Merge remote-tracking branch 'upstream/8.x' into 8.x

Author: tauno

README.md

@@ -73,9 +73,9 @@ new release of Drupal core.
 
 Follow the steps below to update your core files.
 
-1. Run `composer update drupal/core`.
-1. Run `git diff` to determine if any of the scaffolding files have changed.
- Review the files for any changes and restore any customizations to
+1. Run `composer update drupal/core --with-dependencies` to update Drupal Core and its dependencies.
+1. Run `git diff` to determine if any of the scaffolding files have changed. 
+ Review the files for any changes and restore any customizations to 
  `.htaccess` or `robots.txt`.
 1. Commit everything all together in a single commit, so `web` will remain in
  sync with the `core` when checking out branches or running `git bisect`.

composer.json

@@ -37,7 +37,7 @@
  "drupal/token": "8.1.0-alpha2"
  },
  "require-dev": {
- "behat/mink": "~1.7",
+  "behat/mink": "~1.7",
  "behat/mink-goutte-driver": "~1.2",
  "jcalderonzumba/gastonjs": "^1.1@dev",
  "jcalderonzumba/mink-phantomjs-driver": "~0.3.1",
@@ -73,6 +73,7 @@
  "extra": {
  "installer-paths": {
  "web/core": ["type:drupal-core"],
+ "web/libraries/{$name}": ["type:drupal-library"],
  "web/modules/contrib/{$name}": ["type:drupal-module"],
  "web/profiles/contrib/{$name}": ["type:drupal-profile"],
  "web/themes/contrib/{$name}": ["type:drupal-theme"],

drush/policy.drush.inc

@@ -36,4 +36,3 @@ function policy_drush_help_alter(&$command) {
  $command['options']['pm-force'] = 'Override site policy and allow Drush codebase management (pm-* commands)';
  }
 }
-

scripts/composer/ScriptHandler.php

@@ -14,7 +14,7 @@
 class ScriptHandler {
 
  protected static function getDrupalRoot($project_root) {
- return $project_root .  '/web';
+ return $project_root . '/web';
  }
 
  public static function createRequiredFiles(Event $event) {