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

Merge pull request #801 from wp-cli/update-framework #423