Merge pull request #861 from wp-cli/update-framework

Merge pull request #861 from wp-cli/update-framework #493