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

Merge pull request #795 from wp-cli/update-framework #416