Merge branch 'master' into force-install-476

Conflicts:
	features/theme.feature
	php/commands/plugin.php
	php/commands/theme.php

diff --cc php/commands/plugin.php
index 73e11ea,17989e7..725a0fd
--- 1/php/commands/plugin.php
--- 2/php/commands/plugin.php
+++ b/php/commands/plugin.php
@@@ -252,7 -242,7 +252,7 @@@ class Plugin_Command extends \WP_CLI\Co
        /**
         * Install a plugin.
         *
-        * @synopsis <plugin|zip> [--version=<version>] [--activate] [--yes]
 -       * @synopsis <plugin|zip|url> [--version=<version>] [--activate]
++       * @synopsis <plugin|zip|url> [--version=<version>] [--activate] [--yes]
         */
        function install( $args, $assoc_args ) {
                parent::install( $args, $assoc_args );

diff --cc php/commands/theme.php
index df2da7f,b5639d2..d6e82df
--- 1/php/commands/theme.php
--- 2/php/commands/theme.php
+++ b/php/commands/theme.php
@@@ -159,7 -157,7 +159,7 @@@ class Theme_Command extends \WP_CLI\Com
        /**
         * Install a theme.
         *
-        * @synopsis <theme|zip> [--version=<version>] [--activate] [--yes]
 -       * @synopsis <theme|zip|url> [--version=<version>] [--activate]
++       * @synopsis <theme|zip|url> [--version=<version>] [--activate] [--yes]
         */
        function install( $args, $assoc_args ) {
                parent::install( $args, $assoc_args );