Merge pull request #199 from wp-cli/update/wp-cli-2-12

Merge pull request #199 from wp-cli/update/wp-cli-2-12 #53