Merge branch 'master' into package-manager-v2

Conflicts:
	composer.json

diff --cc composer.json
index 90b517b,c852f8b..4d5d37e
--- 1/composer.json
--- 2/composer.json
+++ b/composer.json
@@@ -12,7 -12,7 +12,8 @@@
                "wp-cli/php-cli-tools": "0.9.3",
                "mustache/mustache": "~2.4",
                "rhumsaa/array_column": "~1.1",
 +              "composer/composer": "dev-master"
+               "rmccue/requests": "dev-master"
        },
        "suggest": {
                "d11wtq/boris": "Enhanced `wp shell` functionality"