diff --git a/.htaccess b/.htaccess
index af418c46d..b26c63bb5 100644
--- a/.htaccess
+++ b/.htaccess
@@ -18,9 +18,6 @@ Options -Indexes
 # Follow symbolic links in this directory.
 Options +FollowSymLinks
 
-# Make Drupal handle any 404 errors.
-ErrorDocument 404 /index.php
-
 # Set the default handler.
 DirectoryIndex index.php index.html index.htm
 
@@ -28,13 +25,14 @@ DirectoryIndex index.php index.html index.htm
 AddType image/svg+xml svg svgz
 AddEncoding gzip svgz
 
-# Override PHP settings that cannot be changed at runtime. See
+# Most of the following PHP settings cannot be changed at runtime. See
 # sites/default/default.settings.php and
 # Drupal\Core\DrupalKernel::bootEnvironment() for settings that can be
 # changed at runtime.
 
 # PHP 5, Apache 1 and 2.
 <IfModule mod_php5.c>
+  php_value assert.active                   0
   php_flag session.auto_start               off
   php_value mbstring.http_input             pass
   php_value mbstring.http_output            pass
@@ -62,6 +60,14 @@ AddEncoding gzip svgz
   </FilesMatch>
 </IfModule>
 
+# Set a fallback resource if mod_rewrite is not enabled. This allows Drupal to
+# work without clean URLs. This requires Apache version >= 2.2.16. If Drupal is
+# not accessed by the top level URL (i.e.: http://example.com/drupal/ instead of
+# http://example.com/), the path to index.php will need to be adjusted.
+<IfModule !mod_rewrite.c>
+  FallbackResource /index.php
+</IfModule>
+
 # Various rewrite rules.
 <IfModule mod_rewrite.c>
   RewriteEngine on
@@ -125,6 +131,9 @@ AddEncoding gzip svgz
   RewriteCond %{REQUEST_URI} !core
   RewriteRule ^ %1/core/%2 [L,QSA,R=301]
 
+  # Rewrite install.php during installation to see if mod_rewrite is working
+  RewriteRule ^core/install.php core/install.php?rewrite=ok [QSA,L]
+
   # Pass all requests not referring directly to files in the filesystem to
   # index.php.
   RewriteCond %{REQUEST_FILENAME} !-f
diff --git a/core/.gitignore b/core/.gitignore
index 91bd4cdda..74b6a4c79 100644
--- a/core/.gitignore
+++ b/core/.gitignore
@@ -14,3 +14,6 @@ vendor/symfony/translation/Symfony/Component/Translation/*
 
 # PHPUnit provides some binary dependencies that are already available.
 vendor/phpunit/phpunit/build/dependencies
+
+# The PHAR file below contains CRLF characters that cause a problem with PIFR.
+vendor/symfony/dependency-injection/Tests/Fixtures/includes/ProjectWithXsdExtensionInPhar.phar
diff --git a/core/INSTALL.txt b/core/INSTALL.txt
index 6ae05b4ec..514e528fe 100644
--- a/core/INSTALL.txt
+++ b/core/INSTALL.txt
@@ -18,7 +18,7 @@ Drupal requires:
 - A web server with PHP support, for example:
   - Apache 2.0 (or greater) (http://httpd.apache.org/).
   - Nginx 1.1 (or greater) (http://nginx.com/).
-- PHP 5.4.5 (or greater) (http://php.net/). For better security support it is
+- PHP 5.5.9 (or greater) (http://php.net/). For better security support it is
   recommended to update to at least 5.5.21 or 5.6.5.
 - One of the following databases:
   - MySQL 5.5.3 (or greater) (http://www.mysql.com/).
@@ -121,34 +121,41 @@ INSTALLATION
 
    a. Missing files directory.
 
-      The install script will attempt to create a file storage directory in
-      the default location at sites/default/files (the location of the files
+      The install script will attempt to create a public file storage directory
+      in the default location at sites/default/files (the location of the files
       directory may be changed after Drupal is installed).
 
-      If auto-creation fails, you can make it work by changing permissions on
-      the sites/default directory so that the web server can create the files
-      directory within it for you. (If you are creating a multisite
-      installation, substitute the correct sites directory for sites/default;
-      see the Multisite Configuration section of this file, below.)
+      If auto-creation fails, you can create the directory yourself. (If you are
+      creating a multisite installation, substitute the correct sites directory
+      for sites/default; see the Multisite Configuration section of this file,
+      below.) Sample commands from a Unix/Linux command line:
 
-      For example, on a Unix/Linux command line, you can grant everyone
+        mkdir sites/default/files
+        chmod a+w sites/default/files
+
+      Alternatively, you can make the install script work by changing
+      permissions on the sites/default directory. The web server can then
+      create the files directory within it for you.
+
+      For example, on a Unix/Linux command line, you can you can grant everyone
       (including the web server) permission to write to the sites/default
       directory with this command:
 
         chmod a+w sites/default
 
-      Be sure to set the permissions back after the installation is finished!
+      Then re-run install.php (e.g. by clicking "try again" at the bottom of
+      the Requirements problem page. Once the files directory is created, you
+      will need to grant everyone (including the web server) permission to
+      write to it with this command:
+
+        chmod a+w sites/default/files
+
+      Be sure to set the permissions for the default directory back after the
+      installation is finished! (Leave the files directory writeable.)
       Sample command:
 
         chmod go-w sites/default
 
-      Alternatively, instead of allowing the web server to create the files
-      directory for you as described above, you can create it yourself. Sample
-      commands from a Unix/Linux command line:
-
-        mkdir sites/default/files
-        chmod a+w sites/default/files
-
    b. Missing settings file.
 
       Drupal will try to automatically create settings.php and services.yml
diff --git a/core/MAINTAINERS.txt b/core/MAINTAINERS.txt
index 40a6a8d1d..9408d5737 100644
--- a/core/MAINTAINERS.txt
+++ b/core/MAINTAINERS.txt
@@ -108,7 +108,6 @@ Database update system
 Entity system
 - Wolfgang Ziegler 'fago' https://www.drupal.org/u/fago
 - Nathaniel Catchpole 'catch' https://www.drupal.org/u/catch
-- Franz Heinzmann 'Frando' https://www.drupal.org/u/frando
 - Sascha Grossenbacher 'Berdir' https://www.drupal.org/u/berdir
 
 Extension system
@@ -128,7 +127,6 @@ Form system
 - Wolfgang Ziegler 'fago' https://www.drupal.org/u/fago
 - Daniel F. Kudwien 'sun' https://www.drupal.org/u/sun
 - Tim Plunkett 'tim.plunkett' https://www.drupal.org/u/tim.plunkett
-- Franz Heinzmann 'Frando' https://www.drupal.org/u/frando
 
 Image system
 - Claudiu Cristea 'claudiu.cristea' https://www.drupal.org/u/claudiu.cristea
@@ -182,7 +180,6 @@ Queue system
 Render system
 - Moshe Weitzman 'moshe weitzman' https://www.drupal.org/u/moshe-weitzman
 - Alex Bronstein 'effulgentsia' https://www.drupal.org/u/effulgentsia
-- Franz Heinzmann 'Frando' https://www.drupal.org/u/frando
 
 Request processing system
 - Larry Garfield 'Crell' https://www.drupal.org/u/crell
@@ -298,7 +295,8 @@ Configuration Translation module
 
 Contact module
 - Lee Rowlands 'larowlan' https://www.drupal.org/u/larowlan
-- Tim Eisenhuth 'tim-e' https://www.drupal.org/u/tim-e
+- Jibran Ijaz 'jibran' https://www.drupal.org/u/jibran
+- Andrey Postnikov 'andypost' https://www.drupal.org/u/andypost
 
 Content Translation module
 - Francesco Placella 'plach' https://www.drupal.org/u/plach
diff --git a/core/UPGRADE.txt b/core/UPGRADE.txt
index 21611dda1..5394a4eae 100644
--- a/core/UPGRADE.txt
+++ b/core/UPGRADE.txt
@@ -67,6 +67,9 @@ following the instructions in the INTRODUCTION section at the top of this file:
    Sometimes an update includes changes to default.settings.php (this will be
    noted in the release notes). If that's the case, follow these steps:
 
+   - Locate your settings.php file in the /sites/* directory. (Typically
+     sites/default.)
+
    - Make a backup copy of your settings.php file, with a different file name.
 
    - Make a copy of the new default.settings.php file, and name the copy
@@ -77,6 +80,13 @@ following the instructions in the INTRODUCTION section at the top of this file:
      database information, and you will also want to copy in any other
      customizations you have added.
 
+   You can find the release notes for your version at
+   https://www.drupal.org/project/drupal. At bottom of the project page under
+   "Downloads" use the link for your version of Drupal to view the release
+   notes. If your version is not listed, use the 'View all releases' link. From
+   this page you can scroll down or use the filter to find your version and its
+   release notes.
+
 4. Download the latest Drupal 8.x release from https://www.drupal.org to a
    directory outside of your web root. Extract the archive and copy the files
    into your Drupal directory.
diff --git a/core/assets/vendor/backbone/backbone-min.js b/core/assets/vendor/backbone/backbone-min.js
index 8ea4b13d3..f29903b1a 100644
--- a/core/assets/vendor/backbone/backbone-min.js
+++ b/core/assets/vendor/backbone/backbone-min.js
@@ -1,2 +1,2 @@
-(function(t,e){if(typeof define==="function"&&define.amd){define(["underscore","jquery","exports"],function(i,r,s){t.Backbone=e(t,s,i,r)})}else if(typeof exports!=="undefined"){var i=require("underscore");e(t,exports,i)}else{t.Backbone=e(t,{},t._,t.jQuery||t.Zepto||t.ender||t.$)}})(this,function(t,e,i,r){var s=t.Backbone;var n=[];var a=n.push;var o=n.slice;var h=n.splice;e.VERSION="1.1.2";e.$=r;e.noConflict=function(){t.Backbone=s;return this};e.emulateHTTP=false;e.emulateJSON=false;var u=e.Events={on:function(t,e,i){if(!c(this,"on",t,[e,i])||!e)return this;this._events||(this._events={});var r=this._events[t]||(this._events[t]=[]);r.push({callback:e,context:i,ctx:i||this});return this},once:function(t,e,r){if(!c(this,"once",t,[e,r])||!e)return this;var s=this;var n=i.once(function(){s.off(t,n);e.apply(this,arguments)});n._callback=e;return this.on(t,n,r)},off:function(t,e,r){var s,n,a,o,h,u,l,f;if(!this._events||!c(this,"off",t,[e,r]))return this;if(!t&&!e&&!r){this._events=void 0;return this}o=t?[t]:i.keys(this._events);for(h=0,u=o.length;h<u;h++){t=o[h];if(a=this._events[t]){this._events[t]=s=[];if(e||r){for(l=0,f=a.length;l<f;l++){n=a[l];if(e&&e!==n.callback&&e!==n.callback._callback||r&&r!==n.context){s.push(n)}}}if(!s.length)delete this._events[t]}}return this},trigger:function(t){if(!this._events)return this;var e=o.call(arguments,1);if(!c(this,"trigger",t,e))return this;var i=this._events[t];var r=this._events.all;if(i)f(i,e);if(r)f(r,arguments);return this},stopListening:function(t,e,r){var s=this._listeningTo;if(!s)return this;var n=!e&&!r;if(!r&&typeof e==="object")r=this;if(t)(s={})[t._listenId]=t;for(var a in s){t=s[a];t.off(e,r,this);if(n||i.isEmpty(t._events))delete this._listeningTo[a]}return this}};var l=/\s+/;var c=function(t,e,i,r){if(!i)return true;if(typeof i==="object"){for(var s in i){t[e].apply(t,[s,i[s]].concat(r))}return false}if(l.test(i)){var n=i.split(l);for(var a=0,o=n.length;a<o;a++){t[e].apply(t,[n[a]].concat(r))}return false}return true};var f=function(t,e){var i,r=-1,s=t.length,n=e[0],a=e[1],o=e[2];switch(e.length){case 0:while(++r<s)(i=t[r]).callback.call(i.ctx);return;case 1:while(++r<s)(i=t[r]).callback.call(i.ctx,n);return;case 2:while(++r<s)(i=t[r]).callback.call(i.ctx,n,a);return;case 3:while(++r<s)(i=t[r]).callback.call(i.ctx,n,a,o);return;default:while(++r<s)(i=t[r]).callback.apply(i.ctx,e);return}};var d={listenTo:"on",listenToOnce:"once"};i.each(d,function(t,e){u[e]=function(e,r,s){var n=this._listeningTo||(this._listeningTo={});var a=e._listenId||(e._listenId=i.uniqueId("l"));n[a]=e;if(!s&&typeof r==="object")s=this;e[t](r,s,this);return this}});u.bind=u.on;u.unbind=u.off;i.extend(e,u);var p=e.Model=function(t,e){var r=t||{};e||(e={});this.cid=i.uniqueId("c");this.attributes={};if(e.collection)this.collection=e.collection;if(e.parse)r=this.parse(r,e)||{};r=i.defaults({},r,i.result(this,"defaults"));this.set(r,e);this.changed={};this.initialize.apply(this,arguments)};i.extend(p.prototype,u,{changed:null,validationError:null,idAttribute:"id",initialize:function(){},toJSON:function(t){return i.clone(this.attributes)},sync:function(){return e.sync.apply(this,arguments)},get:function(t){return this.attributes[t]},escape:function(t){return i.escape(this.get(t))},has:function(t){return this.get(t)!=null},set:function(t,e,r){var s,n,a,o,h,u,l,c;if(t==null)return this;if(typeof t==="object"){n=t;r=e}else{(n={})[t]=e}r||(r={});if(!this._validate(n,r))return false;a=r.unset;h=r.silent;o=[];u=this._changing;this._changing=true;if(!u){this._previousAttributes=i.clone(this.attributes);this.changed={}}c=this.attributes,l=this._previousAttributes;if(this.idAttribute in n)this.id=n[this.idAttribute];for(s in n){e=n[s];if(!i.isEqual(c[s],e))o.push(s);if(!i.isEqual(l[s],e)){this.changed[s]=e}else{delete this.changed[s]}a?delete c[s]:c[s]=e}if(!h){if(o.length)this._pending=r;for(var f=0,d=o.length;f<d;f++){this.trigger("change:"+o[f],this,c[o[f]],r)}}if(u)return this;if(!h){while(this._pending){r=this._pending;this._pending=false;this.trigger("change",this,r)}}this._pending=false;this._changing=false;return this},unset:function(t,e){return this.set(t,void 0,i.extend({},e,{unset:true}))},clear:function(t){var e={};for(var r in this.attributes)e[r]=void 0;return this.set(e,i.extend({},t,{unset:true}))},hasChanged:function(t){if(t==null)return!i.isEmpty(this.changed);return i.has(this.changed,t)},changedAttributes:function(t){if(!t)return this.hasChanged()?i.clone(this.changed):false;var e,r=false;var s=this._changing?this._previousAttributes:this.attributes;for(var n in t){if(i.isEqual(s[n],e=t[n]))continue;(r||(r={}))[n]=e}return r},previous:function(t){if(t==null||!this._previousAttributes)return null;return this._previousAttributes[t]},previousAttributes:function(){return i.clone(this._previousAttributes)},fetch:function(t){t=t?i.clone(t):{};if(t.parse===void 0)t.parse=true;var e=this;var r=t.success;t.success=function(i){if(!e.set(e.parse(i,t),t))return false;if(r)r(e,i,t);e.trigger("sync",e,i,t)};q(this,t);return this.sync("read",this,t)},save:function(t,e,r){var s,n,a,o=this.attributes;if(t==null||typeof t==="object"){s=t;r=e}else{(s={})[t]=e}r=i.extend({validate:true},r);if(s&&!r.wait){if(!this.set(s,r))return false}else{if(!this._validate(s,r))return false}if(s&&r.wait){this.attributes=i.extend({},o,s)}if(r.parse===void 0)r.parse=true;var h=this;var u=r.success;r.success=function(t){h.attributes=o;var e=h.parse(t,r);if(r.wait)e=i.extend(s||{},e);if(i.isObject(e)&&!h.set(e,r)){return false}if(u)u(h,t,r);h.trigger("sync",h,t,r)};q(this,r);n=this.isNew()?"create":r.patch?"patch":"update";if(n==="patch")r.attrs=s;a=this.sync(n,this,r);if(s&&r.wait)this.attributes=o;return a},destroy:function(t){t=t?i.clone(t):{};var e=this;var r=t.success;var s=function(){e.trigger("destroy",e,e.collection,t)};t.success=function(i){if(t.wait||e.isNew())s();if(r)r(e,i,t);if(!e.isNew())e.trigger("sync",e,i,t)};if(this.isNew()){t.success();return false}q(this,t);var n=this.sync("delete",this,t);if(!t.wait)s();return n},url:function(){var t=i.result(this,"urlRoot")||i.result(this.collection,"url")||M();if(this.isNew())return t;return t.replace(/([^\/])$/,"$1/")+encodeURIComponent(this.id)},parse:function(t,e){return t},clone:function(){return new this.constructor(this.attributes)},isNew:function(){return!this.has(this.idAttribute)},isValid:function(t){return this._validate({},i.extend(t||{},{validate:true}))},_validate:function(t,e){if(!e.validate||!this.validate)return true;t=i.extend({},this.attributes,t);var r=this.validationError=this.validate(t,e)||null;if(!r)return true;this.trigger("invalid",this,r,i.extend(e,{validationError:r}));return false}});var v=["keys","values","pairs","invert","pick","omit"];i.each(v,function(t){p.prototype[t]=function(){var e=o.call(arguments);e.unshift(this.attributes);return i[t].apply(i,e)}});var g=e.Collection=function(t,e){e||(e={});if(e.model)this.model=e.model;if(e.comparator!==void 0)this.comparator=e.comparator;this._reset();this.initialize.apply(this,arguments);if(t)this.reset(t,i.extend({silent:true},e))};var m={add:true,remove:true,merge:true};var y={add:true,remove:false};i.extend(g.prototype,u,{model:p,initialize:function(){},toJSON:function(t){return this.map(function(e){return e.toJSON(t)})},sync:function(){return e.sync.apply(this,arguments)},add:function(t,e){return this.set(t,i.extend({merge:false},e,y))},remove:function(t,e){var r=!i.isArray(t);t=r?[t]:i.clone(t);e||(e={});var s,n,a,o;for(s=0,n=t.length;s<n;s++){o=t[s]=this.get(t[s]);if(!o)continue;delete this._byId[o.id];delete this._byId[o.cid];a=this.indexOf(o);this.models.splice(a,1);this.length--;if(!e.silent){e.index=a;o.trigger("remove",o,this,e)}this._removeReference(o,e)}return r?t[0]:t},set:function(t,e){e=i.defaults({},e,m);if(e.parse)t=this.parse(t,e);var r=!i.isArray(t);t=r?t?[t]:[]:i.clone(t);var s,n,a,o,h,u,l;var c=e.at;var f=this.model;var d=this.comparator&&c==null&&e.sort!==false;var v=i.isString(this.comparator)?this.comparator:null;var g=[],y=[],_={};var b=e.add,w=e.merge,x=e.remove;var E=!d&&b&&x?[]:false;for(s=0,n=t.length;s<n;s++){h=t[s]||{};if(h instanceof p){a=o=h}else{a=h[f.prototype.idAttribute||"id"]}if(u=this.get(a)){if(x)_[u.cid]=true;if(w){h=h===o?o.attributes:h;if(e.parse)h=u.parse(h,e);u.set(h,e);if(d&&!l&&u.hasChanged(v))l=true}t[s]=u}else if(b){o=t[s]=this._prepareModel(h,e);if(!o)continue;g.push(o);this._addReference(o,e)}o=u||o;if(E&&(o.isNew()||!_[o.id]))E.push(o);_[o.id]=true}if(x){for(s=0,n=this.length;s<n;++s){if(!_[(o=this.models[s]).cid])y.push(o)}if(y.length)this.remove(y,e)}if(g.length||E&&E.length){if(d)l=true;this.length+=g.length;if(c!=null){for(s=0,n=g.length;s<n;s++){this.models.splice(c+s,0,g[s])}}else{if(E)this.models.length=0;var k=E||g;for(s=0,n=k.length;s<n;s++){this.models.push(k[s])}}}if(l)this.sort({silent:true});if(!e.silent){for(s=0,n=g.length;s<n;s++){(o=g[s]).trigger("add",o,this,e)}if(l||E&&E.length)this.trigger("sort",this,e)}return r?t[0]:t},reset:function(t,e){e||(e={});for(var r=0,s=this.models.length;r<s;r++){this._removeReference(this.models[r],e)}e.previousModels=this.models;this._reset();t=this.add(t,i.extend({silent:true},e));if(!e.silent)this.trigger("reset",this,e);return t},push:function(t,e){return this.add(t,i.extend({at:this.length},e))},pop:function(t){var e=this.at(this.length-1);this.remove(e,t);return e},unshift:function(t,e){return this.add(t,i.extend({at:0},e))},shift:function(t){var e=this.at(0);this.remove(e,t);return e},slice:function(){return o.apply(this.models,arguments)},get:function(t){if(t==null)return void 0;return this._byId[t]||this._byId[t.id]||this._byId[t.cid]},at:function(t){return this.models[t]},where:function(t,e){if(i.isEmpty(t))return e?void 0:[];return this[e?"find":"filter"](function(e){for(var i in t){if(t[i]!==e.get(i))return false}return true})},findWhere:function(t){return this.where(t,true)},sort:function(t){if(!this.comparator)throw new Error("Cannot sort a set without a comparator");t||(t={});if(i.isString(this.comparator)||this.comparator.length===1){this.models=this.sortBy(this.comparator,this)}else{this.models.sort(i.bind(this.comparator,this))}if(!t.silent)this.trigger("sort",this,t);return this},pluck:function(t){return i.invoke(this.models,"get",t)},fetch:function(t){t=t?i.clone(t):{};if(t.parse===void 0)t.parse=true;var e=t.success;var r=this;t.success=function(i){var s=t.reset?"reset":"set";r[s](i,t);if(e)e(r,i,t);r.trigger("sync",r,i,t)};q(this,t);return this.sync("read",this,t)},create:function(t,e){e=e?i.clone(e):{};if(!(t=this._prepareModel(t,e)))return false;if(!e.wait)this.add(t,e);var r=this;var s=e.success;e.success=function(t,i){if(e.wait)r.add(t,e);if(s)s(t,i,e)};t.save(null,e);return t},parse:function(t,e){return t},clone:function(){return new this.constructor(this.models)},_reset:function(){this.length=0;this.models=[];this._byId={}},_prepareModel:function(t,e){if(t instanceof p)return t;e=e?i.clone(e):{};e.collection=this;var r=new this.model(t,e);if(!r.validationError)return r;this.trigger("invalid",this,r.validationError,e);return false},_addReference:function(t,e){this._byId[t.cid]=t;if(t.id!=null)this._byId[t.id]=t;if(!t.collection)t.collection=this;t.on("all",this._onModelEvent,this)},_removeReference:function(t,e){if(this===t.collection)delete t.collection;t.off("all",this._onModelEvent,this)},_onModelEvent:function(t,e,i,r){if((t==="add"||t==="remove")&&i!==this)return;if(t==="destroy")this.remove(e,r);if(e&&t==="change:"+e.idAttribute){delete this._byId[e.previous(e.idAttribute)];if(e.id!=null)this._byId[e.id]=e}this.trigger.apply(this,arguments)}});var _=["forEach","each","map","collect","reduce","foldl","inject","reduceRight","foldr","find","detect","filter","select","reject","every","all","some","any","include","contains","invoke","max","min","toArray","size","first","head","take","initial","rest","tail","drop","last","without","difference","indexOf","shuffle","lastIndexOf","isEmpty","chain","sample"];i.each(_,function(t){g.prototype[t]=function(){var e=o.call(arguments);e.unshift(this.models);return i[t].apply(i,e)}});var b=["groupBy","countBy","sortBy","indexBy"];i.each(b,function(t){g.prototype[t]=function(e,r){var s=i.isFunction(e)?e:function(t){return t.get(e)};return i[t](this.models,s,r)}});var w=e.View=function(t){this.cid=i.uniqueId("view");t||(t={});i.extend(this,i.pick(t,E));this._ensureElement();this.initialize.apply(this,arguments);this.delegateEvents()};var x=/^(\S+)\s*(.*)$/;var E=["model","collection","el","id","attributes","className","tagName","events"];i.extend(w.prototype,u,{tagName:"div",$:function(t){return this.$el.find(t)},initialize:function(){},render:function(){return this},remove:function(){this.$el.remove();this.stopListening();return this},setElement:function(t,i){if(this.$el)this.undelegateEvents();this.$el=t instanceof e.$?t:e.$(t);this.el=this.$el[0];if(i!==false)this.delegateEvents();return this},delegateEvents:function(t){if(!(t||(t=i.result(this,"events"))))return this;this.undelegateEvents();for(var e in t){var r=t[e];if(!i.isFunction(r))r=this[t[e]];if(!r)continue;var s=e.match(x);var n=s[1],a=s[2];r=i.bind(r,this);n+=".delegateEvents"+this.cid;if(a===""){this.$el.on(n,r)}else{this.$el.on(n,a,r)}}return this},undelegateEvents:function(){this.$el.off(".delegateEvents"+this.cid);return this},_ensureElement:function(){if(!this.el){var t=i.extend({},i.result(this,"attributes"));if(this.id)t.id=i.result(this,"id");if(this.className)t["class"]=i.result(this,"className");var r=e.$("<"+i.result(this,"tagName")+">").attr(t);this.setElement(r,false)}else{this.setElement(i.result(this,"el"),false)}}});e.sync=function(t,r,s){var n=T[t];i.defaults(s||(s={}),{emulateHTTP:e.emulateHTTP,emulateJSON:e.emulateJSON});var a={type:n,dataType:"json"};if(!s.url){a.url=i.result(r,"url")||M()}if(s.data==null&&r&&(t==="create"||t==="update"||t==="patch")){a.contentType="application/json";a.data=JSON.stringify(s.attrs||r.toJSON(s))}if(s.emulateJSON){a.contentType="application/x-www-form-urlencoded";a.data=a.data?{model:a.data}:{}}if(s.emulateHTTP&&(n==="PUT"||n==="DELETE"||n==="PATCH")){a.type="POST";if(s.emulateJSON)a.data._method=n;var o=s.beforeSend;s.beforeSend=function(t){t.setRequestHeader("X-HTTP-Method-Override",n);if(o)return o.apply(this,arguments)}}if(a.type!=="GET"&&!s.emulateJSON){a.processData=false}if(a.type==="PATCH"&&k){a.xhr=function(){return new ActiveXObject("Microsoft.XMLHTTP")}}var h=s.xhr=e.ajax(i.extend(a,s));r.trigger("request",r,h,s);return h};var k=typeof window!=="undefined"&&!!window.ActiveXObject&&!(window.XMLHttpRequest&&(new XMLHttpRequest).dispatchEvent);var T={create:"POST",update:"PUT",patch:"PATCH","delete":"DELETE",read:"GET"};e.ajax=function(){return e.$.ajax.apply(e.$,arguments)};var $=e.Router=function(t){t||(t={});if(t.routes)this.routes=t.routes;this._bindRoutes();this.initialize.apply(this,arguments)};var S=/\((.*?)\)/g;var H=/(\(\?)?:\w+/g;var A=/\*\w+/g;var I=/[\-{}\[\]+?.,\\\^$|#\s]/g;i.extend($.prototype,u,{initialize:function(){},route:function(t,r,s){if(!i.isRegExp(t))t=this._routeToRegExp(t);if(i.isFunction(r)){s=r;r=""}if(!s)s=this[r];var n=this;e.history.route(t,function(i){var a=n._extractParameters(t,i);n.execute(s,a);n.trigger.apply(n,["route:"+r].concat(a));n.trigger("route",r,a);e.history.trigger("route",n,r,a)});return this},execute:function(t,e){if(t)t.apply(this,e)},navigate:function(t,i){e.history.navigate(t,i);return this},_bindRoutes:function(){if(!this.routes)return;this.routes=i.result(this,"routes");var t,e=i.keys(this.routes);while((t=e.pop())!=null){this.route(t,this.routes[t])}},_routeToRegExp:function(t){t=t.replace(I,"\\$&").replace(S,"(?:$1)?").replace(H,function(t,e){return e?t:"([^/?]+)"}).replace(A,"([^?]*?)");return new RegExp("^"+t+"(?:\\?([\\s\\S]*))?$")},_extractParameters:function(t,e){var r=t.exec(e).slice(1);return i.map(r,function(t,e){if(e===r.length-1)return t||null;return t?decodeURIComponent(t):null})}});var N=e.History=function(){this.handlers=[];i.bindAll(this,"checkUrl");if(typeof window!=="undefined"){this.location=window.location;this.history=window.history}};var R=/^[#\/]|\s+$/g;var O=/^\/+|\/+$/g;var P=/msie [\w.]+/;var C=/\/$/;var j=/#.*$/;N.started=false;i.extend(N.prototype,u,{interval:50,atRoot:function(){return this.location.pathname.replace(/[^\/]$/,"$&/")===this.root},getHash:function(t){var e=(t||this).location.href.match(/#(.*)$/);return e?e[1]:""},getFragment:function(t,e){if(t==null){if(this._hasPushState||!this._wantsHashChange||e){t=decodeURI(this.location.pathname+this.location.search);var i=this.root.replace(C,"");if(!t.indexOf(i))t=t.slice(i.length)}else{t=this.getHash()}}return t.replace(R,"")},start:function(t){if(N.started)throw new Error("Backbone.history has already been started");N.started=true;this.options=i.extend({root:"/"},this.options,t);this.root=this.options.root;this._wantsHashChange=this.options.hashChange!==false;this._wantsPushState=!!this.options.pushState;this._hasPushState=!!(this.options.pushState&&this.history&&this.history.pushState);var r=this.getFragment();var s=document.documentMode;var n=P.exec(navigator.userAgent.toLowerCase())&&(!s||s<=7);this.root=("/"+this.root+"/").replace(O,"/");if(n&&this._wantsHashChange){var a=e.$('<iframe src="javascript:0" tabindex="-1">');this.iframe=a.hide().appendTo("body")[0].contentWindow;this.navigate(r)}if(this._hasPushState){e.$(window).on("popstate",this.checkUrl)}else if(this._wantsHashChange&&"onhashchange"in window&&!n){e.$(window).on("hashchange",this.checkUrl)}else if(this._wantsHashChange){this._checkUrlInterval=setInterval(this.checkUrl,this.interval)}this.fragment=r;var o=this.location;if(this._wantsHashChange&&this._wantsPushState){if(!this._hasPushState&&!this.atRoot()){this.fragment=this.getFragment(null,true);this.location.replace(this.root+"#"+this.fragment);return true}else if(this._hasPushState&&this.atRoot()&&o.hash){this.fragment=this.getHash().replace(R,"");this.history.replaceState({},document.title,this.root+this.fragment)}}if(!this.options.silent)return this.loadUrl()},stop:function(){e.$(window).off("popstate",this.checkUrl).off("hashchange",this.checkUrl);if(this._checkUrlInterval)clearInterval(this._checkUrlInterval);N.started=false},route:function(t,e){this.handlers.unshift({route:t,callback:e})},checkUrl:function(t){var e=this.getFragment();if(e===this.fragment&&this.iframe){e=this.getFragment(this.getHash(this.iframe))}if(e===this.fragment)return false;if(this.iframe)this.navigate(e);this.loadUrl()},loadUrl:function(t){t=this.fragment=this.getFragment(t);return i.any(this.handlers,function(e){if(e.route.test(t)){e.callback(t);return true}})},navigate:function(t,e){if(!N.started)return false;if(!e||e===true)e={trigger:!!e};var i=this.root+(t=this.getFragment(t||""));t=t.replace(j,"");if(this.fragment===t)return;this.fragment=t;if(t===""&&i!=="/")i=i.slice(0,-1);if(this._hasPushState){this.history[e.replace?"replaceState":"pushState"]({},document.title,i)}else if(this._wantsHashChange){this._updateHash(this.location,t,e.replace);if(this.iframe&&t!==this.getFragment(this.getHash(this.iframe))){if(!e.replace)this.iframe.document.open().close();this._updateHash(this.iframe.location,t,e.replace)}}else{return this.location.assign(i)}if(e.trigger)return this.loadUrl(t)},_updateHash:function(t,e,i){if(i){var r=t.href.replace(/(javascript:|#).*$/,"");t.replace(r+"#"+e)}else{t.hash="#"+e}}});e.history=new N;var U=function(t,e){var r=this;var s;if(t&&i.has(t,"constructor")){s=t.constructor}else{s=function(){return r.apply(this,arguments)}}i.extend(s,r,e);var n=function(){this.constructor=s};n.prototype=r.prototype;s.prototype=new n;if(t)i.extend(s.prototype,t);s.__super__=r.prototype;return s};p.extend=g.extend=$.extend=w.extend=N.extend=U;var M=function(){throw new Error('A "url" property or function must be specified')};var q=function(t,e){var i=e.error;e.error=function(r){if(i)i(t,r,e);t.trigger("error",t,r,e)}};return e});
+(function(t){var e=typeof self=="object"&&self.self==self&&self||typeof global=="object"&&global.global==global&&global;if(typeof define==="function"&&define.amd){define(["underscore","jquery","exports"],function(i,r,s){e.Backbone=t(e,s,i,r)})}else if(typeof exports!=="undefined"){var i=require("underscore"),r;try{r=require("jquery")}catch(s){}t(e,exports,i,r)}else{e.Backbone=t(e,{},e._,e.jQuery||e.Zepto||e.ender||e.$)}})(function(t,e,i,r){var s=t.Backbone;var n=[].slice;e.VERSION="1.2.1";e.$=r;e.noConflict=function(){t.Backbone=s;return this};e.emulateHTTP=false;e.emulateJSON=false;var a=function(t,e,r){switch(t){case 1:return function(){return i[e](this[r])};case 2:return function(t){return i[e](this[r],t)};case 3:return function(t,s){return i[e](this[r],t,s)};case 4:return function(t,s,n){return i[e](this[r],t,s,n)};default:return function(){var t=n.call(arguments);t.unshift(this[r]);return i[e].apply(i,t)}}};var o=function(t,e,r){i.each(e,function(e,s){if(i[s])t.prototype[s]=a(e,s,r)})};var h=e.Events={};var u=/\s+/;var l=function(t,e,r,s,n){var a=0,o;if(r&&typeof r==="object"){if(s!==void 0&&"context"in n&&n.context===void 0)n.context=s;for(o=i.keys(r);a<o.length;a++){e=t(e,o[a],r[o[a]],n)}}else if(r&&u.test(r)){for(o=r.split(u);a<o.length;a++){e=t(e,o[a],s,n)}}else{e=t(e,r,s,n)}return e};h.on=function(t,e,i){return c(this,t,e,i)};var c=function(t,e,i,r,s){t._events=l(f,t._events||{},e,i,{context:r,ctx:t,listening:s});if(s){var n=t._listeners||(t._listeners={});n[s.id]=s}return t};h.listenTo=function(t,e,r){if(!t)return this;var s=t._listenId||(t._listenId=i.uniqueId("l"));var n=this._listeningTo||(this._listeningTo={});var a=n[s];if(!a){var o=this._listenId||(this._listenId=i.uniqueId("l"));a=n[s]={obj:t,objId:s,id:o,listeningTo:n,count:0}}c(t,e,r,this,a);return this};var f=function(t,e,i,r){if(i){var s=t[e]||(t[e]=[]);var n=r.context,a=r.ctx,o=r.listening;if(o)o.count++;s.push({callback:i,context:n,ctx:n||a,listening:o})}return t};h.off=function(t,e,i){if(!this._events)return this;this._events=l(d,this._events,t,e,{context:i,listeners:this._listeners});return this};h.stopListening=function(t,e,r){var s=this._listeningTo;if(!s)return this;var n=t?[t._listenId]:i.keys(s);for(var a=0;a<n.length;a++){var o=s[n[a]];if(!o)break;o.obj.off(e,r,this)}if(i.isEmpty(s))this._listeningTo=void 0;return this};var d=function(t,e,r,s){if(!t)return;var n=0,a;var o=s.context,h=s.listeners;if(!e&&!r&&!o){var u=i.keys(h);for(;n<u.length;n++){a=h[u[n]];delete h[a.id];delete a.listeningTo[a.objId]}return}var l=e?[e]:i.keys(t);for(;n<l.length;n++){e=l[n];var c=t[e];if(!c)break;var f=[];for(var d=0;d<c.length;d++){var v=c[d];if(r&&r!==v.callback&&r!==v.callback._callback||o&&o!==v.context){f.push(v)}else{a=v.listening;if(a&&--a.count===0){delete h[a.id];delete a.listeningTo[a.objId]}}}if(f.length){t[e]=f}else{delete t[e]}}if(i.size(t))return t};h.once=function(t,e,r){var s=l(v,{},t,e,i.bind(this.off,this));return this.on(s,void 0,r)};h.listenToOnce=function(t,e,r){var s=l(v,{},e,r,i.bind(this.stopListening,this,t));return this.listenTo(t,s)};var v=function(t,e,r,s){if(r){var n=t[e]=i.once(function(){s(e,n);r.apply(this,arguments)});n._callback=r}return t};h.trigger=function(t){if(!this._events)return this;var e=Math.max(0,arguments.length-1);var i=Array(e);for(var r=0;r<e;r++)i[r]=arguments[r+1];l(g,this._events,t,void 0,i);return this};var g=function(t,e,i,r){if(t){var s=t[e];var n=t.all;if(s&&n)n=n.slice();if(s)p(s,r);if(n)p(n,[e].concat(r))}return t};var p=function(t,e){var i,r=-1,s=t.length,n=e[0],a=e[1],o=e[2];switch(e.length){case 0:while(++r<s)(i=t[r]).callback.call(i.ctx);return;case 1:while(++r<s)(i=t[r]).callback.call(i.ctx,n);return;case 2:while(++r<s)(i=t[r]).callback.call(i.ctx,n,a);return;case 3:while(++r<s)(i=t[r]).callback.call(i.ctx,n,a,o);return;default:while(++r<s)(i=t[r]).callback.apply(i.ctx,e);return}};h.bind=h.on;h.unbind=h.off;i.extend(e,h);var m=e.Model=function(t,e){var r=t||{};e||(e={});this.cid=i.uniqueId(this.cidPrefix);this.attributes={};if(e.collection)this.collection=e.collection;if(e.parse)r=this.parse(r,e)||{};r=i.defaults({},r,i.result(this,"defaults"));this.set(r,e);this.changed={};this.initialize.apply(this,arguments)};i.extend(m.prototype,h,{changed:null,validationError:null,idAttribute:"id",cidPrefix:"c",initialize:function(){},toJSON:function(t){return i.clone(this.attributes)},sync:function(){return e.sync.apply(this,arguments)},get:function(t){return this.attributes[t]},escape:function(t){return i.escape(this.get(t))},has:function(t){return this.get(t)!=null},matches:function(t){return!!i.iteratee(t,this)(this.attributes)},set:function(t,e,r){if(t==null)return this;var s;if(typeof t==="object"){s=t;r=e}else{(s={})[t]=e}r||(r={});if(!this._validate(s,r))return false;var n=r.unset;var a=r.silent;var o=[];var h=this._changing;this._changing=true;if(!h){this._previousAttributes=i.clone(this.attributes);this.changed={}}var u=this.attributes;var l=this.changed;var c=this._previousAttributes;if(this.idAttribute in s)this.id=s[this.idAttribute];for(var f in s){e=s[f];if(!i.isEqual(u[f],e))o.push(f);if(!i.isEqual(c[f],e)){l[f]=e}else{delete l[f]}n?delete u[f]:u[f]=e}if(!a){if(o.length)this._pending=r;for(var d=0;d<o.length;d++){this.trigger("change:"+o[d],this,u[o[d]],r)}}if(h)return this;if(!a){while(this._pending){r=this._pending;this._pending=false;this.trigger("change",this,r)}}this._pending=false;this._changing=false;return this},unset:function(t,e){return this.set(t,void 0,i.extend({},e,{unset:true}))},clear:function(t){var e={};for(var r in this.attributes)e[r]=void 0;return this.set(e,i.extend({},t,{unset:true}))},hasChanged:function(t){if(t==null)return!i.isEmpty(this.changed);return i.has(this.changed,t)},changedAttributes:function(t){if(!t)return this.hasChanged()?i.clone(this.changed):false;var e=this._changing?this._previousAttributes:this.attributes;var r={};for(var s in t){var n=t[s];if(i.isEqual(e[s],n))continue;r[s]=n}return i.size(r)?r:false},previous:function(t){if(t==null||!this._previousAttributes)return null;return this._previousAttributes[t]},previousAttributes:function(){return i.clone(this._previousAttributes)},fetch:function(t){t=i.extend({parse:true},t);var e=this;var r=t.success;t.success=function(i){var s=t.parse?e.parse(i,t):i;if(!e.set(s,t))return false;if(r)r.call(t.context,e,i,t);e.trigger("sync",e,i,t)};q(this,t);return this.sync("read",this,t)},save:function(t,e,r){var s;if(t==null||typeof t==="object"){s=t;r=e}else{(s={})[t]=e}r=i.extend({validate:true,parse:true},r);var n=r.wait;if(s&&!n){if(!this.set(s,r))return false}else{if(!this._validate(s,r))return false}var a=this;var o=r.success;var h=this.attributes;r.success=function(t){a.attributes=h;var e=r.parse?a.parse(t,r):t;if(n)e=i.extend({},s,e);if(e&&!a.set(e,r))return false;if(o)o.call(r.context,a,t,r);a.trigger("sync",a,t,r)};q(this,r);if(s&&n)this.attributes=i.extend({},h,s);var u=this.isNew()?"create":r.patch?"patch":"update";if(u==="patch"&&!r.attrs)r.attrs=s;var l=this.sync(u,this,r);this.attributes=h;return l},destroy:function(t){t=t?i.clone(t):{};var e=this;var r=t.success;var s=t.wait;var n=function(){e.stopListening();e.trigger("destroy",e,e.collection,t)};t.success=function(i){if(s)n();if(r)r.call(t.context,e,i,t);if(!e.isNew())e.trigger("sync",e,i,t)};var a=false;if(this.isNew()){i.defer(t.success)}else{q(this,t);a=this.sync("delete",this,t)}if(!s)n();return a},url:function(){var t=i.result(this,"urlRoot")||i.result(this.collection,"url")||M();if(this.isNew())return t;var e=this.get(this.idAttribute);return t.replace(/[^\/]$/,"$&/")+encodeURIComponent(e)},parse:function(t,e){return t},clone:function(){return new this.constructor(this.attributes)},isNew:function(){return!this.has(this.idAttribute)},isValid:function(t){return this._validate({},i.defaults({validate:true},t))},_validate:function(t,e){if(!e.validate||!this.validate)return true;t=i.extend({},this.attributes,t);var r=this.validationError=this.validate(t,e)||null;if(!r)return true;this.trigger("invalid",this,r,i.extend(e,{validationError:r}));return false}});var _={keys:1,values:1,pairs:1,invert:1,pick:0,omit:0,chain:1,isEmpty:1};o(m,_,"attributes");var y=e.Collection=function(t,e){e||(e={});if(e.model)this.model=e.model;if(e.comparator!==void 0)this.comparator=e.comparator;this._reset();this.initialize.apply(this,arguments);if(t)this.reset(t,i.extend({silent:true},e))};var b={add:true,remove:true,merge:true};var x={add:true,remove:false};i.extend(y.prototype,h,{model:m,initialize:function(){},toJSON:function(t){return this.map(function(e){return e.toJSON(t)})},sync:function(){return e.sync.apply(this,arguments)},add:function(t,e){return this.set(t,i.extend({merge:false},e,x))},remove:function(t,e){e=i.extend({},e);var r=!i.isArray(t);t=r?[t]:i.clone(t);var s=this._removeModels(t,e);if(!e.silent&&s)this.trigger("update",this,e);return r?s[0]:s},set:function(t,e){e=i.defaults({},e,b);if(e.parse&&!this._isModel(t))t=this.parse(t,e);var r=!i.isArray(t);t=r?t?[t]:[]:t.slice();var s,n,a,o,h;var u=e.at;if(u!=null)u=+u;if(u<0)u+=this.length+1;var l=this.comparator&&u==null&&e.sort!==false;var c=i.isString(this.comparator)?this.comparator:null;var f=[],d=[],v={};var g=e.add,p=e.merge,m=e.remove;var _=!l&&g&&m?[]:false;var y=false;for(var x=0;x<t.length;x++){a=t[x];if(o=this.get(a)){if(m)v[o.cid]=true;if(p&&a!==o){a=this._isModel(a)?a.attributes:a;if(e.parse)a=o.parse(a,e);o.set(a,e);if(l&&!h&&o.hasChanged(c))h=true}t[x]=o}else if(g){n=t[x]=this._prepareModel(a,e);if(!n)continue;f.push(n);this._addReference(n,e)}n=o||n;if(!n)continue;s=this.modelId(n.attributes);if(_&&(n.isNew()||!v[s])){_.push(n);y=y||!this.models[x]||n.cid!==this.models[x].cid}v[s]=true}if(m){for(var x=0;x<this.length;x++){if(!v[(n=this.models[x]).cid])d.push(n)}if(d.length)this._removeModels(d,e)}if(f.length||y){if(l)h=true;this.length+=f.length;if(u!=null){for(var x=0;x<f.length;x++){this.models.splice(u+x,0,f[x])}}else{if(_)this.models.length=0;var w=_||f;for(var x=0;x<w.length;x++){this.models.push(w[x])}}}if(h)this.sort({silent:true});if(!e.silent){var E=u!=null?i.clone(e):e;for(var x=0;x<f.length;x++){if(u!=null)E.index=u+x;(n=f[x]).trigger("add",n,this,E)}if(h||y)this.trigger("sort",this,e);if(f.length||d.length)this.trigger("update",this,e)}return r?t[0]:t},reset:function(t,e){e=e?i.clone(e):{};for(var r=0;r<this.models.length;r++){this._removeReference(this.models[r],e)}e.previousModels=this.models;this._reset();t=this.add(t,i.extend({silent:true},e));if(!e.silent)this.trigger("reset",this,e);return t},push:function(t,e){return this.add(t,i.extend({at:this.length},e))},pop:function(t){var e=this.at(this.length-1);return this.remove(e,t)},unshift:function(t,e){return this.add(t,i.extend({at:0},e))},shift:function(t){var e=this.at(0);return this.remove(e,t)},slice:function(){return n.apply(this.models,arguments)},get:function(t){if(t==null)return void 0;var e=this.modelId(this._isModel(t)?t.attributes:t);return this._byId[t]||this._byId[e]||this._byId[t.cid]},at:function(t){if(t<0)t+=this.length;return this.models[t]},where:function(t,e){var r=i.matches(t);return this[e?"find":"filter"](function(t){return r(t.attributes)})},findWhere:function(t){return this.where(t,true)},sort:function(t){if(!this.comparator)throw new Error("Cannot sort a set without a comparator");t||(t={});if(i.isString(this.comparator)||this.comparator.length===1){this.models=this.sortBy(this.comparator,this)}else{this.models.sort(i.bind(this.comparator,this))}if(!t.silent)this.trigger("sort",this,t);return this},pluck:function(t){return i.invoke(this.models,"get",t)},fetch:function(t){t=i.extend({parse:true},t);var e=t.success;var r=this;t.success=function(i){var s=t.reset?"reset":"set";r[s](i,t);if(e)e.call(t.context,r,i,t);r.trigger("sync",r,i,t)};q(this,t);return this.sync("read",this,t)},create:function(t,e){e=e?i.clone(e):{};var r=e.wait;t=this._prepareModel(t,e);if(!t)return false;if(!r)this.add(t,e);var s=this;var n=e.success;e.success=function(t,e,i){if(r)s.add(t,i);if(n)n.call(i.context,t,e,i)};t.save(null,e);return t},parse:function(t,e){return t},clone:function(){return new this.constructor(this.models,{model:this.model,comparator:this.comparator})},modelId:function(t){return t[this.model.prototype.idAttribute||"id"]},_reset:function(){this.length=0;this.models=[];this._byId={}},_prepareModel:function(t,e){if(this._isModel(t)){if(!t.collection)t.collection=this;return t}e=e?i.clone(e):{};e.collection=this;var r=new this.model(t,e);if(!r.validationError)return r;this.trigger("invalid",this,r.validationError,e);return false},_removeModels:function(t,e){var i=[];for(var r=0;r<t.length;r++){var s=this.get(t[r]);if(!s)continue;var n=this.indexOf(s);this.models.splice(n,1);this.length--;if(!e.silent){e.index=n;s.trigger("remove",s,this,e)}i.push(s);this._removeReference(s,e)}return i.length?i:false},_isModel:function(t){return t instanceof m},_addReference:function(t,e){this._byId[t.cid]=t;var i=this.modelId(t.attributes);if(i!=null)this._byId[i]=t;t.on("all",this._onModelEvent,this)},_removeReference:function(t,e){delete this._byId[t.cid];var i=this.modelId(t.attributes);if(i!=null)delete this._byId[i];if(this===t.collection)delete t.collection;t.off("all",this._onModelEvent,this)},_onModelEvent:function(t,e,i,r){if((t==="add"||t==="remove")&&i!==this)return;if(t==="destroy")this.remove(e,r);if(t==="change"){var s=this.modelId(e.previousAttributes());var n=this.modelId(e.attributes);if(s!==n){if(s!=null)delete this._byId[s];if(n!=null)this._byId[n]=e}}this.trigger.apply(this,arguments)}});var w={forEach:3,each:3,map:3,collect:3,reduce:4,foldl:4,inject:4,reduceRight:4,foldr:4,find:3,detect:3,filter:3,select:3,reject:3,every:3,all:3,some:3,any:3,include:2,contains:2,invoke:0,max:3,min:3,toArray:1,size:1,first:3,head:3,take:3,initial:3,rest:3,tail:3,drop:3,last:3,without:0,difference:0,indexOf:3,shuffle:1,lastIndexOf:3,isEmpty:1,chain:1,sample:3,partition:3};o(y,w,"models");var E=["groupBy","countBy","sortBy","indexBy"];i.each(E,function(t){if(!i[t])return;y.prototype[t]=function(e,r){var s=i.isFunction(e)?e:function(t){return t.get(e)};return i[t](this.models,s,r)}});var k=e.View=function(t){this.cid=i.uniqueId("view");i.extend(this,i.pick(t,I));this._ensureElement();this.initialize.apply(this,arguments)};var S=/^(\S+)\s*(.*)$/;var I=["model","collection","el","id","attributes","className","tagName","events"];i.extend(k.prototype,h,{tagName:"div",$:function(t){return this.$el.find(t)},initialize:function(){},render:function(){return this},remove:function(){this._removeElement();this.stopListening();return this},_removeElement:function(){this.$el.remove()},setElement:function(t){this.undelegateEvents();this._setElement(t);this.delegateEvents();return this},_setElement:function(t){this.$el=t instanceof e.$?t:e.$(t);this.el=this.$el[0]},delegateEvents:function(t){t||(t=i.result(this,"events"));if(!t)return this;this.undelegateEvents();for(var e in t){var r=t[e];if(!i.isFunction(r))r=this[r];if(!r)continue;var s=e.match(S);this.delegate(s[1],s[2],i.bind(r,this))}return this},delegate:function(t,e,i){this.$el.on(t+".delegateEvents"+this.cid,e,i);return this},undelegateEvents:function(){if(this.$el)this.$el.off(".delegateEvents"+this.cid);return this},undelegate:function(t,e,i){this.$el.off(t+".delegateEvents"+this.cid,e,i);return this},_createElement:function(t){return document.createElement(t)},_ensureElement:function(){if(!this.el){var t=i.extend({},i.result(this,"attributes"));if(this.id)t.id=i.result(this,"id");if(this.className)t["class"]=i.result(this,"className");this.setElement(this._createElement(i.result(this,"tagName")));this._setAttributes(t)}else{this.setElement(i.result(this,"el"))}},_setAttributes:function(t){this.$el.attr(t)}});e.sync=function(t,r,s){var n=T[t];i.defaults(s||(s={}),{emulateHTTP:e.emulateHTTP,emulateJSON:e.emulateJSON});var a={type:n,dataType:"json"};if(!s.url){a.url=i.result(r,"url")||M()}if(s.data==null&&r&&(t==="create"||t==="update"||t==="patch")){a.contentType="application/json";a.data=JSON.stringify(s.attrs||r.toJSON(s))}if(s.emulateJSON){a.contentType="application/x-www-form-urlencoded";a.data=a.data?{model:a.data}:{}}if(s.emulateHTTP&&(n==="PUT"||n==="DELETE"||n==="PATCH")){a.type="POST";if(s.emulateJSON)a.data._method=n;var o=s.beforeSend;s.beforeSend=function(t){t.setRequestHeader("X-HTTP-Method-Override",n);if(o)return o.apply(this,arguments)}}if(a.type!=="GET"&&!s.emulateJSON){a.processData=false}var h=s.error;s.error=function(t,e,i){s.textStatus=e;s.errorThrown=i;if(h)h.call(s.context,t,e,i)};var u=s.xhr=e.ajax(i.extend(a,s));r.trigger("request",r,u,s);return u};var T={create:"POST",update:"PUT",patch:"PATCH","delete":"DELETE",read:"GET"};e.ajax=function(){return e.$.ajax.apply(e.$,arguments)};var P=e.Router=function(t){t||(t={});if(t.routes)this.routes=t.routes;this._bindRoutes();this.initialize.apply(this,arguments)};var H=/\((.*?)\)/g;var $=/(\(\?)?:\w+/g;var A=/\*\w+/g;var C=/[\-{}\[\]+?.,\\\^$|#\s]/g;i.extend(P.prototype,h,{initialize:function(){},route:function(t,r,s){if(!i.isRegExp(t))t=this._routeToRegExp(t);if(i.isFunction(r)){s=r;r=""}if(!s)s=this[r];var n=this;e.history.route(t,function(i){var a=n._extractParameters(t,i);if(n.execute(s,a,r)!==false){n.trigger.apply(n,["route:"+r].concat(a));n.trigger("route",r,a);e.history.trigger("route",n,r,a)}});return this},execute:function(t,e,i){if(t)t.apply(this,e)},navigate:function(t,i){e.history.navigate(t,i);return this},_bindRoutes:function(){if(!this.routes)return;this.routes=i.result(this,"routes");var t,e=i.keys(this.routes);while((t=e.pop())!=null){this.route(t,this.routes[t])}},_routeToRegExp:function(t){t=t.replace(C,"\\$&").replace(H,"(?:$1)?").replace($,function(t,e){return e?t:"([^/?]+)"}).replace(A,"([^?]*?)");return new RegExp("^"+t+"(?:\\?([\\s\\S]*))?$")},_extractParameters:function(t,e){var r=t.exec(e).slice(1);return i.map(r,function(t,e){if(e===r.length-1)return t||null;return t?decodeURIComponent(t):null})}});var N=e.History=function(){this.handlers=[];i.bindAll(this,"checkUrl");if(typeof window!=="undefined"){this.location=window.location;this.history=window.history}};var R=/^[#\/]|\s+$/g;var j=/^\/+|\/+$/g;var O=/#.*$/;N.started=false;i.extend(N.prototype,h,{interval:50,atRoot:function(){var t=this.location.pathname.replace(/[^\/]$/,"$&/");return t===this.root&&!this.getSearch()},matchRoot:function(){var t=this.decodeFragment(this.location.pathname);var e=t.slice(0,this.root.length-1)+"/";return e===this.root},decodeFragment:function(t){return decodeURI(t.replace(/%25/g,"%2525"))},getSearch:function(){var t=this.location.href.replace(/#.*/,"").match(/\?.+/);return t?t[0]:""},getHash:function(t){var e=(t||this).location.href.match(/#(.*)$/);return e?e[1]:""},getPath:function(){var t=this.decodeFragment(this.location.pathname+this.getSearch()).slice(this.root.length-1);return t.charAt(0)==="/"?t.slice(1):t},getFragment:function(t){if(t==null){if(this._usePushState||!this._wantsHashChange){t=this.getPath()}else{t=this.getHash()}}return t.replace(R,"")},start:function(t){if(N.started)throw new Error("Backbone.history has already been started");N.started=true;this.options=i.extend({root:"/"},this.options,t);this.root=this.options.root;this._wantsHashChange=this.options.hashChange!==false;this._hasHashChange="onhashchange"in window;this._useHashChange=this._wantsHashChange&&this._hasHashChange;this._wantsPushState=!!this.options.pushState;this._hasPushState=!!(this.history&&this.history.pushState);this._usePushState=this._wantsPushState&&this._hasPushState;this.fragment=this.getFragment();this.root=("/"+this.root+"/").replace(j,"/");if(this._wantsHashChange&&this._wantsPushState){if(!this._hasPushState&&!this.atRoot()){var e=this.root.slice(0,-1)||"/";this.location.replace(e+"#"+this.getPath());return true}else if(this._hasPushState&&this.atRoot()){this.navigate(this.getHash(),{replace:true})}}if(!this._hasHashChange&&this._wantsHashChange&&!this._usePushState){this.iframe=document.createElement("iframe");this.iframe.src="javascript:0";this.iframe.style.display="none";this.iframe.tabIndex=-1;var r=document.body;var s=r.insertBefore(this.iframe,r.firstChild).contentWindow;s.document.open();s.document.close();s.location.hash="#"+this.fragment}var n=window.addEventListener||function(t,e){return attachEvent("on"+t,e)};if(this._usePushState){n("popstate",this.checkUrl,false)}else if(this._useHashChange&&!this.iframe){n("hashchange",this.checkUrl,false)}else if(this._wantsHashChange){this._checkUrlInterval=setInterval(this.checkUrl,this.interval)}if(!this.options.silent)return this.loadUrl()},stop:function(){var t=window.removeEventListener||function(t,e){return detachEvent("on"+t,e)};if(this._usePushState){t("popstate",this.checkUrl,false)}else if(this._useHashChange&&!this.iframe){t("hashchange",this.checkUrl,false)}if(this.iframe){document.body.removeChild(this.iframe);this.iframe=null}if(this._checkUrlInterval)clearInterval(this._checkUrlInterval);N.started=false},route:function(t,e){this.handlers.unshift({route:t,callback:e})},checkUrl:function(t){var e=this.getFragment();if(e===this.fragment&&this.iframe){e=this.getHash(this.iframe.contentWindow)}if(e===this.fragment)return false;if(this.iframe)this.navigate(e);this.loadUrl()},loadUrl:function(t){if(!this.matchRoot())return false;t=this.fragment=this.getFragment(t);return i.any(this.handlers,function(e){if(e.route.test(t)){e.callback(t);return true}})},navigate:function(t,e){if(!N.started)return false;if(!e||e===true)e={trigger:!!e};t=this.getFragment(t||"");var i=this.root;if(t===""||t.charAt(0)==="?"){i=i.slice(0,-1)||"/"}var r=i+t;t=this.decodeFragment(t.replace(O,""));if(this.fragment===t)return;this.fragment=t;if(this._usePushState){this.history[e.replace?"replaceState":"pushState"]({},document.title,r)}else if(this._wantsHashChange){this._updateHash(this.location,t,e.replace);if(this.iframe&&t!==this.getHash(this.iframe.contentWindow)){var s=this.iframe.contentWindow;if(!e.replace){s.document.open();s.document.close()}this._updateHash(s.location,t,e.replace)}}else{return this.location.assign(r)}if(e.trigger)return this.loadUrl(t)},_updateHash:function(t,e,i){if(i){var r=t.href.replace(/(javascript:|#).*$/,"");t.replace(r+"#"+e)}else{t.hash="#"+e}}});e.history=new N;var U=function(t,e){var r=this;var s;if(t&&i.has(t,"constructor")){s=t.constructor}else{s=function(){return r.apply(this,arguments)}}i.extend(s,r,e);var n=function(){this.constructor=s};n.prototype=r.prototype;s.prototype=new n;if(t)i.extend(s.prototype,t);s.__super__=r.prototype;return s};m.extend=y.extend=P.extend=k.extend=N.extend=U;var M=function(){throw new Error('A "url" property or function must be specified')};var q=function(t,e){var i=e.error;e.error=function(r){if(i)i.call(e.context,t,r,e);t.trigger("error",t,r,e)}};return e});
 //# sourceMappingURL=backbone-min.map
\ No newline at end of file
diff --git a/core/assets/vendor/backbone/backbone-min.map b/core/assets/vendor/backbone/backbone-min.map
index 2b0cf2776..f01489a5c 100644
--- a/core/assets/vendor/backbone/backbone-min.map
+++ b/core/assets/vendor/backbone/backbone-min.map
@@ -1 +1 @@
-{"version":3,"file":"backbone-min.js","sources":["backbone.js"],"names":["root","factory","define","amd","_","$","exports","Backbone","require","jQuery","Zepto","ender","this","previousBackbone","array","push","slice","splice","VERSION","noConflict","emulateHTTP","emulateJSON","Events","on","name","callback","context","eventsApi","_events","events","ctx","once","self","off","apply","arguments","_callback","retain","ev","names","i","l","j","k","keys","length","trigger","args","call","allEvents","all","triggerEvents","stopListening","obj","listeningTo","_listeningTo","remove","_listenId","id","isEmpty","eventSplitter","action","rest","key","concat","test","split","a1","a2","a3","listenMethods","listenTo","listenToOnce","each","implementation","method","uniqueId","bind","unbind","extend","Model","attributes","options","attrs","cid","collection","parse","defaults","result","set","changed","initialize","prototype","validationError","idAttribute","toJSON","clone","sync","get","attr","escape","has","val","unset","changes","silent","changing","prev","current","_validate","_changing","_previousAttributes","isEqual","_pending","clear","hasChanged","changedAttributes","diff","old","previous","previousAttributes","fetch","model","success","resp","wrapError","save","xhr","validate","wait","serverAttrs","isObject","isNew","patch","destroy","url","base","urlError","replace","encodeURIComponent","constructor","isValid","error","modelMethods","unshift","Collection","models","comparator","_reset","reset","setOptions","add","merge","addOptions","map","singular","isArray","index","_byId","indexOf","_removeReference","existing","sort","at","targetModel","sortable","sortAttr","isString","toAdd","toRemove","modelMap","order","_prepareModel","_addReference","orderedModels","previousModels","pop","shift","where","first","findWhere","Error","sortBy","pluck","invoke","create","_onModelEvent","event","methods","attributeMethods","value","iterator","isFunction","View","pick","viewOptions","_ensureElement","delegateEvents","delegateEventSplitter","tagName","selector","$el","find","render","setElement","element","delegate","undelegateEvents","el","match","eventName","className","type","methodMap","params","dataType","data","contentType","JSON","stringify","_method","beforeSend","setRequestHeader","processData","noXhrPatch","ActiveXObject","ajax","window","XMLHttpRequest","dispatchEvent","update","delete","read","Router","routes","_bindRoutes","optionalParam","namedParam","splatParam","escapeRegExp","route","isRegExp","_routeToRegExp","router","history","fragment","_extractParameters","execute","navigate","optional","RegExp","exec","param","decodeURIComponent","History","handlers","bindAll","location","routeStripper","rootStripper","isExplorer","trailingSlash","pathStripper","started","interval","atRoot","pathname","getHash","href","getFragment","forcePushState","_hasPushState","_wantsHashChange","decodeURI","search","start","hashChange","_wantsPushState","pushState","docMode","document","documentMode","oldIE","navigator","userAgent","toLowerCase","frame","iframe","hide","appendTo","contentWindow","checkUrl","_checkUrlInterval","setInterval","loc","hash","replaceState","title","loadUrl","stop","clearInterval","e","any","handler","_updateHash","open","close","assign","protoProps","staticProps","parent","child","Surrogate","__super__"],"mappings":"CAOC,SAASA,EAAMC,GAGd,SAAWC,UAAW,YAAcA,OAAOC,IAAK,CAC9CD,QAAQ,aAAc,SAAU,WAAY,SAASE,EAAGC,EAAGC,GAGzDN,EAAKO,SAAWN,EAAQD,EAAMM,EAASF,EAAGC,SAIvC,UAAWC,WAAY,YAAa,CACzC,GAAIF,GAAII,QAAQ,aAChBP,GAAQD,EAAMM,QAASF,OAGlB,CACLJ,EAAKO,SAAWN,EAAQD,KAAUA,EAAKI,EAAIJ,EAAKS,QAAUT,EAAKU,OAASV,EAAKW,OAASX,EAAKK,MAG7FO,KAAM,SAASZ,EAAMO,EAAUH,EAAGC,GAOlC,GAAIQ,GAAmBb,EAAKO,QAG5B,IAAIO,KACJ,IAAIC,GAAOD,EAAMC,IACjB,IAAIC,GAAQF,EAAME,KAClB,IAAIC,GAASH,EAAMG,MAGnBV,GAASW,QAAU,OAInBX,GAASF,EAAIA,CAIbE,GAASY,WAAa,WACpBnB,EAAKO,SAAWM,CAChB,OAAOD,MAMTL,GAASa,YAAc,KAMvBb,GAASc,YAAc,KAevB,IAAIC,GAASf,EAASe,QAIpBC,GAAI,SAASC,EAAMC,EAAUC,GAC3B,IAAKC,EAAUf,KAAM,KAAMY,GAAOC,EAAUC,MAAcD,EAAU,MAAOb,KAC3EA,MAAKgB,UAAYhB,KAAKgB,WACtB,IAAIC,GAASjB,KAAKgB,QAAQJ,KAAUZ,KAAKgB,QAAQJ,MACjDK,GAAOd,MAAMU,SAAUA,EAAUC,QAASA,EAASI,IAAKJ,GAAWd,MACnE,OAAOA,OAKTmB,KAAM,SAASP,EAAMC,EAAUC,GAC7B,IAAKC,EAAUf,KAAM,OAAQY,GAAOC,EAAUC,MAAcD,EAAU,MAAOb,KAC7E,IAAIoB,GAAOpB,IACX,IAAImB,GAAO3B,EAAE2B,KAAK,WAChBC,EAAKC,IAAIT,EAAMO,EACfN,GAASS,MAAMtB,KAAMuB,YAEvBJ,GAAKK,UAAYX,CACjB,OAAOb,MAAKW,GAAGC,EAAMO,EAAML,IAO7BO,IAAK,SAAST,EAAMC,EAAUC,GAC5B,GAAIW,GAAQC,EAAIT,EAAQU,EAAOC,EAAGC,EAAGC,EAAGC,CACxC,KAAK/B,KAAKgB,UAAYD,EAAUf,KAAM,MAAOY,GAAOC,EAAUC,IAAW,MAAOd,KAChF,KAAKY,IAASC,IAAaC,EAAS,CAClCd,KAAKgB,YAAe,EACpB,OAAOhB,MAET2B,EAAQf,GAAQA,GAAQpB,EAAEwC,KAAKhC,KAAKgB,QACpC,KAAKY,EAAI,EAAGC,EAAIF,EAAMM,OAAQL,EAAIC,EAAGD,IAAK,CACxChB,EAAOe,EAAMC,EACb,IAAIX,EAASjB,KAAKgB,QAAQJ,GAAO,CAC/BZ,KAAKgB,QAAQJ,GAAQa,IACrB,IAAIZ,GAAYC,EAAS,CACvB,IAAKgB,EAAI,EAAGC,EAAId,EAAOgB,OAAQH,EAAIC,EAAGD,IAAK,CACzCJ,EAAKT,EAAOa,EACZ,IAAKjB,GAAYA,IAAaa,EAAGb,UAAYA,IAAaa,EAAGb,SAASW,WACjEV,GAAWA,IAAYY,EAAGZ,QAAU,CACvCW,EAAOtB,KAAKuB,KAIlB,IAAKD,EAAOQ,aAAejC,MAAKgB,QAAQJ,IAI5C,MAAOZ,OAOTkC,QAAS,SAAStB,GAChB,IAAKZ,KAAKgB,QAAS,MAAOhB,KAC1B,IAAImC,GAAO/B,EAAMgC,KAAKb,UAAW,EACjC,KAAKR,EAAUf,KAAM,UAAWY,EAAMuB,GAAO,MAAOnC,KACpD,IAAIiB,GAASjB,KAAKgB,QAAQJ,EAC1B,IAAIyB,GAAYrC,KAAKgB,QAAQsB,GAC7B,IAAIrB,EAAQsB,EAActB,EAAQkB,EAClC,IAAIE,EAAWE,EAAcF,EAAWd,UACxC,OAAOvB,OAKTwC,cAAe,SAASC,EAAK7B,EAAMC,GACjC,GAAI6B,GAAc1C,KAAK2C,YACvB,KAAKD,EAAa,MAAO1C,KACzB,IAAI4C,IAAUhC,IAASC,CACvB,KAAKA,SAAmBD,KAAS,SAAUC,EAAWb,IACtD,IAAIyC,GAAMC,MAAkBD,EAAII,WAAaJ,CAC7C,KAAK,GAAIK,KAAMJ,GAAa,CAC1BD,EAAMC,EAAYI,EAClBL,GAAIpB,IAAIT,EAAMC,EAAUb,KACxB,IAAI4C,GAAUpD,EAAEuD,QAAQN,EAAIzB,eAAiBhB,MAAK2C,aAAaG,GAEjE,MAAO9C,OAMX,IAAIgD,GAAgB,KAKpB,IAAIjC,GAAY,SAAS0B,EAAKQ,EAAQrC,EAAMsC,GAC1C,IAAKtC,EAAM,MAAO,KAGlB,UAAWA,KAAS,SAAU,CAC5B,IAAK,GAAIuC,KAAOvC,GAAM,CACpB6B,EAAIQ,GAAQ3B,MAAMmB,GAAMU,EAAKvC,EAAKuC,IAAMC,OAAOF,IAEjD,MAAO,OAIT,GAAIF,EAAcK,KAAKzC,GAAO,CAC5B,GAAIe,GAAQf,EAAK0C,MAAMN,EACvB,KAAK,GAAIpB,GAAI,EAAGC,EAAIF,EAAMM,OAAQL,EAAIC,EAAGD,IAAK,CAC5Ca,EAAIQ,GAAQ3B,MAAMmB,GAAMd,EAAMC,IAAIwB,OAAOF,IAE3C,MAAO,OAGT,MAAO,MAMT,IAAIX,GAAgB,SAAStB,EAAQkB,GACnC,GAAIT,GAAIE,GAAK,EAAGC,EAAIZ,EAAOgB,OAAQsB,EAAKpB,EAAK,GAAIqB,EAAKrB,EAAK,GAAIsB,EAAKtB,EAAK,EACzE,QAAQA,EAAKF,QACX,IAAK,GAAG,QAASL,EAAIC,GAAIH,EAAKT,EAAOW,IAAIf,SAASuB,KAAKV,EAAGR,IAAM,OAChE,KAAK,GAAG,QAASU,EAAIC,GAAIH,EAAKT,EAAOW,IAAIf,SAASuB,KAAKV,EAAGR,IAAKqC,EAAK,OACpE,KAAK,GAAG,QAAS3B,EAAIC,GAAIH,EAAKT,EAAOW,IAAIf,SAASuB,KAAKV,EAAGR,IAAKqC,EAAIC,EAAK,OACxE,KAAK,GAAG,QAAS5B,EAAIC,GAAIH,EAAKT,EAAOW,IAAIf,SAASuB,KAAKV,EAAGR,IAAKqC,EAAIC,EAAIC,EAAK,OAC5E,SAAS,QAAS7B,EAAIC,GAAIH,EAAKT,EAAOW,IAAIf,SAASS,MAAMI,EAAGR,IAAKiB,EAAO,SAI5E,IAAIuB,IAAiBC,SAAU,KAAMC,aAAc,OAKnDpE,GAAEqE,KAAKH,EAAe,SAASI,EAAgBC,GAC7CrD,EAAOqD,GAAU,SAAStB,EAAK7B,EAAMC,GACnC,GAAI6B,GAAc1C,KAAK2C,eAAiB3C,KAAK2C,gBAC7C,IAAIG,GAAKL,EAAII,YAAcJ,EAAII,UAAYrD,EAAEwE,SAAS,KACtDtB,GAAYI,GAAML,CAClB,KAAK5B,SAAmBD,KAAS,SAAUC,EAAWb,IACtDyC,GAAIqB,GAAgBlD,EAAMC,EAAUb,KACpC,OAAOA,QAKXU,GAAOuD,KAASvD,EAAOC,EACvBD,GAAOwD,OAASxD,EAAOW,GAIvB7B,GAAE2E,OAAOxE,EAAUe,EAYnB,IAAI0D,GAAQzE,EAASyE,MAAQ,SAASC,EAAYC,GAChD,GAAIC,GAAQF,KACZC,KAAYA,KACZtE,MAAKwE,IAAMhF,EAAEwE,SAAS,IACtBhE,MAAKqE,aACL,IAAIC,EAAQG,WAAYzE,KAAKyE,WAAaH,EAAQG,UAClD,IAAIH,EAAQI,MAAOH,EAAQvE,KAAK0E,MAAMH,EAAOD,MAC7CC,GAAQ/E,EAAEmF,YAAaJ,EAAO/E,EAAEoF,OAAO5E,KAAM,YAC7CA,MAAK6E,IAAIN,EAAOD,EAChBtE,MAAK8E,UACL9E,MAAK+E,WAAWzD,MAAMtB,KAAMuB,WAI9B/B,GAAE2E,OAAOC,EAAMY,UAAWtE,GAGxBoE,QAAS,KAGTG,gBAAiB,KAIjBC,YAAa,KAIbH,WAAY,aAGZI,OAAQ,SAASb,GACf,MAAO9E,GAAE4F,MAAMpF,KAAKqE,aAKtBgB,KAAM,WACJ,MAAO1F,GAAS0F,KAAK/D,MAAMtB,KAAMuB,YAInC+D,IAAK,SAASC,GACZ,MAAOvF,MAAKqE,WAAWkB,IAIzBC,OAAQ,SAASD,GACf,MAAO/F,GAAEgG,OAAOxF,KAAKsF,IAAIC,KAK3BE,IAAK,SAASF,GACZ,MAAOvF,MAAKsF,IAAIC,IAAS,MAM3BV,IAAK,SAAS1B,EAAKuC,EAAKpB,GACtB,GAAIiB,GAAMhB,EAAOoB,EAAOC,EAASC,EAAQC,EAAUC,EAAMC,CACzD,IAAI7C,GAAO,KAAM,MAAOnD,KAGxB,UAAWmD,KAAQ,SAAU,CAC3BoB,EAAQpB,CACRmB,GAAUoB,MACL,EACJnB,MAAYpB,GAAOuC,EAGtBpB,IAAYA,KAGZ,KAAKtE,KAAKiG,UAAU1B,EAAOD,GAAU,MAAO,MAG5CqB,GAAkBrB,EAAQqB,KAC1BE,GAAkBvB,EAAQuB,MAC1BD,KACAE,GAAkB9F,KAAKkG,SACvBlG,MAAKkG,UAAa,IAElB,KAAKJ,EAAU,CACb9F,KAAKmG,oBAAsB3G,EAAE4F,MAAMpF,KAAKqE,WACxCrE,MAAK8E,WAEPkB,EAAUhG,KAAKqE,WAAY0B,EAAO/F,KAAKmG,mBAGvC,IAAInG,KAAKkF,cAAeX,GAAOvE,KAAK8C,GAAKyB,EAAMvE,KAAKkF,YAGpD,KAAKK,IAAQhB,GAAO,CAClBmB,EAAMnB,EAAMgB,EACZ,KAAK/F,EAAE4G,QAAQJ,EAAQT,GAAOG,GAAME,EAAQzF,KAAKoF,EACjD,KAAK/F,EAAE4G,QAAQL,EAAKR,GAAOG,GAAM,CAC/B1F,KAAK8E,QAAQS,GAAQG,MAChB,OACE1F,MAAK8E,QAAQS,GAEtBI,QAAeK,GAAQT,GAAQS,EAAQT,GAAQG,EAIjD,IAAKG,EAAQ,CACX,GAAID,EAAQ3D,OAAQjC,KAAKqG,SAAW/B,CACpC,KAAK,GAAI1C,GAAI,EAAGC,EAAI+D,EAAQ3D,OAAQL,EAAIC,EAAGD,IAAK,CAC9C5B,KAAKkC,QAAQ,UAAY0D,EAAQhE,GAAI5B,KAAMgG,EAAQJ,EAAQhE,IAAK0C,IAMpE,GAAIwB,EAAU,MAAO9F,KACrB,KAAK6F,EAAQ,CACX,MAAO7F,KAAKqG,SAAU,CACpB/B,EAAUtE,KAAKqG,QACfrG,MAAKqG,SAAW,KAChBrG,MAAKkC,QAAQ,SAAUlC,KAAMsE,IAGjCtE,KAAKqG,SAAW,KAChBrG,MAAKkG,UAAY,KACjB,OAAOlG,OAKT2F,MAAO,SAASJ,EAAMjB,GACpB,MAAOtE,MAAK6E,IAAIU,MAAW,GAAG/F,EAAE2E,UAAWG,GAAUqB,MAAO,SAI9DW,MAAO,SAAShC,GACd,GAAIC,KACJ,KAAK,GAAIpB,KAAOnD,MAAKqE,WAAYE,EAAMpB,OAAY,EACnD,OAAOnD,MAAK6E,IAAIN,EAAO/E,EAAE2E,UAAWG,GAAUqB,MAAO,SAKvDY,WAAY,SAAShB,GACnB,GAAIA,GAAQ,KAAM,OAAQ/F,EAAEuD,QAAQ/C,KAAK8E,QACzC,OAAOtF,GAAEiG,IAAIzF,KAAK8E,QAASS,IAS7BiB,kBAAmB,SAASC,GAC1B,IAAKA,EAAM,MAAOzG,MAAKuG,aAAe/G,EAAE4F,MAAMpF,KAAK8E,SAAW,KAC9D,IAAIY,GAAKZ,EAAU,KACnB,IAAI4B,GAAM1G,KAAKkG,UAAYlG,KAAKmG,oBAAsBnG,KAAKqE,UAC3D,KAAK,GAAIkB,KAAQkB,GAAM,CACrB,GAAIjH,EAAE4G,QAAQM,EAAInB,GAAQG,EAAMe,EAAKlB,IAAS,UAC7CT,IAAYA,OAAeS,GAAQG,EAEtC,MAAOZ,IAKT6B,SAAU,SAASpB,GACjB,GAAIA,GAAQ,OAASvF,KAAKmG,oBAAqB,MAAO,KACtD,OAAOnG,MAAKmG,oBAAoBZ,IAKlCqB,mBAAoB,WAClB,MAAOpH,GAAE4F,MAAMpF,KAAKmG,sBAMtBU,MAAO,SAASvC,GACdA,EAAUA,EAAU9E,EAAE4F,MAAMd,KAC5B,IAAIA,EAAQI,YAAe,GAAGJ,EAAQI,MAAQ,IAC9C,IAAIoC,GAAQ9G,IACZ,IAAI+G,GAAUzC,EAAQyC,OACtBzC,GAAQyC,QAAU,SAASC,GACzB,IAAKF,EAAMjC,IAAIiC,EAAMpC,MAAMsC,EAAM1C,GAAUA,GAAU,MAAO,MAC5D,IAAIyC,EAASA,EAAQD,EAAOE,EAAM1C,EAClCwC,GAAM5E,QAAQ,OAAQ4E,EAAOE,EAAM1C,GAErC2C,GAAUjH,KAAMsE,EAChB,OAAOtE,MAAKqF,KAAK,OAAQrF,KAAMsE,IAMjC4C,KAAM,SAAS/D,EAAKuC,EAAKpB,GACvB,GAAIC,GAAOR,EAAQoD,EAAK9C,EAAarE,KAAKqE,UAG1C,IAAIlB,GAAO,YAAeA,KAAQ,SAAU,CAC1CoB,EAAQpB,CACRmB,GAAUoB,MACL,EACJnB,MAAYpB,GAAOuC,EAGtBpB,EAAU9E,EAAE2E,QAAQiD,SAAU,MAAO9C,EAKrC,IAAIC,IAAUD,EAAQ+C,KAAM,CAC1B,IAAKrH,KAAK6E,IAAIN,EAAOD,GAAU,MAAO,WACjC,CACL,IAAKtE,KAAKiG,UAAU1B,EAAOD,GAAU,MAAO,OAI9C,GAAIC,GAASD,EAAQ+C,KAAM,CACzBrH,KAAKqE,WAAa7E,EAAE2E,UAAWE,EAAYE,GAK7C,GAAID,EAAQI,YAAe,GAAGJ,EAAQI,MAAQ,IAC9C,IAAIoC,GAAQ9G,IACZ,IAAI+G,GAAUzC,EAAQyC,OACtBzC,GAAQyC,QAAU,SAASC,GAEzBF,EAAMzC,WAAaA,CACnB,IAAIiD,GAAcR,EAAMpC,MAAMsC,EAAM1C,EACpC,IAAIA,EAAQ+C,KAAMC,EAAc9H,EAAE2E,OAAOI,MAAa+C,EACtD,IAAI9H,EAAE+H,SAASD,KAAiBR,EAAMjC,IAAIyC,EAAahD,GAAU,CAC/D,MAAO,OAET,GAAIyC,EAASA,EAAQD,EAAOE,EAAM1C,EAClCwC,GAAM5E,QAAQ,OAAQ4E,EAAOE,EAAM1C,GAErC2C,GAAUjH,KAAMsE,EAEhBP,GAAS/D,KAAKwH,QAAU,SAAYlD,EAAQmD,MAAQ,QAAU,QAC9D,IAAI1D,IAAW,QAASO,EAAQC,MAAQA,CACxC4C,GAAMnH,KAAKqF,KAAKtB,EAAQ/D,KAAMsE,EAG9B,IAAIC,GAASD,EAAQ+C,KAAMrH,KAAKqE,WAAaA,CAE7C,OAAO8C,IAMTO,QAAS,SAASpD,GAChBA,EAAUA,EAAU9E,EAAE4F,MAAMd,KAC5B,IAAIwC,GAAQ9G,IACZ,IAAI+G,GAAUzC,EAAQyC,OAEtB,IAAIW,GAAU,WACZZ,EAAM5E,QAAQ,UAAW4E,EAAOA,EAAMrC,WAAYH,GAGpDA,GAAQyC,QAAU,SAASC,GACzB,GAAI1C,EAAQ+C,MAAQP,EAAMU,QAASE,GACnC,IAAIX,EAASA,EAAQD,EAAOE,EAAM1C,EAClC,KAAKwC,EAAMU,QAASV,EAAM5E,QAAQ,OAAQ4E,EAAOE,EAAM1C,GAGzD,IAAItE,KAAKwH,QAAS,CAChBlD,EAAQyC,SACR,OAAO,OAETE,EAAUjH,KAAMsE,EAEhB,IAAI6C,GAAMnH,KAAKqF,KAAK,SAAUrF,KAAMsE,EACpC,KAAKA,EAAQ+C,KAAMK,GACnB,OAAOP,IAMTQ,IAAK,WACH,GAAIC,GACFpI,EAAEoF,OAAO5E,KAAM,YACfR,EAAEoF,OAAO5E,KAAKyE,WAAY,QAC1BoD,GACF,IAAI7H,KAAKwH,QAAS,MAAOI,EACzB,OAAOA,GAAKE,QAAQ,WAAY,OAASC,mBAAmB/H,KAAK8C,KAKnE4B,MAAO,SAASsC,EAAM1C,GACpB,MAAO0C,IAIT5B,MAAO,WACL,MAAO,IAAIpF,MAAKgI,YAAYhI,KAAKqE,aAInCmD,MAAO,WACL,OAAQxH,KAAKyF,IAAIzF,KAAKkF,cAIxB+C,QAAS,SAAS3D,GAChB,MAAOtE,MAAKiG,aAAczG,EAAE2E,OAAOG,OAAiB8C,SAAU,SAKhEnB,UAAW,SAAS1B,EAAOD,GACzB,IAAKA,EAAQ8C,WAAapH,KAAKoH,SAAU,MAAO,KAChD7C,GAAQ/E,EAAE2E,UAAWnE,KAAKqE,WAAYE,EACtC,IAAI2D,GAAQlI,KAAKiF,gBAAkBjF,KAAKoH,SAAS7C,EAAOD,IAAY,IACpE,KAAK4D,EAAO,MAAO,KACnBlI,MAAKkC,QAAQ,UAAWlC,KAAMkI,EAAO1I,EAAE2E,OAAOG,GAAUW,gBAAiBiD,IACzE,OAAO,SAMX,IAAIC,IAAgB,OAAQ,SAAU,QAAS,SAAU,OAAQ,OAGjE3I,GAAEqE,KAAKsE,EAAc,SAASpE,GAC5BK,EAAMY,UAAUjB,GAAU,WACxB,GAAI5B,GAAO/B,EAAMgC,KAAKb,UACtBY,GAAKiG,QAAQpI,KAAKqE,WAClB,OAAO7E,GAAEuE,GAAQzC,MAAM9B,EAAG2C,KAiB9B,IAAIkG,GAAa1I,EAAS0I,WAAa,SAASC,EAAQhE,GACtDA,IAAYA,KACZ,IAAIA,EAAQwC,MAAO9G,KAAK8G,MAAQxC,EAAQwC,KACxC,IAAIxC,EAAQiE,iBAAoB,GAAGvI,KAAKuI,WAAajE,EAAQiE,UAC7DvI,MAAKwI,QACLxI,MAAK+E,WAAWzD,MAAMtB,KAAMuB,UAC5B,IAAI+G,EAAQtI,KAAKyI,MAAMH,EAAQ9I,EAAE2E,QAAQ0B,OAAQ,MAAOvB,IAI1D,IAAIoE,IAAcC,IAAK,KAAM/F,OAAQ,KAAMgG,MAAO,KAClD,IAAIC,IAAcF,IAAK,KAAM/F,OAAQ,MAGrCpD,GAAE2E,OAAOkE,EAAWrD,UAAWtE,GAI7BoG,MAAO1C,EAIPW,WAAY,aAIZI,OAAQ,SAASb,GACf,MAAOtE,MAAK8I,IAAI,SAAShC,GAAQ,MAAOA,GAAM3B,OAAOb,MAIvDe,KAAM,WACJ,MAAO1F,GAAS0F,KAAK/D,MAAMtB,KAAMuB,YAInCoH,IAAK,SAASL,EAAQhE,GACpB,MAAOtE,MAAK6E,IAAIyD,EAAQ9I,EAAE2E,QAAQyE,MAAO,OAAQtE,EAASuE,KAI5DjG,OAAQ,SAAS0F,EAAQhE,GACvB,GAAIyE,IAAYvJ,EAAEwJ,QAAQV,EAC1BA,GAASS,GAAYT,GAAU9I,EAAE4F,MAAMkD,EACvChE,KAAYA,KACZ,IAAI1C,GAAGC,EAAGoH,EAAOnC,CACjB,KAAKlF,EAAI,EAAGC,EAAIyG,EAAOrG,OAAQL,EAAIC,EAAGD,IAAK,CACzCkF,EAAQwB,EAAO1G,GAAK5B,KAAKsF,IAAIgD,EAAO1G,GACpC,KAAKkF,EAAO,eACL9G,MAAKkJ,MAAMpC,EAAMhE,UACjB9C,MAAKkJ,MAAMpC,EAAMtC,IACxByE,GAAQjJ,KAAKmJ,QAAQrC,EACrB9G,MAAKsI,OAAOjI,OAAO4I,EAAO,EAC1BjJ,MAAKiC,QACL,KAAKqC,EAAQuB,OAAQ,CACnBvB,EAAQ2E,MAAQA,CAChBnC,GAAM5E,QAAQ,SAAU4E,EAAO9G,KAAMsE,GAEvCtE,KAAKoJ,iBAAiBtC,EAAOxC,GAE/B,MAAOyE,GAAWT,EAAO,GAAKA,GAOhCzD,IAAK,SAASyD,EAAQhE,GACpBA,EAAU9E,EAAEmF,YAAaL,EAASoE,EAClC,IAAIpE,EAAQI,MAAO4D,EAAStI,KAAK0E,MAAM4D,EAAQhE,EAC/C,IAAIyE,IAAYvJ,EAAEwJ,QAAQV,EAC1BA,GAASS,EAAYT,GAAUA,MAAgB9I,EAAE4F,MAAMkD,EACvD,IAAI1G,GAAGC,EAAGiB,EAAIgE,EAAOvC,EAAO8E,EAAUC,CACtC,IAAIC,GAAKjF,EAAQiF,EACjB,IAAIC,GAAcxJ,KAAK8G,KACvB,IAAI2C,GAAWzJ,KAAKuI,YAAegB,GAAM,MAASjF,EAAQgF,OAAS,KACnE,IAAII,GAAWlK,EAAEmK,SAAS3J,KAAKuI,YAAcvI,KAAKuI,WAAa,IAC/D,IAAIqB,MAAYC,KAAeC,IAC/B,IAAInB,GAAMrE,EAAQqE,IAAKC,EAAQtE,EAAQsE,MAAOhG,EAAS0B,EAAQ1B,MAC/D,IAAImH,IAASN,GAAYd,GAAO/F,KAAc,KAI9C,KAAKhB,EAAI,EAAGC,EAAIyG,EAAOrG,OAAQL,EAAIC,EAAGD,IAAK,CACzC2C,EAAQ+D,EAAO1G,MACf,IAAI2C,YAAiBH,GAAO,CAC1BtB,EAAKgE,EAAQvC,MACR,CACLzB,EAAKyB,EAAMiF,EAAYxE,UAAUE,aAAe,MAKlD,GAAImE,EAAWrJ,KAAKsF,IAAIxC,GAAK,CAC3B,GAAIF,EAAQkH,EAAST,EAAS7E,KAAO,IACrC,IAAIoE,EAAO,CACTrE,EAAQA,IAAUuC,EAAQA,EAAMzC,WAAaE,CAC7C,IAAID,EAAQI,MAAOH,EAAQ8E,EAAS3E,MAAMH,EAAOD,EACjD+E,GAASxE,IAAIN,EAAOD,EACpB,IAAImF,IAAaH,GAAQD,EAAS9C,WAAWmD,GAAWJ,EAAO,KAEjEhB,EAAO1G,GAAKyH,MAGP,IAAIV,EAAK,CACd7B,EAAQwB,EAAO1G,GAAK5B,KAAKgK,cAAczF,EAAOD,EAC9C,KAAKwC,EAAO,QACZ8C,GAAMzJ,KAAK2G,EACX9G,MAAKiK,cAAcnD,EAAOxC,GAI5BwC,EAAQuC,GAAYvC,CACpB,IAAIiD,IAAUjD,EAAMU,UAAYsC,EAAShD,EAAMhE,KAAMiH,EAAM5J,KAAK2G,EAChEgD,GAAShD,EAAMhE,IAAM,KAIvB,GAAIF,EAAQ,CACV,IAAKhB,EAAI,EAAGC,EAAI7B,KAAKiC,OAAQL,EAAIC,IAAKD,EAAG,CACvC,IAAKkI,GAAUhD,EAAQ9G,KAAKsI,OAAO1G,IAAI4C,KAAMqF,EAAS1J,KAAK2G,GAE7D,GAAI+C,EAAS5H,OAAQjC,KAAK4C,OAAOiH,EAAUvF,GAI7C,GAAIsF,EAAM3H,QAAW8H,GAASA,EAAM9H,OAAS,CAC3C,GAAIwH,EAAUH,EAAO,IACrBtJ,MAAKiC,QAAU2H,EAAM3H,MACrB,IAAIsH,GAAM,KAAM,CACd,IAAK3H,EAAI,EAAGC,EAAI+H,EAAM3H,OAAQL,EAAIC,EAAGD,IAAK,CACxC5B,KAAKsI,OAAOjI,OAAOkJ,EAAK3H,EAAG,EAAGgI,EAAMhI,SAEjC,CACL,GAAImI,EAAO/J,KAAKsI,OAAOrG,OAAS,CAChC,IAAIiI,GAAgBH,GAASH,CAC7B,KAAKhI,EAAI,EAAGC,EAAIqI,EAAcjI,OAAQL,EAAIC,EAAGD,IAAK,CAChD5B,KAAKsI,OAAOnI,KAAK+J,EAActI,MAMrC,GAAI0H,EAAMtJ,KAAKsJ,MAAMzD,OAAQ,MAG7B,KAAKvB,EAAQuB,OAAQ,CACnB,IAAKjE,EAAI,EAAGC,EAAI+H,EAAM3H,OAAQL,EAAIC,EAAGD,IAAK,EACvCkF,EAAQ8C,EAAMhI,IAAIM,QAAQ,MAAO4E,EAAO9G,KAAMsE,GAEjD,GAAIgF,GAASS,GAASA,EAAM9H,OAASjC,KAAKkC,QAAQ,OAAQlC,KAAMsE,GAIlE,MAAOyE,GAAWT,EAAO,GAAKA,GAOhCG,MAAO,SAASH,EAAQhE,GACtBA,IAAYA,KACZ,KAAK,GAAI1C,GAAI,EAAGC,EAAI7B,KAAKsI,OAAOrG,OAAQL,EAAIC,EAAGD,IAAK,CAClD5B,KAAKoJ,iBAAiBpJ,KAAKsI,OAAO1G,GAAI0C,GAExCA,EAAQ6F,eAAiBnK,KAAKsI,MAC9BtI,MAAKwI,QACLF,GAAStI,KAAK2I,IAAIL,EAAQ9I,EAAE2E,QAAQ0B,OAAQ,MAAOvB,GACnD,KAAKA,EAAQuB,OAAQ7F,KAAKkC,QAAQ,QAASlC,KAAMsE,EACjD,OAAOgE,IAITnI,KAAM,SAAS2G,EAAOxC,GACpB,MAAOtE,MAAK2I,IAAI7B,EAAOtH,EAAE2E,QAAQoF,GAAIvJ,KAAKiC,QAASqC,KAIrD8F,IAAK,SAAS9F,GACZ,GAAIwC,GAAQ9G,KAAKuJ,GAAGvJ,KAAKiC,OAAS,EAClCjC,MAAK4C,OAAOkE,EAAOxC,EACnB,OAAOwC,IAITsB,QAAS,SAAStB,EAAOxC,GACvB,MAAOtE,MAAK2I,IAAI7B,EAAOtH,EAAE2E,QAAQoF,GAAI,GAAIjF,KAI3C+F,MAAO,SAAS/F,GACd,GAAIwC,GAAQ9G,KAAKuJ,GAAG,EACpBvJ,MAAK4C,OAAOkE,EAAOxC,EACnB,OAAOwC,IAIT1G,MAAO,WACL,MAAOA,GAAMkB,MAAMtB,KAAKsI,OAAQ/G,YAIlC+D,IAAK,SAAS7C,GACZ,GAAIA,GAAO,KAAM,WAAY,EAC7B,OAAOzC,MAAKkJ,MAAMzG,IAAQzC,KAAKkJ,MAAMzG,EAAIK,KAAO9C,KAAKkJ,MAAMzG,EAAI+B,MAIjE+E,GAAI,SAASN,GACX,MAAOjJ,MAAKsI,OAAOW,IAKrBqB,MAAO,SAAS/F,EAAOgG,GACrB,GAAI/K,EAAEuD,QAAQwB,GAAQ,MAAOgG,OAAa,KAC1C,OAAOvK,MAAKuK,EAAQ,OAAS,UAAU,SAASzD,GAC9C,IAAK,GAAI3D,KAAOoB,GAAO,CACrB,GAAIA,EAAMpB,KAAS2D,EAAMxB,IAAInC,GAAM,MAAO,OAE5C,MAAO,SAMXqH,UAAW,SAASjG,GAClB,MAAOvE,MAAKsK,MAAM/F,EAAO,OAM3B+E,KAAM,SAAShF,GACb,IAAKtE,KAAKuI,WAAY,KAAM,IAAIkC,OAAM,yCACtCnG,KAAYA,KAGZ,IAAI9E,EAAEmK,SAAS3J,KAAKuI,aAAevI,KAAKuI,WAAWtG,SAAW,EAAG,CAC/DjC,KAAKsI,OAAStI,KAAK0K,OAAO1K,KAAKuI,WAAYvI,UACtC,CACLA,KAAKsI,OAAOgB,KAAK9J,EAAEyE,KAAKjE,KAAKuI,WAAYvI,OAG3C,IAAKsE,EAAQuB,OAAQ7F,KAAKkC,QAAQ,OAAQlC,KAAMsE,EAChD,OAAOtE,OAIT2K,MAAO,SAASpF,GACd,MAAO/F,GAAEoL,OAAO5K,KAAKsI,OAAQ,MAAO/C,IAMtCsB,MAAO,SAASvC,GACdA,EAAUA,EAAU9E,EAAE4F,MAAMd,KAC5B,IAAIA,EAAQI,YAAe,GAAGJ,EAAQI,MAAQ,IAC9C,IAAIqC,GAAUzC,EAAQyC,OACtB,IAAItC,GAAazE,IACjBsE,GAAQyC,QAAU,SAASC,GACzB,GAAIjD,GAASO,EAAQmE,MAAQ,QAAU,KACvChE,GAAWV,GAAQiD,EAAM1C,EACzB,IAAIyC,EAASA,EAAQtC,EAAYuC,EAAM1C,EACvCG,GAAWvC,QAAQ,OAAQuC,EAAYuC,EAAM1C,GAE/C2C,GAAUjH,KAAMsE,EAChB,OAAOtE,MAAKqF,KAAK,OAAQrF,KAAMsE,IAMjCuG,OAAQ,SAAS/D,EAAOxC,GACtBA,EAAUA,EAAU9E,EAAE4F,MAAMd,KAC5B,MAAMwC,EAAQ9G,KAAKgK,cAAclD,EAAOxC,IAAW,MAAO,MAC1D,KAAKA,EAAQ+C,KAAMrH,KAAK2I,IAAI7B,EAAOxC,EACnC,IAAIG,GAAazE,IACjB,IAAI+G,GAAUzC,EAAQyC,OACtBzC,GAAQyC,QAAU,SAASD,EAAOE,GAChC,GAAI1C,EAAQ+C,KAAM5C,EAAWkE,IAAI7B,EAAOxC,EACxC,IAAIyC,EAASA,EAAQD,EAAOE,EAAM1C,GAEpCwC,GAAMI,KAAK,KAAM5C,EACjB,OAAOwC,IAKTpC,MAAO,SAASsC,EAAM1C,GACpB,MAAO0C,IAIT5B,MAAO,WACL,MAAO,IAAIpF,MAAKgI,YAAYhI,KAAKsI,SAKnCE,OAAQ,WACNxI,KAAKiC,OAAS,CACdjC,MAAKsI,SACLtI,MAAKkJ,UAKPc,cAAe,SAASzF,EAAOD,GAC7B,GAAIC,YAAiBH,GAAO,MAAOG,EACnCD,GAAUA,EAAU9E,EAAE4F,MAAMd,KAC5BA,GAAQG,WAAazE,IACrB,IAAI8G,GAAQ,GAAI9G,MAAK8G,MAAMvC,EAAOD,EAClC,KAAKwC,EAAM7B,gBAAiB,MAAO6B,EACnC9G,MAAKkC,QAAQ,UAAWlC,KAAM8G,EAAM7B,gBAAiBX,EACrD,OAAO,QAIT2F,cAAe,SAASnD,EAAOxC,GAC7BtE,KAAKkJ,MAAMpC,EAAMtC,KAAOsC,CACxB,IAAIA,EAAMhE,IAAM,KAAM9C,KAAKkJ,MAAMpC,EAAMhE,IAAMgE,CAC7C,KAAKA,EAAMrC,WAAYqC,EAAMrC,WAAazE,IAC1C8G,GAAMnG,GAAG,MAAOX,KAAK8K,cAAe9K,OAItCoJ,iBAAkB,SAAStC,EAAOxC,GAChC,GAAItE,OAAS8G,EAAMrC,iBAAmBqC,GAAMrC,UAC5CqC,GAAMzF,IAAI,MAAOrB,KAAK8K,cAAe9K,OAOvC8K,cAAe,SAASC,EAAOjE,EAAOrC,EAAYH,GAChD,IAAKyG,IAAU,OAASA,IAAU,WAAatG,IAAezE,KAAM,MACpE,IAAI+K,IAAU,UAAW/K,KAAK4C,OAAOkE,EAAOxC,EAC5C,IAAIwC,GAASiE,IAAU,UAAYjE,EAAM5B,YAAa,OAC7ClF,MAAKkJ,MAAMpC,EAAMH,SAASG,EAAM5B,aACvC,IAAI4B,EAAMhE,IAAM,KAAM9C,KAAKkJ,MAAMpC,EAAMhE,IAAMgE,EAE/C9G,KAAKkC,QAAQZ,MAAMtB,KAAMuB,aAQ7B,IAAIyJ,IAAW,UAAW,OAAQ,MAAO,UAAW,SAAU,QAC5D,SAAU,cAAe,QAAS,OAAQ,SAAU,SAAU,SAC9D,SAAU,QAAS,MAAO,OAAQ,MAAO,UAAW,WAAY,SAChE,MAAO,MAAO,UAAW,OAAQ,QAAS,OAAQ,OAAQ,UAAW,OACrE,OAAQ,OAAQ,OAAQ,UAAW,aAAc,UAAW,UAC5D,cAAe,UAAW,QAAS,SAGrCxL,GAAEqE,KAAKmH,EAAS,SAASjH,GACvBsE,EAAWrD,UAAUjB,GAAU,WAC7B,GAAI5B,GAAO/B,EAAMgC,KAAKb,UACtBY,GAAKiG,QAAQpI,KAAKsI,OAClB,OAAO9I,GAAEuE,GAAQzC,MAAM9B,EAAG2C,KAK9B,IAAI8I,IAAoB,UAAW,UAAW,SAAU,UAGxDzL,GAAEqE,KAAKoH,EAAkB,SAASlH,GAChCsE,EAAWrD,UAAUjB,GAAU,SAASmH,EAAOpK,GAC7C,GAAIqK,GAAW3L,EAAE4L,WAAWF,GAASA,EAAQ,SAASpE,GACpD,MAAOA,GAAMxB,IAAI4F,GAEnB,OAAO1L,GAAEuE,GAAQ/D,KAAKsI,OAAQ6C,EAAUrK,KAiB5C,IAAIuK,GAAO1L,EAAS0L,KAAO,SAAS/G,GAClCtE,KAAKwE,IAAMhF,EAAEwE,SAAS,OACtBM,KAAYA,KACZ9E,GAAE2E,OAAOnE,KAAMR,EAAE8L,KAAKhH,EAASiH,GAC/BvL,MAAKwL,gBACLxL,MAAK+E,WAAWzD,MAAMtB,KAAMuB,UAC5BvB,MAAKyL,iBAIP,IAAIC,GAAwB,gBAG5B,IAAIH,IAAe,QAAS,aAAc,KAAM,KAAM,aAAc,YAAa,UAAW,SAG5F/L,GAAE2E,OAAOkH,EAAKrG,UAAWtE,GAGvBiL,QAAS,MAITlM,EAAG,SAASmM,GACV,MAAO5L,MAAK6L,IAAIC,KAAKF,IAKvB7G,WAAY,aAKZgH,OAAQ,WACN,MAAO/L,OAKT4C,OAAQ,WACN5C,KAAK6L,IAAIjJ,QACT5C,MAAKwC,eACL,OAAOxC,OAKTgM,WAAY,SAASC,EAASC,GAC5B,GAAIlM,KAAK6L,IAAK7L,KAAKmM,kBACnBnM,MAAK6L,IAAMI,YAAmBtM,GAASF,EAAIwM,EAAUtM,EAASF,EAAEwM,EAChEjM,MAAKoM,GAAKpM,KAAK6L,IAAI,EACnB,IAAIK,IAAa,MAAOlM,KAAKyL,gBAC7B,OAAOzL,OAkBTyL,eAAgB,SAASxK,GACvB,KAAMA,IAAWA,EAASzB,EAAEoF,OAAO5E,KAAM,YAAa,MAAOA,KAC7DA,MAAKmM,kBACL,KAAK,GAAIhJ,KAAOlC,GAAQ,CACtB,GAAI8C,GAAS9C,EAAOkC,EACpB,KAAK3D,EAAE4L,WAAWrH,GAASA,EAAS/D,KAAKiB,EAAOkC,GAChD,KAAKY,EAAQ,QAEb,IAAIsI,GAAQlJ,EAAIkJ,MAAMX,EACtB,IAAIY,GAAYD,EAAM,GAAIT,EAAWS,EAAM,EAC3CtI,GAASvE,EAAEyE,KAAKF,EAAQ/D,KACxBsM,IAAa,kBAAoBtM,KAAKwE,GACtC,IAAIoH,IAAa,GAAI,CACnB5L,KAAK6L,IAAIlL,GAAG2L,EAAWvI,OAClB,CACL/D,KAAK6L,IAAIlL,GAAG2L,EAAWV,EAAU7H,IAGrC,MAAO/D,OAMTmM,iBAAkB,WAChBnM,KAAK6L,IAAIxK,IAAI,kBAAoBrB,KAAKwE,IACtC,OAAOxE,OAOTwL,eAAgB,WACd,IAAKxL,KAAKoM,GAAI,CACZ,GAAI7H,GAAQ/E,EAAE2E,UAAW3E,EAAEoF,OAAO5E,KAAM,cACxC,IAAIA,KAAK8C,GAAIyB,EAAMzB,GAAKtD,EAAEoF,OAAO5E,KAAM,KACvC,IAAIA,KAAKuM,UAAWhI,EAAM,SAAW/E,EAAEoF,OAAO5E,KAAM,YACpD,IAAI6L,GAAMlM,EAASF,EAAE,IAAMD,EAAEoF,OAAO5E,KAAM,WAAa,KAAKuF,KAAKhB,EACjEvE,MAAKgM,WAAWH,EAAK,WAChB,CACL7L,KAAKgM,WAAWxM,EAAEoF,OAAO5E,KAAM,MAAO,UAwB5CL,GAAS0F,KAAO,SAAStB,EAAQ+C,EAAOxC,GACtC,GAAIkI,GAAOC,EAAU1I,EAGrBvE,GAAEmF,SAASL,IAAYA,OACrB9D,YAAab,EAASa,YACtBC,YAAad,EAASc,aAIxB,IAAIiM,IAAUF,KAAMA,EAAMG,SAAU,OAGpC,KAAKrI,EAAQqD,IAAK,CAChB+E,EAAO/E,IAAMnI,EAAEoF,OAAOkC,EAAO,QAAUe,IAIzC,GAAIvD,EAAQsI,MAAQ,MAAQ9F,IAAU/C,IAAW,UAAYA,IAAW,UAAYA,IAAW,SAAU,CACvG2I,EAAOG,YAAc,kBACrBH,GAAOE,KAAOE,KAAKC,UAAUzI,EAAQC,OAASuC,EAAM3B,OAAOb,IAI7D,GAAIA,EAAQ7D,YAAa,CACvBiM,EAAOG,YAAc,mCACrBH,GAAOE,KAAOF,EAAOE,MAAQ9F,MAAO4F,EAAOE,SAK7C,GAAItI,EAAQ9D,cAAgBgM,IAAS,OAASA,IAAS,UAAYA,IAAS,SAAU,CACpFE,EAAOF,KAAO,MACd,IAAIlI,EAAQ7D,YAAaiM,EAAOE,KAAKI,QAAUR,CAC/C,IAAIS,GAAa3I,EAAQ2I,UACzB3I,GAAQ2I,WAAa,SAAS9F,GAC5BA,EAAI+F,iBAAiB,yBAA0BV,EAC/C,IAAIS,EAAY,MAAOA,GAAW3L,MAAMtB,KAAMuB,YAKlD,GAAImL,EAAOF,OAAS,QAAUlI,EAAQ7D,YAAa,CACjDiM,EAAOS,YAAc,MAMvB,GAAIT,EAAOF,OAAS,SAAWY,EAAY,CACzCV,EAAOvF,IAAM,WACX,MAAO,IAAIkG,eAAc,sBAK7B,GAAIlG,GAAM7C,EAAQ6C,IAAMxH,EAAS2N,KAAK9N,EAAE2E,OAAOuI,EAAQpI,GACvDwC,GAAM5E,QAAQ,UAAW4E,EAAOK,EAAK7C,EACrC,OAAO6C,GAGT,IAAIiG,SACKG,UAAW,eAAiBA,OAAOF,iBACtCE,OAAOC,iBAAkB,GAAKA,iBAAgBC,cAGpD,IAAIhB,IACF5B,OAAU,OACV6C,OAAU,MACVjG,MAAU,QACVkG,SAAU,SACVC,KAAU,MAKZjO,GAAS2N,KAAO,WACd,MAAO3N,GAASF,EAAE6N,KAAKhM,MAAM3B,EAASF,EAAG8B,WAQ3C,IAAIsM,GAASlO,EAASkO,OAAS,SAASvJ,GACtCA,IAAYA,KACZ,IAAIA,EAAQwJ,OAAQ9N,KAAK8N,OAASxJ,EAAQwJ,MAC1C9N,MAAK+N,aACL/N,MAAK+E,WAAWzD,MAAMtB,KAAMuB,WAK9B,IAAIyM,GAAgB,YACpB,IAAIC,GAAgB,cACpB,IAAIC,GAAgB,QACpB,IAAIC,GAAgB,0BAGpB3O,GAAE2E,OAAO0J,EAAO7I,UAAWtE,GAIzBqE,WAAY,aAQZqJ,MAAO,SAASA,EAAOxN,EAAMC,GAC3B,IAAKrB,EAAE6O,SAASD,GAAQA,EAAQpO,KAAKsO,eAAeF,EACpD,IAAI5O,EAAE4L,WAAWxK,GAAO,CACtBC,EAAWD,CACXA,GAAO,GAET,IAAKC,EAAUA,EAAWb,KAAKY,EAC/B,IAAI2N,GAASvO,IACbL,GAAS6O,QAAQJ,MAAMA,EAAO,SAASK,GACrC,GAAItM,GAAOoM,EAAOG,mBAAmBN,EAAOK,EAC5CF,GAAOI,QAAQ9N,EAAUsB,EACzBoM,GAAOrM,QAAQZ,MAAMiN,GAAS,SAAW3N,GAAMwC,OAAOjB,GACtDoM,GAAOrM,QAAQ,QAAStB,EAAMuB,EAC9BxC,GAAS6O,QAAQtM,QAAQ,QAASqM,EAAQ3N,EAAMuB,IAElD,OAAOnC,OAKT2O,QAAS,SAAS9N,EAAUsB,GAC1B,GAAItB,EAAUA,EAASS,MAAMtB,KAAMmC,IAIrCyM,SAAU,SAASH,EAAUnK,GAC3B3E,EAAS6O,QAAQI,SAASH,EAAUnK,EACpC,OAAOtE,OAMT+N,YAAa,WACX,IAAK/N,KAAK8N,OAAQ,MAClB9N,MAAK8N,OAAStO,EAAEoF,OAAO5E,KAAM,SAC7B,IAAIoO,GAAON,EAAStO,EAAEwC,KAAKhC,KAAK8N,OAChC,QAAQM,EAAQN,EAAO1D,QAAU,KAAM,CACrCpK,KAAKoO,MAAMA,EAAOpO,KAAK8N,OAAOM,MAMlCE,eAAgB,SAASF,GACvBA,EAAQA,EAAMtG,QAAQqG,EAAc,QACtBrG,QAAQkG,EAAe,WACvBlG,QAAQmG,EAAY,SAAS5B,EAAOwC,GACnC,MAAOA,GAAWxC,EAAQ,aAE3BvE,QAAQoG,EAAY,WAClC,OAAO,IAAIY,QAAO,IAAMV,EAAQ,yBAMlCM,mBAAoB,SAASN,EAAOK,GAClC,GAAI/B,GAAS0B,EAAMW,KAAKN,GAAUrO,MAAM,EACxC,OAAOZ,GAAEsJ,IAAI4D,EAAQ,SAASsC,EAAOpN,GAEnC,GAAIA,IAAM8K,EAAOzK,OAAS,EAAG,MAAO+M,IAAS,IAC7C,OAAOA,GAAQC,mBAAmBD,GAAS,SAcjD,IAAIE,GAAUvP,EAASuP,QAAU,WAC/BlP,KAAKmP,WACL3P,GAAE4P,QAAQpP,KAAM,WAGhB,UAAWuN,UAAW,YAAa,CACjCvN,KAAKqP,SAAW9B,OAAO8B,QACvBrP,MAAKwO,QAAUjB,OAAOiB,SAK1B,IAAIc,GAAgB,cAGpB,IAAIC,GAAe,YAGnB,IAAIC,GAAa,aAGjB,IAAIC,GAAgB,KAGpB,IAAIC,GAAe,MAGnBR,GAAQS,QAAU,KAGlBnQ,GAAE2E,OAAO+K,EAAQlK,UAAWtE,GAI1BkP,SAAU,GAGVC,OAAQ,WACN,MAAO7P,MAAKqP,SAASS,SAAShI,QAAQ,SAAU,SAAW9H,KAAKZ,MAKlE2Q,QAAS,SAASxC,GAChB,GAAIlB,IAASkB,GAAUvN,MAAMqP,SAASW,KAAK3D,MAAM,SACjD,OAAOA,GAAQA,EAAM,GAAK,IAK5B4D,YAAa,SAASxB,EAAUyB,GAC9B,GAAIzB,GAAY,KAAM,CACpB,GAAIzO,KAAKmQ,gBAAkBnQ,KAAKoQ,kBAAoBF,EAAgB,CAClEzB,EAAW4B,UAAUrQ,KAAKqP,SAASS,SAAW9P,KAAKqP,SAASiB,OAC5D,IAAIlR,GAAOY,KAAKZ,KAAK0I,QAAQ2H,EAAe,GAC5C,KAAKhB,EAAStF,QAAQ/J,GAAOqP,EAAWA,EAASrO,MAAMhB,EAAK6C,YACvD,CACLwM,EAAWzO,KAAK+P,WAGpB,MAAOtB,GAAS3G,QAAQwH,EAAe,KAKzCiB,MAAO,SAASjM,GACd,GAAI4K,EAAQS,QAAS,KAAM,IAAIlF,OAAM,4CACrCyE,GAAQS,QAAU,IAIlB3P,MAAKsE,QAAmB9E,EAAE2E,QAAQ/E,KAAM,KAAMY,KAAKsE,QAASA,EAC5DtE,MAAKZ,KAAmBY,KAAKsE,QAAQlF,IACrCY,MAAKoQ,iBAAmBpQ,KAAKsE,QAAQkM,aAAe,KACpDxQ,MAAKyQ,kBAAqBzQ,KAAKsE,QAAQoM,SACvC1Q,MAAKmQ,iBAAsBnQ,KAAKsE,QAAQoM,WAAa1Q,KAAKwO,SAAWxO,KAAKwO,QAAQkC,UAClF,IAAIjC,GAAoBzO,KAAKiQ,aAC7B,IAAIU,GAAoBC,SAASC,YACjC,IAAIC,GAAqBtB,EAAWT,KAAKgC,UAAUC,UAAUC,kBAAoBN,GAAWA,GAAW,EAGvG3Q,MAAKZ,MAAQ,IAAMY,KAAKZ,KAAO,KAAK0I,QAAQyH,EAAc,IAE1D,IAAIuB,GAAS9Q,KAAKoQ,iBAAkB,CAClC,GAAIc,GAAQvR,EAASF,EAAE,4CACvBO,MAAKmR,OAASD,EAAME,OAAOC,SAAS,QAAQ,GAAGC,aAC/CtR,MAAK4O,SAASH,GAKhB,GAAIzO,KAAKmQ,cAAe,CACtBxQ,EAASF,EAAE8N,QAAQ5M,GAAG,WAAYX,KAAKuR,cAClC,IAAIvR,KAAKoQ,kBAAqB,gBAAkB7C,UAAYuD,EAAO,CACxEnR,EAASF,EAAE8N,QAAQ5M,GAAG,aAAcX,KAAKuR,cACpC,IAAIvR,KAAKoQ,iBAAkB,CAChCpQ,KAAKwR,kBAAoBC,YAAYzR,KAAKuR,SAAUvR,KAAK4P,UAK3D5P,KAAKyO,SAAWA,CAChB,IAAIiD,GAAM1R,KAAKqP,QAIf,IAAIrP,KAAKoQ,kBAAoBpQ,KAAKyQ,gBAAiB,CAIjD,IAAKzQ,KAAKmQ,gBAAkBnQ,KAAK6P,SAAU,CACzC7P,KAAKyO,SAAWzO,KAAKiQ,YAAY,KAAM,KACvCjQ,MAAKqP,SAASvH,QAAQ9H,KAAKZ,KAAO,IAAMY,KAAKyO,SAE7C,OAAO,UAIF,IAAIzO,KAAKmQ,eAAiBnQ,KAAK6P,UAAY6B,EAAIC,KAAM,CAC1D3R,KAAKyO,SAAWzO,KAAK+P,UAAUjI,QAAQwH,EAAe,GACtDtP,MAAKwO,QAAQoD,gBAAiBhB,SAASiB,MAAO7R,KAAKZ,KAAOY,KAAKyO,WAKnE,IAAKzO,KAAKsE,QAAQuB,OAAQ,MAAO7F,MAAK8R,WAKxCC,KAAM,WACJpS,EAASF,EAAE8N,QAAQlM,IAAI,WAAYrB,KAAKuR,UAAUlQ,IAAI,aAAcrB,KAAKuR,SACzE,IAAIvR,KAAKwR,kBAAmBQ,cAAchS,KAAKwR,kBAC/CtC,GAAQS,QAAU,OAKpBvB,MAAO,SAASA,EAAOvN,GACrBb,KAAKmP,SAAS/G,SAASgG,MAAOA,EAAOvN,SAAUA,KAKjD0Q,SAAU,SAASU,GACjB,GAAIjM,GAAUhG,KAAKiQ,aACnB,IAAIjK,IAAYhG,KAAKyO,UAAYzO,KAAKmR,OAAQ,CAC5CnL,EAAUhG,KAAKiQ,YAAYjQ,KAAK+P,QAAQ/P,KAAKmR,SAE/C,GAAInL,IAAYhG,KAAKyO,SAAU,MAAO,MACtC,IAAIzO,KAAKmR,OAAQnR,KAAK4O,SAAS5I,EAC/BhG,MAAK8R,WAMPA,QAAS,SAASrD,GAChBA,EAAWzO,KAAKyO,SAAWzO,KAAKiQ,YAAYxB,EAC5C,OAAOjP,GAAE0S,IAAIlS,KAAKmP,SAAU,SAASgD,GACnC,GAAIA,EAAQ/D,MAAM/K,KAAKoL,GAAW,CAChC0D,EAAQtR,SAAS4N,EACjB,OAAO,UAYbG,SAAU,SAASH,EAAUnK,GAC3B,IAAK4K,EAAQS,QAAS,MAAO,MAC7B,KAAKrL,GAAWA,IAAY,KAAMA,GAAWpC,UAAWoC,EAExD,IAAIqD,GAAM3H,KAAKZ,MAAQqP,EAAWzO,KAAKiQ,YAAYxB,GAAY,IAG/DA,GAAWA,EAAS3G,QAAQ4H,EAAc,GAE1C,IAAI1P,KAAKyO,WAAaA,EAAU,MAChCzO,MAAKyO,SAAWA,CAGhB,IAAIA,IAAa,IAAM9G,IAAQ,IAAKA,EAAMA,EAAIvH,MAAM,GAAI,EAGxD,IAAIJ,KAAKmQ,cAAe,CACtBnQ,KAAKwO,QAAQlK,EAAQwD,QAAU,eAAiB,gBAAiB8I,SAASiB,MAAOlK,OAI5E,IAAI3H,KAAKoQ,iBAAkB,CAChCpQ,KAAKoS,YAAYpS,KAAKqP,SAAUZ,EAAUnK,EAAQwD,QAClD,IAAI9H,KAAKmR,QAAW1C,IAAazO,KAAKiQ,YAAYjQ,KAAK+P,QAAQ/P,KAAKmR,SAAW,CAI7E,IAAI7M,EAAQwD,QAAS9H,KAAKmR,OAAOP,SAASyB,OAAOC,OACjDtS,MAAKoS,YAAYpS,KAAKmR,OAAO9B,SAAUZ,EAAUnK,EAAQwD,cAKtD,CACL,MAAO9H,MAAKqP,SAASkD,OAAO5K,GAE9B,GAAIrD,EAAQpC,QAAS,MAAOlC,MAAK8R,QAAQrD,IAK3C2D,YAAa,SAAS/C,EAAUZ,EAAU3G,GACxC,GAAIA,EAAS,CACX,GAAIkI,GAAOX,EAASW,KAAKlI,QAAQ,qBAAsB,GACvDuH,GAASvH,QAAQkI,EAAO,IAAMvB,OACzB,CAELY,EAASsC,KAAO,IAAMlD,KAO5B9O,GAAS6O,QAAU,GAAIU,EAQvB,IAAI/K,GAAS,SAASqO,EAAYC,GAChC,GAAIC,GAAS1S,IACb,IAAI2S,EAKJ,IAAIH,GAAchT,EAAEiG,IAAI+M,EAAY,eAAgB,CAClDG,EAAQH,EAAWxK,gBACd,CACL2K,EAAQ,WAAY,MAAOD,GAAOpR,MAAMtB,KAAMuB,YAIhD/B,EAAE2E,OAAOwO,EAAOD,EAAQD,EAIxB,IAAIG,GAAY,WAAY5S,KAAKgI,YAAc2K,EAC/CC,GAAU5N,UAAY0N,EAAO1N,SAC7B2N,GAAM3N,UAAY,GAAI4N,EAItB,IAAIJ,EAAYhT,EAAE2E,OAAOwO,EAAM3N,UAAWwN,EAI1CG,GAAME,UAAYH,EAAO1N,SAEzB,OAAO2N,GAITvO,GAAMD,OAASkE,EAAWlE,OAAS0J,EAAO1J,OAASkH,EAAKlH,OAAS+K,EAAQ/K,OAASA,CAGlF,IAAI0D,GAAW,WACb,KAAM,IAAI4C,OAAM,kDAIlB,IAAIxD,GAAY,SAASH,EAAOxC,GAC9B,GAAI4D,GAAQ5D,EAAQ4D,KACpB5D,GAAQ4D,MAAQ,SAASlB,GACvB,GAAIkB,EAAOA,EAAMpB,EAAOE,EAAM1C,EAC9BwC,GAAM5E,QAAQ,QAAS4E,EAAOE,EAAM1C,IAIxC,OAAO3E"}
\ No newline at end of file
+{"version":3,"file":"backbone-min.js","sources":["backbone.js"],"names":["factory","root","self","global","define","amd","_","$","exports","Backbone","require","e","jQuery","Zepto","ender","previousBackbone","slice","VERSION","noConflict","this","emulateHTTP","emulateJSON","addMethod","length","method","attribute","value","iteratee","context","defaultVal","args","call","arguments","unshift","apply","addUnderscoreMethods","Class","methods","each","prototype","Events","eventSplitter","eventsApi","memo","name","callback","opts","i","names","keys","test","split","on","internalOn","obj","listening","_events","onApi","ctx","listeners","_listeners","id","listenTo","_listenId","uniqueId","listeningTo","_listeningTo","thisId","objId","count","events","options","handlers","push","off","offApi","stopListening","ids","isEmpty","remaining","j","handler","_callback","size","once","onceMap","bind","listenToOnce","map","offer","trigger","Math","max","Array","triggerApi","objEvents","cb","allEvents","all","triggerEvents","concat","ev","l","a1","a2","a3","unbind","extend","Model","attributes","attrs","cid","cidPrefix","collection","parse","defaults","result","set","changed","initialize","validationError","idAttribute","toJSON","clone","sync","get","attr","escape","has","matches","key","val","_validate","unset","silent","changes","changing","_changing","_previousAttributes","current","prev","isEqual","_pending","clear","hasChanged","changedAttributes","diff","old","previous","previousAttributes","fetch","model","success","resp","serverAttrs","wrapError","save","validate","wait","isNew","patch","xhr","destroy","defer","url","base","urlError","replace","encodeURIComponent","constructor","isValid","error","modelMethods","values","pairs","invert","pick","omit","chain","Collection","models","comparator","_reset","reset","setOptions","add","remove","merge","addOptions","singular","isArray","removed","_removeModels","_isModel","existing","sort","at","sortable","sortAttr","isString","toAdd","toRemove","modelMap","order","orderChanged","_prepareModel","_addReference","modelId","splice","orderedModels","addOpts","index","_removeReference","previousModels","pop","shift","_byId","where","first","findWhere","Error","sortBy","pluck","invoke","create","callbackOpts","indexOf","_onModelEvent","event","prevId","collectionMethods","forEach","collect","reduce","foldl","inject","reduceRight","foldr","find","detect","filter","select","reject","every","some","any","include","contains","min","toArray","head","take","initial","rest","tail","drop","last","without","difference","shuffle","lastIndexOf","sample","partition","attributeMethods","iterator","isFunction","View","viewOptions","_ensureElement","delegateEventSplitter","tagName","selector","$el","render","_removeElement","setElement","element","undelegateEvents","_setElement","delegateEvents","el","match","delegate","eventName","listener","undelegate","_createElement","document","createElement","className","_setAttributes","type","methodMap","params","dataType","data","contentType","JSON","stringify","_method","beforeSend","setRequestHeader","processData","textStatus","errorThrown","ajax","update","delete","read","Router","routes","_bindRoutes","optionalParam","namedParam","splatParam","escapeRegExp","route","isRegExp","_routeToRegExp","router","history","fragment","_extractParameters","execute","navigate","optional","RegExp","exec","param","decodeURIComponent","History","bindAll","window","location","routeStripper","rootStripper","pathStripper","started","interval","atRoot","path","pathname","getSearch","matchRoot","decodeFragment","decodeURI","href","getHash","getPath","charAt","getFragment","_usePushState","_wantsHashChange","start","hashChange","_hasHashChange","_useHashChange","_wantsPushState","pushState","_hasPushState","iframe","src","style","display","tabIndex","body","iWindow","insertBefore","firstChild","contentWindow","open","close","hash","addEventListener","attachEvent","checkUrl","_checkUrlInterval","setInterval","loadUrl","stop","removeEventListener","detachEvent","removeChild","clearInterval","title","_updateHash","assign","protoProps","staticProps","parent","child","Surrogate","__super__"],"mappings":"CAOC,SAASA,GAIR,GAAIC,SAAeC,OAAQ,UAAYA,KAAKA,MAAQA,MAAQA,YAC1CC,SAAU,UAAYA,OAAOA,QAAUA,QAAUA,MAGnE,UAAWC,UAAW,YAAcA,OAAOC,IAAK,CAC9CD,QAAQ,aAAc,SAAU,WAAY,SAASE,EAAGC,EAAGC,GAGzDP,EAAKQ,SAAWT,EAAQC,EAAMO,EAASF,EAAGC,SAIvC,UAAWC,WAAY,YAAa,CACzC,GAAIF,GAAII,QAAQ,cAAeH,CAC/B,KAAMA,EAAIG,QAAQ,UAAa,MAAMC,IACrCX,EAAQC,EAAMO,QAASF,EAAGC,OAGrB,CACLN,EAAKQ,SAAWT,EAAQC,KAAUA,EAAKK,EAAIL,EAAKW,QAAUX,EAAKY,OAASZ,EAAKa,OAASb,EAAKM,MAG7F,SAASN,EAAMQ,EAAUH,EAAGC,GAO5B,GAAIQ,GAAmBd,EAAKQ,QAG5B,IAAIO,MAAWA,KAGfP,GAASQ,QAAU,OAInBR,GAASF,EAAIA,CAIbE,GAASS,WAAa,WACpBjB,EAAKQ,SAAWM,CAChB,OAAOI,MAMTV,GAASW,YAAc,KAMvBX,GAASY,YAAc,KAIvB,IAAIC,GAAY,SAASC,EAAQC,EAAQC,GACvC,OAAQF,GACN,IAAK,GAAG,MAAO,YACb,MAAOjB,GAAEkB,GAAQL,KAAKM,IAExB,KAAK,GAAG,MAAO,UAASC,GACtB,MAAOpB,GAAEkB,GAAQL,KAAKM,GAAYC,GAEpC,KAAK,GAAG,MAAO,UAASC,EAAUC,GAChC,MAAOtB,GAAEkB,GAAQL,KAAKM,GAAYE,EAAUC,GAE9C,KAAK,GAAG,MAAO,UAASD,EAAUE,EAAYD,GAC5C,MAAOtB,GAAEkB,GAAQL,KAAKM,GAAYE,EAAUE,EAAYD,GAE1D,SAAS,MAAO,YACd,GAAIE,GAAOd,EAAMe,KAAKC,UACtBF,GAAKG,QAAQd,KAAKM,GAClB,OAAOnB,GAAEkB,GAAQU,MAAM5B,EAAGwB,KAIhC,IAAIK,GAAuB,SAASC,EAAOC,EAASZ,GAClDnB,EAAEgC,KAAKD,EAAS,SAASd,EAAQC,GAC/B,GAAIlB,EAAEkB,GAASY,EAAMG,UAAUf,GAAUF,EAAUC,EAAQC,EAAQC,KAiBvE,IAAIe,GAAS/B,EAAS+B,SAGtB,IAAIC,GAAgB,KAOpB,IAAIC,GAAY,SAASf,EAAUgB,EAAMC,EAAMC,EAAUC,GACvD,GAAIC,GAAI,EAAGC,CACX,IAAIJ,SAAeA,KAAS,SAAU,CAEpC,GAAIC,QAAkB,IAAK,WAAaC,IAAQA,EAAKlB,cAAiB,GAAGkB,EAAKlB,QAAUiB,CACxF,KAAKG,EAAQ1C,EAAE2C,KAAKL,GAAOG,EAAIC,EAAMzB,OAASwB,IAAK,CACjDJ,EAAOhB,EAASgB,EAAMK,EAAMD,GAAIH,EAAKI,EAAMD,IAAKD,QAE7C,IAAIF,GAAQH,EAAcS,KAAKN,GAAO,CAE3C,IAAKI,EAAQJ,EAAKO,MAAMV,GAAgBM,EAAIC,EAAMzB,OAAQwB,IAAK,CAC7DJ,EAAOhB,EAASgB,EAAMK,EAAMD,GAAIF,EAAUC,QAEvC,CACLH,EAAOhB,EAASgB,EAAMC,EAAMC,EAAUC,GAExC,MAAOH,GAKTH,GAAOY,GAAK,SAASR,EAAMC,EAAUjB,GACnC,MAAOyB,GAAWlC,KAAMyB,EAAMC,EAAUjB,GAK1C,IAAIyB,GAAa,SAASC,EAAKV,EAAMC,EAAUjB,EAAS2B,GACtDD,EAAIE,QAAUd,EAAUe,EAAOH,EAAIE,YAAeZ,EAAMC,GACpDjB,QAASA,EACT8B,IAAKJ,EACLC,UAAWA,GAGf,IAAIA,EAAW,CACb,GAAII,GAAYL,EAAIM,aAAeN,EAAIM,cACvCD,GAAUJ,EAAUM,IAAMN,EAG5B,MAAOD,GAKTd,GAAOsB,SAAY,SAASR,EAAKV,EAAMC,GACrC,IAAKS,EAAK,MAAOnC,KACjB,IAAI0C,GAAKP,EAAIS,YAAcT,EAAIS,UAAYzD,EAAE0D,SAAS,KACtD,IAAIC,GAAc9C,KAAK+C,eAAiB/C,KAAK+C,gBAC7C,IAAIX,GAAYU,EAAYJ,EAI5B,KAAKN,EAAW,CACd,GAAIY,GAAShD,KAAK4C,YAAc5C,KAAK4C,UAAYzD,EAAE0D,SAAS,KAC5DT,GAAYU,EAAYJ,IAAOP,IAAKA,EAAKc,MAAOP,EAAIA,GAAIM,EAAQF,YAAaA,EAAaI,MAAO,GAInGhB,EAAWC,EAAKV,EAAMC,EAAU1B,KAAMoC,EACtC,OAAOpC,MAIT,IAAIsC,GAAQ,SAASa,EAAQ1B,EAAMC,EAAU0B,GAC3C,GAAI1B,EAAU,CACZ,GAAI2B,GAAWF,EAAO1B,KAAU0B,EAAO1B,MACvC,IAAIhB,GAAU2C,EAAQ3C,QAAS8B,EAAMa,EAAQb,IAAKH,EAAYgB,EAAQhB,SACtE,IAAIA,EAAWA,EAAUc,OAEzBG,GAASC,MAAO5B,SAAUA,EAAUjB,QAASA,EAAS8B,IAAK9B,GAAW8B,EAAKH,UAAWA,IAExF,MAAOe,GAOT9B,GAAOkC,IAAO,SAAS9B,EAAMC,EAAUjB,GACrC,IAAKT,KAAKqC,QAAS,MAAOrC,KAC1BA,MAAKqC,QAAUd,EAAUiC,EAAQxD,KAAKqC,QAASZ,EAAMC,GACjDjB,QAASA,EACT+B,UAAWxC,KAAKyC,YAEpB,OAAOzC,MAKTqB,GAAOoC,cAAiB,SAAStB,EAAKV,EAAMC,GAC1C,GAAIoB,GAAc9C,KAAK+C,YACvB,KAAKD,EAAa,MAAO9C,KAEzB,IAAI0D,GAAMvB,GAAOA,EAAIS,WAAazD,EAAE2C,KAAKgB,EAEzC,KAAK,GAAIlB,GAAI,EAAGA,EAAI8B,EAAItD,OAAQwB,IAAK,CACnC,GAAIQ,GAAYU,EAAYY,EAAI9B,GAIhC,KAAKQ,EAAW,KAEhBA,GAAUD,IAAIoB,IAAI9B,EAAMC,EAAU1B,MAEpC,GAAIb,EAAEwE,QAAQb,GAAc9C,KAAK+C,iBAAoB,EAErD,OAAO/C,MAIT,IAAIwD,GAAS,SAASL,EAAQ1B,EAAMC,EAAU0B,GAE5C,IAAKD,EAAQ,MAEb,IAAIvB,GAAI,EAAGQ,CACX,IAAI3B,GAAU2C,EAAQ3C,QAAS+B,EAAYY,EAAQZ,SAGnD,KAAKf,IAASC,IAAajB,EAAS,CAClC,GAAIiD,GAAMvE,EAAE2C,KAAKU,EACjB,MAAOZ,EAAI8B,EAAItD,OAAQwB,IAAK,CAC1BQ,EAAYI,EAAUkB,EAAI9B,UACnBY,GAAUJ,EAAUM,UACpBN,GAAUU,YAAYV,EAAUa,OAEzC,OAGF,GAAIpB,GAAQJ,GAAQA,GAAQtC,EAAE2C,KAAKqB,EACnC,MAAOvB,EAAIC,EAAMzB,OAAQwB,IAAK,CAC5BH,EAAOI,EAAMD,EACb,IAAIyB,GAAWF,EAAO1B,EAGtB,KAAK4B,EAAU,KAGf,IAAIO,KACJ,KAAK,GAAIC,GAAI,EAAGA,EAAIR,EAASjD,OAAQyD,IAAK,CACxC,GAAIC,GAAUT,EAASQ,EACvB,IACEnC,GAAYA,IAAaoC,EAAQpC,UAC/BA,IAAaoC,EAAQpC,SAASqC,WAC5BtD,GAAWA,IAAYqD,EAAQrD,QACnC,CACAmD,EAAUN,KAAKQ,OACV,CACL1B,EAAY0B,EAAQ1B,SACpB,IAAIA,KAAeA,EAAUc,QAAU,EAAG,OACjCV,GAAUJ,EAAUM,UACpBN,GAAUU,YAAYV,EAAUa,SAM7C,GAAIW,EAAUxD,OAAQ,CACpB+C,EAAO1B,GAAQmC,MACV,OACET,GAAO1B,IAGlB,GAAItC,EAAE6E,KAAKb,GAAS,MAAOA,GAO7B9B,GAAO4C,KAAQ,SAASxC,EAAMC,EAAUjB,GAEtC,GAAI0C,GAAS5B,EAAU2C,KAAazC,EAAMC,EAAUvC,EAAEgF,KAAKnE,KAAKuD,IAAKvD,MACrE,OAAOA,MAAKiC,GAAGkB,MAAa,GAAG1C,GAIjCY,GAAO+C,aAAgB,SAASjC,EAAKV,EAAMC,GAEzC,GAAIyB,GAAS5B,EAAU2C,KAAazC,EAAMC,EAAUvC,EAAEgF,KAAKnE,KAAKyD,cAAezD,KAAMmC,GACrF,OAAOnC,MAAK2C,SAASR,EAAKgB,GAK5B,IAAIe,GAAU,SAASG,EAAK5C,EAAMC,EAAU4C,GAC1C,GAAI5C,EAAU,CACZ,GAAIuC,GAAOI,EAAI5C,GAAQtC,EAAE8E,KAAK,WAC5BK,EAAM7C,EAAMwC,EACZvC,GAASX,MAAMf,KAAMa,YAEvBoD,GAAKF,UAAYrC,EAEnB,MAAO2C,GAOThD,GAAOkD,QAAW,SAAS9C,GACzB,IAAKzB,KAAKqC,QAAS,MAAOrC,KAE1B,IAAII,GAASoE,KAAKC,IAAI,EAAG5D,UAAUT,OAAS,EAC5C,IAAIO,GAAO+D,MAAMtE,EACjB,KAAK,GAAIwB,GAAI,EAAGA,EAAIxB,EAAQwB,IAAKjB,EAAKiB,GAAKf,UAAUe,EAAI,EAEzDL,GAAUoD,EAAY3E,KAAKqC,QAASZ,MAAW,GAAGd,EAClD,OAAOX,MAIT,IAAI2E,GAAa,SAASC,EAAWnD,EAAMoD,EAAIlE,GAC7C,GAAIiE,EAAW,CACb,GAAIzB,GAASyB,EAAUnD,EACvB,IAAIqD,GAAYF,EAAUG,GAC1B,IAAI5B,GAAU2B,EAAWA,EAAYA,EAAUjF,OAC/C,IAAIsD,EAAQ6B,EAAc7B,EAAQxC,EAClC,IAAImE,EAAWE,EAAcF,GAAYrD,GAAMwD,OAAOtE,IAExD,MAAOiE,GAMT,IAAII,GAAgB,SAAS7B,EAAQxC,GACnC,GAAIuE,GAAItD,GAAK,EAAGuD,EAAIhC,EAAO/C,OAAQgF,EAAKzE,EAAK,GAAI0E,EAAK1E,EAAK,GAAI2E,EAAK3E,EAAK,EACzE,QAAQA,EAAKP,QACX,IAAK,GAAG,QAASwB,EAAIuD,GAAID,EAAK/B,EAAOvB,IAAIF,SAASd,KAAKsE,EAAG3C,IAAM,OAChE,KAAK,GAAG,QAASX,EAAIuD,GAAID,EAAK/B,EAAOvB,IAAIF,SAASd,KAAKsE,EAAG3C,IAAK6C,EAAK,OACpE,KAAK,GAAG,QAASxD,EAAIuD,GAAID,EAAK/B,EAAOvB,IAAIF,SAASd,KAAKsE,EAAG3C,IAAK6C,EAAIC,EAAK,OACxE,KAAK,GAAG,QAASzD,EAAIuD,GAAID,EAAK/B,EAAOvB,IAAIF,SAASd,KAAKsE,EAAG3C,IAAK6C,EAAIC,EAAIC,EAAK,OAC5E,SAAS,QAAS1D,EAAIuD,GAAID,EAAK/B,EAAOvB,IAAIF,SAASX,MAAMmE,EAAG3C,IAAK5B,EAAO,SAK5EU,GAAO8C,KAAS9C,EAAOY,EACvBZ,GAAOkE,OAASlE,EAAOkC,GAIvBpE,GAAEqG,OAAOlG,EAAU+B,EAYnB,IAAIoE,GAAQnG,EAASmG,MAAQ,SAASC,EAAYtC,GAChD,GAAIuC,GAAQD,KACZtC,KAAYA,KACZpD,MAAK4F,IAAMzG,EAAE0D,SAAS7C,KAAK6F,UAC3B7F,MAAK0F,aACL,IAAItC,EAAQ0C,WAAY9F,KAAK8F,WAAa1C,EAAQ0C,UAClD,IAAI1C,EAAQ2C,MAAOJ,EAAQ3F,KAAK+F,MAAMJ,EAAOvC,MAC7CuC,GAAQxG,EAAE6G,YAAaL,EAAOxG,EAAE8G,OAAOjG,KAAM,YAC7CA,MAAKkG,IAAIP,EAAOvC,EAChBpD,MAAKmG,UACLnG,MAAKoG,WAAWrF,MAAMf,KAAMa,WAI9B1B,GAAEqG,OAAOC,EAAMrE,UAAWC,GAGxB8E,QAAS,KAGTE,gBAAiB,KAIjBC,YAAa,KAIbT,UAAW,IAIXO,WAAY,aAGZG,OAAQ,SAASnD,GACf,MAAOjE,GAAEqH,MAAMxG,KAAK0F,aAKtBe,KAAM,WACJ,MAAOnH,GAASmH,KAAK1F,MAAMf,KAAMa,YAInC6F,IAAK,SAASC,GACZ,MAAO3G,MAAK0F,WAAWiB,IAIzBC,OAAQ,SAASD,GACf,MAAOxH,GAAEyH,OAAO5G,KAAK0G,IAAIC,KAK3BE,IAAK,SAASF,GACZ,MAAO3G,MAAK0G,IAAIC,IAAS,MAI3BG,QAAS,SAASnB,GAChB,QAASxG,EAAEqB,SAASmF,EAAO3F,MAAMA,KAAK0F,aAMxCQ,IAAK,SAASa,EAAKC,EAAK5D,GACtB,GAAI2D,GAAO,KAAM,MAAO/G,KAGxB,IAAI2F,EACJ,UAAWoB,KAAQ,SAAU,CAC3BpB,EAAQoB,CACR3D,GAAU4D,MACL,EACJrB,MAAYoB,GAAOC,EAGtB5D,IAAYA,KAGZ,KAAKpD,KAAKiH,UAAUtB,EAAOvC,GAAU,MAAO,MAG5C,IAAI8D,GAAa9D,EAAQ8D,KACzB,IAAIC,GAAa/D,EAAQ+D,MACzB,IAAIC,KACJ,IAAIC,GAAarH,KAAKsH,SACtBtH,MAAKsH,UAAY,IAEjB,KAAKD,EAAU,CACbrH,KAAKuH,oBAAsBpI,EAAEqH,MAAMxG,KAAK0F,WACxC1F,MAAKmG,WAGP,GAAIqB,GAAUxH,KAAK0F,UACnB,IAAIS,GAAUnG,KAAKmG,OACnB,IAAIsB,GAAUzH,KAAKuH,mBAGnB,IAAIvH,KAAKsG,cAAeX,GAAO3F,KAAK0C,GAAKiD,EAAM3F,KAAKsG,YAGpD,KAAK,GAAIK,KAAQhB,GAAO,CACtBqB,EAAMrB,EAAMgB,EACZ,KAAKxH,EAAEuI,QAAQF,EAAQb,GAAOK,GAAMI,EAAQ9D,KAAKqD,EACjD,KAAKxH,EAAEuI,QAAQD,EAAKd,GAAOK,GAAM,CAC/Bb,EAAQQ,GAAQK,MACX,OACEb,GAAQQ,GAEjBO,QAAeM,GAAQb,GAAQa,EAAQb,GAAQK,EAIjD,IAAKG,EAAQ,CACX,GAAIC,EAAQhH,OAAQJ,KAAK2H,SAAWvE,CACpC,KAAK,GAAIxB,GAAI,EAAGA,EAAIwF,EAAQhH,OAAQwB,IAAK,CACvC5B,KAAKuE,QAAQ,UAAY6C,EAAQxF,GAAI5B,KAAMwH,EAAQJ,EAAQxF,IAAKwB,IAMpE,GAAIiE,EAAU,MAAOrH,KACrB,KAAKmH,EAAQ,CACX,MAAOnH,KAAK2H,SAAU,CACpBvE,EAAUpD,KAAK2H,QACf3H,MAAK2H,SAAW,KAChB3H,MAAKuE,QAAQ,SAAUvE,KAAMoD,IAGjCpD,KAAK2H,SAAW,KAChB3H,MAAKsH,UAAY,KACjB,OAAOtH,OAKTkH,MAAO,SAASP,EAAMvD,GACpB,MAAOpD,MAAKkG,IAAIS,MAAW,GAAGxH,EAAEqG,UAAWpC,GAAU8D,MAAO,SAI9DU,MAAO,SAASxE,GACd,GAAIuC,KACJ,KAAK,GAAIoB,KAAO/G,MAAK0F,WAAYC,EAAMoB,OAAY,EACnD,OAAO/G,MAAKkG,IAAIP,EAAOxG,EAAEqG,UAAWpC,GAAU8D,MAAO,SAKvDW,WAAY,SAASlB,GACnB,GAAIA,GAAQ,KAAM,OAAQxH,EAAEwE,QAAQ3D,KAAKmG,QACzC,OAAOhH,GAAE0H,IAAI7G,KAAKmG,QAASQ,IAS7BmB,kBAAmB,SAASC,GAC1B,IAAKA,EAAM,MAAO/H,MAAK6H,aAAe1I,EAAEqH,MAAMxG,KAAKmG,SAAW,KAC9D,IAAI6B,GAAMhI,KAAKsH,UAAYtH,KAAKuH,oBAAsBvH,KAAK0F,UAC3D,IAAIS,KACJ,KAAK,GAAIQ,KAAQoB,GAAM,CACrB,GAAIf,GAAMe,EAAKpB,EACf,IAAIxH,EAAEuI,QAAQM,EAAIrB,GAAOK,GAAM,QAC/Bb,GAAQQ,GAAQK,EAElB,MAAO7H,GAAE6E,KAAKmC,GAAWA,EAAU,OAKrC8B,SAAU,SAAStB,GACjB,GAAIA,GAAQ,OAAS3G,KAAKuH,oBAAqB,MAAO,KACtD,OAAOvH,MAAKuH,oBAAoBZ,IAKlCuB,mBAAoB,WAClB,MAAO/I,GAAEqH,MAAMxG,KAAKuH,sBAKtBY,MAAO,SAAS/E,GACdA,EAAUjE,EAAEqG,QAAQO,MAAO,MAAO3C,EAClC,IAAIgF,GAAQpI,IACZ,IAAIqI,GAAUjF,EAAQiF,OACtBjF,GAAQiF,QAAU,SAASC,GACzB,GAAIC,GAAcnF,EAAQ2C,MAAQqC,EAAMrC,MAAMuC,EAAMlF,GAAWkF,CAC/D,KAAKF,EAAMlC,IAAIqC,EAAanF,GAAU,MAAO,MAC7C,IAAIiF,EAASA,EAAQzH,KAAKwC,EAAQ3C,QAAS2H,EAAOE,EAAMlF,EACxDgF,GAAM7D,QAAQ,OAAQ6D,EAAOE,EAAMlF,GAErCoF,GAAUxI,KAAMoD,EAChB,OAAOpD,MAAKyG,KAAK,OAAQzG,KAAMoD,IAMjCqF,KAAM,SAAS1B,EAAKC,EAAK5D,GAEvB,GAAIuC,EACJ,IAAIoB,GAAO,YAAeA,KAAQ,SAAU,CAC1CpB,EAAQoB,CACR3D,GAAU4D,MACL,EACJrB,MAAYoB,GAAOC,EAGtB5D,EAAUjE,EAAEqG,QAAQkD,SAAU,KAAM3C,MAAO,MAAO3C,EAClD,IAAIuF,GAAOvF,EAAQuF,IAKnB,IAAIhD,IAAUgD,EAAM,CAClB,IAAK3I,KAAKkG,IAAIP,EAAOvC,GAAU,MAAO,WACjC,CACL,IAAKpD,KAAKiH,UAAUtB,EAAOvC,GAAU,MAAO,OAK9C,GAAIgF,GAAQpI,IACZ,IAAIqI,GAAUjF,EAAQiF,OACtB,IAAI3C,GAAa1F,KAAK0F,UACtBtC,GAAQiF,QAAU,SAASC,GAEzBF,EAAM1C,WAAaA,CACnB,IAAI6C,GAAcnF,EAAQ2C,MAAQqC,EAAMrC,MAAMuC,EAAMlF,GAAWkF,CAC/D,IAAIK,EAAMJ,EAAcpJ,EAAEqG,UAAWG,EAAO4C,EAC5C,IAAIA,IAAgBH,EAAMlC,IAAIqC,EAAanF,GAAU,MAAO,MAC5D,IAAIiF,EAASA,EAAQzH,KAAKwC,EAAQ3C,QAAS2H,EAAOE,EAAMlF,EACxDgF,GAAM7D,QAAQ,OAAQ6D,EAAOE,EAAMlF,GAErCoF,GAAUxI,KAAMoD,EAGhB,IAAIuC,GAASgD,EAAM3I,KAAK0F,WAAavG,EAAEqG,UAAWE,EAAYC,EAE9D,IAAItF,GAASL,KAAK4I,QAAU,SAAYxF,EAAQyF,MAAQ,QAAU,QAClE,IAAIxI,IAAW,UAAY+C,EAAQuC,MAAOvC,EAAQuC,MAAQA,CAC1D,IAAImD,GAAM9I,KAAKyG,KAAKpG,EAAQL,KAAMoD,EAGlCpD,MAAK0F,WAAaA,CAElB,OAAOoD,IAMTC,QAAS,SAAS3F,GAChBA,EAAUA,EAAUjE,EAAEqH,MAAMpD,KAC5B,IAAIgF,GAAQpI,IACZ,IAAIqI,GAAUjF,EAAQiF,OACtB,IAAIM,GAAOvF,EAAQuF,IAEnB,IAAII,GAAU,WACZX,EAAM3E,eACN2E,GAAM7D,QAAQ,UAAW6D,EAAOA,EAAMtC,WAAY1C,GAGpDA,GAAQiF,QAAU,SAASC,GACzB,GAAIK,EAAMI,GACV,IAAIV,EAASA,EAAQzH,KAAKwC,EAAQ3C,QAAS2H,EAAOE,EAAMlF,EACxD,KAAKgF,EAAMQ,QAASR,EAAM7D,QAAQ,OAAQ6D,EAAOE,EAAMlF,GAGzD,IAAI0F,GAAM,KACV,IAAI9I,KAAK4I,QAAS,CAChBzJ,EAAE6J,MAAM5F,EAAQiF,aACX,CACLG,EAAUxI,KAAMoD,EAChB0F,GAAM9I,KAAKyG,KAAK,SAAUzG,KAAMoD,GAElC,IAAKuF,EAAMI,GACX,OAAOD,IAMTG,IAAK,WACH,GAAIC,GACF/J,EAAE8G,OAAOjG,KAAM,YACfb,EAAE8G,OAAOjG,KAAK8F,WAAY,QAC1BqD,GACF,IAAInJ,KAAK4I,QAAS,MAAOM,EACzB,IAAIxG,GAAK1C,KAAK0G,IAAI1G,KAAKsG,YACvB,OAAO4C,GAAKE,QAAQ,SAAU,OAASC,mBAAmB3G,IAK5DqD,MAAO,SAASuC,EAAMlF,GACpB,MAAOkF,IAIT9B,MAAO,WACL,MAAO,IAAIxG,MAAKsJ,YAAYtJ,KAAK0F,aAInCkD,MAAO,WACL,OAAQ5I,KAAK6G,IAAI7G,KAAKsG,cAIxBiD,QAAS,SAASnG,GAChB,MAAOpD,MAAKiH,aAAc9H,EAAE6G,UAAU0C,SAAU,MAAOtF,KAKzD6D,UAAW,SAAStB,EAAOvC,GACzB,IAAKA,EAAQsF,WAAa1I,KAAK0I,SAAU,MAAO,KAChD/C,GAAQxG,EAAEqG,UAAWxF,KAAK0F,WAAYC,EACtC,IAAI6D,GAAQxJ,KAAKqG,gBAAkBrG,KAAK0I,SAAS/C,EAAOvC,IAAY,IACpE,KAAKoG,EAAO,MAAO,KACnBxJ,MAAKuE,QAAQ,UAAWvE,KAAMwJ,EAAOrK,EAAEqG,OAAOpC,GAAUiD,gBAAiBmD,IACzE,OAAO,SAMX,IAAIC,IAAiB3H,KAAM,EAAG4H,OAAQ,EAAGC,MAAO,EAAGC,OAAQ,EAAGC,KAAM,EAChEC,KAAM,EAAGC,MAAO,EAAGpG,QAAS,EAGhC3C,GAAqByE,EAAOgE,EAAc,aAe1C,IAAIO,GAAa1K,EAAS0K,WAAa,SAASC,EAAQ7G,GACtDA,IAAYA,KACZ,IAAIA,EAAQgF,MAAOpI,KAAKoI,MAAQhF,EAAQgF,KACxC,IAAIhF,EAAQ8G,iBAAoB,GAAGlK,KAAKkK,WAAa9G,EAAQ8G,UAC7DlK,MAAKmK,QACLnK,MAAKoG,WAAWrF,MAAMf,KAAMa,UAC5B,IAAIoJ,EAAQjK,KAAKoK,MAAMH,EAAQ9K,EAAEqG,QAAQ2B,OAAQ,MAAO/D,IAI1D,IAAIiH,IAAcC,IAAK,KAAMC,OAAQ,KAAMC,MAAO,KAClD,IAAIC,IAAcH,IAAK,KAAMC,OAAQ,MAGrCpL,GAAEqG,OAAOwE,EAAW5I,UAAWC,GAI7B+G,MAAO3C,EAIPW,WAAY,aAIZG,OAAQ,SAASnD,GACf,MAAOpD,MAAKqE,IAAI,SAAS+D,GAAS,MAAOA,GAAM7B,OAAOnD,MAIxDqD,KAAM,WACJ,MAAOnH,GAASmH,KAAK1F,MAAMf,KAAMa,YAInCyJ,IAAK,SAASL,EAAQ7G,GACpB,MAAOpD,MAAKkG,IAAI+D,EAAQ9K,EAAEqG,QAAQgF,MAAO,OAAQpH,EAASqH,KAI5DF,OAAQ,SAASN,EAAQ7G,GACvBA,EAAUjE,EAAEqG,UAAWpC,EACvB,IAAIsH,IAAYvL,EAAEwL,QAAQV,EAC1BA,GAASS,GAAYT,GAAU9K,EAAEqH,MAAMyD,EACvC,IAAIW,GAAU5K,KAAK6K,cAAcZ,EAAQ7G,EACzC,KAAKA,EAAQ+D,QAAUyD,EAAS5K,KAAKuE,QAAQ,SAAUvE,KAAMoD,EAC7D,OAAOsH,GAAWE,EAAQ,GAAKA,GAOjC1E,IAAK,SAAS+D,EAAQ7G,GACpBA,EAAUjE,EAAE6G,YAAa5C,EAASiH,EAClC,IAAIjH,EAAQ2C,QAAU/F,KAAK8K,SAASb,GAASA,EAASjK,KAAK+F,MAAMkE,EAAQ7G,EACzE,IAAIsH,IAAYvL,EAAEwL,QAAQV,EAC1BA,GAASS,EAAYT,GAAUA,MAAgBA,EAAOpK,OACtD,IAAI6C,GAAI0F,EAAOzC,EAAOoF,EAAUC,CAChC,IAAIC,GAAK7H,EAAQ6H,EACjB,IAAIA,GAAM,KAAMA,GAAMA,CACtB,IAAIA,EAAK,EAAGA,GAAMjL,KAAKI,OAAS,CAChC,IAAI8K,GAAWlL,KAAKkK,YAAee,GAAM,MAAS7H,EAAQ4H,OAAS,KACnE,IAAIG,GAAWhM,EAAEiM,SAASpL,KAAKkK,YAAclK,KAAKkK,WAAa,IAC/D,IAAImB,MAAYC,KAAeC,IAC/B,IAAIjB,GAAMlH,EAAQkH,IAAKE,EAAQpH,EAAQoH,MAAOD,EAASnH,EAAQmH,MAC/D,IAAIiB,IAASN,GAAYZ,GAAOC,KAAc,KAC9C,IAAIkB,GAAe,KAInB,KAAK,GAAI7J,GAAI,EAAGA,EAAIqI,EAAO7J,OAAQwB,IAAK,CACtC+D,EAAQsE,EAAOrI,EAIf,IAAImJ,EAAW/K,KAAK0G,IAAIf,GAAQ,CAC9B,GAAI4E,EAAQgB,EAASR,EAASnF,KAAO,IACrC,IAAI4E,GAAS7E,IAAUoF,EAAU,CAC/BpF,EAAQ3F,KAAK8K,SAASnF,GAASA,EAAMD,WAAaC,CAClD,IAAIvC,EAAQ2C,MAAOJ,EAAQoF,EAAShF,MAAMJ,EAAOvC,EACjD2H,GAAS7E,IAAIP,EAAOvC,EACpB,IAAI8H,IAAaF,GAAQD,EAASlD,WAAWsD,GAAWH,EAAO,KAEjEf,EAAOrI,GAAKmJ,MAGP,IAAIT,EAAK,CACdlC,EAAQ6B,EAAOrI,GAAK5B,KAAK0L,cAAc/F,EAAOvC,EAC9C,KAAKgF,EAAO,QACZiD,GAAM/H,KAAK8E,EACXpI,MAAK2L,cAAcvD,EAAOhF,GAI5BgF,EAAQ2C,GAAY3C,CACpB,KAAKA,EAAO,QACZ1F,GAAK1C,KAAK4L,QAAQxD,EAAM1C,WACxB,IAAI8F,IAAUpD,EAAMQ,UAAY2C,EAAS7I,IAAM,CAC7C8I,EAAMlI,KAAK8E,EAGXqD,GAAeA,IAAiBzL,KAAKiK,OAAOrI,IAAMwG,EAAMxC,MAAQ5F,KAAKiK,OAAOrI,GAAGgE,IAGjF2F,EAAS7I,GAAM,KAIjB,GAAI6H,EAAQ,CACV,IAAK,GAAI3I,GAAI,EAAGA,EAAI5B,KAAKI,OAAQwB,IAAK,CACpC,IAAK2J,GAAUnD,EAAQpI,KAAKiK,OAAOrI,IAAIgE,KAAM0F,EAAShI,KAAK8E,GAE7D,GAAIkD,EAASlL,OAAQJ,KAAK6K,cAAcS,EAAUlI,GAIpD,GAAIiI,EAAMjL,QAAUqL,EAAc,CAChC,GAAIP,EAAUF,EAAO,IACrBhL,MAAKI,QAAUiL,EAAMjL,MACrB,IAAI6K,GAAM,KAAM,CACd,IAAK,GAAIrJ,GAAI,EAAGA,EAAIyJ,EAAMjL,OAAQwB,IAAK,CACrC5B,KAAKiK,OAAO4B,OAAOZ,EAAKrJ,EAAG,EAAGyJ,EAAMzJ,SAEjC,CACL,GAAI4J,EAAOxL,KAAKiK,OAAO7J,OAAS,CAChC,IAAI0L,GAAgBN,GAASH,CAC7B,KAAK,GAAIzJ,GAAI,EAAGA,EAAIkK,EAAc1L,OAAQwB,IAAK,CAC7C5B,KAAKiK,OAAO3G,KAAKwI,EAAclK,MAMrC,GAAIoJ,EAAMhL,KAAKgL,MAAM7D,OAAQ,MAG7B,KAAK/D,EAAQ+D,OAAQ,CACnB,GAAI4E,GAAUd,GAAM,KAAO9L,EAAEqH,MAAMpD,GAAWA,CAC9C,KAAK,GAAIxB,GAAI,EAAGA,EAAIyJ,EAAMjL,OAAQwB,IAAK,CACrC,GAAIqJ,GAAM,KAAMc,EAAQC,MAAQf,EAAKrJ,GACpCwG,EAAQiD,EAAMzJ,IAAI2C,QAAQ,MAAO6D,EAAOpI,KAAM+L,GAEjD,GAAIf,GAAQS,EAAczL,KAAKuE,QAAQ,OAAQvE,KAAMoD,EACrD,IAAIiI,EAAMjL,QAAUkL,EAASlL,OAAQJ,KAAKuE,QAAQ,SAAUvE,KAAMoD,GAIpE,MAAOsH,GAAWT,EAAO,GAAKA,GAOhCG,MAAO,SAASH,EAAQ7G,GACtBA,EAAUA,EAAUjE,EAAEqH,MAAMpD,KAC5B,KAAK,GAAIxB,GAAI,EAAGA,EAAI5B,KAAKiK,OAAO7J,OAAQwB,IAAK,CAC3C5B,KAAKiM,iBAAiBjM,KAAKiK,OAAOrI,GAAIwB,GAExCA,EAAQ8I,eAAiBlM,KAAKiK,MAC9BjK,MAAKmK,QACLF,GAASjK,KAAKsK,IAAIL,EAAQ9K,EAAEqG,QAAQ2B,OAAQ,MAAO/D,GACnD,KAAKA,EAAQ+D,OAAQnH,KAAKuE,QAAQ,QAASvE,KAAMoD,EACjD,OAAO6G,IAIT3G,KAAM,SAAS8E,EAAOhF,GACpB,MAAOpD,MAAKsK,IAAIlC,EAAOjJ,EAAEqG,QAAQyF,GAAIjL,KAAKI,QAASgD,KAIrD+I,IAAK,SAAS/I,GACZ,GAAIgF,GAAQpI,KAAKiL,GAAGjL,KAAKI,OAAS,EAClC,OAAOJ,MAAKuK,OAAOnC,EAAOhF,IAI5BtC,QAAS,SAASsH,EAAOhF,GACvB,MAAOpD,MAAKsK,IAAIlC,EAAOjJ,EAAEqG,QAAQyF,GAAI,GAAI7H,KAI3CgJ,MAAO,SAAShJ,GACd,GAAIgF,GAAQpI,KAAKiL,GAAG,EACpB,OAAOjL,MAAKuK,OAAOnC,EAAOhF,IAI5BvD,MAAO,WACL,MAAOA,GAAMkB,MAAMf,KAAKiK,OAAQpJ,YAIlC6F,IAAK,SAASvE,GACZ,GAAIA,GAAO,KAAM,WAAY,EAC7B,IAAIO,GAAK1C,KAAK4L,QAAQ5L,KAAK8K,SAAS3I,GAAOA,EAAIuD,WAAavD,EAC5D,OAAOnC,MAAKqM,MAAMlK,IAAQnC,KAAKqM,MAAM3J,IAAO1C,KAAKqM,MAAMlK,EAAIyD,MAI7DqF,GAAI,SAASe,GACX,GAAIA,EAAQ,EAAGA,GAAShM,KAAKI,MAC7B,OAAOJ,MAAKiK,OAAO+B,IAKrBM,MAAO,SAAS3G,EAAO4G,GACrB,GAAIzF,GAAU3H,EAAE2H,QAAQnB,EACxB,OAAO3F,MAAKuM,EAAQ,OAAS,UAAU,SAASnE,GAC9C,MAAOtB,GAAQsB,EAAM1C,eAMzB8G,UAAW,SAAS7G,GAClB,MAAO3F,MAAKsM,MAAM3G,EAAO,OAM3BqF,KAAM,SAAS5H,GACb,IAAKpD,KAAKkK,WAAY,KAAM,IAAIuC,OAAM,yCACtCrJ,KAAYA,KAGZ,IAAIjE,EAAEiM,SAASpL,KAAKkK,aAAelK,KAAKkK,WAAW9J,SAAW,EAAG,CAC/DJ,KAAKiK,OAASjK,KAAK0M,OAAO1M,KAAKkK,WAAYlK,UACtC,CACLA,KAAKiK,OAAOe,KAAK7L,EAAEgF,KAAKnE,KAAKkK,WAAYlK,OAG3C,IAAKoD,EAAQ+D,OAAQnH,KAAKuE,QAAQ,OAAQvE,KAAMoD,EAChD,OAAOpD,OAIT2M,MAAO,SAAShG,GACd,MAAOxH,GAAEyN,OAAO5M,KAAKiK,OAAQ,MAAOtD,IAMtCwB,MAAO,SAAS/E,GACdA,EAAUjE,EAAEqG,QAAQO,MAAO,MAAO3C,EAClC,IAAIiF,GAAUjF,EAAQiF,OACtB,IAAIvC,GAAa9F,IACjBoD,GAAQiF,QAAU,SAASC,GACzB,GAAIjI,GAAS+C,EAAQgH,MAAQ,QAAU,KACvCtE,GAAWzF,GAAQiI,EAAMlF,EACzB,IAAIiF,EAASA,EAAQzH,KAAKwC,EAAQ3C,QAASqF,EAAYwC,EAAMlF,EAC7D0C,GAAWvB,QAAQ,OAAQuB,EAAYwC,EAAMlF,GAE/CoF,GAAUxI,KAAMoD,EAChB,OAAOpD,MAAKyG,KAAK,OAAQzG,KAAMoD,IAMjCyJ,OAAQ,SAASzE,EAAOhF,GACtBA,EAAUA,EAAUjE,EAAEqH,MAAMpD,KAC5B,IAAIuF,GAAOvF,EAAQuF,IACnBP,GAAQpI,KAAK0L,cAActD,EAAOhF,EAClC,KAAKgF,EAAO,MAAO,MACnB,KAAKO,EAAM3I,KAAKsK,IAAIlC,EAAOhF,EAC3B,IAAI0C,GAAa9F,IACjB,IAAIqI,GAAUjF,EAAQiF,OACtBjF,GAAQiF,QAAU,SAASD,EAAOE,EAAMwE,GACtC,GAAInE,EAAM7C,EAAWwE,IAAIlC,EAAO0E,EAChC,IAAIzE,EAASA,EAAQzH,KAAKkM,EAAarM,QAAS2H,EAAOE,EAAMwE,GAE/D1E,GAAMK,KAAK,KAAMrF,EACjB,OAAOgF,IAKTrC,MAAO,SAASuC,EAAMlF,GACpB,MAAOkF,IAIT9B,MAAO,WACL,MAAO,IAAIxG,MAAKsJ,YAAYtJ,KAAKiK,QAC/B7B,MAAOpI,KAAKoI,MACZ8B,WAAYlK,KAAKkK,cAKrB0B,QAAS,SAAUjG,GACjB,MAAOA,GAAM3F,KAAKoI,MAAMhH,UAAUkF,aAAe,OAKnD6D,OAAQ,WACNnK,KAAKI,OAAS,CACdJ,MAAKiK,SACLjK,MAAKqM,UAKPX,cAAe,SAAS/F,EAAOvC,GAC7B,GAAIpD,KAAK8K,SAASnF,GAAQ,CACxB,IAAKA,EAAMG,WAAYH,EAAMG,WAAa9F,IAC1C,OAAO2F,GAETvC,EAAUA,EAAUjE,EAAEqH,MAAMpD,KAC5BA,GAAQ0C,WAAa9F,IACrB,IAAIoI,GAAQ,GAAIpI,MAAKoI,MAAMzC,EAAOvC,EAClC,KAAKgF,EAAM/B,gBAAiB,MAAO+B,EACnCpI,MAAKuE,QAAQ,UAAWvE,KAAMoI,EAAM/B,gBAAiBjD,EACrD,OAAO,QAKTyH,cAAe,SAASZ,EAAQ7G,GAC9B,GAAIwH,KACJ,KAAK,GAAIhJ,GAAI,EAAGA,EAAIqI,EAAO7J,OAAQwB,IAAK,CACtC,GAAIwG,GAAQpI,KAAK0G,IAAIuD,EAAOrI,GAC5B,KAAKwG,EAAO,QAEZ,IAAI4D,GAAQhM,KAAK+M,QAAQ3E,EACzBpI,MAAKiK,OAAO4B,OAAOG,EAAO,EAC1BhM,MAAKI,QAEL,KAAKgD,EAAQ+D,OAAQ,CACnB/D,EAAQ4I,MAAQA,CAChB5D,GAAM7D,QAAQ,SAAU6D,EAAOpI,KAAMoD,GAGvCwH,EAAQtH,KAAK8E,EACbpI,MAAKiM,iBAAiB7D,EAAOhF,GAE/B,MAAOwH,GAAQxK,OAASwK,EAAU,OAKpCE,SAAU,SAAU1C,GAClB,MAAOA,aAAiB3C,IAI1BkG,cAAe,SAASvD,EAAOhF,GAC7BpD,KAAKqM,MAAMjE,EAAMxC,KAAOwC,CACxB,IAAI1F,GAAK1C,KAAK4L,QAAQxD,EAAM1C,WAC5B,IAAIhD,GAAM,KAAM1C,KAAKqM,MAAM3J,GAAM0F,CACjCA,GAAMnG,GAAG,MAAOjC,KAAKgN,cAAehN,OAItCiM,iBAAkB,SAAS7D,EAAOhF,SACzBpD,MAAKqM,MAAMjE,EAAMxC,IACxB,IAAIlD,GAAK1C,KAAK4L,QAAQxD,EAAM1C,WAC5B,IAAIhD,GAAM,WAAa1C,MAAKqM,MAAM3J,EAClC,IAAI1C,OAASoI,EAAMtC,iBAAmBsC,GAAMtC,UAC5CsC,GAAM7E,IAAI,MAAOvD,KAAKgN,cAAehN,OAOvCgN,cAAe,SAASC,EAAO7E,EAAOtC,EAAY1C,GAChD,IAAK6J,IAAU,OAASA,IAAU,WAAanH,IAAe9F,KAAM,MACpE,IAAIiN,IAAU,UAAWjN,KAAKuK,OAAOnC,EAAOhF,EAC5C,IAAI6J,IAAU,SAAU,CACtB,GAAIC,GAASlN,KAAK4L,QAAQxD,EAAMF,qBAChC,IAAIxF,GAAK1C,KAAK4L,QAAQxD,EAAM1C,WAC5B,IAAIwH,IAAWxK,EAAI,CACjB,GAAIwK,GAAU,WAAalN,MAAKqM,MAAMa,EACtC,IAAIxK,GAAM,KAAM1C,KAAKqM,MAAM3J,GAAM0F,GAGrCpI,KAAKuE,QAAQxD,MAAMf,KAAMa,aAQ7B,IAAIsM,IAAsBC,QAAS,EAAGjM,KAAM,EAAGkD,IAAK,EAAGgJ,QAAS,EAAGC,OAAQ,EACvEC,MAAO,EAAGC,OAAQ,EAAGC,YAAa,EAAGC,MAAO,EAAGC,KAAM,EAAGC,OAAQ,EAAGC,OAAQ,EAC3EC,OAAQ,EAAGC,OAAQ,EAAGC,MAAO,EAAGjJ,IAAK,EAAGkJ,KAAM,EAAGC,IAAK,EAAGC,QAAS,EAClEC,SAAU,EAAGxB,OAAQ,EAAGnI,IAAK,EAAG4J,IAAK,EAAGC,QAAS,EAAGtK,KAAM,EAAGuI,MAAO,EACpEgC,KAAM,EAAGC,KAAM,EAAGC,QAAS,EAAGC,KAAM,EAAGC,KAAM,EAAGC,KAAM,EAAGC,KAAM,EAC/DC,QAAS,EAAGC,WAAY,EAAGhC,QAAS,EAAGiC,QAAS,EAAGC,YAAa,EAChEtL,QAAS,EAAGoG,MAAO,EAAGmF,OAAQ,EAAGC,UAAW,EAGhDnO,GAAqBgJ,EAAYmD,EAAmB,SAGpD,IAAIiC,IAAoB,UAAW,UAAW,SAAU,UAGxDjQ,GAAEgC,KAAKiO,EAAkB,SAAS/O,GAChC,IAAKlB,EAAEkB,GAAS,MAChB2J,GAAW5I,UAAUf,GAAU,SAASE,EAAOE,GAC7C,GAAI4O,GAAWlQ,EAAEmQ,WAAW/O,GAASA,EAAQ,SAAS6H,GACpD,MAAOA,GAAM1B,IAAInG,GAEnB,OAAOpB,GAAEkB,GAAQL,KAAKiK,OAAQoF,EAAU5O,KAiB5C,IAAI8O,GAAOjQ,EAASiQ,KAAO,SAASnM,GAClCpD,KAAK4F,IAAMzG,EAAE0D,SAAS,OACtB1D,GAAEqG,OAAOxF,KAAMb,EAAE0K,KAAKzG,EAASoM,GAC/BxP,MAAKyP,gBACLzP,MAAKoG,WAAWrF,MAAMf,KAAMa,WAI9B,IAAI6O,GAAwB,gBAG5B,IAAIF,IAAe,QAAS,aAAc,KAAM,KAAM,aAAc,YAAa,UAAW,SAG5FrQ,GAAEqG,OAAO+J,EAAKnO,UAAWC,GAGvBsO,QAAS,MAITvQ,EAAG,SAASwQ,GACV,MAAO5P,MAAK6P,IAAIlC,KAAKiC,IAKvBxJ,WAAY,aAKZ0J,OAAQ,WACN,MAAO9P,OAKTuK,OAAQ,WACNvK,KAAK+P,gBACL/P,MAAKyD,eACL,OAAOzD,OAMT+P,eAAgB,WACd/P,KAAK6P,IAAItF,UAKXyF,WAAY,SAASC,GACnBjQ,KAAKkQ,kBACLlQ,MAAKmQ,YAAYF,EACjBjQ,MAAKoQ,gBACL,OAAOpQ,OAQTmQ,YAAa,SAASE,GACpBrQ,KAAK6P,IAAMQ,YAAc/Q,GAASF,EAAIiR,EAAK/Q,EAASF,EAAEiR,EACtDrQ,MAAKqQ,GAAKrQ,KAAK6P,IAAI,IAgBrBO,eAAgB,SAASjN,GACvBA,IAAWA,EAAShE,EAAE8G,OAAOjG,KAAM,UACnC,KAAKmD,EAAQ,MAAOnD,KACpBA,MAAKkQ,kBACL,KAAK,GAAInJ,KAAO5D,GAAQ,CACtB,GAAI9C,GAAS8C,EAAO4D,EACpB,KAAK5H,EAAEmQ,WAAWjP,GAASA,EAASL,KAAKK,EACzC,KAAKA,EAAQ,QACb,IAAIiQ,GAAQvJ,EAAIuJ,MAAMZ,EACtB1P,MAAKuQ,SAASD,EAAM,GAAIA,EAAM,GAAInR,EAAEgF,KAAK9D,EAAQL,OAEnD,MAAOA,OAMTuQ,SAAU,SAASC,EAAWZ,EAAUa,GACtCzQ,KAAK6P,IAAI5N,GAAGuO,EAAY,kBAAoBxQ,KAAK4F,IAAKgK,EAAUa,EAChE,OAAOzQ,OAMTkQ,iBAAkB,WAChB,GAAIlQ,KAAK6P,IAAK7P,KAAK6P,IAAItM,IAAI,kBAAoBvD,KAAK4F,IACpD,OAAO5F,OAKT0Q,WAAY,SAASF,EAAWZ,EAAUa,GACxCzQ,KAAK6P,IAAItM,IAAIiN,EAAY,kBAAoBxQ,KAAK4F,IAAKgK,EAAUa,EACjE,OAAOzQ,OAKT2Q,eAAgB,SAAShB,GACvB,MAAOiB,UAASC,cAAclB,IAOhCF,eAAgB,WACd,IAAKzP,KAAKqQ,GAAI,CACZ,GAAI1K,GAAQxG,EAAEqG,UAAWrG,EAAE8G,OAAOjG,KAAM,cACxC,IAAIA,KAAK0C,GAAIiD,EAAMjD,GAAKvD,EAAE8G,OAAOjG,KAAM,KACvC,IAAIA,KAAK8Q,UAAWnL,EAAM,SAAWxG,EAAE8G,OAAOjG,KAAM,YACpDA,MAAKgQ,WAAWhQ,KAAK2Q,eAAexR,EAAE8G,OAAOjG,KAAM,YACnDA,MAAK+Q,eAAepL,OACf,CACL3F,KAAKgQ,WAAW7Q,EAAE8G,OAAOjG,KAAM,SAMnC+Q,eAAgB,SAASrL,GACvB1F,KAAK6P,IAAIlJ,KAAKjB,KAuBlBpG,GAASmH,KAAO,SAASpG,EAAQ+H,EAAOhF,GACtC,GAAI4N,GAAOC,EAAU5Q,EAGrBlB,GAAE6G,SAAS5C,IAAYA,OACrBnD,YAAaX,EAASW,YACtBC,YAAaZ,EAASY,aAIxB,IAAIgR,IAAUF,KAAMA,EAAMG,SAAU,OAGpC,KAAK/N,EAAQ6F,IAAK,CAChBiI,EAAOjI,IAAM9J,EAAE8G,OAAOmC,EAAO,QAAUe,IAIzC,GAAI/F,EAAQgO,MAAQ,MAAQhJ,IAAU/H,IAAW,UAAYA,IAAW,UAAYA,IAAW,SAAU,CACvG6Q,EAAOG,YAAc,kBACrBH,GAAOE,KAAOE,KAAKC,UAAUnO,EAAQuC,OAASyC,EAAM7B,OAAOnD,IAI7D,GAAIA,EAAQlD,YAAa,CACvBgR,EAAOG,YAAc,mCACrBH,GAAOE,KAAOF,EAAOE,MAAQhJ,MAAO8I,EAAOE,SAK7C,GAAIhO,EAAQnD,cAAgB+Q,IAAS,OAASA,IAAS,UAAYA,IAAS,SAAU,CACpFE,EAAOF,KAAO,MACd,IAAI5N,EAAQlD,YAAagR,EAAOE,KAAKI,QAAUR,CAC/C,IAAIS,GAAarO,EAAQqO,UACzBrO,GAAQqO,WAAa,SAAS3I,GAC5BA,EAAI4I,iBAAiB,yBAA0BV,EAC/C,IAAIS,EAAY,MAAOA,GAAW1Q,MAAMf,KAAMa,YAKlD,GAAIqQ,EAAOF,OAAS,QAAU5N,EAAQlD,YAAa,CACjDgR,EAAOS,YAAc,MAIvB,GAAInI,GAAQpG,EAAQoG,KACpBpG,GAAQoG,MAAQ,SAASV,EAAK8I,EAAYC,GACxCzO,EAAQwO,WAAaA,CACrBxO,GAAQyO,YAAcA,CACtB,IAAIrI,EAAOA,EAAM5I,KAAKwC,EAAQ3C,QAASqI,EAAK8I,EAAYC,GAI1D,IAAI/I,GAAM1F,EAAQ0F,IAAMxJ,EAASwS,KAAK3S,EAAEqG,OAAO0L,EAAQ9N,GACvDgF,GAAM7D,QAAQ,UAAW6D,EAAOU,EAAK1F,EACrC,OAAO0F,GAIT,IAAImI,IACFpE,OAAU,OACVkF,OAAU,MACVlJ,MAAU,QACVmJ,SAAU,SACVC,KAAU,MAKZ3S,GAASwS,KAAO,WACd,MAAOxS,GAASF,EAAE0S,KAAK/Q,MAAMzB,EAASF,EAAGyB,WAQ3C,IAAIqR,GAAS5S,EAAS4S,OAAS,SAAS9O,GACtCA,IAAYA,KACZ,IAAIA,EAAQ+O,OAAQnS,KAAKmS,OAAS/O,EAAQ+O,MAC1CnS,MAAKoS,aACLpS,MAAKoG,WAAWrF,MAAMf,KAAMa,WAK9B,IAAIwR,GAAgB,YACpB,IAAIC,GAAgB,cACpB,IAAIC,GAAgB,QACpB,IAAIC,GAAgB,0BAGpBrT,GAAEqG,OAAO0M,EAAO9Q,UAAWC,GAIzB+E,WAAY,aAQZqM,MAAO,SAASA,EAAOhR,EAAMC,GAC3B,IAAKvC,EAAEuT,SAASD,GAAQA,EAAQzS,KAAK2S,eAAeF,EACpD,IAAItT,EAAEmQ,WAAW7N,GAAO,CACtBC,EAAWD,CACXA,GAAO,GAET,IAAKC,EAAUA,EAAW1B,KAAKyB,EAC/B,IAAImR,GAAS5S,IACbV,GAASuT,QAAQJ,MAAMA,EAAO,SAASK,GACrC,GAAInS,GAAOiS,EAAOG,mBAAmBN,EAAOK,EAC5C,IAAIF,EAAOI,QAAQtR,EAAUf,EAAMc,KAAU,MAAO,CAClDmR,EAAOrO,QAAQxD,MAAM6R,GAAS,SAAWnR,GAAMwD,OAAOtE,GACtDiS,GAAOrO,QAAQ,QAAS9C,EAAMd,EAC9BrB,GAASuT,QAAQtO,QAAQ,QAASqO,EAAQnR,EAAMd,KAGpD,OAAOX,OAKTgT,QAAS,SAAStR,EAAUf,EAAMc,GAChC,GAAIC,EAAUA,EAASX,MAAMf,KAAMW,IAIrCsS,SAAU,SAASH,EAAU1P,GAC3B9D,EAASuT,QAAQI,SAASH,EAAU1P,EACpC,OAAOpD,OAMToS,YAAa,WACX,IAAKpS,KAAKmS,OAAQ,MAClBnS,MAAKmS,OAAShT,EAAE8G,OAAOjG,KAAM,SAC7B,IAAIyS,GAAON,EAAShT,EAAE2C,KAAK9B,KAAKmS,OAChC,QAAQM,EAAQN,EAAOhG,QAAU,KAAM,CACrCnM,KAAKyS,MAAMA,EAAOzS,KAAKmS,OAAOM,MAMlCE,eAAgB,SAASF,GACvBA,EAAQA,EAAMrJ,QAAQoJ,EAAc,QACtBpJ,QAAQiJ,EAAe,WACvBjJ,QAAQkJ,EAAY,SAAShC,EAAO4C,GACnC,MAAOA,GAAW5C,EAAQ,aAE3BlH,QAAQmJ,EAAY,WAClC,OAAO,IAAIY,QAAO,IAAMV,EAAQ,yBAMlCM,mBAAoB,SAASN,EAAOK,GAClC,GAAI5B,GAASuB,EAAMW,KAAKN,GAAUjT,MAAM,EACxC,OAAOV,GAAEkF,IAAI6M,EAAQ,SAASmC,EAAOzR,GAEnC,GAAIA,IAAMsP,EAAO9Q,OAAS,EAAG,MAAOiT,IAAS,IAC7C,OAAOA,GAAQC,mBAAmBD,GAAS,SAcjD,IAAIE,GAAUjU,EAASiU,QAAU,WAC/BvT,KAAKqD,WACLlE,GAAEqU,QAAQxT,KAAM,WAGhB,UAAWyT,UAAW,YAAa,CACjCzT,KAAK0T,SAAWD,OAAOC,QACvB1T,MAAK6S,QAAUY,OAAOZ,SAK1B,IAAIc,GAAgB,cAGpB,IAAIC,GAAe,YAGnB,IAAIC,GAAe,MAGnBN,GAAQO,QAAU,KAGlB3U,GAAEqG,OAAO+N,EAAQnS,UAAWC,GAI1B0S,SAAU,GAGVC,OAAQ,WACN,GAAIC,GAAOjU,KAAK0T,SAASQ,SAAS9K,QAAQ,SAAU,MACpD,OAAO6K,KAASjU,KAAKlB,OAASkB,KAAKmU,aAIrCC,UAAW,WACT,GAAIH,GAAOjU,KAAKqU,eAAerU,KAAK0T,SAASQ,SAC7C,IAAIpV,GAAOmV,EAAKpU,MAAM,EAAGG,KAAKlB,KAAKsB,OAAS,GAAK,GACjD,OAAOtB,KAASkB,KAAKlB,MAMvBuV,eAAgB,SAASvB,GACvB,MAAOwB,WAAUxB,EAAS1J,QAAQ,OAAQ,WAK5C+K,UAAW,WACT,GAAI7D,GAAQtQ,KAAK0T,SAASa,KAAKnL,QAAQ,MAAO,IAAIkH,MAAM,OACxD,OAAOA,GAAQA,EAAM,GAAK,IAK5BkE,QAAS,SAASf,GAChB,GAAInD,IAASmD,GAAUzT,MAAM0T,SAASa,KAAKjE,MAAM,SACjD,OAAOA,GAAQA,EAAM,GAAK,IAI5BmE,QAAS,WACP,GAAIR,GAAOjU,KAAKqU,eACdrU,KAAK0T,SAASQ,SAAWlU,KAAKmU,aAC9BtU,MAAMG,KAAKlB,KAAKsB,OAAS,EAC3B,OAAO6T,GAAKS,OAAO,KAAO,IAAMT,EAAKpU,MAAM,GAAKoU,GAIlDU,YAAa,SAAS7B,GACpB,GAAIA,GAAY,KAAM,CACpB,GAAI9S,KAAK4U,gBAAkB5U,KAAK6U,iBAAkB,CAChD/B,EAAW9S,KAAKyU,cACX,CACL3B,EAAW9S,KAAKwU,WAGpB,MAAO1B,GAAS1J,QAAQuK,EAAe,KAKzCmB,MAAO,SAAS1R,GACd,GAAImQ,EAAQO,QAAS,KAAM,IAAIrH,OAAM,4CACrC8G,GAAQO,QAAU,IAIlB9T,MAAKoD,QAAmBjE,EAAEqG,QAAQ1G,KAAM,KAAMkB,KAAKoD,QAASA,EAC5DpD,MAAKlB,KAAmBkB,KAAKoD,QAAQtE,IACrCkB,MAAK6U,iBAAmB7U,KAAKoD,QAAQ2R,aAAe,KACpD/U,MAAKgV,eAAmB,gBAAkBvB,OAC1CzT,MAAKiV,eAAmBjV,KAAK6U,kBAAoB7U,KAAKgV,cACtDhV,MAAKkV,kBAAqBlV,KAAKoD,QAAQ+R,SACvCnV,MAAKoV,iBAAsBpV,KAAK6S,SAAW7S,KAAK6S,QAAQsC,UACxDnV,MAAK4U,cAAmB5U,KAAKkV,iBAAmBlV,KAAKoV,aACrDpV,MAAK8S,SAAmB9S,KAAK2U,aAG7B3U,MAAKlB,MAAQ,IAAMkB,KAAKlB,KAAO,KAAKsK,QAAQwK,EAAc,IAI1D,IAAI5T,KAAK6U,kBAAoB7U,KAAKkV,gBAAiB,CAIjD,IAAKlV,KAAKoV,gBAAkBpV,KAAKgU,SAAU,CACzC,GAAIlV,GAAOkB,KAAKlB,KAAKe,MAAM,GAAI,IAAM,GACrCG,MAAK0T,SAAStK,QAAQtK,EAAO,IAAMkB,KAAKyU,UAExC,OAAO,UAIF,IAAIzU,KAAKoV,eAAiBpV,KAAKgU,SAAU,CAC9ChU,KAAKiT,SAASjT,KAAKwU,WAAYpL,QAAS,QAQ5C,IAAKpJ,KAAKgV,gBAAkBhV,KAAK6U,mBAAqB7U,KAAK4U,cAAe,CACxE5U,KAAKqV,OAASzE,SAASC,cAAc,SACrC7Q,MAAKqV,OAAOC,IAAM,cAClBtV,MAAKqV,OAAOE,MAAMC,QAAU,MAC5BxV,MAAKqV,OAAOI,UAAY,CACxB,IAAIC,GAAO9E,SAAS8E,IAEpB,IAAIC,GAAUD,EAAKE,aAAa5V,KAAKqV,OAAQK,EAAKG,YAAYC,aAC9DH,GAAQ/E,SAASmF,MACjBJ,GAAQ/E,SAASoF,OACjBL,GAAQjC,SAASuC,KAAO,IAAMjW,KAAK8S,SAIrC,GAAIoD,GAAmBzC,OAAOyC,kBAAoB,SAAU1F,EAAWC,GACrE,MAAO0F,aAAY,KAAO3F,EAAWC,GAKvC,IAAIzQ,KAAK4U,cAAe,CACtBsB,EAAiB,WAAYlW,KAAKoW,SAAU,WACvC,IAAIpW,KAAKiV,iBAAmBjV,KAAKqV,OAAQ,CAC9Ca,EAAiB,aAAclW,KAAKoW,SAAU,WACzC,IAAIpW,KAAK6U,iBAAkB,CAChC7U,KAAKqW,kBAAoBC,YAAYtW,KAAKoW,SAAUpW,KAAK+T,UAG3D,IAAK/T,KAAKoD,QAAQ+D,OAAQ,MAAOnH,MAAKuW,WAKxCC,KAAM,WAEJ,GAAIC,GAAsBhD,OAAOgD,qBAAuB,SAAUjG,EAAWC,GAC3E,MAAOiG,aAAY,KAAOlG,EAAWC,GAIvC,IAAIzQ,KAAK4U,cAAe,CACtB6B,EAAoB,WAAYzW,KAAKoW,SAAU,WAC1C,IAAIpW,KAAKiV,iBAAmBjV,KAAKqV,OAAQ,CAC9CoB,EAAoB,aAAczW,KAAKoW,SAAU,OAInD,GAAIpW,KAAKqV,OAAQ,CACfzE,SAAS8E,KAAKiB,YAAY3W,KAAKqV,OAC/BrV,MAAKqV,OAAS,KAIhB,GAAIrV,KAAKqW,kBAAmBO,cAAc5W,KAAKqW,kBAC/C9C,GAAQO,QAAU,OAKpBrB,MAAO,SAASA,EAAO/Q,GACrB1B,KAAKqD,SAASvC,SAAS2R,MAAOA,EAAO/Q,SAAUA,KAKjD0U,SAAU,SAAS5W,GACjB,GAAIgI,GAAUxH,KAAK2U,aAInB,IAAInN,IAAYxH,KAAK8S,UAAY9S,KAAKqV,OAAQ,CAC5C7N,EAAUxH,KAAKwU,QAAQxU,KAAKqV,OAAOS,eAGrC,GAAItO,IAAYxH,KAAK8S,SAAU,MAAO,MACtC,IAAI9S,KAAKqV,OAAQrV,KAAKiT,SAASzL,EAC/BxH,MAAKuW,WAMPA,QAAS,SAASzD,GAEhB,IAAK9S,KAAKoU,YAAa,MAAO,MAC9BtB,GAAW9S,KAAK8S,SAAW9S,KAAK2U,YAAY7B,EAC5C,OAAO3T,GAAE+O,IAAIlO,KAAKqD,SAAU,SAASS,GACnC,GAAIA,EAAQ2O,MAAM1Q,KAAK+Q,GAAW,CAChChP,EAAQpC,SAASoR,EACjB,OAAO,UAYbG,SAAU,SAASH,EAAU1P,GAC3B,IAAKmQ,EAAQO,QAAS,MAAO,MAC7B,KAAK1Q,GAAWA,IAAY,KAAMA,GAAWmB,UAAWnB,EAGxD0P,GAAW9S,KAAK2U,YAAY7B,GAAY,GAGxC,IAAIhU,GAAOkB,KAAKlB,IAChB,IAAIgU,IAAa,IAAMA,EAAS4B,OAAO,KAAO,IAAK,CACjD5V,EAAOA,EAAKe,MAAM,GAAI,IAAM,IAE9B,GAAIoJ,GAAMnK,EAAOgU,CAGjBA,GAAW9S,KAAKqU,eAAevB,EAAS1J,QAAQyK,EAAc,IAE9D,IAAI7T,KAAK8S,WAAaA,EAAU,MAChC9S,MAAK8S,SAAWA,CAGhB,IAAI9S,KAAK4U,cAAe,CACtB5U,KAAK6S,QAAQzP,EAAQgG,QAAU,eAAiB,gBAAiBwH,SAASiG,MAAO5N,OAI5E,IAAIjJ,KAAK6U,iBAAkB,CAChC7U,KAAK8W,YAAY9W,KAAK0T,SAAUZ,EAAU1P,EAAQgG,QAClD,IAAIpJ,KAAKqV,QAAWvC,IAAa9S,KAAKwU,QAAQxU,KAAKqV,OAAOS,eAAiB,CACzE,GAAIH,GAAU3V,KAAKqV,OAAOS,aAK1B,KAAK1S,EAAQgG,QAAS,CACpBuM,EAAQ/E,SAASmF,MACjBJ,GAAQ/E,SAASoF,QAGnBhW,KAAK8W,YAAYnB,EAAQjC,SAAUZ,EAAU1P,EAAQgG,cAKlD,CACL,MAAOpJ,MAAK0T,SAASqD,OAAO9N,GAE9B,GAAI7F,EAAQmB,QAAS,MAAOvE,MAAKuW,QAAQzD,IAK3CgE,YAAa,SAASpD,EAAUZ,EAAU1J,GACxC,GAAIA,EAAS,CACX,GAAImL,GAAOb,EAASa,KAAKnL,QAAQ,qBAAsB,GACvDsK,GAAStK,QAAQmL,EAAO,IAAMzB,OACzB,CAELY,EAASuC,KAAO,IAAMnD,KAO5BxT,GAASuT,QAAU,GAAIU,EAQvB,IAAI/N,GAAS,SAASwR,EAAYC,GAChC,GAAIC,GAASlX,IACb,IAAImX,EAKJ,IAAIH,GAAc7X,EAAE0H,IAAImQ,EAAY,eAAgB,CAClDG,EAAQH,EAAW1N,gBACd,CACL6N,EAAQ,WAAY,MAAOD,GAAOnW,MAAMf,KAAMa,YAIhD1B,EAAEqG,OAAO2R,EAAOD,EAAQD,EAIxB,IAAIG,GAAY,WAAYpX,KAAKsJ,YAAc6N,EAC/CC,GAAUhW,UAAY8V,EAAO9V,SAC7B+V,GAAM/V,UAAY,GAAIgW,EAItB,IAAIJ,EAAY7X,EAAEqG,OAAO2R,EAAM/V,UAAW4V,EAI1CG,GAAME,UAAYH,EAAO9V,SAEzB,OAAO+V,GAIT1R,GAAMD,OAASwE,EAAWxE,OAAS0M,EAAO1M,OAAS+J,EAAK/J,OAAS+N,EAAQ/N,OAASA,CAGlF,IAAI2D,GAAW,WACb,KAAM,IAAIsD,OAAM,kDAIlB,IAAIjE,GAAY,SAASJ,EAAOhF,GAC9B,GAAIoG,GAAQpG,EAAQoG,KACpBpG,GAAQoG,MAAQ,SAASlB,GACvB,GAAIkB,EAAOA,EAAM5I,KAAKwC,EAAQ3C,QAAS2H,EAAOE,EAAMlF,EACpDgF,GAAM7D,QAAQ,QAAS6D,EAAOE,EAAMlF,IAIxC,OAAO9D"}
\ No newline at end of file
diff --git a/core/assets/vendor/backbone/backbone.js b/core/assets/vendor/backbone/backbone.js
new file mode 100644
index 000000000..58800425c
--- /dev/null
+++ b/core/assets/vendor/backbone/backbone.js
@@ -0,0 +1,1873 @@
+//     Backbone.js 1.2.1
+
+//     (c) 2010-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+//     Backbone may be freely distributed under the MIT license.
+//     For all details and documentation:
+//     http://backbonejs.org
+
+(function(factory) {
+
+  // Establish the root object, `window` (`self`) in the browser, or `global` on the server.
+  // We use `self` instead of `window` for `WebWorker` support.
+  var root = (typeof self == 'object' && self.self == self && self) ||
+            (typeof global == 'object' && global.global == global && global);
+
+  // Set up Backbone appropriately for the environment. Start with AMD.
+  if (typeof define === 'function' && define.amd) {
+    define(['underscore', 'jquery', 'exports'], function(_, $, exports) {
+      // Export global even in AMD case in case this script is loaded with
+      // others that may still expect a global Backbone.
+      root.Backbone = factory(root, exports, _, $);
+    });
+
+  // Next for Node.js or CommonJS. jQuery may not be needed as a module.
+  } else if (typeof exports !== 'undefined') {
+    var _ = require('underscore'), $;
+    try { $ = require('jquery'); } catch(e) {}
+    factory(root, exports, _, $);
+
+  // Finally, as a browser global.
+  } else {
+    root.Backbone = factory(root, {}, root._, (root.jQuery || root.Zepto || root.ender || root.$));
+  }
+
+}(function(root, Backbone, _, $) {
+
+  // Initial Setup
+  // -------------
+
+  // Save the previous value of the `Backbone` variable, so that it can be
+  // restored later on, if `noConflict` is used.
+  var previousBackbone = root.Backbone;
+
+  // Create a local reference to a common array method we'll want to use later.
+  var slice = [].slice;
+
+  // Current version of the library. Keep in sync with `package.json`.
+  Backbone.VERSION = '1.2.1';
+
+  // For Backbone's purposes, jQuery, Zepto, Ender, or My Library (kidding) owns
+  // the `$` variable.
+  Backbone.$ = $;
+
+  // Runs Backbone.js in *noConflict* mode, returning the `Backbone` variable
+  // to its previous owner. Returns a reference to this Backbone object.
+  Backbone.noConflict = function() {
+    root.Backbone = previousBackbone;
+    return this;
+  };
+
+  // Turn on `emulateHTTP` to support legacy HTTP servers. Setting this option
+  // will fake `"PATCH"`, `"PUT"` and `"DELETE"` requests via the `_method` parameter and
+  // set a `X-Http-Method-Override` header.
+  Backbone.emulateHTTP = false;
+
+  // Turn on `emulateJSON` to support legacy servers that can't deal with direct
+  // `application/json` requests ... this will encode the body as
+  // `application/x-www-form-urlencoded` instead and will send the model in a
+  // form param named `model`.
+  Backbone.emulateJSON = false;
+
+  // Proxy Underscore methods to a Backbone class' prototype using a
+  // particular attribute as the data argument
+  var addMethod = function(length, method, attribute) {
+    switch (length) {
+      case 1: return function() {
+        return _[method](this[attribute]);
+      };
+      case 2: return function(value) {
+        return _[method](this[attribute], value);
+      };
+      case 3: return function(iteratee, context) {
+        return _[method](this[attribute], iteratee, context);
+      };
+      case 4: return function(iteratee, defaultVal, context) {
+        return _[method](this[attribute], iteratee, defaultVal, context);
+      };
+      default: return function() {
+        var args = slice.call(arguments);
+        args.unshift(this[attribute]);
+        return _[method].apply(_, args);
+      };
+    }
+  };
+  var addUnderscoreMethods = function(Class, methods, attribute) {
+    _.each(methods, function(length, method) {
+      if (_[method]) Class.prototype[method] = addMethod(length, method, attribute);
+    });
+  };
+
+  // Backbone.Events
+  // ---------------
+
+  // A module that can be mixed in to *any object* in order to provide it with
+  // custom events. You may bind with `on` or remove with `off` callback
+  // functions to an event; `trigger`-ing an event fires all callbacks in
+  // succession.
+  //
+  //     var object = {};
+  //     _.extend(object, Backbone.Events);
+  //     object.on('expand', function(){ alert('expanded'); });
+  //     object.trigger('expand');
+  //
+  var Events = Backbone.Events = {};
+
+  // Regular expression used to split event strings.
+  var eventSplitter = /\s+/;
+
+  // Iterates over the standard `event, callback` (as well as the fancy multiple
+  // space-separated events `"change blur", callback` and jQuery-style event
+  // maps `{event: callback}`), reducing them by manipulating `memo`.
+  // Passes a normalized single event name and callback, as well as any
+  // optional `opts`.
+  var eventsApi = function(iteratee, memo, name, callback, opts) {
+    var i = 0, names;
+    if (name && typeof name === 'object') {
+      // Handle event maps.
+      if (callback !== void 0 && 'context' in opts && opts.context === void 0) opts.context = callback;
+      for (names = _.keys(name); i < names.length ; i++) {
+        memo = iteratee(memo, names[i], name[names[i]], opts);
+      }
+    } else if (name && eventSplitter.test(name)) {
+      // Handle space separated event names.
+      for (names = name.split(eventSplitter); i < names.length; i++) {
+        memo = iteratee(memo, names[i], callback, opts);
+      }
+    } else {
+      memo = iteratee(memo, name, callback, opts);
+    }
+    return memo;
+  };
+
+  // Bind an event to a `callback` function. Passing `"all"` will bind
+  // the callback to all events fired.
+  Events.on = function(name, callback, context) {
+    return internalOn(this, name, callback, context);
+  };
+
+  // An internal use `on` function, used to guard the `listening` argument from
+  // the public API.
+  var internalOn = function(obj, name, callback, context, listening) {
+    obj._events = eventsApi(onApi, obj._events || {}, name, callback, {
+        context: context,
+        ctx: obj,
+        listening: listening
+    });
+
+    if (listening) {
+      var listeners = obj._listeners || (obj._listeners = {});
+      listeners[listening.id] = listening;
+    }
+
+    return obj;
+  };
+
+  // Inversion-of-control versions of `on`. Tell *this* object to listen to
+  // an event in another object... keeping track of what it's listening to.
+  Events.listenTo =  function(obj, name, callback) {
+    if (!obj) return this;
+    var id = obj._listenId || (obj._listenId = _.uniqueId('l'));
+    var listeningTo = this._listeningTo || (this._listeningTo = {});
+    var listening = listeningTo[id];
+
+    // This object is not listening to any other events on `obj` yet.
+    // Setup the necessary references to track the listening callbacks.
+    if (!listening) {
+      var thisId = this._listenId || (this._listenId = _.uniqueId('l'));
+      listening = listeningTo[id] = {obj: obj, objId: id, id: thisId, listeningTo: listeningTo, count: 0};
+    }
+
+    // Bind callbacks on obj, and keep track of them on listening.
+    internalOn(obj, name, callback, this, listening);
+    return this;
+  };
+
+  // The reducing API that adds a callback to the `events` object.
+  var onApi = function(events, name, callback, options) {
+    if (callback) {
+      var handlers = events[name] || (events[name] = []);
+      var context = options.context, ctx = options.ctx, listening = options.listening;
+      if (listening) listening.count++;
+
+      handlers.push({ callback: callback, context: context, ctx: context || ctx, listening: listening });
+    }
+    return events;
+  };
+
+  // Remove one or many callbacks. If `context` is null, removes all
+  // callbacks with that function. If `callback` is null, removes all
+  // callbacks for the event. If `name` is null, removes all bound
+  // callbacks for all events.
+  Events.off =  function(name, callback, context) {
+    if (!this._events) return this;
+    this._events = eventsApi(offApi, this._events, name, callback, {
+        context: context,
+        listeners: this._listeners
+    });
+    return this;
+  };
+
+  // Tell this object to stop listening to either specific events ... or
+  // to every object it's currently listening to.
+  Events.stopListening =  function(obj, name, callback) {
+    var listeningTo = this._listeningTo;
+    if (!listeningTo) return this;
+
+    var ids = obj ? [obj._listenId] : _.keys(listeningTo);
+
+    for (var i = 0; i < ids.length; i++) {
+      var listening = listeningTo[ids[i]];
+
+      // If listening doesn't exist, this object is not currently
+      // listening to obj. Break out early.
+      if (!listening) break;
+
+      listening.obj.off(name, callback, this);
+    }
+    if (_.isEmpty(listeningTo)) this._listeningTo = void 0;
+
+    return this;
+  };
+
+  // The reducing API that removes a callback from the `events` object.
+  var offApi = function(events, name, callback, options) {
+    // No events to consider.
+    if (!events) return;
+
+    var i = 0, listening;
+    var context = options.context, listeners = options.listeners;
+
+    // Delete all events listeners and "drop" events.
+    if (!name && !callback && !context) {
+      var ids = _.keys(listeners);
+      for (; i < ids.length; i++) {
+        listening = listeners[ids[i]];
+        delete listeners[listening.id];
+        delete listening.listeningTo[listening.objId];
+      }
+      return;
+    }
+
+    var names = name ? [name] : _.keys(events);
+    for (; i < names.length; i++) {
+      name = names[i];
+      var handlers = events[name];
+
+      // Bail out if there are no events stored.
+      if (!handlers) break;
+
+      // Replace events if there are any remaining.  Otherwise, clean up.
+      var remaining = [];
+      for (var j = 0; j < handlers.length; j++) {
+        var handler = handlers[j];
+        if (
+          callback && callback !== handler.callback &&
+            callback !== handler.callback._callback ||
+              context && context !== handler.context
+        ) {
+          remaining.push(handler);
+        } else {
+          listening = handler.listening;
+          if (listening && --listening.count === 0) {
+            delete listeners[listening.id];
+            delete listening.listeningTo[listening.objId];
+          }
+        }
+      }
+
+      // Update tail event if the list has any events.  Otherwise, clean up.
+      if (remaining.length) {
+        events[name] = remaining;
+      } else {
+        delete events[name];
+      }
+    }
+    if (_.size(events)) return events;
+  };
+
+  // Bind an event to only be triggered a single time. After the first time
+  // the callback is invoked, it will be removed. When multiple events are
+  // passed in using the space-separated syntax, the event will fire once for every
+  // event you passed in, not once for a combination of all events
+  Events.once =  function(name, callback, context) {
+    // Map the event into a `{event: once}` object.
+    var events = eventsApi(onceMap, {}, name, callback, _.bind(this.off, this));
+    return this.on(events, void 0, context);
+  };
+
+  // Inversion-of-control versions of `once`.
+  Events.listenToOnce =  function(obj, name, callback) {
+    // Map the event into a `{event: once}` object.
+    var events = eventsApi(onceMap, {}, name, callback, _.bind(this.stopListening, this, obj));
+    return this.listenTo(obj, events);
+  };
+
+  // Reduces the event callbacks into a map of `{event: onceWrapper}`.
+  // `offer` unbinds the `onceWrapper` after it has been called.
+  var onceMap = function(map, name, callback, offer) {
+    if (callback) {
+      var once = map[name] = _.once(function() {
+        offer(name, once);
+        callback.apply(this, arguments);
+      });
+      once._callback = callback;
+    }
+    return map;
+  };
+
+  // Trigger one or many events, firing all bound callbacks. Callbacks are
+  // passed the same arguments as `trigger` is, apart from the event name
+  // (unless you're listening on `"all"`, which will cause your callback to
+  // receive the true name of the event as the first argument).
+  Events.trigger =  function(name) {
+    if (!this._events) return this;
+
+    var length = Math.max(0, arguments.length - 1);
+    var args = Array(length);
+    for (var i = 0; i < length; i++) args[i] = arguments[i + 1];
+
+    eventsApi(triggerApi, this._events, name, void 0, args);
+    return this;
+  };
+
+  // Handles triggering the appropriate event callbacks.
+  var triggerApi = function(objEvents, name, cb, args) {
+    if (objEvents) {
+      var events = objEvents[name];
+      var allEvents = objEvents.all;
+      if (events && allEvents) allEvents = allEvents.slice();
+      if (events) triggerEvents(events, args);
+      if (allEvents) triggerEvents(allEvents, [name].concat(args));
+    }
+    return objEvents;
+  };
+
+  // A difficult-to-believe, but optimized internal dispatch function for
+  // triggering events. Tries to keep the usual cases speedy (most internal
+  // Backbone events have 3 arguments).
+  var triggerEvents = function(events, args) {
+    var ev, i = -1, l = events.length, a1 = args[0], a2 = args[1], a3 = args[2];
+    switch (args.length) {
+      case 0: while (++i < l) (ev = events[i]).callback.call(ev.ctx); return;
+      case 1: while (++i < l) (ev = events[i]).callback.call(ev.ctx, a1); return;
+      case 2: while (++i < l) (ev = events[i]).callback.call(ev.ctx, a1, a2); return;
+      case 3: while (++i < l) (ev = events[i]).callback.call(ev.ctx, a1, a2, a3); return;
+      default: while (++i < l) (ev = events[i]).callback.apply(ev.ctx, args); return;
+    }
+  };
+
+  // Aliases for backwards compatibility.
+  Events.bind   = Events.on;
+  Events.unbind = Events.off;
+
+  // Allow the `Backbone` object to serve as a global event bus, for folks who
+  // want global "pubsub" in a convenient place.
+  _.extend(Backbone, Events);
+
+  // Backbone.Model
+  // --------------
+
+  // Backbone **Models** are the basic data object in the framework --
+  // frequently representing a row in a table in a database on your server.
+  // A discrete chunk of data and a bunch of useful, related methods for
+  // performing computations and transformations on that data.
+
+  // Create a new model with the specified attributes. A client id (`cid`)
+  // is automatically generated and assigned for you.
+  var Model = Backbone.Model = function(attributes, options) {
+    var attrs = attributes || {};
+    options || (options = {});
+    this.cid = _.uniqueId(this.cidPrefix);
+    this.attributes = {};
+    if (options.collection) this.collection = options.collection;
+    if (options.parse) attrs = this.parse(attrs, options) || {};
+    attrs = _.defaults({}, attrs, _.result(this, 'defaults'));
+    this.set(attrs, options);
+    this.changed = {};
+    this.initialize.apply(this, arguments);
+  };
+
+  // Attach all inheritable methods to the Model prototype.
+  _.extend(Model.prototype, Events, {
+
+    // A hash of attributes whose current and previous value differ.
+    changed: null,
+
+    // The value returned during the last failed validation.
+    validationError: null,
+
+    // The default name for the JSON `id` attribute is `"id"`. MongoDB and
+    // CouchDB users may want to set this to `"_id"`.
+    idAttribute: 'id',
+
+    // The prefix is used to create the client id which is used to identify models locally.
+    // You may want to override this if you're experiencing name clashes with model ids.
+    cidPrefix: 'c',
+
+    // Initialize is an empty function by default. Override it with your own
+    // initialization logic.
+    initialize: function(){},
+
+    // Return a copy of the model's `attributes` object.
+    toJSON: function(options) {
+      return _.clone(this.attributes);
+    },
+
+    // Proxy `Backbone.sync` by default -- but override this if you need
+    // custom syncing semantics for *this* particular model.
+    sync: function() {
+      return Backbone.sync.apply(this, arguments);
+    },
+
+    // Get the value of an attribute.
+    get: function(attr) {
+      return this.attributes[attr];
+    },
+
+    // Get the HTML-escaped value of an attribute.
+    escape: function(attr) {
+      return _.escape(this.get(attr));
+    },
+
+    // Returns `true` if the attribute contains a value that is not null
+    // or undefined.
+    has: function(attr) {
+      return this.get(attr) != null;
+    },
+
+    // Special-cased proxy to underscore's `_.matches` method.
+    matches: function(attrs) {
+      return !!_.iteratee(attrs, this)(this.attributes);
+    },
+
+    // Set a hash of model attributes on the object, firing `"change"`. This is
+    // the core primitive operation of a model, updating the data and notifying
+    // anyone who needs to know about the change in state. The heart of the beast.
+    set: function(key, val, options) {
+      if (key == null) return this;
+
+      // Handle both `"key", value` and `{key: value}` -style arguments.
+      var attrs;
+      if (typeof key === 'object') {
+        attrs = key;
+        options = val;
+      } else {
+        (attrs = {})[key] = val;
+      }
+
+      options || (options = {});
+
+      // Run validation.
+      if (!this._validate(attrs, options)) return false;
+
+      // Extract attributes and options.
+      var unset      = options.unset;
+      var silent     = options.silent;
+      var changes    = [];
+      var changing   = this._changing;
+      this._changing = true;
+
+      if (!changing) {
+        this._previousAttributes = _.clone(this.attributes);
+        this.changed = {};
+      }
+
+      var current = this.attributes;
+      var changed = this.changed;
+      var prev    = this._previousAttributes;
+
+      // Check for changes of `id`.
+      if (this.idAttribute in attrs) this.id = attrs[this.idAttribute];
+
+      // For each `set` attribute, update or delete the current value.
+      for (var attr in attrs) {
+        val = attrs[attr];
+        if (!_.isEqual(current[attr], val)) changes.push(attr);
+        if (!_.isEqual(prev[attr], val)) {
+          changed[attr] = val;
+        } else {
+          delete changed[attr];
+        }
+        unset ? delete current[attr] : current[attr] = val;
+      }
+
+      // Trigger all relevant attribute changes.
+      if (!silent) {
+        if (changes.length) this._pending = options;
+        for (var i = 0; i < changes.length; i++) {
+          this.trigger('change:' + changes[i], this, current[changes[i]], options);
+        }
+      }
+
+      // You might be wondering why there's a `while` loop here. Changes can
+      // be recursively nested within `"change"` events.
+      if (changing) return this;
+      if (!silent) {
+        while (this._pending) {
+          options = this._pending;
+          this._pending = false;
+          this.trigger('change', this, options);
+        }
+      }
+      this._pending = false;
+      this._changing = false;
+      return this;
+    },
+
+    // Remove an attribute from the model, firing `"change"`. `unset` is a noop
+    // if the attribute doesn't exist.
+    unset: function(attr, options) {
+      return this.set(attr, void 0, _.extend({}, options, {unset: true}));
+    },
+
+    // Clear all attributes on the model, firing `"change"`.
+    clear: function(options) {
+      var attrs = {};
+      for (var key in this.attributes) attrs[key] = void 0;
+      return this.set(attrs, _.extend({}, options, {unset: true}));
+    },
+
+    // Determine if the model has changed since the last `"change"` event.
+    // If you specify an attribute name, determine if that attribute has changed.
+    hasChanged: function(attr) {
+      if (attr == null) return !_.isEmpty(this.changed);
+      return _.has(this.changed, attr);
+    },
+
+    // Return an object containing all the attributes that have changed, or
+    // false if there are no changed attributes. Useful for determining what
+    // parts of a view need to be updated and/or what attributes need to be
+    // persisted to the server. Unset attributes will be set to undefined.
+    // You can also pass an attributes object to diff against the model,
+    // determining if there *would be* a change.
+    changedAttributes: function(diff) {
+      if (!diff) return this.hasChanged() ? _.clone(this.changed) : false;
+      var old = this._changing ? this._previousAttributes : this.attributes;
+      var changed = {};
+      for (var attr in diff) {
+        var val = diff[attr];
+        if (_.isEqual(old[attr], val)) continue;
+        changed[attr] = val;
+      }
+      return _.size(changed) ? changed : false;
+    },
+
+    // Get the previous value of an attribute, recorded at the time the last
+    // `"change"` event was fired.
+    previous: function(attr) {
+      if (attr == null || !this._previousAttributes) return null;
+      return this._previousAttributes[attr];
+    },
+
+    // Get all of the attributes of the model at the time of the previous
+    // `"change"` event.
+    previousAttributes: function() {
+      return _.clone(this._previousAttributes);
+    },
+
+    // Fetch the model from the server, merging the response with the model's
+    // local attributes. Any changed attributes will trigger a "change" event.
+    fetch: function(options) {
+      options = _.extend({parse: true}, options);
+      var model = this;
+      var success = options.success;
+      options.success = function(resp) {
+        var serverAttrs = options.parse ? model.parse(resp, options) : resp;
+        if (!model.set(serverAttrs, options)) return false;
+        if (success) success.call(options.context, model, resp, options);
+        model.trigger('sync', model, resp, options);
+      };
+      wrapError(this, options);
+      return this.sync('read', this, options);
+    },
+
+    // Set a hash of model attributes, and sync the model to the server.
+    // If the server returns an attributes hash that differs, the model's
+    // state will be `set` again.
+    save: function(key, val, options) {
+      // Handle both `"key", value` and `{key: value}` -style arguments.
+      var attrs;
+      if (key == null || typeof key === 'object') {
+        attrs = key;
+        options = val;
+      } else {
+        (attrs = {})[key] = val;
+      }
+
+      options = _.extend({validate: true, parse: true}, options);
+      var wait = options.wait;
+
+      // If we're not waiting and attributes exist, save acts as
+      // `set(attr).save(null, opts)` with validation. Otherwise, check if
+      // the model will be valid when the attributes, if any, are set.
+      if (attrs && !wait) {
+        if (!this.set(attrs, options)) return false;
+      } else {
+        if (!this._validate(attrs, options)) return false;
+      }
+
+      // After a successful server-side save, the client is (optionally)
+      // updated with the server-side state.
+      var model = this;
+      var success = options.success;
+      var attributes = this.attributes;
+      options.success = function(resp) {
+        // Ensure attributes are restored during synchronous saves.
+        model.attributes = attributes;
+        var serverAttrs = options.parse ? model.parse(resp, options) : resp;
+        if (wait) serverAttrs = _.extend({}, attrs, serverAttrs);
+        if (serverAttrs && !model.set(serverAttrs, options)) return false;
+        if (success) success.call(options.context, model, resp, options);
+        model.trigger('sync', model, resp, options);
+      };
+      wrapError(this, options);
+
+      // Set temporary attributes if `{wait: true}` to properly find new ids.
+      if (attrs && wait) this.attributes = _.extend({}, attributes, attrs);
+
+      var method = this.isNew() ? 'create' : (options.patch ? 'patch' : 'update');
+      if (method === 'patch' && !options.attrs) options.attrs = attrs;
+      var xhr = this.sync(method, this, options);
+
+      // Restore attributes.
+      this.attributes = attributes;
+
+      return xhr;
+    },
+
+    // Destroy this model on the server if it was already persisted.
+    // Optimistically removes the model from its collection, if it has one.
+    // If `wait: true` is passed, waits for the server to respond before removal.
+    destroy: function(options) {
+      options = options ? _.clone(options) : {};
+      var model = this;
+      var success = options.success;
+      var wait = options.wait;
+
+      var destroy = function() {
+        model.stopListening();
+        model.trigger('destroy', model, model.collection, options);
+      };
+
+      options.success = function(resp) {
+        if (wait) destroy();
+        if (success) success.call(options.context, model, resp, options);
+        if (!model.isNew()) model.trigger('sync', model, resp, options);
+      };
+
+      var xhr = false;
+      if (this.isNew()) {
+        _.defer(options.success);
+      } else {
+        wrapError(this, options);
+        xhr = this.sync('delete', this, options);
+      }
+      if (!wait) destroy();
+      return xhr;
+    },
+
+    // Default URL for the model's representation on the server -- if you're
+    // using Backbone's restful methods, override this to change the endpoint
+    // that will be called.
+    url: function() {
+      var base =
+        _.result(this, 'urlRoot') ||
+        _.result(this.collection, 'url') ||
+        urlError();
+      if (this.isNew()) return base;
+      var id = this.get(this.idAttribute);
+      return base.replace(/[^\/]$/, '$&/') + encodeURIComponent(id);
+    },
+
+    // **parse** converts a response into the hash of attributes to be `set` on
+    // the model. The default implementation is just to pass the response along.
+    parse: function(resp, options) {
+      return resp;
+    },
+
+    // Create a new model with identical attributes to this one.
+    clone: function() {
+      return new this.constructor(this.attributes);
+    },
+
+    // A model is new if it has never been saved to the server, and lacks an id.
+    isNew: function() {
+      return !this.has(this.idAttribute);
+    },
+
+    // Check if the model is currently in a valid state.
+    isValid: function(options) {
+      return this._validate({}, _.defaults({validate: true}, options));
+    },
+
+    // Run validation against the next complete set of model attributes,
+    // returning `true` if all is well. Otherwise, fire an `"invalid"` event.
+    _validate: function(attrs, options) {
+      if (!options.validate || !this.validate) return true;
+      attrs = _.extend({}, this.attributes, attrs);
+      var error = this.validationError = this.validate(attrs, options) || null;
+      if (!error) return true;
+      this.trigger('invalid', this, error, _.extend(options, {validationError: error}));
+      return false;
+    }
+
+  });
+
+  // Underscore methods that we want to implement on the Model.
+  var modelMethods = { keys: 1, values: 1, pairs: 1, invert: 1, pick: 0,
+      omit: 0, chain: 1, isEmpty: 1 };
+
+  // Mix in each Underscore method as a proxy to `Model#attributes`.
+  addUnderscoreMethods(Model, modelMethods, 'attributes');
+
+  // Backbone.Collection
+  // -------------------
+
+  // If models tend to represent a single row of data, a Backbone Collection is
+  // more analogous to a table full of data ... or a small slice or page of that
+  // table, or a collection of rows that belong together for a particular reason
+  // -- all of the messages in this particular folder, all of the documents
+  // belonging to this particular author, and so on. Collections maintain
+  // indexes of their models, both in order, and for lookup by `id`.
+
+  // Create a new **Collection**, perhaps to contain a specific type of `model`.
+  // If a `comparator` is specified, the Collection will maintain
+  // its models in sort order, as they're added and removed.
+  var Collection = Backbone.Collection = function(models, options) {
+    options || (options = {});
+    if (options.model) this.model = options.model;
+    if (options.comparator !== void 0) this.comparator = options.comparator;
+    this._reset();
+    this.initialize.apply(this, arguments);
+    if (models) this.reset(models, _.extend({silent: true}, options));
+  };
+
+  // Default options for `Collection#set`.
+  var setOptions = {add: true, remove: true, merge: true};
+  var addOptions = {add: true, remove: false};
+
+  // Define the Collection's inheritable methods.
+  _.extend(Collection.prototype, Events, {
+
+    // The default model for a collection is just a **Backbone.Model**.
+    // This should be overridden in most cases.
+    model: Model,
+
+    // Initialize is an empty function by default. Override it with your own
+    // initialization logic.
+    initialize: function(){},
+
+    // The JSON representation of a Collection is an array of the
+    // models' attributes.
+    toJSON: function(options) {
+      return this.map(function(model) { return model.toJSON(options); });
+    },
+
+    // Proxy `Backbone.sync` by default.
+    sync: function() {
+      return Backbone.sync.apply(this, arguments);
+    },
+
+    // Add a model, or list of models to the set.
+    add: function(models, options) {
+      return this.set(models, _.extend({merge: false}, options, addOptions));
+    },
+
+    // Remove a model, or a list of models from the set.
+    remove: function(models, options) {
+      options = _.extend({}, options);
+      var singular = !_.isArray(models);
+      models = singular ? [models] : _.clone(models);
+      var removed = this._removeModels(models, options);
+      if (!options.silent && removed) this.trigger('update', this, options);
+      return singular ? removed[0] : removed;
+    },
+
+    // Update a collection by `set`-ing a new list of models, adding new ones,
+    // removing models that are no longer present, and merging models that
+    // already exist in the collection, as necessary. Similar to **Model#set**,
+    // the core operation for updating the data contained by the collection.
+    set: function(models, options) {
+      options = _.defaults({}, options, setOptions);
+      if (options.parse && !this._isModel(models)) models = this.parse(models, options);
+      var singular = !_.isArray(models);
+      models = singular ? (models ? [models] : []) : models.slice();
+      var id, model, attrs, existing, sort;
+      var at = options.at;
+      if (at != null) at = +at;
+      if (at < 0) at += this.length + 1;
+      var sortable = this.comparator && (at == null) && options.sort !== false;
+      var sortAttr = _.isString(this.comparator) ? this.comparator : null;
+      var toAdd = [], toRemove = [], modelMap = {};
+      var add = options.add, merge = options.merge, remove = options.remove;
+      var order = !sortable && add && remove ? [] : false;
+      var orderChanged = false;
+
+      // Turn bare objects into model references, and prevent invalid models
+      // from being added.
+      for (var i = 0; i < models.length; i++) {
+        attrs = models[i];
+
+        // If a duplicate is found, prevent it from being added and
+        // optionally merge it into the existing model.
+        if (existing = this.get(attrs)) {
+          if (remove) modelMap[existing.cid] = true;
+          if (merge && attrs !== existing) {
+            attrs = this._isModel(attrs) ? attrs.attributes : attrs;
+            if (options.parse) attrs = existing.parse(attrs, options);
+            existing.set(attrs, options);
+            if (sortable && !sort && existing.hasChanged(sortAttr)) sort = true;
+          }
+          models[i] = existing;
+
+        // If this is a new, valid model, push it to the `toAdd` list.
+        } else if (add) {
+          model = models[i] = this._prepareModel(attrs, options);
+          if (!model) continue;
+          toAdd.push(model);
+          this._addReference(model, options);
+        }
+
+        // Do not add multiple models with the same `id`.
+        model = existing || model;
+        if (!model) continue;
+        id = this.modelId(model.attributes);
+        if (order && (model.isNew() || !modelMap[id])) {
+          order.push(model);
+
+          // Check to see if this is actually a new model at this index.
+          orderChanged = orderChanged || !this.models[i] || model.cid !== this.models[i].cid;
+        }
+
+        modelMap[id] = true;
+      }
+
+      // Remove nonexistent models if appropriate.
+      if (remove) {
+        for (var i = 0; i < this.length; i++) {
+          if (!modelMap[(model = this.models[i]).cid]) toRemove.push(model);
+        }
+        if (toRemove.length) this._removeModels(toRemove, options);
+      }
+
+      // See if sorting is needed, update `length` and splice in new models.
+      if (toAdd.length || orderChanged) {
+        if (sortable) sort = true;
+        this.length += toAdd.length;
+        if (at != null) {
+          for (var i = 0; i < toAdd.length; i++) {
+            this.models.splice(at + i, 0, toAdd[i]);
+          }
+        } else {
+          if (order) this.models.length = 0;
+          var orderedModels = order || toAdd;
+          for (var i = 0; i < orderedModels.length; i++) {
+            this.models.push(orderedModels[i]);
+          }
+        }
+      }
+
+      // Silently sort the collection if appropriate.
+      if (sort) this.sort({silent: true});
+
+      // Unless silenced, it's time to fire all appropriate add/sort events.
+      if (!options.silent) {
+        var addOpts = at != null ? _.clone(options) : options;
+        for (var i = 0; i < toAdd.length; i++) {
+          if (at != null) addOpts.index = at + i;
+          (model = toAdd[i]).trigger('add', model, this, addOpts);
+        }
+        if (sort || orderChanged) this.trigger('sort', this, options);
+        if (toAdd.length || toRemove.length) this.trigger('update', this, options);
+      }
+
+      // Return the added (or merged) model (or models).
+      return singular ? models[0] : models;
+    },
+
+    // When you have more items than you want to add or remove individually,
+    // you can reset the entire set with a new list of models, without firing
+    // any granular `add` or `remove` events. Fires `reset` when finished.
+    // Useful for bulk operations and optimizations.
+    reset: function(models, options) {
+      options = options ? _.clone(options) : {};
+      for (var i = 0; i < this.models.length; i++) {
+        this._removeReference(this.models[i], options);
+      }
+      options.previousModels = this.models;
+      this._reset();
+      models = this.add(models, _.extend({silent: true}, options));
+      if (!options.silent) this.trigger('reset', this, options);
+      return models;
+    },
+
+    // Add a model to the end of the collection.
+    push: function(model, options) {
+      return this.add(model, _.extend({at: this.length}, options));
+    },
+
+    // Remove a model from the end of the collection.
+    pop: function(options) {
+      var model = this.at(this.length - 1);
+      return this.remove(model, options);
+    },
+
+    // Add a model to the beginning of the collection.
+    unshift: function(model, options) {
+      return this.add(model, _.extend({at: 0}, options));
+    },
+
+    // Remove a model from the beginning of the collection.
+    shift: function(options) {
+      var model = this.at(0);
+      return this.remove(model, options);
+    },
+
+    // Slice out a sub-array of models from the collection.
+    slice: function() {
+      return slice.apply(this.models, arguments);
+    },
+
+    // Get a model from the set by id.
+    get: function(obj) {
+      if (obj == null) return void 0;
+      var id = this.modelId(this._isModel(obj) ? obj.attributes : obj);
+      return this._byId[obj] || this._byId[id] || this._byId[obj.cid];
+    },
+
+    // Get the model at the given index.
+    at: function(index) {
+      if (index < 0) index += this.length;
+      return this.models[index];
+    },
+
+    // Return models with matching attributes. Useful for simple cases of
+    // `filter`.
+    where: function(attrs, first) {
+      var matches = _.matches(attrs);
+      return this[first ? 'find' : 'filter'](function(model) {
+        return matches(model.attributes);
+      });
+    },
+
+    // Return the first model with matching attributes. Useful for simple cases
+    // of `find`.
+    findWhere: function(attrs) {
+      return this.where(attrs, true);
+    },
+
+    // Force the collection to re-sort itself. You don't need to call this under
+    // normal circumstances, as the set will maintain sort order as each item
+    // is added.
+    sort: function(options) {
+      if (!this.comparator) throw new Error('Cannot sort a set without a comparator');
+      options || (options = {});
+
+      // Run sort based on type of `comparator`.
+      if (_.isString(this.comparator) || this.comparator.length === 1) {
+        this.models = this.sortBy(this.comparator, this);
+      } else {
+        this.models.sort(_.bind(this.comparator, this));
+      }
+
+      if (!options.silent) this.trigger('sort', this, options);
+      return this;
+    },
+
+    // Pluck an attribute from each model in the collection.
+    pluck: function(attr) {
+      return _.invoke(this.models, 'get', attr);
+    },
+
+    // Fetch the default set of models for this collection, resetting the
+    // collection when they arrive. If `reset: true` is passed, the response
+    // data will be passed through the `reset` method instead of `set`.
+    fetch: function(options) {
+      options = _.extend({parse: true}, options);
+      var success = options.success;
+      var collection = this;
+      options.success = function(resp) {
+        var method = options.reset ? 'reset' : 'set';
+        collection[method](resp, options);
+        if (success) success.call(options.context, collection, resp, options);
+        collection.trigger('sync', collection, resp, options);
+      };
+      wrapError(this, options);
+      return this.sync('read', this, options);
+    },
+
+    // Create a new instance of a model in this collection. Add the model to the
+    // collection immediately, unless `wait: true` is passed, in which case we
+    // wait for the server to agree.
+    create: function(model, options) {
+      options = options ? _.clone(options) : {};
+      var wait = options.wait;
+      model = this._prepareModel(model, options);
+      if (!model) return false;
+      if (!wait) this.add(model, options);
+      var collection = this;
+      var success = options.success;
+      options.success = function(model, resp, callbackOpts) {
+        if (wait) collection.add(model, callbackOpts);
+        if (success) success.call(callbackOpts.context, model, resp, callbackOpts);
+      };
+      model.save(null, options);
+      return model;
+    },
+
+    // **parse** converts a response into a list of models to be added to the
+    // collection. The default implementation is just to pass it through.
+    parse: function(resp, options) {
+      return resp;
+    },
+
+    // Create a new collection with an identical list of models as this one.
+    clone: function() {
+      return new this.constructor(this.models, {
+        model: this.model,
+        comparator: this.comparator
+      });
+    },
+
+    // Define how to uniquely identify models in the collection.
+    modelId: function (attrs) {
+      return attrs[this.model.prototype.idAttribute || 'id'];
+    },
+
+    // Private method to reset all internal state. Called when the collection
+    // is first initialized or reset.
+    _reset: function() {
+      this.length = 0;
+      this.models = [];
+      this._byId  = {};
+    },
+
+    // Prepare a hash of attributes (or other model) to be added to this
+    // collection.
+    _prepareModel: function(attrs, options) {
+      if (this._isModel(attrs)) {
+        if (!attrs.collection) attrs.collection = this;
+        return attrs;
+      }
+      options = options ? _.clone(options) : {};
+      options.collection = this;
+      var model = new this.model(attrs, options);
+      if (!model.validationError) return model;
+      this.trigger('invalid', this, model.validationError, options);
+      return false;
+    },
+
+    // Internal method called by both remove and set.
+    // Returns removed models, or false if nothing is removed.
+    _removeModels: function(models, options) {
+      var removed = [];
+      for (var i = 0; i < models.length; i++) {
+        var model = this.get(models[i]);
+        if (!model) continue;
+
+        var index = this.indexOf(model);
+        this.models.splice(index, 1);
+        this.length--;
+
+        if (!options.silent) {
+          options.index = index;
+          model.trigger('remove', model, this, options);
+        }
+
+        removed.push(model);
+        this._removeReference(model, options);
+      }
+      return removed.length ? removed : false;
+    },
+
+    // Method for checking whether an object should be considered a model for
+    // the purposes of adding to the collection.
+    _isModel: function (model) {
+      return model instanceof Model;
+    },
+
+    // Internal method to create a model's ties to a collection.
+    _addReference: function(model, options) {
+      this._byId[model.cid] = model;
+      var id = this.modelId(model.attributes);
+      if (id != null) this._byId[id] = model;
+      model.on('all', this._onModelEvent, this);
+    },
+
+    // Internal method to sever a model's ties to a collection.
+    _removeReference: function(model, options) {
+      delete this._byId[model.cid];
+      var id = this.modelId(model.attributes);
+      if (id != null) delete this._byId[id];
+      if (this === model.collection) delete model.collection;
+      model.off('all', this._onModelEvent, this);
+    },
+
+    // Internal method called every time a model in the set fires an event.
+    // Sets need to update their indexes when models change ids. All other
+    // events simply proxy through. "add" and "remove" events that originate
+    // in other collections are ignored.
+    _onModelEvent: function(event, model, collection, options) {
+      if ((event === 'add' || event === 'remove') && collection !== this) return;
+      if (event === 'destroy') this.remove(model, options);
+      if (event === 'change') {
+        var prevId = this.modelId(model.previousAttributes());
+        var id = this.modelId(model.attributes);
+        if (prevId !== id) {
+          if (prevId != null) delete this._byId[prevId];
+          if (id != null) this._byId[id] = model;
+        }
+      }
+      this.trigger.apply(this, arguments);
+    }
+
+  });
+
+  // Underscore methods that we want to implement on the Collection.
+  // 90% of the core usefulness of Backbone Collections is actually implemented
+  // right here:
+  var collectionMethods = { forEach: 3, each: 3, map: 3, collect: 3, reduce: 4,
+      foldl: 4, inject: 4, reduceRight: 4, foldr: 4, find: 3, detect: 3, filter: 3,
+      select: 3, reject: 3, every: 3, all: 3, some: 3, any: 3, include: 2,
+      contains: 2, invoke: 0, max: 3, min: 3, toArray: 1, size: 1, first: 3,
+      head: 3, take: 3, initial: 3, rest: 3, tail: 3, drop: 3, last: 3,
+      without: 0, difference: 0, indexOf: 3, shuffle: 1, lastIndexOf: 3,
+      isEmpty: 1, chain: 1, sample: 3, partition: 3 };
+
+  // Mix in each Underscore method as a proxy to `Collection#models`.
+  addUnderscoreMethods(Collection, collectionMethods, 'models');
+
+  // Underscore methods that take a property name as an argument.
+  var attributeMethods = ['groupBy', 'countBy', 'sortBy', 'indexBy'];
+
+  // Use attributes instead of properties.
+  _.each(attributeMethods, function(method) {
+    if (!_[method]) return;
+    Collection.prototype[method] = function(value, context) {
+      var iterator = _.isFunction(value) ? value : function(model) {
+        return model.get(value);
+      };
+      return _[method](this.models, iterator, context);
+    };
+  });
+
+  // Backbone.View
+  // -------------
+
+  // Backbone Views are almost more convention than they are actual code. A View
+  // is simply a JavaScript object that represents a logical chunk of UI in the
+  // DOM. This might be a single item, an entire list, a sidebar or panel, or
+  // even the surrounding frame which wraps your whole app. Defining a chunk of
+  // UI as a **View** allows you to define your DOM events declaratively, without
+  // having to worry about render order ... and makes it easy for the view to
+  // react to specific changes in the state of your models.
+
+  // Creating a Backbone.View creates its initial element outside of the DOM,
+  // if an existing element is not provided...
+  var View = Backbone.View = function(options) {
+    this.cid = _.uniqueId('view');
+    _.extend(this, _.pick(options, viewOptions));
+    this._ensureElement();
+    this.initialize.apply(this, arguments);
+  };
+
+  // Cached regex to split keys for `delegate`.
+  var delegateEventSplitter = /^(\S+)\s*(.*)$/;
+
+  // List of view options to be merged as properties.
+  var viewOptions = ['model', 'collection', 'el', 'id', 'attributes', 'className', 'tagName', 'events'];
+
+  // Set up all inheritable **Backbone.View** properties and methods.
+  _.extend(View.prototype, Events, {
+
+    // The default `tagName` of a View's element is `"div"`.
+    tagName: 'div',
+
+    // jQuery delegate for element lookup, scoped to DOM elements within the
+    // current view. This should be preferred to global lookups where possible.
+    $: function(selector) {
+      return this.$el.find(selector);
+    },
+
+    // Initialize is an empty function by default. Override it with your own
+    // initialization logic.
+    initialize: function(){},
+
+    // **render** is the core function that your view should override, in order
+    // to populate its element (`this.el`), with the appropriate HTML. The
+    // convention is for **render** to always return `this`.
+    render: function() {
+      return this;
+    },
+
+    // Remove this view by taking the element out of the DOM, and removing any
+    // applicable Backbone.Events listeners.
+    remove: function() {
+      this._removeElement();
+      this.stopListening();
+      return this;
+    },
+
+    // Remove this view's element from the document and all event listeners
+    // attached to it. Exposed for subclasses using an alternative DOM
+    // manipulation API.
+    _removeElement: function() {
+      this.$el.remove();
+    },
+
+    // Change the view's element (`this.el` property) and re-delegate the
+    // view's events on the new element.
+    setElement: function(element) {
+      this.undelegateEvents();
+      this._setElement(element);
+      this.delegateEvents();
+      return this;
+    },
+
+    // Creates the `this.el` and `this.$el` references for this view using the
+    // given `el`. `el` can be a CSS selector or an HTML string, a jQuery
+    // context or an element. Subclasses can override this to utilize an
+    // alternative DOM manipulation API and are only required to set the
+    // `this.el` property.
+    _setElement: function(el) {
+      this.$el = el instanceof Backbone.$ ? el : Backbone.$(el);
+      this.el = this.$el[0];
+    },
+
+    // Set callbacks, where `this.events` is a hash of
+    //
+    // *{"event selector": "callback"}*
+    //
+    //     {
+    //       'mousedown .title':  'edit',
+    //       'click .button':     'save',
+    //       'click .open':       function(e) { ... }
+    //     }
+    //
+    // pairs. Callbacks will be bound to the view, with `this` set properly.
+    // Uses event delegation for efficiency.
+    // Omitting the selector binds the event to `this.el`.
+    delegateEvents: function(events) {
+      events || (events = _.result(this, 'events'));
+      if (!events) return this;
+      this.undelegateEvents();
+      for (var key in events) {
+        var method = events[key];
+        if (!_.isFunction(method)) method = this[method];
+        if (!method) continue;
+        var match = key.match(delegateEventSplitter);
+        this.delegate(match[1], match[2], _.bind(method, this));
+      }
+      return this;
+    },
+
+    // Add a single event listener to the view's element (or a child element
+    // using `selector`). This only works for delegate-able events: not `focus`,
+    // `blur`, and not `change`, `submit`, and `reset` in Internet Explorer.
+    delegate: function(eventName, selector, listener) {
+      this.$el.on(eventName + '.delegateEvents' + this.cid, selector, listener);
+      return this;
+    },
+
+    // Clears all callbacks previously bound to the view by `delegateEvents`.
+    // You usually don't need to use this, but may wish to if you have multiple
+    // Backbone views attached to the same DOM element.
+    undelegateEvents: function() {
+      if (this.$el) this.$el.off('.delegateEvents' + this.cid);
+      return this;
+    },
+
+    // A finer-grained `undelegateEvents` for removing a single delegated event.
+    // `selector` and `listener` are both optional.
+    undelegate: function(eventName, selector, listener) {
+      this.$el.off(eventName + '.delegateEvents' + this.cid, selector, listener);
+      return this;
+    },
+
+    // Produces a DOM element to be assigned to your view. Exposed for
+    // subclasses using an alternative DOM manipulation API.
+    _createElement: function(tagName) {
+      return document.createElement(tagName);
+    },
+
+    // Ensure that the View has a DOM element to render into.
+    // If `this.el` is a string, pass it through `$()`, take the first
+    // matching element, and re-assign it to `el`. Otherwise, create
+    // an element from the `id`, `className` and `tagName` properties.
+    _ensureElement: function() {
+      if (!this.el) {
+        var attrs = _.extend({}, _.result(this, 'attributes'));
+        if (this.id) attrs.id = _.result(this, 'id');
+        if (this.className) attrs['class'] = _.result(this, 'className');
+        this.setElement(this._createElement(_.result(this, 'tagName')));
+        this._setAttributes(attrs);
+      } else {
+        this.setElement(_.result(this, 'el'));
+      }
+    },
+
+    // Set attributes from a hash on this view's element.  Exposed for
+    // subclasses using an alternative DOM manipulation API.
+    _setAttributes: function(attributes) {
+      this.$el.attr(attributes);
+    }
+
+  });
+
+  // Backbone.sync
+  // -------------
+
+  // Override this function to change the manner in which Backbone persists
+  // models to the server. You will be passed the type of request, and the
+  // model in question. By default, makes a RESTful Ajax request
+  // to the model's `url()`. Some possible customizations could be:
+  //
+  // * Use `setTimeout` to batch rapid-fire updates into a single request.
+  // * Send up the models as XML instead of JSON.
+  // * Persist models via WebSockets instead of Ajax.
+  //
+  // Turn on `Backbone.emulateHTTP` in order to send `PUT` and `DELETE` requests
+  // as `POST`, with a `_method` parameter containing the true HTTP method,
+  // as well as all requests with the body as `application/x-www-form-urlencoded`
+  // instead of `application/json` with the model in a param named `model`.
+  // Useful when interfacing with server-side languages like **PHP** that make
+  // it difficult to read the body of `PUT` requests.
+  Backbone.sync = function(method, model, options) {
+    var type = methodMap[method];
+
+    // Default options, unless specified.
+    _.defaults(options || (options = {}), {
+      emulateHTTP: Backbone.emulateHTTP,
+      emulateJSON: Backbone.emulateJSON
+    });
+
+    // Default JSON-request options.
+    var params = {type: type, dataType: 'json'};
+
+    // Ensure that we have a URL.
+    if (!options.url) {
+      params.url = _.result(model, 'url') || urlError();
+    }
+
+    // Ensure that we have the appropriate request data.
+    if (options.data == null && model && (method === 'create' || method === 'update' || method === 'patch')) {
+      params.contentType = 'application/json';
+      params.data = JSON.stringify(options.attrs || model.toJSON(options));
+    }
+
+    // For older servers, emulate JSON by encoding the request into an HTML-form.
+    if (options.emulateJSON) {
+      params.contentType = 'application/x-www-form-urlencoded';
+      params.data = params.data ? {model: params.data} : {};
+    }
+
+    // For older servers, emulate HTTP by mimicking the HTTP method with `_method`
+    // And an `X-HTTP-Method-Override` header.
+    if (options.emulateHTTP && (type === 'PUT' || type === 'DELETE' || type === 'PATCH')) {
+      params.type = 'POST';
+      if (options.emulateJSON) params.data._method = type;
+      var beforeSend = options.beforeSend;
+      options.beforeSend = function(xhr) {
+        xhr.setRequestHeader('X-HTTP-Method-Override', type);
+        if (beforeSend) return beforeSend.apply(this, arguments);
+      };
+    }
+
+    // Don't process data on a non-GET request.
+    if (params.type !== 'GET' && !options.emulateJSON) {
+      params.processData = false;
+    }
+
+    // Pass along `textStatus` and `errorThrown` from jQuery.
+    var error = options.error;
+    options.error = function(xhr, textStatus, errorThrown) {
+      options.textStatus = textStatus;
+      options.errorThrown = errorThrown;
+      if (error) error.call(options.context, xhr, textStatus, errorThrown);
+    };
+
+    // Make the request, allowing the user to override any Ajax options.
+    var xhr = options.xhr = Backbone.ajax(_.extend(params, options));
+    model.trigger('request', model, xhr, options);
+    return xhr;
+  };
+
+  // Map from CRUD to HTTP for our default `Backbone.sync` implementation.
+  var methodMap = {
+    'create': 'POST',
+    'update': 'PUT',
+    'patch':  'PATCH',
+    'delete': 'DELETE',
+    'read':   'GET'
+  };
+
+  // Set the default implementation of `Backbone.ajax` to proxy through to `$`.
+  // Override this if you'd like to use a different library.
+  Backbone.ajax = function() {
+    return Backbone.$.ajax.apply(Backbone.$, arguments);
+  };
+
+  // Backbone.Router
+  // ---------------
+
+  // Routers map faux-URLs to actions, and fire events when routes are
+  // matched. Creating a new one sets its `routes` hash, if not set statically.
+  var Router = Backbone.Router = function(options) {
+    options || (options = {});
+    if (options.routes) this.routes = options.routes;
+    this._bindRoutes();
+    this.initialize.apply(this, arguments);
+  };
+
+  // Cached regular expressions for matching named param parts and splatted
+  // parts of route strings.
+  var optionalParam = /\((.*?)\)/g;
+  var namedParam    = /(\(\?)?:\w+/g;
+  var splatParam    = /\*\w+/g;
+  var escapeRegExp  = /[\-{}\[\]+?.,\\\^$|#\s]/g;
+
+  // Set up all inheritable **Backbone.Router** properties and methods.
+  _.extend(Router.prototype, Events, {
+
+    // Initialize is an empty function by default. Override it with your own
+    // initialization logic.
+    initialize: function(){},
+
+    // Manually bind a single named route to a callback. For example:
+    //
+    //     this.route('search/:query/p:num', 'search', function(query, num) {
+    //       ...
+    //     });
+    //
+    route: function(route, name, callback) {
+      if (!_.isRegExp(route)) route = this._routeToRegExp(route);
+      if (_.isFunction(name)) {
+        callback = name;
+        name = '';
+      }
+      if (!callback) callback = this[name];
+      var router = this;
+      Backbone.history.route(route, function(fragment) {
+        var args = router._extractParameters(route, fragment);
+        if (router.execute(callback, args, name) !== false) {
+          router.trigger.apply(router, ['route:' + name].concat(args));
+          router.trigger('route', name, args);
+          Backbone.history.trigger('route', router, name, args);
+        }
+      });
+      return this;
+    },
+
+    // Execute a route handler with the provided parameters.  This is an
+    // excellent place to do pre-route setup or post-route cleanup.
+    execute: function(callback, args, name) {
+      if (callback) callback.apply(this, args);
+    },
+
+    // Simple proxy to `Backbone.history` to save a fragment into the history.
+    navigate: function(fragment, options) {
+      Backbone.history.navigate(fragment, options);
+      return this;
+    },
+
+    // Bind all defined routes to `Backbone.history`. We have to reverse the
+    // order of the routes here to support behavior where the most general
+    // routes can be defined at the bottom of the route map.
+    _bindRoutes: function() {
+      if (!this.routes) return;
+      this.routes = _.result(this, 'routes');
+      var route, routes = _.keys(this.routes);
+      while ((route = routes.pop()) != null) {
+        this.route(route, this.routes[route]);
+      }
+    },
+
+    // Convert a route string into a regular expression, suitable for matching
+    // against the current location hash.
+    _routeToRegExp: function(route) {
+      route = route.replace(escapeRegExp, '\\$&')
+                   .replace(optionalParam, '(?:$1)?')
+                   .replace(namedParam, function(match, optional) {
+                     return optional ? match : '([^/?]+)';
+                   })
+                   .replace(splatParam, '([^?]*?)');
+      return new RegExp('^' + route + '(?:\\?([\\s\\S]*))?$');
+    },
+
+    // Given a route, and a URL fragment that it matches, return the array of
+    // extracted decoded parameters. Empty or unmatched parameters will be
+    // treated as `null` to normalize cross-browser behavior.
+    _extractParameters: function(route, fragment) {
+      var params = route.exec(fragment).slice(1);
+      return _.map(params, function(param, i) {
+        // Don't decode the search params.
+        if (i === params.length - 1) return param || null;
+        return param ? decodeURIComponent(param) : null;
+      });
+    }
+
+  });
+
+  // Backbone.History
+  // ----------------
+
+  // Handles cross-browser history management, based on either
+  // [pushState](http://diveintohtml5.info/history.html) and real URLs, or
+  // [onhashchange](https://developer.mozilla.org/en-US/docs/DOM/window.onhashchange)
+  // and URL fragments. If the browser supports neither (old IE, natch),
+  // falls back to polling.
+  var History = Backbone.History = function() {
+    this.handlers = [];
+    _.bindAll(this, 'checkUrl');
+
+    // Ensure that `History` can be used outside of the browser.
+    if (typeof window !== 'undefined') {
+      this.location = window.location;
+      this.history = window.history;
+    }
+  };
+
+  // Cached regex for stripping a leading hash/slash and trailing space.
+  var routeStripper = /^[#\/]|\s+$/g;
+
+  // Cached regex for stripping leading and trailing slashes.
+  var rootStripper = /^\/+|\/+$/g;
+
+  // Cached regex for stripping urls of hash.
+  var pathStripper = /#.*$/;
+
+  // Has the history handling already been started?
+  History.started = false;
+
+  // Set up all inheritable **Backbone.History** properties and methods.
+  _.extend(History.prototype, Events, {
+
+    // The default interval to poll for hash changes, if necessary, is
+    // twenty times a second.
+    interval: 50,
+
+    // Are we at the app root?
+    atRoot: function() {
+      var path = this.location.pathname.replace(/[^\/]$/, '$&/');
+      return path === this.root && !this.getSearch();
+    },
+
+    // Does the pathname match the root?
+    matchRoot: function() {
+      var path = this.decodeFragment(this.location.pathname);
+      var root = path.slice(0, this.root.length - 1) + '/';
+      return root === this.root;
+    },
+
+    // Unicode characters in `location.pathname` are percent encoded so they're
+    // decoded for comparison. `%25` should not be decoded since it may be part
+    // of an encoded parameter.
+    decodeFragment: function(fragment) {
+      return decodeURI(fragment.replace(/%25/g, '%2525'));
+    },
+
+    // In IE6, the hash fragment and search params are incorrect if the
+    // fragment contains `?`.
+    getSearch: function() {
+      var match = this.location.href.replace(/#.*/, '').match(/\?.+/);
+      return match ? match[0] : '';
+    },
+
+    // Gets the true hash value. Cannot use location.hash directly due to bug
+    // in Firefox where location.hash will always be decoded.
+    getHash: function(window) {
+      var match = (window || this).location.href.match(/#(.*)$/);
+      return match ? match[1] : '';
+    },
+
+    // Get the pathname and search params, without the root.
+    getPath: function() {
+      var path = this.decodeFragment(
+        this.location.pathname + this.getSearch()
+      ).slice(this.root.length - 1);
+      return path.charAt(0) === '/' ? path.slice(1) : path;
+    },
+
+    // Get the cross-browser normalized URL fragment from the path or hash.
+    getFragment: function(fragment) {
+      if (fragment == null) {
+        if (this._usePushState || !this._wantsHashChange) {
+          fragment = this.getPath();
+        } else {
+          fragment = this.getHash();
+        }
+      }
+      return fragment.replace(routeStripper, '');
+    },
+
+    // Start the hash change handling, returning `true` if the current URL matches
+    // an existing route, and `false` otherwise.
+    start: function(options) {
+      if (History.started) throw new Error('Backbone.history has already been started');
+      History.started = true;
+
+      // Figure out the initial configuration. Do we need an iframe?
+      // Is pushState desired ... is it available?
+      this.options          = _.extend({root: '/'}, this.options, options);
+      this.root             = this.options.root;
+      this._wantsHashChange = this.options.hashChange !== false;
+      this._hasHashChange   = 'onhashchange' in window;
+      this._useHashChange   = this._wantsHashChange && this._hasHashChange;
+      this._wantsPushState  = !!this.options.pushState;
+      this._hasPushState    = !!(this.history && this.history.pushState);
+      this._usePushState    = this._wantsPushState && this._hasPushState;
+      this.fragment         = this.getFragment();
+
+      // Normalize root to always include a leading and trailing slash.
+      this.root = ('/' + this.root + '/').replace(rootStripper, '/');
+
+      // Transition from hashChange to pushState or vice versa if both are
+      // requested.
+      if (this._wantsHashChange && this._wantsPushState) {
+
+        // If we've started off with a route from a `pushState`-enabled
+        // browser, but we're currently in a browser that doesn't support it...
+        if (!this._hasPushState && !this.atRoot()) {
+          var root = this.root.slice(0, -1) || '/';
+          this.location.replace(root + '#' + this.getPath());
+          // Return immediately as browser will do redirect to new url
+          return true;
+
+        // Or if we've started out with a hash-based route, but we're currently
+        // in a browser where it could be `pushState`-based instead...
+        } else if (this._hasPushState && this.atRoot()) {
+          this.navigate(this.getHash(), {replace: true});
+        }
+
+      }
+
+      // Proxy an iframe to handle location events if the browser doesn't
+      // support the `hashchange` event, HTML5 history, or the user wants
+      // `hashChange` but not `pushState`.
+      if (!this._hasHashChange && this._wantsHashChange && !this._usePushState) {
+        this.iframe = document.createElement('iframe');
+        this.iframe.src = 'javascript:0';
+        this.iframe.style.display = 'none';
+        this.iframe.tabIndex = -1;
+        var body = document.body;
+        // Using `appendChild` will throw on IE < 9 if the document is not ready.
+        var iWindow = body.insertBefore(this.iframe, body.firstChild).contentWindow;
+        iWindow.document.open();
+        iWindow.document.close();
+        iWindow.location.hash = '#' + this.fragment;
+      }
+
+      // Add a cross-platform `addEventListener` shim for older browsers.
+      var addEventListener = window.addEventListener || function (eventName, listener) {
+        return attachEvent('on' + eventName, listener);
+      };
+
+      // Depending on whether we're using pushState or hashes, and whether
+      // 'onhashchange' is supported, determine how we check the URL state.
+      if (this._usePushState) {
+        addEventListener('popstate', this.checkUrl, false);
+      } else if (this._useHashChange && !this.iframe) {
+        addEventListener('hashchange', this.checkUrl, false);
+      } else if (this._wantsHashChange) {
+        this._checkUrlInterval = setInterval(this.checkUrl, this.interval);
+      }
+
+      if (!this.options.silent) return this.loadUrl();
+    },
+
+    // Disable Backbone.history, perhaps temporarily. Not useful in a real app,
+    // but possibly useful for unit testing Routers.
+    stop: function() {
+      // Add a cross-platform `removeEventListener` shim for older browsers.
+      var removeEventListener = window.removeEventListener || function (eventName, listener) {
+        return detachEvent('on' + eventName, listener);
+      };
+
+      // Remove window listeners.
+      if (this._usePushState) {
+        removeEventListener('popstate', this.checkUrl, false);
+      } else if (this._useHashChange && !this.iframe) {
+        removeEventListener('hashchange', this.checkUrl, false);
+      }
+
+      // Clean up the iframe if necessary.
+      if (this.iframe) {
+        document.body.removeChild(this.iframe);
+        this.iframe = null;
+      }
+
+      // Some environments will throw when clearing an undefined interval.
+      if (this._checkUrlInterval) clearInterval(this._checkUrlInterval);
+      History.started = false;
+    },
+
+    // Add a route to be tested when the fragment changes. Routes added later
+    // may override previous routes.
+    route: function(route, callback) {
+      this.handlers.unshift({route: route, callback: callback});
+    },
+
+    // Checks the current URL to see if it has changed, and if it has,
+    // calls `loadUrl`, normalizing across the hidden iframe.
+    checkUrl: function(e) {
+      var current = this.getFragment();
+
+      // If the user pressed the back button, the iframe's hash will have
+      // changed and we should use that for comparison.
+      if (current === this.fragment && this.iframe) {
+        current = this.getHash(this.iframe.contentWindow);
+      }
+
+      if (current === this.fragment) return false;
+      if (this.iframe) this.navigate(current);
+      this.loadUrl();
+    },
+
+    // Attempt to load the current URL fragment. If a route succeeds with a
+    // match, returns `true`. If no defined routes matches the fragment,
+    // returns `false`.
+    loadUrl: function(fragment) {
+      // If the root doesn't match, no routes can match either.
+      if (!this.matchRoot()) return false;
+      fragment = this.fragment = this.getFragment(fragment);
+      return _.any(this.handlers, function(handler) {
+        if (handler.route.test(fragment)) {
+          handler.callback(fragment);
+          return true;
+        }
+      });
+    },
+
+    // Save a fragment into the hash history, or replace the URL state if the
+    // 'replace' option is passed. You are responsible for properly URL-encoding
+    // the fragment in advance.
+    //
+    // The options object can contain `trigger: true` if you wish to have the
+    // route callback be fired (not usually desirable), or `replace: true`, if
+    // you wish to modify the current URL without adding an entry to the history.
+    navigate: function(fragment, options) {
+      if (!History.started) return false;
+      if (!options || options === true) options = {trigger: !!options};
+
+      // Normalize the fragment.
+      fragment = this.getFragment(fragment || '');
+
+      // Don't include a trailing slash on the root.
+      var root = this.root;
+      if (fragment === '' || fragment.charAt(0) === '?') {
+        root = root.slice(0, -1) || '/';
+      }
+      var url = root + fragment;
+
+      // Strip the hash and decode for matching.
+      fragment = this.decodeFragment(fragment.replace(pathStripper, ''));
+
+      if (this.fragment === fragment) return;
+      this.fragment = fragment;
+
+      // If pushState is available, we use it to set the fragment as a real URL.
+      if (this._usePushState) {
+        this.history[options.replace ? 'replaceState' : 'pushState']({}, document.title, url);
+
+      // If hash changes haven't been explicitly disabled, update the hash
+      // fragment to store history.
+      } else if (this._wantsHashChange) {
+        this._updateHash(this.location, fragment, options.replace);
+        if (this.iframe && (fragment !== this.getHash(this.iframe.contentWindow))) {
+          var iWindow = this.iframe.contentWindow;
+
+          // Opening and closing the iframe tricks IE7 and earlier to push a
+          // history entry on hash-tag change.  When replace is true, we don't
+          // want this.
+          if (!options.replace) {
+            iWindow.document.open();
+            iWindow.document.close();
+          }
+
+          this._updateHash(iWindow.location, fragment, options.replace);
+        }
+
+      // If you've told us that you explicitly don't want fallback hashchange-
+      // based history, then `navigate` becomes a page refresh.
+      } else {
+        return this.location.assign(url);
+      }
+      if (options.trigger) return this.loadUrl(fragment);
+    },
+
+    // Update the hash location, either replacing the current entry, or adding
+    // a new one to the browser history.
+    _updateHash: function(location, fragment, replace) {
+      if (replace) {
+        var href = location.href.replace(/(javascript:|#).*$/, '');
+        location.replace(href + '#' + fragment);
+      } else {
+        // Some browsers require that `hash` contains a leading #.
+        location.hash = '#' + fragment;
+      }
+    }
+
+  });
+
+  // Create the default Backbone.history.
+  Backbone.history = new History;
+
+  // Helpers
+  // -------
+
+  // Helper function to correctly set up the prototype chain for subclasses.
+  // Similar to `goog.inherits`, but uses a hash of prototype properties and
+  // class properties to be extended.
+  var extend = function(protoProps, staticProps) {
+    var parent = this;
+    var child;
+
+    // The constructor function for the new subclass is either defined by you
+    // (the "constructor" property in your `extend` definition), or defaulted
+    // by us to simply call the parent constructor.
+    if (protoProps && _.has(protoProps, 'constructor')) {
+      child = protoProps.constructor;
+    } else {
+      child = function(){ return parent.apply(this, arguments); };
+    }
+
+    // Add static properties to the constructor function, if supplied.
+    _.extend(child, parent, staticProps);
+
+    // Set the prototype chain to inherit from `parent`, without calling
+    // `parent` constructor function.
+    var Surrogate = function(){ this.constructor = child; };
+    Surrogate.prototype = parent.prototype;
+    child.prototype = new Surrogate;
+
+    // Add prototype properties (instance properties) to the subclass,
+    // if supplied.
+    if (protoProps) _.extend(child.prototype, protoProps);
+
+    // Set a convenience property in case the parent's prototype is needed
+    // later.
+    child.__super__ = parent.prototype;
+
+    return child;
+  };
+
+  // Set up inheritance for the model, collection, router, view and history.
+  Model.extend = Collection.extend = Router.extend = View.extend = History.extend = extend;
+
+  // Throw an error when a URL is needed, and none is supplied.
+  var urlError = function() {
+    throw new Error('A "url" property or function must be specified');
+  };
+
+  // Wrap an optional error callback with a fallback error event.
+  var wrapError = function(model, options) {
+    var error = options.error;
+    options.error = function(resp) {
+      if (error) error.call(options.context, model, resp, options);
+      model.trigger('error', model, resp, options);
+    };
+  };
+
+  return Backbone;
+
+}));
diff --git a/core/composer.json b/core/composer.json
index 22c40629f..26938e39d 100644
--- a/core/composer.json
+++ b/core/composer.json
@@ -4,8 +4,7 @@
   "type": "drupal-core",
   "license": "GPL-2.0+",
   "require": {
-    "php": ">=5.4.5",
-    "sdboyer/gliph": "0.1.*",
+    "php": ">=5.5.9",
     "symfony/class-loader": "2.7.*",
     "symfony/console": "2.7.*",
     "symfony/css-selector": "2.7.*",
@@ -22,18 +21,20 @@
     "twig/twig": "1.18.*",
     "doctrine/common": "~2.4.2",
     "doctrine/annotations": "1.2.*",
-    "guzzlehttp/guzzle": "~5.0",
+    "guzzlehttp/guzzle": "dev-master#1879fbe853b0c64d109e369c7aeff09849e62d1e",
     "symfony-cmf/routing": "1.3.*",
     "easyrdf/easyrdf": "0.9.*",
     "phpunit/phpunit": "4.6.*",
     "zendframework/zend-feed": "2.4.*",
-    "mikey179/vfsStream": "1.*",
+    "mikey179/vfsStream": "~1.2",
     "stack/builder": "1.0.*",
     "egulias/email-validator": "1.2.*",
     "behat/mink": "~1.6",
-    "behat/mink-goutte-driver": "~1.1",
-    "fabpot/goutte": "^2.0.3",
-    "masterminds/html5": "~2.1"
+    "behat/mink-goutte-driver": "dev-master#cc5ce119b5a8e06662f634b35967aff0b0c7dfdd",
+    "fabpot/goutte": "~3.1",
+    "masterminds/html5": "~2.1",
+    "symfony/psr-http-message-bridge": "v0.2",
+    "zendframework/zend-diactoros": "1.1.0"
   },
   "replace": {
     "drupal/action": "self.version",
diff --git a/core/composer.lock b/core/composer.lock
index 536389885..676d0bf29 100644
--- a/core/composer.lock
+++ b/core/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "61a2b6dec8252d78e904d37fbf1637d7",
+    "hash": "3708d8fdb54957e5ce661cda1df88353",
     "packages": [
         {
             "name": "behat/mink",
@@ -118,22 +118,22 @@
         },
         {
             "name": "behat/mink-goutte-driver",
-            "version": "v1.1.0",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "https://github.com/minkphp/MinkGoutteDriver.git",
-                "reference": "2bf327b4166694ecaa8ae7f956cb6ae252ecf03e"
+                "reference": "cc5ce119b5a8e06662f634b35967aff0b0c7dfdd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/minkphp/MinkGoutteDriver/zipball/2bf327b4166694ecaa8ae7f956cb6ae252ecf03e",
-                "reference": "2bf327b4166694ecaa8ae7f956cb6ae252ecf03e",
+                "url": "https://api.github.com/repos/minkphp/MinkGoutteDriver/zipball/cc5ce119b5a8e06662f634b35967aff0b0c7dfdd",
+                "reference": "cc5ce119b5a8e06662f634b35967aff0b0c7dfdd",
                 "shasum": ""
             },
             "require": {
                 "behat/mink": "~1.6@dev",
                 "behat/mink-browserkit-driver": "~1.2@dev",
-                "fabpot/goutte": "~1.0.4|~2.0",
+                "fabpot/goutte": "~1.0.4|~2.0|~3.1",
                 "php": ">=5.3.1"
             },
             "type": "mink-driver",
@@ -143,8 +143,8 @@
                 }
             },
             "autoload": {
-                "psr-0": {
-                    "Behat\\Mink\\Driver": "src/"
+                "psr-4": {
+                    "Behat\\Mink\\Driver\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -166,7 +166,7 @@
                 "headless",
                 "testing"
             ],
-            "time": "2014-10-09 09:21:12"
+            "time": "2015-06-27 00:15:11"
         },
         {
             "name": "doctrine/annotations",
@@ -570,22 +570,27 @@
         },
         {
             "name": "doctrine/lexer",
-            "version": "v1.0",
+            "version": "v1.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/lexer.git",
-                "reference": "v1.0"
+                "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/lexer/zipball/2f708a85bb3aab5d99dab8be435abd73e0b18acb",
-                "reference": "v1.0",
+                "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c",
+                "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.2"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
             "autoload": {
                 "psr-0": {
                     "Doctrine\\Common\\Lexer\\": "lib/"
@@ -596,20 +601,17 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com",
-                    "homepage": "http://www.instaclick.com"
-                },
                 {
                     "name": "Roman Borschel",
                     "email": "roman@code-factory.org"
                 },
                 {
-                    "name": "Johannes M. Schmitt",
-                    "email": "schmittjoh@gmail.com",
-                    "homepage": "https://github.com/schmittjoh",
-                    "role": "Developer of wrapped JMSSerializerBundle"
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
+                {
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com"
                 }
             ],
             "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.",
@@ -618,7 +620,7 @@
                 "lexer",
                 "parser"
             ],
-            "time": "2013-01-12 18:59:04"
+            "time": "2014-09-09 13:34:57"
         },
         {
             "name": "easyrdf/easyrdf",
@@ -684,29 +686,30 @@
         },
         {
             "name": "egulias/email-validator",
-            "version": "1.2.5",
+            "version": "1.2.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/egulias/EmailValidator.git",
-                "reference": "518f80a0ff7c1a35780e7702f4262c8c6f2b807f"
+                "reference": "af864423f50ea59f96c87bb1eae147a70bcf67a1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/518f80a0ff7c1a35780e7702f4262c8c6f2b807f",
-                "reference": "518f80a0ff7c1a35780e7702f4262c8c6f2b807f",
+                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/af864423f50ea59f96c87bb1eae147a70bcf67a1",
+                "reference": "af864423f50ea59f96c87bb1eae147a70bcf67a1",
                 "shasum": ""
             },
             "require": {
-                "doctrine/lexer": "~1.0",
+                "doctrine/lexer": "~1.0,>=1.0.1",
                 "php": ">= 5.3.3"
             },
             "require-dev": {
+                "phpunit/phpunit": "~4.4",
                 "satooshi/php-coveralls": "dev-master"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.3.x-dev"
+                    "dev-master": "2.0.x-dev"
                 }
             },
             "autoload": {
@@ -727,28 +730,30 @@
             "homepage": "https://github.com/egulias/EmailValidator",
             "keywords": [
                 "email",
+                "emailvalidation",
+                "emailvalidator",
                 "validation",
                 "validator"
             ],
-            "time": "2014-11-06 08:59:44"
+            "time": "2015-06-22 21:07:51"
         },
         {
             "name": "fabpot/goutte",
-            "version": "v2.0.3",
+            "version": "v3.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/FriendsOfPHP/Goutte.git",
-                "reference": "65ab61eae03d670b93a9044ad2328eb81aa1bde5"
+                "reference": "d9a5a28782d30e9f4e20176caea58a1d459f2c71"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfPHP/Goutte/zipball/65ab61eae03d670b93a9044ad2328eb81aa1bde5",
-                "reference": "65ab61eae03d670b93a9044ad2328eb81aa1bde5",
+                "url": "https://api.github.com/repos/FriendsOfPHP/Goutte/zipball/d9a5a28782d30e9f4e20176caea58a1d459f2c71",
+                "reference": "d9a5a28782d30e9f4e20176caea58a1d459f2c71",
                 "shasum": ""
             },
             "require": {
-                "guzzlehttp/guzzle": ">=4,<6",
-                "php": ">=5.4.0",
+                "guzzlehttp/guzzle": "^6.0",
+                "php": ">=5.5.0",
                 "symfony/browser-kit": "~2.1",
                 "symfony/css-selector": "~2.1",
                 "symfony/dom-crawler": "~2.1"
@@ -756,7 +761,7 @@
             "type": "application",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-master": "3.1-dev"
                 }
             },
             "autoload": {
@@ -779,25 +784,26 @@
             "keywords": [
                 "scraper"
             ],
-            "time": "2014-11-28 09:48:17"
+            "time": "2015-06-24 16:11:31"
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "5.2.0",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "475b29ccd411f2fa8a408e64576418728c032cfa"
+                "reference": "1879fbe853b0c64d109e369c7aeff09849e62d1e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/475b29ccd411f2fa8a408e64576418728c032cfa",
-                "reference": "475b29ccd411f2fa8a408e64576418728c032cfa",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/1879fbe853b0c64d109e369c7aeff09849e62d1e",
+                "reference": "1879fbe853b0c64d109e369c7aeff09849e62d1e",
                 "shasum": ""
             },
             "require": {
-                "guzzlehttp/ringphp": "~1.0",
-                "php": ">=5.4.0"
+                "guzzlehttp/promises": "~1.0",
+                "guzzlehttp/psr7": "~1.1",
+                "php": ">=5.5.0"
             },
             "require-dev": {
                 "ext-curl": "*",
@@ -807,10 +813,13 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-master": "6.0-dev"
                 }
             },
             "autoload": {
+                "files": [
+                    "src/functions_include.php"
+                ],
                 "psr-4": {
                     "GuzzleHttp\\": "src/"
                 }
@@ -826,7 +835,7 @@
                     "homepage": "https://github.com/mtdowling"
                 }
             ],
-            "description": "Guzzle is a PHP HTTP client library and framework for building RESTful web service clients",
+            "description": "Guzzle is a PHP HTTP client library",
             "homepage": "http://guzzlephp.org/",
             "keywords": [
                 "client",
@@ -837,34 +846,28 @@
                 "rest",
                 "web service"
             ],
-            "time": "2015-01-28 01:03:29"
+            "time": "2015-07-10 20:04:21"
         },
         {
-            "name": "guzzlehttp/ringphp",
-            "version": "1.0.7",
+            "name": "guzzlehttp/promises",
+            "version": "1.0.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/guzzle/RingPHP.git",
-                "reference": "52d868f13570a9a56e5fce6614e0ec75d0f13ac2"
+                "url": "https://github.com/guzzle/promises.git",
+                "reference": "2ee5bc7f1a92efecc90da7f6711a53a7be26b5b7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/RingPHP/zipball/52d868f13570a9a56e5fce6614e0ec75d0f13ac2",
-                "reference": "52d868f13570a9a56e5fce6614e0ec75d0f13ac2",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/2ee5bc7f1a92efecc90da7f6711a53a7be26b5b7",
+                "reference": "2ee5bc7f1a92efecc90da7f6711a53a7be26b5b7",
                 "shasum": ""
             },
             "require": {
-                "guzzlehttp/streams": "~3.0",
-                "php": ">=5.4.0",
-                "react/promise": "~2.0"
+                "php": ">=5.5.0"
             },
             "require-dev": {
-                "ext-curl": "*",
                 "phpunit/phpunit": "~4.0"
             },
-            "suggest": {
-                "ext-curl": "Guzzle will use specific adapters if cURL is present"
-            },
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -873,8 +876,11 @@
             },
             "autoload": {
                 "psr-4": {
-                    "GuzzleHttp\\Ring\\": "src/"
-                }
+                    "GuzzleHttp\\Promise\\": "src/"
+                },
+                "files": [
+                    "src/functions.php"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -887,25 +893,32 @@
                     "homepage": "https://github.com/mtdowling"
                 }
             ],
-            "description": "Provides a simple API and specification that abstracts away the details of HTTP into a single PHP function.",
-            "time": "2015-03-30 01:43:20"
+            "description": "Guzzle promises library",
+            "keywords": [
+                "promise"
+            ],
+            "time": "2015-06-24 16:16:25"
         },
         {
-            "name": "guzzlehttp/streams",
-            "version": "3.0.0",
+            "name": "guzzlehttp/psr7",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/guzzle/streams.git",
-                "reference": "47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5"
+                "url": "https://github.com/guzzle/psr7.git",
+                "reference": "af0e1758de355eb113917ad79c3c0e3604bce4bd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/streams/zipball/47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5",
-                "reference": "47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/af0e1758de355eb113917ad79c3c0e3604bce4bd",
+                "reference": "af0e1758de355eb113917ad79c3c0e3604bce4bd",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.4.0"
+                "php": ">=5.4.0",
+                "psr/http-message": "~1.0"
+            },
+            "provide": {
+                "psr/http-message-implementation": "1.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "~4.0"
@@ -913,13 +926,16 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "1.0-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "GuzzleHttp\\Stream\\": "src/"
-                }
+                    "GuzzleHttp\\Psr7\\": "src/"
+                },
+                "files": [
+                    "src/functions.php"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -932,13 +948,14 @@
                     "homepage": "https://github.com/mtdowling"
                 }
             ],
-            "description": "Provides a simple abstraction over streams of data",
-            "homepage": "http://guzzlephp.org/",
+            "description": "PSR-7 message implementation",
             "keywords": [
-                "Guzzle",
-                "stream"
+                "http",
+                "message",
+                "stream",
+                "uri"
             ],
-            "time": "2014-10-12 19:18:40"
+            "time": "2015-06-24 19:55:15"
         },
         {
             "name": "masterminds/html5",
@@ -1533,6 +1550,55 @@
             ],
             "time": "2015-04-02 05:36:41"
         },
+        {
+            "name": "psr/http-message",
+            "version": "1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-message.git",
+                "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/85d63699f0dbedb190bbd4b0d2b9dc707ea4c298",
+                "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Message\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP messages",
+            "keywords": [
+                "http",
+                "http-message",
+                "psr",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "time": "2015-05-04 20:22:00"
+        },
         {
             "name": "psr/log",
             "version": "1.0.0",
@@ -1571,98 +1637,6 @@
             ],
             "time": "2012-12-21 11:40:51"
         },
-        {
-            "name": "react/promise",
-            "version": "v2.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/reactphp/promise.git",
-                "reference": "365fcee430dfa4ace1fbc75737ca60ceea7eeeef"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/reactphp/promise/zipball/365fcee430dfa4ace1fbc75737ca60ceea7eeeef",
-                "reference": "365fcee430dfa4ace1fbc75737ca60ceea7eeeef",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.4.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "React\\Promise\\": "src/"
-                },
-                "files": [
-                    "src/functions_include.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jan Sorgalla",
-                    "email": "jsorgalla@googlemail.com"
-                }
-            ],
-            "description": "A lightweight implementation of CommonJS Promises/A for PHP",
-            "time": "2014-12-30 13:32:42"
-        },
-        {
-            "name": "sdboyer/gliph",
-            "version": "0.1.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sdboyer/gliph.git",
-                "reference": "db9e4b77622f91e2d338cc45f83c2cd0e3cf0e1e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sdboyer/gliph/zipball/db9e4b77622f91e2d338cc45f83c2cd0e3cf0e1e",
-                "reference": "db9e4b77622f91e2d338cc45f83c2cd0e3cf0e1e",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "3.7.*",
-                "satooshi/php-coveralls": "0.6.*"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "Gliph": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Sam Boyer",
-                    "email": "tech@samboyer.org"
-                }
-            ],
-            "description": "A graph library for PHP.",
-            "homepage": "http://github.com/sdboyer/gliph",
-            "keywords": [
-                "gliph",
-                "graph",
-                "library",
-                "php",
-                "spl"
-            ],
-            "time": "2014-08-03 14:34:47"
-        },
         {
             "name": "sebastian/comparator",
             "version": "1.1.1",
@@ -2143,16 +2117,16 @@
         },
         {
             "name": "symfony/browser-kit",
-            "version": "v2.7.0",
+            "version": "v2.7.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/BrowserKit.git",
-                "reference": "70cdc18dd601a486a8cc69ee26367cbaedd60400"
+                "reference": "176905d3d74c2f99e6ab70f4f5a89460532495ae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/70cdc18dd601a486a8cc69ee26367cbaedd60400",
-                "reference": "70cdc18dd601a486a8cc69ee26367cbaedd60400",
+                "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/176905d3d74c2f99e6ab70f4f5a89460532495ae",
+                "reference": "176905d3d74c2f99e6ab70f4f5a89460532495ae",
                 "shasum": ""
             },
             "require": {
@@ -2194,20 +2168,20 @@
             ],
             "description": "Symfony BrowserKit Component",
             "homepage": "https://symfony.com",
-            "time": "2015-05-02 15:21:08"
+            "time": "2015-07-09 16:07:40"
         },
         {
             "name": "symfony/class-loader",
-            "version": "v2.7.0",
+            "version": "v2.7.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/ClassLoader.git",
-                "reference": "fa19598cb708b92d983b34aae313f57c217f9386"
+                "reference": "2fccbc544997340808801a7410cdcb96dd12edc4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/ClassLoader/zipball/fa19598cb708b92d983b34aae313f57c217f9386",
-                "reference": "fa19598cb708b92d983b34aae313f57c217f9386",
+                "url": "https://api.github.com/repos/symfony/ClassLoader/zipball/2fccbc544997340808801a7410cdcb96dd12edc4",
+                "reference": "2fccbc544997340808801a7410cdcb96dd12edc4",
                 "shasum": ""
             },
             "require": {
@@ -2244,20 +2218,20 @@
             ],
             "description": "Symfony ClassLoader Component",
             "homepage": "https://symfony.com",
-            "time": "2015-05-15 13:33:16"
+            "time": "2015-06-25 12:52:11"
         },
         {
             "name": "symfony/console",
-            "version": "v2.7.0",
+            "version": "v2.7.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Console.git",
-                "reference": "7f0bec04961c61c961df0cb8c2ae88dbfd83f399"
+                "reference": "8cf484449130cabfd98dcb4694ca9945802a21ed"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Console/zipball/7f0bec04961c61c961df0cb8c2ae88dbfd83f399",
-                "reference": "7f0bec04961c61c961df0cb8c2ae88dbfd83f399",
+                "url": "https://api.github.com/repos/symfony/Console/zipball/8cf484449130cabfd98dcb4694ca9945802a21ed",
+                "reference": "8cf484449130cabfd98dcb4694ca9945802a21ed",
                 "shasum": ""
             },
             "require": {
@@ -2301,11 +2275,11 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2015-05-29 16:22:24"
+            "time": "2015-07-09 16:07:40"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v2.7.0",
+            "version": "v2.7.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/CssSelector.git",
@@ -2358,16 +2332,16 @@
         },
         {
             "name": "symfony/debug",
-            "version": "v2.7.0",
+            "version": "v2.7.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Debug.git",
-                "reference": "1df2971b27a6ff73dae4ea622f42802000ec332d"
+                "reference": "9daa1bf9f7e615fa2fba30357e479a90141222e3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Debug/zipball/1df2971b27a6ff73dae4ea622f42802000ec332d",
-                "reference": "1df2971b27a6ff73dae4ea622f42802000ec332d",
+                "url": "https://api.github.com/repos/symfony/Debug/zipball/9daa1bf9f7e615fa2fba30357e479a90141222e3",
+                "reference": "9daa1bf9f7e615fa2fba30357e479a90141222e3",
                 "shasum": ""
             },
             "require": {
@@ -2414,20 +2388,20 @@
             ],
             "description": "Symfony Debug Component",
             "homepage": "https://symfony.com",
-            "time": "2015-05-22 14:54:25"
+            "time": "2015-07-09 16:07:40"
         },
         {
             "name": "symfony/dependency-injection",
-            "version": "v2.7.0",
+            "version": "v2.7.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/DependencyInjection.git",
-                "reference": "137bf489c5151c7eb1e4b7dd34a123f9a74b966d"
+                "reference": "d56b1b89a0c8b34a6eca6211ec76c43256ec4030"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/137bf489c5151c7eb1e4b7dd34a123f9a74b966d",
-                "reference": "137bf489c5151c7eb1e4b7dd34a123f9a74b966d",
+                "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/d56b1b89a0c8b34a6eca6211ec76c43256ec4030",
+                "reference": "d56b1b89a0c8b34a6eca6211ec76c43256ec4030",
                 "shasum": ""
             },
             "require": {
@@ -2474,20 +2448,20 @@
             ],
             "description": "Symfony DependencyInjection Component",
             "homepage": "https://symfony.com",
-            "time": "2015-05-29 14:44:44"
+            "time": "2015-07-09 16:07:40"
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v2.7.0",
+            "version": "v2.7.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/DomCrawler.git",
-                "reference": "11d8eb8ccc1533f4c2d89a025f674894fda520b3"
+                "reference": "9dabece63182e95c42b06967a0d929a5df78bc35"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/11d8eb8ccc1533f4c2d89a025f674894fda520b3",
-                "reference": "11d8eb8ccc1533f4c2d89a025f674894fda520b3",
+                "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/9dabece63182e95c42b06967a0d929a5df78bc35",
+                "reference": "9dabece63182e95c42b06967a0d929a5df78bc35",
                 "shasum": ""
             },
             "require": {
@@ -2527,20 +2501,20 @@
             ],
             "description": "Symfony DomCrawler Component",
             "homepage": "https://symfony.com",
-            "time": "2015-05-22 14:54:25"
+            "time": "2015-07-09 16:07:40"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v2.7.0",
+            "version": "v2.7.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/EventDispatcher.git",
-                "reference": "687039686d0e923429ba6e958d0baa920cd5d458"
+                "reference": "9310b5f9a87ec2ea75d20fec0b0017c77c66dac3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/687039686d0e923429ba6e958d0baa920cd5d458",
-                "reference": "687039686d0e923429ba6e958d0baa920cd5d458",
+                "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/9310b5f9a87ec2ea75d20fec0b0017c77c66dac3",
+                "reference": "9310b5f9a87ec2ea75d20fec0b0017c77c66dac3",
                 "shasum": ""
             },
             "require": {
@@ -2585,20 +2559,20 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2015-05-02 15:21:08"
+            "time": "2015-06-18 19:21:56"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v2.7.0",
+            "version": "v2.7.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/HttpFoundation.git",
-                "reference": "729de183da037c125c5f6366bd4f0631ba1a1abb"
+                "reference": "88903c0531b90d4ecd90282b18f08c0c77bde0b2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/729de183da037c125c5f6366bd4f0631ba1a1abb",
-                "reference": "729de183da037c125c5f6366bd4f0631ba1a1abb",
+                "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/88903c0531b90d4ecd90282b18f08c0c77bde0b2",
+                "reference": "88903c0531b90d4ecd90282b18f08c0c77bde0b2",
                 "shasum": ""
             },
             "require": {
@@ -2638,20 +2612,20 @@
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "https://symfony.com",
-            "time": "2015-05-22 14:54:25"
+            "time": "2015-07-09 16:07:40"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v2.7.0",
+            "version": "v2.7.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/HttpKernel.git",
-                "reference": "74acbb7ef9c4aae0620d3250b9b990d2fff28d16"
+                "reference": "4a8a6f2a847475b3a38da50363a07f69b5cbf37e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/74acbb7ef9c4aae0620d3250b9b990d2fff28d16",
-                "reference": "74acbb7ef9c4aae0620d3250b9b990d2fff28d16",
+                "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/4a8a6f2a847475b3a38da50363a07f69b5cbf37e",
+                "reference": "4a8a6f2a847475b3a38da50363a07f69b5cbf37e",
                 "shasum": ""
             },
             "require": {
@@ -2718,20 +2692,20 @@
             ],
             "description": "Symfony HttpKernel Component",
             "homepage": "https://symfony.com",
-            "time": "2015-05-30 16:52:28"
+            "time": "2015-07-13 19:27:49"
         },
         {
             "name": "symfony/process",
-            "version": "v2.7.0",
+            "version": "v2.7.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Process.git",
-                "reference": "e0a82b58e36afc60f8e79b8bc85a22bb064077c1"
+                "reference": "48aeb0e48600321c272955132d7606ab0a49adb3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Process/zipball/e0a82b58e36afc60f8e79b8bc85a22bb064077c1",
-                "reference": "e0a82b58e36afc60f8e79b8bc85a22bb064077c1",
+                "url": "https://api.github.com/repos/symfony/Process/zipball/48aeb0e48600321c272955132d7606ab0a49adb3",
+                "reference": "48aeb0e48600321c272955132d7606ab0a49adb3",
                 "shasum": ""
             },
             "require": {
@@ -2767,20 +2741,74 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "time": "2015-05-15 13:33:16"
+            "time": "2015-07-01 11:25:50"
         },
         {
-            "name": "symfony/routing",
-            "version": "v2.7.0",
+            "name": "symfony/psr-http-message-bridge",
+            "version": "v0.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/Routing.git",
-                "reference": "6f0333fb8b89cf6f8fd9d6740c5e83b73d9c95b9"
+                "url": "https://github.com/symfony/psr-http-message-bridge.git",
+                "reference": "dc7e308e1dc2898a46776e2221a643cb08315453"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Routing/zipball/6f0333fb8b89cf6f8fd9d6740c5e83b73d9c95b9",
-                "reference": "6f0333fb8b89cf6f8fd9d6740c5e83b73d9c95b9",
+                "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/dc7e308e1dc2898a46776e2221a643cb08315453",
+                "reference": "dc7e308e1dc2898a46776e2221a643cb08315453",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "psr/http-message": "~1.0",
+                "symfony/http-foundation": "~2.3|~3.0"
+            },
+            "require-dev": {
+                "symfony/phpunit-bridge": "~2.7|~3.0"
+            },
+            "suggest": {
+                "zendframework/zend-diactoros": "To use the Zend Diactoros factory"
+            },
+            "type": "symfony-bridge",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Bridge\\PsrHttpMessage\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                }
+            ],
+            "description": "PSR HTTP message bridge",
+            "homepage": "http://symfony.com",
+            "keywords": [
+                "http",
+                "http-message",
+                "psr-7"
+            ],
+            "time": "2015-05-29 17:57:12"
+        },
+        {
+            "name": "symfony/routing",
+            "version": "v2.7.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/Routing.git",
+                "reference": "ea9134f277162b02e5f80ac058b75a77637b0d26"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/Routing/zipball/ea9134f277162b02e5f80ac058b75a77637b0d26",
+                "reference": "ea9134f277162b02e5f80ac058b75a77637b0d26",
                 "shasum": ""
             },
             "require": {
@@ -2838,20 +2866,20 @@
                 "uri",
                 "url"
             ],
-            "time": "2015-05-19 06:58:17"
+            "time": "2015-07-09 16:07:40"
         },
         {
             "name": "symfony/serializer",
-            "version": "v2.7.0",
+            "version": "v2.7.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Serializer.git",
-                "reference": "634d3adf119396320fba4c14caa01390700e7f3b"
+                "reference": "4ce2211d3a5d3a3605de7cc040af2808882f3c95"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Serializer/zipball/634d3adf119396320fba4c14caa01390700e7f3b",
-                "reference": "634d3adf119396320fba4c14caa01390700e7f3b",
+                "url": "https://api.github.com/repos/symfony/Serializer/zipball/4ce2211d3a5d3a3605de7cc040af2808882f3c95",
+                "reference": "4ce2211d3a5d3a3605de7cc040af2808882f3c95",
                 "shasum": ""
             },
             "require": {
@@ -2899,20 +2927,20 @@
             ],
             "description": "Symfony Serializer Component",
             "homepage": "https://symfony.com",
-            "time": "2015-05-29 14:44:44"
+            "time": "2015-07-08 06:12:51"
         },
         {
             "name": "symfony/translation",
-            "version": "v2.7.0-BETA2",
+            "version": "v2.7.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Translation.git",
-                "reference": "1be5bbed3938247acd7c5f4e4f29dd32db636b1f"
+                "reference": "c8dc34cc936152c609cdd722af317e4239d10dd6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Translation/zipball/1be5bbed3938247acd7c5f4e4f29dd32db636b1f",
-                "reference": "1be5bbed3938247acd7c5f4e4f29dd32db636b1f",
+                "url": "https://api.github.com/repos/symfony/Translation/zipball/c8dc34cc936152c609cdd722af317e4239d10dd6",
+                "reference": "c8dc34cc936152c609cdd722af317e4239d10dd6",
                 "shasum": ""
             },
             "require": {
@@ -2960,20 +2988,20 @@
             ],
             "description": "Symfony Translation Component",
             "homepage": "https://symfony.com",
-            "time": "2015-05-11 02:35:29"
+            "time": "2015-07-09 16:07:40"
         },
         {
             "name": "symfony/validator",
-            "version": "v2.7.0",
+            "version": "v2.7.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Validator.git",
-                "reference": "3a5461a388ff8962790fd5a39e6e2da84ba1e824"
+                "reference": "26a190dbdf7a19fc2251c2d59547a717918b6c77"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Validator/zipball/3a5461a388ff8962790fd5a39e6e2da84ba1e824",
-                "reference": "3a5461a388ff8962790fd5a39e6e2da84ba1e824",
+                "url": "https://api.github.com/repos/symfony/Validator/zipball/26a190dbdf7a19fc2251c2d59547a717918b6c77",
+                "reference": "26a190dbdf7a19fc2251c2d59547a717918b6c77",
                 "shasum": ""
             },
             "require": {
@@ -3030,20 +3058,20 @@
             ],
             "description": "Symfony Validator Component",
             "homepage": "https://symfony.com",
-            "time": "2015-05-29 14:44:44"
+            "time": "2015-07-02 06:17:05"
         },
         {
             "name": "symfony/yaml",
-            "version": "v2.7.0",
+            "version": "v2.7.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Yaml.git",
-                "reference": "4a29a5248aed4fb45f626a7bbbd330291492f5c3"
+                "reference": "4bfbe0ed3909bfddd75b70c094391ec1f142f860"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Yaml/zipball/4a29a5248aed4fb45f626a7bbbd330291492f5c3",
-                "reference": "4a29a5248aed4fb45f626a7bbbd330291492f5c3",
+                "url": "https://api.github.com/repos/symfony/Yaml/zipball/4bfbe0ed3909bfddd75b70c094391ec1f142f860",
+                "reference": "4bfbe0ed3909bfddd75b70c094391ec1f142f860",
                 "shasum": ""
             },
             "require": {
@@ -3079,7 +3107,7 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2015-05-02 15:21:08"
+            "time": "2015-07-01 11:25:50"
         },
         {
             "name": "twig/twig",
@@ -3138,6 +3166,56 @@
             ],
             "time": "2015-04-19 08:30:27"
         },
+        {
+            "name": "zendframework/zend-diactoros",
+            "version": "1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/zend-diactoros.git",
+                "reference": "df65f70fc36f24d51a90ad706a09cd9b74fc4dd8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/df65f70fc36f24d51a90ad706a09cd9b74fc4dd8",
+                "reference": "df65f70fc36f24d51a90ad706a09cd9b74fc4dd8",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4",
+                "psr/http-message": "~1.0"
+            },
+            "provide": {
+                "psr/http-message-implementation": "~1.0.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.6",
+                "squizlabs/php_codesniffer": "^2.3.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev",
+                    "dev-develop": "1.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Zend\\Diactoros\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-2-Clause"
+            ],
+            "description": "PSR HTTP Message implementations",
+            "homepage": "https://github.com/zendframework/zend-diactoros",
+            "keywords": [
+                "http",
+                "psr",
+                "psr-7"
+            ],
+            "time": "2015-06-24 20:42:54"
+        },
         {
             "name": "zendframework/zend-escaper",
             "version": "2.4.0",
@@ -3291,11 +3369,14 @@
     "packages-dev": [],
     "aliases": [],
     "minimum-stability": "dev",
-    "stability-flags": [],
+    "stability-flags": {
+        "guzzlehttp/guzzle": 20,
+        "behat/mink-goutte-driver": 20
+    },
     "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=5.4.5"
+        "php": ">=5.5.9"
     },
     "platform-dev": []
 }
diff --git a/core/config/schema/core.data_types.schema.yml b/core/config/schema/core.data_types.schema.yml
index 130d4cc1d..93743e4c4 100644
--- a/core/config/schema/core.data_types.schema.yml
+++ b/core/config/schema/core.data_types.schema.yml
@@ -56,6 +56,11 @@ label:
   label: 'Label'
   translatable: true
 
+# String containing plural variants, separated by EXT.
+plural_label:
+  type: label
+  label: 'Plural variants'
+
 # Internal Drupal path
 path:
   type: string
diff --git a/core/core.api.php b/core/core.api.php
index a8b13cab4..de34440eb 100644
--- a/core/core.api.php
+++ b/core/core.api.php
@@ -57,6 +57,7 @@
  * - @link queue Queue API @endlink
  * - @link typed_data Typed Data @endlink
  * - @link testing Automated tests @endlink
+ * - @link php_assert PHP Runtime Assert Statements @endlink
  * - @link third_party Integrating third-party applications @endlink
  *
  * @section more_info Further information
@@ -982,6 +983,55 @@
  * @}
  */
 
+/**
+ * @defgroup php_assert PHP Runtime Assert Statements
+ * @{
+ * Use of the assert() statement in Drupal.
+ *
+ * Unit tests also use the term "assertion" to refer to test conditions, so to
+ * avoid confusion the term "runtime assertion" will be used for the assert()
+ * statement throughout the documentation.
+ *
+ * A runtime assertion is a statement that is expected to always be true at
+ * the point in the code it appears at. They are tested using PHP's internal
+ * @link http://www.php.net/assert assert() @endlink statement. If an
+ * assertion is ever FALSE it indicates an error in the code or in module or
+ * theme configuration files. User-provided configuration files should be
+ * verified with standard control structures at all times, not just checked in
+ * development environments with assert() statements on.
+ *
+ * When runtime assertions fail in PHP 7 an \AssertionException is thrown.
+ * Drupal uses an assertion callback to do the same in PHP 5.x so that unit
+ * tests involving runtime assertions will work uniformly across both versions.
+ *
+ * The Drupal project primarily uses runtime assertions to enforce the
+ * expectations of the API by failing when incorrect calls are made by code
+ * under development. While PHP type hinting does this for objects and arrays,
+ * runtime assertions do this for scalars (strings, integers, floats, etc.) and
+ * complex data structures such as cache and render arrays. They ensure that
+ * methods' return values are the documented datatypes. They also verify that
+ * objects have been properly configured and set up by the service container.
+ * Runtime assertions are checked throughout development. They supplement unit
+ * tests by checking scenarios that do not have unit tests written for them,
+ * and by testing the API calls made by all the code in the system.
+ *
+ * When using assert() keep the following in mind:
+ * - Runtime assertions are disabled by default in production and enabled in
+ *   development, so they can't be used as control structures. Use exceptions
+ *   for errors that can occur in production no matter how unlikely they are.
+ * - Assert() functions in a buggy manner prior to PHP 7. If you do not use a
+ *   string for the first argument of the statement but instead use a function
+ *   call or expression then that code will be evaluated even when runtime
+ *   assertions are turned off. To avoid this you must use a string as the
+ *   first argument, and assert will pass this string to the eval() statement.
+ * - Since runtime assertion strings are parsed by eval() use caution when
+ *   using them to work with data that may be unsanitized.
+ *
+ * See https://www.drupal.org/node/2492225 for more information on runtime
+ * assertions.
+ * @}
+ */
+
 /**
  * @defgroup info_types Information types
  * @{
@@ -2054,12 +2104,6 @@ function hook_validation_constraint_alter(array &$definitions) {
  * an array. Here are the details of its elements, all of which are optional:
  * - callback: The callback to invoke to handle the server side of the
  *   Ajax event. More information on callbacks is below in @ref sub_callback.
- * - path: The URL path to use for the request. If omitted, defaults to
- *   'system/ajax', which invokes the default Drupal Ajax processing (this will
- *   call the callback supplied in the 'callback' element). If you supply a
- *   path, you must set up a routing entry to handle the request yourself and
- *   return output described in @ref sub_callback below. See the
- *   @link menu Routing topic @endlink for more information on routing.
  * - wrapper: The HTML 'id' attribute of the area where the content returned by
  *   the callback should be placed. Note that callbacks have a choice of
  *   returning content or JavaScript commands; 'wrapper' is used for content
@@ -2085,6 +2129,13 @@ function hook_validation_constraint_alter(array &$definitions) {
  *   - message: Translated message to display.
  *   - url: For a bar progress indicator, URL path for determining progress.
  *   - interval: For a bar progress indicator, how often to update it.
+ * - url: A \Drupal\Core\Url to which to submit the Ajax request. If omitted,
+ *   defaults to either the same URL as the form or link destination is for
+ *   someone with JavaScript disabled, or a slightly modified version (e.g.,
+ *   with a query parameter added, removed, or changed) of that URL if
+ *   necessary to support Drupal's content negotiation. It is recommended to
+ *   omit this key and use Drupal's content negotiation rather than using
+ *   substantially different URLs between Ajax and non-Ajax.
  *
  * @subsection sub_callback Setting up a callback to process Ajax
  * Once you have set up your form to trigger an Ajax response (see @ref sub_form
@@ -2186,6 +2237,13 @@ function hook_validation_constraint_alter(array &$definitions) {
  *   at the end of a request to finalize operations, if this service was
  *   instantiated. Services should implement \Drupal\Core\DestructableInterface
  *   in this case.
+ * - context_provider: Indicates a block context provider, used for example
+ *   by block conditions. It has to implement
+ *   \Drupal\Core\Plugin\Context\ContextProviderInterface.
+ * - http_client_middleware: Indicates that the service provides a guzzle
+ *   middleware, see
+ *   https://guzzle.readthedocs.org/en/latest/handlers-and-middleware.html for
+ *   more information.
  *
  * Creating a tag for a service does not do anything on its own, but tags
  * can be discovered or queried in a compiler pass when the container is built,
diff --git a/core/core.libraries.yml b/core/core.libraries.yml
index 3a6906eff..cfbaf473d 100644
--- a/core/core.libraries.yml
+++ b/core/core.libraries.yml
@@ -2,10 +2,10 @@
 
 backbone:
   remote: https://github.com/jashkenas/backbone
-  version: "1.1.2"
+  version: "1.2.1"
   license:
     name: MIT
-    url: https://github.com/jashkenas/backbone/blob/1.1.2/LICENSE
+    url: https://github.com/jashkenas/backbone/blob/1.2.1/LICENSE
     gpl-compatible: true
   js:
     assets/vendor/backbone/backbone-min.js: { weight: -19, minified: true }
@@ -133,6 +133,15 @@ drupal.collapse:
     - core/drupal.form
     - core/jquery.once
 
+drupal.date:
+  version: VERSION
+  js:
+    misc/date.js: {}
+  dependencies:
+    - core/drupal
+    - core/modernizr
+    - core/jquery.ui.datepicker
+
 drupal.debounce:
   version: VERSION
   js:
diff --git a/core/core.services.yml b/core/core.services.yml
index 0fe0a7f19..4eb462cbe 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -2,11 +2,25 @@ parameters:
   session.storage.options: {}
   twig.config: {}
   renderer.config:
-    required_cache_contexts: ['languages:language_interface', 'theme']
+    required_cache_contexts: ['languages:language_interface', 'theme', 'user.permissions']
   factory.keyvalue:
     default: keyvalue.database
   factory.keyvalue.expirable:
     default: keyvalue.expirable.database
+  filter_protocols:
+    - http
+    - https
+    - ftp
+    - news
+    - nntp
+    - tel
+    - telnet
+    - mailto
+    - irc
+    - ssh
+    - sftp
+    - webcal
+    - rtsp
 services:
   # Simple cache contexts, directly derived from the request context.
   cache_context.ip:
@@ -24,6 +38,11 @@ services:
     arguments: ['@request_stack']
     tags:
       - { name: cache.context }
+  cache_context.session:
+    class: Drupal\Core\Cache\Context\SessionCacheContext
+    arguments: ['@request_stack']
+    tags:
+      - { name: cache.context}
   cache_context.request_format:
     class: Drupal\Core\Cache\Context\RequestFormatCacheContext
     arguments: ['@request_stack']
@@ -266,6 +285,9 @@ services:
   context.handler:
     class: Drupal\Core\Plugin\Context\ContextHandler
     arguments: ['@typed_data_manager']
+  context.repository:
+    class: Drupal\Core\Plugin\Context\LazyContextRepository
+    arguments: ['@service_container']
   cron:
     class: Drupal\Core\Cron
     arguments: ['@module_handler', '@lock', '@queue', '@state', '@account_switcher', '@logger.channel.cron', '@plugin.manager.queue_worker']
@@ -371,10 +393,21 @@ services:
   path.current:
     class: Drupal\Core\Path\CurrentPathStack
     arguments: ['@request_stack']
+  http_handler_stack:
+    class: GuzzleHttp\HandlerStack
+    public: false
+    factory: GuzzleHttp\HandlerStack::create
+    configurator: ['@http_handler_stack_configurator', configure]
+  http_handler_stack_configurator:
+    class: Drupal\Core\Http\HandlerStackConfigurator
+    public: false
+    arguments: ['@service_container']
   http_client:
-    class: Drupal\Core\Http\Client
-    tags:
-      - { name: service_collector, tag: http_client_subscriber, call: attach }
+    class: GuzzleHttp\Client
+    factory: http_client_factory:fromOptions
+  http_client_factory:
+    class: Drupal\Core\Http\ClientFactory
+    arguments: ['@http_handler_stack']
   theme.negotiator:
     class: Drupal\Core\Theme\ThemeNegotiator
     arguments: ['@access_check.theme']
@@ -596,9 +629,18 @@ services:
       - { name: http_middleware, priority: 50 }
     calls:
       - [setContainer, ['@service_container']]
+  psr7.http_foundation_factory:
+    class: Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory
+  psr7.http_message_factory:
+    class: Symfony\Bridge\PsrHttpMessage\Factory\DiactorosFactory
   language_manager:
     class: Drupal\Core\Language\LanguageManager
     arguments: ['@language.default']
+  language.current_language_context:
+    class: Drupal\Core\Language\ContextProvider\CurrentLanguageContext
+    arguments: ['@language_manager']
+    tags:
+      - { name: 'context_provider' }
   language.default:
     class: Drupal\Core\Language\LanguageDefault
     arguments: ['%language.default_values%']
@@ -682,9 +724,15 @@ services:
     arguments: ['@route_filter.lazy_collector']
     tags:
       - { name: event_subscriber }
-  url_generator:
+  url_generator.non_bubbling:
     class: Drupal\Core\Routing\UrlGenerator
-    arguments: ['@router.route_provider', '@path_processor_manager', '@route_processor_manager', '@config.factory', '@request_stack']
+    arguments: ['@router.route_provider', '@path_processor_manager', '@route_processor_manager', '@request_stack', '%filter_protocols%']
+    public: false
+    calls:
+      - [setContext, ['@?router.request_context']]
+  url_generator:
+    class: Drupal\Core\Render\MetadataBubblingUrlGenerator
+    arguments: ['@url_generator.non_bubbling', '@renderer']
     calls:
       - [setContext, ['@?router.request_context']]
   redirect.destination:
@@ -692,10 +740,10 @@ services:
     arguments: ['@request_stack', '@url_generator']
   unrouted_url_assembler:
     class: Drupal\Core\Utility\UnroutedUrlAssembler
-    arguments: ['@request_stack', '@config.factory', '@path_processor_manager']
+    arguments: ['@request_stack', '@path_processor_manager', '%filter_protocols%']
   link_generator:
     class: Drupal\Core\Utility\LinkGenerator
-    arguments: ['@url_generator', '@module_handler']
+    arguments: ['@url_generator', '@module_handler', '@renderer']
   router:
     class: Drupal\Core\Routing\AccessAwareRouter
     arguments: ['@router.no_access_checks', '@access_manager', '@current_user']
@@ -729,6 +777,9 @@ services:
     arguments: ['@database']
     tags:
       - { name: backend_overridable }
+  pgsql.entity.query.sql:
+    class: Drupal\Core\Entity\Query\Sql\pgsql\QueryFactory
+    arguments: ['@database']
   entity.query.null:
     class: Drupal\Core\Entity\Query\Null\QueryFactory
   entity.query.keyvalue:
@@ -856,6 +907,11 @@ services:
     class: Drupal\Core\EventSubscriber\RouteMethodSubscriber
     tags:
       - { name: event_subscriber }
+  psr_response_view_subscriber:
+    class: Drupal\Core\EventSubscriber\PsrResponseSubscriber
+    arguments: ['@psr7.http_foundation_factory']
+    tags:
+      - { name: event_subscriber }
 
   # Main content view subscriber plus the renderers it uses.
   main_content_view_subscriber:
@@ -1003,6 +1059,10 @@ services:
     arguments: ['@url_generator', '@router.request_context']
     tags:
       - { name: event_subscriber }
+  redirect_leading_slashes_subscriber:
+    class: Drupal\Core\EventSubscriber\RedirectLeadingSlashesSubscriber
+    tags:
+      - { name: event_subscriber }
   request_close_subscriber:
     class: Drupal\Core\EventSubscriber\RequestCloseSubscriber
     tags:
@@ -1031,7 +1091,7 @@ services:
     class: Drupal\Core\EventSubscriber\DefaultExceptionSubscriber
     tags:
       - { name: event_subscriber }
-    arguments: ['@config.factory', '@bare_html_page_renderer']
+    arguments: ['@config.factory']
   exception.logger:
     class: Drupal\Core\EventSubscriber\ExceptionLoggingSubscriber
     tags:
@@ -1152,7 +1212,7 @@ services:
       - { name: service_collector, tag: breadcrumb_builder, call: addBuilder }
   token:
     class: Drupal\Core\Utility\Token
-    arguments: ['@module_handler', '@cache.discovery', '@language_manager', '@cache_tags.invalidator']
+    arguments: ['@module_handler', '@cache.discovery', '@language_manager', '@cache_tags.invalidator', '@renderer']
   batch.storage:
     class: Drupal\Core\Batch\BatchStorage
     arguments: ['@database', '@session', '@csrf_token']
@@ -1179,50 +1239,71 @@ services:
     calls:
       - [setContainer, ['@service_container']]
     arguments: ['feed.writer.']
-# Zend Feed reader plugins
+# Zend Feed reader plugins. Plugins should be set as prototype scope.
   feed.reader.dublincoreentry:
     class: Zend\Feed\Reader\Extension\DublinCore\Entry
+    scope: prototype
   feed.reader.dublincorefeed:
     class: Zend\Feed\Reader\Extension\DublinCore\Feed
+    scope: prototype
   feed.reader.contententry:
     class: Zend\Feed\Reader\Extension\Content\Entry
+    scope: prototype
   feed.reader.atomentry:
     class: Zend\Feed\Reader\Extension\Atom\Entry
+    scope: prototype
   feed.reader.atomfeed:
     class: Zend\Feed\Reader\Extension\Atom\Feed
+    scope: prototype
   feed.reader.slashentry:
     class: Zend\Feed\Reader\Extension\Slash\Entry
+    scope: prototype
   feed.reader.wellformedwebentry:
     class: Zend\Feed\Reader\Extension\WellFormedWeb\Entry
+    scope: prototype
   feed.reader.threadentry:
     class: Zend\Feed\Reader\Extension\Thread\Entry
+    scope: prototype
   feed.reader.podcastentry:
     class: Zend\Feed\Reader\Extension\Podcast\Entry
+    scope: prototype
   feed.reader.podcastfeed:
     class: Zend\Feed\Reader\Extension\Podcast\Feed
-# Zend Feed writer plugins
+    scope: prototype
+# Zend Feed writer plugins. Plugins should be set as prototype scope.
   feed.writer.atomrendererfeed:
     class: Zend\Feed\Writer\Extension\Atom\Renderer\Feed
+    scope: prototype
   feed.writer.contentrendererentry:
     class: Zend\Feed\Writer\Extension\Content\Renderer\Entry
+    scope: prototype
   feed.writer.dublincorerendererentry:
     class: Zend\Feed\Writer\Extension\DublinCore\Renderer\Entry
+    scope: prototype
   feed.writer.dublincorerendererfeed:
     class: Zend\Feed\Writer\Extension\DublinCore\Renderer\Feed
+    scope: prototype
   feed.writer.itunesentry:
     class: Zend\Feed\Writer\Extension\ITunes\Entry
+    scope: prototype
   feed.writer.itunesfeed:
     class: Zend\Feed\Writer\Extension\ITunes\Feed
+    scope: prototype
   feed.writer.itunesrendererentry:
     class: Zend\Feed\Writer\Extension\ITunes\Renderer\Entry
+    scope: prototype
   feed.writer.itunesrendererfeed:
     class: Zend\Feed\Writer\Extension\ITunes\Renderer\Feed
+    scope: prototype
   feed.writer.slashrendererentry:
     class: Zend\Feed\Writer\Extension\Slash\Renderer\Entry
+    scope: prototype
   feed.writer.threadingrendererentry:
     class: Zend\Feed\Writer\Extension\Threading\Renderer\Entry
+    scope: prototype
   feed.writer.wellformedwebrendererentry:
     class: Zend\Feed\Writer\Extension\WellFormedWeb\Renderer\Entry
+    scope: prototype
   theme.manager:
     class: Drupal\Core\Theme\ThemeManager
     arguments: ['@app.root', '@theme.negotiator', '@theme.initialization', '@request_stack', '@module_handler']
@@ -1240,6 +1321,9 @@ services:
       - [setThemeManager, ['@theme.manager']]
   authentication:
     class: Drupal\Core\Authentication\AuthenticationManager
+    arguments: ['@authentication_collector']
+  authentication_collector:
+    class: Drupal\Core\Authentication\AuthenticationCollector
     tags:
       - { name: service_collector, tag: authentication_provider, call: addProvider }
   authentication_subscriber:
@@ -1337,7 +1421,7 @@ services:
     class: Drupal\Core\Extension\InfoParser
   twig:
     class: Drupal\Core\Template\TwigEnvironment
-    arguments: ['@app.root', '@twig.loader', '%twig.config%']
+    arguments: ['@app.root', '@cache.default', '@twig.loader', '%twig.config%']
     tags:
       - { name: service_collector, tag: 'twig.extension', call: addExtension }
   twig.extension:
@@ -1377,6 +1461,7 @@ services:
     alias: plugin.manager.element_info
   file.mime_type.guesser:
     class: Drupal\Core\File\MimeType\MimeTypeGuesser
+    arguments: ['@stream_wrapper_manager']
     tags:
       - { name: service_collector, tag: mime_type_guesser, call: addGuesser }
     lazy: true
@@ -1391,7 +1476,12 @@ services:
     arguments: ['@request_stack', '@cache_factory', '@cache_contexts_manager']
   renderer:
     class: Drupal\Core\Render\Renderer
-    arguments: ['@controller_resolver', '@theme.manager', '@plugin.manager.element_info', '@render_cache', '%renderer.config%']
+    arguments: ['@controller_resolver', '@theme.manager', '@plugin.manager.element_info', '@render_cache', '@request_stack', '%renderer.config%']
+  early_rendering_controller_wrapper_subscriber:
+    class: Drupal\Core\EventSubscriber\EarlyRenderingControllerWrapperSubscriber
+    arguments: ['@controller_resolver', '@renderer']
+    tags:
+      - { name: event_subscriber }
   email.validator:
     class: Egulias\EmailValidator\EmailValidator
 
diff --git a/core/includes/batch.inc b/core/includes/batch.inc
index 4e4747159..7aa8ee794 100644
--- a/core/includes/batch.inc
+++ b/core/includes/batch.inc
@@ -165,7 +165,7 @@ function _batch_progress_page() {
   $query_options['op'] = $new_op;
   $batch['url']->setOption('query', $query_options);
 
-  $url = $batch['url']->toString();
+  $url = $batch['url']->toString(TRUE)->getGeneratedUrl();
 
   $build = array(
     '#theme' => 'progress_bar',
diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
index d11e60821..1d05b4a93 100644
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -23,7 +23,7 @@ use Drupal\Core\Language\LanguageInterface;
 /**
  * Minimum supported version of PHP.
  */
-const DRUPAL_MINIMUM_PHP = '5.4.5';
+const DRUPAL_MINIMUM_PHP = '5.5.9';
 
 /**
  * Minimum recommended value of PHP memory_limit.
@@ -174,7 +174,7 @@ function config_get_config_directory($type = CONFIG_ACTIVE_DIRECTORY) {
   if (!empty($config_directories[$type])) {
     return $config_directories[$type];
   }
-  throw new \Exception(format_string('The configuration directory type %type does not exist.', array('%type' => $type)));
+  throw new \Exception("The configuration directory type '$type' does not exist");
 }
 
 /**
@@ -563,7 +563,7 @@ function drupal_set_message($message = NULL, $type = 'status', $repeat = FALSE)
 
     $new = array(
       'safe' => SafeMarkup::isSafe($message),
-      'message' => $message,
+      'message' => (string) $message,
     );
     if ($repeat || !in_array($new, $_SESSION['messages'][$type])) {
       $_SESSION['messages'][$type][] = $new;
@@ -679,7 +679,7 @@ function _drupal_error_handler($error_level, $message, $filename, $line, $contex
  * always fatal: the execution of the script will stop as soon as the exception
  * handler exits.
  *
- * @param \Exception|\BaseException $exception
+ * @param \Exception|\Throwable $exception
  *   The exception object that was thrown.
  */
 function _drupal_exception_handler($exception) {
@@ -689,12 +689,13 @@ function _drupal_exception_handler($exception) {
     // Log the message to the watchdog and return an error page to the user.
     _drupal_log_error(Error::decodeException($exception), TRUE);
   }
-  // PHP 7 introduces BaseExceptions.
-  catch (BaseException $exception2) {
-    _drupal_exception_handler_additional($exception, $exception2);
+  // PHP 7 introduces Throwable, which covers both Error and
+  // Exception throwables.
+  catch (\Throwable $error) {
+    _drupal_exception_handler_additional($exception, $error);
   }
   // In order to be compatibile with PHP 5 we also catch regular Exceptions.
-  catch (Exception $exception2) {
+  catch (\Exception $exception2) {
     _drupal_exception_handler_additional($exception, $exception2);
   }
 }
@@ -702,9 +703,9 @@ function _drupal_exception_handler($exception) {
 /**
  * Displays any additional errors caught while handling an exception.
  *
- * @param \Exception|\BaseException $exception
+ * @param \Exception|\Throwable $exception
  *   The first exception object that was thrown.
- * @param \Exception|\BaseException $exception
+ * @param \Exception|\Throwable $exception2
  *   The second exception object that was thrown.
  */
 function _drupal_exception_handler_additional($exception, $exception2) {
@@ -1098,12 +1099,13 @@ function _drupal_shutdown_function() {
       call_user_func_array($callback['callback'], $callback['arguments']);
     }
   }
-  // PHP 7 introduces BaseExceptions.
-  catch (BaseException $exception) {
-    _drupal_shutdown_function_handle_exception($exception);
+  // PHP 7 introduces Throwable, which covers both Error and
+  // Exception throwables.
+  catch (\Throwable $error) {
+    _drupal_shutdown_function_handle_exception($error);
   }
   // In order to be compatibile with PHP 5 we also catch regular Exceptions.
-  catch (Exception $exception) {
+  catch (\Exception $exception) {
     _drupal_shutdown_function_handle_exception($exception);
   }
 }
@@ -1111,7 +1113,7 @@ function _drupal_shutdown_function() {
 /**
  * Displays and logs any errors that may happen during shutdown.
  *
- * @param \Exception|\BaseException $exception
+ * @param \Exception|\Throwable $exception
  *   The exception object that was thrown.
  *
  * @see _drupal_shutdown_function()
diff --git a/core/includes/common.inc b/core/includes/common.inc
index a68fa5a80..cf4bbb6bb 100644
--- a/core/includes/common.inc
+++ b/core/includes/common.inc
@@ -856,9 +856,9 @@ function drupal_process_states(&$elements) {
  * foreach ($regions as $region) {
  *   drupal_attach_tabledrag('my-module-table', array(
  *     'action' => 'order',
- *     'relationship' => sibling',
+ *     'relationship' => 'sibling',
  *     'group' => 'my-elements-weight',
- *     'subgroup' => my-elements-weight-' . $region,
+ *     'subgroup' => 'my-elements-weight-' . $region,
  *   ));
  * }
  * @endcode
@@ -1036,7 +1036,7 @@ function drupal_pre_render_links($element) {
     $child = &$element[$key];
     // If the child has links which have not been printed yet and the user has
     // access to it, merge its links in to the parent.
-    if (isset($child['#links']) && empty($child['#printed']) && (!isset($child['#access']) || $child['#access'])) {
+    if (isset($child['#links']) && empty($child['#printed']) && Element::isVisibleElement($child)) {
       $element['#links'] += $child['#links'];
       // Mark the child as having been printed already (so that its links
       // cannot be mistakenly rendered twice).
@@ -1295,8 +1295,10 @@ function drupal_flush_all_caches() {
   // Reset all static caches.
   drupal_static_reset();
 
-  // Wipe the PHP Storage caches.
-  PhpStorageFactory::get('service_container')->deleteAll();
+  // Invalidate the container.
+  \Drupal::service('kernel')->invalidateContainer();
+
+  // Wipe the Twig PHP Storage cache.
   PhpStorageFactory::get('twig')->deleteAll();
 
   // Rebuild module and theme data.
diff --git a/core/includes/database.inc b/core/includes/database.inc
index 98041cde6..75744f465 100644
--- a/core/includes/database.inc
+++ b/core/includes/database.inc
@@ -1,9 +1,5 @@
 <?php
 
-use Drupal\Core\Database\Database;
-use Drupal\Core\Database\Query\Condition;
-use Drupal\Core\Site\Settings;
-
 /**
  * @file
  * Core systems for the database layer.
@@ -13,6 +9,10 @@ use Drupal\Core\Site\Settings;
  * file only, as they cannot auto-load the way classes can.
  */
 
+use Drupal\Core\Database\Database;
+use Drupal\Core\Database\Query\Condition;
+use Drupal\Core\Site\Settings;
+
 /**
  * @addtogroup database
  * @{
@@ -28,23 +28,29 @@ use Drupal\Core\Site\Settings;
  * Do not use this function for INSERT, UPDATE, or DELETE queries. Those should
  * be handled via db_insert(), db_update() and db_delete() respectively.
  *
- * @param $query
+ * @param string|\Drupal\Core\Database\StatementInterface $query
  *   The prepared statement query to run. Although it will accept both named and
  *   unnamed placeholders, named placeholders are strongly preferred as they are
  *   more self-documenting. If the argument corresponding to a placeholder is
  *   an array of values to be expanded, e.g. for an IN query, the placeholder
  *   should be named with a trailing bracket like :example[]
- * @param $args
+ * @param array $args
  *   An array of values to substitute into the query. If the query uses named
  *   placeholders, this is an associative array in any order. If the query uses
  *   unnamed placeholders (?), this is an indexed array and the order must match
  *   the order of placeholders in the query string.
- * @param $options
+ * @param array $options
  *   An array of options to control how the query operates.
  *
  * @return \Drupal\Core\Database\StatementInterface
  *   A prepared statement object, already executed.
  *
+ * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
+ *   a database connection injected into your service from the container and
+ *   call query() on it. E.g.
+ *   $injected_database->query($query, $args, $options);
+ *
+ * @see \Drupal\Core\Database\Connection::query()
  * @see \Drupal\Core\Database\Connection::defaultOptions()
  */
 function db_query($query, array $args = array(), array $options = array()) {
@@ -58,7 +64,7 @@ function db_query($query, array $args = array(), array $options = array()) {
 /**
  * Executes a query against the active database, restricted to a range.
  *
- * @param $query
+ * @param string $query
  *   The prepared statement query to run. Although it will accept both named and
  *   unnamed placeholders, named placeholders are strongly preferred as they are
  *   more self-documenting.
@@ -66,17 +72,23 @@ function db_query($query, array $args = array(), array $options = array()) {
  *   The first record from the result set to return.
  * @param $count
  *   The number of records to return from the result set.
- * @param $args
+ * @param array $args
  *   An array of values to substitute into the query. If the query uses named
  *   placeholders, this is an associative array in any order. If the query uses
  *   unnamed placeholders (?), this is an indexed array and the order must match
  *   the order of placeholders in the query string.
- * @param $options
+ * @param array $options
  *   An array of options to control how the query operates.
  *
  * @return \Drupal\Core\Database\StatementInterface
  *   A prepared statement object, already executed.
  *
+ * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
+ *   a database connection injected into your service from the container and
+ *   call queryRange() on it. E.g.
+ *   $injected_database->queryRange($query, $from, $count, $args, $options);
+ *
+ * @see \Drupal\Core\Database\Connection::queryRange()
  * @see \Drupal\Core\Database\Connection::defaultOptions()
  */
 function db_query_range($query, $from, $count, array $args = array(), array $options = array()) {
@@ -92,21 +104,27 @@ function db_query_range($query, $from, $count, array $args = array(), array $opt
  *
  * The execution of the query string happens against the active database.
  *
- * @param $query
+ * @param string $query
  *   The prepared SELECT statement query to run. Although it will accept both
  *   named and unnamed placeholders, named placeholders are strongly preferred
  *   as they are more self-documenting.
- * @param $args
+ * @param array $args
  *   An array of values to substitute into the query. If the query uses named
  *   placeholders, this is an associative array in any order. If the query uses
  *   unnamed placeholders (?), this is an indexed array and the order must match
  *   the order of placeholders in the query string.
- * @param $options
+ * @param array $options
  *   An array of options to control how the query operates.
  *
  * @return
  *   The name of the temporary table.
  *
+ * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
+ *   a database connection injected into your service from the container and
+ *   call queryTemporary() on it. E.g.
+ *   $injected_database->queryTemporary($query, $args, $options);
+ *
+ * @see \Drupal\Core\Database\Connection::queryTemporary()
  * @see \Drupal\Core\Database\Connection::defaultOptions()
  */
 function db_query_temporary($query, array $args = array(), array $options = array()) {
@@ -120,13 +138,20 @@ function db_query_temporary($query, array $args = array(), array $options = arra
 /**
  * Returns a new InsertQuery object for the active database.
  *
- * @param $table
+ * @param string $table
  *   The table into which to insert.
- * @param $options
+ * @param array $options
  *   An array of options to control how the query operates.
  *
  * @return \Drupal\Core\Database\Query\Insert
  *   A new Insert object for this connection.
+ *
+ * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
+ *   a database connection injected into your service from the container and
+ *   call insert() on it. E.g. $injected_database->insert($table, $options);
+ *
+ * @see \Drupal\Core\Database\Connection::insert()
+ * @see \Drupal\Core\Database\Connection::defaultOptions()
  */
 function db_insert($table, array $options = array()) {
   if (empty($options['target']) || $options['target'] == 'replica') {
@@ -138,13 +163,20 @@ function db_insert($table, array $options = array()) {
 /**
  * Returns a new MergeQuery object for the active database.
  *
- * @param $table
- *   The table into which to merge.
- * @param $options
+ * @param string $table
+ *   Name of the table to associate with this query.
+ * @param array $options
  *   An array of options to control how the query operates.
  *
  * @return \Drupal\Core\Database\Query\Merge
  *   A new Merge object for this connection.
+ *
+ * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
+ *   a database connection injected into your service from the container and
+ *   call merge() on it. E.g. $injected_database->merge($table, $options);
+ *
+ * @see \Drupal\Core\Database\Connection::merge()
+ * @see \Drupal\Core\Database\Connection::defaultOptions()
  */
 function db_merge($table, array $options = array()) {
   if (empty($options['target']) || $options['target'] == 'replica') {
@@ -156,13 +188,20 @@ function db_merge($table, array $options = array()) {
 /**
  * Returns a new UpdateQuery object for the active database.
  *
- * @param $table
+ * @param string $table
  *   The table to update.
- * @param $options
+ * @param array $options
  *   An array of options to control how the query operates.
  *
  * @return \Drupal\Core\Database\Query\Update
  *   A new Update object for this connection.
+ *
+ * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
+ *   a database connection injected into your service from the container and
+ *   call update() on it. E.g. $injected_database->update($table, $options);
+ *
+ * @see \Drupal\Core\Database\Connection::update()
+ * @see \Drupal\Core\Database\Connection::defaultOptions()
  */
 function db_update($table, array $options = array()) {
   if (empty($options['target']) || $options['target'] == 'replica') {
@@ -174,13 +213,20 @@ function db_update($table, array $options = array()) {
 /**
  * Returns a new DeleteQuery object for the active database.
  *
- * @param $table
+ * @param string $table
  *   The table from which to delete.
- * @param $options
+ * @param array $options
  *   An array of options to control how the query operates.
  *
  * @return \Drupal\Core\Database\Query\Delete
  *   A new Delete object for this connection.
+ *
+ * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
+ *   a database connection injected into your service from the container and
+ *   call delete() on it. E.g. $injected_database->delete($table, $options);
+ *
+ * @see \Drupal\Core\Database\Connection::delete()
+ * @see \Drupal\Core\Database\Connection::defaultOptions()
  */
 function db_delete($table, array $options = array()) {
   if (empty($options['target']) || $options['target'] == 'replica') {
@@ -192,13 +238,20 @@ function db_delete($table, array $options = array()) {
 /**
  * Returns a new TruncateQuery object for the active database.
  *
- * @param $table
- *   The table from which to delete.
- * @param $options
+ * @param string $table
+ *   The table from which to truncate.
+ * @param array $options
  *   An array of options to control how the query operates.
  *
  * @return \Drupal\Core\Database\Query\Truncate
  *   A new Truncate object for this connection.
+ *
+ * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
+ *   a database connection injected into your service from the container and
+ *   call truncate() on it. E.g. $injected_database->truncate($table, $options);
+ *
+ * @see \Drupal\Core\Database\Connection::truncate()
+ * @see \Drupal\Core\Database\Connection::defaultOptions()
  */
 function db_truncate($table, array $options = array()) {
   if (empty($options['target']) || $options['target'] == 'replica') {
@@ -210,16 +263,25 @@ function db_truncate($table, array $options = array()) {
 /**
  * Returns a new SelectQuery object for the active database.
  *
- * @param $table
- *   The base table for this query. May be a string or another SelectQuery
- *   object. If a query object is passed, it will be used as a subselect.
- * @param $alias
+ * @param string|\Drupal\Core\Database\Query\SelectInterface $table
+ *   The base table for this query. May be a string or another SelectInterface
+ *   object. If a SelectInterface object is passed, it will be used as a
+ *   subselect.
+ * @param string $alias
  *   (optional) The alias for the base table of this query.
- * @param $options
+ * @param array $options
  *   (optional) An array of options to control how the query operates.
  *
  * @return \Drupal\Core\Database\Query\Select
  *   A new Select object for this connection.
+ *
+ * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
+ *   a database connection injected into your service from the container and
+ *   call select() on it. E.g.
+ *   $injected_database->select($table, $alias, $options);
+ *
+ * @see \Drupal\Core\Database\Connection::select()
+ * @see \Drupal\Core\Database\Connection::defaultOptions()
  */
 function db_select($table, $alias = NULL, array $options = array()) {
   if (empty($options['target'])) {
@@ -239,6 +301,14 @@ function db_select($table, $alias = NULL, array $options = array()) {
  *
  * @return \Drupal\Core\Database\Transaction
  *   A new Transaction object for this connection.
+ *
+ * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
+ *   a database connection injected into your service from the container and
+ *   call startTransaction() on it. E.g.
+ *   $injected_database->startTransaction($name);
+ *
+ * @see \Drupal\Core\Database\Connection::startTransaction()
+ * @see \Drupal\Core\Database\Connection::defaultOptions()
  */
 function db_transaction($name = NULL, array $options = array()) {
   if (empty($options['target'])) {
@@ -253,8 +323,11 @@ function db_transaction($name = NULL, array $options = array()) {
  * @param $key
  *   The key in the $databases array to set as the default database.
  *
- * @return
+ * @return string|null
  *   The key of the formerly active database.
+ *
+ * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Use
+ * \Drupal\Core\Database\Database::setActiveConnection().
  */
 function db_set_active($key = 'default') {
   return Database::setActiveConnection($key);
@@ -268,8 +341,14 @@ function db_set_active($key = 'default') {
  * @param $table
  *   The table name to escape.
  *
- * @return
+ * @return string
  *   The escaped table name as a string.
+ *
+ * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
+ *   a database connection injected into your service from the container and
+ *   call escapeTable() on it. E.g. $injected_database->escapeTable($table);
+ *
+ * @see \Drupal\Core\Database\Connection::escapeTable()
  */
 function db_escape_table($table) {
   return Database::getConnection()->escapeTable($table);
@@ -280,11 +359,17 @@ function db_escape_table($table) {
  *
  * Only keeps alphanumeric and underscores.
  *
- * @param $field
+ * @param string $field
  *   The field name to escape.
  *
- * @return
+ * @return string
  *   The escaped field name as a string.
+ *
+ * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
+ *   a database connection injected into your service from the container and
+ *   call escapeTable() on it. E.g. $injected_database->escapeTable($table);
+ *
+ * @see \Drupal\Core\Database\Connection::escapeField()
  */
 function db_escape_field($field) {
   return Database::getConnection()->escapeField($field);
@@ -314,11 +399,17 @@ function db_escape_field($field) {
  * Backslash is defined as escape character for LIKE patterns in
  * DatabaseCondition::mapConditionOperator().
  *
- * @param $string
+ * @param string $string
  *   The string to escape.
  *
- * @return
+ * @return string
  *   The escaped string.
+ *
+ * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
+ *   a database connection injected into your service from the container and
+ *   call escapeLike() on it. E.g. $injected_database->escapeLike($string);
+ *
+ * @see \Drupal\Core\Database\Connection::escapeLike()
  */
 function db_like($string) {
   return Database::getConnection()->escapeLike($string);
@@ -327,8 +418,14 @@ function db_like($string) {
 /**
  * Retrieves the name of the currently active database driver.
  *
- * @return
+ * @return string
  *   The name of the currently active database driver.
+ *
+ * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
+ *   a database connection injected into your service from the container and
+ *   call driver() on it. E.g. $injected_database->driver($string);
+ *
+ * @see \Drupal\Core\Database\Connection::driver()
  */
 function db_driver() {
   return Database::getConnection()->driver();
@@ -337,9 +434,14 @@ function db_driver() {
 /**
  * Closes the active database connection.
  *
- * @param $options
+ * @param array $options
  *   An array of options to control which connection is closed. Only the target
  *   key has any meaning in this case.
+ *
+ * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Use
+ *   \Drupal\Core\Database\Database::closeConnection($target).
+ *
+ * @see \Drupal\Core\Database\Database::closeConnection()
  */
 function db_close(array $options = array()) {
   if (empty($options['target'])) {
@@ -355,13 +457,19 @@ function db_close(array $options = array()) {
  * serial field is preferred, and InsertQuery::execute() returns the value of
  * the last ID inserted.
  *
- * @param $existing_id
+ * @param int $existing_id
  *   After a database import, it might be that the sequences table is behind, so
  *   by passing in a minimum ID, it can be assured that we never issue the same
  *   ID.
  *
- * @return
+ * @return int
  *   An integer number larger than any number returned before for this sequence.
+ *
+ * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
+ *   a database connection injected into your service from the container and
+ *   call nextId() on it. E.g. $injected_database->nextId($existing_id);
+ *
+ * @see \Drupal\Core\Database\Connection::nextId()
  */
 function db_next_id($existing_id = 0) {
   return Database::getConnection()->nextId($existing_id);
@@ -372,6 +480,12 @@ function db_next_id($existing_id = 0) {
  *
  * @return \Drupal\Core\Database\Query\Condition
  *   A new Condition object, set to "OR" all conditions together.
+ *
+ * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Create
+ *   a \Drupal\Core\Database\Query\Condition object, specifying an OR
+ *   conjunction: new Condition('OR');
+ *
+ * @see \Drupal\Core\Database\Query\Condition
  */
 function db_or() {
   return new Condition('OR');
@@ -382,6 +496,12 @@ function db_or() {
  *
  * @return \Drupal\Core\Database\Query\Condition
  *   A new Condition object, set to "AND" all conditions together.
+ *
+ * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Create
+ *   a \Drupal\Core\Database\Query\Condition object, specifying an AND
+ *   conjunction: new Condition('AND');
+ *
+ * @see \Drupal\Core\Database\Query\Condition
  */
 function db_and() {
   return new Condition('AND');
@@ -392,6 +512,12 @@ function db_and() {
  *
  * @return \Drupal\Core\Database\Query\Condition
  *   A new Condition object, set to "XOR" all conditions together.
+ *
+ * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Create
+ *   a \Drupal\Core\Database\Query\Condition object, specifying an XOR
+ *   conjunction: new Condition('XOR');
+ *
+ * @see \Drupal\Core\Database\Query\Condition
  */
 function db_xor() {
   return new Condition('XOR');
@@ -403,11 +529,17 @@ function db_xor() {
  * Internal API function call.  The db_and(), db_or(), and db_xor()
  * functions are preferred.
  *
- * @param $conjunction
+ * @param string $conjunction
  *   The conjunction to use for query conditions (AND, OR or XOR).
  *
  * @return \Drupal\Core\Database\Query\Condition
  *   A new Condition object, set to the specified conjunction.
+ *
+ * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Create
+ *   a \Drupal\Core\Database\Query\Condition object, specifying the desired
+ *   conjunction: new Condition($conjunctin);
+ *
+ * @see \Drupal\Core\Database\Query\Condition
  */
 function db_condition($conjunction) {
   return new Condition($conjunction);
@@ -426,10 +558,17 @@ function db_condition($conjunction) {
 /**
  * Creates a new table from a Drupal table definition.
  *
- * @param $name
+ * @param string $name
  *   The name of the table to create.
- * @param $table
+ * @param array $table
  *   A Schema API table definition array.
+ *
+ * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
+ *   a database connection injected into your service from the container, get
+ *   its schema driver, and call createTable() on it. E.g.
+ *   $injected_database->schema()->createTable($name, $table);
+ *
+ * @see \Drupal\Core\Database\Schema::createTable()
  */
 function db_create_table($name, $table) {
   return Database::getConnection()->schema()->createTable($name, $table);
@@ -441,11 +580,18 @@ function db_create_table($name, $table) {
  * This is usually an identity function but if a key/index uses a column prefix
  * specification, this function extracts just the name.
  *
- * @param $fields
+ * @param array $fields
  *   An array of key/index column specifiers.
  *
- * @return
+ * @return array
  *   An array of field names.
+ *
+ * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
+ *   a database connection injected into your service from the container, get
+ *   its schema driver, and call fieldNames() on it. E.g.
+ *   $injected_database->schema()->fieldNames($fields);
+ *
+ * @see \Drupal\Core\Database\Schema::fieldNames()
  */
 function db_field_names($fields) {
   return Database::getConnection()->schema()->fieldNames($fields);
@@ -454,13 +600,20 @@ function db_field_names($fields) {
 /**
  * Checks if an index exists in the given table.
  *
- * @param $table
+ * @param string $table
  *   The name of the table in drupal (no prefixing).
- * @param $name
+ * @param string $name
  *   The name of the index in drupal (no prefixing).
  *
- * @return
+ * @return bool
  *   TRUE if the given index exists, otherwise FALSE.
+ *
+ * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
+ *   a database connection injected into your service from the container, get
+ *   its schema driver, and call indexExists() on it. E.g.
+ *   $injected_database->schema()->indexExists($table, $name);
+ *
+ * @see \Drupal\Core\Database\Schema::indexExists()
  */
 function db_index_exists($table, $name) {
   return Database::getConnection()->schema()->indexExists($table, $name);
@@ -469,11 +622,18 @@ function db_index_exists($table, $name) {
 /**
  * Checks if a table exists.
  *
- * @param $table
+ * @param string $table
  *   The name of the table in drupal (no prefixing).
  *
- * @return
+ * @return bool
  *   TRUE if the given table exists, otherwise FALSE.
+ *
+ * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
+ *   a database connection injected into your service from the container, get
+ *   its schema driver, and call tableExists() on it. E.g.
+ *   $injected_database->schema()->tableExists($table);
+ *
+ * @see \Drupal\Core\Database\Schema::tableExists()
  */
 function db_table_exists($table) {
   return Database::getConnection()->schema()->tableExists($table);
@@ -487,8 +647,15 @@ function db_table_exists($table) {
  * @param $field
  *   The name of the field.
  *
- * @return
+ * @return bool
  *   TRUE if the given column exists, otherwise FALSE.
+ *
+ * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
+ *   a database connection injected into your service from the container, get
+ *   its schema driver, and call fieldExists() on it. E.g.
+ *   $injected_database->schema()->fieldExists($table, $field);
+ *
+ * @see \Drupal\Core\Database\Schema::fieldExists()
  */
 function db_field_exists($table, $field) {
   return Database::getConnection()->schema()->fieldExists($table, $field);
@@ -497,21 +664,24 @@ function db_field_exists($table, $field) {
 /**
  * Finds all tables that are like the specified base table name.
  *
- * @param $table_expression
+ * @param string $table_expression
  *   An SQL expression, for example "simpletest%" (without the quotes).
  *   BEWARE: this is not prefixed, the caller should take care of that.
  *
- * @return
+ * @return array
  *   Array, both the keys and the values are the matching tables.
+ *
+ * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
+ *   a database connection injected into your service from the container, get
+ *   its schema driver, and call findTables() on it. E.g.
+ *   $injected_database->schema()->findTables($table_expression);
+ *
+ * @see \Drupal\Core\Database\Schema::findTables()
  */
 function db_find_tables($table_expression) {
   return Database::getConnection()->schema()->findTables($table_expression);
 }
 
-function _db_create_keys_sql($spec) {
-  return Database::getConnection()->schema()->createKeysSql($spec);
-}
-
 /**
  * Renames a table.
  *
@@ -519,6 +689,13 @@ function _db_create_keys_sql($spec) {
  *   The current name of the table to be renamed.
  * @param $new_name
  *   The new name for the table.
+ *
+ * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
+ *   a database connection injected into your service from the container, get
+ *   its schema driver, and call renameTable() on it. E.g.
+ *   $injected_database->schema()->renameTable($table, $new_name);
+ *
+ * @see \Drupal\Core\Database\Schema::renameTable()
  */
 function db_rename_table($table, $new_name) {
   return Database::getConnection()->schema()->renameTable($table, $new_name);
@@ -529,6 +706,13 @@ function db_rename_table($table, $new_name) {
  *
  * @param $table
  *   The table to be dropped.
+ *
+ * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
+ *   a database connection injected into your service from the container, get
+ *   its schema driver, and call dropTable() on it. E.g.
+ *   $injected_database->schema()->dropTable($table);
+ *
+ * @see \Drupal\Core\Database\Schema::dropTable()
  */
 function db_drop_table($table) {
   return Database::getConnection()->schema()->dropTable($table);
@@ -541,18 +725,24 @@ function db_drop_table($table) {
  *   Name of the table to be altered.
  * @param $field
  *   Name of the field to be added.
- * @param $spec
+ * @param array $spec
  *   The field specification array, as taken from a schema definition. The
  *   specification may also contain the key 'initial'; the newly-created field
  *   will be set to the value of the key in all rows. This is most useful for
  *   creating NOT NULL columns with no default value in existing tables.
- * @param $keys_new
+ * @param array $keys_new
  *   (optional) Keys and indexes specification to be created on the table along
  *   with adding the field. The format is the same as a table specification, but
  *   without the 'fields' element. If you are adding a type 'serial' field, you
  *   MUST specify at least one key or index including it in this array. See
  *   db_change_field() for more explanation why.
  *
+ * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
+ *   a database connection injected into your service from the container, get
+ *   its schema driver, and call addField() on it. E.g.
+ *   $injected_database->schema()->addField($table, $field, $spec, $keys_new);
+ *
+ * @see \Drupal\Core\Database\Schema::addField()
  * @see db_change_field()
  */
 function db_add_field($table, $field, $spec, $keys_new = array()) {
@@ -566,6 +756,17 @@ function db_add_field($table, $field, $spec, $keys_new = array()) {
  *   The table to be altered.
  * @param $field
  *   The field to be dropped.
+ *
+ * @return bool
+ *   TRUE if the field was successfully dropped, FALSE if there was no field by
+ *   that name to begin with.
+ *
+ * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
+ *   a database connection injected into your service from the container, get
+ *   its schema driver, and call dropField() on it. E.g.
+ *   $injected_database->schema()->dropField($table, $field);
+ *
+ * @see \Drupal\Core\Database\Schema::dropField()
  */
 function db_drop_field($table, $field) {
   return Database::getConnection()->schema()->dropField($table, $field);
@@ -580,6 +781,13 @@ function db_drop_field($table, $field) {
  *   The field to be altered.
  * @param $default
  *   Default value to be set. NULL for 'default NULL'.
+ *
+ * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
+ *   a database connection injected into your service from the container, get
+ *   its schema driver, and call fieldSetDefault() on it. E.g.
+ *   $injected_database->schema()->fieldSetDefault($table, $field, $default);
+ *
+ * @see \Drupal\Core\Database\Schema::fieldSetDefault()
  */
 function db_field_set_default($table, $field, $default) {
   return Database::getConnection()->schema()->fieldSetDefault($table, $field, $default);
@@ -592,6 +800,13 @@ function db_field_set_default($table, $field, $default) {
  *   The table to be altered.
  * @param $field
  *   The field to be altered.
+ *
+ * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
+ *   a database connection injected into your service from the container, get
+ *   its schema driver, and call fieldSetNoDefault() on it. E.g.
+ *   $injected_database->schema()->fieldSetNoDefault($table, $field);
+ *
+ * @see \Drupal\Core\Database\Schema::fieldSetNoDefault()
  */
 function db_field_set_no_default($table, $field) {
   return Database::getConnection()->schema()->fieldSetNoDefault($table, $field);
@@ -604,6 +819,13 @@ function db_field_set_no_default($table, $field) {
  *   Name of the table to be altered.
  * @param $fields
  *   Array of fields for the primary key.
+ *
+ * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
+ *   a database connection injected into your service from the container, get
+ *   its schema driver, and call addPrimaryKey() on it. E.g.
+ *   $injected_database->schema()->addPrimaryKey($table, $fields);
+ *
+ * @see \Drupal\Core\Database\Schema::addPrimaryKey()
  */
 function db_add_primary_key($table, $fields) {
   return Database::getConnection()->schema()->addPrimaryKey($table, $fields);
@@ -614,6 +836,17 @@ function db_add_primary_key($table, $fields) {
  *
  * @param $table
  *   Name of the table to be altered.
+ *
+ * @return bool
+ *   TRUE if the primary key was successfully dropped, FALSE if there was no
+ *   primary key on this table to begin with.
+ *
+ * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
+ *   a database connection injected into your service from the container, get
+ *   its schema driver, and call dropPrimaryKey() on it. E.g.
+ *   $injected_database->schema()->dropPrimaryKey($table);
+ *
+ * @see \Drupal\Core\Database\Schema::dropPrimaryKey()
  */
 function db_drop_primary_key($table) {
   return Database::getConnection()->schema()->dropPrimaryKey($table);
@@ -626,8 +859,15 @@ function db_drop_primary_key($table) {
  *   The table to be altered.
  * @param $name
  *   The name of the key.
- * @param $fields
+ * @param array $fields
  *   An array of field names.
+ *
+ * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
+ *   a database connection injected into your service from the container, get
+ *   its schema driver, and call addUniqueKey() on it. E.g.
+ *   $injected_database->schema()->addUniqueKey($table, $name, $fields);
+ *
+ * @see \Drupal\Core\Database\Schema::addUniqueKey()
  */
 function db_add_unique_key($table, $name, $fields) {
   return Database::getConnection()->schema()->addUniqueKey($table, $name, $fields);
@@ -640,6 +880,17 @@ function db_add_unique_key($table, $name, $fields) {
  *   The table to be altered.
  * @param $name
  *   The name of the key.
+ *
+ * @return bool
+ *   TRUE if the key was successfully dropped, FALSE if there was no key by
+ *   that name to begin with.
+ *
+ * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
+ *   a database connection injected into your service from the container, get
+ *   its schema driver, and call dropUniqueKey() on it. E.g.
+ *   $injected_database->schema()->dropUniqueKey($table, $name);
+ *
+ * @see \Drupal\Core\Database\Schema::dropUniqueKey()
  */
 function db_drop_unique_key($table, $name) {
   return Database::getConnection()->schema()->dropUniqueKey($table, $name);
@@ -652,8 +903,15 @@ function db_drop_unique_key($table, $name) {
  *   The table to be altered.
  * @param $name
  *   The name of the index.
- * @param $fields
+ * @param array $fields
  *   An array of field names.
+ *
+ * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
+ *   a database connection injected into your service from the container, get
+ *   its schema driver, and call addIndex() on it. E.g.
+ *   $injected_database->schema()->addIndex($table, $name, $fields);
+ *
+ * @see \Drupal\Core\Database\Schema::addIndex()
  */
 function db_add_index($table, $name, $fields) {
   return Database::getConnection()->schema()->addIndex($table, $name, $fields);
@@ -666,6 +924,17 @@ function db_add_index($table, $name, $fields) {
  *   The table to be altered.
  * @param $name
  *   The name of the index.
+ *
+ * @return bool
+ *   TRUE if the index was successfully dropped, FALSE if there was no index
+ *   by that name to begin with.
+ *
+ * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
+ *   a database connection injected into your service from the container, get
+ *   its schema driver, and call dropIndex() on it. E.g.
+ *   $injected_database->schema()->dropIndex($table, $name);
+ *
+ * @see \Drupal\Core\Database\Schema::dropIndex()
  */
 function db_drop_index($table, $name) {
   return Database::getConnection()->schema()->dropIndex($table, $name);
@@ -726,10 +995,17 @@ function db_drop_index($table, $name) {
  *   change the name).
  * @param $spec
  *   The field specification for the new field.
- * @param $keys_new
+ * @param array $keys_new
  *   (optional) Keys and indexes specification to be created on the table along
  *   with changing the field. The format is the same as a table specification
  *   but without the 'fields' element.
+ *
+ * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
+ *   a database connection injected into your service from the container, get
+ *   its schema driver, and call changeField() on it. E.g.
+ *   $injected_database->schema()->changeField($table, $field, $field_new, $spec, $keys_new);
+ *
+ * @see \Drupal\Core\Database\Schema::changeField()
  */
 function db_change_field($table, $field, $field_new, $spec, $keys_new = array()) {
   return Database::getConnection()->schema()->changeField($table, $field, $field_new, $spec, $keys_new);
diff --git a/core/includes/entity.inc b/core/includes/entity.inc
index 31bbf42df..e66ec2d94 100644
--- a/core/includes/entity.inc
+++ b/core/includes/entity.inc
@@ -31,6 +31,11 @@ function entity_render_cache_clear() {
  * @return array
  *   The bundle info for a specific entity type, or all entity types.
  *
+ * @deprecated in Drupal 8.x-dev and will be removed before Drupal 9.0.0. Use
+ *   \Drupal\Core\Entity\EntityManagerInterface::getBundleInfo() for a single
+ *   bundle, or \Drupal\Core\Entity\EntityManagerInterface::getAllBundleInfo()
+ *   for all bundles.
+ *
  * @see \Drupal\Core\Entity\EntityManagerInterface::getBundleInfo()
  * @see \Drupal\Core\Entity\EntityManagerInterface::getAllBundleInfo()
  */
@@ -56,8 +61,18 @@ function entity_get_bundles($entity_type = NULL) {
  * @return \Drupal\Core\Entity\EntityInterface|null
  *   The entity object, or NULL if there is no entity with the given ID.
  *
- * @see \Drupal\Core\Entity\EntityManagerInterface
- * @see \Drupal\Core\Entity\EntityStorageInterface
+ * @deprecated in Drupal 8.0.x, will be removed before Drupal 9.0.0. Use
+ *   The method overriding Entity::load() for the entity type, e.g.
+ *   \Drupal\node\Entity\Node::load() if the entity type is known. If the
+ *   entity type is variable, use the entity manager service to load the entity
+ *   from the entity storage:
+ * @code
+ * \Drupal::entityManager()->getStorage($entity_type)->load($id)
+ * @endcode
+ *
+ * @see \Drupal\Core\Entity\EntityInterface::load()
+ * @see \Drupal\Core\Entity\EntityManagerInterface::getStorage()
+ * @see \Drupal\Core\Entity\EntityStorageInterface::load()
  * @see \Drupal\Core\Entity\Sql\SqlContentEntityStorage
  * @see \Drupal\Core\Entity\Query\QueryInterface
  */
@@ -81,8 +96,15 @@ function entity_load($entity_type, $id, $reset = FALSE) {
  *   The entity object, or NULL if there is no entity with the given revision
  *   id.
  *
- * @see \Drupal\Core\Entity\EntityManagerInterface
- * @see \Drupal\Core\Entity\EntityStorageInterface
+ * @deprecated as of Drupal 8.0.x, will be removed before Drupal 9.0.0. Use
+ *   the entity storage's loadRevision() method to load a specific entity
+ *   revision:
+ * @code
+ * \Drupal::entityManager()->getStorage($entity_type)->loadRevision($revision_id);
+ * @endcode
+ *
+ * @see \Drupal\Core\Entity\EntityManagerInterface::getStorage()
+ * @see \Drupal\Core\Entity\EntityStorageInterface::loadRevision()
  * @see \Drupal\Core\Entity\Sql\SqlContentEntityStorage
  */
 function entity_revision_load($entity_type, $revision_id) {
@@ -98,6 +120,16 @@ function entity_revision_load($entity_type, $revision_id) {
  *   The entity type to load, e.g. node or user.
  * @param $revision_id
  *   The revision ID to delete.
+ *
+ * @deprecated as of Drupal 8.0.x, will be removed before Drupal 9.0.0. Use
+ *   the entity storage's deleteRevision() method to delete a specific entity
+ *   revision:
+ * @code
+ * \Drupal::entityManager()->getStorage($entity_type)>deleteRevision($revision_id);
+ * @endcode
+ *
+ * @see \Drupal\Core\Entity\EntityManagerInterface::getStorage()
+ * @see \Drupal\Core\Entity\EntityStorageInterface::deleteRevision()
  */
 function entity_revision_delete($entity_type, $revision_id) {
   \Drupal::entityManager()
@@ -134,8 +166,18 @@ function entity_revision_delete($entity_type, $revision_id) {
  * @return array
  *   An array of entity objects indexed by their IDs.
  *
- * @see \Drupal\Core\Entity\EntityManagerInterface
- * @see \Drupal\Core\Entity\EntityStorageInterface
+ * @deprecated in Drupal 8.0.x, will be removed before Drupal 9.0.0. Use
+ *   The method overriding Entity::loadMultiple() for the entity type, e.g.
+ *   \Drupal\node\Entity\Node::loadMultiple() if the entity type is known. If
+ *   the entity type is variable, use the entity manager service to load the
+ *   entity from the entity storage:
+ * @code
+ * \Drupal::entityManager()->getStorage($entity_type)->loadMultiple($id)
+ * @endcode
+ *
+ * @see \Drupal\Core\Entity\EntityInterface::loadMultiple()
+ * @see \Drupal\Core\Entity\EntityManagerInterface::getStorage()
+ * @see \Drupal\Core\Entity\EntityStorageInterface::loadMultiple()
  * @see \Drupal\Core\Entity\Sql\SqlContentEntityStorage
  * @see \Drupal\Core\Entity\Query\QueryInterface
  */
@@ -159,6 +201,16 @@ function entity_load_multiple($entity_type, array $ids = NULL, $reset = FALSE) {
  * @return array
  *   An array of entity objects indexed by their IDs. Returns an empty array if
  *   no matching entities are found.
+ *
+ * @deprecated as of Drupal 8.0.x, will be removed before Drupal 9.0.0. Use
+ *   the entity storage's loadByProperties() method to load an entity by their
+ *   property values:
+ * @code
+ * \Drupal::entityManager()->getStorage($entity_type)->loadByProperties($values);
+ * @endcode
+ *
+ * @see \Drupal\Core\Entity\EntityManagerInterface::getStorage()
+ * @see \Drupal\Core\Entity\EntityStorageInterface::loadByProperties()
  */
 function entity_load_multiple_by_properties($entity_type, array $values) {
   return \Drupal::entityManager()
@@ -179,8 +231,17 @@ function entity_load_multiple_by_properties($entity_type, array $values) {
  * @param $id
  *   The ID of the entity to load.
  *
- * @return
+ * @return \Drupal\Core\Entity\EntityInterface|null
  *   The unchanged entity, or FALSE if the entity cannot be loaded.
+ *
+ * @deprecated as of Drupal 8.0.x, will be removed before Drupal 9.0.0. Use
+ *   the entity storage's loadUnchanged() method to load an unchanged entity:
+ * @code
+ * \Drupal::entityManager()->getStorage($entity_type)->loadUnchanged($id).
+ * @endcode
+ *
+ * @see \Drupal\Core\Entity\EntityManagerInterface::getStorage()
+ * @see \Drupal\Core\Entity\EntityStorageInterface::loadUnchanged()
  */
 function entity_load_unchanged($entity_type, $id) {
   return \Drupal::entityManager()
@@ -195,6 +256,18 @@ function entity_load_unchanged($entity_type, $id) {
  *   The type of the entity.
  * @param array $ids
  *   An array of entity IDs of the entities to delete.
+ *
+ * @deprecated as of Drupal 8.0.x, will be removed before Drupal 9.0.0. Use
+ *   the entity storage's delete() method to delete multiple entities:
+ * @code
+ * $storage_handler = \Drupal::entityManager()->getStorage($entity_type);
+ * $entities = $storage_handler->loadMultiple($ids);
+ * $storage_handler->delete($entities);
+ * @endcode
+ *
+ * @see \Drupal\Core\Entity\EntityManagerInterface::getStorage()
+ * @see \Drupal\Core\Entity\EntityStorageInterface::loadMultiple()
+ * @see \Drupal\Core\Entity\EntityStorageInterface::delete()
  */
 function entity_delete_multiple($entity_type, array $ids) {
   $controller = \Drupal::entityManager()->getStorage($entity_type);
@@ -214,10 +287,17 @@ function entity_delete_multiple($entity_type, array $ids) {
  * @return \Drupal\Core\Entity\EntityInterface
  *   A new entity object.
  *
- * @deprecated in Drupal 8.x-dev, will be removed before Drupal 9.0.0. Use
- *    the <EntityType>::create($values) method if the entity type is known or
- *    \Drupal::entityManager()->getStorage($entity_type)->create($values) if the
- *    entity type is variable.
+ * @deprecated in Drupal 8.0.x, will be removed before Drupal 9.0.0. Use
+ *   The method overriding Entity::create() for the entity type, e.g.
+ *   \Drupal\node\Entity\Node::create() if the entity type is known. If the
+ *   entity type is variable, use the entity storage's create() method to
+ *   construct a new entity:
+ * @code
+ * \Drupal::entityManager()->getStorage($entity_type)->create($values)
+ * @endcode
+ *
+ * @see \Drupal\Core\Entity\EntityManagerInterface::getStorage()
+ * @see \Drupal\Core\Entity\EntityStorageInterface::create()
  */
 function entity_create($entity_type, array $values = array()) {
   return \Drupal::entityManager()
@@ -228,9 +308,6 @@ function entity_create($entity_type, array $values = array()) {
 /**
  * Returns the label of an entity.
  *
- * This is a wrapper for Drupal\Core\Entity\EntityInterface::label(). This function
- * should only be used as a callback, e.g. for menu title callbacks.
- *
  * @param \Drupal\Core\Entity\EntityInterface $entity
  *   The entity for which to generate the label.
  * @param $langcode
@@ -238,9 +315,15 @@ function entity_create($entity_type, array $values = array()) {
  *   getting the label. If set to NULL, the entity's default language is
  *   used.
  *
- * @return
+ * @return string|null
  *   The label of the entity, or NULL if there is no label defined.
  *
+ * @deprecated as of Drupal 8.0.x, will be removed before Drupal 9.0.0. Use
+ *   the entity's label() method to get the label of the entity:
+ * @code
+ * $entity->label($langcode);
+ * @endcode
+ *
  * @see \Drupal\Core\Entity\EntityInterface::label()
  */
 function entity_page_label(EntityInterface $entity, $langcode = NULL) {
@@ -263,6 +346,16 @@ function entity_page_label(EntityInterface $entity, $langcode = NULL) {
  *
  * @return array
  *   A render array for the entity.
+ *
+ * @deprecated as of Drupal 8.0.x, will be removed before Drupal 9.0.0.
+ *   Use the entity view builder's view() method for creating a render array:
+ * @code
+ * $view_builder = \Drupal::entityManager()->getViewBuilder($entity->getEntityTypeId());
+ * return $view_builder->view($entity, $view_mode, $langcode);
+ * @endcode
+ *
+ * @see \Drupal\Core\Entity\EntityManagerInterface::getViewBuilder()
+ * @see \Drupal\Core\Entity\EntityViewBuilderInterface::view()
  */
 function entity_view(EntityInterface $entity, $view_mode, $langcode = NULL, $reset = FALSE) {
   $render_controller = \Drupal::entityManager()->getViewBuilder($entity->getEntityTypeId());
@@ -289,6 +382,17 @@ function entity_view(EntityInterface $entity, $view_mode, $langcode = NULL, $res
  * @return array
  *   A render array for the entities, indexed by the same keys as the
  *   entities array passed in $entities.
+ *
+ * @deprecated as of Drupal 8.0.x, will be removed before Drupal 9.0.0.
+ *   Use the entity view builder's viewMultiple() method for creating a render
+ *   array for the provided entities:
+ * @code
+ * $view_builder = \Drupal::entityManager()->getViewBuilder($entity->getEntityTypeId());
+ * return $view_builder->viewMultiple($entities, $view_mode, $langcode);
+ * @endcode
+ *
+ * @see \Drupal\Core\Entity\EntityManagerInterface::getViewBuilder()
+ * @see \Drupal\Core\Entity\EntityViewBuilderInterface::viewMultiple()
  */
 function entity_view_multiple(array $entities, $view_mode, $langcode = NULL, $reset = FALSE) {
   $render_controller = \Drupal::entityManager()->getViewBuilder(reset($entities)->getEntityTypeId());
@@ -336,6 +440,26 @@ function entity_view_multiple(array $entities, $view_mode, $langcode = NULL, $re
  *
  * @return \Drupal\Core\Entity\Display\EntityViewDisplayInterface
  *   The entity view display associated to the view mode.
+ *
+ * @deprecated as of Drupal 8.0.x, will be removed before Drupal 9.0.0.
+ *   If the display is available in configuration use:
+ * @code
+ *   \Drupal::entityManager()->getStorage('entity_view_display')->load($entity_type . '.' . $bundle . '.' . $view_mode);
+ * @endcode
+ *   When the display is not available in configuration, you can create a new
+ *   EntityViewDisplay object using:
+ * @code
+ * $values = ('entity_view_display', array(
+ *  'targetEntityType' => $entity_type,
+ *  'bundle' => $bundle,
+ *  'mode' => $view_mode,
+ *  'status' => TRUE,
+ * ));
+ * \Drupal::entityManager()->getStorage('entity_view_display')->create($values);
+ * @endcode
+ *
+ * @see \Drupal\Core\Entity\EntityStorageInterface::create()
+ * @see \Drupal\Core\Entity\EntityStorageInterface::load()
  */
 function entity_get_display($entity_type, $bundle, $view_mode) {
   // Try loading the display from configuration.
@@ -392,6 +516,26 @@ function entity_get_display($entity_type, $bundle, $view_mode) {
  *
  * @return \Drupal\Core\Entity\Display\EntityFormDisplayInterface
  *   The entity form display associated to the given form mode.
+ *
+ * @deprecated as of Drupal 8.0.x, will be removed before Drupal 9.0.0.
+ *   If the entity form display is available in configuration use:
+ * @code
+ *   \Drupal::entityManager()->getStorage('entity_form_display')->load($entity_type . '.' . $bundle . '.' . $form_mode);
+ * @endcode
+ *   When the entity form display is not available in configuration, you can create a new
+ *   EntityFormDisplay object using:
+ * @code
+ * $values = ('entity_form_display', array(
+ *  'targetEntityType' => $entity_type,
+ *  'bundle' => $bundle,
+ *  'mode' => $form_mode,
+ *  'status' => TRUE,
+ * ));
+ * \Drupal::entityManager()->getStorage('entity_form_display')->create($values);
+ * @endcode
+ *
+ * @see \Drupal\Core\Entity\EntityStorageInterface::create()
+ * @see \Drupal\Core\Entity\EntityStorageInterface::load()
  */
 function entity_get_form_display($entity_type, $bundle, $form_mode) {
   // Try loading the entity from configuration.
diff --git a/core/includes/errors.inc b/core/includes/errors.inc
index 06753fd0d..707968ba6 100644
--- a/core/includes/errors.inc
+++ b/core/includes/errors.inc
@@ -9,6 +9,7 @@ use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Utility\Xss;
 use Drupal\Core\Logger\RfcLogLevel;
 use Drupal\Core\Utility\Error;
+use Symfony\Component\HttpFoundation\Response;
 
 /**
  * Maps PHP error constants to watchdog severity levels.
@@ -117,21 +118,6 @@ function error_displayable($error = NULL) {
  */
 function _drupal_log_error($error, $fatal = FALSE) {
   $is_installer = drupal_installation_attempted();
-  // Initialize a maintenance theme if the bootstrap was not complete.
-  // Do it early because drupal_set_message() triggers a
-  // \Drupal\Core\Theme\ThemeManager::initTheme().
-  if ($fatal && \Drupal::hasService('theme.manager')) {
-    // The installer initializes a maintenance theme at the earliest possible
-    // point in time already. Do not unset that.
-    if (!$is_installer) {
-      \Drupal::theme()->resetActiveTheme();
-    }
-    if (!defined('MAINTENANCE_MODE')) {
-      define('MAINTENANCE_MODE', 'error');
-    }
-    // No-op if the active theme is set already.
-    drupal_maintenance_theme();
-  }
 
   // Backtrace array is not a valid replacement value for t().
   $backtrace = $error['backtrace'];
@@ -152,22 +138,37 @@ function _drupal_log_error($error, $fatal = FALSE) {
         'line' => $error['%line'],
       ),
     );
+    // For non-fatal errors (e.g. PHP notices) _drupal_log_error can be called
+    // multiple times per request. In that case the response is typically
+    // generated outside of the error handler, e.g., in a controller. As a
+    // result it is not possible to use a Response object here but instead the
+    // headers need to be emitted directly.
     header('X-Drupal-Assertion-' . $number . ': ' . rawurlencode(serialize($assertion)));
     $number++;
   }
 
+  $response = new Response();
+
   // Only call the logger if there is a logger factory available. This can occur
   // if there is an error while rebuilding the container or during the
   // installer.
   if (\Drupal::hasService('logger.factory')) {
-    \Drupal::logger('php')->log($error['severity_level'], '%type: !message in %function (line %line of %file).', $error);
+    try {
+      \Drupal::logger('php')->log($error['severity_level'], '%type: !message in %function (line %line of %file).', $error);
+    }
+    catch (\Exception $e) {
+      // We can't log, for example because the database connection is not
+      // available. At least try to log to PHP error log.
+      error_log(sprintf('Failed to log error: %type: !message in %function (line %line of %file).', $error['%type'], $error['%function'], $error['%line'], $error['%file']));
+    }
   }
 
   if (PHP_SAPI === 'cli') {
     if ($fatal) {
       // When called from CLI, simply output a plain text message.
       // Should not translate the string to avoid errors producing more errors.
-      print html_entity_decode(strip_tags(format_string('%type: !message in %function (line %line of %file).', $error))). "\n";
+      $response->setContent(html_entity_decode(strip_tags(format_string('%type: !message in %function (line %line of %file).', $error))). "\n");
+      $response->send();
       exit;
     }
   }
@@ -177,7 +178,8 @@ function _drupal_log_error($error, $fatal = FALSE) {
       if (error_displayable($error)) {
         // When called from JavaScript, simply output the error message.
         // Should not translate the string to avoid errors producing more errors.
-        print format_string('%type: !message in %function (line %line of %file).', $error);
+        $response->setContent(format_string('%type: !message in %function (line %line of %file).', $error));
+        $response->send();
       }
       exit;
     }
@@ -185,6 +187,8 @@ function _drupal_log_error($error, $fatal = FALSE) {
   else {
     // Display the message if the current error reporting level allows this type
     // of message to be displayed, and unconditionally in update.php.
+    $message = '';
+    $class = NULL;
     if (error_displayable($error)) {
       $class = 'error';
 
@@ -219,6 +223,32 @@ function _drupal_log_error($error, $fatal = FALSE) {
         // Generate a backtrace containing only scalar argument values.
         $message .= '<pre class="backtrace">' . Error::formatBacktrace($backtrace) . '</pre>';
       }
+    }
+
+    if ($fatal) {
+      // We fallback to a maintenance page at this point, because the page generation
+      // itself can generate errors.
+      // Should not translate the string to avoid errors producing more errors.
+      $message = 'The website encountered an unexpected error. Please try again later.' . '<br />' . $message;
+
+      if ($is_installer) {
+        // install_display_output() prints the output and ends script execution.
+        $output = array(
+          '#title' => 'Error',
+          '#markup' => $message,
+        );
+        install_display_output($output, $GLOBALS['install_state'], $response->headers->all());
+        exit;
+      }
+
+      $response->setContent($message);
+      $response->setStatusCode(500, '500 Service unavailable (with message)');
+
+      $response->send();
+      // An exception must halt script execution.
+      exit;
+    }
+    else {
       if (\Drupal::hasService('session')) {
         // Message display is dependent on sessions being available.
         drupal_set_message(SafeMarkup::set($message), $class, TRUE);
@@ -227,29 +257,6 @@ function _drupal_log_error($error, $fatal = FALSE) {
         print $message;
       }
     }
-
-    if ($fatal) {
-      // We fallback to a maintenance page at this point, because the page generation
-      // itself can generate errors.
-      // Should not translate the string to avoid errors producing more errors.
-      $message = 'The website encountered an unexpected error. Please try again later.';
-      if ($is_installer) {
-        // install_display_output() prints the output and ends script execution.
-        $output = array(
-          '#title' => 'Error',
-          '#markup' => $message,
-        );
-        install_display_output($output, $GLOBALS['install_state']);
-        exit;
-      }
-
-      $bare_html_page_renderer = \Drupal::service('bare_html_page_renderer');
-      $response = $bare_html_page_renderer->renderBarePage(['#markup' => $message], 'Error', 'maintenance_page');
-      $response->setStatusCode(500, '500 Service unavailable (with message)');
-      // An exception must halt script execution.
-      $response->send();
-      exit;
-    }
   }
 }
 
@@ -277,9 +284,16 @@ function _drupal_get_error_level() {
     return ERROR_REPORTING_DISPLAY_VERBOSE;
   }
   $error_level = NULL;
-  if (\Drupal::hasService('config.factory')) {
+  // Try to get the error level configuration from database. If this fails,
+  // for example if the database connection is not there, try to read it from
+  // settings.php.
+  try {
     $error_level = \Drupal::config('system.logging')->get('error_level');
   }
+  catch (\Exception $e) {
+    $error_level = isset($GLOBALS['config']['system.logging']['error_level']) ? $GLOBALS['config']['system.logging']['error_level'] : ERROR_REPORTING_HIDE;
+  }
+
   // If there is no container or if it has no config.factory service, we are
   // possibly in an edge-case error situation while trying to serve a regular
   // request on a public site, so use the non-verbose default value.
diff --git a/core/includes/file.inc b/core/includes/file.inc
index 4440d4183..0740c82d1 100644
--- a/core/includes/file.inc
+++ b/core/includes/file.inc
@@ -89,49 +89,6 @@ const FILE_EXISTS_ERROR = 2;
  */
 const FILE_STATUS_PERMANENT = 1;
 
-/**
- * Provides Drupal stream wrapper registry.
- *
- * @param int $filter
- *   (Optional) Filters out all types except those with an on bit for each on
- *   bit in $filter. For example, if $filter is
- *   StreamWrapperInterface::WRITE_VISIBLE, which is equal to
- *   (StreamWrapperInterface::READ | StreamWrapperInterface::WRITE |
- *   StreamWrapperInterface::VISIBLE), then only stream wrappers with all three
- *   of these bits set are returned. Defaults to StreamWrapperInterface::ALL,
- *   which returns all registered stream wrappers.
- *
- * @return array
- *   An array keyed by scheme, with values containing an array of information
- *   about the stream wrapper, as returned by hook_stream_wrappers(). If $filter
- *   is omitted or set to StreamWrapperInterface::ALL, the entire Drupal stream
- *   wrapper registry is returned. Otherwise only the stream wrappers whose
- *   'type' bitmask has an on bit for each bit specified in $filter are
- *   returned.
- *
- * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
- *   Use \Drupal::service('stream_wrapper_manager')->getWrappers().
- */
-function file_get_stream_wrappers($filter = StreamWrapperInterface::ALL) {
-  return \Drupal::service('stream_wrapper_manager')->getWrappers($filter);
-}
-
-/**
- * Returns the stream wrapper class name for a given scheme.
- *
- * @param string $scheme
- *   Stream scheme.
- *
- * @return string|bool
- *   Return string if a scheme has a registered handler, or FALSE.
- *
- * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
- *   Use \Drupal::service('stream_wrapper_manager')->getClass().
- */
-function file_stream_wrapper_get_class($scheme) {
-  return \Drupal::service('stream_wrapper_manager')->getClass($scheme);
-}
-
 /**
  * Returns the scheme of a URI (e.g. a stream).
  *
@@ -214,55 +171,6 @@ function file_stream_wrapper_uri_normalize($uri) {
   return $uri;
 }
 
-/**
- * Returns a reference to the stream wrapper class responsible for a given URI.
- *
- * The scheme determines the stream wrapper class that should be
- * used by consulting the stream wrapper registry.
- *
- * @param string $uri
- *   A stream, referenced as "scheme://target".
- *
- * @return \Drupal\Core\StreamWrapper\StreamWrapperInterface|bool
- *   Returns a new stream wrapper object appropriate for the given URI or FALSE
- *   if no registered handler could be found. For example, a URI of
- *   "private://example.txt" would return a new private stream wrapper object
- *   (Drupal\Core\StreamWrapper\PrivateStream).
- *
- * * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
- *   Use \Drupal::service('stream_wrapper_manager')->getViaUri().
- */
-function file_stream_wrapper_get_instance_by_uri($uri) {
-  return \Drupal::service('stream_wrapper_manager')->getViaUri($uri);
-}
-
-/**
- * Returns a reference to the stream wrapper class responsible for a scheme.
- *
- * This helper method returns a stream instance using a scheme. That is, the
- * passed string does not contain a "://". For example, "public" is a scheme
- * but "public://" is a URI (stream). This is because the later contains both
- * a scheme and target despite target being empty.
- *
- * Note: the instance URI will be initialized to "scheme://" so that you can
- * make the customary method calls as if you had retrieved an instance by URI.
- *
- * @param string $scheme
- *   If the stream was "public://target", "public" would be the scheme.
- *
- * @return \Drupal\Core\StreamWrapper\StreamWrapperInterface|bool
- *   Returns a new stream wrapper object appropriate for the given $scheme.
- *   For example, for the public scheme a stream wrapper object
- *   (Drupal\Core\StreamWrapper\PublicStream).
- *   FALSE is returned if no registered handler could be found.
- *
- * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
- *   Use \Drupal::service('stream_wrapper_manager')->getViaScheme().
- */
-function file_stream_wrapper_get_instance_by_scheme($scheme) {
-  return \Drupal::service('stream_wrapper_manager')->getViaScheme($scheme);
-}
-
 /**
  * Creates a web-accessible URL for a stream to an external or local file.
  *
@@ -331,7 +239,7 @@ function file_create_url($uri) {
   }
   else {
     // Attempt to return an external URL using the appropriate wrapper.
-    if ($wrapper = file_stream_wrapper_get_instance_by_uri($uri)) {
+    if ($wrapper = \Drupal::service('stream_wrapper_manager')->getViaUri($uri)) {
       return $wrapper->getExternalUrl();
     }
     else {
diff --git a/core/includes/form.inc b/core/includes/form.inc
index 817082010..1c8820176 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -43,7 +43,7 @@ function template_preprocess_select(&$variables) {
 }
 
 /**
- * Converts an array of options into HTML, for use in select list form elements.
+ * Converts an options form element into a structured array for output.
  *
  * This function calls itself recursively to obtain the values for each optgroup
  * within the list of options and when the function encounters an object with
@@ -78,13 +78,22 @@ function template_preprocess_select(&$variables) {
  *   $element['#options'] above, or NULL. This parameter is only used internally
  *   and is not intended to be passed in to the initial function call.
  *
- * @return string
- *   An HTML string of options and optgroups for use in a select form element.
+ * @return mixed[]
+ *   A structured, possibly nested, array of options and optgroups for use in a
+ *   select form element.
+ *   - label: A translated string whose value is the text of a single HTML
+ *     option element, or the label attribute for an optgroup.
+ *   - options: Optional, array of options for an optgroup.
+ *   - selected: A boolean that indicates whether the option is selected when
+ *     rendered.
+ *   - type: A string that defines the element type. The value can be 'option'
+ *     or 'optgroup'.
+ *   - value: A string that contains the value attribute for the option.
  */
 function form_select_options($element, $choices = NULL) {
   if (!isset($choices)) {
     if (empty($element['#options'])) {
-      return '';
+      return [];
     }
     $choices = $element['#options'];
   }
@@ -94,29 +103,35 @@ function form_select_options($element, $choices = NULL) {
   $value_is_array = $value_valid && is_array($element['#value']);
   // Check if the element is multiple select and no value has been selected.
   $empty_value = (empty($element['#value']) && !empty($element['#multiple']));
-  $options = '';
+  $options = [];
   foreach ($choices as $key => $choice) {
     if (is_array($choice)) {
-      $options .= '<optgroup label="' . SafeMarkup::checkPlain($key) . '">';
-      $options .= form_select_options($element, $choice);
-      $options .= '</optgroup>';
+      $options[] = [
+        'type' => 'optgroup',
+        'label' => $key,
+        'options' => form_select_options($element, $choice),
+      ];
     }
     elseif (is_object($choice) && isset($choice->option)) {
-      $options .= form_select_options($element, $choice->option);
+      $options = array_merge($options, form_select_options($element, $choice->option));
     }
     else {
+      $option = [];
       $key = (string) $key;
       $empty_choice = $empty_value && $key == '_none';
       if ($value_valid && ((!$value_is_array && (string) $element['#value'] === $key || ($value_is_array && in_array($key, $element['#value']))) || $empty_choice)) {
-        $selected = ' selected="selected"';
+        $option['selected'] = TRUE;
       }
       else {
-        $selected = '';
+        $option['selected'] = FALSE;
       }
-      $options .= '<option value="' . SafeMarkup::checkPlain($key) . '"' . $selected . '>' . SafeMarkup::checkPlain($choice) . '</option>';
+      $option['type'] = 'option';
+      $option['value'] = $key;
+      $option['label'] = $choice;
+      $options[] = $option;
     }
   }
-  return SafeMarkup::set($options);
+  return $options;
 }
 
 /**
@@ -810,7 +825,7 @@ function batch_process($redirect = NULL, Url $url = NULL, $redirect_callback = N
       $query_options['op'] = 'finished';
       $error_url->setOption('query', $query_options);
 
-      $batch['error_message'] = t('Please continue to <a href="@error_url">the error page</a>', array('@error_url' => $error_url->toString()));
+      $batch['error_message'] = t('Please continue to <a href="@error_url">the error page</a>', array('@error_url' => $error_url->toString(TRUE)->getGeneratedUrl()));
 
       // Clear the way for the redirection to the batch processing page, by
       // saving and unsetting the 'destination', if there is any.
@@ -840,7 +855,7 @@ function batch_process($redirect = NULL, Url $url = NULL, $redirect_callback = N
         $function($batch_url->toString(), ['query' => $query_options]);
       }
       else {
-        return new RedirectResponse($batch_url->setAbsolute()->toString());
+        return new RedirectResponse($batch_url->setAbsolute()->toString(TRUE)->getGeneratedUrl());
       }
     }
     else {
diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc
index 34bfcb017..fb18fe303 100644
--- a/core/includes/install.core.inc
+++ b/core/includes/install.core.inc
@@ -1350,7 +1350,7 @@ function install_download_translation(&$install_state) {
  *   original name. If the path contains a filename as well, that one will be
  *   used instead.
  *
- * @return boolean
+ * @return bool
  *   TRUE on success, FALSE on failure.
  */
 function install_retrieve_file($uri, $destination) {
@@ -1364,8 +1364,8 @@ function install_retrieve_file($uri, $destination) {
   }
 
   try {
-    $request = \Drupal::httpClient()->get($uri, array('headers' => array('Accept' => 'text/plain')));
-    $data = $request->getBody(TRUE);
+    $response = \Drupal::httpClient()->get($uri, array('headers' => array('Accept' => 'text/plain')));
+    $data = (string) $response->getBody();
     if (empty($data)) {
       return FALSE;
     }
@@ -1656,6 +1656,12 @@ function install_profile_themes(&$install_state) {
  *   An array of information about the current installation state.
  */
 function install_install_profile(&$install_state) {
+  // Now that all modules are installed, make sure the entity storage and other
+  // handlers are up to date with the current entity and field definitions. For
+  // example, Path module adds a base field to nodes and taxonomy terms after
+  // those modules are already installed.
+  \Drupal::service('entity.definition_update_manager')->applyUpdates();
+
   \Drupal::service('module_installer')->install(array(drupal_get_profile()), FALSE);
   // Install all available optional config. During installation the module order
   // is determined by dependencies. If there are no dependencies between modules
diff --git a/core/includes/menu.inc b/core/includes/menu.inc
index d57849904..56566e1f8 100644
--- a/core/includes/menu.inc
+++ b/core/includes/menu.inc
@@ -40,10 +40,6 @@ function template_preprocess_menu_local_task(&$variables) {
     $active = SafeMarkup::format('<span class="visually-hidden">@label</span>', array('@label' => t('(active tab)')));
     $link_text = t('@local-task-title@active', array('@local-task-title' => $link_text, '@active' => $active));
   }
-  else {
-    // @todo Remove this once https://www.drupal.org/node/2338081 is fixed.
-    $link_text = SafeMarkup::checkPlain($link_text);
-  }
 
   $link['localized_options']['set_active_class'] = TRUE;
 
diff --git a/core/includes/pager.inc b/core/includes/pager.inc
index 7ce34072e..57f860c64 100644
--- a/core/includes/pager.inc
+++ b/core/includes/pager.inc
@@ -176,6 +176,7 @@ function template_preprocess_pager(&$variables) {
   $element = $variables['pager']['#element'];
   $parameters = $variables['pager']['#parameters'];
   $quantity = $variables['pager']['#quantity'];
+  $route_name = $variables['pager']['#route_name'];
   global $pager_page_array, $pager_total;
 
   // Nothing to do if there is only one page.
@@ -218,7 +219,7 @@ function template_preprocess_pager(&$variables) {
     $options = array(
       'query' => pager_query_add_page($parameters, $element, 0),
     );
-    $items['first']['href'] = \Drupal::url('<current>', [], $options);
+    $items['first']['href'] = \Drupal::url($route_name, [], $options);
     if (isset($tags[0])) {
       $items['first']['text'] = $tags[0];
     }
@@ -227,7 +228,7 @@ function template_preprocess_pager(&$variables) {
     $options = array(
       'query' => pager_query_add_page($parameters, $element, $pager_page_array[$element] - 1),
     );
-    $items['previous']['href'] = \Drupal::url('<current>', [], $options);
+    $items['previous']['href'] = \Drupal::url($route_name, [], $options);
     if (isset($tags[1])) {
       $items['previous']['text'] = $tags[1];
     }
@@ -243,7 +244,7 @@ function template_preprocess_pager(&$variables) {
       $options = array(
         'query' => pager_query_add_page($parameters, $element, $i - 1),
       );
-      $items['pages'][$i]['href'] = \Drupal::url('<current>', [], $options);
+      $items['pages'][$i]['href'] = \Drupal::url($route_name, [], $options);
       if ($i == $pager_current) {
         $variables['current'] = $i;
       }
@@ -260,7 +261,7 @@ function template_preprocess_pager(&$variables) {
     $options = array(
       'query' => pager_query_add_page($parameters, $element, $pager_page_array[$element] + 1),
     );
-    $items['next']['href'] = \Drupal::url('<current>', [], $options);
+    $items['next']['href'] = \Drupal::url($route_name, [], $options);
     if (isset($tags[3])) {
       $items['next']['text'] = $tags[3];
     }
@@ -269,13 +270,18 @@ function template_preprocess_pager(&$variables) {
     $options = array(
       'query' => pager_query_add_page($parameters, $element, $pager_max - 1),
     );
-    $items['last']['href'] = \Drupal::url('<current>', [], $options);
+    $items['last']['href'] = \Drupal::url($route_name, [], $options);
     if (isset($tags[4])) {
       $items['last']['text'] = $tags[4];
     }
   }
 
   $variables['items'] = $items;
+
+  // The rendered link needs to play well with any other query parameter
+  // used on the page, like exposed filters, so for the cacheability all query
+  // parameters matter.
+  $variables['#cache']['contexts'][] = 'url.query_args';
 }
 
 /**
diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index 74000172c..cfdfa890c 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -1066,30 +1066,6 @@ function template_preprocess_item_list(&$variables) {
   }
 }
 
-/**
- * Prepares variables for feed icon templates.
- *
- * Default template: feed-icon.html.twig.
- *
- * @param array $variables
- *   An associative array containing:
- *   - url: An internal system path or a fully qualified external URL of the
- *     feed.
- *   - title: A descriptive title of the feed.
- */
-function template_preprocess_feed_icon(&$variables) {
-  $text = t('Subscribe to !feed-title', array('!feed-title' => $variables['title']));
-  $variables['icon'] = array(
-    '#theme' => 'image__feed_icon',
-    '#uri' => 'core/misc/feed.png',
-    '#width' => 16,
-    '#height' => 16,
-    '#alt' => $text,
-  );
-  // Stripping tags because that's what l() used to do.
-  $variables['attributes']['title'] = strip_tags($text);
-}
-
 /**
  * Returns HTML for an indentation div; used for drag and drop tables.
  *
@@ -1350,7 +1326,7 @@ function template_preprocess_page(&$variables) {
   $variables['language']          = $language_interface;
   $variables['logo']              = theme_get_setting('logo.url');
   $variables['site_name']         = (theme_get_setting('features.name') ? SafeMarkup::checkPlain($site_config->get('name')) : '');
-  $variables['site_slogan']       = (theme_get_setting('features.slogan') ? Xss::filterAdmin($site_config->get('slogan')) : '');
+  $variables['site_slogan']['#markup'] = (theme_get_setting('features.slogan') ? $site_config->get('slogan') : '');
 
   // An exception might be thrown.
   try {
@@ -1462,7 +1438,6 @@ function template_preprocess_maintenance_page(&$variables) {
   template_preprocess_page($variables);
 
   // @see system_page_attachments()
-  $variables['#attached']['library'][] = 'core/normalize';
   $variables['#attached']['library'][] = 'system/maintenance';
 }
 
diff --git a/core/includes/update.inc b/core/includes/update.inc
index 9d4557f02..34882c3d7 100644
--- a/core/includes/update.inc
+++ b/core/includes/update.inc
@@ -224,14 +224,10 @@ function update_do_one($module, $number, $dependency_map, &$context) {
 /**
  * Performs entity definition updates, which can trigger schema updates.
  *
- * @param $module
- *   The module whose update will be run.
- * @param $number
- *   The update number to run.
  * @param $context
  *   The batch context array.
  */
-function update_entity_definitions($module, $number, &$context) {
+function update_entity_definitions(&$context) {
   try {
     \Drupal::service('entity.definition_update_manager')->applyUpdates();
   }
@@ -243,7 +239,7 @@ function update_entity_definitions($module, $number, &$context) {
     // \Drupal\Component\Utility\SafeMarkup::checkPlain() by
     // \Drupal\Core\Utility\Error::decodeException().
     $ret['#abort'] = array('success' => FALSE, 'query' => t('%type: !message in %function (line %line of %file).', $variables));
-    $context['results'][$module][$number] = $ret;
+    $context['results']['core']['update_entity_definitions'] = $ret;
     $context['results']['#abort'][] = 'update_entity_definitions';
   }
 }
diff --git a/core/includes/utility.inc b/core/includes/utility.inc
index ff65dc8cf..4918719a5 100644
--- a/core/includes/utility.inc
+++ b/core/includes/utility.inc
@@ -29,13 +29,17 @@ function drupal_rebuild(ClassLoader $class_loader, Request $request) {
   restore_error_handler();
   restore_exception_handler();
 
-  // Force kernel to rebuild container.
-  PhpStorageFactory::get('service_container')->deleteAll();
+  // Force kernel to rebuild php cache.
   PhpStorageFactory::get('twig')->deleteAll();
 
   // Bootstrap up to where caches exist and clear them.
   $kernel = new DrupalKernel('prod', $class_loader);
   $kernel->setSitePath(DrupalKernel::findSitePath($request));
+
+  // Invalidate the container.
+  $kernel->invalidateContainer();
+
+  // Prepare a NULL request.
   $kernel->prepareLegacyRequest($request);
 
   foreach (Cache::getBins() as $bin) {
diff --git a/core/install.php b/core/install.php
index d88444656..5940fbebe 100644
--- a/core/install.php
+++ b/core/install.php
@@ -21,8 +21,8 @@ define('MAINTENANCE_MODE', 'install');
 // The minimum version is specified explicitly, as DRUPAL_MINIMUM_PHP is not
 // yet available. It is defined in bootstrap.inc, but it is not possible to
 // load that file yet as it would cause a fatal error on older versions of PHP.
-if (version_compare(PHP_VERSION, '5.4.5') < 0) {
-  print 'Your PHP installation is too old. Drupal requires at least PHP 5.4.5. See the <a href="https://www.drupal.org/requirements">system requirements</a> page for more information.';
+if (version_compare(PHP_VERSION, '5.5.9') < 0) {
+  print 'Your PHP installation is too old. Drupal requires at least PHP 5.5.9. See the <a href="https://www.drupal.org/requirements">system requirements</a> page for more information.';
   exit;
 }
 
diff --git a/core/lib/Drupal.php b/core/lib/Drupal.php
index 7fbd06ae1..2254f8b02 100644
--- a/core/lib/Drupal.php
+++ b/core/lib/Drupal.php
@@ -81,7 +81,7 @@ class Drupal {
   /**
    * The current system version.
    */
-  const VERSION = '8.0.0-beta12';
+  const VERSION = '8.0.0-beta14';
 
   /**
    * Core API compatibility.
@@ -395,7 +395,7 @@ class Drupal {
   /**
    * Returns the default http client.
    *
-   * @return \GuzzleHttp\ClientInterface
+   * @return \GuzzleHttp\Client
    *   A guzzle http client instance.
    */
   public static function httpClient() {
@@ -504,22 +504,22 @@ class Drupal {
    *   (optional) An associative array of parameter names and values.
    * @param array $options
    *   (optional) An associative array of additional options.
-   * @param bool $collect_cacheability_metadata
+   * @param bool $collect_bubbleable_metadata
    *   (optional) Defaults to FALSE. When TRUE, both the generated URL and its
-   *   associated cacheability metadata are returned.
+   *   associated bubbleable metadata are returned.
    *
    * @return string|\Drupal\Core\GeneratedUrl
    *   A string containing a URL to the given path.
-   *   When $collect_cacheability_metadata is TRUE, a GeneratedUrl object is
-   *   returned, containing the generated URL plus cacheability metadata.
+   *   When $collect_bubbleable_metadata is TRUE, a GeneratedUrl object is
+   *   returned, containing the generated URL plus bubbleable metadata.
    *
    * @see \Drupal\Core\Routing\UrlGeneratorInterface::generateFromRoute()
    * @see \Drupal\Core\Url
    * @see \Drupal\Core\Url::fromRoute()
    * @see \Drupal\Core\Url::fromUri()
    */
-  public static function url($route_name, $route_parameters = array(), $options = array(), $collect_cacheability_metadata = FALSE) {
-    return static::getContainer()->get('url_generator')->generateFromRoute($route_name, $route_parameters, $options, $collect_cacheability_metadata);
+  public static function url($route_name, $route_parameters = array(), $options = array(), $collect_bubbleable_metadata = FALSE) {
+    return static::getContainer()->get('url_generator')->generateFromRoute($route_name, $route_parameters, $options, $collect_bubbleable_metadata);
   }
 
   /**
@@ -542,20 +542,20 @@ class Drupal {
    *   The link text for the anchor tag.
    * @param \Drupal\Core\Url $url
    *   The URL object used for the link.
-   * @param bool $collect_cacheability_metadata
+   * @param bool $collect_bubbleable_metadata
    *   (optional) Defaults to FALSE. When TRUE, both the generated URL and its
-   *   associated cacheability metadata are returned.
+   *   associated bubbleable metadata are returned.
    *
    * @return string|\Drupal\Core\GeneratedLink
    *   An HTML string containing a link to the given route and parameters.
-   *   When $collect_cacheability_metadata is TRUE, a GeneratedLink object is
-   *   returned, containing the generated link plus cacheability metadata.
+   *   When $collect_bubbleable_metadata is TRUE, a GeneratedLink object is
+   *   returned, containing the generated link plus bubbleable metadata.
    *
    * @see \Drupal\Core\Utility\LinkGeneratorInterface::generate()
    * @see \Drupal\Core\Url
    */
-  public static function l($text, Url $url, $collect_cacheability_metadata = FALSE) {
-    return static::getContainer()->get('link_generator')->generate($text, $url, $collect_cacheability_metadata);
+  public static function l($text, Url $url, $collect_bubbleable_metadata = FALSE) {
+    return static::getContainer()->get('link_generator')->generate($text, $url, $collect_bubbleable_metadata);
   }
 
   /**
diff --git a/core/lib/Drupal/Component/Assertion/Inspector.php b/core/lib/Drupal/Component/Assertion/Inspector.php
new file mode 100644
index 000000000..cb17632b6
--- /dev/null
+++ b/core/lib/Drupal/Component/Assertion/Inspector.php
@@ -0,0 +1,409 @@
+<?php
+/**
+ * @file
+ * Contains \Drupal\Component\Assertion\Inspector.
+ */
+
+namespace Drupal\Component\Assertion;
+
+use Traversable;
+
+/**
+ * Generic inspections for the assert() statement.
+ *
+ * This is a static function collection for inspecting variable contents. All
+ * functions in this collection check a variable against an assertion about its
+ * structure.
+ *
+ * Example call:
+ * @code
+ *   assert('Drupal\\Component\\Assertion\\Inspector::assertAllStrings($array)');
+ * @endcode
+ *
+ * @ingroup php_assert
+ */
+class Inspector {
+
+  /**
+   * Asserts argument can be traversed with foreach.
+   *
+   * @param mixed $traversable
+   *   Variable to be examined.
+   *
+   * @return bool
+   *   TRUE if $traversable can be traversed with foreach.
+   */
+  public static function assertTraversable($traversable) {
+    return is_array($traversable) || $traversable instanceof Traversable;
+  }
+
+  /**
+   * Asserts callback returns TRUE for each member of a traversable.
+   *
+   * This is less memory intensive than using array_filter() to build a second
+   * array and then comparing the arrays. Many of the other functions in this
+   * collection alias this function passing a specific callback to make the
+   * code more readable.
+   *
+   * @param callable $callable
+   *   Callback function.
+   * @param mixed $traversable
+   *   Variable to be examined.
+   *
+   * @return bool
+   *   TRUE if $traversable can be traversed and $callable returns TRUE on
+   *   all members.
+   *
+   * @see http://php.net/manual/language.types.callable.php
+   */
+  public static function assertAll(callable $callable, $traversable) {
+    if (static::assertTraversable($traversable)) {
+      foreach ($traversable as $member) {
+        if (!$callable($member)) {
+          return FALSE;
+        }
+      }
+      return TRUE;
+    }
+    return FALSE;
+  }
+
+  /**
+   * Asserts that all members are strings.
+   *
+   * @param mixed $traversable
+   *   Variable to be examined.
+   *
+   * @return bool
+   *   TRUE if $traversable can be traversed and all members are strings.
+   */
+  public static function assertAllStrings($traversable) {
+    return static::assertAll('is_string', $traversable);
+  }
+
+  /**
+   * Asserts all members are strings or objects with magic __toString() method.
+   *
+   * @param mixed $traversable
+   *   Variable to be examined.
+   *
+   * @return bool
+   *   TRUE if $traversable can be traversed and all members are strings or
+   *   objects with __toString().
+   */
+  public static function assertAllStringable($traversable) {
+    if (static::assertTraversable($traversable)) {
+      foreach ($traversable as $member) {
+        if (!(is_string($member) || (is_object($member) && method_exists($member, '__toString')))) {
+          return FALSE;
+        }
+      }
+      return TRUE;
+    }
+    return FALSE;
+  }
+
+  /**
+   * Asserts that all members are arrays.
+   *
+   * @param mixed $traversable
+   *   Variable to be examined.
+   *
+   * @return bool
+   *   TRUE if $traversable can be traversed and all members are arrays.
+   */
+  public static function assertAllArrays($traversable) {
+    return static::assertAll('is_array', $traversable);
+  }
+
+  /**
+   * Asserts that the array is strict.
+   *
+   * What PHP calls arrays are more formally called maps in most other
+   * programming languages. A map is a datatype that associates values to keys.
+   * The term 'strict array' here refers to a 0-indexed array in the classic
+   * sense found in programming languages other than PHP.
+   *
+   * @param mixed $array
+   *   Variable to be examined.
+   *
+   * @return bool
+   *   TRUE if $traversable is a 0-indexed array.
+   *
+   * @see http://php.net/manual/language.types.array.php
+   */
+  public static function assertStrictArray($array) {
+    if (!is_array($array)) {
+      return FALSE;
+    }
+    $i = 0;
+
+    foreach (array_keys($array) as $key) {
+      if ($i !== $key) {
+        return FALSE;
+      }
+      $i++;
+    }
+    return TRUE;
+  }
+
+  /**
+   * Asserts all members are strict arrays.
+   *
+   * @param mixed $traversable
+   *   Variable to be examined.
+   *
+   * @return bool
+   *   TRUE if $traversable can be traversed and all members are strict arrays.
+   *
+   * @see ::assertStrictArray
+   */
+  public static function assertAllStrictArrays($traversable) {
+    return static::assertAll([__CLASS__, 'assertStrictArray'], $traversable);
+  }
+
+  /**
+   * Asserts all given keys exist in every member array.
+   *
+   * Drupal has several data structure arrays that require certain keys be set.
+   * You can overload this function to specify a list of required keys. All
+   * of the keys must be set for this method to return TRUE.
+   *
+   * As an example, this assertion tests for the keys of a theme registry.
+   *
+   * @code
+   *   assert('Drupal\\Component\\Assertion\\Inspector::assertAllHaveKey(
+   *     $arrayToTest, "type", "theme path", "function", "template", "variables", "render element", "preprocess functions")');
+   * @endcode
+   *
+   * Note: If a method requires certain keys to be present it will usually be
+   * specific about the data types for the values of those keys. Therefore it
+   * will be best to write a specific test for it. Such tests are either bound
+   * to the object that uses them, or are collected into one assertion set for
+   * the package.
+   *
+   * @param mixed $traversable
+   *   Variable to be examined.
+   * @param string ...
+   *   Keys to be searched for.
+   *
+   * @return bool
+   *   TRUE if $traversable can be traversed and all members have all keys.
+   */
+  public static function assertAllHaveKey() {
+    $args = func_get_args();
+    $traversable = array_shift($args);
+
+    if (static::assertTraversable($traversable)) {
+      foreach ($traversable as $member) {
+        foreach ($args as $key) {
+          if (!array_key_exists($key, $member)) {
+            return FALSE;
+          }
+        }
+      }
+      return TRUE;
+    }
+    return FALSE;
+  }
+
+  /**
+   * Asserts that all members are integer values.
+   *
+   * @param mixed $traversable
+   *   Variable to be examined.
+   *
+   * @return bool
+   *   TRUE if $traversable can be traversed and all members are integers.
+   */
+  public static function assertAllIntegers($traversable) {
+    return static::assertAll('is_int', $traversable);
+  }
+
+  /**
+   * Asserts that all members are float values.
+   *
+   * @param mixed $traversable
+   *   Variable to be examined.
+   *
+   * @return bool
+   *   TRUE if $traversable can be traversed and all members are floating point
+   *   numbers.
+   */
+  public static function assertAllFloat($traversable) {
+    return static::assertAll('is_float', $traversable);
+  }
+
+  /**
+   * Asserts that all members are callable.
+   *
+   * @param mixed $traversable
+   *   Variable to be examined.
+   *
+   * @return bool
+   *   TRUE if $traversable can be traversed and all members are callable.
+   */
+  public static function assertAllCallable($traversable) {
+    return static::assertAll('is_callable', $traversable);
+  }
+
+  /**
+   * Asserts that all members are not empty.
+   *
+   * @param mixed $traversable
+   *   Variable to be examined.
+   *
+   * @return bool
+   *   TRUE if $traversable can be traversed and all members not empty.
+   */
+  public static function assertAllNotEmpty($traversable) {
+    if (static::assertTraversable($traversable)) {
+      foreach ($traversable as $member) {
+        if (empty($member)) {
+          return FALSE;
+        }
+      }
+      return TRUE;
+    }
+    return FALSE;
+  }
+
+  /**
+   * Asserts all members are numeric data types or strings castable to such.
+   *
+   * @param mixed $traversable
+   *   Variable to be examined.
+   *
+   * @return bool
+   *   TRUE if $traversable can be traversed and all members are numeric.
+   */
+  public static function assertAllNumeric($traversable) {
+    return static::assertAll('is_numeric', $traversable);
+  }
+
+  /**
+   * Asserts that all members are strings that contain the specified string.
+   *
+   * This runs faster than the regular expression equivalent.
+   *
+   * @param string $pattern
+   *   The needle to find.
+   * @param mixed $traversable
+   *   Variable to examine.
+   * @param bool $case_sensitive
+   *   TRUE to use strstr(), FALSE to use stristr() which is case insensitive.
+   *
+   * @return bool
+   *   TRUE if $traversable can be traversed and all members are strings
+   *   containing $pattern.
+   */
+  public static function assertAllMatch($pattern, $traversable, $case_sensitive = FALSE) {
+    if (static::assertTraversable($traversable)) {
+      if ($case_sensitive) {
+        foreach ($traversable as $member) {
+          if (!(is_string($member) && strstr($member, $pattern))) {
+            return FALSE;
+          }
+        }
+      }
+      else {
+        foreach ($traversable as $member) {
+          if (!(is_string($member) && stristr($member, $pattern))) {
+            return FALSE;
+          }
+        }
+      }
+      return TRUE;
+    }
+    return FALSE;
+  }
+
+
+  /**
+   * Asserts that all members are strings matching a regular expression.
+   *
+   * @param string $pattern
+   *   Regular expression string to find.
+   * @param mixed $traversable
+   *   Variable to be examined.
+   *
+   * @return bool
+   *   TRUE if $traversable can be traversed and all members are strings
+   *   matching $pattern.
+   */
+  public static function assertAllRegularExpressionMatch($pattern, $traversable) {
+    if (static::assertTraversable($traversable)) {
+      foreach ($traversable as $member) {
+        if (!is_string($member)) {
+          return FALSE;
+        }
+
+        if (!preg_match($pattern, $member)) {
+          return FALSE;
+        }
+      }
+      return TRUE;
+    }
+    return FALSE;
+  }
+
+  /**
+   * Asserts that all members are objects.
+   *
+   * When testing if a collection is composed of objects those objects should
+   * be given a common interface to implement and the test should be written to
+   * search for just that interface. While this method will allow tests for
+   * just object status or for multiple classes and interfaces this was done to
+   * allow tests to be written for existing code without altering it. Only use
+   * this method in that manner when testing code from third party vendors.
+   *
+   * Here are some examples:
+   * @code
+   *   // Just test all are objects, like a cache.
+   *   assert('Drupal\\Component\\Assertion\\Inspector::assertAllObjects(
+   *     $collection');
+   *
+   *   // Test if traversable objects (arrays won't pass this)
+   *   assert('Drupal\\Component\\Assertion\\Inspector::assertAllObjects(
+   *     $collection', \'\\Traversable\');
+   *
+   *   // Test for the Foo class or Bar\None interface
+   *   assert('Drupal\\Component\\Assertion\\Inspector::assertAllObjects(
+   *     $collection', \'\\Foo\', \'\\Bar\\None\'');
+   * @endcode
+   *
+   * @param mixed $traversable
+   *   Variable to be examined.
+   * @param string ...
+   *   Classes and interfaces to test objects against.
+   *
+   * @return bool
+   *   TRUE if $traversable can be traversed and all members are objects with
+   *   at least one of the listed classes or interfaces.
+   */
+  public static function assertAllObjects() {
+    $args = func_get_args();
+    $traversable = array_shift($args);
+
+    if (static::assertTraversable($traversable)) {
+      foreach ($traversable as $member) {
+        if (count($args) > 0) {
+          foreach ($args as $instance) {
+            if ($member instanceof $instance) {
+              // We're continuing to the next member on the outer loop.
+              // @see http://php.net/continue
+              continue 2;
+            }
+          }
+          return FALSE;
+        }
+        elseif (!is_object($member)) {
+          return FALSE;
+        }
+      }
+      return TRUE;
+    }
+    return FALSE;
+  }
+
+}
diff --git a/core/lib/Drupal/Component/Datetime/DateTimePlus.php b/core/lib/Drupal/Component/Datetime/DateTimePlus.php
index cae00215f..c3edf998c 100644
--- a/core/lib/Drupal/Component/Datetime/DateTimePlus.php
+++ b/core/lib/Drupal/Component/Datetime/DateTimePlus.php
@@ -508,7 +508,7 @@ class DateTimePlus {
    * @param array $array
    *   An array of datetime values keyed by date part.
    *
-   * @return boolean
+   * @return bool
    *   TRUE if the datetime parts contain valid values, otherwise FALSE.
    */
   public static function checkArray($array) {
diff --git a/core/lib/Drupal/Component/Gettext/LICENSE.txt b/core/lib/Drupal/Component/Gettext/LICENSE.txt
new file mode 100644
index 000000000..94fb84639
--- /dev/null
+++ b/core/lib/Drupal/Component/Gettext/LICENSE.txt
@@ -0,0 +1,339 @@
+        GNU GENERAL PUBLIC LICENSE
+           Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+          Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+        GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+          NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+         END OF TERMS AND CONDITIONS
+
+      How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/core/lib/Drupal/Component/Gettext/PoItem.php b/core/lib/Drupal/Component/Gettext/PoItem.php
index cefeee7ab..c845c4b07 100644
--- a/core/lib/Drupal/Component/Gettext/PoItem.php
+++ b/core/lib/Drupal/Component/Gettext/PoItem.php
@@ -147,7 +147,7 @@ class PoItem {
   /**
    * Get if the translation has plural values.
    *
-   * @return boolean $plural
+   * @return bool
    */
   function isPlural() {
     return $this->_plural;
diff --git a/core/lib/Drupal/Component/Gettext/README.txt b/core/lib/Drupal/Component/Gettext/README.txt
new file mode 100644
index 000000000..f51a277ce
--- /dev/null
+++ b/core/lib/Drupal/Component/Gettext/README.txt
@@ -0,0 +1,12 @@
+The Drupal Gettext Component
+
+Thanks for using this Drupal component.
+
+You can participate in its development on Drupal.org, through our issue system:
+https://www.drupal.org/project/issues/drupal
+
+You can get the full Drupal repo here:
+https://www.drupal.org/project/drupal/git-instructions
+
+You can browse the full Drupal repo here:
+http://cgit.drupalcode.org/drupal
diff --git a/core/lib/Drupal/Component/Gettext/TESTING.txt b/core/lib/Drupal/Component/Gettext/TESTING.txt
new file mode 100644
index 000000000..19dcc98cf
--- /dev/null
+++ b/core/lib/Drupal/Component/Gettext/TESTING.txt
@@ -0,0 +1,19 @@
+HOW-TO: Test this Drupal component
+
+In order to test this component, you'll need to get the entire Drupal repo and
+run the tests there.
+
+You'll find the tests under core/tests/Drupal/Tests/Component.
+
+You can get the full Drupal repo here:
+https://www.drupal.org/project/drupal/git-instructions
+
+You can find more information about running PHPUnit tests with Drupal here:
+https://www.drupal.org/node/2116263
+
+Each component in the Drupal\Component namespace has its own annotated test
+group. You can use this group to run only the tests for this component. Like
+this:
+
+$ cd ./core
+$ ./vendor/bin/phpunit --group Gettext
diff --git a/core/lib/Drupal/Component/Gettext/composer.json b/core/lib/Drupal/Component/Gettext/composer.json
new file mode 100644
index 000000000..a95be566e
--- /dev/null
+++ b/core/lib/Drupal/Component/Gettext/composer.json
@@ -0,0 +1,16 @@
+{
+  "name": "drupal/core-gettext",
+  "description": "PHP library for reading PO files.",
+  "type": "library",
+  "license": "GPL-2.0+",
+  "support": {
+    "issues": "https://www.drupal.org/project/issues/drupal",
+    "irc": "irc://irc.freenode.net/drupal-contribute",
+    "source": "https://www.drupal.org/project/drupal/git-instructions"
+  },
+  "autoload": {
+    "psr-4": {
+      "Drupal\\Component\\Gettext\\": ""
+    }
+  }
+}
diff --git a/core/lib/Drupal/Component/HttpFoundation/SecuredRedirectResponse.php b/core/lib/Drupal/Component/HttpFoundation/SecuredRedirectResponse.php
new file mode 100644
index 000000000..77c978c7d
--- /dev/null
+++ b/core/lib/Drupal/Component/HttpFoundation/SecuredRedirectResponse.php
@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Component\HttpFoundation\SecuredRedirectResponse.
+ */
+
+namespace Drupal\Component\HttpFoundation;
+
+use \Symfony\Component\HttpFoundation\RedirectResponse;
+
+/**
+ * Provides a common base class for safe redirects.
+ *
+ * In case you want to redirect to external URLs use
+ * TrustedRedirectResponse.
+ *
+ * For local URLs we use LocalRedirectResponse which opts
+ * out of external redirects.
+ */
+abstract class SecuredRedirectResponse extends RedirectResponse {
+
+  /**
+   * Copies an existing redirect response into a safe one.
+   *
+   * The safe one cannot accidentally redirect to an external URL, unless
+   * actively wanted (see TrustedRedirectResponse).
+   *
+   * @param \Symfony\Component\HttpFoundation\RedirectResponse $response
+   *   The original redirect.
+   *
+   * @return static
+   */
+  public static function createFromRedirectResponse(RedirectResponse $response) {
+    $safe_response = new static($response->getTargetUrl(), $response->getStatusCode(), $response->headers->allPreserveCase());
+    $safe_response->setProtocolVersion($response->getProtocolVersion());
+    $safe_response->setCharset($response->getCharset());
+    return $safe_response;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setTargetUrl($url) {
+    if (!$this->isSafe($url)) {
+      throw new \InvalidArgumentException(sprintf('It is not safe to redirect to %s', $url));
+    }
+    return parent::setTargetUrl($url);
+  }
+
+  /**
+   * Returns whether the URL is considered as safe to redirect to.
+   *
+   * @param string $url
+   *   The URL checked for safety.
+   *
+   * @return bool
+   */
+  abstract protected function isSafe($url);
+
+}
diff --git a/core/lib/Drupal/Component/PhpStorage/FileStorage.php b/core/lib/Drupal/Component/PhpStorage/FileStorage.php
index 2ed6d6b9c..4f511c223 100644
--- a/core/lib/Drupal/Component/PhpStorage/FileStorage.php
+++ b/core/lib/Drupal/Component/PhpStorage/FileStorage.php
@@ -224,7 +224,7 @@ EOF;
    * @param string $path
    *   A string containing either a file or directory path.
    *
-   * @return boolean
+   * @return bool
    *   TRUE for success or if path does not exist, FALSE in the event of an
    *   error.
    */
diff --git a/core/lib/Drupal/Component/PhpStorage/MTimeProtectedFileStorage.php b/core/lib/Drupal/Component/PhpStorage/MTimeProtectedFileStorage.php
index 26d8200c8..077a40dd3 100644
--- a/core/lib/Drupal/Component/PhpStorage/MTimeProtectedFileStorage.php
+++ b/core/lib/Drupal/Component/PhpStorage/MTimeProtectedFileStorage.php
@@ -58,7 +58,8 @@ class MTimeProtectedFileStorage extends MTimeProtectedFastFileStorage {
    *
    * @param string $name
    *   The virtual file name. Can be a relative path.
-   * return string
+   *
+   * @return string|false
    *   The full path where the file is if it is valid, FALSE otherwise.
    */
   protected function checkFile($name) {
diff --git a/core/lib/Drupal/Component/Plugin/Context/Context.php b/core/lib/Drupal/Component/Plugin/Context/Context.php
index 04cb7b2ba..c891e6254 100644
--- a/core/lib/Drupal/Component/Plugin/Context/Context.php
+++ b/core/lib/Drupal/Component/Plugin/Context/Context.php
@@ -67,6 +67,13 @@ class Context implements ContextInterface {
     return $this->contextValue;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function hasContextValue() {
+    return (bool) $this->contextValue || (bool) $this->getContextDefinition()->getDefaultValue();
+  }
+
   /**
    * {@inheritdoc}
    */
diff --git a/core/lib/Drupal/Component/Plugin/Context/ContextInterface.php b/core/lib/Drupal/Component/Plugin/Context/ContextInterface.php
index ab092ed66..04948f930 100644
--- a/core/lib/Drupal/Component/Plugin/Context/ContextInterface.php
+++ b/core/lib/Drupal/Component/Plugin/Context/ContextInterface.php
@@ -30,6 +30,14 @@ interface ContextInterface {
    */
   public function getContextValue();
 
+  /**
+   * Returns whether the context has a value.
+   *
+   * @return bool
+   *   TRUE if the context has a value, FALSE otherwise.
+   */
+  public function hasContextValue();
+
   /**
    * Sets the definition that the context must conform to.
    *
diff --git a/core/lib/Drupal/Component/Plugin/ContextAwarePluginBase.php b/core/lib/Drupal/Component/Plugin/ContextAwarePluginBase.php
index e9254073c..d9c9c8a36 100644
--- a/core/lib/Drupal/Component/Plugin/ContextAwarePluginBase.php
+++ b/core/lib/Drupal/Component/Plugin/ContextAwarePluginBase.php
@@ -22,7 +22,7 @@ abstract class ContextAwarePluginBase extends PluginBase implements ContextAware
    *
    * @var \Drupal\Component\Plugin\Context\ContextInterface[]
    */
-  protected $context;
+  protected $context = [];
 
   /**
    * Overrides \Drupal\Component\Plugin\PluginBase::__construct().
diff --git a/core/lib/Drupal/Component/Plugin/composer.json b/core/lib/Drupal/Component/Plugin/composer.json
index e2d024022..826685d11 100644
--- a/core/lib/Drupal/Component/Plugin/composer.json
+++ b/core/lib/Drupal/Component/Plugin/composer.json
@@ -5,7 +5,7 @@
     "homepage": "https://www.drupal.org/project/drupal",
     "license": "GPL-2.0+",
     "require": {
-        "php": ">=5.4.2"
+        "php": ">=5.5.9"
     },
     "autoload": {
         "psr-0": {
diff --git a/core/lib/Drupal/Component/ProxyBuilder/ProxyBuilder.php b/core/lib/Drupal/Component/ProxyBuilder/ProxyBuilder.php
index 373a77938..d75a8978d 100644
--- a/core/lib/Drupal/Component/ProxyBuilder/ProxyBuilder.php
+++ b/core/lib/Drupal/Component/ProxyBuilder/ProxyBuilder.php
@@ -22,7 +22,30 @@ class ProxyBuilder {
    *   The class name of the proxy.
    */
   public static function buildProxyClassName($class_name) {
-    return str_replace('\\', '_', $class_name) . '_Proxy';
+    $match = [];
+    preg_match('/([a-zA-Z0-9_]+\\\\[a-zA-Z0-9_]+)\\\\(.+)/', $class_name, $match);
+    $root_namespace = $match[1];
+    $rest_fqcn = $match[2];
+    $proxy_class_name = $root_namespace . '\\ProxyClass\\' . $rest_fqcn;
+
+    return $proxy_class_name;
+  }
+
+  /**
+   * Generates the used proxy namespace from a given class name.
+   *
+   * @param string $class_name
+   *   The class name of the actual service.
+   *
+   * @return string
+   *   The namespace name of the proxy.
+   */
+  public static function buildProxyNamespace($class_name) {
+    $proxy_classname = static::buildProxyClassName($class_name);
+
+    preg_match('/(.+)\\\\[a-zA-Z0-9]+/', $proxy_classname, $match);
+    $proxy_namespace = $match[1];
+    return $proxy_namespace;
   }
 
   /**
@@ -30,23 +53,38 @@ class ProxyBuilder {
    *
    * @param string $class_name
    *   The class name of the actual service.
+   * @param string $proxy_class_name
+   *   (optional) The class name of the proxy service.
    *
    * @return string
    *   The full string with namespace class and methods.
    */
-  public function build($class_name) {
+  public function build($class_name, $proxy_class_name = '') {
     $reflection = new \ReflectionClass($class_name);
 
+    if ($proxy_class_name) {
+      $proxy_class_reflection = new \ReflectionClass($proxy_class_name);
+      $proxy_namespace = $proxy_class_reflection->getNamespaceName();
+    }
+    else {
+      $proxy_class_name = $this->buildProxyClassName($class_name);
+      $proxy_namespace = $this->buildProxyNamespace($class_name);
+      $proxy_class_shortname = str_replace($proxy_namespace . '\\', '', $proxy_class_name);
+    }
+
     $output = '';
     $class_documentation = <<<'EOS'
-/**
- * Provides a proxy class for \{{ class_name }}.
- *
- * @see \Drupal\Component\ProxyBuilder
- */
+
+namespace {{ namespace }}{
+
+    /**
+     * Provides a proxy class for \{{ class_name }}.
+     *
+     * @see \Drupal\Component\ProxyBuilder
+     */
 
 EOS;
-    $class_start = 'class {{ proxy_class_name }}';
+    $class_start = '    class {{ proxy_class_shortname }}';
 
     // For cases in which the implemented interface is a child of another
     // interface, getInterfaceNames() also returns the parent. This causes a
@@ -77,11 +115,15 @@ EOS;
     // The actual class;
     $properties = <<<'EOS'
 /**
+ * The id of the original proxied service.
+ *
  * @var string
  */
-protected $serviceId;
+protected $drupalProxyOriginalServiceId;
 
 /**
+ * The real proxied service, after it was lazy loaded.
+ *
  * @var \{{ class_name }}
  */
 protected $service;
@@ -123,13 +165,14 @@ EOS;
       if ($value === '') {
         return $value;
       }
-      return "    $value";
+      return "        $value";
     }, explode("\n", $output)));
 
-    $final_output = $class_documentation . $class_start . "\n{\n\n" . $output . "\n}\n";
+    $final_output = $class_documentation . $class_start . "\n    {\n\n" . $output . "\n    }\n\n}\n";
 
     $final_output = str_replace('{{ class_name }}', $class_name, $final_output);
-    $final_output = str_replace('{{ proxy_class_name }}', $this->buildProxyClassName($class_name), $final_output);
+    $final_output = str_replace('{{ namespace }}', $proxy_namespace ? $proxy_namespace . ' ' : '', $final_output);
+    $final_output = str_replace('{{ proxy_class_shortname }}', $proxy_class_shortname, $final_output);
 
     return $final_output;
   }
@@ -141,11 +184,16 @@ EOS;
    */
   protected function buildLazyLoadItselfMethod() {
     $output = <<<'EOS'
+/**
+ * Lazy loads the real service from the container.
+ *
+ * @return object
+ *   Returns the constructed real service.
+ */
 protected function lazyLoadItself()
 {
     if (!isset($this->service)) {
-        $method_name = 'get' . Container::camelize($this->serviceId) . 'Service';
-        $this->service = $this->container->$method_name(false);
+        $this->service = $this->container->get($this->drupalProxyOriginalServiceId);
     }
 
     return $this->service;
@@ -177,11 +225,19 @@ EOS;
     if ($reflection_method->returnsReference()) {
       $reference = '&';
     }
+
+    $signature_line = <<<'EOS'
+/**
+ * {@inheritdoc}
+ */
+
+EOS;
+
     if ($reflection_method->isStatic()) {
-      $signature_line = 'public static function ' . $reference . $function_name . '(';
+      $signature_line .= 'public static function ' . $reference . $function_name . '(';
     }
     else {
-      $signature_line = 'public function ' . $reference . $function_name . '(';
+      $signature_line .= 'public function ' . $reference . $function_name . '(';
     }
 
     $signature_line .= implode(', ', $parameters);
@@ -269,10 +325,18 @@ EOS;
    */
   protected function buildConstructorMethod() {
     $output = <<<'EOS'
-public function __construct(\Symfony\Component\DependencyInjection\ContainerInterface $container, $serviceId)
+/**
+ * Constructs a ProxyClass Drupal proxy object.
+ *
+ * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
+ *   The container.
+ * @param string $drupal_proxy_original_service_id
+ *   The service ID of the original service.
+ */
+public function __construct(\Symfony\Component\DependencyInjection\ContainerInterface $container, $drupal_proxy_original_service_id)
 {
     $this->container = $container;
-    $this->serviceId = $serviceId;
+    $this->drupalProxyOriginalServiceId = $drupal_proxy_original_service_id;
 }
 
 EOS;
diff --git a/core/lib/Drupal/Component/ProxyBuilder/ProxyDumper.php b/core/lib/Drupal/Component/ProxyBuilder/ProxyDumper.php
deleted file mode 100644
index 71260621c..000000000
--- a/core/lib/Drupal/Component/ProxyBuilder/ProxyDumper.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\Component\ProxyBuilder\ProxyDumper.
- */
-
-namespace Drupal\Component\ProxyBuilder;
-
-use Symfony\Component\DependencyInjection\Definition;
-use Symfony\Component\DependencyInjection\LazyProxy\PhpDumper\DumperInterface;
-
-/**
- * Dumps the proxy service into the dumped PHP container file.
- */
-class ProxyDumper implements DumperInterface {
-
-  /**
-   * Keeps track of already existing proxy classes.
-   *
-   * @var array
-   */
-  protected $buildClasses = [];
-
-  /**
-   * The proxy builder.
-   *
-   * @var \Drupal\Component\ProxyBuilder\ProxyBuilder
-   */
-  protected $builder;
-
-  public function __construct(ProxyBuilder $builder) {
-    $this->builder = $builder;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function isProxyCandidate(Definition $definition) {
-    return $definition->isLazy() && ($class = $definition->getClass()) && class_exists($class);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getProxyFactoryCode(Definition $definition, $id) {
-    // Note: the specific get method is called initially with $lazyLoad=TRUE;
-    // When you want to retrieve the actual service, the code generated in
-    // ProxyBuilder calls the method with lazy loading disabled.
-    $output = <<<'EOS'
-        if ($lazyLoad) {
-            return $this->services['{{ id }}'] = new {{ class_name }}($this, '{{ id }}');
-        }
-
-EOS;
-    $output = str_replace('{{ id }}', $id, $output);
-    $output = str_replace('{{ class_name }}', $this->builder->buildProxyClassName($definition->getClass()), $output);
-
-    return $output;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getProxyCode(Definition $definition) {
-    // Maybe the same class is used in different services, which are both marked
-    // as lazy (just think about 2 database connections).
-    // In those cases we should not generate proxy code the second time.
-    if (!isset($this->buildClasses[$definition->getClass()])) {
-      $this->buildClasses[$definition->getClass()] = TRUE;
-      return $this->builder->build($definition->getClass());
-    }
-    else {
-      return '';
-    }
-  }
-
-}
diff --git a/core/lib/Drupal/Component/ProxyBuilder/composer.json b/core/lib/Drupal/Component/ProxyBuilder/composer.json
index c941c6ede..126c1a339 100644
--- a/core/lib/Drupal/Component/ProxyBuilder/composer.json
+++ b/core/lib/Drupal/Component/ProxyBuilder/composer.json
@@ -5,7 +5,7 @@
   "homepage": "https://www.drupal.org/project/drupal",
   "license": "GPL-2.0+",
   "require": {
-    "php": ">=5.4.2",
+    "php": ">=5.5.9",
     "symfony/dependency-injection": "~2.6"
   },
   "autoload": {
diff --git a/core/lib/Drupal/Component/Utility/Crypt.php b/core/lib/Drupal/Component/Utility/Crypt.php
index ef5ebfe48..9e9a17ff9 100644
--- a/core/lib/Drupal/Component/Utility/Crypt.php
+++ b/core/lib/Drupal/Component/Utility/Crypt.php
@@ -106,7 +106,7 @@ class Crypt {
 
     $hmac = base64_encode(hash_hmac('sha256', $data, $key, TRUE));
     // Modify the hmac so it's safe to use in URLs.
-    return strtr($hmac, array('+' => '-', '/' => '_', '=' => ''));
+    return str_replace(['+', '/', '='], ['-', '_', ''], $hmac);
   }
 
   /**
@@ -122,7 +122,7 @@ class Crypt {
   public static function hashBase64($data) {
     $hash = base64_encode(hash('sha256', $data, TRUE));
     // Modify the hash so it's safe to use in URLs.
-    return strtr($hash, array('+' => '-', '/' => '_', '=' => ''));
+    return str_replace(['+', '/', '='], ['-', '_', ''], $hash);
   }
 
   /**
@@ -137,7 +137,7 @@ class Crypt {
    * @see \Drupal\Component\Utility\Crypt::randomBytes()
    */
   public static function randomBytesBase64($count = 32) {
-    return strtr(base64_encode(static::randomBytes($count)), array('+' => '-', '/' => '_', '=' => ''));
+    return str_replace(['+', '/', '='], ['-', '_', ''], base64_encode(static::randomBytes($count)));
   }
 
 }
diff --git a/core/lib/Drupal/Component/Utility/Html.php b/core/lib/Drupal/Component/Utility/Html.php
index b6eb64983..d4bf13e82 100644
--- a/core/lib/Drupal/Component/Utility/Html.php
+++ b/core/lib/Drupal/Component/Utility/Html.php
@@ -187,7 +187,7 @@ class Html {
    * @see self::getUniqueId()
    */
   public static function getId($id) {
-    $id = strtr(Unicode::strtolower($id), array(' ' => '-', '_' => '-', '[' => '-', ']' => ''));
+    $id = str_replace([' ', '_', '[', ']'], ['-', '-', '-', ''], Unicode::strtolower($id));
 
     // As defined in http://www.w3.org/TR/html4/types.html#type-name, HTML IDs can
     // only contain letters, digits ([0-9]), hyphens ("-"), underscores ("_"),
diff --git a/core/lib/Drupal/Component/Utility/SafeMarkup.php b/core/lib/Drupal/Component/Utility/SafeMarkup.php
index d97dc2f24..4d4926615 100644
--- a/core/lib/Drupal/Component/Utility/SafeMarkup.php
+++ b/core/lib/Drupal/Component/Utility/SafeMarkup.php
@@ -15,9 +15,9 @@ namespace Drupal\Component\Utility;
  * provides a store for known safe strings and methods to manage them
  * throughout the page request.
  *
- * Strings sanitized by self::checkPlain() or Xss::filter() are automatically
- * marked safe, as are markup strings created from render arrays via
- * drupal_render().
+ * Strings sanitized by self::checkPlain() and self::escape() or
+ * self::xssFilter() are automatically marked safe, as are markup strings
+ * created from @link theme_render render arrays @endlink via drupal_render().
  *
  * This class should be limited to internal use only. Module developers should
  * instead use the appropriate
@@ -141,17 +141,79 @@ class SafeMarkup {
   /**
    * Applies a very permissive XSS/HTML filter for admin-only use.
    *
-   * @param string $string
-   *   A string.
+   * Note: This method only filters if $string is not marked safe already.
    *
-   * @return string
-   *   The escaped string. If $string was already set as safe with
-   *   self::set(), it won't be escaped again.
+   * @deprecated as of Drupal 8.0.x, will be removed before Drupal 8.0.0. If the
+   *   string used as part of a @link theme_render render array @endlink use
+   *   #markup to allow the render system to filter automatically. If the result
+   *   is not being used directly in the rendering system (for example, when its
+   *   result is being combined with other strings before rendering), use
+   *   Xss::filterAdmin(). Otherwise, use SafeMarkup::xssFilter() and the tag
+   *   list provided by Xss::getAdminTagList() instead. In the rare instance
+   *   that the caller does not want to filter strings that are marked safe
+   *   already, it needs to check SafeMarkup::isSafe() itself.
    *
+   * @see \Drupal\Component\Utility\SafeMarkup::xssFilter()
+   * @see \Drupal\Component\Utility\SafeMarkup::isSafe()
    * @see \Drupal\Component\Utility\Xss::filterAdmin()
+   * @see \Drupal\Component\Utility\Xss::getAdminTagList()
    */
   public static function checkAdminXss($string) {
-    return static::isSafe($string) ? $string : Xss::filterAdmin($string);
+    return static::isSafe($string) ? $string : static::xssFilter($string, Xss::getAdminTagList());
+  }
+
+  /**
+   * Filters HTML for XSS vulnerabilities and marks the result as safe.
+   *
+   * Calling this method unnecessarily will result in bloating the safe string
+   * list and increases the chance of unintended side effects.
+   *
+   * If Twig receives a value that is not marked as safe then it will
+   * automatically encode special characters in a plain-text string for display
+   * as HTML. Therefore, SafeMarkup::xssFilter() should only be used when the
+   * string might contain HTML that needs to be rendered properly by the
+   * browser.
+   *
+   * If you need to filter for admin use, like Xss::filterAdmin(), then:
+   * - If the string is used as part of a @link theme_render render array @endlink,
+   *   use #markup to allow the render system to filter by the admin tag list
+   *   automatically.
+   * - Otherwise, use the SafeMarkup::xssFilter() with tag list provided by
+   *   Xss::getAdminTagList() instead.
+   *
+   * This method should only be used instead of Xss::filter() when the result is
+   * being added to a render array that is constructed before rendering begins.
+   *
+   * In the rare instance that the caller does not want to filter strings that
+   * are marked safe already, it needs to check SafeMarkup::isSafe() itself.
+   *
+   * @param $string
+   *   The string with raw HTML in it. It will be stripped of everything that
+   *   can cause an XSS attack. The string provided will always be escaped
+   *   regardless of whether the string is already marked as safe.
+   * @param array $html_tags
+   *   (optional) An array of HTML tags. If omitted, it uses the default tag
+   *   list defined by \Drupal\Component\Utility\Xss::filter().
+   *
+   * @return string
+   *   An XSS-safe version of $string, or an empty string if $string is not
+   *   valid UTF-8. The string is marked as safe.
+   *
+   * @ingroup sanitization
+   *
+   * @see \Drupal\Component\Utility\Xss::filter()
+   * @see \Drupal\Component\Utility\Xss::filterAdmin()
+   * @see \Drupal\Component\Utility\Xss::getAdminTagList()
+   * @see \Drupal\Component\Utility\SafeMarkup::isSafe()
+   */
+  public static function xssFilter($string, $html_tags = NULL) {
+    if (is_null($html_tags)) {
+      $string = Xss::filter($string);
+    }
+    else {
+      $string = Xss::filter($string, $html_tags);
+    }
+    return static::set($string);
   }
 
   /**
diff --git a/core/lib/Drupal/Component/Utility/UrlHelper.php b/core/lib/Drupal/Component/Utility/UrlHelper.php
index 6c87822c5..2039d8326 100644
--- a/core/lib/Drupal/Component/Utility/UrlHelper.php
+++ b/core/lib/Drupal/Component/Utility/UrlHelper.php
@@ -244,7 +244,7 @@ class UrlHelper {
     $base_parts = parse_url($base_url);
 
     if (empty($base_parts['host']) || empty($url_parts['host'])) {
-      throw new \InvalidArgumentException(SafeMarkup::format('A path was passed when a fully qualified domain was expected.'));
+      throw new \InvalidArgumentException('A path was passed when a fully qualified domain was expected.');
     }
 
     if (!isset($url_parts['path']) || !isset($base_parts['path'])) {
diff --git a/core/lib/Drupal/Component/Utility/Xss.php b/core/lib/Drupal/Component/Utility/Xss.php
index f967ca626..a68ca2b14 100644
--- a/core/lib/Drupal/Component/Utility/Xss.php
+++ b/core/lib/Drupal/Component/Utility/Xss.php
@@ -29,14 +29,19 @@ class Xss {
    * Based on kses by Ulf Harnhammar, see http://sourceforge.net/projects/kses.
    * For examples of various XSS attacks, see: http://ha.ckers.org/xss.html.
    *
-   * This code does five things:
+   * This method is preferred to
+   * \Drupal\Component\Utility\SafeMarkup::xssFilter() when the result is not
+   * being used directly in the rendering system (for example, when its result
+   * is being combined with other strings before rendering). This avoids
+   * bloating the safe string list with partial strings if the whole result will
+   * be marked safe.
+   *
+   * This code does four things:
    * - Removes characters and constructs that can trick browsers.
    * - Makes sure all HTML entities are well-formed.
    * - Makes sure all HTML tags and attributes are well-formed.
    * - Makes sure no HTML tags contain URLs with a disallowed protocol (e.g.
    *   javascript:).
-   * - Marks the sanitized, XSS-safe version of $string as safe markup for
-   *   rendering.
    *
    * @param $string
    *   The string with raw HTML in it. It will be stripped of everything that
@@ -49,7 +54,7 @@ class Xss {
    *   valid UTF-8.
    *
    * @see \Drupal\Component\Utility\Unicode::validateUtf8()
-   * @see \Drupal\Component\Utility\SafeMarkup
+   * @see \Drupal\Component\Utility\SafeMarkup::xssFilter()
    *
    * @ingroup sanitization
    */
@@ -83,7 +88,7 @@ class Xss {
     // for output. All other known XSS vectors have been filtered out by this
     // point and any HTML tags remaining will have been deliberately allowed, so
     // it is acceptable to call SafeMarkup::set() on the resultant string.
-    return SafeMarkup::set(preg_replace_callback('%
+    return preg_replace_callback('%
       (
       <(?=[^a-zA-Z!/])  # a lone <
       |                 # or
@@ -92,7 +97,7 @@ class Xss {
       <[^>]*(>|$)       # a string that starts with a <, up until the > or the end of the string
       |                 # or
       >                 # just a >
-      )%x', $splitter, $string));
+      )%x', $splitter, $string);
   }
 
   /**
@@ -103,6 +108,13 @@ class Xss {
    * is desired (so \Drupal\Component\Utility\SafeMarkup::checkPlain() is
    * not acceptable).
    *
+   * This method is preferred to
+   * \Drupal\Component\Utility\SafeMarkup::xssFilter() when the result is
+   * not being used directly in the rendering system (for example, when its
+   * result is being combined with other strings before rendering). This avoids
+   * bloating the safe string list with partial strings if the whole result will
+   * be marked safe.
+   *
    * Allows all tags that can be used inside an HTML body, save
    * for scripts and styles.
    *
@@ -111,6 +123,12 @@ class Xss {
    *
    * @return string
    *   The filtered string.
+   *
+   * @ingroup sanitization
+   *
+   * @see \Drupal\Component\Utility\SafeMarkup::xssFilter()
+   * @see \Drupal\Component\Utility\Xss::getAdminTagList()
+   *
    */
   public static function filterAdmin($string) {
     return static::filter($string, static::$adminTags);
@@ -319,4 +337,14 @@ class Xss {
     return !isset($html_tags[strtolower($elem)]);
   }
 
+  /**
+   * Gets the list of html tags allowed by Xss::filterAdmin().
+   *
+   * @return array
+   *   The list of html tags allowed by filterAdmin().
+   */
+  public static function getAdminTagList() {
+    return static::$adminTags;
+  }
+
 }
diff --git a/core/lib/Drupal/Component/Utility/composer.json b/core/lib/Drupal/Component/Utility/composer.json
index af0c31b51..a029d1e45 100644
--- a/core/lib/Drupal/Component/Utility/composer.json
+++ b/core/lib/Drupal/Component/Utility/composer.json
@@ -5,7 +5,7 @@
   "homepage": "https://www.drupal.org/project/drupal",
   "license": "GPL-2.0+",
   "require": {
-    "php": ">=5.3.10"
+    "php": ">=5.5.9"
   },
   "autoload": {
     "psr-0": {
diff --git a/core/lib/Drupal/Core/Access/AccessResult.php b/core/lib/Drupal/Core/Access/AccessResult.php
index 9c4e42f6f..b364bafb7 100644
--- a/core/lib/Drupal/Core/Access/AccessResult.php
+++ b/core/lib/Drupal/Core/Access/AccessResult.php
@@ -25,6 +25,9 @@ use Drupal\Core\Session\AccountInterface;
  *
  * When using ::orIf() and ::andIf(), cacheability metadata will be merged
  * accordingly as well.
+ *
+ * @todo Use RefinableCacheableDependencyInterface and the corresponding trait in
+ *   https://www.drupal.org/node/2526326.
  */
 abstract class AccessResult implements AccessResultInterface, CacheableDependencyInterface {
 
@@ -316,10 +319,12 @@ abstract class AccessResult implements AccessResultInterface, CacheableDependenc
    *   The entity whose cache tag to set on the access result.
    *
    * @return $this
+   *
+   * @deprecated in Drupal 8.0.x-dev, will be removed before Drupal 9.0.0. Use
+   *   ::addCacheableDependency() instead.
    */
   public function cacheUntilEntityChanges(EntityInterface $entity) {
-    $this->addCacheTags($entity->getCacheTags());
-    return $this;
+    return $this->addCacheableDependency($entity);
   }
 
   /**
@@ -329,9 +334,33 @@ abstract class AccessResult implements AccessResultInterface, CacheableDependenc
    *   The configuration object whose cache tag to set on the access result.
    *
    * @return $this
+   *
+   * @deprecated in Drupal 8.0.x-dev, will be removed before Drupal 9.0.0. Use
+   *   ::addCacheableDependency() instead.
    */
   public function cacheUntilConfigurationChanges(ConfigBase $configuration) {
-    $this->addCacheTags($configuration->getCacheTags());
+    return $this->addCacheableDependency($configuration);
+  }
+
+  /**
+   * Adds a dependency on an object: merges its cacheability metadata.
+   *
+   * @param \Drupal\Core\Cache\CacheableDependencyInterface|object $other_object
+   *   The dependency. If the object implements CacheableDependencyInterface,
+   *   then its cacheability metadata will be used. Otherwise, the passed in
+   *   object must be assumed to be uncacheable, so max-age 0 is set.
+   *
+   * @return $this
+   */
+  public function addCacheableDependency($other_object) {
+    if ($other_object instanceof CacheableDependencyInterface) {
+      $this->contexts = Cache::mergeContexts($this->contexts, $other_object->getCacheContexts());
+      $this->tags = Cache::mergeTags($this->tags, $other_object->getCacheTags());
+      $this->maxAge = Cache::mergeMaxAges($this->maxAge, $other_object->getCacheMaxAge());
+    }
+    else {
+      $this->maxAge = 0;
+    }
     return $this;
   }
 
diff --git a/core/lib/Drupal/Core/Access/RouteProcessorCsrf.php b/core/lib/Drupal/Core/Access/RouteProcessorCsrf.php
index 5399d9e09..bd3a55278 100644
--- a/core/lib/Drupal/Core/Access/RouteProcessorCsrf.php
+++ b/core/lib/Drupal/Core/Access/RouteProcessorCsrf.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\Core\Access;
 
-use Drupal\Core\Cache\CacheableMetadata;
+use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\Core\RouteProcessor\OutboundRouteProcessorInterface;
 use Symfony\Component\Routing\Route;
 
@@ -36,7 +36,7 @@ class RouteProcessorCsrf implements OutboundRouteProcessorInterface {
   /**
    * {@inheritdoc}
    */
-  public function processOutbound($route_name, Route $route, array &$parameters, CacheableMetadata $cacheable_metadata = NULL) {
+  public function processOutbound($route_name, Route $route, array &$parameters, BubbleableMetadata $bubbleable_metadata = NULL) {
     if ($route->hasRequirement('_csrf_token')) {
       $path = ltrim($route->getPath(), '/');
       // Replace the path parameters with values from the parameters array.
@@ -45,13 +45,44 @@ class RouteProcessorCsrf implements OutboundRouteProcessorInterface {
       }
       // Adding this to the parameters means it will get merged into the query
       // string when the route is compiled.
-      $parameters['token'] = $this->csrfToken->get($path);
-      if ($cacheable_metadata) {
-        // Tokens are per user and per session, so not cacheable.
-        // @todo Improve in https://www.drupal.org/node/2351015.
-        $cacheable_metadata->setCacheMaxAge(0);
+      if (!$bubbleable_metadata) {
+        $parameters['token'] = $this->csrfToken->get($path);
+      }
+      else {
+        // Generate a placeholder and a render array to replace it.
+        $placeholder = hash('sha1', $path);
+        $placeholder_render_array = [
+          '#lazy_builder' => ['route_processor_csrf:renderPlaceholderCsrfToken', [$path]],
+        ];
+
+        // Instead of setting an actual CSRF token as the query string, we set
+        // the placeholder, which will be replaced at the very last moment. This
+        // ensures links with CSRF tokens don't break cacheability.
+        $parameters['token'] = $placeholder;
+        $bubbleable_metadata->addAttachments(['placeholders' => [$placeholder => $placeholder_render_array]]);
       }
     }
   }
 
+  /**
+   * #lazy_builder callback; gets a CSRF token for the given path.
+   *
+   * @param string $path
+   *   The path to get a CSRF token for.
+   *
+   * @return array
+   *   A renderable array representing the CSRF token.
+   */
+  public function renderPlaceholderCsrfToken($path) {
+    return [
+      '#markup' => $this->csrfToken->get($path),
+      // Tokens are per session.
+      '#cache' => [
+        'contexts' => [
+          'session',
+        ],
+      ],
+    ];
+  }
+
 }
diff --git a/core/lib/Drupal/Core/Ajax/AjaxResponseAttachmentsProcessor.php b/core/lib/Drupal/Core/Ajax/AjaxResponseAttachmentsProcessor.php
index 7d36b51c7..bffe66619 100644
--- a/core/lib/Drupal/Core/Ajax/AjaxResponseAttachmentsProcessor.php
+++ b/core/lib/Drupal/Core/Ajax/AjaxResponseAttachmentsProcessor.php
@@ -164,15 +164,15 @@ class AjaxResponseAttachmentsProcessor implements AttachmentsResponseProcessorIn
     $resource_commands = array();
     if ($css_assets) {
       $css_render_array = $this->cssCollectionRenderer->render($css_assets);
-      $resource_commands[] = new AddCssCommand($this->renderer->renderPlain($css_render_array));
+      $resource_commands[] = new AddCssCommand((string) $this->renderer->renderPlain($css_render_array));
     }
     if ($js_assets_header) {
       $js_header_render_array = $this->jsCollectionRenderer->render($js_assets_header);
-      $resource_commands[] = new PrependCommand('head', $this->renderer->renderPlain($js_header_render_array));
+      $resource_commands[] = new PrependCommand('head', (string) $this->renderer->renderPlain($js_header_render_array));
     }
     if ($js_assets_footer) {
       $js_footer_render_array = $this->jsCollectionRenderer->render($js_assets_footer);
-      $resource_commands[] = new AppendCommand('body', $this->renderer->renderPlain($js_footer_render_array));
+      $resource_commands[] = new AppendCommand('body', (string) $this->renderer->renderPlain($js_footer_render_array));
     }
     foreach (array_reverse($resource_commands) as $resource_command) {
       $response->addCommand($resource_command, TRUE);
diff --git a/core/lib/Drupal/Core/Ajax/CommandWithAttachedAssetsTrait.php b/core/lib/Drupal/Core/Ajax/CommandWithAttachedAssetsTrait.php
index fe117e173..d83db5779 100644
--- a/core/lib/Drupal/Core/Ajax/CommandWithAttachedAssetsTrait.php
+++ b/core/lib/Drupal/Core/Ajax/CommandWithAttachedAssetsTrait.php
@@ -37,10 +37,10 @@ trait CommandWithAttachedAssetsTrait {
     if (is_array($this->content)) {
       $html = \Drupal::service('renderer')->renderRoot($this->content);
       $this->attachedAssets = AttachedAssets::createFromRenderArray($this->content);
-      return $html;
+      return (string) $html;
     }
     else {
-      return $this->content;
+      return (string) $this->content;
     }
   }
 
diff --git a/core/lib/Drupal/Core/Authentication/AuthenticationCollector.php b/core/lib/Drupal/Core/Authentication/AuthenticationCollector.php
new file mode 100644
index 000000000..60bd62c93
--- /dev/null
+++ b/core/lib/Drupal/Core/Authentication/AuthenticationCollector.php
@@ -0,0 +1,89 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Authentication\AuthenticationCollector.
+ */
+
+namespace Drupal\Core\Authentication;
+
+/**
+ * A collector class for authentication providers.
+ */
+class AuthenticationCollector implements AuthenticationCollectorInterface {
+
+  /**
+   * Array of all registered authentication providers, keyed by ID.
+   *
+   * @var \Drupal\Core\Authentication\AuthenticationProviderInterface[]
+   */
+  protected $providers;
+
+  /**
+   * Array of all providers and their priority.
+   *
+   * @var array
+   */
+  protected $providerOrders = [];
+
+  /**
+   * Sorted list of registered providers.
+   *
+   * @var \Drupal\Core\Authentication\AuthenticationProviderInterface[]
+   */
+  protected $sortedProviders;
+
+  /**
+   * List of providers which are allowed on routes with no _auth option.
+   *
+   * @var string[]
+   */
+  protected $globalProviders;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function addProvider(AuthenticationProviderInterface $provider, $provider_id, $priority = 0, $global = FALSE) {
+    $this->providers[$provider_id] = $provider;
+    $this->providerOrders[$priority][$provider_id] = $provider;
+    // Force the providers to be re-sorted.
+    $this->sortedProviders = NULL;
+
+    if ($global) {
+      $this->globalProviders[$provider_id] = TRUE;
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function isGlobal($provider_id) {
+    return isset($this->globalProviders[$provider_id]);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getProvider($provider_id) {
+    return isset($this->providers[$provider_id]) ? $this->providers[$provider_id] : NULL;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getSortedProviders() {
+    if (!isset($this->sortedProviders)) {
+      // Sort the providers according to priority.
+      krsort($this->providerOrders);
+
+      // Merge nested providers from $this->providers into $this->sortedProviders.
+      $this->sortedProviders = [];
+      foreach ($this->providerOrders as $providers) {
+        $this->sortedProviders = array_merge($this->sortedProviders, $providers);
+      }
+    }
+
+    return $this->sortedProviders;
+  }
+
+}
diff --git a/core/lib/Drupal/Core/Authentication/AuthenticationCollectorInterface.php b/core/lib/Drupal/Core/Authentication/AuthenticationCollectorInterface.php
new file mode 100644
index 000000000..5bf6a08a1
--- /dev/null
+++ b/core/lib/Drupal/Core/Authentication/AuthenticationCollectorInterface.php
@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Authentication\AuthenticationCollectorInterface.
+ */
+
+namespace Drupal\Core\Authentication;
+
+/**
+ * Interface for collectors of registered authentication providers.
+ */
+interface AuthenticationCollectorInterface {
+
+  /**
+   * Adds a provider to the array of registered providers.
+   *
+   * @param \Drupal\Core\Authentication\AuthenticationProviderInterface $provider
+   *   The provider object.
+   * @param string $provider_id
+   *   Identifier of the provider.
+   * @param int $priority
+   *   (optional) The provider's priority.
+   * @param bool $global
+   *   (optional) TRUE if the provider is to be applied globally on all routes.
+   *   Defaults to FALSE.
+   */
+  public function addProvider(AuthenticationProviderInterface $provider, $provider_id, $priority = 0, $global = FALSE);
+
+  /**
+   * Returns whether a provider is considered global.
+   *
+   * @param string $provider_id
+   *   The provider ID.
+   *
+   * @return bool
+   *   TRUE if the provider is global, FALSE otherwise.
+   *
+   * @see \Drupal\Core\Authentication\AuthenticationCollectorInterface::addProvider
+   */
+  public function isGlobal($provider_id);
+
+  /**
+   * Returns an authentication provider.
+   *
+   * @param string $provider_id
+   *   The provider ID.
+   *
+   * @return \Drupal\Core\Authentication\AuthenticationProviderInterface|NULL
+   *   The authentication provider which matches the ID.
+   */
+  public function getProvider($provider_id);
+
+  /**
+   * Returns the sorted array of authentication providers.
+   *
+   * @return \Drupal\Core\Authentication\AuthenticationProviderInterface[]
+   *   An array of authentication provider objects.
+   */
+  public function getSortedProviders();
+
+}
diff --git a/core/lib/Drupal/Core/Authentication/AuthenticationManager.php b/core/lib/Drupal/Core/Authentication/AuthenticationManager.php
index ac50ae3c5..d95873dd7 100644
--- a/core/lib/Drupal/Core/Authentication/AuthenticationManager.php
+++ b/core/lib/Drupal/Core/Authentication/AuthenticationManager.php
@@ -20,69 +20,23 @@ use Symfony\Component\HttpFoundation\Request;
  *
  * If no provider set an active user then the user is set to anonymous.
  */
-class AuthenticationManager implements AuthenticationProviderInterface, AuthenticationProviderFilterInterface, AuthenticationProviderChallengeInterface, AuthenticationManagerInterface {
+class AuthenticationManager implements AuthenticationProviderInterface, AuthenticationProviderFilterInterface, AuthenticationProviderChallengeInterface {
 
   /**
-   * Array of all registered authentication providers, keyed by ID.
+   * The authentication provider collector.
    *
-   * @var \Drupal\Core\Authentication\AuthenticationProviderInterface[]
+   * @var \Drupal\Core\Authentication\AuthenticationCollectorInterface
    */
-  protected $providers;
+  protected $authCollector;
 
   /**
-   * Array of all providers and their priority.
+   * Creates a new authentication manager instance.
    *
-   * @var array
+   * @param \Drupal\Core\Authentication\AuthenticationCollectorInterface $auth_collector
+   *   The authentication provider collector.
    */
-  protected $providerOrders = array();
-
-  /**
-   * Sorted list of registered providers.
-   *
-   * @var \Drupal\Core\Authentication\AuthenticationProviderInterface[]
-   */
-  protected $sortedProviders;
-
-  /**
-   * List of providers which implement the filter interface.
-   *
-   * @var \Drupal\Core\Authentication\AuthenticationProviderFilterInterface[]
-   */
-  protected $filters;
-
-  /**
-   * List of providers which implement the challenge interface.
-   *
-   * @var \Drupal\Core\Authentication\AuthenticationProviderChallengeInterface[]
-   */
-  protected $challengers;
-
-  /**
-   * List of providers which are allowed on routes with no _auth option.
-   *
-   * @var string[]
-   */
-  protected $globalProviders;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function addProvider(AuthenticationProviderInterface $provider, $provider_id, $priority = 0, $global = FALSE) {
-    $this->providers[$provider_id] = $provider;
-    $this->providerOrders[$priority][$provider_id] = $provider;
-    // Force the builders to be re-sorted.
-    $this->sortedProviders = NULL;
-
-    if ($provider instanceof AuthenticationProviderFilterInterface) {
-      $this->filters[$provider_id] = $provider;
-    }
-    if ($provider instanceof AuthenticationProviderChallengeInterface) {
-      $this->challengers[$provider_id] = $provider;
-    }
-
-    if ($global) {
-      $this->globalProviders[$provider_id] = TRUE;
-    }
+  public function __construct(AuthenticationCollectorInterface $auth_collector) {
+    $this->authCollector = $auth_collector;
   }
 
   /**
@@ -97,7 +51,13 @@ class AuthenticationManager implements AuthenticationProviderInterface, Authenti
    */
   public function authenticate(Request $request) {
     $provider_id = $this->getProvider($request);
-    return $this->providers[$provider_id]->authenticate($request);
+    $provider = $this->authCollector->getProvider($provider_id);
+
+    if ($provider) {
+      return $provider->authenticate($request);
+    }
+
+    return NULL;
   }
 
   /**
@@ -110,7 +70,7 @@ class AuthenticationManager implements AuthenticationProviderInterface, Authenti
       $result = $this->applyFilter($request, $authenticated, $this->getProvider($request));
     }
     else {
-      foreach ($this->getSortedProviders() as $provider_id => $provider) {
+      foreach ($this->authCollector->getSortedProviders() as $provider_id => $provider) {
         if ($this->applyFilter($request, $authenticated, $provider_id)) {
           $result = TRUE;
           break;
@@ -126,8 +86,10 @@ class AuthenticationManager implements AuthenticationProviderInterface, Authenti
    */
   public function challengeException(Request $request, \Exception $previous) {
     $provider_id = $this->getChallenger($request);
+
     if ($provider_id) {
-      return $this->challengers[$provider_id]->challengeException($request, $previous);
+      $provider = $this->authCollector->getProvider($provider_id);
+      return $provider->challengeException($request, $previous);
     }
   }
 
@@ -142,7 +104,7 @@ class AuthenticationManager implements AuthenticationProviderInterface, Authenti
    *   If no application detects appropriate credentials, then NULL is returned.
    */
   protected function getProvider(Request $request) {
-    foreach ($this->getSortedProviders() as $provider_id => $provider) {
+    foreach ($this->authCollector->getSortedProviders() as $provider_id => $provider) {
       if ($provider->applies($request)) {
         return $provider_id;
       }
@@ -150,21 +112,19 @@ class AuthenticationManager implements AuthenticationProviderInterface, Authenti
   }
 
   /**
-   * Returns the id of the challenge provider for a request.
+   * Returns the ID of the challenge provider for a request.
    *
    * @param \Symfony\Component\HttpFoundation\Request $request
    *   The incoming request.
    *
    * @return string|NULL
-   *   The id of the first authentication provider which applies to the request.
+   *   The ID of the first authentication provider which applies to the request.
    *   If no application detects appropriate credentials, then NULL is returned.
    */
   protected function getChallenger(Request $request) {
-    if (!empty($this->challengers)) {
-      foreach ($this->getSortedProviders($request, FALSE) as $provider_id => $provider) {
-        if (isset($this->challengers[$provider_id]) && !$provider->applies($request) && $this->applyFilter($request, FALSE, $provider_id)) {
-          return $provider_id;
-        }
+    foreach ($this->authCollector->getSortedProviders() as $provider_id => $provider) {
+      if (($provider instanceof AuthenticationProviderChallengeInterface) && !$provider->applies($request) && $this->applyFilter($request, FALSE, $provider_id)) {
+        return $provider_id;
       }
     }
   }
@@ -186,8 +146,10 @@ class AuthenticationManager implements AuthenticationProviderInterface, Authenti
    *   TRUE if provider is allowed, FALSE otherwise.
    */
   protected function applyFilter(Request $request, $authenticated, $provider_id) {
-    if (isset($this->filters[$provider_id])) {
-      $result = $this->filters[$provider_id]->appliesToRoutedRequest($request, $authenticated);
+    $provider = $this->authCollector->getProvider($provider_id);
+
+    if ($provider && ($provider instanceof AuthenticationProviderFilterInterface)) {
+      $result = $provider->appliesToRoutedRequest($request, $authenticated);
     }
     else {
       $result = $this->defaultFilter($request, $provider_id);
@@ -222,27 +184,8 @@ class AuthenticationManager implements AuthenticationProviderInterface, Authenti
       return in_array($provider_id, $route->getOption('_auth'));
     }
     else {
-      return isset($this->globalProviders[$provider_id]);
+      return $this->authCollector->isGlobal($provider_id);
     }
   }
 
-  /**
-   * Returns the sorted array of authentication providers.
-   *
-   * @return \Drupal\Core\Authentication\AuthenticationProviderInterface[]
-   *   An array of authentication provider objects.
-   */
-  protected function getSortedProviders() {
-    if (!isset($this->sortedProviders)) {
-      // Sort the builders according to priority.
-      krsort($this->providerOrders);
-      // Merge nested providers from $this->providers into $this->sortedProviders.
-      $this->sortedProviders = array();
-      foreach ($this->providerOrders as $providers) {
-        $this->sortedProviders = array_merge($this->sortedProviders, $providers);
-      }
-    }
-    return $this->sortedProviders;
-  }
-
 }
diff --git a/core/lib/Drupal/Core/Authentication/AuthenticationManagerInterface.php b/core/lib/Drupal/Core/Authentication/AuthenticationManagerInterface.php
deleted file mode 100644
index 2b8317b63..000000000
--- a/core/lib/Drupal/Core/Authentication/AuthenticationManagerInterface.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\Core\Authentication\AuthenticationManagerInterface.
- */
-
-namespace Drupal\Core\Authentication;
-
-/**
- * Defines an interface for authentication managers.
- */
-interface AuthenticationManagerInterface {
-
-  /**
-   * Adds a provider to the array of registered providers.
-   *
-   * @param \Drupal\Core\Authentication\AuthenticationProviderInterface $provider
-   *   The provider object.
-   * @param string $provider_id
-   *   Identifier of the provider.
-   * @param int $priority
-   *   (optional) The provider's priority.
-   * @param bool $global
-   *   (optional) TRUE if the provider is to be applied globally on all routes.
-   *   Defaults to FALSE.
-   */
-  public function addProvider(AuthenticationProviderInterface $provider, $provider_id, $priority = 0, $global = FALSE);
-
-}
diff --git a/core/lib/Drupal/Core/Block/BlockBase.php b/core/lib/Drupal/Core/Block/BlockBase.php
index 262fd0c55..ef127e99e 100644
--- a/core/lib/Drupal/Core/Block/BlockBase.php
+++ b/core/lib/Drupal/Core/Block/BlockBase.php
@@ -10,6 +10,7 @@ namespace Drupal\Core\Block;
 use Drupal\block\BlockInterface;
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Access\AccessResult;
+use Drupal\Core\Cache\CacheableDependencyInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Plugin\ContextAwarePluginBase;
 use Drupal\Component\Utility\Unicode;
@@ -265,18 +266,23 @@ abstract class BlockBase extends ContextAwarePluginBase implements BlockPluginIn
     //   \Drupal\system\MachineNameController::transliterate(), so it might make
     //   sense to provide a common service for the two.
     $transliterated = $this->transliteration()->transliterate($admin_label, LanguageInterface::LANGCODE_DEFAULT, '_');
-
-    $replace_pattern = '[^a-z0-9_.]+';
-
     $transliterated = Unicode::strtolower($transliterated);
 
-    if (isset($replace_pattern)) {
-      $transliterated = preg_replace('@' . $replace_pattern . '@', '', $transliterated);
-    }
+    $transliterated = preg_replace('@[^a-z0-9_.]+@', '', $transliterated);
 
     return $transliterated;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheMaxAge() {
+    $max_age = parent::getCacheMaxAge();
+    // @todo Configurability of this will be removed in
+    //   https://www.drupal.org/node/2458763.
+    return Cache::mergeMaxAges($max_age, (int) $this->configuration['cache']['max_age']);
+  }
+
   /**
    * Wraps the transliteration service.
    *
@@ -299,25 +305,4 @@ abstract class BlockBase extends ContextAwarePluginBase implements BlockPluginIn
     $this->transliteration = $transliteration;
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function getCacheContexts() {
-    return [];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCacheTags() {
-    return [];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCacheMaxAge() {
-    return (int)$this->configuration['cache']['max_age'];
-  }
-
 }
diff --git a/core/lib/Drupal/Core/Breadcrumb/BreadcrumbManager.php b/core/lib/Drupal/Core/Breadcrumb/BreadcrumbManager.php
index 00998979a..0015bf3ce 100644
--- a/core/lib/Drupal/Core/Breadcrumb/BreadcrumbManager.php
+++ b/core/lib/Drupal/Core/Breadcrumb/BreadcrumbManager.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\Core\Breadcrumb;
 
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Routing\RouteMatchInterface;
 
@@ -95,7 +94,7 @@ class BreadcrumbManager implements ChainBreadcrumbBuilderInterface {
         break;
       }
       else {
-        throw new \UnexpectedValueException(SafeMarkup::format('Invalid breadcrumb returned by !class::build().', array('!class' => get_class($builder))));
+        throw new \UnexpectedValueException('Invalid breadcrumb returned by ' . get_class($builder) . '::build().');
       }
     }
     // Allow modules to alter the breadcrumb.
diff --git a/core/lib/Drupal/Core/Cache/Cache.php b/core/lib/Drupal/Core/Cache/Cache.php
index d1495929b..5ad9500bb 100644
--- a/core/lib/Drupal/Core/Cache/Cache.php
+++ b/core/lib/Drupal/Core/Cache/Cache.php
@@ -24,19 +24,16 @@ class Cache {
   /**
    * Merges arrays of cache contexts and removes duplicates.
    *
-   * @param string[] …
-   *   Arrays of cache contexts to merge.
+   * @param array $a
+   *    Cache contexts array to merge.
+   * @param array $b
+   *    Cache contexts array to merge.
    *
    * @return string[]
    *   The merged array of cache contexts.
    */
-  public static function mergeContexts() {
-    $cache_context_arrays = func_get_args();
-    $cache_contexts = [];
-    foreach ($cache_context_arrays as $contexts) {
-      $cache_contexts = array_merge($cache_contexts, $contexts);
-    }
-    $cache_contexts = array_unique($cache_contexts);
+  public static function mergeContexts(array $a = [], array $b = []) {
+    $cache_contexts = array_unique(array_merge($a, $b));
     \Drupal::service('cache_contexts_manager')->validateTokens($cache_contexts);
     sort($cache_contexts);
     return $cache_contexts;
@@ -53,19 +50,16 @@ class Cache {
    * allows items to be invalidated based on all tags attached to the content
    * they're constituted from.
    *
-   * @param string[] …
-   *   Arrays of cache tags to merge.
+   * @param array $a
+   *    Cache tags array to merge.
+   * @param array $b
+   *    Cache tags array to merge.
    *
    * @return string[]
    *   The merged array of cache tags.
    */
-  public static function mergeTags() {
-    $cache_tag_arrays = func_get_args();
-    $cache_tags = [];
-    foreach ($cache_tag_arrays as $tags) {
-      $cache_tags = array_merge($cache_tags, $tags);
-    }
-    $cache_tags = array_unique($cache_tags);
+  public static function mergeTags(array $a = [], array $b = []) {
+    $cache_tags = array_unique(array_merge($a, $b));
     static::validateTags($cache_tags);
     sort($cache_tags);
     return $cache_tags;
@@ -76,29 +70,25 @@ class Cache {
    *
    * Ensures infinite max-age (Cache::PERMANENT) is taken into account.
    *
-   * @param int …
-   *   Max-age values.
+   * @param int $a
+   *    Max age value to merge.
+   * @param int $b
+   *    Max age value to merge.
    *
    * @return int
    *   The minimum max-age value.
    */
-  public static function mergeMaxAges() {
-    $max_ages = func_get_args();
-
-    // Filter out all max-age values set to cache permanently.
-    if (in_array(Cache::PERMANENT, $max_ages)) {
-      $max_ages = array_filter($max_ages, function ($max_age) {
-        return $max_age !== Cache::PERMANENT;
-      });
-
-      // If nothing is left, then all max-age values were set to cache
-      // permanently, and then that is the result.
-      if (empty($max_ages)) {
-        return Cache::PERMANENT;
-      }
+  public static function mergeMaxAges($a = Cache::PERMANENT, $b = Cache::PERMANENT) {
+    // If one of the values is Cache::PERMANENT, return the other value.
+    if ($a === Cache::PERMANENT){
+      return $b;
+    }
+    if ($b === Cache::PERMANENT){
+      return $a;
     }
 
-    return min($max_ages);
+    // If none or the values are Cache::PERMANENT, return the minimum value.
+    return min($a, $b);
   }
 
   /**
diff --git a/core/lib/Drupal/Core/Cache/CacheableMetadata.php b/core/lib/Drupal/Core/Cache/CacheableMetadata.php
index a0c1ba890..33d5afbb9 100644
--- a/core/lib/Drupal/Core/Cache/CacheableMetadata.php
+++ b/core/lib/Drupal/Core/Cache/CacheableMetadata.php
@@ -10,6 +10,9 @@ namespace Drupal\Core\Cache;
  * Defines a generic class for passing cacheability metadata.
  *
  * @ingroup cache
+ *
+ * @todo Use RefinableCacheableDependencyInterface and the corresponding trait in
+ *   https://www.drupal.org/node/2526326.
  */
 class CacheableMetadata implements CacheableDependencyInterface {
 
@@ -129,6 +132,35 @@ class CacheableMetadata implements CacheableDependencyInterface {
     return $this;
   }
 
+  /**
+   * Adds a dependency on an object: merges its cacheability metadata.
+   *
+   * @param \Drupal\Core\Cache\CacheableDependencyInterface|mixed $other_object
+   *   The dependency. If the object implements CacheableDependencyInterface,
+   *   then its cacheability metadata will be used. Otherwise, the passed in
+   *   object must be assumed to be uncacheable, so max-age 0 is set.
+   *
+   * @return $this
+   */
+  public function addCacheableDependency($other_object) {
+    if ($other_object instanceof CacheableDependencyInterface) {
+      $this->addCacheTags($other_object->getCacheTags());
+      $this->addCacheContexts($other_object->getCacheContexts());
+      if ($this->maxAge === Cache::PERMANENT) {
+        $this->maxAge = $other_object->getCacheMaxAge();
+      }
+      elseif (($max_age = $other_object->getCacheMaxAge()) && $max_age !== Cache::PERMANENT) {
+        $this->maxAge = Cache::mergeMaxAges($this->maxAge, $max_age);
+      }
+    }
+    else {
+      // Not a cacheable dependency, this can not be cached.
+      $this->maxAge = 0;
+    }
+
+    return $this;
+  }
+
   /**
    * Merges the values of another CacheableMetadata object with this one.
    *
@@ -139,7 +171,7 @@ class CacheableMetadata implements CacheableDependencyInterface {
    *   A new CacheableMetadata object, with the merged data.
    */
   public function merge(CacheableMetadata $other) {
-    $result = new static();
+    $result = clone $this;
 
     // This is called many times per request, so avoid merging unless absolutely
     // necessary.
diff --git a/core/lib/Drupal/Core/Cache/Context/AccountPermissionsCacheContext.php b/core/lib/Drupal/Core/Cache/Context/AccountPermissionsCacheContext.php
index 5993424ae..9c4702ac4 100644
--- a/core/lib/Drupal/Core/Cache/Context/AccountPermissionsCacheContext.php
+++ b/core/lib/Drupal/Core/Cache/Context/AccountPermissionsCacheContext.php
@@ -7,18 +7,21 @@
 
 namespace Drupal\Core\Cache\Context;
 
+use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Session\PermissionsHashGeneratorInterface;
 
 /**
  * Defines the AccountPermissionsCacheContext service, for "per permission" caching.
+ *
+ * Cache context ID: 'user.permissions'.
  */
-class AccountPermissionsCacheContext extends UserCacheContext {
+class AccountPermissionsCacheContext extends UserCacheContextBase implements CacheContextInterface {
 
   /**
    * The permissions hash generator.
    *
-   * @var \Drupal\user\PermissionsHashInterface
+   * @var \Drupal\Core\Session\PermissionsHashGeneratorInterface
    */
   protected $permissionsHashGenerator;
 
@@ -27,7 +30,7 @@ class AccountPermissionsCacheContext extends UserCacheContext {
    *
    * @param \Drupal\Core\Session\AccountInterface $user
    *   The current user.
-   * @param \Drupal\user\PermissionsHashInterface $permissions_hash_generator
+   * @param \Drupal\Core\Session\PermissionsHashGeneratorInterface $permissions_hash_generator
    *   The permissions hash generator.
    */
   public function __construct(AccountInterface $user, PermissionsHashGeneratorInterface $permissions_hash_generator) {
@@ -46,7 +49,24 @@ class AccountPermissionsCacheContext extends UserCacheContext {
    * {@inheritdoc}
    */
   public function getContext() {
-    return 'ph.' . $this->permissionsHashGenerator->generate($this->user);
+    return $this->permissionsHashGenerator->generate($this->user);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheableMetadata() {
+    $cacheable_metadata = new CacheableMetadata();
+
+    // The permissions hash changes when:
+    // - a user is updated to have different roles;
+    $tags = ['user:' . $this->user->id()];
+    // - a role is updated to have different permissions.
+    foreach ($this->user->getRoles() as $rid) {
+      $tags[] = "config:user.role.$rid";
+    }
+
+    return $cacheable_metadata->setCacheTags($tags);
   }
 
 }
diff --git a/core/lib/Drupal/Core/Cache/Context/CacheContextInterface.php b/core/lib/Drupal/Core/Cache/Context/CacheContextInterface.php
index ada317473..ce6947f20 100644
--- a/core/lib/Drupal/Core/Cache/Context/CacheContextInterface.php
+++ b/core/lib/Drupal/Core/Cache/Context/CacheContextInterface.php
@@ -31,4 +31,21 @@ interface CacheContextInterface {
    */
   public function getContext();
 
+  /**
+   * Gets the cacheability metadata for the context.
+   *
+   * There are three valid cases for the returned CacheableMetadata object:
+   * - An empty object means this can be optimized away safely.
+   * - A max-age of 0 means that this context can never be optimized away. It
+   *   will never bubble up and cache tags will not be used.
+   * - Any non-zero max-age and cache tags will bubble up into the cache item
+   *   if this is optimized away to allow for invalidation if the context
+   *   value changes.
+   *
+   *
+   * @return \Drupal\Core\Cache\CacheableMetadata
+   *   A cacheable metadata object.
+   */
+  public function getCacheableMetadata();
+
 }
diff --git a/core/lib/Drupal/Core/Cache/Context/CacheContextsManager.php b/core/lib/Drupal/Core/Cache/Context/CacheContextsManager.php
index 27b012a9e..b01dc9eea 100644
--- a/core/lib/Drupal/Core/Cache/Context/CacheContextsManager.php
+++ b/core/lib/Drupal/Core/Cache/Context/CacheContextsManager.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\Core\Cache\Context;
 
-use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Core\Cache\CacheableMetadata;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -99,23 +99,35 @@ class CacheContextsManager {
    * @param string[] $context_tokens
    *   An array of cache context tokens.
    *
-   * @return string[]
-   *   The array of corresponding cache keys.
+   * @return \Drupal\Core\Cache\Context\ContextCacheKeys
+   *   The ContextCacheKeys object containing the converted cache keys and
+   *   cacheability metadata.
    *
-   * @throws \InvalidArgumentException
+   * @throws \LogicException
+   *   Thrown if any of the context tokens or parameters are not valid.
    */
   public function convertTokensToKeys(array $context_tokens) {
-    $context_tokens = $this->optimizeTokens($context_tokens);
-    sort($context_tokens);
-    $keys = [];
-    foreach (static::parseTokens($context_tokens) as $context) {
-      list($context_id, $parameter) = $context;
-      if (!in_array($context_id, $this->contexts)) {
-        throw new \InvalidArgumentException(SafeMarkup::format('"@context" is not a valid cache context ID.', ['@context' => $context_id]));
-      }
-      $keys[] = $this->getService($context_id)->getContext($parameter);
+    $this->validateTokens($context_tokens);
+    $cacheable_metadata = new CacheableMetadata();
+    $optimized_tokens = $this->optimizeTokens($context_tokens);
+    // Iterate over cache contexts that have been optimized away and get their
+    // cacheability metadata.
+    foreach (static::parseTokens(array_diff($context_tokens, $optimized_tokens)) as $context_token) {
+      list($context_id, $parameter) = $context_token;
+      $context = $this->getService($context_id);
+      $cacheable_metadata = $cacheable_metadata->merge($context->getCacheableMetadata($parameter));
     }
-    return $keys;
+
+    sort($optimized_tokens);
+    $keys = [];
+    foreach (array_combine($optimized_tokens, static::parseTokens($optimized_tokens)) as $context_token => $context) {
+      list($context_id, $parameter) = $context;
+      $keys[] = '[' . $context_token . ']=' . $this->getService($context_id)->getContext($parameter);
+    }
+
+    // Create the returned object and merge in the cacheability metadata.
+    $context_cache_keys = new ContextCacheKeys($keys);
+    return $context_cache_keys->merge($cacheable_metadata);
   }
 
   /**
@@ -129,6 +141,9 @@ class CacheContextsManager {
    * possible of a set of cache context tokens, that still captures the entire
    * universe of variations.
    *
+   * If a cache context is being optimized away, it is able to set cacheable
+   * metadata for itself which will be bubbled up.
+   *
    * E.g. when caching per user ('user'), also caching per role ('user.roles')
    * is meaningless because "per role" is implied by "per user".
    *
@@ -150,6 +165,14 @@ class CacheContextsManager {
   public function optimizeTokens(array $context_tokens) {
     $optimized_content_tokens = [];
     foreach ($context_tokens as $context_token) {
+
+      // Extract the parameter if available.
+      $parameter = NULL;
+      $context_id = $context_token;
+      if (strpos($context_token, ':') !== FALSE) {
+        list($context_id, $parameter) = explode(':', $context_token);
+      }
+
       // Context tokens without:
       // - a period means they don't have a parent
       // - a colon means they're not a specific value of a cache context
@@ -157,6 +180,11 @@ class CacheContextsManager {
       if (strpos($context_token, '.') === FALSE && strpos($context_token, ':') === FALSE) {
         $optimized_content_tokens[] = $context_token;
       }
+      // Check cacheability. If the context defines a max-age of 0, then it
+      // can not be optimized away. Pass the parameter along if we have one.
+      elseif ($this->getService($context_id)->getCacheableMetadata($parameter)->getCacheMaxAge() === 0) {
+        $optimized_content_tokens[] = $context_token;
+      }
       // The context token has a period or a colon. Iterate over all ancestor
       // cache contexts. If one exists, omit the context token.
       else {
diff --git a/core/lib/Drupal/Core/Cache/Context/CalculatedCacheContextInterface.php b/core/lib/Drupal/Core/Cache/Context/CalculatedCacheContextInterface.php
index bb2f291f9..0647fad0d 100644
--- a/core/lib/Drupal/Core/Cache/Context/CalculatedCacheContextInterface.php
+++ b/core/lib/Drupal/Core/Cache/Context/CalculatedCacheContextInterface.php
@@ -34,7 +34,32 @@ interface CalculatedCacheContextInterface {
    * @return string
    *   The string representation of the cache context. When $parameter is NULL,
    *   a value representing all possible parameters must be generated.
+   *
+   * @throws \LogicException
+   *   Thrown if the passed in parameter is invalid.
    */
   public function getContext($parameter = NULL);
 
+  /**
+   * Gets the cacheability metadata for the context based on the parameter value.
+   *
+   * There are three valid cases for the returned CacheableMetadata object:
+   * - An empty object means this can be optimized away safely.
+   * - A max-age of 0 means that this context can never be optimized away. It
+   *   will never bubble up and cache tags will not be used.
+   * - Any non-zero max-age and cache tags will bubble up into the cache item
+   *   if this is optimized away to allow for invalidation if the context
+   *   value changes.
+   *
+   * @param string|null $parameter
+   *   The parameter, or NULL to indicate all possible parameter values.
+   *
+   * @return \Drupal\Core\Cache\CacheableMetadata
+   *   A cacheable metadata object.
+   *
+   * @throws \LogicException
+   *   Thrown if the passed in parameter is invalid.
+   */
+  public function getCacheableMetadata($parameter = NULL);
+
 }
diff --git a/core/lib/Drupal/Core/Cache/Context/ContextCacheKeys.php b/core/lib/Drupal/Core/Cache/Context/ContextCacheKeys.php
new file mode 100644
index 000000000..4b5593f75
--- /dev/null
+++ b/core/lib/Drupal/Core/Cache/Context/ContextCacheKeys.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Cache\Context\ContextCacheKeys.
+ */
+
+namespace Drupal\Core\Cache\Context;
+
+use Drupal\Core\Cache\CacheableMetadata;
+
+/**
+ * A value object to store generated cache keys with its cacheability metadata.
+ */
+class ContextCacheKeys extends CacheableMetadata {
+
+  /**
+   * The generated cache keys.
+   *
+   * @var string[]
+   */
+  protected $keys;
+
+  /**
+   * Constructs a ContextCacheKeys object.
+   *
+   * @param string[] $keys
+   *   The cache context keys.
+   */
+  public function __construct(array $keys) {
+    $this->keys = $keys;
+  }
+
+  /**
+   * Gets the generated cache keys.
+   *
+   * @return string[]
+   *   The cache keys.
+   */
+  public function getKeys() {
+    return $this->keys;
+  }
+
+}
diff --git a/core/lib/Drupal/Core/Cache/Context/CookiesCacheContext.php b/core/lib/Drupal/Core/Cache/Context/CookiesCacheContext.php
index e7850b8c8..bd5ab661e 100644
--- a/core/lib/Drupal/Core/Cache/Context/CookiesCacheContext.php
+++ b/core/lib/Drupal/Core/Cache/Context/CookiesCacheContext.php
@@ -7,8 +7,14 @@
 
 namespace Drupal\Core\Cache\Context;
 
+use Drupal\Core\Cache\CacheableMetadata;
+
 /**
  * Defines the CookiesCacheContext service, for "per cookie" caching.
+ *
+ * Cache context ID: 'cookies' (to vary by all cookies).
+ * Calculated cache context ID: 'cookies:%name', e.g. 'cookies:device_type' (to
+ * vary by the 'device_type' cookie).
  */
 class CookiesCacheContext extends RequestStackCacheContextBase implements CalculatedCacheContextInterface {
 
@@ -31,4 +37,11 @@ class CookiesCacheContext extends RequestStackCacheContextBase implements Calcul
     }
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheableMetadata($cookie = NULL) {
+    return new CacheableMetadata();
+  }
+
 }
diff --git a/core/lib/Drupal/Core/Cache/Context/HeadersCacheContext.php b/core/lib/Drupal/Core/Cache/Context/HeadersCacheContext.php
index 1644aa09c..8b4e45039 100644
--- a/core/lib/Drupal/Core/Cache/Context/HeadersCacheContext.php
+++ b/core/lib/Drupal/Core/Cache/Context/HeadersCacheContext.php
@@ -7,8 +7,14 @@
 
 namespace Drupal\Core\Cache\Context;
 
+use Drupal\Core\Cache\CacheableMetadata;
+
 /**
  * Defines the HeadersCacheContext service, for "per header" caching.
+ *
+ * Cache context ID: 'headers' (to vary by all headers).
+ * Calculated cache context ID: 'headers:%name', e.g. 'headers:X-Something' (to
+ * vary by the 'X-Something' header).
  */
 class HeadersCacheContext extends RequestStackCacheContextBase implements CalculatedCacheContextInterface {
 
@@ -31,4 +37,11 @@ class HeadersCacheContext extends RequestStackCacheContextBase implements Calcul
     }
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheableMetadata($header = NULL) {
+    return new CacheableMetadata();
+  }
+
 }
diff --git a/core/lib/Drupal/Core/Cache/Context/IpCacheContext.php b/core/lib/Drupal/Core/Cache/Context/IpCacheContext.php
index 4841482f6..aac2926f0 100644
--- a/core/lib/Drupal/Core/Cache/Context/IpCacheContext.php
+++ b/core/lib/Drupal/Core/Cache/Context/IpCacheContext.php
@@ -7,10 +7,14 @@
 
 namespace Drupal\Core\Cache\Context;
 
+use Drupal\Core\Cache\CacheableMetadata;
+
 /**
  * Defines the IpCacheContext service, for "per IP address" caching.
+ *
+ * Cache context ID: 'ip'.
  */
-class IpCacheContext extends RequestStackCacheContextBase {
+class IpCacheContext extends RequestStackCacheContextBase implements CacheContextInterface {
 
   /**
    * {@inheritdoc}
@@ -26,4 +30,11 @@ class IpCacheContext extends RequestStackCacheContextBase {
     return $this->requestStack->getCurrentRequest()->getClientIp();
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheableMetadata() {
+    return new CacheableMetadata();
+  }
+
 }
diff --git a/core/lib/Drupal/Core/Cache/Context/IsSuperUserCacheContext.php b/core/lib/Drupal/Core/Cache/Context/IsSuperUserCacheContext.php
index 3f2705963..b5526ed9c 100644
--- a/core/lib/Drupal/Core/Cache/Context/IsSuperUserCacheContext.php
+++ b/core/lib/Drupal/Core/Cache/Context/IsSuperUserCacheContext.php
@@ -7,10 +7,14 @@
 
 namespace Drupal\Core\Cache\Context;
 
+use Drupal\Core\Cache\CacheableMetadata;
+
 /**
  * Defines the IsSuperUserCacheContext service, for "super user or not" caching.
+ *
+ * Cache context ID: 'user.is_super_user'.
  */
-class IsSuperUserCacheContext extends UserCacheContext {
+class IsSuperUserCacheContext extends UserCacheContextBase implements CacheContextInterface {
 
   /**
    * {@inheritdoc}
@@ -26,4 +30,11 @@ class IsSuperUserCacheContext extends UserCacheContext {
     return ((int) $this->user->id()) === 1 ? '1' : '0';
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheableMetadata() {
+    return new CacheableMetadata();
+  }
+
 }
diff --git a/core/lib/Drupal/Core/Cache/Context/LanguagesCacheContext.php b/core/lib/Drupal/Core/Cache/Context/LanguagesCacheContext.php
index 2bf9a2f68..6df0af696 100644
--- a/core/lib/Drupal/Core/Cache/Context/LanguagesCacheContext.php
+++ b/core/lib/Drupal/Core/Cache/Context/LanguagesCacheContext.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\Core\Cache\Context;
 
+use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Language\LanguageManagerInterface;
 
 /**
@@ -74,4 +75,11 @@ class LanguagesCacheContext implements CalculatedCacheContextInterface  {
     }
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheableMetadata($type = NULL) {
+    return new CacheableMetadata();
+  }
+
 }
diff --git a/core/lib/Drupal/Core/Cache/Context/MenuActiveTrailsCacheContext.php b/core/lib/Drupal/Core/Cache/Context/MenuActiveTrailsCacheContext.php
index 40cc077b5..3ff2dc4ed 100644
--- a/core/lib/Drupal/Core/Cache/Context/MenuActiveTrailsCacheContext.php
+++ b/core/lib/Drupal/Core/Cache/Context/MenuActiveTrailsCacheContext.php
@@ -7,12 +7,13 @@
 
 namespace Drupal\Core\Cache\Context;
 
+use Drupal\Core\Cache\CacheableMetadata;
 use Symfony\Component\DependencyInjection\ContainerAware;
 
 /**
  * Defines the MenuActiveTrailsCacheContext service.
  *
- * This class is container-aware to avoid initializing the 'menu.active_trail'
+ * This class is container-aware to avoid initializing the 'menu.active_trails'
  * service (and its dependencies) when it is not necessary.
  */
 class MenuActiveTrailsCacheContext extends ContainerAware implements CalculatedCacheContextInterface {
@@ -28,9 +29,24 @@ class MenuActiveTrailsCacheContext extends ContainerAware implements CalculatedC
    * {@inheritdoc}
    */
   public function getContext($menu_name = NULL) {
+    if (!$menu_name) {
+      throw new \LogicException('No menu name provided for menu.active_trails cache context.');
+    }
+
     $active_trail = $this->container->get('menu.active_trail')
       ->getActiveTrailIds($menu_name);
     return 'menu_trail.' . $menu_name . '|' . implode('|', $active_trail);
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheableMetadata($menu_name = NULL) {
+    if (!$menu_name) {
+      throw new \LogicException('No menu name provided for menu.active_trails cache context.');
+    }
+    $cacheable_metadata = new CacheableMetadata();
+    return $cacheable_metadata->setCacheTags(["config:system.menu.$menu_name"]);
+  }
+
 }
diff --git a/core/lib/Drupal/Core/Cache/Context/PagersCacheContext.php b/core/lib/Drupal/Core/Cache/Context/PagersCacheContext.php
index 23bdb7c99..2c887d25f 100644
--- a/core/lib/Drupal/Core/Cache/Context/PagersCacheContext.php
+++ b/core/lib/Drupal/Core/Cache/Context/PagersCacheContext.php
@@ -7,8 +7,14 @@
 
 namespace Drupal\Core\Cache\Context;
 
+use Drupal\Core\Cache\CacheableMetadata;
+
 /**
  * Defines a cache context for "per page in a pager" caching.
+ *
+ * Cache context ID: 'url.query_args.pagers' (to vary by all pagers).
+ * Calculated cache context ID: 'url.query_args.pagers:%pager_id', e.g.
+ * 'url.query_args.pagers:1' (to vary by the pager with ID 1).
  */
 class PagersCacheContext extends RequestStackCacheContextBase implements CalculatedCacheContextInterface {
 
@@ -28,10 +34,17 @@ class PagersCacheContext extends RequestStackCacheContextBase implements Calcula
     // The value of the 'page' query argument contains the information that
     // controls *all* pagers.
     if ($pager_id === NULL) {
-      return 'pager' . $this->requestStack->getCurrentRequest()->query->get('page', '');
+      return $this->requestStack->getCurrentRequest()->query->get('page', '');
     }
 
-    return 'pager.' . $pager_id . '.' . pager_find_page($pager_id);
+    return $pager_id . '.' . pager_find_page($pager_id);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheableMetadata($pager_id = NULL) {
+    return new CacheableMetadata();
   }
 
 }
diff --git a/core/lib/Drupal/Core/Cache/Context/QueryArgsCacheContext.php b/core/lib/Drupal/Core/Cache/Context/QueryArgsCacheContext.php
index e9a766498..cab1da88d 100644
--- a/core/lib/Drupal/Core/Cache/Context/QueryArgsCacheContext.php
+++ b/core/lib/Drupal/Core/Cache/Context/QueryArgsCacheContext.php
@@ -7,12 +7,14 @@
 
 namespace Drupal\Core\Cache\Context;
 
+use Drupal\Core\Cache\CacheableMetadata;
+
 /**
  * Defines the QueryArgsCacheContext service, for "per query args" caching.
  *
- * A "host" is defined as the combination of URI scheme, domain name and port.
- *
- * @see Symfony\Component\HttpFoundation::getSchemeAndHttpHost()
+ * Cache context ID: 'url.query_args' (to vary by all query arguments).
+ * Calculated cache context ID: 'url.query_args:%key', e.g.'url.query_args:foo'
+ * (to vary by the 'foo' query argument).
  */
 class QueryArgsCacheContext extends RequestStackCacheContextBase implements CalculatedCacheContextInterface {
 
@@ -35,4 +37,11 @@ class QueryArgsCacheContext extends RequestStackCacheContextBase implements Calc
     }
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheableMetadata($query_arg = NULL) {
+    return new CacheableMetadata();
+  }
+
 }
diff --git a/core/lib/Drupal/Core/Cache/Context/RequestFormatCacheContext.php b/core/lib/Drupal/Core/Cache/Context/RequestFormatCacheContext.php
index c3e544d83..e8cb154d2 100644
--- a/core/lib/Drupal/Core/Cache/Context/RequestFormatCacheContext.php
+++ b/core/lib/Drupal/Core/Cache/Context/RequestFormatCacheContext.php
@@ -7,8 +7,12 @@
 
 namespace Drupal\Core\Cache\Context;
 
+use Drupal\Core\Cache\CacheableMetadata;
+
 /**
  * Defines the RequestFormatCacheContext service, for "per format" caching.
+ *
+ * Cache context ID: 'request_format'.
  */
 class RequestFormatCacheContext extends RequestStackCacheContextBase {
 
@@ -26,4 +30,11 @@ class RequestFormatCacheContext extends RequestStackCacheContextBase {
     return $this->requestStack->getCurrentRequest()->getRequestFormat();
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheableMetadata() {
+    return new CacheableMetadata();
+  }
+
 }
diff --git a/core/lib/Drupal/Core/Cache/Context/RequestStackCacheContextBase.php b/core/lib/Drupal/Core/Cache/Context/RequestStackCacheContextBase.php
index 2a8f22d1f..846c97dbb 100644
--- a/core/lib/Drupal/Core/Cache/Context/RequestStackCacheContextBase.php
+++ b/core/lib/Drupal/Core/Cache/Context/RequestStackCacheContextBase.php
@@ -11,8 +11,12 @@ use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
  * Defines a base class for cache contexts depending only on the request stack.
+ *
+ * Subclasses need to implement either
+ * \Drupal\Core\Cache\Context\CacheContextInterface or
+ * \Drupal\Core\Cache\Context\CalculatedCacheContextInterface.
  */
-abstract class RequestStackCacheContextBase implements CacheContextInterface {
+abstract class RequestStackCacheContextBase {
 
   /**
    * The request stack.
diff --git a/core/lib/Drupal/Core/Cache/Context/RouteCacheContext.php b/core/lib/Drupal/Core/Cache/Context/RouteCacheContext.php
index 0643d8bf0..4b4f21b19 100644
--- a/core/lib/Drupal/Core/Cache/Context/RouteCacheContext.php
+++ b/core/lib/Drupal/Core/Cache/Context/RouteCacheContext.php
@@ -7,10 +7,13 @@
 
 namespace Drupal\Core\Cache\Context;
 
+use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Routing\RouteMatchInterface;
 
 /**
  * Defines the RouteCacheContext service, for "per route" caching.
+ *
+ * Cache context ID: 'route'.
  */
 class RouteCacheContext implements CacheContextInterface {
 
@@ -45,4 +48,11 @@ class RouteCacheContext implements CacheContextInterface {
     return $this->routeMatch->getRouteName() . hash('sha256', serialize($this->routeMatch->getRawParameters()->all()));
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheableMetadata() {
+    return new CacheableMetadata();
+  }
+
 }
diff --git a/core/lib/Drupal/Core/Cache/Context/RouteNameCacheContext.php b/core/lib/Drupal/Core/Cache/Context/RouteNameCacheContext.php
index dcca18b8f..487edc288 100644
--- a/core/lib/Drupal/Core/Cache/Context/RouteNameCacheContext.php
+++ b/core/lib/Drupal/Core/Cache/Context/RouteNameCacheContext.php
@@ -9,6 +9,8 @@ namespace Drupal\Core\Cache\Context;
 
 /**
  * Defines the RouteCacheContext service, for "per route name" caching.
+ *
+ * Cache context ID: 'route.name'.
  */
 class RouteNameCacheContext extends RouteCacheContext {
 
diff --git a/core/lib/Drupal/Core/Cache/Context/SessionCacheContext.php b/core/lib/Drupal/Core/Cache/Context/SessionCacheContext.php
new file mode 100644
index 000000000..474032e35
--- /dev/null
+++ b/core/lib/Drupal/Core/Cache/Context/SessionCacheContext.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Cache\Context\SessionCacheContext.
+ */
+
+namespace Drupal\Core\Cache\Context;
+
+/**
+ * Defines the SessionCacheContext service, for "per session" caching.
+ *
+ * Cache context ID: 'session'.
+ */
+class SessionCacheContext extends RequestStackCacheContextBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function getLabel() {
+    return t('Session');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getContext() {
+    return $this->requestStack->getCurrentRequest()->getSession()->getId();
+  }
+
+}
diff --git a/core/lib/Drupal/Core/Cache/Context/SiteCacheContext.php b/core/lib/Drupal/Core/Cache/Context/SiteCacheContext.php
index 4e0c123f5..539ba9dc0 100644
--- a/core/lib/Drupal/Core/Cache/Context/SiteCacheContext.php
+++ b/core/lib/Drupal/Core/Cache/Context/SiteCacheContext.php
@@ -7,9 +7,13 @@
 
 namespace Drupal\Core\Cache\Context;
 
+use Drupal\Core\Cache\CacheableMetadata;
+
 /**
  * Defines the SiteCacheContext service, for "per site" caching.
  *
+ * Cache context ID: 'site'.
+ *
  * A "site" is defined as the combination of URI scheme, domain name, port and
  * base path. It allows for varying between the *same* site being accessed via
  * different entry points. (Different sites in a multisite setup have separate
@@ -18,7 +22,7 @@ namespace Drupal\Core\Cache\Context;
  * @see \Symfony\Component\HttpFoundation\Request::getSchemeAndHttpHost()
  * @see \Symfony\Component\HttpFoundation\Request::getBaseUrl()
  */
-class SiteCacheContext extends RequestStackCacheContextBase {
+class SiteCacheContext extends RequestStackCacheContextBase implements CacheContextInterface {
 
   /**
    * {@inheritdoc}
@@ -35,4 +39,11 @@ class SiteCacheContext extends RequestStackCacheContextBase {
     return $request->getSchemeAndHttpHost() . $request->getBaseUrl();
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheableMetadata() {
+    return new CacheableMetadata();
+  }
+
 }
diff --git a/core/lib/Drupal/Core/Cache/Context/ThemeCacheContext.php b/core/lib/Drupal/Core/Cache/Context/ThemeCacheContext.php
index 85ba1a789..7e451af72 100644
--- a/core/lib/Drupal/Core/Cache/Context/ThemeCacheContext.php
+++ b/core/lib/Drupal/Core/Cache/Context/ThemeCacheContext.php
@@ -7,11 +7,13 @@
 
 namespace Drupal\Core\Cache\Context;
 
-use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Theme\ThemeManagerInterface;
 
 /**
  * Defines the ThemeCacheContext service, for "per theme" caching.
+ *
+ * Cache context ID: 'theme'.
  */
 class ThemeCacheContext implements CacheContextInterface {
 
@@ -46,4 +48,11 @@ class ThemeCacheContext implements CacheContextInterface {
     return $this->themeManager->getActiveTheme()->getName() ?: 'stark';
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheableMetadata() {
+    return new CacheableMetadata();
+  }
+
 }
diff --git a/core/lib/Drupal/Core/Cache/Context/TimeZoneCacheContext.php b/core/lib/Drupal/Core/Cache/Context/TimeZoneCacheContext.php
index 7e5b7c5c9..71dab9603 100644
--- a/core/lib/Drupal/Core/Cache/Context/TimeZoneCacheContext.php
+++ b/core/lib/Drupal/Core/Cache/Context/TimeZoneCacheContext.php
@@ -7,9 +7,13 @@
 
 namespace Drupal\Core\Cache\Context;
 
+use Drupal\Core\Cache\CacheableMetadata;
+
 /**
  * Defines the TimeZoneCacheContext service, for "per time zone" caching.
  *
+ * Cache context ID: 'timezone'.
+ *
  * @see \Drupal\Core\Session\AccountProxy::setAccount()
  */
 class TimeZoneCacheContext implements CacheContextInterface {
@@ -30,4 +34,11 @@ class TimeZoneCacheContext implements CacheContextInterface {
     return date_default_timezone_get();
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheableMetadata() {
+    return new CacheableMetadata();
+  }
+
 }
diff --git a/core/lib/Drupal/Core/Cache/Context/UrlCacheContext.php b/core/lib/Drupal/Core/Cache/Context/UrlCacheContext.php
index 1ea0bf03e..f240128f2 100644
--- a/core/lib/Drupal/Core/Cache/Context/UrlCacheContext.php
+++ b/core/lib/Drupal/Core/Cache/Context/UrlCacheContext.php
@@ -7,10 +7,14 @@
 
 namespace Drupal\Core\Cache\Context;
 
+use Drupal\Core\Cache\CacheableMetadata;
+
 /**
  * Defines the UrlCacheContext service, for "per page" caching.
+ *
+ * Cache context ID: 'url'.
  */
-class UrlCacheContext extends RequestStackCacheContextBase {
+class UrlCacheContext extends RequestStackCacheContextBase implements CacheContextInterface {
 
   /**
    * {@inheritdoc}
@@ -26,4 +30,11 @@ class UrlCacheContext extends RequestStackCacheContextBase {
     return $this->requestStack->getCurrentRequest()->getUri();
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheableMetadata() {
+    return new CacheableMetadata();
+  }
+
 }
diff --git a/core/lib/Drupal/Core/Cache/Context/UserCacheContext.php b/core/lib/Drupal/Core/Cache/Context/UserCacheContext.php
index 80ad5191e..874558bc1 100644
--- a/core/lib/Drupal/Core/Cache/Context/UserCacheContext.php
+++ b/core/lib/Drupal/Core/Cache/Context/UserCacheContext.php
@@ -7,22 +7,14 @@
 
 namespace Drupal\Core\Cache\Context;
 
-use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\Cache\CacheableMetadata;
 
 /**
  * Defines the UserCacheContext service, for "per user" caching.
+ *
+ * Cache context ID: 'user'.
  */
-class UserCacheContext implements CacheContextInterface {
-
-  /**
-   * Constructs a new UserCacheContext service.
-   *
-   * @param \Drupal\Core\Session\AccountInterface $user
-   *   The current user.
-   */
-  public function __construct(AccountInterface $user) {
-    $this->user = $user;
-  }
+class UserCacheContext extends UserCacheContextBase implements CacheContextInterface {
 
   /**
    * {@inheritdoc}
@@ -35,7 +27,14 @@ class UserCacheContext implements CacheContextInterface {
    * {@inheritdoc}
    */
   public function getContext() {
-    return "u." . $this->user->id();
+    return $this->user->id();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheableMetadata() {
+    return new CacheableMetadata();
   }
 
 }
diff --git a/core/lib/Drupal/Core/Cache/Context/UserCacheContextBase.php b/core/lib/Drupal/Core/Cache/Context/UserCacheContextBase.php
new file mode 100644
index 000000000..060cfb664
--- /dev/null
+++ b/core/lib/Drupal/Core/Cache/Context/UserCacheContextBase.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Cache\Context\UserCacheContextBase.
+ */
+
+namespace Drupal\Core\Cache\Context;
+
+use Drupal\Core\Session\AccountInterface;
+
+/**
+ * Base class for user-based cache contexts.
+ *
+ * Subclasses need to implement either
+ * \Drupal\Core\Cache\Context\CacheContextInterface or
+ * \Drupal\Core\Cache\Context\CalculatedCacheContextInterface.
+ */
+abstract class UserCacheContextBase {
+
+  /**
+   * The account object.
+   *
+   * @var \Drupal\Core\Session\AccountInterface
+   */
+  protected $user;
+
+  /**
+   * Constructs a new UserCacheContextBase class.
+   *
+   * @param \Drupal\Core\Session\AccountInterface $user
+   *   The current user.
+   */
+  public function __construct(AccountInterface $user) {
+    $this->user = $user;
+  }
+
+}
diff --git a/core/lib/Drupal/Core/Cache/Context/UserRolesCacheContext.php b/core/lib/Drupal/Core/Cache/Context/UserRolesCacheContext.php
index 55cca784f..8143bed1f 100644
--- a/core/lib/Drupal/Core/Cache/Context/UserRolesCacheContext.php
+++ b/core/lib/Drupal/Core/Cache/Context/UserRolesCacheContext.php
@@ -7,13 +7,19 @@
 
 namespace Drupal\Core\Cache\Context;
 
+use Drupal\Core\Cache\CacheableMetadata;
+
 /**
  * Defines the UserRolesCacheContext service, for "per role" caching.
  *
  * Only use this cache context when checking explicitly for certain roles. Use
  * user.permissions for anything that checks permissions.
+ *
+ * Cache context ID: 'user.roles' (to vary by all roles of the current user).
+ * Calculated cache context ID: 'user.roles:%role', e.g. 'user.roles:anonymous'
+ * (to vary by the presence/absence of a specific role).
  */
-class UserRolesCacheContext extends UserCacheContext implements CalculatedCacheContextInterface{
+class UserRolesCacheContext extends UserCacheContextBase implements CalculatedCacheContextInterface {
 
   /**
    * {@inheritdoc}
@@ -34,11 +40,18 @@ class UserRolesCacheContext extends UserCacheContext implements CalculatedCacheC
       return 'is-super-user';
     }
     if ($role === NULL) {
-      return 'r.' . implode(',', $this->user->getRoles());
+      return implode(',', $this->user->getRoles());
     }
     else {
-      return 'r.' . $role . '.' . (in_array($role, $this->user->getRoles()) ? '0' : '1');
+      return (in_array($role, $this->user->getRoles()) ? '0' : '1');
     }
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheableMetadata($role = NULL) {
+    return (new CacheableMetadata())->setCacheTags(['user:' . $this->user->id()]);
+  }
+
 }
diff --git a/core/lib/Drupal/Core/Cache/RefinableCacheableDependencyInterface.php b/core/lib/Drupal/Core/Cache/RefinableCacheableDependencyInterface.php
new file mode 100644
index 000000000..d3dad65b4
--- /dev/null
+++ b/core/lib/Drupal/Core/Cache/RefinableCacheableDependencyInterface.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * @file
+ * Contains \Drupal\Core\Cache\RefinableCacheableDependencyInterface.
+ */
+
+namespace Drupal\Core\Cache;
+
+/**
+ * Allows to add cacheability metadata to an object for the current runtime.
+ *
+ * This must be used when changing an object in a way that affects its
+ * cacheability. For example, when changing the active translation of an entity
+ * based on the current content language then a cache context for that must be
+ * added.
+ */
+interface RefinableCacheableDependencyInterface extends CacheableDependencyInterface {
+
+  /**
+   * Adds cache contexts.
+   *
+   * @param string[] $cache_contexts
+   *   The cache contexts to be added.
+   *
+   * @return $this
+   */
+  public function addCacheContexts(array $cache_contexts);
+
+  /**
+   * Adds cache tags.
+   *
+   * @param string[] $cache_tags
+   *   The cache tags to be added.
+   *
+   * @return $this
+   */
+  public function addCacheTags(array $cache_tags);
+
+  /**
+   * Merges the maximum age (in seconds) with the existing maximum age.
+   *
+   * The max age will be set to the given value if it is lower than the existing
+   * value.
+   *
+   * @param int $max_age
+   *   The max age to associate.
+   *
+   * @return $this
+   *
+   * @throws \InvalidArgumentException
+   *   Thrown if a non-integer value is supplied.
+   */
+  public function mergeCacheMaxAge($max_age);
+
+  /**
+   * Adds a dependency on an object: merges its cacheability metadata.
+   *
+   * @param \Drupal\Core\Cache\CacheableDependencyInterface|object $other_object
+   *   The dependency. If the object implements CacheableDependencyInterface,
+   *   then its cacheability metadata will be used. Otherwise, the passed in
+   *   object must be assumed to be uncacheable, so max-age 0 is set.
+   *
+   * @return $this
+   *
+   * @see \Drupal\Core\Cache\CacheableMetadata::createFromObject()
+   */
+  public function addCacheableDependency($other_object);
+
+}
diff --git a/core/lib/Drupal/Core/Cache/RefinableCacheableDependencyTrait.php b/core/lib/Drupal/Core/Cache/RefinableCacheableDependencyTrait.php
new file mode 100644
index 000000000..63b1d3d97
--- /dev/null
+++ b/core/lib/Drupal/Core/Cache/RefinableCacheableDependencyTrait.php
@@ -0,0 +1,76 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Cache\RefinableCacheableDependencyTrait.
+ */
+
+namespace Drupal\Core\Cache;
+
+/**
+ * Trait for \Drupal\Core\Cache\RefinableCacheableDependencyInterface.
+ */
+trait RefinableCacheableDependencyTrait {
+
+  /**
+   * Cache contexts.
+   *
+   * @var string[]
+   */
+  protected $cacheContexts = [];
+
+  /**
+   * Cache tags.
+   *
+   * @var string[]
+   */
+  protected $cacheTags = [];
+
+  /**
+   * Cache max-age.
+   *
+   * @var int
+   */
+  protected $cacheMaxAge = Cache::PERMANENT;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function addCacheableDependency($other_object) {
+    if ($other_object instanceof CacheableDependencyInterface) {
+      $this->addCacheContexts($other_object->getCacheContexts());
+      $this->addCacheTags($other_object->getCacheTags());
+      $this->mergeCacheMaxAge($other_object->getCacheMaxAge());
+    }
+    else {
+      // Not a cacheable dependency, this can not be cached.
+      $this->maxAge = 0;
+    }
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function addCacheContexts(array $cache_contexts) {
+    $this->cacheContexts = Cache::mergeContexts($this->cacheContexts, $cache_contexts);
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function addCacheTags(array $cache_tags) {
+    $this->cacheTags = Cache::mergeTags($this->cacheTags, $cache_tags);
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function mergeCacheMaxAge($max_age) {
+    $this->cacheMaxAge = Cache::mergeMaxAges($this->cacheMaxAge, $max_age);
+    return $this;
+  }
+
+}
diff --git a/core/lib/Drupal/Core/Command/DbDumpCommand.php b/core/lib/Drupal/Core/Command/DbDumpCommand.php
index d71bb37ed..10ddcdfb2 100644
--- a/core/lib/Drupal/Core/Command/DbDumpCommand.php
+++ b/core/lib/Drupal/Core/Command/DbDumpCommand.php
@@ -220,6 +220,9 @@ class DbDumpCommand extends Command {
     // Set primary key, unique keys, and indexes.
     $this->getTableIndexes($table, $definition);
 
+    // Set table collation.
+    $this->getTableCollation($table, $definition);
+
     return $definition;
   }
 
@@ -235,7 +238,6 @@ class DbDumpCommand extends Command {
     // Note, this query doesn't support ordering, so that is worked around
     // below by keying the array on Seq_in_index.
     $query = $this->connection->query("SHOW INDEX FROM {" . $table . "}");
-    $indexes = [];
     while (($row = $query->fetchAssoc()) !== FALSE) {
       $index_name = $row['Key_name'];
       $column = $row['Column_name'];
@@ -259,6 +261,22 @@ class DbDumpCommand extends Command {
     }
   }
 
+  /**
+   * Set the table collation.
+   *
+   * @param string $table
+   *   The table to find indexes for.
+   * @param array &$definition
+   *   The schema definition to modify.
+   */
+  protected function getTableCollation($table, &$definition) {
+    $query = $this->connection->query("SHOW TABLE STATUS LIKE '{" . $table . "}'");
+    $data = $query->fetchAssoc();
+
+    // Set `mysql_character_set`. This will be ignored by other backends.
+    $definition['mysql_character_set'] = str_replace('_general_ci', '', $data['Collation']);
+  }
+
   /**
    * Gets all data from a given table.
    *
diff --git a/core/lib/Drupal/Core/Command/GenerateProxyClassApplication.php b/core/lib/Drupal/Core/Command/GenerateProxyClassApplication.php
new file mode 100644
index 000000000..0ad9eb02b
--- /dev/null
+++ b/core/lib/Drupal/Core/Command/GenerateProxyClassApplication.php
@@ -0,0 +1,68 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Command\GenerateProxyClassApplication.
+ */
+
+namespace Drupal\Core\Command;
+
+use Drupal\Component\ProxyBuilder\ProxyBuilder;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Input\InputInterface;
+
+/**
+ * Provides a console command to generate proxy classes.
+ */
+class GenerateProxyClassApplication extends Application {
+
+  /**
+   * The proxy builder.
+   *
+   * @var \Drupal\Component\ProxyBuilder\ProxyBuilder
+   */
+  protected $proxyBuilder;
+
+  /**
+   * Constructs a new GenerateProxyClassApplication instance.
+   *
+   * @param \Drupal\Component\ProxyBuilder\ProxyBuilder $proxy_builder
+   *   The proxy builder.
+   */
+  public function __construct(ProxyBuilder $proxy_builder) {
+    $this->proxyBuilder = $proxy_builder;
+
+    parent::__construct();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getCommandName(InputInterface $input) {
+    return 'generate-proxy-class';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getDefaultCommands() {
+    // Even though this is a single command, keep the HelpCommand (--help).
+    $default_commands = parent::getDefaultCommands();
+    $default_commands[] = new GenerateProxyClassCommand($this->proxyBuilder);
+    return $default_commands;
+  }
+
+  /**
+   * {@inheritdoc}
+   *
+   * Overridden so the application doesn't expect the command name as the first
+   * argument.
+   */
+  public function getDefinition() {
+    $definition = parent::getDefinition();
+    // Clears the normal first argument (the command name).
+    $definition->setArguments();
+    return $definition;
+  }
+
+}
diff --git a/core/lib/Drupal/Core/Command/GenerateProxyClassCommand.php b/core/lib/Drupal/Core/Command/GenerateProxyClassCommand.php
new file mode 100644
index 000000000..288deaa48
--- /dev/null
+++ b/core/lib/Drupal/Core/Command/GenerateProxyClassCommand.php
@@ -0,0 +1,97 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Command\GenerateProxyClassCommand.
+ */
+
+namespace Drupal\Core\Command;
+
+use Drupal\Component\ProxyBuilder\ProxyBuilder;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+/**
+ * Provides a console command to generate proxy classes.
+ */
+class GenerateProxyClassCommand extends Command {
+
+  /**
+   * The proxy builder.
+   *
+   * @var \Drupal\Component\ProxyBuilder\ProxyBuilder
+   */
+  protected $proxyBuilder;
+
+  /**
+   * Constructs a new GenerateProxyClassCommand instance.
+   *
+   * @param \Drupal\Component\ProxyBuilder\ProxyBuilder $proxy_builder
+   *   The proxy builder.
+   */
+  public function __construct(ProxyBuilder $proxy_builder) {
+    parent::__construct();
+
+    $this->proxyBuilder = $proxy_builder;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function configure() {
+    $this->setName('generate-proxy-class')
+      ->setDefinition([
+        new InputArgument('class_name', InputArgument::REQUIRED, 'The class to be proxied'),
+        new InputArgument('namespace_root_path', InputArgument::REQUIRED, 'The filepath to the root of the namespace.'),
+      ])
+      ->setDescription('Dumps a generated proxy class into its appropriate namespace.')
+      ->addUsage('\'Drupal\Core\Batch\BatchStorage\' "core/lib/Drupal/Core"')
+      ->addUsage('\'Drupal\block\BlockRepository\' "core/modules/block/src"')
+      ->addUsage('\'Drupal\mymodule\MyClass\' "modules/contrib/mymodule/src"');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function execute(InputInterface $input, OutputInterface $output) {
+    $class_name = ltrim($input->getArgument('class_name'), '\\');
+    $namespace_root = $input->getArgument('namespace_root_path');
+
+    $match = [];
+    preg_match('/([a-zA-Z0-9_]+\\\\[a-zA-Z0-9_]+)\\\\(.+)/', $class_name, $match);
+
+    if ($match) {
+      $root_namespace = $match[1];
+      $rest_fqcn = $match[2];
+
+      $proxy_filename = $namespace_root . '/ProxyClass/' . str_replace('\\', '/', $rest_fqcn) . '.php';
+      $proxy_class_name = $root_namespace . '\\ProxyClass\\' . $rest_fqcn;
+
+      $proxy_class_string = $this->proxyBuilder->build($class_name);
+
+      $file_string = <<<EOF
+<?php
+
+/**
+ * @file
+ * Contains \{{ proxy_class_name }}.
+ */
+
+/**
+ * This file was generated via php core/scripts/generate-proxy-class.php '$class_name' "$namespace_root".
+ */
+{{ proxy_class_string }}
+EOF;
+      $file_string = str_replace(['{{ proxy_class_name }}', '{{ proxy_class_string }}'], [$proxy_class_name, $proxy_class_string], $file_string);
+
+      mkdir(dirname($proxy_filename), 0775, TRUE);
+      file_put_contents($proxy_filename, $file_string);
+
+      $output->writeln(sprintf('Proxy of class %s written to %s', $class_name, $proxy_filename));
+    }
+
+  }
+
+}
diff --git a/core/lib/Drupal/Core/Condition/ConditionInterface.php b/core/lib/Drupal/Core/Condition/ConditionInterface.php
index e0b611595..fd1b374f2 100644
--- a/core/lib/Drupal/Core/Condition/ConditionInterface.php
+++ b/core/lib/Drupal/Core/Condition/ConditionInterface.php
@@ -9,6 +9,7 @@ namespace Drupal\Core\Condition;
 
 use Drupal\Component\Plugin\ConfigurablePluginInterface;
 use Drupal\Component\Plugin\PluginInspectionInterface;
+use Drupal\Core\Cache\CacheableDependencyInterface;
 use Drupal\Core\Executable\ExecutableInterface;
 use Drupal\Core\Executable\ExecutableManagerInterface;
 use Drupal\Core\Plugin\PluginFormInterface;
@@ -46,12 +47,12 @@ use Drupal\Core\Plugin\PluginFormInterface;
  *
  * @ingroup plugin_api
  */
-interface ConditionInterface extends ExecutableInterface, PluginFormInterface, ConfigurablePluginInterface, PluginInspectionInterface {
+interface ConditionInterface extends ExecutableInterface, PluginFormInterface, ConfigurablePluginInterface, PluginInspectionInterface, CacheableDependencyInterface {
 
   /**
    * Determines whether condition result will be negated.
    *
-   * @return boolean
+   * @return bool
    *   Whether the condition result will be negated.
    */
   public function isNegated();
diff --git a/core/lib/Drupal/Core/Condition/ConditionPluginBase.php b/core/lib/Drupal/Core/Condition/ConditionPluginBase.php
index 5237d0d29..6f6ffc3e5 100644
--- a/core/lib/Drupal/Core/Condition/ConditionPluginBase.php
+++ b/core/lib/Drupal/Core/Condition/ConditionPluginBase.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\Core\Condition;
 
+use Drupal\Core\Cache\Cache;
+use Drupal\Core\Cache\CacheableDependencyInterface;
 use Drupal\Core\Executable\ExecutableManagerInterface;
 use Drupal\Core\Executable\ExecutablePluginBase;
 use Drupal\Core\Form\FormStateInterface;
diff --git a/core/lib/Drupal/Core/Config/ConfigBase.php b/core/lib/Drupal/Core/Config/ConfigBase.php
index eee76a2ad..6fbdd2902 100644
--- a/core/lib/Drupal/Core/Config/ConfigBase.php
+++ b/core/lib/Drupal/Core/Config/ConfigBase.php
@@ -8,9 +8,9 @@
 namespace Drupal\Core\Config;
 
 use Drupal\Component\Utility\NestedArray;
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Cache\Cache;
-use Drupal\Core\Cache\CacheableDependencyInterface;
+use Drupal\Core\Cache\RefinableCacheableDependencyInterface;
+use Drupal\Core\Cache\RefinableCacheableDependencyTrait;
 use \Drupal\Core\DependencyInjection\DependencySerializationTrait;
 
 /**
@@ -28,8 +28,9 @@ use \Drupal\Core\DependencyInjection\DependencySerializationTrait;
  * @see \Drupal\Core\Config\Config
  * @see \Drupal\Core\Theme\ThemeSettings
  */
-abstract class ConfigBase implements CacheableDependencyInterface {
+abstract class ConfigBase implements RefinableCacheableDependencyInterface {
   use DependencySerializationTrait;
+  use RefinableCacheableDependencyTrait;
 
   /**
    * The name of the configuration object.
@@ -97,24 +98,17 @@ abstract class ConfigBase implements CacheableDependencyInterface {
   public static function validateName($name) {
     // The name must be namespaced by owner.
     if (strpos($name, '.') === FALSE) {
-      throw new ConfigNameException(SafeMarkup::format('Missing namespace in Config object name @name.', array(
-        '@name' => $name,
-      )));
+      throw new ConfigNameException("Missing namespace in Config object name $name.");
     }
     // The name must be shorter than Config::MAX_NAME_LENGTH characters.
     if (strlen($name) > self::MAX_NAME_LENGTH) {
-      throw new ConfigNameException(SafeMarkup::format('Config object name @name exceeds maximum allowed length of @length characters.', array(
-        '@name' => $name,
-        '@length' => self::MAX_NAME_LENGTH,
-      )));
+      throw new ConfigNameException("Config object name $name exceeds maximum allowed length of " . static::MAX_NAME_LENGTH . " characters.");
     }
 
     // The name must not contain any of the following characters:
     // : ? * < > " ' / \
     if (preg_match('/[:?*<>"\'\/\\\\]/', $name)) {
-      throw new ConfigNameException(SafeMarkup::format('Invalid character in Config object name @name.', array(
-        '@name' => $name,
-      )));
+      throw new ConfigNameException("Invalid character in Config object name $name.");
     }
   }
 
@@ -222,7 +216,7 @@ abstract class ConfigBase implements CacheableDependencyInterface {
   protected function validateKeys(array $data) {
     foreach ($data as $key => $value) {
       if (strpos($key, '.') !== FALSE) {
-        throw new ConfigValueException(SafeMarkup::format('@key key contains a dot which is not supported.', array('@key' => $key)));
+        throw new ConfigValueException("$key key contains a dot which is not supported.");
       }
       if (is_array($value)) {
         $this->validateKeys($value);
@@ -269,21 +263,21 @@ abstract class ConfigBase implements CacheableDependencyInterface {
    * {@inheritdoc}
    */
   public function getCacheContexts() {
-    return [];
+    return $this->cacheContexts;
   }
 
   /**
    * {@inheritdoc}
    */
   public function getCacheTags() {
-    return ['config:' . $this->name];
+    return Cache::mergeTags(['config:' . $this->name], $this->cacheTags);
   }
 
   /**
    * {@inheritdoc}
    */
   public function getCacheMaxAge() {
-    return Cache::PERMANENT;
+    return $this->cacheMaxAge;
   }
 
 }
diff --git a/core/lib/Drupal/Core/Config/ConfigEvents.php b/core/lib/Drupal/Core/Config/ConfigEvents.php
index 794fbc597..6edbddcac 100644
--- a/core/lib/Drupal/Core/Config/ConfigEvents.php
+++ b/core/lib/Drupal/Core/Config/ConfigEvents.php
@@ -21,11 +21,16 @@ final class ConfigEvents {
    * object is saved. The event listener method receives a
    * \Drupal\Core\Config\ConfigCrudEvent instance.
    *
+   * See hook_update_N() documentation for safe configuration API usage and
+   * restrictions as this event will be fired when configuration is saved by
+   * hook_update_N().
+   *
    * @Event
    *
    * @see \Drupal\Core\Config\ConfigCrudEvent
    * @see \Drupal\Core\Config\Config::save()
    * @see \Drupal\Core\Config\ConfigFactory::onConfigSave()
+   * @see hook_update_N()
    *
    * @var string
    */
@@ -38,11 +43,16 @@ final class ConfigEvents {
    * object is deleted. The event listener method receives a
    * \Drupal\Core\Config\ConfigCrudEvent instance.
    *
+   * See hook_update_N() documentation for safe configuration API usage and
+   * restrictions as this event will be fired when configuration is deleted by
+   * hook_update_N().
+   *
    * @Event
    *
    * @see \Drupal\Core\Config\ConfigCrudEvent
    * @see \Drupal\Core\Config\Config::delete()
    * @see \Drupal\Core\Config\ConfigFactory::onConfigDelete()
+   * @see hook_update_N()
    *
    * @var string
    */
@@ -55,10 +65,15 @@ final class ConfigEvents {
    * object's name is changed. The event listener method receives a
    * \Drupal\Core\Config\ConfigRenameEvent instance.
    *
+   * See hook_update_N() documentation for safe configuration API usage and
+   * restrictions as this event will be fired when configuration is renamed by
+   * hook_update_N().
+   *
    * @Event
    *
    * @see \Drupal\Core\Config\ConfigRenameEvent
-   * @see \Drupal\Core\Config\ConfigFactoryInterface::rename().
+   * @see \Drupal\Core\Config\ConfigFactoryInterface::rename()
+   * @see hook_update_N()
    *
    * @var string
    */
diff --git a/core/lib/Drupal/Core/Config/ConfigFactory.php b/core/lib/Drupal/Core/Config/ConfigFactory.php
index cdfd951ba..6ec8a5c0c 100644
--- a/core/lib/Drupal/Core/Config/ConfigFactory.php
+++ b/core/lib/Drupal/Core/Config/ConfigFactory.php
@@ -126,6 +126,9 @@ class ConfigFactory implements ConfigFactoryInterface, EventSubscriberInterface
           $this->cache[$cache_key]->setSettingsOverride($GLOBALS['config'][$name]);
         }
       }
+
+      $this->propagateConfigOverrideCacheability($cache_key, $name);
+
       return $this->cache[$cache_key];
     }
   }
@@ -183,6 +186,9 @@ class ConfigFactory implements ConfigFactoryInterface, EventSubscriberInterface
             $this->cache[$cache_key]->setSettingsOverride($GLOBALS['config'][$name]);
           }
         }
+
+        $this->propagateConfigOverrideCacheability($cache_key, $name);
+
         $list[$name] = $this->cache[$cache_key];
       }
     }
@@ -209,6 +215,20 @@ class ConfigFactory implements ConfigFactoryInterface, EventSubscriberInterface
     return $overrides;
   }
 
+  /**
+   * Propagates cacheability of config overrides to cached config objects.
+   *
+   * @param string $cache_key
+   *   The key of the cached config object to update.
+   * @param string $name
+   *   The name of the configuration object to construct.
+   */
+  protected function propagateConfigOverrideCacheability($cache_key, $name) {
+    foreach ($this->configFactoryOverrides as $override) {
+      $this->cache[$cache_key]->addCacheableDependency($override->getCacheableMetadata($name));
+    }
+  }
+
   /**
    * {@inheritdoc}
    */
diff --git a/core/lib/Drupal/Core/Config/ConfigFactoryOverrideBase.php b/core/lib/Drupal/Core/Config/ConfigFactoryOverrideBase.php
index d7bc94143..2dc6caaab 100644
--- a/core/lib/Drupal/Core/Config/ConfigFactoryOverrideBase.php
+++ b/core/lib/Drupal/Core/Config/ConfigFactoryOverrideBase.php
@@ -74,7 +74,7 @@ abstract class ConfigFactoryOverrideBase implements EventSubscriberInterface {
     }
     elseif ($changed) {
       // Otherwise set the filtered override values back.
-      $override->setData($override_data)->save();
+      $override->setData($override_data)->save(TRUE);
     }
   }
 
diff --git a/core/lib/Drupal/Core/Config/ConfigFactoryOverrideInterface.php b/core/lib/Drupal/Core/Config/ConfigFactoryOverrideInterface.php
index 56dbc19fa..07938a022 100644
--- a/core/lib/Drupal/Core/Config/ConfigFactoryOverrideInterface.php
+++ b/core/lib/Drupal/Core/Config/ConfigFactoryOverrideInterface.php
@@ -58,4 +58,15 @@ interface ConfigFactoryOverrideInterface {
    */
   public function createConfigObject($name, $collection = StorageInterface::DEFAULT_COLLECTION);
 
+  /**
+   * Gets the cacheability metadata associated with the config factory override.
+   *
+   * @param string $name
+   *   The name of the configuration override to get metadata for.
+   *
+   * @return \Drupal\Core\Cache\CacheableMetadata
+   *   A cacheable metadata object.
+   */
+  public function getCacheableMetadata($name);
+
 }
diff --git a/core/lib/Drupal/Core/Config/ConfigImporter.php b/core/lib/Drupal/Core/Config/ConfigImporter.php
index ed507353d..e0d4e0d4b 100644
--- a/core/lib/Drupal/Core/Config/ConfigImporter.php
+++ b/core/lib/Drupal/Core/Config/ConfigImporter.php
@@ -11,7 +11,6 @@ use Drupal\Core\Config\Importer\MissingContentEvent;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Extension\ModuleInstallerInterface;
 use Drupal\Core\Extension\ThemeHandlerInterface;
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Config\Entity\ImportableEntityStorageInterface;
 use Drupal\Core\DependencyInjection\DependencySerializationTrait;
 use Drupal\Core\Entity\EntityStorageException;
@@ -763,7 +762,7 @@ class ConfigImporter {
       }
     }
     catch (\Exception $e) {
-      $this->logError($this->t('Unexpected error during import with operation @op for @name: @message', array('@op' => $op, '@name' => $name, '@message' => $e->getMessage())));
+      $this->logError($this->t('Unexpected error during import with operation @op for @name: !message', array('@op' => $op, '@name' => $name, '!message' => $e->getMessage())));
       // Error for that operation was logged, mark it as processed so that
       // the import can continue.
       $this->setProcessedConfiguration($collection, $op, $name);
@@ -972,7 +971,7 @@ class ConfigImporter {
       // Call to the configuration entity's storage to handle the configuration
       // change.
       if (!($entity_storage instanceof ImportableEntityStorageInterface)) {
-        throw new EntityStorageException(SafeMarkup::format('The entity storage "@storage" for the "@entity_type" entity type does not support imports', array('@storage' => get_class($entity_storage), '@entity_type' => $entity_type)));
+        throw new EntityStorageException(sprintf('The entity storage "%s" for the "%s" entity type does not support imports', get_class($entity_storage), $entity_type));
       }
       $entity_storage->$method($name, $new_config, $old_config);
       $this->setProcessedConfiguration($collection, $op, $name);
@@ -1018,7 +1017,7 @@ class ConfigImporter {
     // Call to the configuration entity's storage to handle the configuration
     // change.
     if (!($entity_storage instanceof ImportableEntityStorageInterface)) {
-      throw new EntityStorageException(SafeMarkup::format('The entity storage "@storage" for the "@entity_type" entity type does not support imports', array('@storage' => get_class($entity_storage), '@entity_type' => $entity_type_id)));
+      throw new EntityStorageException(sprintf("The entity storage '%s' for the '%s' entity type does not support imports", get_class($entity_storage), $entity_type_id));
     }
     $entity_storage->importRename($names['old_name'], $new_config, $old_config);
     $this->setProcessedConfiguration($collection, 'rename', $rename_name);
diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
index a810dbdc1..5b4688f81 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\Core\Config\Entity;
 
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Config\ConfigException;
 use Drupal\Core\Config\Schema\SchemaIncompleteException;
@@ -192,8 +191,6 @@ abstract class ConfigEntityBase extends Entity implements ConfigEntityInterface
    * {@inheritdoc}
    */
   public function disable() {
-    // An entity was disabled, invalidate its own cache tag.
-    Cache::invalidateTags($this->getCacheTags());
     return $this->setStatus(FALSE);
   }
 
@@ -280,7 +277,7 @@ abstract class ConfigEntityBase extends Entity implements ConfigEntityInterface
       $config_name = $entity_type->getConfigPrefix() . '.' . $this->id();
       $definition = $this->getTypedConfig()->getDefinition($config_name);
       if (!isset($definition['mapping'])) {
-        throw new SchemaIncompleteException(SafeMarkup::format('Incomplete or missing schema for @config_name', array('@config_name' => $config_name)));
+        throw new SchemaIncompleteException("Incomplete or missing schema for $config_name");
       }
       $properties_to_export = array_combine(array_keys($definition['mapping']), array_keys($definition['mapping']));
     }
@@ -333,7 +330,7 @@ abstract class ConfigEntityBase extends Entity implements ConfigEntityInterface
       ->execute();
     $matched_entity = reset($matching_entities);
     if (!empty($matched_entity) && ($matched_entity != $this->id()) && $matched_entity != $this->getOriginalId()) {
-      throw new ConfigDuplicateUUIDException(SafeMarkup::format('Attempt to save a configuration entity %id with UUID %uuid when this UUID is already used for %matched', array('%id' => $this->id(), '%uuid' => $this->uuid(), '%matched' => $matched_entity)));
+      throw new ConfigDuplicateUUIDException("Attempt to save a configuration entity '{$this->id()}' with UUID '{$this->uuid()}' when this UUID is already used for '$matched_entity'");
     }
 
     // If this entity is not new, load the original entity for comparison.
@@ -341,7 +338,7 @@ abstract class ConfigEntityBase extends Entity implements ConfigEntityInterface
       $original = $storage->loadUnchanged($this->getOriginalId());
       // Ensure that the UUID cannot be changed for an existing entity.
       if ($original && ($original->uuid() != $this->uuid())) {
-        throw new ConfigDuplicateUUIDException(SafeMarkup::format('Attempt to save a configuration entity %id with UUID %uuid when this entity already exists with UUID %original_uuid', array('%id' => $this->id(), '%uuid' => $this->uuid(), '%original_uuid' => $original->uuid())));
+        throw new ConfigDuplicateUUIDException("Attempt to save a configuration entity '{$this->id()}' with UUID '{$this->uuid()}' when this entity already exists with UUID '{$original->uuid()}'");
       }
     }
     if (!$this->isSyncing() && !$this->trustedData) {
@@ -409,7 +406,7 @@ abstract class ConfigEntityBase extends Entity implements ConfigEntityInterface
   /**
    * {@inheritdoc}
    */
-  public function getCacheTags() {
+  public function getCacheTagsToInvalidate() {
     // Use cache tags that match the underlying config object's name.
     // @see \Drupal\Core\Config\ConfigBase::getCacheTags()
     return ['config:' . $this->getConfigDependencyName()];
diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php
index 59776aaef..4912dc687 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php
@@ -7,14 +7,13 @@
 
 namespace Drupal\Core\Config\Entity;
 
-use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Config\ConfigImporterException;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityMalformedException;
 use Drupal\Core\Entity\EntityStorageBase;
 use Drupal\Core\Config\Config;
-use Drupal\Core\Config\StorageInterface;
 use Drupal\Core\Config\Entity\Exception\ConfigEntityIdLengthException;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Component\Uuid\UuidInterface;
@@ -184,11 +183,41 @@ class ConfigEntityStorage extends EntityStorageBase implements ConfigEntityStora
     }
 
     // Load all of the configuration entities.
-    $records = array();
+    /** @var \Drupal\Core\Config\Config[] $configs */
+    $configs = [];
+    $records = [];
     foreach ($this->configFactory->loadMultiple($names) as $config) {
-      $records[$config->get($this->idKey)] = $this->overrideFree ? $config->getOriginal(NULL, FALSE) : $config->get();
+      $id = $config->get($this->idKey);
+      $records[$id] = $this->overrideFree ? $config->getOriginal(NULL, FALSE) : $config->get();
+      $configs[$id] = $config;
     }
-    return $this->mapFromStorageRecords($records);
+    $entities = $this->mapFromStorageRecords($records, $configs);
+
+    // Config entities wrap config objects, and therefore they need to inherit
+    // the cacheability metadata of config objects (to ensure e.g. additional
+    // cacheability metadata added by config overrides is not lost).
+    foreach ($entities as $id => $entity) {
+      // But rather than simply inheriting all cacheability metadata of config
+      // objects, we need to make sure the self-referring cache tag that is
+      // present on Config objects is not added to the Config entity. It must be
+      // removed for 3 reasons:
+      // 1. When renaming/duplicating a Config entity, the cache tag of the
+      //    original config object would remain present, which would be wrong.
+      // 2. Some Config entities choose to not use the cache tag that the under-
+      //    lying Config object provides by default (For performance and
+      //    cacheability reasons it may not make sense to have a unique cache
+      //    tag for every Config entity. The DateFormat Config entity specifies
+      //    the 'rendered' cache tag for example, because A) date formats are
+      //    changed extremely rarely, so invalidating all render cache items is
+      //    fine, B) it means fewer cache tags per page.).
+      // 3. Fewer cache tags is better for performance.
+      $self_referring_cache_tag = ['config:' . $configs[$id]->getName()];
+      $config_cacheability = CacheableMetadata::createFromObject($configs[$id]);
+      $config_cacheability->setCacheTags(array_diff($config_cacheability->getCacheTags(), $self_referring_cache_tag));
+      $entity->addCacheableDependency($config_cacheability);
+    }
+
+    return $entities;
   }
 
   /**
@@ -229,10 +258,7 @@ class ConfigEntityStorage extends EntityStorageBase implements ConfigEntityStora
     // @todo Consider moving this to a protected method on the parent class, and
     //   abstracting it for all entity types.
     if (strlen($entity->get($this->idKey)) > self::MAX_ID_LENGTH) {
-      throw new ConfigEntityIdLengthException(SafeMarkup::format('Configuration entity ID @id exceeds maximum allowed length of @length characters.', array(
-        '@id' => $entity->get($this->idKey),
-        '@length' => self::MAX_ID_LENGTH,
-      )));
+      throw new ConfigEntityIdLengthException("Configuration entity ID {$entity->get($this->idKey)} exceeds maximum allowed length of " . self::MAX_ID_LENGTH . " characters.");
     }
 
     return parent::save($entity);
@@ -374,7 +400,7 @@ class ConfigEntityStorage extends EntityStorageBase implements ConfigEntityStora
     $id = static::getIDFromConfigName($name, $this->entityType->getConfigPrefix());
     $entity = $this->load($id);
     if (!$entity) {
-      throw new ConfigImporterException(SafeMarkup::format('Attempt to update non-existing entity "@id".', array('@id' => $id)));
+      throw new ConfigImporterException("Attempt to update non-existing entity '$id'.");
     }
     $entity->setSyncing(TRUE);
     $entity = $this->updateFromStorageRecord($entity, $new_config->get());
diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityType.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityType.php
index 33cefbdd2..ab94c27f6 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityType.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityType.php
@@ -10,7 +10,6 @@ namespace Drupal\Core\Config\Entity;
 use Drupal\Core\Config\Entity\Exception\ConfigEntityStorageClassException;
 use Drupal\Core\Entity\EntityType;
 use Drupal\Core\Config\ConfigPrefixLengthException;
-use Drupal\Component\Utility\SafeMarkup;
 
 /**
  * Provides an implementation of a configuration entity type and its metadata.
@@ -93,10 +92,7 @@ class ConfigEntityType extends EntityType implements ConfigEntityTypeInterface {
     }
 
     if (strlen($config_prefix) > static::PREFIX_LENGTH) {
-      throw new ConfigPrefixLengthException(SafeMarkup::format('The configuration file name prefix @config_prefix exceeds the maximum character limit of @max_char.', array(
-        '@config_prefix' => $config_prefix,
-        '@max_char' => static::PREFIX_LENGTH,
-      )));
+      throw new ConfigPrefixLengthException("The configuration file name prefix $config_prefix exceeds the maximum character limit of " . static::PREFIX_LENGTH);
     }
     return $config_prefix;
   }
@@ -158,7 +154,7 @@ class ConfigEntityType extends EntityType implements ConfigEntityTypeInterface {
    */
   protected function checkStorageClass($class) {
     if (!is_a($class, 'Drupal\Core\Config\Entity\ConfigEntityStorage', TRUE)) {
-      throw new ConfigEntityStorageClassException(SafeMarkup::format('@class is not \Drupal\Core\Config\Entity\ConfigEntityStorage or it does not extend it', ['@class' => $class]));
+      throw new ConfigEntityStorageClassException("$class is not \\Drupal\\Core\\Config\\Entity\\ConfigEntityStorage or it does not extend it");
     }
   }
 
diff --git a/core/lib/Drupal/Core/Config/FileStorage.php b/core/lib/Drupal/Core/Config/FileStorage.php
index ec199e75b..0f5b45aa8 100644
--- a/core/lib/Drupal/Core/Config/FileStorage.php
+++ b/core/lib/Drupal/Core/Config/FileStorage.php
@@ -9,7 +9,6 @@ namespace Drupal\Core\Config;
 
 use Drupal\Component\Serialization\Yaml;
 use Drupal\Component\Serialization\Exception\InvalidDataTypeException;
-use Drupal\Component\Utility\SafeMarkup;
 
 /**
  * Defines the file storage.
@@ -101,10 +100,7 @@ class FileStorage implements StorageInterface {
       $data = $this->decode($data);
     }
     catch (InvalidDataTypeException $e) {
-      throw new UnsupportedDataTypeConfigException(SafeMarkup::format('Invalid data type in config @name: !message', array(
-        '@name' => $name,
-        '!message' => $e->getMessage(),
-      )));
+      throw new UnsupportedDataTypeConfigException("Invalid data type in config $name: {$e->getMessage()}");
     }
     return $data;
   }
@@ -130,10 +126,7 @@ class FileStorage implements StorageInterface {
       $data = $this->encode($data);
     }
     catch (InvalidDataTypeException $e) {
-      throw new StorageException(SafeMarkup::format('Invalid data type in config @name: !message', array(
-        '@name' => $name,
-        '!message' => $e->getMessage(),
-      )));
+      throw new StorageException("Invalid data type in config $name: {$e->getMessage()}");
     }
 
     $target = $this->getFilePath($name);
diff --git a/core/lib/Drupal/Core/Config/ImmutableConfig.php b/core/lib/Drupal/Core/Config/ImmutableConfig.php
index 8435f7110..511a9c421 100644
--- a/core/lib/Drupal/Core/Config/ImmutableConfig.php
+++ b/core/lib/Drupal/Core/Config/ImmutableConfig.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\Core\Config;
 
-use Drupal\Component\Utility\SafeMarkup;
-
 /**
  * Defines the immutable configuration object.
  *
@@ -31,21 +29,21 @@ class ImmutableConfig extends Config {
    * {@inheritdoc}
    */
   public function set($key, $value) {
-    throw new ImmutableConfigException(SafeMarkup::format('Can not set values on immutable configuration !name:!key. Use \Drupal\Core\Config\ConfigFactoryInterface::getEditable() to retrieve a mutable configuration object', ['!name' => $this->getName(), '!key' => $key]));
+    throw new ImmutableConfigException("Can not set values on immutable configuration {$this->getName()}:$key. Use \\Drupal\\Core\\Config\\ConfigFactoryInterface::getEditable() to retrieve a mutable configuration object");
   }
 
   /**
    * {@inheritdoc}
    */
   public function clear($key) {
-    throw new ImmutableConfigException(SafeMarkup::format('Can not clear !key key in immutable configuration !name. Use \Drupal\Core\Config\ConfigFactoryInterface::getEditable() to retrieve a mutable configuration object', ['!name' => $this->getName(), '!key' => $key]));
+    throw new ImmutableConfigException("Can not clear $key key in immutable configuration {$this->getName()}. Use \\Drupal\\Core\\Config\\ConfigFactoryInterface::getEditable() to retrieve a mutable configuration object");
   }
 
   /**
    * {@inheritdoc}
    */
   public function save($has_trusted_data = FALSE) {
-    throw new ImmutableConfigException(SafeMarkup::format('Can not save immutable configuration !name. Use \Drupal\Core\Config\ConfigFactoryInterface::getEditable() to retrieve a mutable configuration object', ['!name' => $this->getName()]));
+    throw new ImmutableConfigException("Can not save immutable configuration {$this->getName()}. Use \\Drupal\\Core\\Config\\ConfigFactoryInterface::getEditable() to retrieve a mutable configuration object");
   }
 
   /**
@@ -55,7 +53,7 @@ class ImmutableConfig extends Config {
    *   The configuration object.
    */
   public function delete() {
-    throw new ImmutableConfigException(SafeMarkup::format('Can not delete immutable configuration !name. Use \Drupal\Core\Config\ConfigFactoryInterface::getEditable() to retrieve a mutable configuration object', ['!name' => $this->getName()]));
+    throw new ImmutableConfigException("Can not delete immutable configuration {$this->getName()}. Use \\Drupal\\Core\\Config\\ConfigFactoryInterface::getEditable() to retrieve a mutable configuration object");
   }
 
 }
diff --git a/core/lib/Drupal/Core/Config/InstallStorage.php b/core/lib/Drupal/Core/Config/InstallStorage.php
index f3a329808..5c1d65a77 100644
--- a/core/lib/Drupal/Core/Config/InstallStorage.php
+++ b/core/lib/Drupal/Core/Config/InstallStorage.php
@@ -91,9 +91,7 @@ class InstallStorage extends FileStorage {
     }
     // If any code in the early installer requests a configuration object that
     // does not exist anywhere as default config, then that must be mistake.
-    throw new StorageException(format_string('Missing configuration file: @name', array(
-      '@name' => $name,
-    )));
+    throw new StorageException("Missing configuration file: $name");
   }
 
   /**
diff --git a/core/lib/Drupal/Core/Config/Schema/ArrayElement.php b/core/lib/Drupal/Core/Config/Schema/ArrayElement.php
index 35e932ac2..88914c052 100644
--- a/core/lib/Drupal/Core/Config/Schema/ArrayElement.php
+++ b/core/lib/Drupal/Core/Config/Schema/ArrayElement.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\Core\Config\Schema;
 
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Config\TypedConfigManagerInterface;
 use Drupal\Core\TypedData\TypedData;
 
@@ -94,7 +93,7 @@ abstract class ArrayElement extends TypedData implements \IteratorAggregate, Typ
       return $element;
     }
     else {
-      throw new \InvalidArgumentException(SafeMarkup::format("The configuration property @key doesn't exist.", array('@key' => $name)));
+      throw new \InvalidArgumentException("The configuration property $name doesn't exist.");
     }
   }
 
diff --git a/core/lib/Drupal/Core/Config/Schema/TypedConfigInterface.php b/core/lib/Drupal/Core/Config/Schema/TypedConfigInterface.php
index 05305602e..22ffd7867 100644
--- a/core/lib/Drupal/Core/Config/Schema/TypedConfigInterface.php
+++ b/core/lib/Drupal/Core/Config/Schema/TypedConfigInterface.php
@@ -24,7 +24,7 @@ interface TypedConfigInterface extends TraversableTypedDataInterface {
   /**
    * Determines whether the data structure is empty.
    *
-   * @return boolean
+   * @return bool
    *   TRUE if the data structure is empty, FALSE otherwise.
    */
   public function isEmpty();
diff --git a/core/lib/Drupal/Core/Config/StorableConfigBase.php b/core/lib/Drupal/Core/Config/StorableConfigBase.php
index 92abc28ee..a0ad7a2b2 100644
--- a/core/lib/Drupal/Core/Config/StorableConfigBase.php
+++ b/core/lib/Drupal/Core/Config/StorableConfigBase.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\Core\Config;
 
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Config\Schema\Ignore;
 use Drupal\Core\TypedData\PrimitiveInterface;
 use Drupal\Core\TypedData\Type\FloatInterface;
@@ -163,10 +162,7 @@ abstract class StorableConfigBase extends ConfigBase {
       }
     }
     elseif ($value !== NULL && !is_scalar($value)) {
-      throw new UnsupportedDataTypeConfigException(SafeMarkup::format('Invalid data type for config element @name:@key', array(
-        '@name' => $this->getName(),
-        '@key' => $key,
-      )));
+      throw new UnsupportedDataTypeConfigException("Invalid data type for config element {$this->getName()}:$key");
     }
   }
 
@@ -213,10 +209,7 @@ abstract class StorableConfigBase extends ConfigBase {
     else {
       // Throw exception on any non-scalar or non-array value.
       if (!is_array($value)) {
-        throw new UnsupportedDataTypeConfigException(SafeMarkup::format('Invalid data type for config element @name:@key', array(
-          '@name' => $this->getName(),
-          '@key' => $key,
-        )));
+        throw new UnsupportedDataTypeConfigException("Invalid data type for config element {$this->getName()}:$key");
       }
       // Recurse into any nested keys.
       foreach ($value as $nested_value_key => $nested_value) {
diff --git a/core/lib/Drupal/Core/Config/StorageComparer.php b/core/lib/Drupal/Core/Config/StorageComparer.php
index 2e61f96ce..a3fa7ee42 100644
--- a/core/lib/Drupal/Core/Config/StorageComparer.php
+++ b/core/lib/Drupal/Core/Config/StorageComparer.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\Core\Config;
 
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Cache\MemoryBackend;
 use Drupal\Core\Config\Entity\ConfigDependencyManager;
 use Drupal\Core\DependencyInjection\DependencySerializationTrait;
@@ -196,7 +195,7 @@ class StorageComparer implements StorageComparerInterface {
       // ensure the array is keyed from 0.
       $this->changelist[$collection][$op] = array_values(array_intersect($sort_order, $this->changelist[$collection][$op]));
       if ($count != count($this->changelist[$collection][$op])) {
-        throw new \InvalidArgumentException(SafeMarkup::format('Sorting the @op changelist should not change its length.', array('@op' => $op)));
+        throw new \InvalidArgumentException("Sorting the $op changelist should not change its length.");
       }
     }
   }
diff --git a/core/lib/Drupal/Core/Config/StorageInterface.php b/core/lib/Drupal/Core/Config/StorageInterface.php
index bf22864d8..3d41be840 100644
--- a/core/lib/Drupal/Core/Config/StorageInterface.php
+++ b/core/lib/Drupal/Core/Config/StorageInterface.php
@@ -156,7 +156,7 @@ interface StorageInterface {
    *   (optional) The prefix to search for. If omitted, all configuration
    *   objects that exist will be deleted.
    *
-   * @return boolean
+   * @return bool
    *   TRUE on success, FALSE otherwise.
    */
   public function deleteAll($prefix = '');
diff --git a/core/lib/Drupal/Core/Config/Testing/ConfigSchemaChecker.php b/core/lib/Drupal/Core/Config/Testing/ConfigSchemaChecker.php
index 5e4fe5769..06c836a76 100644
--- a/core/lib/Drupal/Core/Config/Testing/ConfigSchemaChecker.php
+++ b/core/lib/Drupal/Core/Config/Testing/ConfigSchemaChecker.php
@@ -88,14 +88,14 @@ class ConfigSchemaChecker implements EventSubscriberInterface {
       $this->checked[$name . ':' . $checksum] = TRUE;
       $errors = $this->checkConfigSchema($this->typedManager, $name, $data);
       if ($errors === FALSE) {
-        throw new SchemaIncompleteException(SafeMarkup::format('No schema for @config_name', array('@config_name' => $name)));
+        throw new SchemaIncompleteException("No schema for $name");
       }
       elseif (is_array($errors)) {
         $text_errors = [];
         foreach ($errors as $key => $error) {
           $text_errors[] = SafeMarkup::format('@key @error', array('@key' => $key, '@error' => $error));
         }
-        throw new SchemaIncompleteException(SafeMarkup::format('Schema errors for @config_name with the following errors: @errors', array('@config_name' => $name, '@errors' => implode(', ', $text_errors))));
+        throw new SchemaIncompleteException("Schema errors for $name with the following errors: " . implode(', ', $text_errors));
       }
     }
   }
diff --git a/core/lib/Drupal/Core/Config/TypedConfigManager.php b/core/lib/Drupal/Core/Config/TypedConfigManager.php
index c8f467ca7..500fc3cfd 100644
--- a/core/lib/Drupal/Core/Config/TypedConfigManager.php
+++ b/core/lib/Drupal/Core/Config/TypedConfigManager.php
@@ -8,7 +8,6 @@
 namespace Drupal\Core\Config;
 
 use Drupal\Component\Utility\NestedArray;
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\Config\Schema\ArrayElement;
 use Drupal\Core\Config\Schema\ConfigSchemaAlterException;
@@ -17,7 +16,7 @@ use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\TypedData\TypedDataManager;
 
 /**
- * Manages config type plugins.
+ * Manages config schema type plugins.
  */
 class TypedConfigManager extends TypedDataManager implements TypedConfigManagerInterface {
 
@@ -324,18 +323,18 @@ class TypedConfigManager extends TypedDataManager implements TypedConfigManagerI
     parent::alterDefinitions($definitions);
     $altered_schema = array_keys($definitions);
     if ($discovered_schema != $altered_schema) {
-      $added_keys = array_diff($altered_schema, $discovered_schema);
-      $removed_keys = array_diff($discovered_schema, $altered_schema);
+      $added_keys = implode(',', array_diff($altered_schema, $discovered_schema));
+      $removed_keys = implode(',', array_diff($discovered_schema, $altered_schema));
       if (!empty($added_keys) && !empty($removed_keys)) {
-        $message = 'Invoking hook_config_schema_info_alter() has added (@added) and removed (@removed) schema definitions';
+        $message = "Invoking hook_config_schema_info_alter() has added ($added_keys) and removed ($removed_keys) schema definitions";
       }
       elseif (!empty($added_keys)) {
-        $message = 'Invoking hook_config_schema_info_alter() has added (@added) schema definitions';
+        $message = "Invoking hook_config_schema_info_alter() has added ($added_keys) schema definitions";
       }
       else {
-        $message = 'Invoking hook_config_schema_info_alter() has removed (@removed) schema definitions';
+        $message = "Invoking hook_config_schema_info_alter() has removed ($removed_keys) schema definitions";
       }
-      throw new ConfigSchemaAlterException(SafeMarkup::format($message, ['@added' => implode(',', $added_keys), '@removed' => implode(',', $removed_keys)]));
+      throw new ConfigSchemaAlterException($message);
     }
   }
 
diff --git a/core/lib/Drupal/Core/Config/TypedConfigManagerInterface.php b/core/lib/Drupal/Core/Config/TypedConfigManagerInterface.php
index 0b793bd5f..11c375109 100644
--- a/core/lib/Drupal/Core/Config/TypedConfigManagerInterface.php
+++ b/core/lib/Drupal/Core/Config/TypedConfigManagerInterface.php
@@ -12,9 +12,12 @@ use Drupal\Component\Plugin\PluginManagerInterface;
 use Drupal\Core\TypedData\DataDefinitionInterface;
 
 /**
- * Defines an interface for typed configuration manager.
+ * Defines an interface for managing config schema type plugins.
  *
- * @package Drupal\Core\Config
+ * @see \Drupal\Core\Config\TypedConfigManager
+ * @see \Drupal\Core\Config\Schema\ConfigSchemaDiscovery
+ * @see hook_config_schema_info_alter()
+ * @see https://www.drupal.org/node/1905070
  */
 Interface TypedConfigManagerInterface extends PluginManagerInterface, CachedDiscoveryInterface {
 
diff --git a/core/lib/Drupal/Core/ContentNegotiation.php b/core/lib/Drupal/Core/ContentNegotiation.php
index 8aa7e4848..10237ab8f 100644
--- a/core/lib/Drupal/Core/ContentNegotiation.php
+++ b/core/lib/Drupal/Core/ContentNegotiation.php
@@ -37,10 +37,6 @@ class ContentNegotiation {
       return $request->query->get('_format');
     }
 
-    if ($request->isXmlHttpRequest()) {
-      return 'ajax';
-    }
-
     // Do HTML last so that it always wins.
     return 'html';
   }
diff --git a/core/lib/Drupal/Core/CoreServiceProvider.php b/core/lib/Drupal/Core/CoreServiceProvider.php
index bce1603b3..7e02c80cc 100644
--- a/core/lib/Drupal/Core/CoreServiceProvider.php
+++ b/core/lib/Drupal/Core/CoreServiceProvider.php
@@ -10,6 +10,9 @@ namespace Drupal\Core;
 use Drupal\Core\Cache\Context\CacheContextsPass;
 use Drupal\Core\Cache\ListCacheBinsPass;
 use Drupal\Core\DependencyInjection\Compiler\BackendCompilerPass;
+use Drupal\Core\DependencyInjection\Compiler\GuzzleMiddlewarePass;
+use Drupal\Core\DependencyInjection\Compiler\ContextProvidersPass;
+use Drupal\Core\DependencyInjection\Compiler\ProxyServicesPass;
 use Drupal\Core\DependencyInjection\Compiler\RegisterLazyRouteEnhancers;
 use Drupal\Core\DependencyInjection\Compiler\RegisterLazyRouteFilters;
 use Drupal\Core\DependencyInjection\Compiler\DependencySerializationTraitPass;
@@ -60,6 +63,8 @@ class CoreServiceProvider implements ServiceProviderInterface  {
     // list-building passes are operating on the post-alter services list.
     $container->addCompilerPass(new ModifyServiceDefinitionsPass());
 
+    $container->addCompilerPass(new ProxyServicesPass());
+
     $container->addCompilerPass(new BackendCompilerPass());
 
     $container->addCompilerPass(new StackedKernelPass());
@@ -71,6 +76,7 @@ class CoreServiceProvider implements ServiceProviderInterface  {
     // Collect tagged handler services as method calls on consumer services.
     $container->addCompilerPass(new TaggedHandlersPass());
     $container->addCompilerPass(new RegisterStreamWrappersPass());
+    $container->addCompilerPass(new GuzzleMiddlewarePass());
 
     // Add a compiler pass for registering event subscribers.
     $container->addCompilerPass(new RegisterKernelListenersPass(), PassConfig::TYPE_AFTER_REMOVING);
@@ -85,6 +91,7 @@ class CoreServiceProvider implements ServiceProviderInterface  {
     // Add the compiler pass that will process the tagged services.
     $container->addCompilerPass(new ListCacheBinsPass());
     $container->addCompilerPass(new CacheContextsPass());
+    $container->addCompilerPass(new ContextProvidersPass());
 
     // Register plugin managers.
     $container->addCompilerPass(new PluginManagerPass());
@@ -127,10 +134,10 @@ class CoreServiceProvider implements ServiceProviderInterface  {
     if (!drupal_valid_test_ua()) {
       return;
     }
-    // Add the HTTP request subscriber to Guzzle.
+    // Add the HTTP request middleware to Guzzle.
     $container
-      ->register('test.http_client.request_subscriber', 'Drupal\Core\Test\EventSubscriber\HttpRequestSubscriber')
-      ->addTag('http_client_subscriber');
+      ->register('test.http_client.middleware', 'Drupal\Core\Test\HttpClientMiddleware\TestHttpClientMiddleware')
+      ->addTag('http_client_middleware');
   }
 
 }
diff --git a/core/lib/Drupal/Core/CronInterface.php b/core/lib/Drupal/Core/CronInterface.php
index ed4828afe..57374db40 100644
--- a/core/lib/Drupal/Core/CronInterface.php
+++ b/core/lib/Drupal/Core/CronInterface.php
@@ -9,6 +9,8 @@ namespace Drupal\Core;
 
 /**
  * An interface for running cron tasks.
+ *
+ * @see https://www.drupal.org/cron
  */
 interface CronInterface {
 
diff --git a/core/lib/Drupal/Core/Database/Connection.php b/core/lib/Drupal/Core/Database/Connection.php
index 7c4240202..33d033744 100644
--- a/core/lib/Drupal/Core/Database/Connection.php
+++ b/core/lib/Drupal/Core/Database/Connection.php
@@ -24,7 +24,7 @@ abstract class Connection {
    *
    * We need this information for later auditing and logging.
    *
-   * @var string
+   * @var string|null
    */
   protected $target = NULL;
 
@@ -35,14 +35,14 @@ abstract class Connection {
    * connection can be a single server or a cluster of primary and replicas
    * (use target to pick between primary and replica).
    *
-   * @var string
+   * @var string|null
    */
   protected $key = NULL;
 
   /**
    * The current database logging object for this connection.
    *
-   * @var Log
+   * @var \Drupal\Core\Database\Log|null
    */
   protected $logger = NULL;
 
@@ -111,7 +111,9 @@ abstract class Connection {
   /**
    * The schema object for this connection.
    *
-   * @var object
+   * Set to NULL when the schema is destroyed.
+   *
+   * @var \Drupal\Core\Database\Schema|null
    */
   protected $schema = NULL;
 
@@ -138,6 +140,14 @@ abstract class Connection {
 
   /**
    * Constructs a Connection object.
+   *
+   * @param \PDO $connection
+   *   An object of the PDO class representing a database connection.
+   * @param array $connection_options
+   *   An array of options for the connection. May include the following:
+   *   - prefix
+   *   - namespace
+   *   - Other driver-specific options.
    */
   public function __construct(\PDO $connection, array $connection_options) {
     // Initialize and prepare the connection prefix.
@@ -221,7 +231,7 @@ abstract class Connection {
    *   that behavior and simply return NULL on failure, set this option to
    *   FALSE.
    *
-   * @return
+   * @return array
    *   An array of default query options.
    */
   protected function defaultOptions() {
@@ -241,7 +251,7 @@ abstract class Connection {
    * is for requesting the connection information of this specific
    * open connection object.
    *
-   * @return
+   * @return array
    *   An array of the connection information. The exact list of
    *   properties is driver-dependent.
    */
@@ -252,9 +262,9 @@ abstract class Connection {
   /**
    * Set the list of prefixes used by this database connection.
    *
-   * @param $prefix
-   *   The prefixes, in any of the multiple forms documented in
-   *   default.settings.php.
+   * @param array|string $prefix
+   *   Either a single prefix, or an array of prefixes, in any of the multiple
+   *   forms documented in default.settings.php.
    */
   protected function setPrefix($prefix) {
     if (is_array($prefix)) {
@@ -289,10 +299,10 @@ abstract class Connection {
    * tables, allowing Drupal to coexist with other systems in the same database
    * and/or schema if necessary.
    *
-   * @param $sql
+   * @param string $sql
    *   A string containing a partial or entire SQL query.
    *
-   * @return
+   * @return string
    *   The properly-prefixed string.
    */
   public function prefixTables($sql) {
@@ -304,6 +314,9 @@ abstract class Connection {
    *
    * This function is for when you want to know the prefix of a table. This
    * is not used in prefixTables due to performance reasons.
+   *
+   * @param string $table
+   *   (optional) The table to find the prefix for.
    */
   public function tablePrefix($table = 'default') {
     if (isset($this->prefixes[$table])) {
@@ -355,9 +368,8 @@ abstract class Connection {
    * signature. We therefore also ensure that this function is only ever
    * called once.
    *
-   * @param $target
-   *   The target this connection is for. Set to NULL (default) to disable
-   *   logging entirely.
+   * @param string $target
+   *   (optional) The target this connection is for.
    */
   public function setTarget($target = NULL) {
     if (!isset($this->target)) {
@@ -368,8 +380,8 @@ abstract class Connection {
   /**
    * Returns the target this connection is associated with.
    *
-   * @return
-   *   The target string of this connection.
+   * @return string|null
+   *   The target string of this connection, or NULL if no target is set.
    */
   public function getTarget() {
     return $this->target;
@@ -378,7 +390,7 @@ abstract class Connection {
   /**
    * Tells this connection object what its key is.
    *
-   * @param $target
+   * @param string $key
    *   The key this connection is for.
    */
   public function setKey($key) {
@@ -390,8 +402,8 @@ abstract class Connection {
   /**
    * Returns the key this connection is associated with.
    *
-   * @return
-   *   The key of this connection.
+   * @return string|null
+   *   The key of this connection, or NULL if no key is set.
    */
   public function getKey() {
     return $this->key;
@@ -400,7 +412,7 @@ abstract class Connection {
   /**
    * Associates a logging object with this connection.
    *
-   * @param $logger
+   * @param \Drupal\Core\Database\Log $logger
    *   The logging object we want to use.
    */
   public function setLogger(Log $logger) {
@@ -410,7 +422,7 @@ abstract class Connection {
   /**
    * Gets the current logging object for this connection.
    *
-   * @return \Drupal\Core\Database\Log
+   * @return \Drupal\Core\Database\Log|null
    *   The current logging object for this connection. If there isn't one,
    *   NULL is returned.
    */
@@ -424,12 +436,12 @@ abstract class Connection {
    * This information is exposed to all database drivers, although it is only
    * useful on some of them. This method is table prefix-aware.
    *
-   * @param $table
+   * @param string $table
    *   The table name to use for the sequence.
-   * @param $field
+   * @param string $field
    *   The field name to use for the sequence.
    *
-   * @return
+   * @return string
    *   A table prefix-parsed string for the sequence name.
    */
   public function makeSequenceName($table, $field) {
@@ -441,10 +453,10 @@ abstract class Connection {
    *
    * The comment string will be sanitized to avoid SQL injection attacks.
    *
-   * @param $comments
+   * @param string[] $comments
    *   An array of query comment strings.
    *
-   * @return
+   * @return string
    *   A sanitized comment string.
    */
   public function makeComment($comments) {
@@ -483,10 +495,10 @@ abstract class Connection {
    * Unless the comment is sanitised first, the SQL server would drop the
    * node table and ignore the rest of the SQL statement.
    *
-   * @param $comment
+   * @param string $comment
    *   A query comment string.
    *
-   * @return
+   * @return string
    *   A sanitized version of the query comment string.
    */
   protected function filterComment($comment = '') {
@@ -500,7 +512,7 @@ abstract class Connection {
    * query. All queries executed by Drupal are executed as PDO prepared
    * statements.
    *
-   * @param $query
+   * @param string|\Drupal\Core\Database\StatementInterface $query
    *   The query to execute. In most cases this will be a string containing
    *   an SQL query with placeholders. An already-prepared instance of
    *   StatementInterface may also be passed in order to allow calling
@@ -509,26 +521,36 @@ abstract class Connection {
    *   It is extremely rare that module code will need to pass a statement
    *   object to this method. It is used primarily for database drivers for
    *   databases that require special LOB field handling.
-   * @param $args
+   * @param array $args
    *   An array of arguments for the prepared statement. If the prepared
    *   statement uses ? placeholders, this array must be an indexed array.
    *   If it contains named placeholders, it must be an associative array.
-   * @param $options
-   *   An associative array of options to control how the query is run. See
-   *   the documentation for DatabaseConnection::defaultOptions() for details.
+   * @param array $options
+   *   An associative array of options to control how the query is run. The
+   *   given options will be merged with self::defaultOptions(). See the
+   *   documentation for self::defaultOptions() for details.
+   *   Typically, $options['return'] will be set by a default or by a query
+   *   builder, and should not be set by a user.
    *
    * @return \Drupal\Core\Database\StatementInterface|int|null
-   *   This method will return one of: the executed statement, the number of
-   *   rows affected by the query (not the number matched), or the generated
-   *   insert ID of the last query, depending on the value of
-   *   $options['return']. Typically that value will be set by default or a
-   *   query builder and should not be set by a user. If there is an error,
-   *   this method will return NULL and may throw an exception if
-   *   $options['throw_exception'] is TRUE.
+   *   This method will return one of the following:
+   *   - If either $options['return'] === self::RETURN_STATEMENT, or
+   *     $options['return'] is not set (due to self::defaultOptions()),
+   *     returns the executed statement.
+   *   - If $options['return'] === self::RETURN_AFFECTED,
+   *     returns the number of rows affected by the query
+   *     (not the number matched).
+   *   - If $options['return'] === self::RETURN_INSERT_ID,
+   *     returns the generated insert ID of the last query.
+   *   - If either $options['return'] === self::RETURN_NULL, or
+   *     an exception occurs and $options['throw_exception'] evaluates to FALSE,
+   *     returns NULL.
    *
    * @throws \Drupal\Core\Database\DatabaseExceptionWrapper
    * @throws \Drupal\Core\Database\IntegrityConstraintViolationException
    * @throws \InvalidArgumentException
+   *
+   * @see \Drupal\Core\Database\Connection::defaultOptions()
    */
   public function query($query, array $args = array(), $options = array()) {
     // Use default values if not already set.
@@ -628,6 +650,13 @@ abstract class Connection {
    *
    * @return bool
    *   TRUE if the query was modified, FALSE otherwise.
+   *
+   * @throws \InvalidArgumentException
+   *   This exception is thrown when:
+   *   - A placeholder that ends in [] is supplied, and the supplied value is
+   *     not an array.
+   *   - A placeholder that does not end in [] is supplied, and the supplied
+   *     value is an array.
    */
   protected function expandArguments(&$query, &$args) {
     $modified = FALSE;
@@ -700,12 +729,12 @@ abstract class Connection {
   /**
    * Prepares and returns a SELECT query object.
    *
-   * @param $table
+   * @param string $table
    *   The base table for this query, that is, the first table in the FROM
    *   clause. This table will also be used as the "base" table for query_alter
    *   hook implementations.
-   * @param $alias
-   *   The alias of the base table of this query.
+   * @param string $alias
+   *   (optional) The alias of the base table of this query.
    * @param $options
    *   An array of options on the query.
    *
@@ -724,8 +753,10 @@ abstract class Connection {
   /**
    * Prepares and returns an INSERT query object.
    *
-   * @param $options
-   *   An array of options on the query.
+   * @param string $table
+   *   The table to use for the insert statement.
+   * @param array $options
+   *   (optional) An array of options on the query.
    *
    * @return \Drupal\Core\Database\Query\Insert
    *   A new Insert query object.
@@ -740,8 +771,10 @@ abstract class Connection {
   /**
    * Prepares and returns a MERGE query object.
    *
-   * @param $options
-   *   An array of options on the query.
+   * @param string $table
+   *   The table to use for the merge statement.
+   * @param array $options
+   *   (optional) An array of options on the query.
    *
    * @return \Drupal\Core\Database\Query\Merge
    *   A new Merge query object.
@@ -757,8 +790,10 @@ abstract class Connection {
   /**
    * Prepares and returns an UPDATE query object.
    *
-   * @param $options
-   *   An array of options on the query.
+   * @param string $table
+   *   The table to use for the update statement.
+   * @param array $options
+   *   (optional) An array of options on the query.
    *
    * @return \Drupal\Core\Database\Query\Update
    *   A new Update query object.
@@ -773,8 +808,10 @@ abstract class Connection {
   /**
    * Prepares and returns a DELETE query object.
    *
-   * @param $options
-   *   An array of options on the query.
+   * @param string $table
+   *   The table to use for the delete statement.
+   * @param array $options
+   *   (optional) An array of options on the query.
    *
    * @return \Drupal\Core\Database\Query\Delete
    *   A new Delete query object.
@@ -789,8 +826,10 @@ abstract class Connection {
   /**
    * Prepares and returns a TRUNCATE query object.
    *
-   * @param $options
-   *   An array of options on the query.
+   * @param string $table
+   *   The table to use for the truncate statement.
+   * @param array $options
+   *   (optional) An array of options on the query.
    *
    * @return \Drupal\Core\Database\Query\Truncate
    *   A new Truncate query object.
@@ -825,8 +864,11 @@ abstract class Connection {
    * For some database drivers, it may also wrap the database name in
    * database-specific escape characters.
    *
+   * @param string $database
+   *   An unsanitized database name.
+   *
    * @return string
-   *   The sanitized database name string.
+   *   The sanitized database name.
    */
   public function escapeDatabase($database) {
     return preg_replace('/[^A-Za-z0-9_.]+/', '', $database);
@@ -839,8 +881,11 @@ abstract class Connection {
    * For some database drivers, it may also wrap the table name in
    * database-specific escape characters.
    *
-   * @return
-   *   The sanitized table name string.
+   * @param string $table
+   *   An unsanitized table name.
+   *
+   * @return string
+   *   The sanitized table name.
    */
   public function escapeTable($table) {
     return preg_replace('/[^A-Za-z0-9_.]+/', '', $table);
@@ -853,8 +898,11 @@ abstract class Connection {
    * For some database drivers, it may also wrap the field name in
    * database-specific escape characters.
    *
-   * @return
-   *   The sanitized field name string.
+   * @param string $field
+   *   An unsanitized field name.
+   *
+   * @return string
+   *   The sanitized field name.
    */
   public function escapeField($field) {
     return preg_replace('/[^A-Za-z0-9_.]+/', '', $field);
@@ -868,8 +916,11 @@ abstract class Connection {
    * DatabaseConnection::escapeTable(), this doesn't allow the period (".")
    * because that is not allowed in aliases.
    *
-   * @return
-   *   The sanitized field name string.
+   * @param string $field
+   *   An unsanitized alias name.
+   *
+   * @return string
+   *   The sanitized alias name.
    */
   public function escapeAlias($field) {
     return preg_replace('/[^A-Za-z0-9_]+/', '', $field);
@@ -894,10 +945,10 @@ abstract class Connection {
    * Backslash is defined as escape character for LIKE patterns in
    * Drupal\Core\Database\Query\Condition::mapConditionOperator().
    *
-   * @param $string
+   * @param string $string
    *   The string to escape.
    *
-   * @return
+   * @return string
    *   The escaped string.
    */
   public function escapeLike($string) {
@@ -907,7 +958,7 @@ abstract class Connection {
   /**
    * Determines if there is an active transaction open.
    *
-   * @return
+   * @return bool
    *   TRUE if we're currently in a transaction, FALSE otherwise.
    */
   public function inTransaction() {
@@ -915,7 +966,10 @@ abstract class Connection {
   }
 
   /**
-   * Determines current transaction depth.
+   * Determines the current transaction depth.
+   *
+   * @return int
+   *   The current transaction depth.
    */
   public function transactionDepth() {
     return count($this->transactionLayers);
@@ -924,8 +978,8 @@ abstract class Connection {
   /**
    * Returns a new DatabaseTransaction object on this connection.
    *
-   * @param $name
-   *   Optional name of the savepoint.
+   * @param string $name
+   *   (optional) The name of the savepoint.
    *
    * @return \Drupal\Core\Database\Transaction
    *   A Transaction object.
@@ -942,10 +996,11 @@ abstract class Connection {
    *
    * This method throws an exception if no transaction is active.
    *
-   * @param $savepoint_name
-   *   The name of the savepoint. The default, 'drupal_transaction', will roll
-   *   the entire transaction back.
+   * @param string $savepoint_name
+   *   (optional) The name of the savepoint. The default, 'drupal_transaction',
+   *    will roll the entire transaction back.
    *
+   * @throws \Drupal\Core\Database\TransactionOutOfOrderException
    * @throws \Drupal\Core\Database\TransactionNoActiveException
    *
    * @see \Drupal\Core\Database\Transaction::rollback()
@@ -997,6 +1052,9 @@ abstract class Connection {
    *
    * If no transaction is already active, we begin a new transaction.
    *
+   * @param string $name
+   *   The name of the transaction.
+   *
    * @throws \Drupal\Core\Database\TransactionNameNonUniqueException
    *
    * @see \Drupal\Core\Database\Transaction
@@ -1026,8 +1084,8 @@ abstract class Connection {
    * back the transaction as necessary. If no transaction is active, we return
    * because the transaction may have manually been rolled back.
    *
-   * @param $name
-   *   The name of the savepoint
+   * @param string $name
+   *   The name of the savepoint.
    *
    * @throws \Drupal\Core\Database\TransactionNoActiveException
    * @throws \Drupal\Core\Database\TransactionCommitFailedException
@@ -1083,16 +1141,17 @@ abstract class Connection {
    * separate parameters so that they can be properly escaped to avoid SQL
    * injection attacks.
    *
-   * @param $query
+   * @param string $query
    *   A string containing an SQL query.
-   * @param $args
-   *   An array of values to substitute into the query at placeholder markers.
-   * @param $from
+   * @param int $from
    *   The first result row to return.
-   * @param $count
+   * @param int $count
    *   The maximum number of result rows to return.
-   * @param $options
-   *   An array of options on the query.
+   * @param array $args
+   *   (optional) An array of values to substitute into the query at placeholder
+   *    markers.
+   * @param array $options
+   *   (optional) An array of options on the query.
    *
    * @return \Drupal\Core\Database\StatementInterface
    *   A database query result resource, or NULL if the query was not executed
@@ -1103,7 +1162,7 @@ abstract class Connection {
   /**
    * Generates a temporary table name.
    *
-   * @return
+   * @return string
    *   A table name.
    */
   protected function generateTemporaryTableName() {
@@ -1122,15 +1181,17 @@ abstract class Connection {
    * Note that if you need to know how many results were returned, you should do
    * a SELECT COUNT(*) on the temporary table afterwards.
    *
-   * @param $query
+   * @param string $query
    *   A string containing a normal SELECT SQL query.
-   * @param $args
-   *   An array of values to substitute into the query at placeholder markers.
-   * @param $options
-   *   An associative array of options to control how the query is run. See
-   *   the documentation for DatabaseConnection::defaultOptions() for details.
+   * @param array $args
+   *   (optional) An array of values to substitute into the query at placeholder
+   *   markers.
+   * @param array $options
+   *   (optional) An associative array of options to control how the query is
+   *   run. See the documentation for DatabaseConnection::defaultOptions() for
+   *   details.
    *
-   * @return
+   * @return string
    *   The name of the temporary table.
    */
   abstract function queryTemporary($query, array $args = array(), array $options = array());
@@ -1142,6 +1203,9 @@ abstract class Connection {
    * instance, there could be two MySQL drivers, mysql and mysql_mock. This
    * function would return different values for each, but both would return
    * "mysql" for databaseType().
+   *
+   * @return string
+   *   The type of database driver.
    */
   abstract public function driver();
 
@@ -1155,7 +1219,7 @@ abstract class Connection {
   /**
    * Determines if this driver supports transactions.
    *
-   * @return
+   * @return bool
    *   TRUE if this connection supports transactions, FALSE otherwise.
    */
   public function supportsTransactions() {
@@ -1167,7 +1231,7 @@ abstract class Connection {
    *
    * DDL queries are those that change the schema, such as ALTER queries.
    *
-   * @return
+   * @return bool
    *   TRUE if this connection supports transactions for DDL queries, FALSE
    *   otherwise.
    */
@@ -1199,7 +1263,7 @@ abstract class Connection {
    * overridable lookup function. Database connections should define only
    * those operators they wish to be handled differently than the default.
    *
-   * @param $operator
+   * @param string $operator
    *   The condition operator, such as "IN", "BETWEEN", etc. Case-sensitive.
    *
    * @return
@@ -1226,7 +1290,7 @@ abstract class Connection {
   }
 
   /**
-   * Retrieves an unique id from a given sequence.
+   * Retrieves an unique ID from a given sequence.
    *
    * Use this function if for some reason you can't use a serial field. For
    * example, MySQL has no ways of reading of the current value of a sequence
@@ -1234,9 +1298,9 @@ abstract class Connection {
    * value. Or sometimes you just need a unique integer.
    *
    * @param $existing_id
-   *   After a database import, it might be that the sequences table is behind,
-   *   so by passing in the maximum existing id, it can be assured that we
-   *   never issue the same id.
+   *   (optional) After a database import, it might be that the sequences table
+   *   is behind, so by passing in the maximum existing ID, it can be assured
+   *   that we never issue the same ID.
    *
    * @return
    *   An integer number larger than any number returned by earlier calls and
diff --git a/core/lib/Drupal/Core/Database/Driver/mysql/Connection.php b/core/lib/Drupal/Core/Database/Driver/mysql/Connection.php
index e6c16bb4e..4bc3c29e0 100644
--- a/core/lib/Drupal/Core/Database/Driver/mysql/Connection.php
+++ b/core/lib/Drupal/Core/Database/Driver/mysql/Connection.php
@@ -14,6 +14,7 @@ use Drupal\Core\Database\DatabaseNotFoundException;
 use Drupal\Core\Database\TransactionCommitFailedException;
 use Drupal\Core\Database\DatabaseException;
 use Drupal\Core\Database\Connection as DatabaseConnection;
+use Drupal\Component\Utility\Unicode;
 
 /**
  * @addtogroup database
@@ -34,6 +35,16 @@ class Connection extends DatabaseConnection {
    */
   protected $needsCleanup = FALSE;
 
+  /**
+   * The minimal possible value for the max_allowed_packet setting of MySQL.
+   *
+   * @link https://mariadb.com/kb/en/mariadb/server-system-variables/#max_allowed_packet
+   * @link https://dev.mysql.com/doc/refman/5.7/en/server-system-variables.html#sysvar_max_allowed_packet
+   *
+   * @var int
+   */
+  const MIN_MAX_ALLOWED_PACKET = 1024;
+
   /**
    * Constructs a Connection object.
    */
@@ -49,6 +60,24 @@ class Connection extends DatabaseConnection {
     $this->connectionOptions = $connection_options;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function query($query, array $args = array(), $options = array()) {
+    try {
+      return parent::query($query, $args, $options);
+    } catch (DatabaseException $e) {
+      if ($e->getPrevious()->errorInfo[1] == 1153) {
+        // If a max_allowed_packet error occurs the message length is truncated.
+        // This should prevent the error from recurring if the exception is
+        // logged to the database using dblog or the like.
+        $message = Unicode::truncateBytes($e->getMessage(), self::MIN_MAX_ALLOWED_PACKET);
+        $e = new DatabaseExceptionWrapper($message, $e->getCode(), $e->getPrevious());
+      }
+      throw $e;
+    }
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -278,6 +307,7 @@ class Connection extends DatabaseConnection {
       }
     }
   }
+
 }
 
 
diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php
index d5a5d2a07..ac0184b21 100644
--- a/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php
+++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php
@@ -31,6 +31,27 @@ class Connection extends DatabaseConnection {
    */
   const DATABASE_NOT_FOUND = 7;
 
+  /**
+   * The list of PostgreSQL reserved key words.
+   *
+   * @see http://www.postgresql.org/docs/9.4/static/sql-keywords-appendix.html
+   */
+  protected $postgresqlReservedKeyWords = ['all', 'analyse', 'analyze', 'and',
+  'any', 'array', 'as', 'asc', 'asymmetric', 'authorization', 'binary', 'both',
+  'case', 'cast', 'check', 'collate', 'collation', 'column', 'concurrently',
+  'constraint', 'create', 'cross', 'current_catalog', 'current_date',
+  'current_role', 'current_schema', 'current_time', 'current_timestamp',
+  'current_user', 'default', 'deferrable', 'desc', 'distinct', 'do', 'else',
+  'end', 'except', 'false', 'fetch', 'for', 'foreign', 'freeze', 'from', 'full',
+  'grant', 'group', 'having', 'ilike', 'in', 'initially', 'inner', 'intersect',
+  'into', 'is', 'isnull', 'join', 'lateral', 'leading', 'left', 'like', 'limit',
+  'localtime', 'localtimestamp', 'natural', 'not', 'notnull', 'null', 'offset',
+  'on', 'only', 'or', 'order', 'outer', 'over', 'overlaps', 'placing',
+  'primary', 'references', 'returning', 'right', 'select', 'session_user',
+  'similar', 'some', 'symmetric', 'table', 'then', 'to', 'trailing', 'true',
+  'union', 'unique', 'user', 'using', 'variadic', 'verbose', 'when', 'where',
+  'window', 'with'];
+
   /**
    * Constructs a connection object.
    */
@@ -167,6 +188,10 @@ class Connection extends DatabaseConnection {
       // Quote the field name for case-sensitivity.
       $escaped = '"' . $escaped . '"';
     }
+    elseif (in_array(strtolower($escaped), $this->postgresqlReservedKeyWords)) {
+      // Quote the field name for PostgreSQL reserved key words.
+      $escaped = '"' . $escaped . '"';
+    }
 
     return $escaped;
   }
@@ -181,6 +206,10 @@ class Connection extends DatabaseConnection {
     if (preg_match('/[A-Z]/', $escaped)) {
       $escaped = '"' . $escaped . '"';
     }
+    elseif (in_array(strtolower($escaped), $this->postgresqlReservedKeyWords)) {
+      // Quote the alias name for PostgreSQL reserved key words.
+      $escaped = '"' . $escaped . '"';
+    }
 
     return $escaped;
   }
@@ -195,6 +224,10 @@ class Connection extends DatabaseConnection {
     if (preg_match('/[A-Z]/', $escaped)) {
       $escaped = '"' . $escaped . '"';
     }
+    elseif (in_array(strtolower($escaped), $this->postgresqlReservedKeyWords)) {
+      // Quote the table name for PostgreSQL reserved key words.
+      $escaped = '"' . $escaped . '"';
+    }
 
     return $escaped;
   }
diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Insert.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Insert.php
index f21aa7e95..7bffc9eac 100644
--- a/core/lib/Drupal/Core/Database/Driver/pgsql/Insert.php
+++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Insert.php
@@ -117,6 +117,8 @@ class Insert extends QueryInsert {
     // Default fields are always placed first for consistency.
     $insert_fields = array_merge($this->defaultFields, $this->insertFields);
 
+    $insert_fields = array_map(function($f) { return $this->connection->escapeField($f); }, $insert_fields);
+
     // If we're selecting from a SelectQuery, finish building the query and
     // pass it back, as any remaining options are irrelevant.
     if (!empty($this->fromQuery)) {
@@ -154,4 +156,5 @@ class Insert extends QueryInsert {
 
     return $query;
   }
+
 }
diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Install/Tasks.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Install/Tasks.php
index 83e036665..32f460c4e 100644
--- a/core/lib/Drupal/Core/Database/Driver/pgsql/Install/Tasks.php
+++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Install/Tasks.php
@@ -51,7 +51,7 @@ class Tasks extends InstallTasks {
    * {@inheritdoc}
    */
   public function minimumVersion() {
-    return '8.3';
+    return '9.1.2';
   }
 
   /**
diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php
index 561abee0b..e3062dd2d 100644
--- a/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php
+++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php
@@ -329,7 +329,7 @@ class Schema extends DatabaseSchema {
     }
 
     if (!empty($field['unsigned'])) {
-      // Unsigned datatypes are not supported in PostgreSQL 8.3. In MySQL,
+      // Unsigned datatypes are not supported in PostgreSQL 9.1. In MySQL,
       // they are used to ensure a positive number is inserted and it also
       // doubles the maximum integer size that can be stored in a field.
       // The PostgreSQL schema in Drupal creates a check constraint
@@ -569,7 +569,7 @@ class Schema extends DatabaseSchema {
   }
 
   public function indexExists($table, $name) {
-    // Details http://www.postgresql.org/docs/8.3/interactive/view-pg-indexes.html
+    // Details http://www.postgresql.org/docs/9.1/interactive/view-pg-indexes.html
     $index_name = $this->ensureIdentifiersLength($table, $name, 'idx');
     // Remove leading and trailing quotes because the index name is in a WHERE
     // clause and not used as an identifier.
diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Statement.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Statement.php
index 54e978d01..bfa494f73 100644
--- a/core/lib/Drupal/Core/Database/Driver/sqlite/Statement.php
+++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Statement.php
@@ -22,7 +22,7 @@ use Drupal\Core\Database\StatementInterface;
 class Statement extends StatementPrefetch implements StatementInterface {
 
   /**
-   * SQLite specific implementation of getStatement().
+   * {@inheritdoc}
    *
    * The PDO SQLite layer doesn't replace numeric placeholders in queries
    * correctly, and this makes numeric expressions (such as COUNT(*) >= :count)
@@ -87,6 +87,9 @@ class Statement extends StatementPrefetch implements StatementInterface {
     return $this->pdoConnection->prepare($query);
   }
 
+  /**
+   * {@inheritdoc}
+   */
   public function execute($args = array(), $options = array()) {
     try {
       $return = parent::execute($args, $options);
diff --git a/core/lib/Drupal/Core/Database/Query/Delete.php b/core/lib/Drupal/Core/Database/Query/Delete.php
index 08e7af120..1f59dd9a4 100644
--- a/core/lib/Drupal/Core/Database/Query/Delete.php
+++ b/core/lib/Drupal/Core/Database/Query/Delete.php
@@ -17,6 +17,8 @@ use Drupal\Core\Database\Connection;
  */
 class Delete extends Query implements ConditionInterface {
 
+  use QueryConditionTrait;
+
   /**
    * The table from which to delete.
    *
@@ -24,15 +26,6 @@ class Delete extends Query implements ConditionInterface {
    */
   protected $table;
 
-  /**
-   * The condition object for this query.
-   *
-   * Condition handling is handled via composition.
-   *
-   * @var Condition
-   */
-  protected $condition;
-
   /**
    * Constructs a Delete object.
    *
@@ -51,82 +44,6 @@ class Delete extends Query implements ConditionInterface {
     $this->condition = new Condition('AND');
   }
 
-  /**
-   * Implements Drupal\Core\Database\Query\ConditionInterface::condition().
-   */
-  public function condition($field, $value = NULL, $operator = '=') {
-    $this->condition->condition($field, $value, $operator);
-    return $this;
-  }
-
-  /**
-   * Implements Drupal\Core\Database\Query\ConditionInterface::isNull().
-   */
-  public function isNull($field) {
-    $this->condition->isNull($field);
-    return $this;
-  }
-
-  /**
-   * Implements Drupal\Core\Database\Query\ConditionInterface::isNotNull().
-   */
-  public function isNotNull($field) {
-    $this->condition->isNotNull($field);
-    return $this;
-  }
-
-  /**
-   * Implements Drupal\Core\Database\Query\ConditionInterface::exists().
-   */
-  public function exists(SelectInterface $select) {
-    $this->condition->exists($select);
-    return $this;
-  }
-
-  /**
-   * Implements Drupal\Core\Database\Query\ConditionInterface::notExists().
-   */
-  public function notExists(SelectInterface $select) {
-    $this->condition->notExists($select);
-    return $this;
-  }
-
-  /**
-   * Implements Drupal\Core\Database\Query\ConditionInterface::conditions().
-   */
-  public function &conditions() {
-    return $this->condition->conditions();
-  }
-
-  /**
-   * Implements Drupal\Core\Database\Query\ConditionInterface::arguments().
-   */
-  public function arguments() {
-    return $this->condition->arguments();
-  }
-
-  /**
-   * Implements Drupal\Core\Database\Query\ConditionInterface::where().
-   */
-  public function where($snippet, $args = array()) {
-    $this->condition->where($snippet, $args);
-    return $this;
-  }
-
-  /**
-   * Implements Drupal\Core\Database\Query\ConditionInterface::compile().
-   */
-  public function compile(Connection $connection, PlaceholderInterface $queryPlaceholder) {
-    return $this->condition->compile($connection, $queryPlaceholder);
-  }
-
-  /**
-   * Implements Drupal\Core\Database\Query\ConditionInterface::compiled().
-   */
-  public function compiled() {
-    return $this->condition->compiled();
-  }
-
   /**
    * Executes the DELETE query.
    *
diff --git a/core/lib/Drupal/Core/Database/Query/Merge.php b/core/lib/Drupal/Core/Database/Query/Merge.php
index 34f83788d..c292894c8 100644
--- a/core/lib/Drupal/Core/Database/Query/Merge.php
+++ b/core/lib/Drupal/Core/Database/Query/Merge.php
@@ -49,6 +49,9 @@ use Drupal\Core\Database\IntegrityConstraintViolationException;
  * fields() and updateFields().
  */
 class Merge extends Query implements ConditionInterface {
+
+  use QueryConditionTrait;
+
   /**
    * Returned by execute() if an INSERT query has been executed.
    */
@@ -339,82 +342,6 @@ class Merge extends Query implements ConditionInterface {
     return $this;
   }
 
-  /**
-   * Implements Drupal\Core\Database\Query\ConditionInterface::condition().
-   */
-  public function condition($field, $value = NULL, $operator = '=') {
-    $this->condition->condition($field, $value, $operator);
-    return $this;
-  }
-
-  /**
-   * Implements Drupal\Core\Database\Query\ConditionInterface::isNull().
-   */
-  public function isNull($field) {
-    $this->condition->isNull($field);
-    return $this;
-  }
-
-  /**
-   * Implements Drupal\Core\Database\Query\ConditionInterface::isNotNull().
-   */
-  public function isNotNull($field) {
-    $this->condition->isNotNull($field);
-    return $this;
-  }
-
-  /**
-   * Implements Drupal\Core\Database\Query\ConditionInterface::exists().
-   */
-  public function exists(SelectInterface $select) {
-    $this->condition->exists($select);
-    return $this;
-  }
-
-  /**
-   * Implements Drupal\Core\Database\Query\ConditionInterface::notExists().
-   */
-  public function notExists(SelectInterface $select) {
-    $this->condition->notExists($select);
-    return $this;
-  }
-
-  /**
-   * Implements Drupal\Core\Database\Query\ConditionInterface::conditions().
-   */
-  public function &conditions() {
-    return $this->condition->conditions();
-  }
-
-  /**
-   * Implements Drupal\Core\Database\Query\ConditionInterface::arguments().
-   */
-  public function arguments() {
-    return $this->condition->arguments();
-  }
-
-  /**
-   * Implements Drupal\Core\Database\Query\ConditionInterface::where().
-   */
-  public function where($snippet, $args = array()) {
-    $this->condition->where($snippet, $args);
-    return $this;
-  }
-
-  /**
-   * Implements Drupal\Core\Database\Query\ConditionInterface::compile().
-   */
-  public function compile(Connection $connection, PlaceholderInterface $queryPlaceholder) {
-    return $this->condition->compile($connection, $queryPlaceholder);
-  }
-
-  /**
-   * Implements Drupal\Core\Database\Query\ConditionInterface::compiled().
-   */
-  public function compiled() {
-    return $this->condition->compiled();
-  }
-
   /**
    * Implements PHP magic __toString method to convert the query to a string.
    *
diff --git a/core/lib/Drupal/Core/Database/Query/Query.php b/core/lib/Drupal/Core/Database/Query/Query.php
index 790ed5cb8..8dba91b22 100644
--- a/core/lib/Drupal/Core/Database/Query/Query.php
+++ b/core/lib/Drupal/Core/Database/Query/Query.php
@@ -180,25 +180,4 @@ abstract class Query implements PlaceholderInterface {
     return $this->comments;
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function conditionGroupFactory($conjunction = 'AND') {
-    return new Condition($conjunction);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function andConditionGroup() {
-    return $this->conditionGroupFactory('AND');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function orConditionGroup() {
-    return $this->conditionGroupFactory('OR');
-  }
-
 }
diff --git a/core/lib/Drupal/Core/Database/Query/QueryConditionTrait.php b/core/lib/Drupal/Core/Database/Query/QueryConditionTrait.php
new file mode 100644
index 000000000..d3f203417
--- /dev/null
+++ b/core/lib/Drupal/Core/Database/Query/QueryConditionTrait.php
@@ -0,0 +1,125 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Database\Query\QueryConditionTrait.
+ */
+
+namespace Drupal\Core\Database\Query;
+
+use Drupal\Core\Database\Connection;
+
+/**
+ * Provides an implementation of ConditionInterface.
+ *
+ * @see \Drupal\Core\Database\Query\ConditionInterface
+ */
+trait QueryConditionTrait {
+
+  /**
+   * The condition object for this query.
+   *
+   * Condition handling is handled via composition.
+   *
+   * @var \Drupal\Core\Database\Query\Condition
+   */
+  protected $condition;
+
+  /**
+   * Implements Drupal\Core\Database\Query\ConditionInterface::condition().
+   */
+  public function condition($field, $value = NULL, $operator = '=') {
+    $this->condition->condition($field, $value, $operator);
+    return $this;
+  }
+
+  /**
+   * Implements Drupal\Core\Database\Query\ConditionInterface::isNull().
+   */
+  public function isNull($field) {
+    $this->condition->isNull($field);
+    return $this;
+  }
+
+  /**
+   * Implements Drupal\Core\Database\Query\ConditionInterface::isNotNull().
+   */
+  public function isNotNull($field) {
+    $this->condition->isNotNull($field);
+    return $this;
+  }
+
+  /**
+   * Implements Drupal\Core\Database\Query\ConditionInterface::exists().
+   */
+  public function exists(SelectInterface $select) {
+    $this->condition->exists($select);
+    return $this;
+  }
+
+  /**
+   * Implements Drupal\Core\Database\Query\ConditionInterface::notExists().
+   */
+  public function notExists(SelectInterface $select) {
+    $this->condition->notExists($select);
+    return $this;
+  }
+
+  /**
+   * Implements Drupal\Core\Database\Query\ConditionInterface::conditions().
+   */
+  public function &conditions() {
+    return $this->condition->conditions();
+  }
+
+  /**
+   * Implements Drupal\Core\Database\Query\ConditionInterface::arguments().
+   */
+  public function arguments() {
+    return $this->condition->arguments();
+  }
+
+  /**
+   * Implements Drupal\Core\Database\Query\ConditionInterface::where().
+   */
+  public function where($snippet, $args = array()) {
+    $this->condition->where($snippet, $args);
+    return $this;
+  }
+
+  /**
+   * Implements Drupal\Core\Database\Query\ConditionInterface::compile().
+   */
+  public function compile(Connection $connection, PlaceholderInterface $queryPlaceholder) {
+    $this->condition->compile($connection, $queryPlaceholder);
+  }
+
+  /**
+   * Implements Drupal\Core\Database\Query\ConditionInterface::compiled().
+   */
+  public function compiled() {
+    return $this->condition->compiled();
+  }
+
+  /**
+   * Implements Drupal\Core\Database\Query\ConditionInterface::conditionGroupFactory().
+   */
+  public function conditionGroupFactory($conjunction = 'AND') {
+    return new Condition($conjunction);
+  }
+
+  /**
+   * Implements Drupal\Core\Database\Query\ConditionInterface::andConditionGroup().
+   */
+  public function andConditionGroup() {
+    return $this->conditionGroupFactory('AND');
+  }
+
+  /**
+   * Implements Drupal\Core\Database\Query\ConditionInterface::orConditionGroup().
+   */
+  public function orConditionGroup() {
+    return $this->conditionGroupFactory('OR');
+  }
+
+}
diff --git a/core/lib/Drupal/Core/Database/Query/Select.php b/core/lib/Drupal/Core/Database/Query/Select.php
index d925a07ee..3be5a2f47 100644
--- a/core/lib/Drupal/Core/Database/Query/Select.php
+++ b/core/lib/Drupal/Core/Database/Query/Select.php
@@ -18,6 +18,8 @@ use Drupal\Core\Database\Connection;
  */
 class Select extends Query implements SelectInterface {
 
+  use QueryConditionTrait;
+
   /**
    * The fields to SELECT.
    *
@@ -71,13 +73,6 @@ class Select extends Query implements SelectInterface {
    */
   protected $group = array();
 
-  /**
-   * The conditional object for the WHERE clause.
-   *
-   * @var \Drupal\Core\Database\Query\Condition
-   */
-  protected $where;
-
   /**
    * The conditional object for the HAVING clause.
    *
@@ -139,7 +134,7 @@ class Select extends Query implements SelectInterface {
     $options['return'] = Database::RETURN_STATEMENT;
     parent::__construct($connection, $options);
     $conjunction = isset($options['conjunction']) ? $options['conjunction'] : 'AND';
-    $this->where = new Condition($conjunction);
+    $this->condition = new Condition($conjunction);
     $this->having = new Condition($conjunction);
     $this->addJoin(NULL, $table, $alias);
   }
@@ -188,21 +183,6 @@ class Select extends Query implements SelectInterface {
     return isset($this->alterMetaData[$key]) ? $this->alterMetaData[$key] : NULL;
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function condition($field, $value = NULL, $operator = '=') {
-    $this->where->condition($field, $value, $operator);
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function &conditions() {
-    return $this->where->conditions();
-  }
-
   /**
    * {@inheritdoc}
    */
@@ -211,7 +191,7 @@ class Select extends Query implements SelectInterface {
       return NULL;
     }
 
-    $args = $this->where->arguments() + $this->having->arguments();
+    $args = $this->condition->arguments() + $this->having->arguments();
 
     foreach ($this->tables as $table) {
       if ($table['arguments']) {
@@ -238,51 +218,11 @@ class Select extends Query implements SelectInterface {
     return $args;
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function where($snippet, $args = array()) {
-    $this->where->where($snippet, $args);
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function isNull($field) {
-    $this->where->isNull($field);
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function isNotNull($field) {
-    $this->where->isNotNull($field);
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function exists(SelectInterface $select) {
-    $this->where->exists($select);
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function notExists(SelectInterface $select) {
-    $this->where->notExists($select);
-    return $this;
-  }
-
   /**
    * {@inheritdoc}
    */
   public function compile(Connection $connection, PlaceholderInterface $queryPlaceholder) {
-    $this->where->compile($connection, $queryPlaceholder);
+    $this->condition->compile($connection, $queryPlaceholder);
     $this->having->compile($connection, $queryPlaceholder);
 
     foreach ($this->tables as $table) {
@@ -302,7 +242,7 @@ class Select extends Query implements SelectInterface {
    * {@inheritdoc}
    */
   public function compiled() {
-    if (!$this->where->compiled() || !$this->having->compiled()) {
+    if (!$this->condition->compiled() || !$this->having->compiled()) {
       return FALSE;
     }
 
@@ -463,6 +403,13 @@ class Select extends Query implements SelectInterface {
     return $this->connection->escapeLike($string);
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function escapeField($string) {
+    return $this->connection->escapeField($string);
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -885,9 +832,9 @@ class Select extends Query implements SelectInterface {
     }
 
     // WHERE
-    if (count($this->where)) {
+    if (count($this->condition)) {
       // There is an implicit string cast on $this->condition.
-      $query .= "\nWHERE " . $this->where;
+      $query .= "\nWHERE " . $this->condition;
     }
 
     // GROUP BY
@@ -943,7 +890,7 @@ class Select extends Query implements SelectInterface {
     // want to clone the database connection object as that would duplicate the
     // connection itself.
 
-    $this->where = clone($this->where);
+    $this->condition = clone($this->condition);
     $this->having = clone($this->having);
     foreach ($this->union as $key => $aggregate) {
       $this->union[$key]['query'] = clone($aggregate['query']);
diff --git a/core/lib/Drupal/Core/Database/Query/SelectExtender.php b/core/lib/Drupal/Core/Database/Query/SelectExtender.php
index f85aac4ba..cca68c728 100644
--- a/core/lib/Drupal/Core/Database/Query/SelectExtender.php
+++ b/core/lib/Drupal/Core/Database/Query/SelectExtender.php
@@ -210,6 +210,14 @@ class SelectExtender implements SelectInterface {
     return $this->query->escapeLike($string);
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function escapeField($string) {
+    $this->query->escapeField($string);
+    return $this;
+  }
+
   public function getArguments(PlaceholderInterface $queryPlaceholder = NULL) {
     return $this->query->getArguments($queryPlaceholder);
   }
diff --git a/core/lib/Drupal/Core/Database/Query/SelectInterface.php b/core/lib/Drupal/Core/Database/Query/SelectInterface.php
index bfb7db609..6b870143f 100644
--- a/core/lib/Drupal/Core/Database/Query/SelectInterface.php
+++ b/core/lib/Drupal/Core/Database/Query/SelectInterface.php
@@ -140,6 +140,18 @@ interface SelectInterface extends ConditionInterface, AlterableInterface, Extend
    */
   public function escapeLike($string);
 
+  /**
+   * Escapes a field name string.
+   *
+   * Force all field names to be strictly alphanumeric-plus-underscore.
+   * For some database drivers, it may also wrap the field name in
+   * database-specific escape characters.
+   *
+   * @return
+   *   The sanitized field name string.
+   */
+  public function escapeField($string);
+
   /**
    * Compiles and returns an associative array of the arguments for this prepared statement.
    *
@@ -632,4 +644,5 @@ interface SelectInterface extends ConditionInterface, AlterableInterface, Extend
    *   The called object.
    */
   public function forUpdate($set = TRUE);
+
 }
diff --git a/core/lib/Drupal/Core/Database/Query/Update.php b/core/lib/Drupal/Core/Database/Query/Update.php
index 28330b707..3f7fc396b 100644
--- a/core/lib/Drupal/Core/Database/Query/Update.php
+++ b/core/lib/Drupal/Core/Database/Query/Update.php
@@ -17,6 +17,8 @@ use Drupal\Core\Database\Connection;
  */
 class Update extends Query implements ConditionInterface {
 
+  use QueryConditionTrait;
+
   /**
    * The table to update.
    *
@@ -38,15 +40,6 @@ class Update extends Query implements ConditionInterface {
    */
   protected $arguments = array();
 
-  /**
-   * The condition object for this query.
-   *
-   * Condition handling is handled via composition.
-   *
-   * @var \Drupal\Core\Database\Query\Condition
-   */
-  protected $condition;
-
   /**
    * Array of fields to update to an expression in case of a duplicate record.
    *
@@ -80,82 +73,6 @@ class Update extends Query implements ConditionInterface {
     $this->condition = new Condition('AND');
   }
 
-  /**
-   * Implements Drupal\Core\Database\Query\ConditionInterface::condition().
-   */
-  public function condition($field, $value = NULL, $operator = '=') {
-    $this->condition->condition($field, $value, $operator);
-    return $this;
-  }
-
-  /**
-   * Implements Drupal\Core\Database\Query\ConditionInterface::isNull().
-   */
-  public function isNull($field) {
-    $this->condition->isNull($field);
-    return $this;
-  }
-
-  /**
-   * Implements Drupal\Core\Database\Query\ConditionInterface::isNotNull().
-   */
-  public function isNotNull($field) {
-    $this->condition->isNotNull($field);
-    return $this;
-  }
-
-  /**
-   * Implements Drupal\Core\Database\Query\ConditionInterface::exists().
-   */
-  public function exists(SelectInterface $select) {
-    $this->condition->exists($select);
-    return $this;
-  }
-
-  /**
-   * Implements Drupal\Core\Database\Query\ConditionInterface::notExists().
-   */
-  public function notExists(SelectInterface $select) {
-    $this->condition->notExists($select);
-    return $this;
-  }
-
-  /**
-   * Implements Drupal\Core\Database\Query\ConditionInterface::conditions().
-   */
-  public function &conditions() {
-    return $this->condition->conditions();
-  }
-
-  /**
-   * Implements Drupal\Core\Database\Query\ConditionInterface::arguments().
-   */
-  public function arguments() {
-    return $this->condition->arguments();
-  }
-
-  /**
-   * Implements Drupal\Core\Database\Query\ConditionInterface::where().
-   */
-  public function where($snippet, $args = array()) {
-    $this->condition->where($snippet, $args);
-    return $this;
-  }
-
-  /**
-   * Implements Drupal\Core\Database\Query\ConditionInterface::compile().
-   */
-  public function compile(Connection $connection, PlaceholderInterface $queryPlaceholder) {
-    return $this->condition->compile($connection, $queryPlaceholder);
-  }
-
-  /**
-   * Implements Drupal\Core\Database\Query\ConditionInterface::compiled().
-   */
-  public function compiled() {
-    return $this->condition->compiled();
-  }
-
   /**
    * Adds a set of field->value pairs to be updated.
    *
@@ -256,13 +173,13 @@ class Update extends Query implements ConditionInterface {
         $data['expression']->compile($this->connection, $this);
         $data['expression'] = ' (' . $data['expression'] . ')';
       }
-      $update_fields[] = $field . '=' . $data['expression'];
+      $update_fields[] = $this->connection->escapeField($field) . '=' . $data['expression'];
       unset($fields[$field]);
     }
 
     $max_placeholder = 0;
     foreach ($fields as $field => $value) {
-      $update_fields[] = $field . '=:db_update_placeholder_' . ($max_placeholder++);
+      $update_fields[] = $this->connection->escapeField($field) . '=:db_update_placeholder_' . ($max_placeholder++);
     }
 
     $query = $comments . 'UPDATE {' . $this->connection->escapeTable($this->table) . '} SET ' . implode(', ', $update_fields);
diff --git a/core/lib/Drupal/Core/Database/Statement.php b/core/lib/Drupal/Core/Database/Statement.php
index 5246b21d9..1625bab83 100644
--- a/core/lib/Drupal/Core/Database/Statement.php
+++ b/core/lib/Drupal/Core/Database/Statement.php
@@ -41,6 +41,9 @@ class Statement extends \PDOStatement implements StatementInterface {
     $this->setFetchMode(\PDO::FETCH_OBJ);
   }
 
+  /**
+   * {@inheritdoc}
+   */
   public function execute($args = array(), $options = array()) {
     if (isset($options['fetch'])) {
       if (is_string($options['fetch'])) {
@@ -68,14 +71,23 @@ class Statement extends \PDOStatement implements StatementInterface {
     return $return;
   }
 
+  /**
+   * {@inheritdoc}
+   */
   public function getQueryString() {
     return $this->queryString;
   }
 
+  /**
+   * {@inheritdoc}
+   */
   public function fetchCol($index = 0) {
     return $this->fetchAll(\PDO::FETCH_COLUMN, $index);
   }
 
+  /**
+   * {@inheritdoc}
+   */
   public function fetchAllAssoc($key, $fetch = NULL) {
     $return = array();
     if (isset($fetch)) {
@@ -95,6 +107,9 @@ class Statement extends \PDOStatement implements StatementInterface {
     return $return;
   }
 
+  /**
+   * {@inheritdoc}
+   */
   public function fetchAllKeyed($key_index = 0, $value_index = 1) {
     $return = array();
     $this->setFetchMode(\PDO::FETCH_NUM);
@@ -104,11 +119,17 @@ class Statement extends \PDOStatement implements StatementInterface {
     return $return;
   }
 
+  /**
+   * {@inheritdoc}
+   */
   public function fetchField($index = 0) {
     // Call \PDOStatement::fetchColumn to fetch the field.
     return $this->fetchColumn($index);
   }
 
+  /**
+   * {@inheritdoc}
+   */
   public function fetchAssoc() {
     // Call \PDOStatement::fetch to fetch the row.
     return $this->fetch(\PDO::FETCH_ASSOC);
@@ -127,4 +148,42 @@ class Statement extends \PDOStatement implements StatementInterface {
     }
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function setFetchMode($mode, $a1 = NULL, $a2 = array()) {
+    // Call \PDOStatement::setFetchMode to set fetch mode.
+    // \PDOStatement is picky about the number of arguments in some cases so we
+    // need to be pass the exact number of arguments we where given.
+    switch (func_num_args()) {
+      case 1:
+        return parent::setFetchMode($mode);
+      case 2:
+        return parent::setFetchMode($mode, $a1);
+      case 3:
+      default:
+        return parent::setFetchMode($mode, $a1, $a2);
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function fetchAll($mode = NULL, $column_index = NULL, $constructor_arguments = NULL) {
+    // Call \PDOStatement::fetchAll to fetch all rows.
+    // \PDOStatement is picky about the number of arguments in some cases so we
+    // need to be pass the exact number of arguments we where given.
+    switch (func_num_args()) {
+      case 0:
+        return parent::fetchAll();
+      case 1:
+        return parent::fetchAll($mode);
+      case 2:
+        return parent::fetchAll($mode, $column_index);
+      case 3:
+      default:
+        return parent::fetchAll($mode, $column_index, $constructor_arguments);
+    }
+  }
+
 }
diff --git a/core/lib/Drupal/Core/Database/StatementEmpty.php b/core/lib/Drupal/Core/Database/StatementEmpty.php
index 42d7f1528..f523ae861 100644
--- a/core/lib/Drupal/Core/Database/StatementEmpty.php
+++ b/core/lib/Drupal/Core/Database/StatementEmpty.php
@@ -28,14 +28,23 @@ class StatementEmpty implements \Iterator, StatementInterface {
    */
   public $allowRowCount = FALSE;
 
+  /**
+   * {@inheritdoc}
+   */
   public function execute($args = array(), $options = array()) {
     return FALSE;
   }
 
+  /**
+   * {@inheritdoc}
+   */
   public function getQueryString() {
     return '';
   }
 
+  /**
+   * {@inheritdoc}
+   */
   public function rowCount() {
     if ($this->allowRowCount) {
       return 0;
@@ -43,61 +52,102 @@ class StatementEmpty implements \Iterator, StatementInterface {
     throw new RowCountException();
   }
 
+  /**
+   * {@inheritdoc}
+   */
   public function setFetchMode($mode, $a1 = NULL, $a2 = array()) {
     return;
   }
 
+  /**
+   * {@inheritdoc}
+   */
   public function fetch($mode = NULL, $cursor_orientation = NULL, $cursor_offset = NULL) {
     return NULL;
   }
 
+  /**
+   * {@inheritdoc}
+   */
   public function fetchField($index = 0) {
     return NULL;
   }
 
+  /**
+   * {@inheritdoc}
+   */
   public function fetchObject() {
     return NULL;
   }
 
+  /**
+   * {@inheritdoc}
+   */
   public function fetchAssoc() {
     return NULL;
   }
 
-  function fetchAll($mode = NULL, $column_index = NULL, array $constructor_arguments = array()) {
+  /**
+   * {@inheritdoc}
+   */
+  public function fetchAll($mode = NULL, $column_index = NULL, $constructor_arguments = NULL) {
     return array();
   }
 
+  /**
+   * {@inheritdoc}
+   */
   public function fetchCol($index = 0) {
     return array();
   }
 
+  /**
+   * {@inheritdoc}
+   */
   public function fetchAllKeyed($key_index = 0, $value_index = 1) {
     return array();
   }
 
+  /**
+   * {@inheritdoc}
+   */
   public function fetchAllAssoc($key, $fetch = NULL) {
     return array();
   }
 
-  /* Implementations of Iterator. */
-
+  /**
+   * {@inheritdoc}
+   */
   public function current() {
     return NULL;
   }
 
+  /**
+   * {@inheritdoc}
+   */
   public function key() {
     return NULL;
   }
 
+  /**
+   * {@inheritdoc}
+   */
   public function rewind() {
     // Nothing to do: our DatabaseStatement can't be rewound.
   }
 
+  /**
+   * {@inheritdoc}
+   */
   public function next() {
     // Do nothing, since this is an always-empty implementation.
   }
 
+  /**
+   * {@inheritdoc}
+   */
   public function valid() {
     return FALSE;
   }
+
 }
diff --git a/core/lib/Drupal/Core/Database/StatementInterface.php b/core/lib/Drupal/Core/Database/StatementInterface.php
index 4e87be6f4..6792e3ef4 100644
--- a/core/lib/Drupal/Core/Database/StatementInterface.php
+++ b/core/lib/Drupal/Core/Database/StatementInterface.php
@@ -10,11 +10,6 @@ namespace Drupal\Core\Database;
 /**
  * Represents a prepared statement.
  *
- * Some methods in that class are purposefully commented out. Due to a change in
- * how PHP defines PDOStatement, we can't define a signature for those methods
- * that will work the same way between versions older than 5.2.6 and later
- * versions.  See http://bugs.php.net/bug.php?id=42452 for more details.
- *
  * Child implementations should either extend PDOStatement:
  * @code
  * class Drupal\Core\Database\Driver\oracle\Statement extends PDOStatement implements Drupal\Core\Database\StatementInterface {}
@@ -100,7 +95,7 @@ interface StatementInterface extends \Traversable {
    *   If $mode is PDO::FETCH_CLASS, the optional arguments to pass to the
    *   constructor.
    */
-  // public function setFetchMode($mode, $a1 = NULL, $a2 = array());
+   public function setFetchMode($mode, $a1 = NULL, $a2 = array());
 
   /**
    * Fetches the next row from a result set.
@@ -119,7 +114,7 @@ interface StatementInterface extends \Traversable {
    * @return
    *   A result, formatted according to $mode.
    */
-  // public function fetch($mode = NULL, $cursor_orientation = NULL, $cursor_offset = NULL);
+   public function fetch($mode = NULL, $cursor_orientation = NULL, $cursor_offset = NULL);
 
   /**
    * Returns a single field from the next record of a result set.
@@ -138,7 +133,7 @@ interface StatementInterface extends \Traversable {
    * The object will be of the class specified by StatementInterface::setFetchMode()
    * or stdClass if not specified.
    */
-  // public function fetchObject();
+   public function fetchObject();
 
   /**
    * Fetches the next row and returns it as an associative array.
@@ -165,7 +160,7 @@ interface StatementInterface extends \Traversable {
    * @return
    *   An array of results.
    */
-  // function fetchAll($mode = NULL, $column_index = NULL, array $constructor_arguments);
+   function fetchAll($mode = NULL, $column_index = NULL, $constructor_arguments = NULL);
 
   /**
    * Returns an entire single column of a result set as an indexed array.
diff --git a/core/lib/Drupal/Core/Database/StatementPrefetch.php b/core/lib/Drupal/Core/Database/StatementPrefetch.php
index d322c0504..0fbfc0446 100644
--- a/core/lib/Drupal/Core/Database/StatementPrefetch.php
+++ b/core/lib/Drupal/Core/Database/StatementPrefetch.php
@@ -139,14 +139,7 @@ class StatementPrefetch implements \Iterator, StatementInterface {
   }
 
   /**
-   * Executes a prepared statement.
-   *
-   * @param $args
-   *   An array of values with as many elements as there are bound parameters in the SQL statement being executed.
-   * @param $options
-   *   An array of options for this query.
-   * @return
-   *   TRUE on success, or FALSE on failure.
+   * {@inheritdoc}
    */
   public function execute($args = array(), $options = array()) {
     if (isset($options['fetch'])) {
@@ -236,29 +229,29 @@ class StatementPrefetch implements \Iterator, StatementInterface {
   }
 
   /**
-   * Return the object's SQL query string.
+   * {@inheritdoc}
    */
   public function getQueryString() {
     return $this->queryString;
   }
 
   /**
-   * @see \PDOStatement::setFetchMode()
+   * {@inheritdoc}
    */
-  public function setFetchMode($fetchStyle, $a2 = NULL, $a3 = NULL) {
-    $this->defaultFetchStyle = $fetchStyle;
-    switch ($fetchStyle) {
+  public function setFetchMode($mode, $a1 = NULL, $a2 = array()) {
+    $this->defaultFetchStyle = $mode;
+    switch ($mode) {
       case \PDO::FETCH_CLASS:
-        $this->defaultFetchOptions['class'] = $a2;
-        if ($a3) {
-          $this->defaultFetchOptions['constructor_args'] = $a3;
+        $this->defaultFetchOptions['class'] = $a1;
+        if ($a2) {
+          $this->defaultFetchOptions['constructor_args'] = $a2;
         }
         break;
       case \PDO::FETCH_COLUMN:
-        $this->defaultFetchOptions['column'] = $a2;
+        $this->defaultFetchOptions['column'] = $a1;
         break;
       case \PDO::FETCH_INTO:
-        $this->defaultFetchOptions['object'] = $a2;
+        $this->defaultFetchOptions['object'] = $a1;
         break;
     }
 
@@ -274,8 +267,8 @@ class StatementPrefetch implements \Iterator, StatementInterface {
    * array position in $this->data and format it according to $this->fetchStyle
    * and $this->fetchMode.
    *
-   * @return
-   *  The current row formatted as requested.
+   * @return mixed
+   *   The current row formatted as requested.
    */
   public function current() {
     if (isset($this->currentRow)) {
@@ -327,16 +320,23 @@ class StatementPrefetch implements \Iterator, StatementInterface {
     }
   }
 
-  /* Implementations of Iterator. */
-
+  /**
+   * {@inheritdoc}
+   */
   public function key() {
     return $this->currentKey;
   }
 
+  /**
+   * {@inheritdoc}
+   */
   public function rewind() {
     // Nothing to do: our DatabaseStatement can't be rewound.
   }
 
+  /**
+   * {@inheritdoc}
+   */
   public function next() {
     if (!empty($this->data)) {
       $this->currentRow = reset($this->data);
@@ -348,6 +348,9 @@ class StatementPrefetch implements \Iterator, StatementInterface {
     }
   }
 
+  /**
+   * {@inheritdoc}
+   */
   public function valid() {
     return isset($this->currentRow);
   }
@@ -365,6 +368,9 @@ class StatementPrefetch implements \Iterator, StatementInterface {
     }
   }
 
+  /**
+   * {@inheritdoc}
+   */
   public function fetch($fetch_style = NULL, $cursor_orientation = \PDO::FETCH_ORI_NEXT, $cursor_offset = NULL) {
     if (isset($this->currentRow)) {
       // Set the fetch parameter.
@@ -398,10 +404,16 @@ class StatementPrefetch implements \Iterator, StatementInterface {
     }
   }
 
+  /**
+   * {@inheritdoc}
+   */
   public function fetchField($index = 0) {
     return $this->fetchColumn($index);
   }
 
+  /**
+   * {@inheritdoc}
+   */
   public function fetchObject($class_name = NULL, $constructor_args = array()) {
     if (isset($this->currentRow)) {
       if (!isset($class_name)) {
@@ -427,6 +439,9 @@ class StatementPrefetch implements \Iterator, StatementInterface {
     }
   }
 
+  /**
+   * {@inheritdoc}
+   */
   public function fetchAssoc() {
     if (isset($this->currentRow)) {
       $result = $this->currentRow;
@@ -438,14 +453,17 @@ class StatementPrefetch implements \Iterator, StatementInterface {
     }
   }
 
-  public function fetchAll($fetch_style = NULL, $fetch_column = NULL, $constructor_args = NULL) {
-    $this->fetchStyle = isset($fetch_style) ? $fetch_style : $this->defaultFetchStyle;
+  /**
+   * {@inheritdoc}
+   */
+  public function fetchAll($mode = NULL, $column_index = NULL, $constructor_arguments = NULL) {
+    $this->fetchStyle = isset($mode) ? $mode : $this->defaultFetchStyle;
     $this->fetchOptions = $this->defaultFetchOptions;
-    if (isset($fetch_column)) {
-      $this->fetchOptions['column'] = $fetch_column;
+    if (isset($column_index)) {
+      $this->fetchOptions['column'] = $column_index;
     }
-    if (isset($constructor_args)) {
-      $this->fetchOptions['constructor_args'] = $constructor_args;
+    if (isset($constructor_arguments)) {
+      $this->fetchOptions['constructor_args'] = $constructor_arguments;
     }
 
     $result = array();
@@ -462,6 +480,9 @@ class StatementPrefetch implements \Iterator, StatementInterface {
     return $result;
   }
 
+  /**
+   * {@inheritdoc}
+   */
   public function fetchCol($index = 0) {
     if (isset($this->columnNames[$index])) {
       $result = array();
@@ -477,6 +498,9 @@ class StatementPrefetch implements \Iterator, StatementInterface {
     }
   }
 
+  /**
+   * {@inheritdoc}
+   */
   public function fetchAllKeyed($key_index = 0, $value_index = 1) {
     if (!isset($this->columnNames[$key_index]) || !isset($this->columnNames[$value_index]))
       return array();
@@ -493,6 +517,9 @@ class StatementPrefetch implements \Iterator, StatementInterface {
     return $result;
   }
 
+  /**
+   * {@inheritdoc}
+   */
   public function fetchAllAssoc($key, $fetch_style = NULL) {
     $this->fetchStyle = isset($fetch_style) ? $fetch_style : $this->defaultFetchStyle;
     $this->fetchOptions = $this->defaultFetchOptions;
diff --git a/core/lib/Drupal/Core/Database/database.api.php b/core/lib/Drupal/Core/Database/database.api.php
index dc2e208e7..3e0fbf885 100644
--- a/core/lib/Drupal/Core/Database/database.api.php
+++ b/core/lib/Drupal/Core/Database/database.api.php
@@ -307,7 +307,8 @@
  *    specification). Each specification is an array containing the name of
  *    the referenced table ('table'), and an array of column mappings
  *    ('columns'). Column mappings are defined by key pairs ('source_column' =>
- *    'referenced_column').
+ *    'referenced_column'). This key is for documentation purposes only; foreign
+ *    keys are not created in the database, nor are they enforced by Drupal.
  *  - 'indexes':  An associative array of indexes ('indexname' =>
  *    specification). Each specification is an array of one or more
  *    key column specifiers (see below) that form an index on the
@@ -357,6 +358,8 @@
  *   'unique keys' => array(
  *     'vid' => array('vid'),
  *   ),
+ *   // For documentation purposes only; foreign keys are not created in the
+ *   // database.
  *   'foreign keys' => array(
  *     'node_revision' => array(
  *       'table' => 'node_field_revision',
@@ -467,7 +470,9 @@ function hook_query_TAG_alter(Drupal\Core\Database\Query\AlterableInterface $que
  * creation and alteration of the supported database engines.
  *
  * See the Schema API Handbook at https://www.drupal.org/node/146843 for details
- * on schema definition structures.
+ * on schema definition structures. Note that foreign key definitions are for
+ * documentation purposes only; foreign keys are not created in the database,
+ * nor are they enforced by Drupal.
  *
  * @return array
  *   A schema definition structure array. For each element of the
@@ -517,6 +522,8 @@ function hook_schema() {
       'nid_vid' => array('nid', 'vid'),
       'vid'     => array('vid'),
     ),
+    // For documentation purposes only; foreign keys are not created in the
+    // database.
     'foreign keys' => array(
       'node_revision' => array(
         'table' => 'node_field_revision',
diff --git a/core/lib/Drupal/Core/Datetime/DateFormatter.php b/core/lib/Drupal/Core/Datetime/DateFormatter.php
index 4759d1502..fd445e33a 100644
--- a/core/lib/Drupal/Core/Datetime/DateFormatter.php
+++ b/core/lib/Drupal/Core/Datetime/DateFormatter.php
@@ -204,6 +204,11 @@ class DateFormatter {
         $interval %= $value;
         $granularity--;
       }
+      elseif ($output) {
+        // Break if there was previous output but not any output at this level,
+        // to avoid skipping levels and getting output like "1 year 1 second".
+        break;
+      }
 
       if ($granularity == 0) {
         break;
@@ -373,15 +378,21 @@ class DateFormatter {
             // ourselves.
             $interval_output = '';
             $days = $interval->d;
-            if ($days >= 7) {
-              $weeks = floor($days / 7);
+            $weeks = floor($days / 7);
+            if ($weeks) {
               $interval_output .= $this->formatPlural($weeks, '1 week', '@count weeks', array(), array('langcode' => $options['langcode']));
               $days -= $weeks * 7;
               $granularity--;
             }
-            if ($granularity > 0 && $days > 0) {
+
+            if ((!$output || $weeks > 0) && $granularity > 0 && $days > 0) {
               $interval_output .= ($interval_output ? ' ' : '') . $this->formatPlural($days, '1 day', '@count days', array(), array('langcode' => $options['langcode']));
             }
+            else {
+              // If we did not output days, set the granularity to 0 so that we
+              // will not output hours and get things like "1 week 1 hour".
+              $granularity = 0;
+            }
             break;
 
           case 'h':
@@ -397,9 +408,14 @@ class DateFormatter {
             break;
 
         }
-        $output .= ($output ? ' ' : '') . $interval_output;
+        $output .= ($output && $interval_output ? ' ' : '') . $interval_output;
         $granularity--;
       }
+      elseif ($output) {
+        // Break if there was previous output but not any output at this level,
+        // to avoid skipping levels and getting output like "1 year 1 second".
+        break;
+      }
 
       if ($granularity <= 0) {
         break;
diff --git a/core/lib/Drupal/Core/Datetime/Element/Datelist.php b/core/lib/Drupal/Core/Datetime/Element/Datelist.php
index a0060ed84..2f253b29e 100644
--- a/core/lib/Drupal/Core/Datetime/Element/Datelist.php
+++ b/core/lib/Drupal/Core/Datetime/Element/Datelist.php
@@ -335,10 +335,10 @@ class Datelist extends DateElementBase {
   protected static function incrementRound(&$date, $increment) {
     // Round minutes and seconds, if necessary.
     if ($date instanceOf DrupalDateTime && $increment > 1) {
-      $day = intval(date_format($date, 'j'));
-      $hour = intval(date_format($date, 'H'));
-      $second = intval(round(intval(date_format($date, 's')) / $increment) * $increment);
-      $minute = intval(date_format($date, 'i'));
+      $day = intval($date->format('j'));
+      $hour = intval($date->format('H'));
+      $second = intval(round(intval($date->format('s')) / $increment) * $increment);
+      $minute = intval($date->format('i'));
       if ($second == 60) {
         $minute += 1;
         $second = 0;
@@ -348,12 +348,12 @@ class Datelist extends DateElementBase {
         $hour += 1;
         $minute = 0;
       }
-      date_time_set($date, $hour, $minute, $second);
+      $date->setTime($hour, $minute, $second);
       if ($hour == 24) {
         $day += 1;
-        $year = date_format($date, 'Y');
-        $month = date_format($date, 'n');
-        date_date_set($date, $year, $month, $day);
+        $year = $date->format('Y');
+        $month = $date->format('n');
+        $date->setDate($year, $month, $day);
       }
     }
     return $date;
diff --git a/core/lib/Drupal/Core/Datetime/Element/Datetime.php b/core/lib/Drupal/Core/Datetime/Element/Datetime.php
index b8e4b6990..f9ccb4559 100644
--- a/core/lib/Drupal/Core/Datetime/Element/Datetime.php
+++ b/core/lib/Drupal/Core/Datetime/Element/Datetime.php
@@ -268,6 +268,7 @@ class Datetime extends DateElementBase {
         '#required' => $element['#required'],
         '#size' => max(12, strlen($element['#value']['date'])),
         '#error_no_message' => TRUE,
+        '#date_date_format' => $element['#date_date_format'],
       );
 
       // Allows custom callbacks to alter the element.
diff --git a/core/lib/Drupal/Core/Datetime/Entity/DateFormat.php b/core/lib/Drupal/Core/Datetime/Entity/DateFormat.php
index fa1de8666..34a7b5b4a 100644
--- a/core/lib/Drupal/Core/Datetime/Entity/DateFormat.php
+++ b/core/lib/Drupal/Core/Datetime/Entity/DateFormat.php
@@ -41,14 +41,14 @@ class DateFormat extends ConfigEntityBase implements DateFormatInterface {
    *
    * @var string
    */
-  public $id;
+  protected $id;
 
   /**
    * The human-readable name of the date format entity.
    *
    * @var string
    */
-  public $label;
+  protected $label;
 
   /**
    * The date format pattern.
@@ -101,7 +101,7 @@ class DateFormat extends ConfigEntityBase implements DateFormatInterface {
   /**
    * {@inheritdoc}
    */
-  public function getCacheTags() {
+  public function getCacheTagsToInvalidate() {
     return ['rendered'];
   }
 
diff --git a/core/lib/Drupal/Core/DependencyInjection/Compiler/BackendCompilerPass.php b/core/lib/Drupal/Core/DependencyInjection/Compiler/BackendCompilerPass.php
index e4aedcbaf..aaf842846 100644
--- a/core/lib/Drupal/Core/DependencyInjection/Compiler/BackendCompilerPass.php
+++ b/core/lib/Drupal/Core/DependencyInjection/Compiler/BackendCompilerPass.php
@@ -42,11 +42,25 @@ class BackendCompilerPass implements CompilerPassInterface {
    * {@inheritdoc}
    */
   public function process(ContainerBuilder $container) {
-    $default_backend = $container->hasParameter('default_backend') ? $container->getParameter('default_backend') : NULL;
-    // No default backend was configured, so continue as normal.
-    if (!isset($default_backend)) {
-      return;
+    if ($container->hasParameter('default_backend')) {
+      $default_backend = $container->getParameter('default_backend');
+      // Opt out from the default backend.
+      if (!$default_backend) {
+        return;
+      }
     }
+    else {
+      try {
+        $default_backend = $container->get('database')->driver();
+        $container->set('database', NULL);
+      }
+      catch (\Exception $e) {
+        // If Drupal is not installed or a test doesn't define database there
+        // is nothing to override.
+        return;
+      }
+    }
+
 
     foreach ($container->findTaggedServiceIds('backend_overridable') as $id => $attributes) {
       // If the service is already an alias it is not the original backend, so
diff --git a/core/lib/Drupal/Core/DependencyInjection/Compiler/ContextProvidersPass.php b/core/lib/Drupal/Core/DependencyInjection/Compiler/ContextProvidersPass.php
new file mode 100644
index 000000000..b724be886
--- /dev/null
+++ b/core/lib/Drupal/Core/DependencyInjection/Compiler/ContextProvidersPass.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\DependencyInjection\Compiler\ContextProvidersPass.
+ */
+
+namespace Drupal\Core\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+
+/**
+ * Adds the context provider service IDs to the context manager.
+ */
+class ContextProvidersPass implements CompilerPassInterface {
+
+  /**
+   * {@inheritdoc}
+   *
+   * Passes the service IDs of all context providers to the context repository.
+   */
+  public function process(ContainerBuilder $container) {
+    $context_providers = [];
+    foreach (array_keys($container->findTaggedServiceIds('context_provider')) as $id) {
+      $context_providers[] = $id;
+    }
+
+    $definition = $container->getDefinition('context.repository');
+    $definition->addArgument($context_providers);
+  }
+
+}
diff --git a/core/lib/Drupal/Core/DependencyInjection/Compiler/GuzzleMiddlewarePass.php b/core/lib/Drupal/Core/DependencyInjection/Compiler/GuzzleMiddlewarePass.php
new file mode 100644
index 000000000..42e403ce5
--- /dev/null
+++ b/core/lib/Drupal/Core/DependencyInjection/Compiler/GuzzleMiddlewarePass.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\DependencyInjection\Compiler\GuzzleMiddlewarePass.
+ */
+
+namespace Drupal\Core\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+class GuzzleMiddlewarePass implements CompilerPassInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function process(ContainerBuilder $container) {
+    $middleware_ids = array_keys($container->findTaggedServiceIds('http_client_middleware'));
+    $container->getDefinition('http_handler_stack_configurator')
+      ->addArgument($middleware_ids);
+  }
+
+}
diff --git a/core/lib/Drupal/Core/DependencyInjection/Compiler/ProxyServicesPass.php b/core/lib/Drupal/Core/DependencyInjection/Compiler/ProxyServicesPass.php
new file mode 100644
index 000000000..90b1755dc
--- /dev/null
+++ b/core/lib/Drupal/Core/DependencyInjection/Compiler/ProxyServicesPass.php
@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\DependencyInjection\Compiler\ProxyServicesPass.
+ */
+
+namespace Drupal\Core\DependencyInjection\Compiler;
+
+use Drupal\Component\ProxyBuilder\ProxyBuilder;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Reference;
+
+/**
+ * Replaces all services with a lazy flag.
+ */
+class ProxyServicesPass implements CompilerPassInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function process(ContainerBuilder $container) {
+    foreach ($container->getDefinitions() as $service_id => $definition) {
+      if ($definition->isLazy()) {
+        $proxy_class = ProxyBuilder::buildProxyClassName($definition->getClass());
+        if (class_exists($proxy_class)) {
+          // Copy the existing definition to a new entry.
+          $definition->setLazy(FALSE);
+          // Ensure that the service is accessible.
+          $definition->setPublic(TRUE);
+          $new_service_id = 'drupal.proxy_original_service.' . $service_id;
+          $container->setDefinition($new_service_id, $definition);
+
+          $container->register($service_id, $proxy_class)
+            ->setArguments([new Reference('service_container'), $new_service_id]);
+        }
+        else {
+          $class_name = $definition->getClass();
+
+          // Find the root namespace.
+          $match = [];
+          preg_match('/([a-zA-Z0-9_]+\\\\[a-zA-Z0-9_]+)\\\\(.+)/', $class_name, $match);
+          $root_namespace = $match[1];
+
+          // Find the root namespace path.
+          $root_namespace_dir = '[namespace_root_path]';
+
+          $namespaces = $container->getParameter('container.namespaces');
+
+          // Hardcode Drupal Core, because it is not registered.
+          $namespaces['Drupal\Core'] = 'core/lib/Drupal/Core';
+
+          if (isset($namespaces[$root_namespace])) {
+            $root_namespace_dir = $namespaces[$root_namespace];
+          }
+
+          $message =<<<EOF
+
+Missing proxy class '$proxy_class' for lazy service '$service_id'.
+Use the following command to generate the proxy class:
+  php core/scripts/generate-proxy-class.php '$class_name' "$root_namespace_dir"
+
+
+EOF;
+          trigger_error($message, E_USER_WARNING);
+        }
+      }
+    }
+  }
+
+}
diff --git a/core/lib/Drupal/Core/DrupalKernel.php b/core/lib/Drupal/Core/DrupalKernel.php
index 5823c8269..61c58630b 100644
--- a/core/lib/Drupal/Core/DrupalKernel.php
+++ b/core/lib/Drupal/Core/DrupalKernel.php
@@ -8,7 +8,6 @@
 namespace Drupal\Core;
 
 use Drupal\Component\FileCache\FileCacheFactory;
-use Drupal\Component\ProxyBuilder\ProxyDumper;
 use Drupal\Component\Utility\Crypt;
 use Drupal\Component\Utility\Unicode;
 use Drupal\Component\Utility\UrlHelper;
@@ -24,7 +23,6 @@ use Drupal\Core\Http\TrustedHostsRequestFactory;
 use Drupal\Core\Language\Language;
 use Drupal\Core\PageCache\RequestPolicyInterface;
 use Drupal\Core\PhpStorage\PhpStorageFactory;
-use Drupal\Core\ProxyBuilder\ProxyBuilder;
 use Drupal\Core\Site\Settings;
 use Symfony\Cmf\Component\Routing\RouteObjectInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -54,8 +52,6 @@ use Symfony\Component\Routing\Route;
  */
 class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
 
-  const CONTAINER_BASE_CLASS = '\Drupal\Core\DependencyInjection\Container';
-
   /**
    * Holds the container instance.
    *
@@ -128,6 +124,13 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
    */
   protected $allowDumping;
 
+  /**
+   * Whether the container needs to be rebuilt the next time it is initialized.
+   *
+   * @var bool
+   */
+  protected $containerNeedsRebuild = FALSE;
+
   /**
    * Whether the container needs to be dumped once booting is complete.
    *
@@ -463,8 +466,8 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
     $this->container->get('request_stack')->push($request);
 
     // Set the allowed protocols once we have the config available.
-    $allowed_protocols = $this->container->get('config.factory')->get('system.filter')->get('protocols');
-    if (!isset($allowed_protocols)) {
+    $allowed_protocols = $this->container->getParameter('filter_protocols');
+    if (!$allowed_protocols) {
       // \Drupal\Component\Utility\UrlHelper::filterBadProtocol() is called by
       // the installer and update.php, in which case the configuration may not
       // exist (yet). Provide a minimal default set of allowed protocols for
@@ -697,11 +700,13 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
     }
 
     // If we haven't yet booted, we don't need to do anything: the new module
-    // list will take effect when boot() is called. If we have already booted,
-    // then rebuild the container in order to refresh the serviceProvider list
-    // and container.
+    // list will take effect when boot() is called. However we set a
+    // flag that the container needs a rebuild, so that a potentially cached
+    // container is not used. If we have already booted, then rebuild the
+    // container in order to refresh the serviceProvider list and container.
+    $this->containerNeedsRebuild = TRUE;
     if ($this->booted) {
-      $this->initializeContainer(TRUE);
+      $this->initializeContainer();
     }
   }
 
@@ -740,11 +745,9 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
   /**
    * Initializes the service container.
    *
-   * @param bool $rebuild
-   *   Force a container rebuild.
    * @return \Symfony\Component\DependencyInjection\ContainerInterface
    */
-  protected function initializeContainer($rebuild = FALSE) {
+  protected function initializeContainer() {
     $this->containerNeedsDumping = FALSE;
     $session_started = FALSE;
     if (isset($this->container)) {
@@ -766,7 +769,7 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
 
     // If the module list hasn't already been set in updateModules and we are
     // not forcing a rebuild, then try and load the container from the disk.
-    if (empty($this->moduleList) && !$rebuild) {
+    if (empty($this->moduleList) && !$this->containerNeedsRebuild) {
       $fully_qualified_class_name = '\\' . $this->getClassNamespace() . '\\' . $this->getClassName();
 
       // First, try to load from storage.
@@ -783,6 +786,9 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
       $container = $this->compileContainer();
     }
 
+    // The container was rebuilt successfully.
+    $this->containerNeedsRebuild = FALSE;
+
     $this->attachSynthetic($container);
 
     $this->container = $container;
@@ -807,7 +813,8 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
     \Drupal::setContainer($this->container);
 
     // If needs dumping flag was set, dump the container.
-    if ($this->containerNeedsDumping && !$this->dumpDrupalContainer($this->container, static::CONTAINER_BASE_CLASS)) {
+    $base_class = Settings::get('container_base_class', '\Drupal\Core\DependencyInjection\Container');
+    if ($this->containerNeedsDumping && !$this->dumpDrupalContainer($this->container, $base_class)) {
       $this->container->get('logger.factory')->get('DrupalKernel')->notice('Container cannot be written to disk');
     }
 
@@ -1000,15 +1007,33 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
   }
 
   /**
-   * Force a container rebuild.
-   *
-   * @return \Symfony\Component\DependencyInjection\ContainerInterface
+   * {@inheritdoc}
    */
   public function rebuildContainer() {
     // Empty module properties and for them to be reloaded from scratch.
     $this->moduleList = NULL;
     $this->moduleData = array();
-    return $this->initializeContainer(TRUE);
+    $this->containerNeedsRebuild = TRUE;
+    return $this->initializeContainer();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function invalidateContainer() {
+    // An invalidated container needs a rebuild.
+    $this->containerNeedsRebuild = TRUE;
+
+    // If we have not yet booted, settings or bootstrap services might not yet
+    // be available. In that case the container will not be loaded from cache
+    // due to the above setting when the Kernel is booted.
+    if (!$this->booted) {
+      return;
+    }
+
+    // Also wipe the PHP Storage caches, so that the container is rebuilt
+    // for the next request.
+    $this->storage()->deleteAll();
   }
 
   /**
@@ -1180,7 +1205,6 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
     }
     // Cache the container.
     $dumper = new PhpDumper($container);
-    $dumper->setProxyDumper(new ProxyDumper(new ProxyBuilder()));
     $class = $this->getClassName();
     $namespace = $this->getClassNamespace();
     $content = $dumper->dump([
@@ -1336,8 +1360,6 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
    *
    * @return bool
    *   TRUE if the hostmame is valid, or FALSE otherwise.
-   *
-   * @todo Adjust per resolution to https://github.com/symfony/symfony/issues/12349
    */
   public static function validateHostname(Request $request) {
     // $request->getHost() can throw an UnexpectedValueException if it
@@ -1380,7 +1402,7 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
    * @param array $host_patterns
    *   The array of trusted host patterns.
    *
-   * @return boolean
+   * @return bool
    *   TRUE if the Host header is trusted, FALSE otherwise.
    *
    * @see https://www.drupal.org/node/1992030
diff --git a/core/lib/Drupal/Core/DrupalKernelInterface.php b/core/lib/Drupal/Core/DrupalKernelInterface.php
index b17ed8065..892952a06 100644
--- a/core/lib/Drupal/Core/DrupalKernelInterface.php
+++ b/core/lib/Drupal/Core/DrupalKernelInterface.php
@@ -96,6 +96,18 @@ interface DrupalKernelInterface extends HttpKernelInterface {
    */
   public function updateModules(array $module_list, array $module_filenames = array());
 
+  /**
+   * Force a container rebuild.
+   *
+   * @return \Symfony\Component\DependencyInjection\ContainerInterface
+   */
+  public function rebuildContainer();
+
+  /**
+   * Invalidate the service container for the next request.
+   */
+  public function invalidateContainer();
+
   /**
    * Prepare the kernel for handling a request without handling the request.
    *
diff --git a/core/lib/Drupal/Core/Entity/ContentEntityBase.php b/core/lib/Drupal/Core/Entity/ContentEntityBase.php
index 9d0e5d63b..491311d13 100644
--- a/core/lib/Drupal/Core/Entity/ContentEntityBase.php
+++ b/core/lib/Drupal/Core/Entity/ContentEntityBase.php
@@ -138,12 +138,33 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C
   protected $isDefaultRevision = TRUE;
 
   /**
-   * Holds entity keys like the ID, bundle and revision ID.
+   * Holds translatable entity keys such as the ID, bundle and revision ID.
    *
    * @var array
    */
   protected $entityKeys = array();
 
+  /**
+   * Holds translatable entity keys such as the label.
+   *
+   * @var array
+   */
+  protected $translatableEntityKeys = array();
+
+  /**
+   * Whether entity validation was performed.
+   *
+   * @var bool
+   */
+  protected $validated = FALSE;
+
+  /**
+   * Whether entity validation is required before saving the entity.
+   *
+   * @var bool
+   */
+  protected $validationRequired = FALSE;
+
   /**
    * Overrides Entity::__construct().
    */
@@ -165,14 +186,36 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C
     $this->values = $values;
     foreach ($this->getEntityType()->getKeys() as $key => $field_name) {
       if (isset($this->values[$field_name])) {
-        if (is_array($this->values[$field_name]) && isset($this->values[$field_name][LanguageInterface::LANGCODE_DEFAULT])) {
-          if (is_array($this->values[$field_name][LanguageInterface::LANGCODE_DEFAULT])) {
-            if (isset($this->values[$field_name][LanguageInterface::LANGCODE_DEFAULT][0]['value'])) {
-              $this->entityKeys[$key] = $this->values[$field_name][LanguageInterface::LANGCODE_DEFAULT][0]['value'];
+        if (is_array($this->values[$field_name])) {
+          // We store untranslatable fields into an entity key without using a
+          // langcode key.
+          if (!$this->getFieldDefinition($field_name)->isTranslatable()) {
+            if (isset($this->values[$field_name][LanguageInterface::LANGCODE_DEFAULT])) {
+              if (is_array($this->values[$field_name][LanguageInterface::LANGCODE_DEFAULT])) {
+                if (isset($this->values[$field_name][LanguageInterface::LANGCODE_DEFAULT][0]['value'])) {
+                  $this->entityKeys[$key] = $this->values[$field_name][LanguageInterface::LANGCODE_DEFAULT][0]['value'];
+                }
+              }
+              else {
+                $this->entityKeys[$key] = $this->values[$field_name][LanguageInterface::LANGCODE_DEFAULT];
+              }
             }
           }
           else {
-            $this->entityKeys[$key] = $this->values[$field_name][LanguageInterface::LANGCODE_DEFAULT];
+            // We save translatable fields such as the publishing status of a node
+            // into an entity key array keyed by langcode as a performance
+            // optimization, so we don't have to go through TypedData when we
+            // need these values.
+            foreach ($this->values[$field_name] as $langcode => $field_value) {
+              if (is_array($this->values[$field_name][$langcode])) {
+                if (isset($this->values[$field_name][$langcode][0]['value'])) {
+                  $this->translatableEntityKeys[$key][$langcode] = $this->values[$field_name][$langcode][0]['value'];
+                }
+              }
+              else {
+                $this->translatableEntityKeys[$key][$langcode] = $this->values[$field_name][$langcode];
+              }
+            }
           }
         }
       }
@@ -220,7 +263,7 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C
    */
   public function setNewRevision($value = TRUE) {
     if (!$this->getEntityType()->hasKey('revision')) {
-      throw new \LogicException(SafeMarkup::format('Entity type @entity_type does not support revisions.', ['@entity_type' => $this->getEntityTypeId()]));
+      throw new \LogicException("Entity type {$this->getEntityTypeId()} does not support revisions.");
     }
 
     if ($value && !$this->newRevision) {
@@ -302,6 +345,23 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C
     return !empty($bundles[$this->bundle()]['translatable']) && !$this->getUntranslated()->language()->isLocked() && $this->languageManager()->isMultilingual();
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function preSave(EntityStorageInterface $storage) {
+    // An entity requiring validation should not be saved if it has not been
+    // actually validated.
+    if ($this->validationRequired && !$this->validated) {
+      // @todo Make this an assertion in https://www.drupal.org/node/2408013.
+      throw new \LogicException('Entity validation was skipped.');
+    }
+    else {
+      $this->validated = FALSE;
+    }
+
+    parent::preSave($storage);
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -312,10 +372,26 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C
    * {@inheritdoc}
    */
   public function validate() {
+    $this->validated = TRUE;
     $violations = $this->getTypedData()->validate();
     return new EntityConstraintViolationList($this, iterator_to_array($violations));
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function isValidationRequired() {
+    return (bool) $this->validationRequired;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setValidationRequired($required) {
+    $this->validationRequired = $required;
+    return $this;
+  }
+
   /**
    * Clear entity translation object cache to remove stale references.
    */
@@ -388,15 +464,14 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C
    */
   protected function getTranslatedField($name, $langcode) {
     if ($this->translations[$this->activeLangcode]['status'] == static::TRANSLATION_REMOVED) {
-      $message = 'The entity object refers to a removed translation (@langcode) and cannot be manipulated.';
-      throw new \InvalidArgumentException(SafeMarkup::format($message, array('@langcode' => $this->activeLangcode)));
+      throw new \InvalidArgumentException("The entity object refers to a removed translation ({$this->activeLangcode}) and cannot be manipulated.");
     }
     // Populate $this->fields to speed-up further look-ups and to keep track of
     // fields objects, possibly holding changes to field values.
     if (!isset($this->fields[$name][$langcode])) {
       $definition = $this->getFieldDefinition($name);
       if (!$definition) {
-        throw new \InvalidArgumentException('Field ' . SafeMarkup::checkPlain($name) . ' is unknown.');
+        throw new \InvalidArgumentException("Field $name is unknown.");
       }
       // Non-translatable fields are always stored with
       // LanguageInterface::LANGCODE_DEFAULT as key.
@@ -413,7 +488,7 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C
         if (isset($this->values[$name][$langcode])) {
           $value = $this->values[$name][$langcode];
         }
-        $field = \Drupal::service('plugin.manager.field.field_type')->createFieldItemList($this, $name, $value);
+        $field = \Drupal::service('plugin.manager.field.field_type')->createFieldItemList($this->getTranslation($langcode), $name, $value);
         if ($default) {
           // $this->defaultLangcode might not be set if we are initializing the
           // default language code cache, in which case there is no valid
@@ -454,6 +529,19 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C
     return $fields;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getTranslatableFields($include_computed = TRUE) {
+    $fields = [];
+    foreach ($this->getFieldDefinitions() as $name => $definition) {
+      if (($include_computed || !$definition->isComputed()) && $definition->isTranslatable()) {
+        $fields[$name] = $this->get($name);
+      }
+    }
+    return $fields;
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -537,12 +625,12 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C
     // Get the language code if the property exists.
     // Try to read the value directly from the list of entity keys which got
     // initialized in __construct(). This avoids creating a field item object.
-    if (isset($this->entityKeys['langcode'])) {
-      $this->defaultLangcode = $this->entityKeys['langcode'];
+    if (isset($this->translatableEntityKeys['langcode'][$this->activeLangcode])) {
+      $this->defaultLangcode = $this->translatableEntityKeys['langcode'][$this->activeLangcode];
     }
     elseif ($this->hasField($this->langcodeKey) && ($item = $this->get($this->langcodeKey)) && isset($item->language)) {
       $this->defaultLangcode = $item->language->getId();
-      $this->entityKeys['langcode'] = $this->defaultLangcode;
+      $this->translatableEntityKeys['langcode'][$this->activeLangcode] = $this->defaultLangcode;
     }
 
     if (empty($this->defaultLangcode)) {
@@ -583,8 +671,13 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C
     // that check, as it ready only and must not change, unsetting it could
     // lead to recursions.
     if ($key = array_search($name, $this->getEntityType()->getKeys())) {
-      if (isset($this->entityKeys[$key]) && $key != 'bundle') {
-        unset($this->entityKeys[$key]);
+      if ($key != 'bundle') {
+        if (isset($this->entityKeys[$key])) {
+          unset($this->entityKeys[$key]);
+        }
+        elseif (isset($this->translatableEntityKeys[$key][$this->activeLangcode])) {
+          unset($this->translatableEntityKeys[$key][$this->activeLangcode]);
+        }
       }
     }
 
@@ -663,8 +756,7 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C
     }
 
     if (empty($translation)) {
-      $message = 'Invalid translation language (@langcode) specified.';
-      throw new \InvalidArgumentException(SafeMarkup::format($message, array('@langcode' => $langcode)));
+      throw new \InvalidArgumentException("Invalid translation language ($langcode) specified.");
     }
 
     return $translation;
@@ -710,8 +802,6 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C
     $translation->enforceIsNew = &$this->enforceIsNew;
     $translation->newRevision = &$this->newRevision;
     $translation->translationInitialize = FALSE;
-    // Reset language-dependent properties.
-    unset($translation->entityKeys['label']);
     $translation->typedData = NULL;
 
     return $translation;
@@ -733,8 +823,7 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C
   public function addTranslation($langcode, array $values = array()) {
     $this->getLanguages();
     if (!isset($this->languages[$langcode]) || $this->hasTranslation($langcode)) {
-      $message = 'Invalid translation language (@langcode) specified.';
-      throw new \InvalidArgumentException(SafeMarkup::format($message, array('@langcode' => $langcode)));
+      throw new \InvalidArgumentException("Invalid translation language ($langcode) specified.");
     }
 
     // Instantiate a new empty entity so default values will be populated in the
@@ -784,8 +873,7 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C
       $this->translations[$langcode]['status'] = static::TRANSLATION_REMOVED;
     }
     else {
-      $message = 'The specified translation (@langcode) cannot be removed.';
-      throw new \InvalidArgumentException(SafeMarkup::format($message, array('@langcode' => $langcode)));
+      throw new \InvalidArgumentException("The specified translation ($langcode) cannot be removed.");
     }
   }
 
@@ -918,8 +1006,7 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C
    */
   public function createDuplicate() {
     if ($this->translations[$this->activeLangcode]['status'] == static::TRANSLATION_REMOVED) {
-      $message = 'The entity object refers to a removed translation (@langcode) and cannot be manipulated.';
-      throw new \InvalidArgumentException(SafeMarkup::format($message, array('@langcode' => $this->activeLangcode)));
+      throw new \InvalidArgumentException("The entity object refers to a removed translation ({$this->activeLangcode}) and cannot be manipulated.");
     }
 
     $duplicate = clone $this;
@@ -962,7 +1049,7 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C
         }
         foreach ($values as $langcode => $items) {
           $this->fields[$name][$langcode] = clone $items;
-          $this->fields[$name][$langcode]->setContext($name, $this->getTypedData());
+          $this->fields[$name][$langcode]->setContext($name, $this->getTranslation($langcode)->getTypedData());
         }
       }
 
@@ -1020,18 +1107,34 @@ abstract class ContentEntityBase extends Entity implements \IteratorAggregate, C
    *   The value of the entity key, NULL if not defined.
    */
   protected function getEntityKey($key) {
-    if (!isset($this->entityKeys[$key]) || !array_key_exists($key, $this->entityKeys)) {
-      if ($this->getEntityType()->hasKey($key)) {
-        $field_name = $this->getEntityType()->getKey($key);
-        $property = $this->getFieldDefinition($field_name)->getFieldStorageDefinition()->getMainPropertyName();
-        $this->entityKeys[$key] = $this->get($field_name)->$property;
+    // If the value is known already, return it.
+    if (isset($this->entityKeys[$key])) {
+      return $this->entityKeys[$key];
+    }
+    if (isset($this->translatableEntityKeys[$key][$this->activeLangcode])) {
+      return $this->translatableEntityKeys[$key][$this->activeLangcode];
+    }
+
+    // Otherwise fetch the value by creating a field object.
+    $value = NULL;
+    if ($this->getEntityType()->hasKey($key)) {
+      $field_name = $this->getEntityType()->getKey($key);
+      $definition = $this->getFieldDefinition($field_name);
+      $property = $definition->getFieldStorageDefinition()->getMainPropertyName();
+      $value = $this->get($field_name)->$property;
+
+      // Put it in the right array, depending on whether it is translatable.
+      if ($definition->isTranslatable()) {
+        $this->translatableEntityKeys[$key][$this->activeLangcode] = $value;
       }
       else {
-        $this->entityKeys[$key] = NULL;
+        $this->entityKeys[$key] = $value;
       }
-
     }
-    return $this->entityKeys[$key];
+    else {
+      $this->entityKeys[$key] = $value;
+    }
+    return $value;
   }
 
   /**
diff --git a/core/lib/Drupal/Core/Entity/ContentEntityConfirmFormBase.php b/core/lib/Drupal/Core/Entity/ContentEntityConfirmFormBase.php
index 887fcae36..9ca522128 100644
--- a/core/lib/Drupal/Core/Entity/ContentEntityConfirmFormBase.php
+++ b/core/lib/Drupal/Core/Entity/ContentEntityConfirmFormBase.php
@@ -86,9 +86,6 @@ abstract class ContentEntityConfirmFormBase extends ContentEntityForm implements
       'submit' => array(
         '#type' => 'submit',
         '#value' => $this->getConfirmText(),
-        '#validate' => array(
-          array($this, 'validate'),
-        ),
         '#submit' => array(
           array($this, 'submitForm'),
         ),
@@ -121,9 +118,10 @@ abstract class ContentEntityConfirmFormBase extends ContentEntityForm implements
   /**
    * {@inheritdoc}
    */
-  public function validate(array $form, FormStateInterface $form_state) {
+  public function validateForm(array &$form, FormStateInterface $form_state) {
     // Override the default validation implementation as it is not necessary
     // nor possible to validate an entity in a confirmation form.
+    return $this->entity;
   }
 
 }
diff --git a/core/lib/Drupal/Core/Entity/ContentEntityForm.php b/core/lib/Drupal/Core/Entity/ContentEntityForm.php
index 2c1604bb9..1fd99dcbc 100644
--- a/core/lib/Drupal/Core/Entity/ContentEntityForm.php
+++ b/core/lib/Drupal/Core/Entity/ContentEntityForm.php
@@ -64,17 +64,28 @@ class ContentEntityForm extends EntityForm implements ContentEntityFormInterface
 
   /**
    * {@inheritdoc}
-   *
-   * Note that extending classes should not override this method to add entity
-   * validation logic, but define further validation constraints using the
-   * entity validation API and/or provide a new validation constraint if
-   * necessary. This is the only way to ensure that the validation logic
-   * is correctly applied independently of form submissions; e.g., for REST
-   * requests.
-   * For more information about entity validation, see
-   * https://www.drupal.org/node/2015613.
    */
-  public function validate(array $form, FormStateInterface $form_state) {
+  public function buildEntity(array $form, FormStateInterface $form_state) {
+    /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
+    $entity = parent::buildEntity($form, $form_state);
+
+    // Mark the entity as requiring validation.
+    $entity->setValidationRequired(!$form_state->getTemporaryValue('entity_validated'));
+
+    return $entity;
+  }
+
+  /**
+   * {@inheritdoc}
+   *
+   * Button-level validation handlers are highly discouraged for entity forms,
+   * as they will prevent entity validation from running. If the entity is going
+   * to be saved during the form submission, this method should be manually
+   * invoked from the button-level validation handler, otherwise an exception
+   * will be thrown.
+   */
+  public function validateForm(array &$form, FormStateInterface $form_state) {
+    parent::validateForm($form, $form_state);
     /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
     $entity = $this->buildEntity($form, $form_state);
 
@@ -87,10 +98,10 @@ class ContentEntityForm extends EntityForm implements ContentEntityFormInterface
 
     $this->flagViolations($violations, $form, $form_state);
 
-    // @todo Remove this.
-    // Execute legacy global validation handlers.
-    $form_state->setValidateHandlers([]);
-    \Drupal::service('form_validator')->executeValidateHandlers($form, $form_state);
+    // The entity was validated.
+    $entity->setValidationRequired(FALSE);
+    $form_state->setTemporaryValue('entity_validated', TRUE);
+
     return $entity;
   }
 
diff --git a/core/lib/Drupal/Core/Entity/ContentEntityFormInterface.php b/core/lib/Drupal/Core/Entity/ContentEntityFormInterface.php
index 8fae58efd..054a39039 100644
--- a/core/lib/Drupal/Core/Entity/ContentEntityFormInterface.php
+++ b/core/lib/Drupal/Core/Entity/ContentEntityFormInterface.php
@@ -36,6 +36,8 @@ interface ContentEntityFormInterface extends EntityFormInterface {
    *   The form display that the current form operates with.
    * @param \Drupal\Core\Form\FormStateInterface $form_state
    *   The current state of the form.
+   *
+   * @return $this
    */
   public function setFormDisplay(EntityFormDisplayInterface $form_display, FormStateInterface $form_state);
 
@@ -56,9 +58,26 @@ interface ContentEntityFormInterface extends EntityFormInterface {
    * @param \Drupal\Core\Form\FormStateInterface $form_state
    *   The current state of the form.
    *
-   * @return boolean
+   * @return bool
    *   Returns TRUE if the entity form language matches the entity one.
    */
   public function isDefaultFormLangcode(FormStateInterface $form_state);
 
+  /**
+   * {@inheritdoc}
+   *
+   * Note that extending classes should not override this method to add entity
+   * validation logic, but define further validation constraints using the
+   * entity validation API and/or provide a new validation constraint if
+   * necessary. This is the only way to ensure that the validation logic
+   * is correctly applied independently of form submissions; e.g., for REST
+   * requests.
+   * For more information about entity validation, see
+   * https://www.drupal.org/node/2015613.
+   *
+   * @return \Drupal\Core\Entity\ContentEntityTypeInterface
+   *   The built entity.
+   */
+  public function validateForm(array &$form, FormStateInterface $form_state);
+
 }
diff --git a/core/lib/Drupal/Core/Entity/ContentEntityNullStorage.php b/core/lib/Drupal/Core/Entity/ContentEntityNullStorage.php
index 83c18342c..429d185fc 100644
--- a/core/lib/Drupal/Core/Entity/ContentEntityNullStorage.php
+++ b/core/lib/Drupal/Core/Entity/ContentEntityNullStorage.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\Core\Entity;
 
-use Drupal\Core\Entity\Query\QueryException;
 use Drupal\Core\Field\FieldDefinitionInterface;
 
 /**
@@ -85,25 +84,25 @@ class ContentEntityNullStorage extends ContentEntityStorageBase {
   /**
    * {@inheritdoc}
    */
-  protected function doLoadFieldItems($entities, $age) {
+  protected function doLoadRevisionFieldItems($revision_id) {
   }
 
   /**
    * {@inheritdoc}
    */
-  protected function doSaveFieldItems(EntityInterface $entity, $update) {
+  protected function doSaveFieldItems(ContentEntityInterface $entity, array $names = []) {
   }
 
   /**
    * {@inheritdoc}
    */
-  protected function doDeleteFieldItems(EntityInterface $entity) {
+  protected function doDeleteFieldItems($entities) {
   }
 
   /**
    * {@inheritdoc}
    */
-  protected function doDeleteFieldItemsRevision(EntityInterface $entity) {
+  protected function doDeleteRevisionFieldItems(ContentEntityInterface $revision) {
   }
 
   /**
diff --git a/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php b/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php
index 63cb1843e..6e6a74f89 100644
--- a/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php
+++ b/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php
@@ -7,7 +7,8 @@
 
 namespace Drupal\Core\Entity;
 
-use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Core\Cache\Cache;
+use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -21,16 +22,35 @@ abstract class ContentEntityStorageBase extends EntityStorageBase implements Dyn
    */
   protected $bundleKey = FALSE;
 
+  /**
+   * The entity manager.
+   *
+   * @var \Drupal\Core\Entity\EntityManagerInterface
+   */
+  protected $entityManager;
+
+  /**
+   * Cache backend.
+   *
+   * @var \Drupal\Core\Cache\CacheBackendInterface
+   */
+  protected $cacheBackend;
+
   /**
    * Constructs a ContentEntityStorageBase object.
    *
    * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
    *   The entity type definition.
+   * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
+   *   The entity manager.
+   * @param \Drupal\Core\Cache\CacheBackendInterface $cache
+   *   The cache backend to be used.
    */
-  public function __construct(EntityTypeInterface $entity_type) {
+  public function __construct(EntityTypeInterface $entity_type, EntityManagerInterface $entity_manager, CacheBackendInterface $cache) {
     parent::__construct($entity_type);
-
     $this->bundleKey = $this->entityType->getKey('bundle');
+    $this->entityManager = $entity_manager;
+    $this->cacheBackend = $cache;
   }
 
   /**
@@ -38,7 +58,9 @@ abstract class ContentEntityStorageBase extends EntityStorageBase implements Dyn
    */
   public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type) {
     return new static(
-      $entity_type
+      $entity_type,
+      $container->get('entity.manager'),
+      $container->get('cache.entity')
     );
   }
 
@@ -60,7 +82,7 @@ abstract class ContentEntityStorageBase extends EntityStorageBase implements Dyn
     $bundle = FALSE;
     if ($this->bundleKey) {
       if (!isset($values[$this->bundleKey])) {
-        throw new EntityStorageException(SafeMarkup::format('Missing bundle for entity type @type', array('@type' => $this->entityTypeId)));
+        throw new EntityStorageException('Missing bundle for entity type ' . $this->entityTypeId);
       }
       $bundle = $values[$this->bundleKey];
     }
@@ -157,6 +179,146 @@ abstract class ContentEntityStorageBase extends EntityStorageBase implements Dyn
    */
   public function finalizePurge(FieldStorageDefinitionInterface $storage_definition) { }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function loadRevision($revision_id) {
+    $revision = $this->doLoadRevisionFieldItems($revision_id);
+
+    if ($revision) {
+      $entities = [$revision->id() => $revision];
+      $this->invokeStorageLoadHook($entities);
+      $this->postLoad($entities);
+    }
+
+    return $revision;
+  }
+
+  /**
+   * Actually loads revision field item values from the storage.
+   *
+   * @param int|string $revision_id
+   *   The revision identifier.
+   *
+   * @return \Drupal\Core\Entity\EntityInterface|null
+   *   The specified entity revision or NULL if not found.
+   */
+  abstract protected function doLoadRevisionFieldItems($revision_id);
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function doSave($id, EntityInterface $entity) {
+    /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
+
+    if ($entity->isNew()) {
+      // Ensure the entity is still seen as new after assigning it an id, while
+      // storing its data.
+      $entity->enforceIsNew();
+      if ($this->entityType->isRevisionable()) {
+        $entity->setNewRevision();
+      }
+      $return = SAVED_NEW;
+    }
+    else {
+      // @todo Consider returning a different value when saving a non-default
+      //   entity revision. See https://www.drupal.org/node/2509360.
+      $return = $entity->isDefaultRevision() ? SAVED_UPDATED : FALSE;
+    }
+
+    $this->populateAffectedRevisionTranslations($entity);
+    $this->doSaveFieldItems($entity);
+
+    return $return;
+  }
+
+  /**
+   * Writes entity field values to the storage.
+   *
+   * This method is responsible for allocating entity and revision identifiers
+   * and updating the entity object with their values.
+   *
+   * @param \Drupal\Core\Entity\ContentEntityInterface $entity
+   *   The entity object.
+   * @param string[] $names
+   *   (optional) The name of the fields to be written to the storage. If an
+   *   empty value is passed all field values are saved.
+   */
+  abstract protected function doSaveFieldItems(ContentEntityInterface $entity, array $names = []);
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function doPreSave(EntityInterface $entity) {
+    /** @var \Drupal\Core\Entity\ContentEntityBase $entity */
+
+    // Sync the changes made in the fields array to the internal values array.
+    $entity->updateOriginalValues();
+
+    return parent::doPreSave($entity);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function doPostSave(EntityInterface $entity, $update) {
+    /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
+
+    if ($update && $this->entityType->isTranslatable()) {
+      $this->invokeTranslationHooks($entity);
+    }
+
+    parent::doPostSave($entity, $update);
+
+    // The revision is stored, it should no longer be marked as new now.
+    if ($this->entityType->isRevisionable()) {
+      $entity->setNewRevision(FALSE);
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function doDelete($entities) {
+    /** @var \Drupal\Core\Entity\ContentEntityInterface[] $entities */
+    foreach ($entities as $entity) {
+      $this->invokeFieldMethod('delete', $entity);
+    }
+    $this->doDeleteFieldItems($entities);
+  }
+
+  /**
+   * Deletes entity field values from the storage.
+   *
+   * @param \Drupal\Core\Entity\ContentEntityInterface[] $entities
+   *   An array of entity objects to be deleted.
+   */
+  abstract protected function doDeleteFieldItems($entities);
+
+  /**
+   * {@inheritdoc}
+   */
+  public function deleteRevision($revision_id) {
+    /** @var \Drupal\Core\Entity\ContentEntityInterface $revision */
+    if ($revision = $this->loadRevision($revision_id)) {
+      // Prevent deletion if this is the default revision.
+      if ($revision->isDefaultRevision()) {
+        throw new EntityStorageException('Default revision can not be deleted');
+      }
+      $this->invokeFieldMethod('deleteRevision', $revision);
+      $this->doDeleteRevisionFieldItems($revision);
+      $this->invokeHook('revision_delete', $revision);
+    }
+  }
+
+  /**
+   * Deletes field values of an entity revision from the storage.
+   *
+   * @param \Drupal\Core\Entity\ContentEntityInterface $revision
+   *   An entity revision object to be deleted.
+   */
+  abstract protected function doDeleteRevisionFieldItems(ContentEntityInterface $revision);
+
   /**
    * Checks translation statuses and invoke the related hooks if needed.
    *
@@ -179,31 +341,101 @@ abstract class ContentEntityStorageBase extends EntityStorageBase implements Dyn
     }
   }
 
+  /**
+   * Invokes hook_entity_storage_load().
+   *
+   * @param \Drupal\Core\Entity\ContentEntityInterface[] $entities
+   *   List of entities, keyed on the entity ID.
+   */
+  protected function invokeStorageLoadHook(array &$entities) {
+    if (!empty($entities)) {
+      // Call hook_entity_storage_load().
+      foreach ($this->moduleHandler()->getImplementations('entity_storage_load') as $module) {
+        $function = $module . '_entity_storage_load';
+        $function($entities, $this->entityTypeId);
+      }
+      // Call hook_TYPE_storage_load().
+      foreach ($this->moduleHandler()->getImplementations($this->entityTypeId . '_storage_load') as $module) {
+        $function = $module . '_' . $this->entityTypeId . '_storage_load';
+        $function($entities);
+      }
+    }
+  }
+
   /**
    * {@inheritdoc}
    */
   protected function invokeHook($hook, EntityInterface $entity) {
-    if ($hook == 'presave') {
-      $this->invokeFieldMethod('preSave', $entity);
+    /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
+
+    switch ($hook) {
+      case 'presave':
+        $this->invokeFieldMethod('preSave', $entity);
+        break;
+
+      case 'insert':
+        $this->invokeFieldPostSave($entity, FALSE);
+        break;
+
+      case 'update':
+        $this->invokeFieldPostSave($entity, TRUE);
+        break;
     }
+
     parent::invokeHook($hook, $entity);
   }
 
   /**
    * Invokes a method on the Field objects within an entity.
    *
+   * Any argument passed will be forwarded to the invoked method.
+   *
    * @param string $method
-   *   The method name.
+   *   The name of the method to be invoked.
    * @param \Drupal\Core\Entity\ContentEntityInterface $entity
    *   The entity object.
+   *
+   * @return array
+   *   A multidimensional associative array of results, keyed by entity
+   *   translation language code and field name.
    */
   protected function invokeFieldMethod($method, ContentEntityInterface $entity) {
+    $result = [];
+    $args = array_slice(func_get_args(), 2);
     foreach (array_keys($entity->getTranslationLanguages()) as $langcode) {
       $translation = $entity->getTranslation($langcode);
-      foreach ($translation->getFields() as $field) {
-        $field->$method();
+      // For non translatable fields, there is only one field object instance
+      // across all translations and it has as parent entity the entity in the
+      // default entity translation. Therefore field methods on non translatable
+      // fields should be invoked only on the default entity translation.
+      $fields = $translation->isDefaultTranslation() ? $translation->getFields() : $translation->getTranslatableFields();
+      foreach ($fields as $name => $items) {
+        // call_user_func_array() is way slower than a direct call so we avoid
+        // using it if have no parameters.
+        $result[$langcode][$name] = $args ? call_user_func_array([$items, $method], $args) : $items->{$method}();
       }
     }
+    return $result;
+  }
+
+  /**
+   * Invokes the post save method on the Field objects within an entity.
+   *
+   * @param \Drupal\Core\Entity\ContentEntityInterface $entity
+   *   The entity object.
+   * @param bool $update
+   *   Specifies whether the entity is being updated or created.
+   */
+  protected function invokeFieldPostSave(ContentEntityInterface $entity, $update) {
+    // For each entity translation this returns an array of resave flags keyed
+    // by field name, thus we merge them to obtain a list of fields to resave.
+    $resave = [];
+    foreach ($this->invokeFieldMethod('postSave', $entity, $update) as $translation_results) {
+      $resave += array_filter($translation_results);
+    }
+    if ($resave) {
+      $this->doSaveFieldItems($entity, array_keys($resave));
+    }
   }
 
   /**
@@ -258,4 +490,118 @@ abstract class ContentEntityStorageBase extends EntityStorageBase implements Dyn
     }
   }
 
+  /**
+   * Ensures integer entity IDs are valid.
+   *
+   * The identifier sanitization provided by this method has been introduced
+   * as Drupal used to rely on the database to facilitate this, which worked
+   * correctly with MySQL but led to errors with other DBMS such as PostgreSQL.
+   *
+   * @param array $ids
+   *   The entity IDs to verify.
+   *
+   * @return array
+   *   The sanitized list of entity IDs.
+   */
+  protected function cleanIds(array $ids) {
+    $definitions = $this->entityManager->getBaseFieldDefinitions($this->entityTypeId);
+    $id_definition = $definitions[$this->entityType->getKey('id')];
+    if ($id_definition->getType() == 'integer') {
+      $ids = array_filter($ids, function ($id) {
+        return is_numeric($id) && $id == (int) $id;
+      });
+      $ids = array_map('intval', $ids);
+    }
+    return $ids;
+  }
+
+  /**
+   * Gets entities from the persistent cache backend.
+   *
+   * @param array|null &$ids
+   *   If not empty, return entities that match these IDs. IDs that were found
+   *   will be removed from the list.
+   *
+   * @return \Drupal\Core\Entity\ContentEntityInterface[]
+   *   Array of entities from the persistent cache.
+   */
+  protected function getFromPersistentCache(array &$ids = NULL) {
+    if (!$this->entityType->isPersistentlyCacheable() || empty($ids)) {
+      return array();
+    }
+    $entities = array();
+    // Build the list of cache entries to retrieve.
+    $cid_map = array();
+    foreach ($ids as $id) {
+      $cid_map[$id] = $this->buildCacheId($id);
+    }
+    $cids = array_values($cid_map);
+    if ($cache = $this->cacheBackend->getMultiple($cids)) {
+      // Get the entities that were found in the cache.
+      foreach ($ids as $index => $id) {
+        $cid = $cid_map[$id];
+        if (isset($cache[$cid])) {
+          $entities[$id] = $cache[$cid]->data;
+          unset($ids[$index]);
+        }
+      }
+    }
+    return $entities;
+  }
+
+  /**
+   * Stores entities in the persistent cache backend.
+   *
+   * @param \Drupal\Core\Entity\ContentEntityInterface[] $entities
+   *   Entities to store in the cache.
+   */
+  protected function setPersistentCache($entities) {
+    if (!$this->entityType->isPersistentlyCacheable()) {
+      return;
+    }
+
+    $cache_tags = array(
+      $this->entityTypeId . '_values',
+      'entity_field_info',
+    );
+    foreach ($entities as $id => $entity) {
+      $this->cacheBackend->set($this->buildCacheId($id), $entity, CacheBackendInterface::CACHE_PERMANENT, $cache_tags);
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function resetCache(array $ids = NULL) {
+    if ($ids) {
+      $cids = array();
+      foreach ($ids as $id) {
+        unset($this->entities[$id]);
+        $cids[] = $this->buildCacheId($id);
+      }
+      if ($this->entityType->isPersistentlyCacheable()) {
+        $this->cacheBackend->deleteMultiple($cids);
+      }
+    }
+    else {
+      $this->entities = array();
+      if ($this->entityType->isPersistentlyCacheable()) {
+        Cache::invalidateTags(array($this->entityTypeId . '_values'));
+      }
+    }
+  }
+
+  /**
+   * Builds the cache ID for the passed in entity ID.
+   *
+   * @param int $id
+   *   Entity ID for which the cache ID should be built.
+   *
+   * @return string
+   *   Cache ID that can be passed to the cache backend.
+   */
+  protected function buildCacheId($id) {
+    return "values:{$this->entityTypeId}:$id";
+  }
+
 }
diff --git a/core/lib/Drupal/Core/Entity/Controller/EntityViewController.php b/core/lib/Drupal/Core/Entity/Controller/EntityViewController.php
index 5f5ae4210..8ddf063b3 100644
--- a/core/lib/Drupal/Core/Entity/Controller/EntityViewController.php
+++ b/core/lib/Drupal/Core/Entity/Controller/EntityViewController.php
@@ -105,6 +105,7 @@ class EntityViewController implements ContainerInjectionInterface {
 
     $page['#pre_render'][] = [$this, 'buildTitle'];
     $page['#entity_type'] = $_entity->getEntityTypeId();
+    $page['#' . $page['#entity_type']] = $_entity;
 
 
     return $page;
diff --git a/core/lib/Drupal/Core/Entity/Entity.php b/core/lib/Drupal/Core/Entity/Entity.php
index 9ffa49754..4863121d3 100644
--- a/core/lib/Drupal/Core/Entity/Entity.php
+++ b/core/lib/Drupal/Core/Entity/Entity.php
@@ -8,6 +8,7 @@
 namespace Drupal\Core\Entity;
 
 use Drupal\Core\Cache\Cache;
+use Drupal\Core\Cache\RefinableCacheableDependencyTrait;
 use Drupal\Core\DependencyInjection\DependencySerializationTrait;
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Utility\Unicode;
@@ -24,6 +25,8 @@ use Drupal\Core\Url;
  */
 abstract class Entity implements EntityInterface {
 
+  use RefinableCacheableDependencyTrait;
+
   use DependencySerializationTrait {
     __sleep as traitSleep;
   }
@@ -192,10 +195,7 @@ abstract class Entity implements EntityInterface {
         $uri = call_user_func($uri_callback, $this);
       }
       else {
-        throw new UndefinedLinkTemplateException(SafeMarkup::format('No link template "@rel" found for the "@entity_type" entity type', array(
-          '@rel' => $rel,
-          '@entity_type' => $this->getEntityTypeId(),
-        )));
+        throw new UndefinedLinkTemplateException("No link template '$rel' found for the '{$this->getEntityTypeId()}' entity type");
       }
     }
 
@@ -381,12 +381,7 @@ abstract class Entity implements EntityInterface {
     if ($this->getEntityType()->getBundleOf()) {
       // Throw an exception if the bundle ID is longer than 32 characters.
       if (Unicode::strlen($this->id()) > EntityTypeInterface::BUNDLE_MAX_LENGTH) {
-        throw new ConfigEntityIdLengthException(SafeMarkup::format(
-          'Attempt to create a bundle with an ID longer than @max characters: @id.', array(
-            '@max' => EntityTypeInterface::BUNDLE_MAX_LENGTH,
-            '@id' => $this->id(),
-          )
-        ));
+        throw new ConfigEntityIdLengthException("Attempt to create a bundle with an ID longer than " . EntityTypeInterface::BUNDLE_MAX_LENGTH . " characters: $this->id().");
       }
     }
   }
@@ -440,23 +435,36 @@ abstract class Entity implements EntityInterface {
    * {@inheritdoc}
    */
   public function getCacheContexts() {
-    return [];
+    return $this->cacheContexts;
   }
 
   /**
    * {@inheritdoc}
    */
-  public function getCacheTags() {
+  public function getCacheTagsToInvalidate() {
     // @todo Add bundle-specific listing cache tag?
     //   https://www.drupal.org/node/2145751
+    if ($this->isNew()) {
+      return [];
+    }
     return [$this->entityTypeId . ':' . $this->id()];
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheTags() {
+    if ($this->cacheTags) {
+      return Cache::mergeTags($this->getCacheTagsToInvalidate(), $this->cacheTags);
+    }
+    return $this->getCacheTagsToInvalidate();
+  }
+
   /**
    * {@inheritdoc}
    */
   public function getCacheMaxAge() {
-    return Cache::PERMANENT;
+    return $this->cacheMaxAge;
   }
 
   /**
@@ -511,7 +519,7 @@ abstract class Entity implements EntityInterface {
     }
     if ($update) {
       // An existing entity was updated, also invalidate its unique cache tag.
-      $tags = Cache::mergeTags($tags, $this->getCacheTags());
+      $tags = Cache::mergeTags($tags, $this->getCacheTagsToInvalidate());
     }
     Cache::invalidateTags($tags);
   }
@@ -532,7 +540,7 @@ abstract class Entity implements EntityInterface {
       // other pages than the one it's on. The one it's on is handled by its own
       // cache tag, but subsequent list pages would not be invalidated, hence we
       // must invalidate its list cache tags as well.)
-      $tags = Cache::mergeTags($tags, $entity->getCacheTags());
+      $tags = Cache::mergeTags($tags, $entity->getCacheTagsToInvalidate());
     }
     Cache::invalidateTags($tags);
   }
diff --git a/core/lib/Drupal/Core/Entity/EntityConfirmFormBase.php b/core/lib/Drupal/Core/Entity/EntityConfirmFormBase.php
index a11e27f0a..7b320e168 100644
--- a/core/lib/Drupal/Core/Entity/EntityConfirmFormBase.php
+++ b/core/lib/Drupal/Core/Entity/EntityConfirmFormBase.php
@@ -81,9 +81,6 @@ abstract class EntityConfirmFormBase extends EntityForm implements ConfirmFormIn
       'submit' => array(
         '#type' => 'submit',
         '#value' => $this->getConfirmText(),
-        '#validate' => array(
-          array($this, 'validate'),
-        ),
         '#submit' => array(
           array($this, 'submitForm'),
         ),
diff --git a/core/lib/Drupal/Core/Entity/EntityDefinitionUpdateManager.php b/core/lib/Drupal/Core/Entity/EntityDefinitionUpdateManager.php
index 1531f818c..902aab919 100644
--- a/core/lib/Drupal/Core/Entity/EntityDefinitionUpdateManager.php
+++ b/core/lib/Drupal/Core/Entity/EntityDefinitionUpdateManager.php
@@ -97,7 +97,7 @@ class EntityDefinitionUpdateManager implements EntityDefinitionUpdateManagerInte
   public function applyUpdates() {
     $change_list = $this->getChangeList();
     if ($change_list) {
-      // getChangeList() only disables the cache and does not invalidate.
+      // self::getChangeList() only disables the cache and does not invalidate.
       // In case there are changes, explicitly invalidate caches.
       $this->entityManager->clearCachedDefinitions();
     }
@@ -107,18 +107,7 @@ class EntityDefinitionUpdateManager implements EntityDefinitionUpdateManagerInte
       // to revisionable and at the same time add revisionable fields to the
       // entity type.
       if (!empty($change_list['entity_type'])) {
-        $entity_type = $this->entityManager->getDefinition($entity_type_id);
-
-        switch ($change_list['entity_type']) {
-          case static::DEFINITION_CREATED:
-            $this->entityManager->onEntityTypeCreate($entity_type);
-            break;
-
-          case static::DEFINITION_UPDATED:
-            $original = $this->entityManager->getLastInstalledDefinition($entity_type_id);
-            $this->entityManager->onEntityTypeUpdate($entity_type, $original);
-            break;
-        }
+        $this->doEntityUpdate($change_list['entity_type'], $entity_type_id);
       }
 
       // Process field storage definition changes.
@@ -127,24 +116,105 @@ class EntityDefinitionUpdateManager implements EntityDefinitionUpdateManagerInte
         $original_storage_definitions = $this->entityManager->getLastInstalledFieldStorageDefinitions($entity_type_id);
 
         foreach ($change_list['field_storage_definitions'] as $field_name => $change) {
-          switch ($change) {
-            case static::DEFINITION_CREATED:
-              $this->entityManager->onFieldStorageDefinitionCreate($storage_definitions[$field_name]);
-              break;
-
-            case static::DEFINITION_UPDATED:
-              $this->entityManager->onFieldStorageDefinitionUpdate($storage_definitions[$field_name], $original_storage_definitions[$field_name]);
-              break;
-
-            case static::DEFINITION_DELETED:
-              $this->entityManager->onFieldStorageDefinitionDelete($original_storage_definitions[$field_name]);
-              break;
-          }
+          $storage_definition = isset($storage_definitions[$field_name]) ? $storage_definitions[$field_name] : NULL;
+          $original_storage_definition = isset($original_storage_definitions[$field_name]) ? $original_storage_definitions[$field_name] : NULL;
+          $this->doFieldUpdate($change, $storage_definition, $original_storage_definition);
         }
       }
     }
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function applyEntityUpdate($op, $entity_type_id, $reset_cached_definitions = TRUE) {
+    $change_list = $this->getChangeList();
+    if (!isset($change_list[$entity_type_id]) || $change_list[$entity_type_id]['entity_type'] !== $op) {
+      return FALSE;
+    }
+    if ($reset_cached_definitions) {
+      // self::getChangeList() only disables the cache and does not invalidate.
+      // In case there are changes, explicitly invalidate caches.
+      $this->entityManager->clearCachedDefinitions();
+    }
+    $this->doEntityUpdate($op, $entity_type_id);
+    return TRUE;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function applyFieldUpdate($op, $entity_type_id, $field_name, $reset_cached_definitions = TRUE) {
+    $change_list = $this->getChangeList();
+    if (!isset($change_list[$entity_type_id]['field_storage_definitions']) || $change_list[$entity_type_id]['field_storage_definitions'][$field_name] !== $op) {
+      return FALSE;
+    }
+
+    if ($reset_cached_definitions) {
+      // self::getChangeList() only disables the cache and does not invalidate.
+      // In case there are changes, explicitly invalidate caches.
+      $this->entityManager->clearCachedDefinitions();
+    }
+
+    $storage_definitions = $this->entityManager->getFieldStorageDefinitions($entity_type_id);
+    $original_storage_definitions = $this->entityManager->getLastInstalledFieldStorageDefinitions($entity_type_id);
+    $storage_definition = isset($storage_definitions[$field_name]) ? $storage_definitions[$field_name] : NULL;
+    $original_storage_definition = isset($original_storage_definitions[$field_name]) ? $original_storage_definitions[$field_name] : NULL;
+
+    $this->doFieldUpdate($op, $storage_definition, $original_storage_definition);
+    return TRUE;
+  }
+
+  /**
+   * Performs an entity type definition update.
+   *
+   * @param string $op
+   *   The operation to perform, either static::DEFINITION_CREATED or
+   *   static::DEFINITION_UPDATED.
+   * @param string $entity_type_id
+   *   The entity type ID.
+   */
+  protected function doEntityUpdate($op, $entity_type_id) {
+    $entity_type = $this->entityManager->getDefinition($entity_type_id);
+    switch ($op) {
+      case static::DEFINITION_CREATED:
+        $this->entityManager->onEntityTypeCreate($entity_type);
+        break;
+
+      case static::DEFINITION_UPDATED:
+        $original = $this->entityManager->getLastInstalledDefinition($entity_type_id);
+        $this->entityManager->onEntityTypeUpdate($entity_type, $original);
+        break;
+    }
+  }
+
+  /**
+   * Performs a field storage definition update.
+   *
+   * @param string $op
+   *   The operation to perform, possible values are static::DEFINITION_CREATED,
+   *   static::DEFINITION_UPDATED or static::DEFINITION_DELETED.
+   * @param array|null $storage_definition
+   *   The new field storage definition.
+   * @param array|null $original_storage_definition
+   *   The original field storage definition.
+   */
+  protected function doFieldUpdate($op, $storage_definition = NULL, $original_storage_definition = NULL) {
+    switch ($op) {
+      case static::DEFINITION_CREATED:
+        $this->entityManager->onFieldStorageDefinitionCreate($storage_definition);
+        break;
+
+      case static::DEFINITION_UPDATED:
+        $this->entityManager->onFieldStorageDefinitionUpdate($storage_definition, $original_storage_definition);
+        break;
+
+      case static::DEFINITION_DELETED:
+        $this->entityManager->onFieldStorageDefinitionDelete($original_storage_definition);
+        break;
+    }
+  }
+
   /**
    * Gets a list of changes to entity type and field storage definitions.
    *
diff --git a/core/lib/Drupal/Core/Entity/EntityDefinitionUpdateManagerInterface.php b/core/lib/Drupal/Core/Entity/EntityDefinitionUpdateManagerInterface.php
index 8eee170df..5946eeed9 100644
--- a/core/lib/Drupal/Core/Entity/EntityDefinitionUpdateManagerInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityDefinitionUpdateManagerInterface.php
@@ -83,4 +83,68 @@ interface EntityDefinitionUpdateManagerInterface {
    */
   public function applyUpdates();
 
+  /**
+   * Performs a single entity definition update.
+   *
+   * This method should be used from hook_update_N() functions to process
+   * entity definition updates as part of the update function. This is only
+   * necessary if the hook_update_N() implementation relies on the entity
+   * definition update. All remaining entity definition updates will be run
+   * automatically after the hook_update_N() implementations.
+   *
+   * @param string $op
+   *   The operation to perform, either static::DEFINITION_CREATED or
+   *   static::DEFINITION_UPDATED.
+   * @param string $entity_type_id
+   *   The entity type to update.
+   * @param bool $reset_cached_definitions
+   *   (optional). Determines whether to clear the Entity Manager's cached
+   *   definitions before applying the update. Defaults to TRUE. Can be used
+   *   to prevent unnecessary cache invalidation when a hook_update_N() makes
+   *   multiple calls to this method.
+   *
+   * @return bool
+   *   TRUE if the entity update is processed, FALSE if not.
+   *
+   * @throws \Drupal\Core\Entity\EntityStorageException
+   *   This exception is thrown if a change cannot be applied without
+   *   unacceptable data loss. In such a case, the site administrator needs to
+   *   apply some other process, such as a custom update function or a
+   *   migration via the Migrate module.
+   */
+  public function applyEntityUpdate($op, $entity_type_id, $reset_cached_definitions = TRUE);
+
+  /**
+   * Performs a single field storage definition update.
+   *
+   * This method should be used from hook_update_N() functions to process field
+   * storage definition updates as part of the update function. This is only
+   * necessary if the hook_update_N() implementation relies on the field storage
+   * definition update. All remaining field storage definition updates will be
+   * run automatically after the hook_update_N() implementations.
+   *
+   * @param string $op
+   *   The operation to perform, possible values are static::DEFINITION_CREATED,
+   *   static::DEFINITION_UPDATED or static::DEFINITION_DELETED.
+   * @param string $entity_type_id
+   *   The entity type to update.
+   * @param string $field_name
+   *   The field name to update.
+   * @param bool $reset_cached_definitions
+   *   (optional). Determines whether to clear the Entity Manager's cached
+   *   definitions before applying the update. Defaults to TRUE. Can be used
+   *   to prevent unnecessary cache invalidation when a hook_update_N() makes
+   *   multiple calls to this method.
+
+   * @return bool
+   *   TRUE if the entity update is processed, FALSE if not.
+   *
+   * @throws \Drupal\Core\Entity\EntityStorageException
+   *   This exception is thrown if a change cannot be applied without
+   *   unacceptable data loss. In such a case, the site administrator needs to
+   *   apply some other process, such as a custom update function or a
+   *   migration via the Migrate module.
+   */
+  public function applyFieldUpdate($op, $entity_type_id, $field_name, $reset_cached_definitions = TRUE);
+
 }
diff --git a/core/lib/Drupal/Core/Entity/EntityDisplayBase.php b/core/lib/Drupal/Core/Entity/EntityDisplayBase.php
index d5cda6511..3a59e0156 100644
--- a/core/lib/Drupal/Core/Entity/EntityDisplayBase.php
+++ b/core/lib/Drupal/Core/Entity/EntityDisplayBase.php
@@ -11,7 +11,6 @@ use Drupal\Core\Config\Entity\ConfigEntityBase;
 use Drupal\Core\Config\Entity\ConfigEntityInterface;
 use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Entity\Display\EntityDisplayInterface;
-use Drupal\Component\Utility\SafeMarkup;
 
 /**
  * Provides a common base class for entity view and form displays.
@@ -262,7 +261,7 @@ abstract class EntityDisplayBase extends ConfigEntityBase implements EntityDispl
       // If the target entity type uses entities to manage its bundles then
       // depend on the bundle entity.
       if (!$bundle_entity = $this->entityManager()->getStorage($bundle_entity_type_id)->load($this->bundle)) {
-        throw new \LogicException(SafeMarkup::format('Missing bundle entity, entity type %type, entity id %bundle.', array('%type' => $bundle_entity_type_id, '%bundle' => $this->bundle)));
+        throw new \LogicException("Missing bundle entity, entity type $bundle_entity_type_id, entity id {$this->bundle}.");
       }
       $this->addDependency('config', $bundle_entity->getConfigDependencyName());
     }
diff --git a/core/lib/Drupal/Core/Entity/EntityForm.php b/core/lib/Drupal/Core/Entity/EntityForm.php
index 6d61d0c60..5450e25fc 100644
--- a/core/lib/Drupal/Core/Entity/EntityForm.php
+++ b/core/lib/Drupal/Core/Entity/EntityForm.php
@@ -101,6 +101,12 @@ class EntityForm extends FormBase implements EntityFormInterface {
       $this->init($form_state);
     }
 
+    // Ensure that edit forms have the correct cacheability metadata so they can
+    // be cached.
+    if (!$this->entity->isNew()) {
+      \Drupal::service('renderer')->addCacheableDependency($form, $this->entity);
+    }
+
     // Retrieve the form array using the possibly updated entity in form state.
     $form = $this->form($form, $form_state);
 
@@ -219,7 +225,6 @@ class EntityForm extends FormBase implements EntityFormInterface {
     $actions['submit'] = array(
       '#type' => 'submit',
       '#value' => $this->t('Save'),
-      '#validate' => array('::validate'),
       '#submit' => array('::submitForm', '::save'),
     );
 
@@ -244,16 +249,6 @@ class EntityForm extends FormBase implements EntityFormInterface {
     return $actions;
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function validate(array $form, FormStateInterface $form_state) {
-    // @todo Remove this.
-    // Execute legacy global validation handlers.
-    $form_state->setValidateHandlers([]);
-    \Drupal::service('form_validator')->executeValidateHandlers($form, $form_state);
-  }
-
   /**
    * {@inheritdoc}
    *
diff --git a/core/lib/Drupal/Core/Entity/EntityFormBuilderInterface.php b/core/lib/Drupal/Core/Entity/EntityFormBuilderInterface.php
index 3549f4cef..04cd09682 100644
--- a/core/lib/Drupal/Core/Entity/EntityFormBuilderInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityFormBuilderInterface.php
@@ -9,12 +9,20 @@ namespace Drupal\Core\Entity;
 
 /**
  * Builds entity forms.
+ *
+ * This is like \Drupal\Core\Form\FormBuilderInterface but instead of looking
+ * up the form class by class name, it looks up the form class based on the
+ * entity type and operation.
  */
 interface EntityFormBuilderInterface {
 
   /**
    * Gets the built and processed entity form for the given entity.
    *
+   * The form may also be retrieved from the cache if the form was built in a
+   * previous page load. The form is then passed on for processing, validation,
+   * and submission if there is proper input.
+   *
    * @param \Drupal\Core\Entity\EntityInterface $entity
    *   The entity to be created or edited.
    * @param string $operation
@@ -23,7 +31,15 @@ interface EntityFormBuilderInterface {
    *   @code
    *   _entity_form: node.book_outline
    *   @endcode
-   *   where "book_outline" is the value of $operation.
+   *   where "book_outline" is the value of $operation. The class name for the
+   *   form for each operation (edit, delete, etc.) can be found in the form
+   *   section of the handlers entity annotation. For example:
+   *   @code
+   *   handlers = {
+   *     "form" = {
+   *       "delete" = "Drupal\node\Form\NodeDeleteForm",
+   *   @endcode
+   *   Alternatively, the form class can be set from hook_entity_type_build().
    * @param array $form_state_additions
    *   (optional) An associative array used to build the current state of the
    *   form. Use this to pass additional information to the form, such as the
@@ -36,6 +52,11 @@ interface EntityFormBuilderInterface {
    *
    * @return array
    *   The processed form for the given entity and operation.
+   *
+   * @see \Drupal\Core\Form\FormBuilderInterface::getForm()
+   * @see \Drupal\Core\Entity\EntityTypeInterface::getFormClass()
+   * @see \Drupal\Core\Entity\EntityTypeInterface::setFormClass()
+   * @see system_entity_type_build()
    */
   public function getForm(EntityInterface $entity, $operation = 'default', array $form_state_additions = array());
 
diff --git a/core/lib/Drupal/Core/Entity/EntityFormInterface.php b/core/lib/Drupal/Core/Entity/EntityFormInterface.php
index 26ce9098a..8ae1a9142 100644
--- a/core/lib/Drupal/Core/Entity/EntityFormInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityFormInterface.php
@@ -94,19 +94,6 @@ interface EntityFormInterface extends BaseFormIdInterface {
    */
   public function buildEntity(array $form, FormStateInterface $form_state);
 
-  /**
-   * Validates the submitted form values of the entity form.
-   *
-   * @param array $form
-   *   A nested array form elements comprising the form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   *
-   * @return \Drupal\Core\Entity\ContentEntityTypeInterface
-   *   The built entity.
-   */
-  public function validate(array $form, FormStateInterface $form_state);
-
   /**
    * Form submission handler for the 'save' action.
    *
diff --git a/core/lib/Drupal/Core/Entity/EntityInterface.php b/core/lib/Drupal/Core/Entity/EntityInterface.php
index 68dafd02a..6bedc92d9 100644
--- a/core/lib/Drupal/Core/Entity/EntityInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityInterface.php
@@ -9,13 +9,14 @@ namespace Drupal\Core\Entity;
 
 use Drupal\Core\Access\AccessibleInterface;
 use Drupal\Core\Cache\CacheableDependencyInterface;
+use Drupal\Core\Cache\RefinableCacheableDependencyInterface;
 
 /**
  * Defines a common interface for all entity objects.
  *
  * @ingroup entity_api
  */
-interface EntityInterface extends AccessibleInterface, CacheableDependencyInterface {
+interface EntityInterface extends AccessibleInterface, CacheableDependencyInterface, RefinableCacheableDependencyInterface {
 
   /**
    * Gets the entity UUID (Universally Unique Identifier).
@@ -348,6 +349,19 @@ interface EntityInterface extends AccessibleInterface, CacheableDependencyInterf
    */
   public function getOriginalId();
 
+  /**
+   * Returns the cache tags that should be used to invalidate caches.
+   *
+   * This will not return additional cache tags added through addCacheTags().
+   *
+   * @return string[]
+   *   Set of cache tags.
+   *
+   * @see \Drupal\Core\Cache\RefinableCacheableDependencyInterface::addCacheTags()
+   * @see \Drupal\Core\Cache\CacheableDependencyInterface::getCacheTags()
+   */
+  public function getCacheTagsToInvalidate();
+
   /**
    * Sets the original ID.
    *
diff --git a/core/lib/Drupal/Core/Entity/EntityListBuilderInterface.php b/core/lib/Drupal/Core/Entity/EntityListBuilderInterface.php
index 67e65a38c..9d1a98c55 100644
--- a/core/lib/Drupal/Core/Entity/EntityListBuilderInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityListBuilderInterface.php
@@ -41,8 +41,7 @@ interface EntityListBuilderInterface {
    *   An associative array of operation link data for this list, keyed by
    *   operation name, containing the following key-value pairs:
    *   - title: The localized title of the operation.
-   *   - href: The path for the operation.
-   *   - options: An array of URL options for the path.
+   *   - url: An instance of \Drupal\Core\Url for the operation URL.
    *   - weight: The weight of this operation.
    */
   public function getOperations(EntityInterface $entity);
diff --git a/core/lib/Drupal/Core/Entity/EntityManager.php b/core/lib/Drupal/Core/Entity/EntityManager.php
index 1e1323e2e..ad0002ed5 100644
--- a/core/lib/Drupal/Core/Entity/EntityManager.php
+++ b/core/lib/Drupal/Core/Entity/EntityManager.php
@@ -9,12 +9,12 @@ namespace Drupal\Core\Entity;
 
 use Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException;
 use Drupal\Component\Plugin\Exception\PluginNotFoundException;
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\Config\Entity\ConfigEntityType;
 use Drupal\Core\DependencyInjection\ClassResolverInterface;
 use Drupal\Core\Entity\Exception\AmbiguousEntityClassException;
+use Drupal\Core\Entity\Exception\InvalidLinkTemplateException;
 use Drupal\Core\Entity\Exception\NoCorrespondingEntityClassException;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Field\BaseFieldDefinition;
@@ -226,6 +226,21 @@ class EntityManager extends DefaultPluginManager implements EntityManagerInterfa
     $this->handlers = array();
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function processDefinition(&$definition, $plugin_id) {
+    /** @var \Drupal\Core\Entity\EntityTypeInterface $definition */
+    parent::processDefinition($definition, $plugin_id);
+
+    // All link templates must have a leading slash.
+    foreach ((array) $definition->getLinkTemplates() as $link_relation_name => $link_template) {
+      if ($link_template[0] != '/') {
+        throw new InvalidLinkTemplateException("Link template '$link_relation_name' for entity type '$plugin_id' must start with a leading slash, the current link template is '$link_template'");
+      }
+    }
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -409,7 +424,7 @@ class EntityManager extends DefaultPluginManager implements EntityManagerInterfa
 
     // Fail with an exception for non-fieldable entity types.
     if (!$entity_type->isSubclassOf('\Drupal\Core\Entity\FieldableEntityInterface')) {
-      throw new \LogicException(SafeMarkup::format('Getting the base fields is not supported for entity type @type.', array('@type' => $entity_type->getLabel())));
+      throw new \LogicException("Getting the base fields is not supported for entity type {$entity_type->getLabel()}.");
     }
 
     // Retrieve base field definitions.
@@ -477,28 +492,19 @@ class EntityManager extends DefaultPluginManager implements EntityManagerInterfa
     // translatable values.
     foreach (array_intersect_key($keys, array_flip(['id', 'revision', 'uuid', 'bundle'])) as $key => $field_name) {
       if (!isset($base_field_definitions[$field_name])) {
-        throw new \LogicException(SafeMarkup::format('The @field field definition does not exist and it is used as @key entity key.', array(
-          '@field' => $field_name,
-          '@key' => $key,
-        )));
+        throw new \LogicException("The $field_name field definition does not exist and it is used as $key entity key.");
       }
       if ($base_field_definitions[$field_name]->isRevisionable()) {
-        throw new \LogicException(SafeMarkup::format('The @field field cannot be revisionable as it is used as @key entity key.', array(
-          '@field' => $base_field_definitions[$field_name]->getLabel(),
-          '@key' => $key,
-        )));
+        throw new \LogicException("The {$base_field_definitions[$field_name]->getLabel()} field cannot be revisionable as it is used as $key entity key.");
       }
       if ($base_field_definitions[$field_name]->isTranslatable()) {
-        throw new \LogicException(SafeMarkup::format('The @field field cannot be translatable as it is used as @key entity key.', array(
-          '@field' => $base_field_definitions[$field_name]->getLabel(),
-          '@key' => $key,
-        )));
+        throw new \LogicException("The {$base_field_definitions[$field_name]->getLabel()} field cannot be translatable as it is used as $key entity key.");
       }
     }
 
     // Make sure translatable entity types define the "langcode" field properly.
     if ($entity_type->isTranslatable() && (!isset($keys['langcode']) || !isset($base_field_definitions[$keys['langcode']]) || !$base_field_definitions[$keys['langcode']]->isTranslatable())) {
-      throw new \LogicException(SafeMarkup::format('The @entity_type entity type cannot be translatable as it does not define a translatable "langcode" field.', array('@entity_type' => $entity_type->getLabel())));
+      throw new \LogicException("The {$entity_type->getLabel()} entity type cannot be translatable as it does not define a translatable \"langcode\" field.");
     }
 
     return $base_field_definitions;
@@ -969,6 +975,7 @@ class EntityManager extends DefaultPluginManager implements EntityManagerInterfa
     if ($entity instanceof TranslatableInterface && count($entity->getTranslationLanguages()) > 1) {
       if (empty($langcode)) {
         $langcode = $this->languageManager->getCurrentLanguage(LanguageInterface::TYPE_CONTENT)->getId();
+        $entity->addCacheContexts(['languages:' . LanguageInterface::TYPE_CONTENT]);
       }
 
       // Retrieve language fallback candidates to perform the entity language
diff --git a/core/lib/Drupal/Core/Entity/EntityStorageBase.php b/core/lib/Drupal/Core/Entity/EntityStorageBase.php
index 55d53176d..f132d8948 100644
--- a/core/lib/Drupal/Core/Entity/EntityStorageBase.php
+++ b/core/lib/Drupal/Core/Entity/EntityStorageBase.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\Core\Entity;
 
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Entity\Query\QueryInterface;
 
 /**
@@ -382,6 +381,34 @@ abstract class EntityStorageBase extends EntityHandlerBase implements EntityStor
    * {@inheritdoc}
    */
   public function save(EntityInterface $entity) {
+    // Track if this entity is new.
+    $is_new = $entity->isNew();
+
+    // Execute presave logic and invoke the related hooks.
+    $id = $this->doPreSave($entity);
+
+    // Perform the save and reset the static cache for the changed entity.
+    $return = $this->doSave($id, $entity);
+
+    // Execute post save logic and invoke the related hooks.
+    $this->doPostSave($entity, !$is_new);
+
+    return $return;
+  }
+
+  /**
+   * Performs presave entity processing.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   The saved entity.
+   *
+   * @return int|string
+   *   The processed entity identifier.
+   *
+   * @throws \Drupal\Core\Entity\EntityStorageException
+   *   If the entity identifier is invalid.
+   */
+  protected function doPreSave(EntityInterface $entity) {
     $id = $entity->id();
 
     // Track the original ID.
@@ -389,14 +416,12 @@ abstract class EntityStorageBase extends EntityHandlerBase implements EntityStor
       $id = $entity->getOriginalId();
     }
 
-    // Track if this entity is new.
-    $is_new = $entity->isNew();
     // Track if this entity exists already.
     $id_exists = $this->has($id, $entity);
 
     // A new entity should not already exist.
-    if ($id_exists && $is_new) {
-      throw new EntityStorageException(SafeMarkup::format('@type entity with ID @id already exists.', array('@type' => $this->entityTypeId, '@id' => $id)));
+    if ($id_exists && $entity->isNew()) {
+      throw new EntityStorageException("'{$this->entityTypeId}' entity with ID '$id' already exists.");
     }
 
     // Load the original entity, if any.
@@ -408,25 +433,7 @@ abstract class EntityStorageBase extends EntityHandlerBase implements EntityStor
     $entity->preSave($this);
     $this->invokeHook('presave', $entity);
 
-    // Perform the save and reset the static cache for the changed entity.
-    $return = $this->doSave($id, $entity);
-    $this->resetCache(array($id));
-
-    // The entity is no longer new.
-    $entity->enforceIsNew(FALSE);
-
-    // Allow code to run after saving.
-    $entity->postSave($this, !$is_new);
-    $this->invokeHook($is_new ? 'insert' : 'update', $entity);
-
-    // After saving, this is now the "original entity", and subsequent saves
-    // will be updates instead of inserts, and updates must always be able to
-    // correctly identify the original entity.
-    $entity->setOriginalId($entity->id());
-
-    unset($entity->original);
-
-    return $return;
+    return $id;
   }
 
   /**
@@ -443,6 +450,32 @@ abstract class EntityStorageBase extends EntityHandlerBase implements EntityStor
    */
   abstract protected function doSave($id, EntityInterface $entity);
 
+  /**
+   * Performs post save entity processing.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   The saved entity.
+   * @param bool $update
+   *   Specifies whether the entity is being updated or created.
+   */
+  protected function doPostSave(EntityInterface $entity, $update) {
+    $this->resetCache(array($entity->id()));
+
+    // The entity is no longer new.
+    $entity->enforceIsNew(FALSE);
+
+    // Allow code to run after saving.
+    $entity->postSave($this, $update);
+    $this->invokeHook($update ? 'update' : 'insert', $entity);
+
+    // After saving, this is now the "original entity", and subsequent saves
+    // will be updates instead of inserts, and updates must always be able to
+    // correctly identify the original entity.
+    $entity->setOriginalId($entity->id());
+
+    unset($entity->original);
+  }
+
   /**
    * Builds an entity query.
    *
diff --git a/core/lib/Drupal/Core/Entity/EntityStorageInterface.php b/core/lib/Drupal/Core/Entity/EntityStorageInterface.php
index 98cd4b419..f7b4b4a46 100644
--- a/core/lib/Drupal/Core/Entity/EntityStorageInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityStorageInterface.php
@@ -79,7 +79,7 @@ interface EntityStorageInterface {
   /**
    * Load a specific entity revision.
    *
-   * @param int $revision_id
+   * @param int|string $revision_id
    *   The revision id.
    *
    * @return \Drupal\Core\Entity\EntityInterface|null
diff --git a/core/lib/Drupal/Core/Entity/EntityType.php b/core/lib/Drupal/Core/Entity/EntityType.php
index e121d751e..31c792321 100644
--- a/core/lib/Drupal/Core/Entity/EntityType.php
+++ b/core/lib/Drupal/Core/Entity/EntityType.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\Core\Entity;
 
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Entity\Exception\EntityTypeIdLengthException;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
@@ -245,12 +244,7 @@ class EntityType implements EntityTypeInterface {
   public function __construct($definition) {
     // Throw an exception if the entity type ID is longer than 32 characters.
     if (Unicode::strlen($definition['id']) > static::ID_MAX_LENGTH) {
-      throw new EntityTypeIdLengthException(SafeMarkup::format(
-        'Attempt to create an entity type with an ID longer than @max characters: @id.', array(
-          '@max' => static::ID_MAX_LENGTH,
-          '@id' => $definition['id'],
-        )
-      ));
+      throw new EntityTypeIdLengthException('Attempt to create an entity type with an ID longer than ' . static::ID_MAX_LENGTH . " characters: {$definition['id']}.");
     }
 
     foreach ($definition as $property => $value) {
diff --git a/core/lib/Drupal/Core/Entity/EntityViewBuilder.php b/core/lib/Drupal/Core/Entity/EntityViewBuilder.php
index 09736d223..957c1e42f 100644
--- a/core/lib/Drupal/Core/Entity/EntityViewBuilder.php
+++ b/core/lib/Drupal/Core/Entity/EntityViewBuilder.php
@@ -117,14 +117,10 @@ class EntityViewBuilder extends EntityHandlerBase implements EntityHandlerInterf
    * {@inheritdoc}
    */
   public function viewMultiple(array $entities = array(), $view_mode = 'full', $langcode = NULL) {
-    if (!isset($langcode)) {
-      $langcode = $this->languageManager->getCurrentLanguage(LanguageInterface::TYPE_CONTENT)->getId();
-    }
-
     $build_list = array(
       '#sorted' => TRUE,
       '#pre_render' => array(array($this, 'buildMultiple')),
-      '#langcode' => $langcode,
+      '#langcode' => $langcode ?: $this->languageManager->getCurrentLanguage(LanguageInterface::TYPE_CONTENT)->getId(),
     );
     $weight = 0;
     foreach ($entities as $key => $entity) {
@@ -133,9 +129,10 @@ class EntityViewBuilder extends EntityHandlerBase implements EntityHandlerInterf
       $entity = $this->entityManager->getTranslationFromContext($entity, $langcode);
 
       // Set build defaults.
-      $build_list[$key] = $this->getBuildDefaults($entity, $view_mode, $langcode);
+      $entity_langcode = $entity->language()->getId();
+      $build_list[$key] = $this->getBuildDefaults($entity, $view_mode, $entity_langcode);
       $entityType = $this->entityTypeId;
-      $this->moduleHandler()->alter(array($entityType . '_build_defaults', 'entity_build_defaults'), $build_list[$key], $entity, $view_mode, $langcode);
+      $this->moduleHandler()->alter(array($entityType . '_build_defaults', 'entity_build_defaults'), $build_list[$key], $entity, $view_mode, $entity_langcode);
 
       $build_list[$key]['#weight'] = $weight++;
     }
@@ -368,7 +365,8 @@ class EntityViewBuilder extends EntityHandlerBase implements EntityHandlerInterf
     if (isset($entities)) {
       $tags = [];
       foreach ($entities as $entity) {
-        $tags = Cache::mergeTags($tags, $entity->getCacheTags(), $entity->getEntityType()->getListCacheTags());
+        $tags = Cache::mergeTags($tags, $entity->getCacheTags());
+        $tags = Cache::mergeTags($tags, $entity->getEntityType()->getListCacheTags());
       }
       Cache::invalidateTags($tags);
     }
diff --git a/core/lib/Drupal/Core/Entity/Exception/InvalidLinkTemplateException.php b/core/lib/Drupal/Core/Entity/Exception/InvalidLinkTemplateException.php
new file mode 100644
index 000000000..f64d39fc4
--- /dev/null
+++ b/core/lib/Drupal/Core/Entity/Exception/InvalidLinkTemplateException.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @file
+ * Contains \Drupal\Core\Entity\Exception\InvalidLinkTemplateException.
+ */
+
+namespace Drupal\Core\Entity\Exception;
+
+/**
+ * Indicates that a link template does not follow the required pattern.
+ */
+class InvalidLinkTemplateException extends \Exception {
+
+}
diff --git a/core/lib/Drupal/Core/Entity/FieldableEntityInterface.php b/core/lib/Drupal/Core/Entity/FieldableEntityInterface.php
index b4a196026..a83548b53 100644
--- a/core/lib/Drupal/Core/Entity/FieldableEntityInterface.php
+++ b/core/lib/Drupal/Core/Entity/FieldableEntityInterface.php
@@ -175,7 +175,7 @@ interface FieldableEntityInterface extends EntityInterface {
   public function set($field_name, $value, $notify = TRUE);
 
   /**
-   * Gets an array of field item lists.
+   * Gets an array of all field item lists.
    *
    * @param bool $include_computed
    *   If set to TRUE, computed fields are included. Defaults to TRUE.
@@ -185,6 +185,17 @@ interface FieldableEntityInterface extends EntityInterface {
    */
   public function getFields($include_computed = TRUE);
 
+  /**
+   * Gets an array of field item lists for translatable fields.
+   *
+   * @param bool $include_computed
+   *   If set to TRUE, computed fields are included. Defaults to TRUE.
+   *
+   * @return \Drupal\Core\Field\FieldItemListInterface[]
+   *   An array of field item lists implementing, keyed by field name.
+   */
+  public function getTranslatableFields($include_computed = TRUE);
+
   /**
    * Reacts to changes to a field.
    *
@@ -212,4 +223,22 @@ interface FieldableEntityInterface extends EntityInterface {
    */
   public function validate();
 
+  /**
+   * Checks whether entity validation is required before saving the entity.
+   *
+   * @return bool
+   *   TRUE if validation is required, FALSE if not.
+   */
+  public function isValidationRequired();
+
+  /**
+   * Sets whether entity validation is required before saving the entity.
+   *
+   * @param bool $required
+   *   TRUE if validation is required, FALSE otherwise.
+   *
+   * @return $this
+   */
+  public function setValidationRequired($required);
+
 }
diff --git a/core/lib/Drupal/Core/Entity/KeyValueStore/KeyValueEntityStorage.php b/core/lib/Drupal/Core/Entity/KeyValueStore/KeyValueEntityStorage.php
index 5d8ac59cb..5bb104922 100644
--- a/core/lib/Drupal/Core/Entity/KeyValueStore/KeyValueEntityStorage.php
+++ b/core/lib/Drupal/Core/Entity/KeyValueStore/KeyValueEntityStorage.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\Core\Entity\KeyValueStore;
 
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Uuid\UuidInterface;
 use Drupal\Core\Config\Entity\Exception\ConfigEntityIdLengthException;
 use Drupal\Core\Entity\FieldableEntityInterface;
@@ -167,10 +166,7 @@ class KeyValueEntityStorage extends EntityStorageBase {
     // @todo This is not config-specific, but serial IDs will likely never hit
     //   this limit. Consider renaming the exception class.
     if (strlen($entity->id()) > static::MAX_ID_LENGTH) {
-      throw new ConfigEntityIdLengthException(SafeMarkup::format('Entity ID @id exceeds maximum allowed length of @length characters.', array(
-        '@id' => $entity->id(),
-        '@length' => static::MAX_ID_LENGTH,
-      )));
+      throw new ConfigEntityIdLengthException("Entity ID {$entity->id()} exceeds maximum allowed length of " . static::MAX_ID_LENGTH . ' characters.');
     }
     return parent::save($entity);
   }
diff --git a/core/lib/Drupal/Core/Entity/Plugin/DataType/EntityAdapter.php b/core/lib/Drupal/Core/Entity/Plugin/DataType/EntityAdapter.php
index 305230bbc..054d101ba 100644
--- a/core/lib/Drupal/Core/Entity/Plugin/DataType/EntityAdapter.php
+++ b/core/lib/Drupal/Core/Entity/Plugin/DataType/EntityAdapter.php
@@ -81,12 +81,12 @@ class EntityAdapter extends TypedData implements \IteratorAggregate, ComplexData
    */
   public function get($property_name) {
     if (!isset($this->entity)) {
-      throw new MissingDataException(SafeMarkup::format('Unable to get property @name as no entity has been provided.', array('@name' => $property_name)));
+      throw new MissingDataException("Unable to get property $property_name as no entity has been provided.");
     }
     if (!$this->entity instanceof FieldableEntityInterface) {
       // @todo: Add support for config entities in
       // https://www.drupal.org/node/1818574.
-      throw new \InvalidArgumentException(SafeMarkup::format('Unable to get unknown property @name.', array('@name' => $property_name)));
+      throw new \InvalidArgumentException("Unable to get unknown property $property_name.");
     }
     // This will throw an exception for unknown fields.
     return $this->entity->get($property_name);
@@ -97,12 +97,12 @@ class EntityAdapter extends TypedData implements \IteratorAggregate, ComplexData
    */
   public function set($property_name, $value, $notify = TRUE) {
     if (!isset($this->entity)) {
-      throw new MissingDataException(SafeMarkup::format('Unable to set property @name as no entity has been provided.', array('@name' => $property_name)));
+      throw new MissingDataException("Unable to set property $property_name as no entity has been provided.");
     }
     if (!$this->entity instanceof FieldableEntityInterface) {
       // @todo: Add support for config entities in
       // https://www.drupal.org/node/1818574.
-      throw new \InvalidArgumentException(SafeMarkup::format('Unable to set unknown property @name.', array('@name' => $property_name)));
+      throw new \InvalidArgumentException("Unable to set unknown property $property_name.");
     }
     // This will throw an exception for unknown fields.
     $this->entity->set($property_name, $value, $notify);
@@ -129,7 +129,7 @@ class EntityAdapter extends TypedData implements \IteratorAggregate, ComplexData
    */
   public function toArray() {
     if (!isset($this->entity)) {
-      throw new MissingDataException(SafeMarkup::format('Unable to get property values as no entity has been provided.'));
+      throw new MissingDataException('Unable to get property values as no entity has been provided.');
     }
     return $this->entity->toArray();
   }
@@ -151,13 +151,6 @@ class EntityAdapter extends TypedData implements \IteratorAggregate, ComplexData
     }
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function getDataDefinition() {
-    return $this->definition;
-  }
-
   /**
    * {@inheritdoc}
    */
diff --git a/core/lib/Drupal/Core/Entity/Query/ConditionFundamentals.php b/core/lib/Drupal/Core/Entity/Query/ConditionFundamentals.php
index 195479d29..b93e192c2 100644
--- a/core/lib/Drupal/Core/Entity/Query/ConditionFundamentals.php
+++ b/core/lib/Drupal/Core/Entity/Query/ConditionFundamentals.php
@@ -36,15 +36,27 @@ abstract class ConditionFundamentals {
    */
   protected $query;
 
+  /**
+   * List of potential namespaces of the classes belonging to this condition.
+   *
+   * @var array
+   */
+  protected $namespaces = array();
+
   /**
    * Constructs a Condition object.
    *
    * @param string $conjunction
    *   The operator to use to combine conditions: 'AND' or 'OR'.
+   * @param QueryInterface $query
+   *   The entity query this condition belongs to.
+   * @param array $namespaces
+   *   List of potential namespaces of the classes belonging to this condition.
    */
-  public function __construct($conjunction, QueryInterface $query) {
+  public function __construct($conjunction, QueryInterface $query, $namespaces = []) {
     $this->conjunction = $conjunction;
     $this->query = $query;
+    $this->namespaces = $namespaces;
   }
 
   /**
diff --git a/core/lib/Drupal/Core/Entity/Query/Sql/Condition.php b/core/lib/Drupal/Core/Entity/Query/Sql/Condition.php
index f34df0e93..1ee2c3da8 100644
--- a/core/lib/Drupal/Core/Entity/Query/Sql/Condition.php
+++ b/core/lib/Drupal/Core/Entity/Query/Sql/Condition.php
@@ -7,10 +7,10 @@
 
 namespace Drupal\Core\Entity\Query\Sql;
 
-use Drupal\Core\Entity\Query\ConditionBase;
-use Drupal\Core\Entity\Query\ConditionInterface;
 use Drupal\Core\Database\Query\SelectInterface;
 use Drupal\Core\Database\Query\Condition as SqlCondition;
+use Drupal\Core\Entity\Query\ConditionBase;
+use Drupal\Core\Entity\Query\ConditionInterface;
 
 /**
  * Implements entity query conditions for SQL databases.
@@ -28,6 +28,7 @@ class Condition extends ConditionBase {
    * {@inheritdoc}
    */
   public function compile($conditionContainer) {
+
     // If this is not the top level condition group then the sql query is
     // added to the $conditionContainer object by this function itself. The
     // SQL query object is only necessary to pass to Query::addField() so it
@@ -41,13 +42,21 @@ class Condition extends ConditionBase {
         // Add the SQL query to the object before calling this method again.
         $sql_condition->sqlQuery = $sql_query;
         $condition['field']->compile($sql_condition);
-        $sql_query->condition($sql_condition);
+        $conditionContainer->condition($sql_condition);
       }
       else {
         $type = strtoupper($this->conjunction) == 'OR' || $condition['operator'] == 'IS NULL' ? 'LEFT' : 'INNER';
         $field = $tables->addField($condition['field'], $type, $condition['langcode']);
+        $condition['real_field'] = $field;
         static::translateCondition($condition, $sql_query, $tables->isFieldCaseSensitive($condition['field']));
-        $conditionContainer->condition($field, $condition['value'], $condition['operator']);
+
+        // Add the translated conditions back to the condition container.
+        if (isset($condition['where']) && isset($condition['where_args'])) {
+          $conditionContainer->where($condition['where'], $condition['where_args']);
+        }
+        else {
+          $conditionContainer->condition($field, $condition['value'], $condition['operator']);
+        }
       }
     }
   }
@@ -80,10 +89,11 @@ class Condition extends ConditionBase {
    * @see \Drupal\Core\Database\Query\ConditionInterface::condition()
    */
   public static function translateCondition(&$condition, SelectInterface $sql_query, $case_sensitive) {
-    // There is nothing we can do for IN ().
+    // // There is nothing we can do for IN ().
     if (is_array($condition['value'])) {
       return;
     }
+
     // Ensure that the default operator is set to simplify the cases below.
     if (empty($condition['operator'])) {
       $condition['operator'] = '=';
diff --git a/core/lib/Drupal/Core/Entity/Query/Sql/ConditionAggregate.php b/core/lib/Drupal/Core/Entity/Query/Sql/ConditionAggregate.php
index 584a883c6..9db67ea73 100644
--- a/core/lib/Drupal/Core/Entity/Query/Sql/ConditionAggregate.php
+++ b/core/lib/Drupal/Core/Entity/Query/Sql/ConditionAggregate.php
@@ -11,6 +11,7 @@ use Drupal\Core\Database\Query\SelectInterface;
 use Drupal\Core\Entity\Query\ConditionAggregateBase;
 use Drupal\Core\Entity\Query\ConditionAggregateInterface;
 use Drupal\Core\Database\Query\Condition as SqlCondition;
+use Drupal\Core\Entity\Query\QueryBase;
 
 /**
  * Defines the aggregate condition for sql based storage.
@@ -39,7 +40,8 @@ class ConditionAggregate extends ConditionAggregateBase {
       else {
         $type = ((strtoupper($this->conjunction) == 'OR') || ($condition['operator'] == 'IS NULL')) ? 'LEFT' : 'INNER';
         $field = $tables->addField($condition['field'], $type, $condition['langcode']);
-        Condition::translateCondition($condition, $sql_query, $tables->isFieldCaseSensitive($condition['field']));
+        $condition_class = QueryBase::getClass($this->namespaces, 'Condition');
+        $condition_class::translateCondition($condition, $sql_query, $tables->isFieldCaseSensitive($condition['field']));
         $function = $condition['function'];
         $placeholder = ':db_placeholder_' . $conditionContainer->nextPlaceholder();
         $conditionContainer->having("$function($field) {$condition['operator']} $placeholder", array($placeholder => $condition['value']));
diff --git a/core/lib/Drupal/Core/Entity/Query/Sql/QueryAggregate.php b/core/lib/Drupal/Core/Entity/Query/Sql/QueryAggregate.php
index c76a773e6..1d5a16e84 100644
--- a/core/lib/Drupal/Core/Entity/Query/Sql/QueryAggregate.php
+++ b/core/lib/Drupal/Core/Entity/Query/Sql/QueryAggregate.php
@@ -52,7 +52,8 @@ class QueryAggregate extends Query implements QueryAggregateInterface {
    * Implements \Drupal\Core\Entity\Query\QueryAggregateInterface::conditionAggregateGroupFactory().
    */
   public function conditionAggregateGroupFactory($conjunction = 'AND') {
-    return new ConditionAggregate($conjunction, $this);
+    $class = static::getClass($this->namespaces, 'ConditionAggregate');
+    return new $class($conjunction, $this, $this->namespaces);
   }
 
   /**
diff --git a/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php b/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php
index 98f4f843a..e1a976ac9 100644
--- a/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php
+++ b/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php
@@ -215,7 +215,7 @@ class Tables implements TablesInterface {
           $index_prefix .= "$next_index_prefix.";
         }
         else {
-          throw new QueryException(format_string('Invalid specifier @next.', array('@next' => $relationship_specifier)));
+          throw new QueryException("Invalid specifier '$relationship_specifier'");
         }
       }
     }
@@ -247,7 +247,7 @@ class Tables implements TablesInterface {
         return $this->entityTables[$index_prefix . $table];
       }
     }
-    throw new QueryException(format_string('@property not found', array('@property' => $property)));
+    throw new QueryException("'$property' not found");
   }
 
   /**
diff --git a/core/lib/Drupal/Core/Entity/Query/Sql/pgsql/Condition.php b/core/lib/Drupal/Core/Entity/Query/Sql/pgsql/Condition.php
new file mode 100644
index 000000000..cb4a9af54
--- /dev/null
+++ b/core/lib/Drupal/Core/Entity/Query/Sql/pgsql/Condition.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Entity\Query\Sql\pgsql\Condition.
+ */
+
+namespace Drupal\Core\Entity\Query\Sql\pgsql;
+
+use Drupal\Core\Database\Query\SelectInterface;
+use Drupal\Core\Entity\Query\Sql\Condition as BaseCondition;
+
+/**
+ * Implements entity query conditions for PostgreSQL databases.
+ */
+class Condition extends BaseCondition {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function translateCondition(&$condition, SelectInterface $sql_query, $case_sensitive) {
+    if (is_array($condition['value']) && $case_sensitive === FALSE) {
+      $condition['where'] = 'LOWER(' . $sql_query->escapeField($condition['real_field']) . ') ' . $condition['operator'] . ' (';
+      $condition['where_args'] = [];
+
+      $n = 1;
+      // Only use the array values in case an associative array is passed as an
+      // argument following similar pattern in
+      // \Drupal\Core\Database\Connection::expandArguments().
+      foreach ($condition['value'] as $value) {
+        $condition['where'] .= 'LOWER(:value' . $n . '),';
+        $condition['where_args'][':value' . $n] = $value;
+        $n++;
+      }
+      $condition['where'] = trim($condition['where'], ',');
+      $condition['where'] .= ')';
+      return;
+    }
+    parent::translateCondition($condition, $sql_query, $case_sensitive);
+  }
+}
diff --git a/core/lib/Drupal/Core/Entity/Query/Sql/pgsql/QueryFactory.php b/core/lib/Drupal/Core/Entity/Query/Sql/pgsql/QueryFactory.php
new file mode 100644
index 000000000..fb43f13cc
--- /dev/null
+++ b/core/lib/Drupal/Core/Entity/Query/Sql/pgsql/QueryFactory.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Entity\Query\Sql\pgsql\QueryFactory.
+ */
+
+
+namespace Drupal\Core\Entity\Query\Sql\pgsql;
+
+use Drupal\Core\Entity\Query\Sql\QueryFactory as BaseQueryFactory;
+
+/**
+ * PostgreSQL specific entity query implementation.
+ *
+ * To add a new query implementation extending the default SQL one, add
+ * a service definition like pgsql.entity.query.sql and a factory class like
+ * this. The system will automatically find the relevant Query, QueryAggregate,
+ * Condition, ConditionAggregate, Tables classes in this namespace, in the
+ * namespace of the parent class and so on. So after creating an empty query
+ * factory class like this, it is possible to just drop in a class extending
+ * the base class in this namespace and it will be used automatically but it
+ * is optional: if a class is not extended the relevant default is used.
+ *
+ * @see \Drupal\Core\Entity\Query\QueryBase::getNamespaces()
+ * @see \Drupal\Core\Entity\Query\QueryBase::getClass()
+ */
+class QueryFactory extends BaseQueryFactory {
+
+}
diff --git a/core/lib/Drupal/Core/Entity/Sql/DefaultTableMapping.php b/core/lib/Drupal/Core/Entity/Sql/DefaultTableMapping.php
index ac12621d1..b70127911 100644
--- a/core/lib/Drupal/Core/Entity/Sql/DefaultTableMapping.php
+++ b/core/lib/Drupal/Core/Entity/Sql/DefaultTableMapping.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\Core\Entity\Sql;
 
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Entity\ContentEntityTypeInterface;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 
@@ -178,7 +177,7 @@ class DefaultTableMapping implements TableMappingInterface {
     }
 
     if (!isset($result)) {
-      throw new SqlContentEntityStorageException(SafeMarkup::format('Table information not available for the "@field_name" field.', array('@field_name' => $field_name)));
+      throw new SqlContentEntityStorageException("Table information not available for the '$field_name' field.");
     }
 
     return $result;
@@ -211,7 +210,7 @@ class DefaultTableMapping implements TableMappingInterface {
       $column_name = !in_array($property_name, $this->getReservedColumns()) ? $field_name . '_' . $property_name : $property_name;
     }
     else {
-      throw new SqlContentEntityStorageException(SafeMarkup::format('Column information not available for the "@field_name" field.', array('@field_name' => $field_name)));
+      throw new SqlContentEntityStorageException("Column information not available for the '$field_name' field.");
     }
 
     return $column_name;
diff --git a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
index 4c8aff5cb..689655af2 100644
--- a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
+++ b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\Core\Entity\Sql;
 
-use Drupal\Component\Utility\SafeMarkup;
-use Drupal\Core\Cache\Cache;
 use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Database\Database;
@@ -22,7 +20,6 @@ use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Entity\Query\QueryInterface;
 use Drupal\Core\Entity\Schema\DynamicallyFieldableEntityStorageSchemaInterface;
 use Drupal\Core\Field\FieldDefinitionInterface;
-use Drupal\Core\Field\FieldItemListInterface;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\field\FieldStorageConfigInterface;
@@ -109,13 +106,6 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
    */
   protected $database;
 
-  /**
-   * The entity manager.
-   *
-   * @var \Drupal\Core\Entity\EntityManagerInterface
-   */
-  protected $entityManager;
-
   /**
    * The entity type's storage schema object.
    *
@@ -123,13 +113,6 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
    */
   protected $storageSchema;
 
-  /**
-   * Cache backend.
-   *
-   * @var \Drupal\Core\Cache\CacheBackendInterface
-   */
-  protected $cacheBackend;
-
   /**
    * The language manager.
    *
@@ -176,10 +159,8 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
    *   The language manager.
    */
   public function __construct(EntityTypeInterface $entity_type, Connection $database, EntityManagerInterface $entity_manager, CacheBackendInterface $cache, LanguageManagerInterface $language_manager) {
-    parent::__construct($entity_type);
+    parent::__construct($entity_type, $entity_manager, $cache);
     $this->database = $database;
-    $this->entityManager = $entity_manager;
-    $this->cacheBackend = $cache;
     $this->languageManager = $language_manager;
     $this->initTableLayout();
   }
@@ -284,7 +265,7 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
       $this->initTableLayout();
     }
     else {
-      throw new EntityStorageException(SafeMarkup::format('Unsupported entity type @id', array('@id' => $entity_type->id())));
+      throw new EntityStorageException("Unsupported entity type {$entity_type->id()}");
     }
   }
 
@@ -414,8 +395,10 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
     $entities_from_cache = $this->getFromPersistentCache($ids);
 
     // Load any remaining entities from the database.
-    $entities_from_storage = $this->getFromStorage($ids);
-    $this->setPersistentCache($entities_from_storage);
+    if ($entities_from_storage = $this->getFromStorage($ids)) {
+      $this->invokeStorageLoadHook($entities_from_storage);
+      $this->setPersistentCache($entities_from_storage);
+    }
 
     return $entities_from_cache + $entities_from_storage;
   }
@@ -447,157 +430,12 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
       // Map the loaded records into entity objects and according fields.
       if ($records) {
         $entities = $this->mapFromStorageRecords($records);
-
-        // Call hook_entity_storage_load().
-        foreach ($this->moduleHandler()->getImplementations('entity_storage_load') as $module) {
-          $function = $module . '_entity_storage_load';
-          $function($entities, $this->entityTypeId);
-        }
-        // Call hook_TYPE_storage_load().
-        foreach ($this->moduleHandler()->getImplementations($this->entityTypeId . '_storage_load') as $module) {
-          $function = $module . '_' . $this->entityTypeId . '_storage_load';
-          $function($entities);
-        }
       }
     }
 
     return $entities;
   }
 
-  /**
-   * Ensures integer entity IDs are valid.
-   *
-   * The identifier sanitization provided by this method has been introduced
-   * as Drupal used to rely on the database to facilitate this, which worked
-   * correctly with MySQL but led to errors with other DBMS such as PostgreSQL.
-   *
-   * @param array $ids
-   *   The entity IDs to verify.
-   * @return array
-   *   The sanitized list of entity IDs.
-   */
-  protected function cleanIds(array $ids) {
-    $definitions = $this->entityManager->getBaseFieldDefinitions($this->entityTypeId);
-    $id_definition = $definitions[$this->entityType->getKey('id')];
-    if ($id_definition->getType() == 'integer') {
-      $ids = array_filter($ids, function ($id) {
-        return is_numeric($id) && $id == (int) $id;
-      });
-      $ids = array_map('intval', $ids);
-    }
-    return $ids;
-  }
-
-  /**
-   * Gets entities from the persistent cache backend.
-   *
-   * @param array|null &$ids
-   *   If not empty, return entities that match these IDs. IDs that were found
-   *   will be removed from the list.
-   *
-   * @return \Drupal\Core\Entity\ContentEntityInterface[]
-   *   Array of entities from the persistent cache.
-   */
-  protected function getFromPersistentCache(array &$ids = NULL) {
-    if (!$this->entityType->isPersistentlyCacheable() || empty($ids)) {
-      return array();
-    }
-    $entities = array();
-    // Build the list of cache entries to retrieve.
-    $cid_map = array();
-    foreach ($ids as $id) {
-      $cid_map[$id] = $this->buildCacheId($id);
-    }
-    $cids = array_values($cid_map);
-    if ($cache = $this->cacheBackend->getMultiple($cids)) {
-      // Get the entities that were found in the cache.
-      foreach ($ids as $index => $id) {
-        $cid = $cid_map[$id];
-        if (isset($cache[$cid])) {
-          $entities[$id] = $cache[$cid]->data;
-          unset($ids[$index]);
-        }
-      }
-    }
-    return $entities;
-  }
-
-  /**
-   * Stores entities in the persistent cache backend.
-   *
-   * @param \Drupal\Core\Entity\ContentEntityInterface[] $entities
-   *   Entities to store in the cache.
-   */
-  protected function setPersistentCache($entities) {
-    if (!$this->entityType->isPersistentlyCacheable()) {
-      return;
-    }
-
-    $cache_tags = array(
-      $this->entityTypeId . '_values',
-      'entity_field_info',
-    );
-    foreach ($entities as $id => $entity) {
-      $this->cacheBackend->set($this->buildCacheId($id), $entity, CacheBackendInterface::CACHE_PERMANENT, $cache_tags);
-    }
-  }
-
-  /**
-   * Invokes hook_entity_load_uncached().
-   *
-   * @param \Drupal\Core\Entity\ContentEntityInterface[] $entities
-   *   List of entities, keyed on the entity ID.
-   */
-  protected function invokeLoadUncachedHook(array &$entities) {
-    if (!empty($entities)) {
-      // Call hook_entity_load_uncached().
-      foreach ($this->moduleHandler()->getImplementations('entity_load_uncached') as $module) {
-        $function = $module . '_entity_load_uncached';
-        $function($entities, $this->entityTypeId);
-      }
-      // Call hook_TYPE_load_uncached().
-      foreach ($this->moduleHandler()->getImplementations($this->entityTypeId . '_load_uncached') as $module) {
-        $function = $module . '_' . $this->entityTypeId . '_load_uncached';
-        $function($entities);
-      }
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function resetCache(array $ids = NULL) {
-    if ($ids) {
-      $cids = array();
-      foreach ($ids as $id) {
-        unset($this->entities[$id]);
-        $cids[] = $this->buildCacheId($id);
-      }
-      if ($this->entityType->isPersistentlyCacheable()) {
-        $this->cacheBackend->deleteMultiple($cids);
-      }
-    }
-    else {
-      $this->entities = array();
-      if ($this->entityType->isPersistentlyCacheable()) {
-        Cache::invalidateTags(array($this->entityTypeId . '_values'));
-      }
-    }
-  }
-
-  /**
-   * Builds the cache ID for the passed in entity ID.
-   *
-   * @param int $id
-   *   Entity ID for which the cache ID should be built.
-   *
-   * @return string
-   *   Cache ID that can be passed to the cache backend.
-   */
-  protected function buildCacheId($id) {
-    return "values:{$this->entityTypeId}:$id";
-  }
-
   /**
    * Maps from storage records to entity objects, and attaches fields.
    *
@@ -727,7 +565,9 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
   /**
    * {@inheritdoc}
    */
-  public function loadRevision($revision_id) {
+  protected function doLoadRevisionFieldItems($revision_id) {
+    $revision = NULL;
+
     // Build and execute the query.
     $query_result = $this->buildQuery(array(), $revision_id)->execute();
     $records = $query_result->fetchAllAssoc($this->idKey);
@@ -735,31 +575,20 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
     if (!empty($records)) {
       // Convert the raw records to entity objects.
       $entities = $this->mapFromStorageRecords($records, TRUE);
-      $this->postLoad($entities);
-      $entity = reset($entities);
-      if ($entity) {
-        return $entity;
-      }
+      $revision = reset($entities) ?: NULL;
     }
+
+    return $revision;
   }
 
   /**
-   * Implements \Drupal\Core\Entity\EntityStorageInterface::deleteRevision().
+   * {@inheritdoc}
    */
-  public function deleteRevision($revision_id) {
-    if ($revision = $this->loadRevision($revision_id)) {
-      // Prevent deletion if this is the default revision.
-      if ($revision->isDefaultRevision()) {
-        throw new EntityStorageException('Default revision can not be deleted');
-      }
-
-      $this->database->delete($this->revisionTable)
-        ->condition($this->revisionKey, $revision->getRevisionId())
-        ->execute();
-      $this->invokeFieldMethod('deleteRevision', $revision);
-      $this->deleteRevisionFromDedicatedTables($revision);
-      $this->invokeHook('revision_delete', $revision);
-    }
+  protected function doDeleteRevisionFieldItems(ContentEntityInterface $revision) {
+    $this->database->delete($this->revisionTable)
+      ->condition($this->revisionKey, $revision->getRevisionId())
+      ->execute();
+    $this->deleteRevisionFromDedicatedTables($revision);
   }
 
   /**
@@ -878,7 +707,7 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
   /**
    * {@inheritdoc}
    */
-  protected function doDelete($entities) {
+  protected function doDeleteFieldItems($entities) {
     $ids = array_keys($entities);
 
     $this->database->delete($this->entityType->getBaseTable())
@@ -904,7 +733,6 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
     }
 
     foreach ($entities as $entity) {
-      $this->invokeFieldMethod('delete', $entity);
       $this->deleteFromDedicatedTables($entity);
     }
   }
@@ -915,9 +743,6 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
   public function save(EntityInterface $entity) {
     $transaction = $this->database->startTransaction();
     try {
-      // Sync the changes made in the fields array to the internal values array.
-      $entity->updateOriginalValues();
-
       $return = parent::save($entity);
 
       // Ignore replica server temporarily.
@@ -934,75 +759,97 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
   /**
    * {@inheritdoc}
    */
-  protected function doSave($id, EntityInterface $entity) {
-    // Create the storage record to be saved.
-    $record = $this->mapToStorageRecord($entity);
+  protected function doSaveFieldItems(ContentEntityInterface $entity, array $names = []) {
+    $full_save = empty($names);
+    $update = !$full_save || !$entity->isNew();
 
-    $is_new = $entity->isNew();
-    if (!$is_new) {
-      if ($entity->isDefaultRevision()) {
-        $this->database
-          ->update($this->baseTable)
-          ->fields((array) $record)
-          ->condition($this->idKey, $record->{$this->idKey})
-          ->execute();
-        $return = SAVED_UPDATED;
-      }
-      else {
-        // @todo, should a different value be returned when saving an entity
-        // with $isDefaultRevision = FALSE?
-        $return = FALSE;
-      }
-      if ($this->revisionTable) {
-        $entity->{$this->revisionKey}->value = $this->saveRevision($entity);
-      }
-      if ($this->dataTable) {
-        $this->populateAffectedRevisionTranslations($entity);
-        $this->saveToSharedTables($entity);
-      }
-      if ($this->revisionDataTable) {
-        $this->saveToSharedTables($entity, $this->revisionDataTable);
-      }
+    if ($full_save) {
+      $shared_table_fields = TRUE;
+      $dedicated_table_fields = TRUE;
     }
     else {
-      // Ensure the entity is still seen as new after assigning it an id,
-      // while storing its data.
-      $entity->enforceIsNew();
-      $insert_id = $this->database
-        ->insert($this->baseTable, array('return' => Database::RETURN_INSERT_ID))
-        ->fields((array) $record)
-        ->execute();
-      // Even if this is a new entity the ID key might have been set, in which
-      // case we should not override the provided ID. An ID key that is not set
-      // to any value is interpreted as NULL (or DEFAULT) and thus overridden.
-      if (!isset($record->{$this->idKey})) {
-        $record->{$this->idKey} = $insert_id;
-      }
-      $return = SAVED_NEW;
-      $entity->{$this->idKey}->value = (string) $record->{$this->idKey};
-      if ($this->revisionTable) {
-        $entity->setNewRevision();
-        $record->{$this->revisionKey} = $this->saveRevision($entity);
-      }
-      if ($this->dataTable) {
-        $this->populateAffectedRevisionTranslations($entity);
-        $this->saveToSharedTables($entity);
-      }
-      if ($this->revisionDataTable) {
-        $this->saveToSharedTables($entity, $this->revisionDataTable);
-      }
-    }
-    $this->invokeFieldMethod($is_new ? 'insert' : 'update', $entity);
-    $this->saveToDedicatedTables($entity, !$is_new);
+      $table_mapping = $this->getTableMapping();
+      $storage_definitions = $this->entityManager->getFieldStorageDefinitions($this->entityTypeId);
+      $shared_table_fields = FALSE;
+      $dedicated_table_fields = [];
 
-    if (!$is_new && $this->dataTable) {
-      $this->invokeTranslationHooks($entity);
+      // Collect the name of fields to be written in dedicated tables and check
+      // whether shared table records need to be updated.
+      foreach ($names as $name) {
+        $storage_definition = $storage_definitions[$name];
+        if ($table_mapping->allowsSharedTableStorage($storage_definition)) {
+          $shared_table_fields = TRUE;
+        }
+        elseif ($table_mapping->requiresDedicatedTableStorage($storage_definition)) {
+          $dedicated_table_fields[] = $name;
+        }
+      }
     }
-    $entity->enforceIsNew(FALSE);
-    if ($this->revisionTable) {
-      $entity->setNewRevision(FALSE);
+
+    // Update shared table records if necessary.
+    if ($shared_table_fields) {
+      $record = $this->mapToStorageRecord($entity->getUntranslated(), $this->baseTable);
+      // Create the storage record to be saved.
+      if ($update) {
+        $default_revision = $entity->isDefaultRevision();
+        if ($default_revision) {
+          $this->database
+            ->update($this->baseTable)
+            ->fields((array) $record)
+            ->condition($this->idKey, $record->{$this->idKey})
+            ->execute();
+        }
+        if ($this->revisionTable) {
+          if ($full_save) {
+            $entity->{$this->revisionKey} = $this->saveRevision($entity);
+          }
+          else {
+            $record = $this->mapToStorageRecord($entity->getUntranslated(), $this->revisionTable);
+            $entity->preSaveRevision($this, $record);
+            $this->database
+              ->update($this->revisionTable)
+              ->fields((array) $record)
+              ->condition($this->revisionKey, $record->{$this->revisionKey})
+              ->execute();
+          }
+        }
+        if ($default_revision && $this->dataTable) {
+          $this->saveToSharedTables($entity);
+        }
+        if ($this->revisionDataTable) {
+          $new_revision = $full_save && $entity->isNewRevision();
+          $this->saveToSharedTables($entity, $this->revisionDataTable, $new_revision);
+        }
+      }
+      else {
+        $insert_id = $this->database
+          ->insert($this->baseTable, array('return' => Database::RETURN_INSERT_ID))
+          ->fields((array) $record)
+          ->execute();
+        // Even if this is a new entity the ID key might have been set, in which
+        // case we should not override the provided ID. An ID key that is not set
+        // to any value is interpreted as NULL (or DEFAULT) and thus overridden.
+        if (!isset($record->{$this->idKey})) {
+          $record->{$this->idKey} = $insert_id;
+        }
+        $entity->{$this->idKey} = (string) $record->{$this->idKey};
+        if ($this->revisionTable) {
+          $record->{$this->revisionKey} = $this->saveRevision($entity);
+        }
+        if ($this->dataTable) {
+          $this->saveToSharedTables($entity);
+        }
+        if ($this->revisionDataTable) {
+          $this->saveToSharedTables($entity, $this->revisionDataTable);
+        }
+      }
+    }
+
+    // Update dedicated table records if necessary.
+    if ($dedicated_table_fields) {
+      $names = is_array($dedicated_table_fields) ? $dedicated_table_fields : [];
+      $this->saveToDedicatedTables($entity, $update, $names);
     }
-    return $return;
   }
 
   /**
@@ -1019,14 +866,20 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
    *   The entity object.
    * @param string $table_name
    *   (optional) The table name to save to. Defaults to the data table.
+   * @param bool $new_revision
+   *   (optional) Whether we are dealing with a new revision. By default fetches
+   *   the information from the entity object.
    */
-  protected function saveToSharedTables(ContentEntityInterface $entity, $table_name = NULL) {
+  protected function saveToSharedTables(ContentEntityInterface $entity, $table_name = NULL, $new_revision = NULL) {
     if (!isset($table_name)) {
       $table_name = $this->dataTable;
     }
+    if (!isset($new_revision)) {
+      $new_revision = $entity->isNewRevision();
+    }
     $revision = $table_name != $this->dataTable;
 
-    if (!$revision || !$entity->isNewRevision()) {
+    if (!$revision || !$new_revision) {
       $key = $revision ? $this->revisionKey : $this->idKey;
       $value = $revision ? $entity->getRevisionId() : $entity->id();
       // Delete and insert to handle removed values.
@@ -1070,7 +923,7 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
     foreach ($table_mapping->getFieldNames($table_name) as $field_name) {
 
       if (empty($this->getFieldStorageDefinitions()[$field_name])) {
-        throw new EntityStorageException(SafeMarkup::format('Table mapping contains invalid field %field.', array('%field' => $field_name)));
+        throw new EntityStorageException("Table mapping contains invalid field $field_name.");
       }
       $definition = $this->getFieldStorageDefinitions()[$field_name];
       $columns = $table_mapping->getColumnNames($field_name);
@@ -1303,8 +1156,11 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
    *   The entity.
    * @param bool $update
    *   TRUE if the entity is being updated, FALSE if it is being inserted.
+   * @param string[] $names
+   *   (optional) The names of the fields to be stored. Defaults to all the
+   *   available fields.
    */
-  protected function saveToDedicatedTables(ContentEntityInterface $entity, $update = TRUE) {
+  protected function saveToDedicatedTables(ContentEntityInterface $entity, $update = TRUE, $names = array()) {
     $vid = $entity->getRevisionId();
     $id = $entity->id();
     $bundle = $entity->bundle();
@@ -1319,7 +1175,13 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
 
     $original = !empty($entity->original) ? $entity->original: NULL;
 
-    foreach ($this->entityManager->getFieldDefinitions($entity_type, $bundle) as $field_name => $field_definition) {
+    // Determine which fields should be actually stored.
+    $definitions = $this->entityManager->getFieldDefinitions($entity_type, $bundle);
+    if ($names) {
+      $definitions = array_intersect_key($definitions, array_flip($names));
+    }
+
+    foreach ($definitions as $field_name => $field_definition) {
       $storage_definition = $field_definition->getFieldStorageDefinition();
       if (!$table_mapping->requiresDedicatedTableStorage($storage_definition)) {
         continue;
@@ -1760,9 +1622,11 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
         $or->isNotNull($table_mapping->getFieldColumnName($storage_definition, $property_name));
       }
       $query->condition($or);
-      $query
-        ->fields('t', array($this->idKey))
-        ->distinct(TRUE);
+      if (!$as_bool) {
+        $query
+          ->fields('t', array($this->idKey))
+          ->distinct(TRUE);
+      }
     }
 
     // @todo Find a way to count field data also for fields having custom
@@ -1772,7 +1636,9 @@ class SqlContentEntityStorage extends ContentEntityStorageBase implements SqlEnt
       // If we are performing the query just to check if the field has data
       // limit the number of rows.
       if ($as_bool) {
-        $query->range(0, 1);
+        $query
+          ->range(0, 1)
+          ->addExpression('1');
       }
       else {
         // Otherwise count the number of rows.
diff --git a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
index b81f70543..8a96e513c 100644
--- a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
+++ b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\Core\Entity\Sql;
 
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Database\DatabaseException;
 use Drupal\Core\Entity\ContentEntityTypeInterface;
@@ -286,7 +285,7 @@ class SqlContentEntityStorageSchema implements DynamicallyFieldableEntityStorage
 
     // If a migration is required, we can't proceed.
     if ($this->requiresEntityDataMigration($entity_type, $original)) {
-      throw new EntityStorageException(SafeMarkup::format('The SQL storage cannot change the schema for an existing entity type with data.'));
+      throw new EntityStorageException('The SQL storage cannot change the schema for an existing entity type with data.');
     }
 
     // If we have no data just recreate the entity schema from scratch.
@@ -467,7 +466,7 @@ class SqlContentEntityStorageSchema implements DynamicallyFieldableEntityStorage
    */
   protected function checkEntityType(EntityTypeInterface $entity_type) {
     if ($entity_type->id() != $this->entityType->id()) {
-      throw new EntityStorageException(SafeMarkup::format('Unsupported entity type @id', array('@id' => $entity_type->id())));
+      throw new EntityStorageException("Unsupported entity type {$entity_type->id()}");
     }
     return TRUE;
   }
@@ -530,7 +529,7 @@ class SqlContentEntityStorageSchema implements DynamicallyFieldableEntityStorage
         }
         foreach ($table_mapping->getFieldNames($table_name) as $field_name) {
           if (!isset($storage_definitions[$field_name])) {
-            throw new FieldException(SafeMarkup::format('Field storage definition for "@field_name" could not be found.', array('@field_name' => $field_name)));
+            throw new FieldException("Field storage definition for '$field_name' could not be found.");
           }
           // Add the schema for base field definitions.
           elseif ($table_mapping->allowsSharedTableStorage($storage_definitions[$field_name])) {
@@ -906,7 +905,9 @@ class SqlContentEntityStorageSchema implements DynamicallyFieldableEntityStorage
     $schema = array(
       'description' => "The data table for $entity_type_id entities.",
       'primary key' => array($id_key, $entity_type->getKey('langcode')),
-      'indexes' => array(),
+      'indexes' => array(
+        $entity_type_id . '__id__default_langcode__langcode' => array($id_key, $entity_type->getKey('default_langcode'), $entity_type->getKey('langcode')),
+      ),
       'foreign keys' => array(
         $entity_type_id => array(
           'table' => $this->storage->getBaseTable(),
@@ -942,7 +943,9 @@ class SqlContentEntityStorageSchema implements DynamicallyFieldableEntityStorage
     $schema = array(
       'description' => "The revision data table for $entity_type_id entities.",
       'primary key' => array($revision_key, $entity_type->getKey('langcode')),
-      'indexes' => array(),
+      'indexes' => array(
+        $entity_type_id . '__id__default_langcode__langcode' => array($id_key, $entity_type->getKey('default_langcode'), $entity_type->getKey('langcode')),
+      ),
       'foreign keys' => array(
         $entity_type_id => array(
           'table' => $this->storage->getBaseTable(),
@@ -1017,6 +1020,9 @@ class SqlContentEntityStorageSchema implements DynamicallyFieldableEntityStorage
    *   A partial schema array for the base table.
    */
   protected function processDataTable(ContentEntityTypeInterface $entity_type, array &$schema) {
+    // Marking the respective fields as NOT NULL makes the indexes more
+    // performant.
+    $schema['fields'][$entity_type->getKey('default_langcode')]['not null'] = TRUE;
   }
 
   /**
@@ -1031,6 +1037,9 @@ class SqlContentEntityStorageSchema implements DynamicallyFieldableEntityStorage
    *   A partial schema array for the base table.
    */
   protected function processRevisionDataTable(ContentEntityTypeInterface $entity_type, array &$schema) {
+    // Marking the respective fields as NOT NULL makes the indexes more
+    // performant.
+    $schema['fields'][$entity_type->getKey('default_langcode')]['not null'] = TRUE;
   }
 
   /**
@@ -1420,7 +1429,7 @@ class SqlContentEntityStorageSchema implements DynamicallyFieldableEntityStorage
 
     // Check that the schema does not include forbidden column names.
     if (array_intersect(array_keys($field_schema['columns']), $this->storage->getTableMapping()->getReservedColumns())) {
-      throw new FieldException(format_string('Illegal field column names on @field_name', array('@field_name' => $storage_definition->getName())));
+      throw new FieldException("Illegal field column names on {$storage_definition->getName()}");
     }
 
     $field_name = $storage_definition->getName();
@@ -1642,7 +1651,7 @@ class SqlContentEntityStorageSchema implements DynamicallyFieldableEntityStorage
     $properties = $storage_definition->getPropertyDefinitions();
     $table_mapping = $this->storage->getTableMapping();
     if (array_intersect(array_keys($schema['columns']), $table_mapping->getReservedColumns())) {
-      throw new FieldException(format_string('Illegal field column names on @field_name', array('@field_name' => $storage_definition->getName())));
+      throw new FieldException("Illegal field column names on {$storage_definition->getName()}");
     }
 
     // Add field columns.
diff --git a/core/lib/Drupal/Core/Entity/entity.api.php b/core/lib/Drupal/Core/Entity/entity.api.php
index 3c68a577e..c2638c40a 100644
--- a/core/lib/Drupal/Core/Entity/entity.api.php
+++ b/core/lib/Drupal/Core/Entity/entity.api.php
@@ -1808,13 +1808,15 @@ function hook_entity_field_storage_info_alter(&$fields, \Drupal\Core\Entity\Enti
  *
  * @return array
  *   An operations array as returned by
- *   \Drupal\Core\Entity\EntityListBuilderInterface::getOperations().
+ *   EntityListBuilderInterface::getOperations().
+ *
+ * @see \Drupal\Core\Entity\EntityListBuilderInterface::getOperations()
  */
 function hook_entity_operation(\Drupal\Core\Entity\EntityInterface $entity) {
   $operations = array();
   $operations['translate'] = array(
     'title' => t('Translate'),
-    'route_name' => 'foo_module.entity.translate',
+    'url' => \Drupal\Core\Url::fromRoute('foo_module.entity.translate'),
     'weight' => 50,
   );
 
diff --git a/core/lib/Drupal/Core/EventSubscriber/DefaultExceptionSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/DefaultExceptionSubscriber.php
index 5f9d4aca8..741ab0cf1 100644
--- a/core/lib/Drupal/Core/EventSubscriber/DefaultExceptionSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/DefaultExceptionSubscriber.php
@@ -9,7 +9,6 @@ namespace Drupal\Core\EventSubscriber;
 
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Render\BareHtmlPageRendererInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\Core\Utility\Error;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
@@ -43,24 +42,14 @@ class DefaultExceptionSubscriber implements EventSubscriberInterface {
    */
   protected $configFactory;
 
-  /**
-   * The bare HTML page renderer.
-   *
-   * @var \Drupal\Core\Render\BareHtmlPageRendererInterface
-   */
-  protected $bareHtmlPageRenderer;
-
   /**
    * Constructs a new DefaultExceptionSubscriber.
    *
    * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
    *   The configuration factory.
-   * @param \Drupal\Core\Render\BareHtmlPageRendererInterface $bare_html_page_renderer
-   *   The bare HTML page renderer.
    */
-  public function __construct(ConfigFactoryInterface $config_factory, BareHtmlPageRendererInterface $bare_html_page_renderer) {
+  public function __construct(ConfigFactoryInterface $config_factory) {
     $this->configFactory = $config_factory;
-    $this->bareHtmlPageRenderer = $bare_html_page_renderer;
   }
 
   /**
@@ -87,15 +76,13 @@ class DefaultExceptionSubscriber implements EventSubscriberInterface {
 
     // Display the message if the current error reporting level allows this type
     // of message to be displayed, and unconditionally in update.php.
+    $message = '';
     if (error_displayable($error)) {
-      $class = 'error';
-
       // If error type is 'User notice' then treat it as debug information
       // instead of an error message.
       // @see debug()
       if ($error['%type'] == 'User notice') {
         $error['%type'] = 'Debug';
-        $class = 'status';
       }
 
       // Attempt to reduce verbosity by removing DRUPAL_ROOT from the file path
@@ -125,11 +112,11 @@ class DefaultExceptionSubscriber implements EventSubscriberInterface {
         // sure the backtrace is escaped as it can contain user submitted data.
         $message .= '<pre class="backtrace">' . SafeMarkup::escape(Error::formatBacktrace($backtrace)) . '</pre>';
       }
-      drupal_set_message(SafeMarkup::set($message), $class, TRUE);
     }
 
     $content = $this->t('The website encountered an unexpected error. Please try again later.');
-    $response = $this->bareHtmlPageRenderer->renderBarePage(['#markup' => $content], $this->t('Error'), 'maintenance_page');
+    $content .= $message ? '</br></br>' . $message : '';
+    $response = new Response($content, 500);
 
     if ($exception instanceof HttpExceptionInterface) {
       $response->setStatusCode($exception->getStatusCode());
diff --git a/core/lib/Drupal/Core/EventSubscriber/EarlyRenderingControllerWrapperSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/EarlyRenderingControllerWrapperSubscriber.php
new file mode 100644
index 000000000..0acda56ef
--- /dev/null
+++ b/core/lib/Drupal/Core/EventSubscriber/EarlyRenderingControllerWrapperSubscriber.php
@@ -0,0 +1,181 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\EventSubscriber\EarlyRenderingControllerWrapperSubscriber.
+ */
+
+namespace Drupal\Core\EventSubscriber;
+
+use Drupal\Core\Ajax\AjaxResponse;
+use Drupal\Core\Cache\CacheableDependencyInterface;
+use Drupal\Core\Cache\CacheableResponseInterface;
+use Drupal\Core\Controller\ControllerResolverInterface;
+use Drupal\Core\Render\AttachmentsInterface;
+use Drupal\Core\Render\BubbleableMetadata;
+use Drupal\Core\Render\RenderContext;
+use Drupal\Core\Render\RendererInterface;
+use Drupal\Core\Routing\RouteMatchInterface;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
+use Symfony\Component\HttpKernel\KernelEvents;
+
+/**
+ * Subscriber that wraps controllers, to handle early rendering.
+ *
+ * When controllers call drupal_render() (RendererInterface::render()) outside
+ * of a render context, we call that "early rendering". Controllers should
+ * return only render arrays, but we cannot prevent controllers from doing early
+ * rendering. The problem with early rendering is that the bubbleable metadata
+ * (cacheability & attachments) are lost.
+ *
+ * This can lead to broken pages (missing assets), stale pages (missing cache
+ * tags causing a page not to be invalidated) or even security problems (missing
+ * cache contexts causing a cached page not to be varied sufficiently).
+ *
+ * This event subscriber wraps all controller executions in a closure that sets
+ * up a render context. Consequently, any early rendering will have their
+ * bubbleable metadata (assets & cacheability) stored on that render context.
+ *
+ * If the render context is empty, then the controller either did not do any
+ * rendering at all, or used the RendererInterface::renderRoot() or
+ * ::renderPlain() methods. In that case, no bubbleable metadata is lost.
+ *
+ * If the render context is not empty, then the controller did use
+ * drupal_render(), and bubbleable metadata was collected. This bubbleable
+ * metadata is then merged onto the render array.
+ *
+ * In other words: this just exists to ease the transition to Drupal 8: it
+ * allows controllers that return render arrays (the majority) and
+ * \Drupal\Core\Ajax\AjaxResponse\AjaxResponse objects (a sizable minority that
+ * often involve a fair amount of rendering) to still do early rendering. But
+ * controllers that return any other kind of response are already expected to
+ * do the right thing, so if early rendering is detected in such a case, an
+ * exception is thrown.
+ *
+ * @see \Drupal\Core\Render\RendererInterface
+ * @see \Drupal\Core\Render\Renderer
+ *
+ * @todo Remove in Drupal 9.0.0, by disallowing early rendering.
+ */
+class EarlyRenderingControllerWrapperSubscriber implements EventSubscriberInterface {
+
+  /**
+   * The controller resolver.
+   *
+   * @var \Drupal\Core\Controller\ControllerResolverInterface
+   */
+  protected $controllerResolver;
+
+  /**
+   * The renderer.
+   *
+   * @var \Drupal\Core\Render\RendererInterface
+   */
+  protected $renderer;
+
+  /**
+   * Constructs a new EarlyRenderingControllerWrapperSubscriber instance.
+   *
+   * @param \Drupal\Core\Controller\ControllerResolverInterface $controller_resolver
+   *   The controller resolver.
+   * @param \Drupal\Core\Render\RendererInterface $renderer
+   *   The renderer.
+   */
+  public function __construct(ControllerResolverInterface $controller_resolver, RendererInterface $renderer) {
+    $this->controllerResolver = $controller_resolver;
+    $this->renderer = $renderer;
+  }
+
+  /**
+   * Ensures bubbleable metadata from early rendering is not lost.
+   *
+   * @param \Symfony\Component\HttpKernel\Event\FilterControllerEvent $event
+   *   The controller event.
+   */
+  public function onController(FilterControllerEvent $event) {
+    $controller = $event->getController();
+
+    // See \Symfony\Component\HttpKernel\HttpKernel::handleRaw().
+    $arguments = $this->controllerResolver->getArguments($event->getRequest(), $controller);
+
+    $event->setController(function() use ($controller, $arguments) {
+      return $this->wrapControllerExecutionInRenderContext($controller, $arguments);
+    });
+  }
+
+  /**
+   * Wraps a controller execution in a render context.
+   *
+   * @param callable $controller
+   *   The controller to execute.
+   * @param array $arguments
+   *   The arguments to pass to the controller.
+   *
+   * @return mixed
+   *   The return value of the controller.
+   *
+   * @throws \LogicException
+   *   When early rendering has occurred in a controller that returned a
+   *   Response or domain object that cares about attachments or cacheability.
+   *
+   * @see \Symfony\Component\HttpKernel\HttpKernel::handleRaw()
+   */
+  protected function wrapControllerExecutionInRenderContext($controller, array $arguments) {
+    $context = new RenderContext();
+
+    $response = $this->renderer->executeInRenderContext($context, function() use ($controller, $arguments) {
+      // Now call the actual controller, just like HttpKernel does.
+      return call_user_func_array($controller, $arguments);
+    });
+
+    // If early rendering happened, i.e. if code in the controller called
+    // drupal_render() outside of a render context, then the bubbleable metadata
+    // for that is stored in the current render context.
+    if (!$context->isEmpty()) {
+      /** @var \Drupal\Core\Render\BubbleableMetadata $early_rendering_bubbleable_metadata */
+      $early_rendering_bubbleable_metadata = $context->pop();
+
+      // If a render array or AjaxResponse is returned by the controller, merge
+      // the "lost" bubbleable metadata.
+      if (is_array($response)) {
+        BubbleableMetadata::createFromRenderArray($response)
+          ->merge($early_rendering_bubbleable_metadata)
+          ->applyTo($response);
+      }
+      elseif ($response instanceof AjaxResponse) {
+        $response->addAttachments($early_rendering_bubbleable_metadata->getAttachments());
+        // @todo Make AjaxResponse cacheable in
+        //   https://www.drupal.org/node/956186. Meanwhile, allow contrib
+        //   subclasses to be.
+        if ($response instanceof CacheableResponseInterface) {
+          $response->addCacheableDependency($early_rendering_bubbleable_metadata);
+        }
+      }
+      // If a non-Ajax Response or domain object is returned and it cares about
+      // attachments or cacheability, then throw an exception: early rendering
+      // is not permitted in that case. It is the developer's responsibility
+      // to not use early rendering.
+      elseif ($response instanceof AttachmentsInterface || $response instanceof CacheableResponseInterface || $response instanceof CacheableDependencyInterface) {
+        throw new \LogicException(sprintf('The controller result claims to be providing relevant cache metadata, but leaked metadata was detected. Please ensure you are not rendering content too early. Returned object class: %s.', get_class($response)));
+      }
+      else {
+        // A Response or domain object is returned that does not care about
+        // attachments nor cacheability. E.g. a RedirectResponse. It is safe to
+        // discard any early rendering metadata.
+      }
+    }
+
+    return $response;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function getSubscribedEvents() {
+    $events[KernelEvents::CONTROLLER][] = ['onController'];
+
+    return $events;
+  }
+
+}
diff --git a/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php
index 13a051532..251b9205b 100644
--- a/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php
@@ -113,6 +113,7 @@ class FinishResponseSubscriber implements EventSubscriberInterface {
     // XSS and other vulnerabilities.
     // https://www.owasp.org/index.php/List_of_useful_HTTP_headers
     $response->headers->set('X-Content-Type-Options', 'nosniff', FALSE);
+    $response->headers->set('X-Frame-Options', 'SAMEORIGIN', FALSE);
 
     // Expose the cache contexts and cache tags associated with this page in a
     // X-Drupal-Cache-Contexts and X-Drupal-Cache-Tags header respectively.
diff --git a/core/lib/Drupal/Core/EventSubscriber/PsrResponseSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/PsrResponseSubscriber.php
new file mode 100644
index 000000000..eb0818c87
--- /dev/null
+++ b/core/lib/Drupal/Core/EventSubscriber/PsrResponseSubscriber.php
@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\EventSubscriber\PsrResponseSubscriber.
+ */
+
+namespace Drupal\Core\EventSubscriber;
+
+use Psr\Http\Message\ResponseInterface;
+
+use Symfony\Bridge\PsrHttpMessage\HttpFoundationFactoryInterface;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent;
+use Symfony\Component\HttpKernel\KernelEvents;
+
+/**
+ * Response subscriber for handling PSR-7 responses.
+ */
+class PsrResponseSubscriber implements EventSubscriberInterface {
+
+  /**
+   * The httpFoundation factory.
+   *
+   * @var \Symfony\Bridge\PsrHttpMessage\HttpFoundationFactoryInterface
+   */
+  protected $httpFoundationFactory;
+
+  /**
+   * Constructs a new PathRootsSubscriber instance.
+   *
+   * @param \Symfony\Bridge\PsrHttpMessage\HttpFoundationFactoryInterface $http_foundation_factory
+   *    The httpFoundation factory.
+   */
+  public function __construct(HttpFoundationFactoryInterface $http_foundation_factory) {
+    $this->httpFoundationFactory = $http_foundation_factory;
+  }
+
+  /**
+   * Converts a PSR-7 response to a Symfony response.
+   *
+   * @param \Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent $event
+   *   The Event to process.
+   */
+  public function onKernelView(GetResponseForControllerResultEvent $event) {
+    $controller_result = $event->getControllerResult();
+
+    if ($controller_result instanceof ResponseInterface) {
+      $event->setResponse($this->httpFoundationFactory->createResponse($controller_result));
+    }
+
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function getSubscribedEvents() {
+    $events[KernelEvents::VIEW][] = ['onKernelView'];
+    return $events;
+  }
+
+}
diff --git a/core/lib/Drupal/Core/EventSubscriber/RedirectLeadingSlashesSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/RedirectLeadingSlashesSubscriber.php
new file mode 100644
index 000000000..51ebbc22d
--- /dev/null
+++ b/core/lib/Drupal/Core/EventSubscriber/RedirectLeadingSlashesSubscriber.php
@@ -0,0 +1,54 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\EventSubscriber\RedirectLeadingSlashesSubscriber.
+ */
+
+namespace Drupal\Core\EventSubscriber;
+
+use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+use Symfony\Component\HttpKernel\KernelEvents;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * Redirects paths starting with multiple slashes to a single slash.
+ */
+class RedirectLeadingSlashesSubscriber implements EventSubscriberInterface {
+
+  /**
+   * Redirects paths starting with multiple slashes to a single slash.
+   *
+   * @param \Symfony\Component\HttpKernel\Event\GetResponseEvent $event
+   *   The GetResponseEvent to process.
+   */
+  public function redirect(GetResponseEvent $event) {
+    $request = $event->getRequest();
+    // Get the requested path minus the base path.
+    $path = $request->getPathInfo();
+
+    // It is impossible to create a link or a route to a path starting with
+    // multiple leading slashes. However if a form is added to the 404 page that
+    // submits back to the same URI this presents an open redirect
+    // vulnerability. Also, Drupal 7 renders the same page for
+    // http://www.example.org/foo and http://www.example.org////foo.
+    if (strpos($path, '//') === 0) {
+      $path = '/' . ltrim($path, '/');
+      $qs = $request->getQueryString();
+      if ($qs) {
+        $qs = '?' . $qs;
+      }
+      $event->setResponse(new RedirectResponse($request->getUriForPath($path) . $qs));
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  static function getSubscribedEvents() {
+    $events[KernelEvents::REQUEST][] = ['redirect', 1000];
+    return $events;
+  }
+
+}
diff --git a/core/lib/Drupal/Core/EventSubscriber/RedirectResponseSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/RedirectResponseSubscriber.php
index 0573eea25..efaf5c802 100644
--- a/core/lib/Drupal/Core/EventSubscriber/RedirectResponseSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/RedirectResponseSubscriber.php
@@ -7,13 +7,15 @@
 
 namespace Drupal\Core\EventSubscriber;
 
+use Drupal\Component\HttpFoundation\SecuredRedirectResponse;
 use Drupal\Component\Utility\UrlHelper;
+use Drupal\Core\Routing\LocalRedirectResponse;
 use Drupal\Core\Routing\RequestContext;
 use Drupal\Core\Routing\UrlGeneratorInterface;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
-use Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
@@ -51,48 +53,88 @@ class RedirectResponseSubscriber implements EventSubscriberInterface {
   public function checkRedirectUrl(FilterResponseEvent $event) {
     $response = $event->getResponse();
     if ($response instanceOf RedirectResponse) {
-      $options = array();
-
       $request = $event->getRequest();
+
+      // Let the 'destination' query parameter override the redirect target.
+      // If $response is already a SecuredRedirectResponse, it might reject the
+      // new target as invalid, in which case proceed with the old target.
       $destination = $request->query->get('destination');
-      // A destination from \Drupal::request()->query always overrides the
-      // current RedirectResponse. We do not allow absolute URLs to be passed
-      // via \Drupal::request()->query, as this can be an attack vector, with
-      // the following exception:
-      // - Absolute URLs that point to this site (i.e. same base URL and
-      //   base path) are allowed.
       if ($destination) {
-        if (!UrlHelper::isExternal($destination)) {
-          // The destination query parameter can be a relative URL in the sense
-          // of not including the scheme and host, but its path is expected to
-          // be absolute (start with a '/'). For such a case, prepend the
-          // scheme and host, because the 'Location' header must be absolute.
-          if (strpos($destination, '/') === 0) {
-            $destination = $request->getSchemeAndHttpHost() . $destination;
-          }
-          else {
-            // Legacy destination query parameters can be relative paths that
-            // have not yet been converted to URLs (outbound path processors
-            // and other URL handling still needs to be performed).
-            // @todo As generateFromPath() is deprecated, remove this in
-            //   https://www.drupal.org/node/2418219.
-            $destination = UrlHelper::parse($destination);
-            $path = $destination['path'];
-            $options['query'] = $destination['query'];
-            $options['fragment'] = $destination['fragment'];
-            // The 'Location' HTTP header must always be absolute.
-            $options['absolute'] = TRUE;
-            $destination = $this->urlGenerator->generateFromPath($path, $options);
-          }
+        // The 'Location' HTTP header must always be absolute.
+        $destination = $this->getDestinationAsAbsoluteUrl($destination, $request->getSchemeAndHttpHost());
+        try {
           $response->setTargetUrl($destination);
         }
-        elseif (UrlHelper::externalIsLocal($destination, $this->requestContext->getCompleteBaseUrl())) {
-          $response->setTargetUrl($destination);
+        catch (\InvalidArgumentException $e) {
         }
       }
+
+      // Regardless of whether the target is the original one or the overridden
+      // destination, ensure that all redirects are safe.
+      if (!($response instanceOf SecuredRedirectResponse)) {
+        try {
+          // SecuredRedirectResponse is an abstract class that requires a
+          // concrete implementation. Default to LocalRedirectResponse, which
+          // considers only redirects to within the same site as safe.
+          $safe_response = LocalRedirectResponse::createFromRedirectResponse($response);
+          $safe_response->setRequestContext($this->requestContext);
+        }
+        catch (\InvalidArgumentException $e) {
+          // If the above failed, it's because the redirect target wasn't
+          // local. Do not follow that redirect. Display an error message
+          // instead. We're already catching one exception, so trigger_error()
+          // rather than throw another one.
+          // We don't throw an exception, because this is a client error rather than a
+          // server error.
+          $message = 'Redirects to external URLs are not allowed by default, use \Drupal\Core\Routing\TrustedRedirectResponse for it.';
+          trigger_error($message, E_USER_ERROR);
+          $safe_response = new Response($message, 400);
+        }
+        $event->setResponse($safe_response);
+      }
     }
   }
 
+  /**
+   * Converts the passed in destination into an absolute URL.
+   *
+   * @param string $destination
+   *   The path for the destination. In case it starts with a slash it should
+   *   have the base path included already.
+   * @param string $scheme_and_host
+   *   The scheme and host string of the current request.
+   *
+   * @return string
+   *   The destination as absolute URL.
+   */
+  protected function getDestinationAsAbsoluteUrl($destination, $scheme_and_host) {
+    if (!UrlHelper::isExternal($destination)) {
+      // The destination query parameter can be a relative URL in the sense of
+      // not including the scheme and host, but its path is expected to be
+      // absolute (start with a '/'). For such a case, prepend the scheme and
+      // host, because the 'Location' header must be absolute.
+      if (strpos($destination, '/') === 0) {
+        $destination = $scheme_and_host . $destination;
+      }
+      else {
+        // Legacy destination query parameters can be relative paths that have
+        // not yet been converted to URLs (outbound path processors and other
+        // URL handling still needs to be performed).
+        // @todo As generateFromPath() is deprecated, remove this in
+        //   https://www.drupal.org/node/2418219.
+        $destination = UrlHelper::parse($destination);
+        $path = $destination['path'];
+        $options = [
+          'query' => $destination['query'],
+          'fragment' => $destination['fragment'],
+          'absolute' => TRUE,
+        ];
+        $destination = $this->urlGenerator->generateFromPath($path, $options);
+      }
+    }
+    return $destination;
+  }
+
   /**
    * Sanitize the destination parameter to prevent open redirect attacks.
    *
diff --git a/core/lib/Drupal/Core/Extension/ModuleHandler.php b/core/lib/Drupal/Core/Extension/ModuleHandler.php
index ce5af4f63..f97897c18 100644
--- a/core/lib/Drupal/Core/Extension/ModuleHandler.php
+++ b/core/lib/Drupal/Core/Extension/ModuleHandler.php
@@ -9,7 +9,6 @@ namespace Drupal\Core\Extension;
 
 use Drupal\Component\Graph\Graph;
 use Drupal\Component\Utility\NestedArray;
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Cache\CacheBackendInterface;
 
@@ -581,7 +580,7 @@ class ModuleHandler implements ModuleHandlerInterface {
         }
         // If a new implementation was added, verify that the function exists.
         if (!function_exists($module . '_' . $hook)) {
-          throw new \RuntimeException(SafeMarkup::format('An invalid implementation @function was added by hook_module_implements_alter()', array('@function' => $module . '_' . $hook)));
+          throw new \RuntimeException("An invalid implementation {$module}_{$hook} was added by hook_module_implements_alter()");
         }
       }
     }
diff --git a/core/lib/Drupal/Core/Extension/ModuleInstaller.php b/core/lib/Drupal/Core/Extension/ModuleInstaller.php
index e523943ed..41e698c1d 100644
--- a/core/lib/Drupal/Core/Extension/ModuleInstaller.php
+++ b/core/lib/Drupal/Core/Extension/ModuleInstaller.php
@@ -13,7 +13,6 @@ use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\Config\PreExistingConfigException;
 use Drupal\Core\Config\StorageInterface;
 use Drupal\Core\DrupalKernelInterface;
-use Drupal\Component\Utility\SafeMarkup;
 
 /**
  * Default implementation of the module installer.
@@ -88,10 +87,7 @@ class ModuleInstaller implements ModuleInstallerInterface {
       $module_list = $module_list ? array_combine($module_list, $module_list) : array();
       if ($missing_modules = array_diff_key($module_list, $module_data)) {
         // One or more of the given modules doesn't exist.
-        throw new MissingDependencyException(SafeMarkup::format('Unable to install modules %modules due to missing modules %missing.', array(
-          '%modules' => implode(', ', $module_list),
-          '%missing' => implode(', ', $missing_modules),
-        )));
+        throw new MissingDependencyException(sprintf('Unable to install modules %s due to missing modules %s.', implode(', ', $module_list), implode(', ', $missing_modules)));
       }
 
       // Only process currently uninstalled modules.
@@ -107,10 +103,7 @@ class ModuleInstaller implements ModuleInstallerInterface {
         foreach (array_keys($module_data[$module]->requires) as $dependency) {
           if (!isset($module_data[$dependency])) {
             // The dependency does not exist.
-            throw new MissingDependencyException(SafeMarkup::format('Unable to install modules: module %module is missing its dependency module %dependency.', array(
-              '%module' => $module,
-              '%dependency' => $dependency,
-            )));
+            throw new MissingDependencyException("Unable to install modules: module '$module' is missing its dependency module $dependency.");
           }
 
           // Skip already installed modules.
@@ -145,10 +138,7 @@ class ModuleInstaller implements ModuleInstallerInterface {
       if (!$enabled) {
         // Throw an exception if the module name is too long.
         if (strlen($module) > DRUPAL_EXTENSION_NAME_MAX_LENGTH) {
-          throw new ExtensionNameLengthException(format_string('Module name %name is over the maximum allowed length of @max characters.', array(
-            '%name' => $module,
-            '@max' => DRUPAL_EXTENSION_NAME_MAX_LENGTH,
-          )));
+          throw new ExtensionNameLengthException("Module name '$module' is over the maximum allowed length of " . DRUPAL_EXTENSION_NAME_MAX_LENGTH . ' characters');
         }
 
         // Check the validity of the default configuration. This will throw
@@ -253,12 +243,11 @@ class ModuleInstaller implements ModuleInstallerInterface {
         // Record the fact that it was installed.
         $modules_installed[] = $module;
 
-        // file_get_stream_wrappers() needs to re-register Drupal's stream
-        // wrappers in case a module-provided stream wrapper is used later in
-        // the same request. In particular, this happens when installing Drupal
-        // via Drush, as the 'translations' stream wrapper is provided by
-        // Interface Translation module and is later used to import
-        // translations.
+        // Drupal's stream wrappers needs to be re-registered in case a
+        // module-provided stream wrapper is used later in the same request. In
+        // particular, this happens when installing Drupal via Drush, as the
+        // 'translations' stream wrapper is provided by Interface Translation
+        // module and is later used to import translations.
         \Drupal::service('stream_wrapper_manager')->register();
 
         // Update the theme registry to include it.
@@ -330,9 +319,7 @@ class ModuleInstaller implements ModuleInstallerInterface {
       foreach ($reasons as $reason) {
         $reason_message[] = implode(', ', $reason);
       }
-      throw new ModuleUninstallValidatorException(format_string('The following reasons prevents the modules from being uninstalled: @reasons', array(
-        '@reasons' => implode('; ', $reason_message),
-      )));
+      throw new ModuleUninstallValidatorException('The following reasons prevents the modules from being uninstalled: ' . implode('; ', $reason_message));
     }
     // Set the actual module weights.
     $module_list = array_map(function ($module) use ($module_data) {
diff --git a/core/lib/Drupal/Core/Extension/ThemeHandler.php b/core/lib/Drupal/Core/Extension/ThemeHandler.php
index f53bb0c99..2eb56bc60 100644
--- a/core/lib/Drupal/Core/Extension/ThemeHandler.php
+++ b/core/lib/Drupal/Core/Extension/ThemeHandler.php
@@ -167,7 +167,7 @@ class ThemeHandler implements ThemeHandlerInterface {
   public function install(array $theme_list, $install_dependencies = TRUE) {
     // We keep the old install() method as BC layer but redirect directly to the
     // theme installer.
-    \Drupal::service('theme_installer')->install($theme_list, $install_dependencies);
+    return \Drupal::service('theme_installer')->install($theme_list, $install_dependencies);
   }
 
   /**
@@ -429,7 +429,7 @@ class ThemeHandler implements ThemeHandlerInterface {
   public function getName($theme) {
     $themes = $this->listInfo();
     if (!isset($themes[$theme])) {
-      throw new \InvalidArgumentException(SafeMarkup::format('Requested the name of a non-existing theme @theme', array('@theme' => $theme)));
+      throw new \InvalidArgumentException("Requested the name of a non-existing theme $theme");
     }
     return SafeMarkup::checkPlain($themes[$theme]->info['name']);
   }
diff --git a/core/lib/Drupal/Core/Extension/ThemeInstaller.php b/core/lib/Drupal/Core/Extension/ThemeInstaller.php
index 1bebca2db..b3b391eb3 100644
--- a/core/lib/Drupal/Core/Extension/ThemeInstaller.php
+++ b/core/lib/Drupal/Core/Extension/ThemeInstaller.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\Core\Extension;
 
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Asset\AssetCollectionOptimizerInterface;
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Config\ConfigFactoryInterface;
@@ -113,9 +112,7 @@ class ThemeInstaller implements ThemeInstallerInterface {
 
       if ($missing = array_diff_key($theme_list, $theme_data)) {
         // One or more of the given themes doesn't exist.
-        throw new \InvalidArgumentException(SafeMarkup::format('Unknown themes: !themes.', array(
-          '!themes' => implode(', ', $missing),
-        )));
+        throw new \InvalidArgumentException('Unknown themes: ' . implode(', ', $missing) . '.');
       }
 
       // Only process themes that are not installed currently.
@@ -164,10 +161,7 @@ class ThemeInstaller implements ThemeInstallerInterface {
 
       // Throw an exception if the theme name is too long.
       if (strlen($key) > DRUPAL_EXTENSION_NAME_MAX_LENGTH) {
-        throw new ExtensionNameLengthException(SafeMarkup::format('Theme name %name is over the maximum allowed length of @max characters.', array(
-          '%name' => $key,
-          '@max' => DRUPAL_EXTENSION_NAME_MAX_LENGTH,
-        )));
+        throw new ExtensionNameLengthException("Theme name $key is over the maximum allowed length of " . DRUPAL_EXTENSION_NAME_MAX_LENGTH . ' characters.');
       }
 
       // Validate default configuration of the theme. If there is existing
diff --git a/core/lib/Drupal/Core/Extension/module.api.php b/core/lib/Drupal/Core/Extension/module.api.php
index 63f81b280..7acc0fdbb 100644
--- a/core/lib/Drupal/Core/Extension/module.api.php
+++ b/core/lib/Drupal/Core/Extension/module.api.php
@@ -125,6 +125,8 @@ function hook_module_preinstall($module) {
  * \Drupal\Core\Extension\ModuleHandler::install() for a detailed description of
  * the order in which install hooks are invoked.
  *
+ * This hook should be implemented in a .module file, not in an .install file.
+ *
  * @param $modules
  *   An array of the modules that were installed.
  *
@@ -464,11 +466,30 @@ function hook_install_tasks_alter(&$tasks, $install_state) {
  * In order to call a function from your mymodule.module or an include file,
  * you need to explicitly load that file first.
  *
- * During database updates the schema of any module could be out of date. For
- * this reason, caution is needed when using any API function within an update
+ * Implementations must ensure that APIs used are safe during updates. During
+ * database updates the schema of any module could be out of date. For this
+ * reason, caution is needed when using any API function within an update
  * function - particularly CRUD functions, functions that depend on the schema
- * (for example by using drupal_write_record()), and any functions that invoke
- * hooks.
+ * (for example by using \Drupal\Core\Entity\Entity::save()), and any functions
+ * that invoke hooks.
+ *
+ * The following actions are examples that are safe:
+ * - Cache invalidation.
+ * - Using \Drupal::configFactory()->getEditable() and \Drupal::config().
+ *   Implementations must:
+ *   - Not make any assumption that the config data is valid.
+ *   - Use the correct data type when changing configuration values as specified
+ *     by its configuration schema at the time the update hook is written. If
+ *     the data type changes in a subsequent code change, a subsequent update
+ *     hook is responsible for ensuring the final data type aligns with the
+ *     configuration schema.
+ *   - Use the $has_trusted_data argument for \Drupal\Core\Config\Config::save()
+ *     so that configuration schemas are not used whilst saving configuration.
+ * - Marking a container for rebuild.
+ *
+ * The following actions are examples that are unsafe:
+ * - Loading, saving, or performing any other operation on an entity.
+ * - Rebuilding the router using \Drupal::service('router.builder')->rebuild().
  *
  * The $sandbox parameter should be used when a multipass update is needed, in
  * circumstances where running the whole update at once could cause PHP to
diff --git a/core/lib/Drupal/Core/Field/Entity/BaseFieldOverride.php b/core/lib/Drupal/Core/Field/Entity/BaseFieldOverride.php
index 32862d113..ecf7665ab 100644
--- a/core/lib/Drupal/Core/Field/Entity/BaseFieldOverride.php
+++ b/core/lib/Drupal/Core/Field/Entity/BaseFieldOverride.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\Core\Field\Entity;
 
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Field\BaseFieldDefinition;
 use Drupal\Core\Field\FieldConfigBase;
@@ -103,10 +102,10 @@ class BaseFieldOverride extends FieldConfigBase {
       throw new FieldException('Attempt to create a base field bundle override of a field without a field_name');
     }
     if (empty($values['entity_type'])) {
-      throw new FieldException(SafeMarkup::format('Attempt to create a base field bundle override of field @field_name without an entity_type', array('@field_name' => $values['field_name'])));
+      throw new FieldException("Attempt to create a base field bundle override of field {$values['field_name']} without an entity_type");
     }
     if (empty($values['bundle'])) {
-      throw new FieldException(SafeMarkup::format('Attempt to create a base field bundle override of field @field_name without a bundle', array('@field_name' => $values['field_name'])));
+      throw new FieldException("Attempt to create a base field bundle override of field {$values['field_name']} without a bundle");
     }
 
     parent::__construct($values, $entity_type);
@@ -188,10 +187,10 @@ class BaseFieldOverride extends FieldConfigBase {
     else {
       // Some updates are always disallowed.
       if ($this->entity_type != $this->original->entity_type) {
-        throw new FieldException(SafeMarkup::format('Cannot change the entity_type of an existing base field bundle override (entity type:@entity_type, bundle:@bundle, field name: @field_name)', array('@field_name' => $this->field_name, '@entity_type' => $this->entity_type, '@bundle' => $this->original->bundle)));
+        throw new FieldException("Cannot change the entity_type of an existing base field bundle override (entity type:{$this->entity_type}, bundle:{$this->original->bundle}, field name: {$this->field_name})");
       }
       if ($this->bundle != $this->original->bundle && empty($this->bundleRenameAllowed)) {
-        throw new FieldException(SafeMarkup::format('Cannot change the bundle of an existing base field bundle override (entity type:@entity_type, bundle:@bundle, field name: @field_name)', array('@field_name' => $this->field_name, '@entity_type' => $this->entity_type, '@bundle' => $this->original->bundle)));
+        throw new FieldException("Cannot change the bundle of an existing base field bundle override (entity type:{$this->entity_type}, bundle:{$this->original->bundle}, field name: {$this->field_name})");
       }
       $previous_definition = $this->original;
     }
diff --git a/core/lib/Drupal/Core/Field/FieldConfigBase.php b/core/lib/Drupal/Core/Field/FieldConfigBase.php
index a7790a3be..00fc56773 100644
--- a/core/lib/Drupal/Core/Field/FieldConfigBase.php
+++ b/core/lib/Drupal/Core/Field/FieldConfigBase.php
@@ -12,7 +12,6 @@ use Drupal\Core\Config\Entity\ConfigEntityBase;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Entity\FieldableEntityInterface;
 use Drupal\Core\Field\TypedData\FieldItemDataDefinition;
-use Drupal\Component\Utility\SafeMarkup;
 
 /**
  * Base class for configurable field definitions.
@@ -254,7 +253,7 @@ abstract class FieldConfigBase extends ConfigEntityBase implements FieldConfigIn
     $bundle_entity_type_id = $this->entityManager()->getDefinition($this->entity_type)->getBundleEntityType();
     if ($bundle_entity_type_id != 'bundle') {
       if (!$bundle_entity = $this->entityManager()->getStorage($bundle_entity_type_id)->load($this->bundle)) {
-        throw new \LogicException(SafeMarkup::format('Missing bundle entity, entity type %type, entity id %bundle.', array('%type' => $bundle_entity_type_id, '%bundle' => $this->bundle)));
+        throw new \LogicException("Missing bundle entity, entity type {$bundle_entity_type_id}, entity id {$this->bundle}.");
       }
       $this->addDependency('config', $bundle_entity->getConfigDependencyName());
     }
diff --git a/core/lib/Drupal/Core/Field/FieldItemBase.php b/core/lib/Drupal/Core/Field/FieldItemBase.php
index fd521a9ec..8e50c6a26 100644
--- a/core/lib/Drupal/Core/Field/FieldItemBase.php
+++ b/core/lib/Drupal/Core/Field/FieldItemBase.php
@@ -201,12 +201,7 @@ abstract class FieldItemBase extends Map implements FieldItemInterface {
   /**
    * {@inheritdoc}
    */
-  public function insert() { }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function update() { }
+  public function postSave($update) { }
 
   /**
    * {@inheritdoc}
diff --git a/core/lib/Drupal/Core/Field/FieldItemInterface.php b/core/lib/Drupal/Core/Field/FieldItemInterface.php
index a2339acac..23e375703 100644
--- a/core/lib/Drupal/Core/Field/FieldItemInterface.php
+++ b/core/lib/Drupal/Core/Field/FieldItemInterface.php
@@ -151,7 +151,7 @@ interface FieldItemInterface extends ComplexDataInterface {
    * @param $property_name
    *   The name of the property to get; e.g., 'title' or 'name'.
    *
-   * @return boolean
+   * @return bool
    *   Returns TRUE if the property exists and is set, FALSE otherwise.
    */
   public function __isset($property_name);
@@ -183,26 +183,39 @@ interface FieldItemInterface extends ComplexDataInterface {
   /**
    * Defines custom presave behavior for field values.
    *
-   * This method is called before insert() and update() methods, and before
-   * values are written into storage.
+   * This method is called during the process of saving an entity, just before
+   * values are written into storage. When storing a new entity, its identifier
+   * will not be available yet. This should be used to massage item property
+   * values or perform any other operation that needs to happen before values
+   * are stored. For instance this is the proper phase to auto-create a new
+   * entity for an entity reference field item, because this way it will be
+   * possible to store the referenced entity identifier.
    */
   public function preSave();
 
   /**
-   * Defines custom insert behavior for field values.
+   * Defines custom post-save behavior for field values.
    *
-   * This method is called during the process of inserting an entity, just
-   * before values are written into storage.
-   */
-  public function insert();
-
-  /**
-   * Defines custom update behavior for field values.
+   * This method is called during the process of saving an entity, just after
+   * values are written into storage. This is useful mostly when the business
+   * logic to be implemented always requires the entity identifier, even when
+   * storing a new entity. For instance, when implementing circular entity
+   * references, the referenced entity will be created on pre-save with a dummy
+   * value for the referring entity identifier, which will be updated with the
+   * actual one on post-save.
    *
-   * This method is called during the process of updating an entity, just before
-   * values are written into storage.
+   * In the rare cases where item properties depend on the entity identifier,
+   * massaging logic will have to be implemented on post-save and returning TRUE
+   * will allow them to be rewritten to the storage with the updated values.
+   *
+   * @param bool $update
+   *   Specifies whether the entity is being updated or created.
+   *
+   * @return bool
+   *   Whether field items should be rewritten to the storage as a consequence
+   *   of the logic implemented by the custom behavior.
    */
-  public function update();
+  public function postSave($update);
 
   /**
    * Defines custom delete behavior for field values.
diff --git a/core/lib/Drupal/Core/Field/FieldItemList.php b/core/lib/Drupal/Core/Field/FieldItemList.php
index aa10c6f50..1067ae8c8 100644
--- a/core/lib/Drupal/Core/Field/FieldItemList.php
+++ b/core/lib/Drupal/Core/Field/FieldItemList.php
@@ -7,14 +7,12 @@
 
 namespace Drupal\Core\Field;
 
-use Drupal\Core\Entity\FieldableEntityInterface;
 use Drupal\Core\Access\AccessResult;
+use Drupal\Core\Entity\FieldableEntityInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\Core\Session\AccountInterface;
-use Drupal\Core\TypedData\DataDefinitionInterface;
 use Drupal\Core\TypedData\Plugin\DataType\ItemList;
-use Drupal\Core\TypedData\TypedDataInterface;
 
 /**
  * Represents an entity field; that is, a list of field item objects.
@@ -212,15 +210,9 @@ class FieldItemList extends ItemList implements FieldItemListInterface {
   /**
    * {@inheritdoc}
    */
-  public function insert() {
-    $this->delegateMethod('insert');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function update() {
-    $this->delegateMethod('update');
+  public function postSave($update) {
+    $result = $this->delegateMethod('postSave', $update);
+    return (bool) array_filter($result);
   }
 
   /**
@@ -240,13 +232,23 @@ class FieldItemList extends ItemList implements FieldItemListInterface {
   /**
    * Calls a method on each FieldItem.
    *
+   * Any argument passed will be forwarded to the invoked method.
+   *
    * @param string $method
-   *   The name of the method.
+   *   The name of the method to be invoked.
+   *
+   * @return array
+   *   An array of results keyed by delta.
    */
   protected function delegateMethod($method) {
-    foreach ($this->list as $item) {
-      $item->{$method}();
+    $result = [];
+    $args = array_slice(func_get_args(), 1);
+    foreach ($this->list as $delta => $item) {
+      // call_user_func_array() is way slower than a direct call so we avoid
+      // using it if have no parameters.
+      $result[$delta] = $args ? call_user_func_array([$item, $method], $args) : $item->{$method}();
     }
+    return $result;
   }
 
   /**
diff --git a/core/lib/Drupal/Core/Field/FieldItemListInterface.php b/core/lib/Drupal/Core/Field/FieldItemListInterface.php
index e4ea12c6c..df595e520 100644
--- a/core/lib/Drupal/Core/Field/FieldItemListInterface.php
+++ b/core/lib/Drupal/Core/Field/FieldItemListInterface.php
@@ -130,26 +130,29 @@ interface FieldItemListInterface extends ListInterface, AccessibleInterface {
   /**
    * Defines custom presave behavior for field values.
    *
-   * This method is called before either insert() or update() methods, and
-   * before values are written into storage.
+   * This method is called during the process of saving an entity, just before
+   * item values are written into storage.
+   *
+   * @see \Drupal\Core\Field\FieldItemInterface::preSave()
    */
   public function preSave();
 
   /**
-   * Defines custom insert behavior for field values.
+   * Defines custom post-save behavior for field values.
    *
-   * This method is called after the save() method, and before values are
-   * written into storage.
-   */
-  public function insert();
-
-  /**
-   * Defines custom update behavior for field values.
+   * This method is called during the process of saving an entity, just after
+   * item values are written into storage.
    *
-   * This method is called after the save() method, and before values are
-   * written into storage.
+   * @param bool $update
+   *   Specifies whether the entity is being updated or created.
+   *
+   * @return bool
+   *   Whether field items should be rewritten to the storage as a consequence
+   *   of the logic implemented by the custom behavior.
+   *
+   * @see \Drupal\Core\Field\FieldItemInterface::postSave()
    */
-  public function update();
+  public function postSave($update);
 
   /**
    * Defines custom delete behavior for field values.
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/EntityReferenceAutocompleteWidget.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/EntityReferenceAutocompleteWidget.php
index 6201c529b..948079ec9 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/EntityReferenceAutocompleteWidget.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/EntityReferenceAutocompleteWidget.php
@@ -46,10 +46,7 @@ class EntityReferenceAutocompleteWidget extends WidgetBase {
       '#type' => 'radios',
       '#title' => t('Autocomplete matching'),
       '#default_value' => $this->getSetting('match_operator'),
-      '#options' => array(
-        'STARTS_WITH' => t('Starts with'),
-        'CONTAINS' => t('Contains'),
-      ),
+      '#options' => $this->getMatchOperatorOptions(),
       '#description' => t('Select the method used to collect autocomplete suggestions. Note that <em>Contains</em> can cause performance issues on sites with thousands of entities.'),
     );
     $element['size'] = array(
@@ -74,7 +71,8 @@ class EntityReferenceAutocompleteWidget extends WidgetBase {
   public function settingsSummary() {
     $summary = array();
 
-    $summary[] = t('Autocomplete matching: @match_operator', array('@match_operator' => $this->getSetting('match_operator')));
+    $operators = $this->getMatchOperatorOptions();
+    $summary[] = t('Autocomplete matching: @match_operator', array('@match_operator' => $operators[$this->getSetting('match_operator')]));
     $summary[] = t('Textfield size: !size', array('!size' => $this->getSetting('size')));
     $placeholder = $this->getSetting('placeholder');
     if (!empty($placeholder)) {
@@ -181,4 +179,17 @@ class EntityReferenceAutocompleteWidget extends WidgetBase {
     return isset($settings[$setting_name]) ? $settings[$setting_name] : NULL;
   }
 
+  /**
+   * Returns the options for the match operator.
+   *
+   * @return array
+   *   List of options.
+   */
+  protected function getMatchOperatorOptions() {
+    return [
+      'STARTS_WITH' => t('Starts with'),
+      'CONTAINS' => t('Contains'),
+    ];
+  }
+
 }
diff --git a/core/lib/Drupal/Core/Field/WidgetBase.php b/core/lib/Drupal/Core/Field/WidgetBase.php
index cc13ae441..356eece30 100644
--- a/core/lib/Drupal/Core/Field/WidgetBase.php
+++ b/core/lib/Drupal/Core/Field/WidgetBase.php
@@ -12,6 +12,7 @@ use Drupal\Component\Utility\NestedArray;
 use Drupal\Component\Utility\SortArray;
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Render\Element;
 use Symfony\Component\Validator\ConstraintViolationInterface;
 use Symfony\Component\Validator\ConstraintViolationListInterface;
 
@@ -415,8 +416,8 @@ abstract class WidgetBase extends PluginSettingsBase implements WidgetInterface
         }
       }
 
-      // Only set errors if the element is accessible.
-      if (!isset($element['#access']) || $element['#access']) {
+      // Only set errors if the element is visible.
+      if (Element::isVisibleElement($element)) {
         $handles_multiple = $this->handlesMultipleValues();
 
         $violations_by_delta = array();
diff --git a/core/lib/Drupal/Core/File/MimeType/MimeTypeGuesser.php b/core/lib/Drupal/Core/File/MimeType/MimeTypeGuesser.php
index 20544638a..ae750502c 100644
--- a/core/lib/Drupal/Core/File/MimeType/MimeTypeGuesser.php
+++ b/core/lib/Drupal/Core/File/MimeType/MimeTypeGuesser.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\Core\File\MimeType;
 
+use Drupal\Core\StreamWrapper\StreamWrapperManagerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesser as SymfonyMimeTypeGuesser;
 use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesserInterface;
@@ -35,11 +36,28 @@ class MimeTypeGuesser implements MimeTypeGuesserInterface {
    */
   protected $sortedGuessers = NULL;
 
+   /**
+   * The stream wrapper manager.
+   *
+   * @var \Drupal\Core\StreamWrapper\StreamWrapperManagerInterface
+   */
+  protected $streamWrapperManager;
+
+  /**
+   * Constructs a MimeTypeGuesser object.
+   *
+   * @param StreamWrapperManagerInterface $streamWrapperManager
+   *   The stream wrapper manager.
+   */
+  public function __construct(StreamWrapperManagerInterface $stream_wrapper_manager) {
+    $this->streamWrapperManager = $stream_wrapper_manager;
+  }
+
   /**
    * {@inheritdoc}
    */
   public function guess($path) {
-    if ($wrapper = file_stream_wrapper_get_instance_by_uri($path)) {
+    if ($wrapper = $this->streamWrapperManager->getViaUri($path)) {
       // Get the real path from the stream wrapper.
       $path = $wrapper->realpath();
     }
@@ -100,6 +118,8 @@ class MimeTypeGuesser implements MimeTypeGuesserInterface {
    * @see \Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesser
    */
   public static function registerWithSymfonyGuesser(ContainerInterface $container) {
+    // Reset state, so we do not store more and more services during test runs.
+    SymfonyMimeTypeGuesser::reset();
     $singleton = SymfonyMimeTypeGuesser::getInstance();
     $singleton->register($container->get('file.mime_type.guesser'));
   }
diff --git a/core/lib/Drupal/Core/File/file.api.php b/core/lib/Drupal/Core/File/file.api.php
index a4fd8e4c6..43913fbd0 100644
--- a/core/lib/Drupal/Core/File/file.api.php
+++ b/core/lib/Drupal/Core/File/file.api.php
@@ -80,7 +80,7 @@ function hook_file_url_alter(&$uri) {
     }
     // Public created files.
     else {
-      $wrapper = file_stream_wrapper_get_instance_by_scheme($scheme);
+      $wrapper = \Drupal::service('stream_wrapper_manager')->getViaScheme($scheme);
       $path = $wrapper->getDirectoryPath() . '/' . file_uri_target($uri);
     }
 
diff --git a/core/lib/Drupal/Core/Form/FormBuilder.php b/core/lib/Drupal/Core/Form/FormBuilder.php
index 2e0b19245..fe6d104ee 100644
--- a/core/lib/Drupal/Core/Form/FormBuilder.php
+++ b/core/lib/Drupal/Core/Form/FormBuilder.php
@@ -10,8 +10,8 @@ namespace Drupal\Core\Form;
 use Drupal\Component\Utility\Crypt;
 use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\NestedArray;
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Utility\UrlHelper;
+use Drupal\Core\Access\AccessResultInterface;
 use Drupal\Core\Access\CsrfTokenGenerator;
 use Drupal\Core\DependencyInjection\ClassResolverInterface;
 use Drupal\Core\EventSubscriber\MainContentViewSubscriber;
@@ -152,7 +152,7 @@ class FormBuilder implements FormBuilderInterface, FormValidatorInterface, FormS
     }
 
     if (!is_object($form_arg) || !($form_arg instanceof FormInterface)) {
-      throw new \InvalidArgumentException(SafeMarkup::format('The form argument @form_arg is not a valid form.', array('@form_arg' => $form_arg)));
+      throw new \InvalidArgumentException("The form argument $form_arg is not a valid form.");
     }
 
     // Add the $form_arg as the callback object and determine the form ID.
@@ -184,9 +184,22 @@ class FormBuilder implements FormBuilderInterface, FormValidatorInterface, FormS
     // Ensure the form ID is prepared.
     $form_id = $this->getFormId($form_id, $form_state);
 
+    $request = $this->requestStack->getCurrentRequest();
+
+    // Inform $form_state about the request method that's building it, so that
+    // it can prevent persisting state changes during HTTP methods for which
+    // that is disallowed by HTTP: GET and HEAD.
+    $form_state->setRequestMethod($request->getMethod());
+
+    // Initialize the form's user input. The user input should include only the
+    // input meant to be treated as part of what is submitted to the form, so
+    // we base it on the form's method rather than the request's method. For
+    // example, when someone does a GET request for
+    // /node/add/article?destination=foo, which is a form that expects its
+    // submission method to be POST, the user input during the GET request
+    // should be initialized to empty rather than to ['destination' => 'foo'].
     $input = $form_state->getUserInput();
     if (!isset($input)) {
-      $request = $this->requestStack->getCurrentRequest();
       $input = $form_state->isMethodType('get') ? $request->query->all() : $request->request->all();
       $form_state->setUserInput($input);
     }
@@ -312,8 +325,22 @@ class FormBuilder implements FormBuilderInterface, FormValidatorInterface, FormS
    */
   public function rebuildForm($form_id, FormStateInterface &$form_state, $old_form = NULL) {
     $form = $this->retrieveForm($form_id, $form_state);
-    // All rebuilt forms will be cached.
-    $form_state->setCached();
+
+    // Only GET and POST are valid form methods. If the form receives its input
+    // via POST, then $form_state must be persisted when it is rebuilt between
+    // submissions. If the form receives its input via GET, then persisting
+    // state is forbidden by $form_state->setCached(), and the form must use
+    // the URL itself to transfer its state across steps. Although $form_state
+    // throws an exception based on the request method rather than the form's
+    // method, we base the decision to cache on the form method, because:
+    // - It's the form method that defines what the form needs to do to manage
+    //   its state.
+    // - rebuildForm() should only be called after successful input processing,
+    //   which means the request method matches the form method, and if not,
+    //   there's some other error, so it's ok if an exception is thrown.
+    if ($form_state->isMethodType('POST')) {
+      $form_state->setCached();
+    }
 
     // If only parts of the form will be returned to the browser (e.g., Ajax or
     // RIA clients), or if the form already had a new build ID regenerated when
@@ -697,7 +724,14 @@ class FormBuilder implements FormBuilderInterface, FormValidatorInterface, FormS
   protected function buildFormAction() {
     // @todo Use <current> instead of the master request in
     //   https://www.drupal.org/node/2505339.
-    $request_uri = $this->requestStack->getMasterRequest()->getRequestUri();
+    $request = $this->requestStack->getMasterRequest();
+    $request_uri = $request->getRequestUri();
+
+    // Prevent cross site requests via the Form API by using an absolute URL
+    // when the request uri starts with multiple slashes..
+    if (strpos($request_uri, '//') === 0) {
+      $request_uri = $request->getUri();
+    }
 
     // @todo Remove this parsing once these are removed from the request in
     //   https://www.drupal.org/node/2504709.
@@ -829,6 +863,13 @@ class FormBuilder implements FormBuilderInterface, FormValidatorInterface, FormS
 
     // Recurse through all child elements.
     $count = 0;
+    if (isset($element['#access'])) {
+      $access = $element['#access'];
+      $inherited_access = NULL;
+      if (($access instanceof AccessResultInterface && !$access->isAllowed()) || $access === FALSE) {
+        $inherited_access = $access;
+      }
+    }
     foreach (Element::children($element) as $key) {
       // Prior to checking properties of child elements, their default
       // properties need to be loaded.
@@ -842,9 +883,9 @@ class FormBuilder implements FormBuilderInterface, FormValidatorInterface, FormS
         $element[$key]['#tree'] = $element['#tree'];
       }
 
-      // Deny access to child elements if parent is denied.
-      if (isset($element['#access']) && !$element['#access']) {
-        $element[$key]['#access'] = FALSE;
+      // Children inherit #access from parent.
+      if (isset($inherited_access)) {
+        $element[$key]['#access'] = $inherited_access;
       }
 
       // Make child elements inherit their parent's #disabled and #allow_focus
diff --git a/core/lib/Drupal/Core/Form/FormBuilderInterface.php b/core/lib/Drupal/Core/Form/FormBuilderInterface.php
index 60ad70483..89813ca6e 100644
--- a/core/lib/Drupal/Core/Form/FormBuilderInterface.php
+++ b/core/lib/Drupal/Core/Form/FormBuilderInterface.php
@@ -70,7 +70,7 @@ interface FormBuilderInterface {
    * Builds and processes a form for a given form ID.
    *
    * The form may also be retrieved from the cache if the form was built in a
-   * previous page-load. The form is then passed on for processing, validation
+   * previous page load. The form is then passed on for processing, validation,
    * and submission if there is proper input.
    *
    * @param \Drupal\Core\Form\FormInterface|string $form_id
@@ -108,9 +108,7 @@ interface FormBuilderInterface {
    * form workflow, to be returned for rendering.
    *
    * Ajax form submissions are almost always multi-step workflows, so that is
-   * one common use-case during which form rebuilding occurs. See
-   * Drupal\system\FormAjaxController::content() for more information about
-   * creating Ajax-enabled forms.
+   * one common use-case during which form rebuilding occurs.
    *
    * @param string $form_id
    *   The unique string identifying the desired form. If a function with that
@@ -130,7 +128,6 @@ interface FormBuilderInterface {
    *   The newly built form.
    *
    * @see self::processForm()
-   * @see \Drupal\system\FormAjaxController::content()
    */
   public function rebuildForm($form_id, FormStateInterface &$form_state, $old_form = NULL);
 
diff --git a/core/lib/Drupal/Core/Form/FormState.php b/core/lib/Drupal/Core/Form/FormState.php
index 4a17d6b22..9cb0b0da2 100644
--- a/core/lib/Drupal/Core/Form/FormState.php
+++ b/core/lib/Drupal/Core/Form/FormState.php
@@ -141,16 +141,29 @@ class FormState implements FormStateInterface {
   /**
    * The HTTP form method to use for finding the input for this form.
    *
-   * May be 'post' or 'get'. Defaults to 'post'. Note that 'get' method forms do
+   * May be 'POST' or 'GET'. Defaults to 'POST'. Note that 'GET' method forms do
    * not use form ids so are always considered to be submitted, which can have
-   * unexpected effects. The 'get' method should only be used on forms that do
-   * not change data, as that is exclusively the domain of 'post.'
+   * unexpected effects. The 'GET' method should only be used on forms that do
+   * not change data, as that is exclusively the domain of 'POST.'
    *
    * This property is uncacheable.
    *
    * @var string
    */
-  protected $method = 'post';
+  protected $method = 'POST';
+
+  /**
+   * The HTTP method used by the request building or processing this form.
+   *
+   * May be any valid HTTP method. Defaults to 'GET', because even though
+   * $method is 'POST' for most forms, the form's initial build is usually
+   * performed as part of a GET request.
+   *
+   * This property is uncacheable.
+   *
+   * @var string
+   */
+  protected $requestMethod = 'GET';
 
   /**
    * If set to TRUE the original, unprocessed form structure will be cached,
@@ -475,6 +488,12 @@ class FormState implements FormStateInterface {
    * {@inheritdoc}
    */
   public function setCached($cache = TRUE) {
+    // Persisting $form_state is a side-effect disallowed during a "safe" HTTP
+    // method.
+    if ($cache && $this->isRequestMethodSafe()) {
+      throw new \LogicException(sprintf('Form state caching on %s requests is not allowed.', $this->requestMethod));
+    }
+
     $this->cache = (bool) $cache;
     return $this;
   }
@@ -569,6 +588,29 @@ class FormState implements FormStateInterface {
     return $this->method === strtoupper($method_type);
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function setRequestMethod($method) {
+    $this->requestMethod = strtoupper($method);
+    return $this;
+  }
+
+  /**
+   * Checks whether the request method is a "safe" HTTP method.
+   *
+   * http://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.1.1 defines
+   * GET and HEAD as "safe" methods, meaning they SHOULD NOT have side-effects,
+   * such as persisting $form_state changes.
+   *
+   * @return bool
+   *
+   * @see \Symfony\Component\HttpFoundation\Request::isMethodSafe()
+   */
+  protected function isRequestMethodSafe() {
+    return in_array($this->requestMethod, array('GET', 'HEAD'));
+  }
+
   /**
    * {@inheritdoc}
    */
diff --git a/core/lib/Drupal/Core/Form/FormStateInterface.php b/core/lib/Drupal/Core/Form/FormStateInterface.php
index e0ca1c6a7..fd46f70fe 100644
--- a/core/lib/Drupal/Core/Form/FormStateInterface.php
+++ b/core/lib/Drupal/Core/Form/FormStateInterface.php
@@ -640,6 +640,10 @@ interface FormStateInterface {
    *   TRUE if the form should be cached, FALSE otherwise.
    *
    * @return $this
+   *
+   * @throws \LogicException
+   *   If the current request is using an HTTP method that must not change
+   *   state (e.g., GET).
    */
   public function setCached($cache = TRUE);
 
@@ -731,17 +735,36 @@ interface FormStateInterface {
   public function getLimitValidationErrors();
 
   /**
-   * Sets the HTTP form method.
+   * Sets the HTTP method to use for the form's submission.
+   *
+   * This is what the form's "method" attribute should be, not necessarily what
+   * the current request's HTTP method is. For example, a form can have a
+   * method attribute of POST, but the request that initially builds it uses
+   * GET.
    *
    * @param string $method
-   *   The HTTP form method.
+   *   Either "GET" or "POST". Other HTTP methods are not valid form submission
+   *   methods.
    *
    * @see \Drupal\Core\Form\FormState::$method
+   * @see \Drupal\Core\Form\FormStateInterface::setRequestMethod()
    *
    * @return $this
    */
   public function setMethod($method);
 
+  /**
+   * Sets the HTTP method used by the request that is building the form.
+   *
+   * @param string $method
+   *   Can be any valid HTTP method, such as GET, POST, HEAD, etc.
+   *
+   * @return $this
+   *
+   * @see \Drupal\Core\Form\FormStateInterface::setMethod()
+   */
+  public function setRequestMethod($method);
+
   /**
    * Returns the HTTP form method.
    *
diff --git a/core/lib/Drupal/Core/GeneratedLink.php b/core/lib/Drupal/Core/GeneratedLink.php
index 7d5b0c316..eb35bc620 100644
--- a/core/lib/Drupal/Core/GeneratedLink.php
+++ b/core/lib/Drupal/Core/GeneratedLink.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\Core;
 
-use Drupal\Core\Cache\CacheableMetadata;
+use Drupal\Core\Render\BubbleableMetadata;
 
 /**
  * Used to return generated links, along with associated cacheability metadata.
@@ -15,7 +15,7 @@ use Drupal\Core\Cache\CacheableMetadata;
  * Note: not to be confused with \Drupal\Core\Link, which is for passing around
  *   ungenerated links (typically link text + route name + route parameters).
  */
-class GeneratedLink extends CacheableMetadata {
+class GeneratedLink extends BubbleableMetadata {
 
   /**
    * The HTML string value containing a link.
diff --git a/core/lib/Drupal/Core/GeneratedUrl.php b/core/lib/Drupal/Core/GeneratedUrl.php
index 7c5574722..68df6e1c6 100644
--- a/core/lib/Drupal/Core/GeneratedUrl.php
+++ b/core/lib/Drupal/Core/GeneratedUrl.php
@@ -7,15 +7,15 @@
 
 namespace Drupal\Core;
 
-use Drupal\Core\Cache\CacheableMetadata;
+use Drupal\Core\Render\BubbleableMetadata;
 
 /**
- * Used to return generated URLs, along with associated cacheability metadata.
+ * Used to return generated URLs, along with associated bubbleable metadata.
  *
  * Note: not to be confused with \Drupal\Core\Url, which is for passing around
  *   ungenerated URLs (typically route name + route parameters).
  */
-class GeneratedUrl extends CacheableMetadata {
+class GeneratedUrl extends BubbleableMetadata {
 
   /**
    * The string value of the URL.
diff --git a/core/lib/Drupal/Core/Http/Client.php b/core/lib/Drupal/Core/Http/Client.php
deleted file mode 100644
index fd27b671a..000000000
--- a/core/lib/Drupal/Core/Http/Client.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\Core\Http\Client.
- */
-
-namespace Drupal\Core\Http;
-
-use Drupal\Component\Utility\NestedArray;
-use Drupal\Core\Site\Settings;
-use GuzzleHttp\Client as GuzzleClient;
-use GuzzleHttp\Event\SubscriberInterface;
-
-/**
- * Drupal default HTTP client class.
- */
-class Client extends GuzzleClient {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function __construct(array $config = []) {
-    $default_config = array(
-      // Security consideration: we must not use the certificate authority
-      // file shipped with Guzzle because it can easily get outdated if a
-      // certificate authority is hacked. Instead, we rely on the certificate
-      // authority file provided by the operating system which is more likely
-      // going to be updated in a timely fashion. This overrides the default
-      // path to the pem file bundled with Guzzle.
-      'verify' => TRUE,
-      'timeout' => 30,
-      'headers' => array(
-        'User-Agent' => 'Drupal/' . \Drupal::VERSION . ' (+https://www.drupal.org/) ' . static::getDefaultUserAgent(),
-      ),
-    );
-
-    // The entire config array is merged/configurable to allow Guzzle client
-    // options outside of 'defaults' to be changed, such as 'adapter', or
-    // 'message_factory'.
-    $config = NestedArray::mergeDeep(array('defaults' => $default_config), $config, Settings::get('http_client_config', array()));
-
-    parent::__construct($config);
-  }
-
-  /**
-   * Attaches an event subscriber.
-   *
-   * @param \GuzzleHttp\Event\SubscriberInterface $subscriber
-   *   The subscriber to attach.
-   *
-   * @see \GuzzleHttp\Event\Emitter::attach()
-   */
-  public function attach(SubscriberInterface $subscriber) {
-    $this->getEmitter()->attach($subscriber);
-  }
-
-  /**
-   * Detaches an event subscriber.
-   *
-   * @param \GuzzleHttp\Event\SubscriberInterface $subscriber
-   *   The subscriber to detach.
-   *
-   * @see \GuzzleHttp\Event\Emitter::detach()
-   */
-  public function detach(SubscriberInterface $subscriber) {
-    $this->getEmitter()->detach($subscriber);
-  }
-
-}
diff --git a/core/lib/Drupal/Core/Http/ClientFactory.php b/core/lib/Drupal/Core/Http/ClientFactory.php
new file mode 100644
index 000000000..7524e896b
--- /dev/null
+++ b/core/lib/Drupal/Core/Http/ClientFactory.php
@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Http\ClientFactory.
+ */
+
+namespace Drupal\Core\Http;
+
+use Drupal\Component\Utility\NestedArray;
+use Drupal\Core\Site\Settings;
+use GuzzleHttp\Client;
+use GuzzleHttp\HandlerStack;
+
+/**
+ * Helper class to construct a HTTP client with Drupal specific config.
+ */
+class ClientFactory {
+
+  /**
+   * The handler stack.
+   *
+   * @var \GuzzleHttp\HandlerStack
+   */
+  protected $stack;
+
+  /**
+   * Constructs a new ClientFactory instance.
+   *
+   * @param \GuzzleHttp\HandlerStack $stack
+   *   The handler stack.
+   */
+  public function __construct(HandlerStack $stack) {
+    $this->stack = $stack;
+  }
+
+  /**
+   * Constructs a new client object from some configuration.
+   *
+   * @param array $config
+   *   The config for the client.
+   *
+   * @return \GuzzleHttp\Client
+   *   The HTTP client.
+   */
+  public function fromOptions(array $config = []) {
+    $default_config = [
+      // Security consideration: we must not use the certificate authority
+      // file shipped with Guzzle because it can easily get outdated if a
+      // certificate authority is hacked. Instead, we rely on the certificate
+      // authority file provided by the operating system which is more likely
+      // going to be updated in a timely fashion. This overrides the default
+      // path to the pem file bundled with Guzzle.
+      'verify' => TRUE,
+      'timeout' => 30,
+      'headers' => [
+        'User-Agent' => 'Drupal/' . \Drupal::VERSION . ' (+https://www.drupal.org/) ' . \GuzzleHttp\default_user_agent(),
+      ],
+      'handler' => $this->stack,
+    ];
+
+    $config = NestedArray::mergeDeep($default_config, Settings::get('http_client_config', []), $config);
+
+    return new Client($config);
+  }
+
+}
diff --git a/core/lib/Drupal/Core/Http/HandlerStackConfigurator.php b/core/lib/Drupal/Core/Http/HandlerStackConfigurator.php
new file mode 100644
index 000000000..54e4bd9c3
--- /dev/null
+++ b/core/lib/Drupal/Core/Http/HandlerStackConfigurator.php
@@ -0,0 +1,94 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Http\HandlerStackConfigurator.
+ */
+
+namespace Drupal\Core\Http;
+
+use GuzzleHttp\HandlerStack;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Defines a class for configuring middlewares on the http handler stack.
+ *
+ * The http_client service requires a handler stack to perform http requests.
+ * This is provided by the http_handler_stack service. Modules wishing to add
+ * additional middlewares to the handler stack can create services and tag them
+ * as http_client_middleware. Each service must contain an __invoke method that
+ * returns a closure which will serve as the middleware.
+ *
+ * @see https://guzzle.readthedocs.org/en/latest/handlers-and-middleware.html
+ *
+ * @see \Drupal\Core\Http\Client
+ * @see \Drupal\Core\Test\HttpClientMiddleware\TestHttpClientMiddleware
+ */
+class HandlerStackConfigurator {
+
+  /**
+   * Array of middlewares to add to the handler stack.
+   *
+   * @var callable[]
+   */
+  protected $middlewares = NULL;
+
+  /**
+   * A list of used middleware service IDs.
+   *
+   * @var string[]
+   */
+  protected $middlewareIds = [];
+
+  /**
+   * The service container.
+   *
+   * @var \Symfony\Component\DependencyInjection\ContainerInterface
+   */
+  protected $container;
+
+  /**
+   * Contructs a new HandlerStackConfigurator object.
+   *
+   * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
+   *   The service container.
+   * @param string[] $middleware_ids
+   *   The middleware IDs.
+   */
+  public function __construct(ContainerInterface $container, array $middleware_ids) {
+    $this->middlewareIds = $middleware_ids;
+    $this->container = $container;
+  }
+
+  /**
+   * Ensures that the middlewares are initialized.
+   */
+  protected function initializeMiddlewares() {
+    if (!isset($this->middlewares)) {
+      $this->middlewares = [];
+      foreach ($this->middlewareIds as $middleware_id) {
+        $middleware = $this->container->get($middleware_id);
+        if (is_callable($middleware)) {
+          $this->middlewares[$middleware_id] = $middleware();
+        }
+        else {
+          throw new \InvalidArgumentException('Middlewares need to implement __invoke, see https://guzzle.readthedocs.org/en/latest/handlers-and-middleware.html for more information about middlewares.');
+        }
+      }
+    }
+  }
+
+  /**
+   * Configures the stack using services tagged as http_client_middleware.
+   *
+   * @param \GuzzleHttp\HandlerStack $handler_stack
+   *   The handler stack
+   */
+  public function configure(HandlerStack $handler_stack) {
+    $this->initializeMiddlewares();
+    foreach ($this->middlewares as $middleware_id => $middleware) {
+      $handler_stack->push($middleware, $middleware_id);
+    }
+  }
+
+}
diff --git a/core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationBase.php b/core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationBase.php
index 4fd6bdcf9..9e21c039e 100644
--- a/core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationBase.php
+++ b/core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationBase.php
@@ -8,7 +8,6 @@
 namespace Drupal\Core\ImageToolkit;
 
 use Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException;
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Plugin\PluginBase;
 use Psr\Log\LoggerInterface;
 
@@ -114,7 +113,7 @@ abstract class ImageToolkitOperationBase extends PluginBase implements ImageTool
       if ($argument['required']) {
         if (!array_key_exists($id, $arguments)) {
           // If the argument is required throw an exception.
-          throw new \InvalidArgumentException(SafeMarkup::format("Argument '@argument' expected by plugin '@plugin' but not passed", array('@argument' => $id, '@plugin' => $this->getPluginId())));
+          throw new \InvalidArgumentException("Argument '$id' expected by plugin '{$this->getPluginId()}' but not passed");
         }
       }
       else {
@@ -124,7 +123,7 @@ abstract class ImageToolkitOperationBase extends PluginBase implements ImageTool
         if (!array_key_exists('default', $argument)) {
           // The plugin did not define a default, so throw a plugin exception,
           // not an invalid argument exception.
-          throw new InvalidPluginDefinitionException(SafeMarkup::format("Default for argument '@argument' expected by plugin '@plugin' but not defined", array('@argument' => $id, '@plugin' => $this->getPluginId())));
+          throw new InvalidPluginDefinitionException("Default for argument '$id' expected by plugin '{$this->getPluginId()}' but not defined");
         }
 
         // Use the default value if the argument is not passed in.
diff --git a/core/lib/Drupal/Core/Installer/InstallerKernel.php b/core/lib/Drupal/Core/Installer/InstallerKernel.php
index 41e8cbe9c..cd3977cf3 100644
--- a/core/lib/Drupal/Core/Installer/InstallerKernel.php
+++ b/core/lib/Drupal/Core/Installer/InstallerKernel.php
@@ -16,13 +16,11 @@ class InstallerKernel extends DrupalKernel {
 
   /**
    * {@inheritdoc}
-   *
-   * @param bool $rebuild
-   *   Force a container rebuild. Unlike the parent method, this defaults to
-   *   TRUE.
    */
-  protected function initializeContainer($rebuild = TRUE) {
-    $container = parent::initializeContainer($rebuild);
+  protected function initializeContainer() {
+    // Always force a container rebuild.
+    $this->containerNeedsRebuild = TRUE;
+    $container = parent::initializeContainer();
     return $container;
   }
 
diff --git a/core/lib/Drupal/Core/Installer/InstallerServiceProvider.php b/core/lib/Drupal/Core/Installer/InstallerServiceProvider.php
index 83a784515..4e09da7b3 100644
--- a/core/lib/Drupal/Core/Installer/InstallerServiceProvider.php
+++ b/core/lib/Drupal/Core/Installer/InstallerServiceProvider.php
@@ -46,6 +46,8 @@ class InstallerServiceProvider implements ServiceProviderInterface, ServiceModif
     $container
       ->register('url_generator', 'Drupal\Core\Routing\NullGenerator')
       ->addArgument(new Reference('request_stack'));
+    $container
+      ->register('path_processor_manager', 'Drupal\Core\PathProcessor\NullPathProcessorManager');
     $container
       ->register('router.dumper', 'Drupal\Core\Routing\NullMatcherDumper');
 
@@ -58,7 +60,10 @@ class InstallerServiceProvider implements ServiceProviderInterface, ServiceModif
     // Replace the route builder with an empty implementation.
     // @todo Convert installer steps into routes; add an installer.routing.yml.
     $definition = $container->getDefinition('router.builder');
-    $definition->setClass('Drupal\Core\Installer\InstallerRouteBuilder');
+    $definition->setClass('Drupal\Core\Installer\InstallerRouteBuilder')
+      // The core router builder, but there is no reason here to be lazy, so
+      // we don't need to ship with a custom proxy class.
+      ->setLazy(FALSE);
   }
 
   /**
diff --git a/core/modules/block/src/EventSubscriber/CurrentLanguageContext.php b/core/lib/Drupal/Core/Language/ContextProvider/CurrentLanguageContext.php
similarity index 56%
rename from core/modules/block/src/EventSubscriber/CurrentLanguageContext.php
rename to core/lib/Drupal/Core/Language/ContextProvider/CurrentLanguageContext.php
index 023f7ccfe..94f39fd77 100644
--- a/core/modules/block/src/EventSubscriber/CurrentLanguageContext.php
+++ b/core/lib/Drupal/Core/Language/ContextProvider/CurrentLanguageContext.php
@@ -2,21 +2,22 @@
 
 /**
  * @file
- * Contains \Drupal\block\EventSubscriber\CurrentLanguageContext.
+ * Contains \Drupal\Core\Language\ContextProvider\CurrentLanguageContext.
  */
 
-namespace Drupal\block\EventSubscriber;
+namespace Drupal\Core\Language\ContextProvider;
 
-use Drupal\block\Event\BlockContextEvent;
+use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Language\LanguageManagerInterface;
 use Drupal\Core\Plugin\Context\Context;
 use Drupal\Core\Plugin\Context\ContextDefinition;
+use Drupal\Core\Plugin\Context\ContextProviderInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 
 /**
  * Sets the current language as a context.
  */
-class CurrentLanguageContext extends BlockContextSubscriberBase {
+class CurrentLanguageContext implements ContextProviderInterface {
 
   use StringTranslationTrait;
 
@@ -40,24 +41,41 @@ class CurrentLanguageContext extends BlockContextSubscriberBase {
   /**
    * {@inheritdoc}
    */
-  public function onBlockActiveContext(BlockContextEvent $event) {
+  public function getRuntimeContexts(array $unqualified_context_ids) {
     // Add a context for each language type.
     $language_types = $this->languageManager->getLanguageTypes();
     $info = $this->languageManager->getDefinedLanguageTypesInfo();
+
+    if ($unqualified_context_ids) {
+      foreach ($unqualified_context_ids as $unqualified_context_id) {
+        if (array_search($unqualified_context_id, $language_types) === FALSE) {
+          unset($language_types[$unqualified_context_id]);
+        }
+      }
+    }
+
+    $result = [];
     foreach ($language_types as $type_key) {
       if (isset($info[$type_key]['name'])) {
         $context = new Context(new ContextDefinition('language', $info[$type_key]['name']));
         $context->setContextValue($this->languageManager->getCurrentLanguage($type_key));
-        $event->setContext('language.' . $type_key, $context);
+
+        $cacheability = new CacheableMetadata();
+        $cacheability->setCacheContexts(['languages:' . $type_key]);
+        $context->addCacheableDependency($cacheability);
+
+        $result[$type_key] = $context;
       }
     }
+
+    return $result;
   }
 
   /**
    * {@inheritdoc}
    */
-  public function onBlockAdministrativeContext(BlockContextEvent $event) {
-    $this->onBlockActiveContext($event);
+  public function getAvailableContexts() {
+    return $this->getRuntimeContexts([]);
   }
 
 }
diff --git a/core/lib/Drupal/Core/Language/LanguageManager.php b/core/lib/Drupal/Core/Language/LanguageManager.php
index eda43525f..cd27c747b 100644
--- a/core/lib/Drupal/Core/Language/LanguageManager.php
+++ b/core/lib/Drupal/Core/Language/LanguageManager.php
@@ -87,28 +87,43 @@ class LanguageManager implements LanguageManagerInterface {
   }
 
   /**
-   * {@inheritdoc}
+   * Returns information about all defined language types.
+   *
+   * Defines the three core language types:
+   * - Interface language is the only configurable language type in core. It is
+   *   used by t() as the default language if none is specified.
+   * - Content language is by default non-configurable and inherits the
+   *   interface language negotiated value. It is used by the Field API to
+   *   determine the display language for fields if no explicit value is
+   *   specified.
+   * - URL language is by default non-configurable and is determined through the
+   *   URL language negotiation method or the URL fallback language negotiation
+   *   method if no language can be detected. It is used by l() as the default
+   *   language if none is specified.
+   *
+   * @return array
+   *   An associative array of language type information arrays keyed by
+   *   language type machine name, in the format of
+   *   hook_language_types_info().
    */
   public function getDefinedLanguageTypesInfo() {
-    // This needs to have the same return value as
-    // language_language_type_info(), so that even if the Language module is
-    // not defined, users of this information, such as the Views module, can
-    // access names and descriptions of the default language types.
-    return array(
+    $this->definedLanguageTypesInfo = array(
       LanguageInterface::TYPE_INTERFACE => array(
-        'name' => $this->t('Interface text'),
-        'description' => $this->t('Order of language detection methods for interface text. If a translation of interface text is available in the detected language, it will be displayed.'),
+        'name' => new TranslationWrapper('Interface text'),
+        'description' => new TranslationWrapper('Order of language detection methods for interface text. If a translation of interface text is available in the detected language, it will be displayed.'),
         'locked' => TRUE,
       ),
       LanguageInterface::TYPE_CONTENT => array(
-        'name' => $this->t('Content'),
-        'description' => $this->t('Order of language detection methods for content. If a version of content is available in the detected language, it will be displayed.'),
+        'name' => new TranslationWrapper('Content'),
+        'description' => new TranslationWrapper('Order of language detection methods for content. If a version of content is available in the detected language, it will be displayed.'),
         'locked' => TRUE,
       ),
       LanguageInterface::TYPE_URL => array(
         'locked' => TRUE,
       ),
     );
+
+    return $this->definedLanguageTypesInfo;
   }
 
   /**
diff --git a/core/lib/Drupal/Core/Link.php b/core/lib/Drupal/Core/Link.php
index 73bbcf55a..05869a24e 100644
--- a/core/lib/Drupal/Core/Link.php
+++ b/core/lib/Drupal/Core/Link.php
@@ -122,17 +122,17 @@ class Link {
   /**
    * Generates the HTML for this Link object.
    *
-   * @param bool $collect_cacheability_metadata
+   * @param bool $collect_bubbleable_metadata
    *   (optional) Defaults to FALSE. When TRUE, both the generated link and its
-   *   associated cacheability metadata are returned.
+   *   associated bubbleable metadata are returned.
    *
    * @return string|\Drupal\Core\GeneratedLink
    *   The link HTML markup.
-   *   When $collect_cacheability_metadata is TRUE, a GeneratedLink object is
-   *   returned, containing the generated link plus cacheability metadata.
+   *   When $collect_bubbleable_metadata is TRUE, a GeneratedLink object is
+   *   returned, containing the generated link plus bubbleable metadata.
    */
-  public function toString($collect_cacheability_metadata = FALSE) {
-    return $this->getLinkGenerator()->generateFromLink($this, $collect_cacheability_metadata);
+  public function toString($collect_bubbleable_metadata = FALSE) {
+    return $this->getLinkGenerator()->generateFromLink($this, $collect_bubbleable_metadata);
   }
 
 }
diff --git a/core/lib/Drupal/Core/Logger/LoggerChannelInterface.php b/core/lib/Drupal/Core/Logger/LoggerChannelInterface.php
index 20afd7eb7..abc36d4e0 100644
--- a/core/lib/Drupal/Core/Logger/LoggerChannelInterface.php
+++ b/core/lib/Drupal/Core/Logger/LoggerChannelInterface.php
@@ -13,6 +13,29 @@ use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
  * Logger channel interface.
+ *
+ * This interface defines the full behavior of the central Drupal logger
+ * facility. However, when writing code that does logging, use the generic
+ * \Psr\Log\LoggerInterface for typehinting instead (you shouldn't need the
+ * methods here).
+ *
+ * To add a new logger to the system, implement \Psr\Log\LoggerInterface and
+ * add a service for that class to a services.yml file tagged with the 'logger'
+ * tag. The default logger channel implementation will call the log() method
+ * of every logger service with some useful data set in the $context argument
+ * of log(): request_uri, referer, ip, user, uid.
+ *
+ * SECURITY NOTE: the caller might also set a 'link' in the $context array
+ * which will be printed as-is by the dblog module under an "operations"
+ * header. Usually this is a "view", "edit" or similar relevant link. Make sure
+ * to use proper, secure link generation facilities; some are listed below.
+ *
+ * @see \Drupal\Core\Logger\RfcLoggerTrait
+ * @see \Psr\Log\LoggerInterface
+ * @see \Drupal\Core\Logger\\LoggerChannelFactoryInterface
+ * @see \Drupal\Core\Utility\LinkGeneratorInterface
+ * @see \Drupal\Core\Routing\LinkGeneratorTrait::l()
+ * @see \Drupal\Core\Entity\EntityInterface::link()
  */
 interface LoggerChannelInterface extends LoggerInterface {
 
diff --git a/core/lib/Drupal/Core/Menu/ContextualLinkDefault.php b/core/lib/Drupal/Core/Menu/ContextualLinkDefault.php
index 4fe741683..19671feae 100644
--- a/core/lib/Drupal/Core/Menu/ContextualLinkDefault.php
+++ b/core/lib/Drupal/Core/Menu/ContextualLinkDefault.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\Core\Menu;
 
-use Drupal\Core\Plugin\PluginBase;
+use Drupal\Component\Plugin\PluginBase;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -17,21 +17,10 @@ class ContextualLinkDefault extends PluginBase implements ContextualLinkInterfac
 
   /**
    * {@inheritdoc}
-   *
-   * @todo: It might be helpful at some point to move this getTitle logic into
-   *   a trait.
    */
   public function getTitle(Request $request = NULL) {
-    $options = array();
-    if (!empty($this->pluginDefinition['title_context'])) {
-      $options['context'] = $this->pluginDefinition['title_context'];
-    }
-    $args = array();
-    if (isset($this->pluginDefinition['title_arguments']) && $title_arguments = $this->pluginDefinition['title_arguments']) {
-      $args = (array) $title_arguments;
-    }
-
-    return $this->t($this->pluginDefinition['title'], $args, $options);
+    // The title from YAML file discovery may be a TranslationWrapper object.
+    return (string) $this->pluginDefinition['title'];
   }
 
   /**
diff --git a/core/lib/Drupal/Core/Menu/ContextualLinkManager.php b/core/lib/Drupal/Core/Menu/ContextualLinkManager.php
index 3482adc36..25421d7fd 100644
--- a/core/lib/Drupal/Core/Menu/ContextualLinkManager.php
+++ b/core/lib/Drupal/Core/Menu/ContextualLinkManager.php
@@ -118,8 +118,9 @@ class ContextualLinkManager extends DefaultPluginManager implements ContextualLi
    */
   protected function getDiscovery() {
     if (!isset($this->discovery)) {
-      $this->discovery = new YamlDiscovery('links.contextual', $this->moduleHandler->getModuleDirectories());
-      $this->discovery = new ContainerDerivativeDiscoveryDecorator($this->discovery);
+      $yaml_discovery = new YamlDiscovery('links.contextual', $this->moduleHandler->getModuleDirectories());
+      $yaml_discovery->addTranslatableProperty('title', 'title_context');
+      $this->discovery = new ContainerDerivativeDiscoveryDecorator($yaml_discovery);
     }
     return $this->discovery;
   }
diff --git a/core/lib/Drupal/Core/Menu/InaccessibleMenuLink.php b/core/lib/Drupal/Core/Menu/InaccessibleMenuLink.php
index 075e3569d..1dad00d6f 100644
--- a/core/lib/Drupal/Core/Menu/InaccessibleMenuLink.php
+++ b/core/lib/Drupal/Core/Menu/InaccessibleMenuLink.php
@@ -8,7 +8,6 @@
 namespace Drupal\Core\Menu;
 
 use Drupal\Component\Plugin\Exception\PluginException;
-use Drupal\Component\Utility\SafeMarkup;
 
 /**
  * A menu link plugin for wrapping another menu link, in sensitive situations.
@@ -80,7 +79,7 @@ class InaccessibleMenuLink extends MenuLinkBase {
    * {@inheritdoc}
    */
   public function updateLink(array $new_definition_values, $persist) {
-    throw new PluginException(SafeMarkup::format('Inaccessible menu link plugins do not support updating'));
+    throw new PluginException('Inaccessible menu link plugins do not support updating');
   }
 
 }
diff --git a/core/lib/Drupal/Core/Menu/LocalActionDefault.php b/core/lib/Drupal/Core/Menu/LocalActionDefault.php
index b830a2fa1..b0109a99f 100644
--- a/core/lib/Drupal/Core/Menu/LocalActionDefault.php
+++ b/core/lib/Drupal/Core/Menu/LocalActionDefault.php
@@ -7,8 +7,9 @@
 
 namespace Drupal\Core\Menu;
 
+use Drupal\Component\Plugin\PluginBase;
+use Drupal\Core\DependencyInjection\DependencySerializationTrait;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\Core\Plugin\PluginBase;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Routing\RouteProviderInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -19,6 +20,8 @@ use Symfony\Component\HttpFoundation\Request;
  */
 class LocalActionDefault extends PluginBase implements LocalActionInterface, ContainerFactoryPluginInterface {
 
+  use DependencySerializationTrait;
+
   /**
    * The route provider to load routes by name.
    *
@@ -68,15 +71,8 @@ class LocalActionDefault extends PluginBase implements LocalActionInterface, Con
    */
   public function getTitle(Request $request = NULL) {
     // Subclasses may pull in the request or specific attributes as parameters.
-    $options = array();
-    if (!empty($this->pluginDefinition['title_context'])) {
-      $options['context'] = $this->pluginDefinition['title_context'];
-    }
-    $args = array();
-    if (isset($this->pluginDefinition['title_arguments']) && $title_arguments = $this->pluginDefinition['title_arguments']) {
-      $args = (array) $title_arguments;
-    }
-    return $this->t($this->pluginDefinition['title'], $args, $options);
+    // The title from YAML file discovery may be a TranslationWrapper object.
+    return (string) $this->pluginDefinition['title'];
   }
 
   /**
diff --git a/core/lib/Drupal/Core/Menu/LocalActionManager.php b/core/lib/Drupal/Core/Menu/LocalActionManager.php
index db6acef6c..c387b1590 100644
--- a/core/lib/Drupal/Core/Menu/LocalActionManager.php
+++ b/core/lib/Drupal/Core/Menu/LocalActionManager.php
@@ -142,8 +142,9 @@ class LocalActionManager extends DefaultPluginManager implements LocalActionMana
    */
   protected function getDiscovery() {
     if (!isset($this->discovery)) {
-      $this->discovery = new YamlDiscovery('links.action', $this->moduleHandler->getModuleDirectories());
-      $this->discovery = new ContainerDerivativeDiscoveryDecorator($this->discovery);
+      $yaml_discovery = new YamlDiscovery('links.action', $this->moduleHandler->getModuleDirectories());
+      $yaml_discovery->addTranslatableProperty('title', 'title_context');
+      $this->discovery = new ContainerDerivativeDiscoveryDecorator($yaml_discovery);
     }
     return $this->discovery;
   }
diff --git a/core/lib/Drupal/Core/Menu/LocalTaskDefault.php b/core/lib/Drupal/Core/Menu/LocalTaskDefault.php
index ecef19c5d..6a09ffa70 100644
--- a/core/lib/Drupal/Core/Menu/LocalTaskDefault.php
+++ b/core/lib/Drupal/Core/Menu/LocalTaskDefault.php
@@ -7,7 +7,8 @@
 
 namespace Drupal\Core\Menu;
 
-use Drupal\Core\Plugin\PluginBase;
+use Drupal\Component\Plugin\PluginBase;
+use Drupal\Core\DependencyInjection\DependencySerializationTrait;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -16,6 +17,8 @@ use Symfony\Component\HttpFoundation\Request;
  */
 class LocalTaskDefault extends PluginBase implements LocalTaskInterface {
 
+  use DependencySerializationTrait;
+
   /**
    * The route provider to load routes by name.
    *
@@ -75,16 +78,8 @@ class LocalTaskDefault extends PluginBase implements LocalTaskInterface {
    * {@inheritdoc}
    */
   public function getTitle(Request $request = NULL) {
-    // Subclasses may pull in the request or specific attributes as parameters.
-    $options = array();
-    if (!empty($this->pluginDefinition['title_context'])) {
-      $options['context'] = $this->pluginDefinition['title_context'];
-    }
-    $args = array();
-    if (isset($this->pluginDefinition['title_arguments']) && $title_arguments = $this->pluginDefinition['title_arguments']) {
-      $args = (array) $title_arguments;
-    }
-    return $this->t($this->pluginDefinition['title'], $args, $options);
+    // The title from YAML file discovery may be a TranslationWrapper object.
+    return (string) $this->pluginDefinition['title'];
   }
 
   /**
diff --git a/core/lib/Drupal/Core/Menu/LocalTaskManager.php b/core/lib/Drupal/Core/Menu/LocalTaskManager.php
index 70b11025f..5b12ac8c4 100644
--- a/core/lib/Drupal/Core/Menu/LocalTaskManager.php
+++ b/core/lib/Drupal/Core/Menu/LocalTaskManager.php
@@ -142,8 +142,9 @@ class LocalTaskManager extends DefaultPluginManager implements LocalTaskManagerI
    */
   protected function getDiscovery() {
     if (!isset($this->discovery)) {
-      $this->discovery = new YamlDiscovery('links.task', $this->moduleHandler->getModuleDirectories());
-      $this->discovery = new ContainerDerivativeDiscoveryDecorator($this->discovery);
+      $yaml_discovery = new YamlDiscovery('links.task', $this->moduleHandler->getModuleDirectories());
+      $yaml_discovery->addTranslatableProperty('title', 'title_context');
+      $this->discovery = new ContainerDerivativeDiscoveryDecorator($yaml_discovery);
     }
     return $this->discovery;
   }
diff --git a/core/lib/Drupal/Core/Menu/MenuLinkBase.php b/core/lib/Drupal/Core/Menu/MenuLinkBase.php
index 70774dfed..6ecfbdf58 100644
--- a/core/lib/Drupal/Core/Menu/MenuLinkBase.php
+++ b/core/lib/Drupal/Core/Menu/MenuLinkBase.php
@@ -8,7 +8,6 @@
 namespace Drupal\Core\Menu;
 
 use Drupal\Component\Plugin\Exception\PluginException;
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Plugin\PluginBase;
 use Drupal\Core\Url;
@@ -170,7 +169,7 @@ abstract class MenuLinkBase extends PluginBase implements MenuLinkInterface {
    * {@inheritdoc}
    */
   public function deleteLink() {
-    throw new PluginException(SafeMarkup::format('Menu link plugin with ID @id does not support deletion', array('@id' => $this->getPluginId())));
+    throw new PluginException("Menu link plugin with ID '{$this->getPluginId()}' does not support deletion");
   }
 
   /**
diff --git a/core/lib/Drupal/Core/Menu/MenuLinkDefault.php b/core/lib/Drupal/Core/Menu/MenuLinkDefault.php
index c2241428c..c17fe79c1 100644
--- a/core/lib/Drupal/Core/Menu/MenuLinkDefault.php
+++ b/core/lib/Drupal/Core/Menu/MenuLinkDefault.php
@@ -67,26 +67,14 @@ class MenuLinkDefault extends MenuLinkBase implements ContainerFactoryPluginInte
    * {@inheritdoc}
    */
   public function getTitle() {
-    // Subclasses may pull in the request or specific attributes as parameters.
-    $options = array();
-    if (!empty($this->pluginDefinition['title_context'])) {
-      $options['context'] = $this->pluginDefinition['title_context'];
-    }
-    $args = array();
-    if (isset($this->pluginDefinition['title_arguments']) && $title_arguments = $this->pluginDefinition['title_arguments']) {
-      $args = (array) $title_arguments;
-    }
-    return $this->t($this->pluginDefinition['title'], $args, $options);
+    return (string) $this->pluginDefinition['title'];
   }
 
   /**
    * {@inheritdoc}
    */
   public function getDescription() {
-    if ($this->pluginDefinition['description']) {
-      return $this->t($this->pluginDefinition['description']);
-    }
-    return '';
+    return (string) $this->pluginDefinition['description'];
   }
 
   /**
diff --git a/core/lib/Drupal/Core/Menu/MenuLinkManager.php b/core/lib/Drupal/Core/Menu/MenuLinkManager.php
index b4c776045..6a4a5108a 100644
--- a/core/lib/Drupal/Core/Menu/MenuLinkManager.php
+++ b/core/lib/Drupal/Core/Menu/MenuLinkManager.php
@@ -10,7 +10,6 @@ namespace Drupal\Core\Menu;
 use Drupal\Component\Plugin\Exception\PluginException;
 use Drupal\Component\Plugin\Exception\PluginNotFoundException;
 use Drupal\Component\Utility\NestedArray;
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Plugin\Discovery\ContainerDerivativeDiscoveryDecorator;
 use Drupal\Core\Plugin\Discovery\YamlDiscovery;
@@ -41,15 +40,11 @@ class MenuLinkManager implements MenuLinkManagerInterface {
     'route_parameters' => array(),
     // The external URL if this link has one (required if route_name is empty).
     'url' => '',
-    // The static title for the menu link. You can specify placeholders like on
-    // any translatable string and the values in title_arguments.
+    // The static title for the menu link. If this came from a YAML definition
+    // or other safe source this may be a TranslationWrapper object.
     'title' => '',
-    // The values for the menu link placeholders.
-    'title_arguments' => array(),
-    // A context for the title string.
-    // @see \Drupal\Core\StringTranslation\TranslationInterface::translate()
-    'title_context' => '',
-    // The description.
+    // The description. If this came from a YAML definition or other safe source
+    // this may be be a TranslationWrapper object.
     'description' => '',
     // The plugin ID of the parent link (or NULL for a top-level link).
     'parent' => '',
@@ -148,8 +143,10 @@ class MenuLinkManager implements MenuLinkManagerInterface {
    */
   protected function getDiscovery() {
     if (!isset($this->discovery)) {
-      $this->discovery = new YamlDiscovery('links.menu', $this->moduleHandler->getModuleDirectories());
-      $this->discovery = new ContainerDerivativeDiscoveryDecorator($this->discovery);
+      $yaml_discovery = new YamlDiscovery('links.menu', $this->moduleHandler->getModuleDirectories());
+      $yaml_discovery->addTranslatableProperty('title', 'title_context');
+      $yaml_discovery->addTranslatableProperty('description', 'description_context');
+      $this->discovery = new ContainerDerivativeDiscoveryDecorator($yaml_discovery);
     }
     return $this->discovery;
   }
@@ -287,7 +284,7 @@ class MenuLinkManager implements MenuLinkManagerInterface {
       }
     }
     else {
-      throw new PluginException(SafeMarkup::format('Menu link plugin with ID @id does not support deletion', array('@id' => $id)));
+      throw new PluginException("Menu link plugin with ID '$id' does not support deletion");
     }
     $this->treeStorage->delete($id);
   }
@@ -355,7 +352,7 @@ class MenuLinkManager implements MenuLinkManagerInterface {
    */
   public function addDefinition($id, array $definition) {
     if ($this->treeStorage->load($id) || $id === '') {
-      throw new PluginException(SafeMarkup::format('The ID @id already exists as a plugin definition or is not valid', array('@id' => $id)));
+      throw new PluginException("The ID $id already exists as a plugin definition or is not valid");
     }
     // Add defaults, so there is no requirement to specify everything.
     $this->processDefinition($definition, $id);
@@ -402,7 +399,7 @@ class MenuLinkManager implements MenuLinkManagerInterface {
     $id = $instance->getPluginId();
 
     if (!$instance->isResettable()) {
-      throw new PluginException(SafeMarkup::format('Menu link %id is not resettable', array('%id' => $id)));
+      throw new PluginException("Menu link $id is not resettable");
     }
     // Get the original data from disk, reset the override and re-save the menu
     // tree for this link.
diff --git a/core/lib/Drupal/Core/Menu/MenuTreeParameters.php b/core/lib/Drupal/Core/Menu/MenuTreeParameters.php
index 2cf52ceb1..2ea493d20 100644
--- a/core/lib/Drupal/Core/Menu/MenuTreeParameters.php
+++ b/core/lib/Drupal/Core/Menu/MenuTreeParameters.php
@@ -16,10 +16,6 @@ namespace Drupal\Core\Menu;
  * - Which parent IDs should be used to restrict the tree. Only links with
  *   a parent in the list will be included.
  * - Which menu links are omitted, depending on the minimum and maximum depth.
- *
- * @todo Add getter methods and make all properties protected and define an
- *   interface instead of using the concrete class to type hint.
- *   https://www.drupal.org/node/2302041
  */
 class MenuTreeParameters {
 
diff --git a/core/lib/Drupal/Core/Menu/MenuTreeStorage.php b/core/lib/Drupal/Core/Menu/MenuTreeStorage.php
index 659d6be39..7a79fc1aa 100644
--- a/core/lib/Drupal/Core/Menu/MenuTreeStorage.php
+++ b/core/lib/Drupal/Core/Menu/MenuTreeStorage.php
@@ -8,7 +8,6 @@
 namespace Drupal\Core\Menu;
 
 use Drupal\Component\Plugin\Exception\PluginException;
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Utility\UrlHelper;
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Cache\CacheBackendInterface;
@@ -95,8 +94,6 @@ class MenuTreeStorage implements MenuTreeStorageInterface {
     'route_parameters',
     'url',
     'title',
-    'title_arguments',
-    'title_context',
     'description',
     'parent',
     'weight',
@@ -367,7 +364,9 @@ class MenuTreeStorage implements MenuTreeStorageInterface {
     $fields['route_param_key'] = $fields['route_parameters'] ? UrlHelper::buildQuery($fields['route_parameters']) : '';
 
     foreach ($this->serializedFields() as $name) {
-      $fields[$name] = serialize($fields[$name]);
+      if (isset($fields[$name])) {
+        $fields[$name] = serialize($fields[$name]);
+      }
     }
     $this->setParents($fields, $parent, $original);
 
@@ -476,7 +475,7 @@ class MenuTreeStorage implements MenuTreeStorageInterface {
         $limit = $this->maxDepth() - 1;
       }
       if ($parent['depth'] > $limit) {
-        throw new PluginException(SafeMarkup::format('The link with ID @id or its children exceeded the maximum depth of @depth', array('@id' => $fields['id'], '@depth' => $this->maxDepth())));
+        throw new PluginException("The link with ID {$fields['id']} or its children exceeded the maximum depth of {$this->maxDepth()}");
       }
       $fields['depth'] = $parent['depth'] + 1;
       $i = 1;
@@ -619,7 +618,9 @@ class MenuTreeStorage implements MenuTreeStorageInterface {
    */
   protected function prepareLink(array $link, $intersect = FALSE) {
     foreach ($this->serializedFields() as $name) {
-      $link[$name] = unserialize($link[$name]);
+      if (isset($link[$name])) {
+        $link[$name] = unserialize($link[$name]);
+      }
     }
     if ($intersect) {
       $link = array_intersect_key($link, array_flip($this->definitionFields()));
@@ -637,7 +638,7 @@ class MenuTreeStorage implements MenuTreeStorageInterface {
     foreach ($properties as $name => $value) {
       if (!in_array($name, $this->definitionFields(), TRUE)) {
         $fields = implode(', ', $this->definitionFields());
-        throw new \InvalidArgumentException(SafeMarkup::format('An invalid property name, @name was specified. Allowed property names are: @fields.', array('@name' => $name, '@fields' => $fields)));
+        throw new \InvalidArgumentException("An invalid property name, $name was specified. Allowed property names are: $fields.");
       }
       $query->condition($name, $value);
     }
@@ -736,7 +737,9 @@ class MenuTreeStorage implements MenuTreeStorageInterface {
     $loaded = $this->safeExecuteSelect($query)->fetchAllAssoc('id', \PDO::FETCH_ASSOC);
     foreach ($loaded as &$link) {
       foreach ($this->serializedFields() as $name) {
-        $link[$name] = unserialize($link[$name]);
+        if (isset($link[$name])) {
+          $link[$name] = unserialize($link[$name]);
+        }
       }
     }
     return $loaded;
@@ -927,15 +930,19 @@ class MenuTreeStorage implements MenuTreeStorageInterface {
     if (!empty($parameters->conditions)) {
       // Only allow conditions that are testing definition fields.
       $parameters->conditions = array_intersect_key($parameters->conditions, array_flip($this->definitionFields()));
+      $serialized_fields = $this->serializedFields();
       foreach ($parameters->conditions as $column => $value) {
-        if (!is_array($value)) {
-          $query->condition($column, $value);
-        }
-        else {
+        if (is_array($value)) {
           $operator = $value[1];
           $value = $value[0];
-          $query->condition($column, $value, $operator);
         }
+        else {
+          $operator = '=';
+        }
+        if (in_array($column, $serialized_fields)) {
+          $value = serialize($value);
+        }
+        $query->condition($column, $value, $operator);
       }
     }
 
@@ -1242,30 +1249,18 @@ class MenuTreeStorage implements MenuTreeStorageInterface {
           'default' => '',
         ),
         'title' => array(
-          'description' => 'The text displayed for the link.',
-          'type' => 'varchar',
-          'length' => 255,
-          'not null' => TRUE,
-          'default' => '',
-        ),
-        'title_arguments' => array(
-          'description' => 'A serialized array of arguments to be passed to t() (if this plugin uses it).',
+          'description' => 'The serialized title for the link. May be a TranslationWrapper.',
           'type' => 'blob',
           'size' => 'big',
           'not null' => FALSE,
           'serialize' => TRUE,
         ),
-        'title_context' => array(
-          'description' => 'The translation context for the link title.',
-          'type' => 'varchar',
-          'length' => 255,
-          'not null' => TRUE,
-          'default' => '',
-        ),
         'description' => array(
-          'description' => 'The description of this link - used for admin pages and title attribute.',
-          'type' => 'text',
+          'description' => 'The serialized description of this link - used for admin pages and title attribute. May be a TranslationWrapper.',
+          'type' => 'blob',
+          'size' => 'big',
           'not null' => FALSE,
+          'serialize' => TRUE,
         ),
         'class' => array(
           'description' => 'The class for this link plugin.',
diff --git a/core/lib/Drupal/Core/Menu/menu.api.php b/core/lib/Drupal/Core/Menu/menu.api.php
index 1d8298feb..8550fc515 100644
--- a/core/lib/Drupal/Core/Menu/menu.api.php
+++ b/core/lib/Drupal/Core/Menu/menu.api.php
@@ -334,8 +334,12 @@
  *
  *   The value corresponding to each machine name key is an associative array
  *   that may contain the following key-value pairs:
- *   - title: (required) The untranslated title of the menu link.
- *   - description: The untranslated description of the link.
+ *   - title: (required) The title of the menu link. If this should be
+ *     translated, create a \Drupal\Core\StringTranslation\TranslationWrapper
+ *     object.
+ *   - description: The description of the link. If this should be
+ *     translated, create a \Drupal\Core\StringTranslation\TranslationWrapper
+ *     object.
  *   - route_name: (optional) The route name to be used to build the path.
  *     Either the route_name or url element must be provided.
  *   - route_parameters: (optional) The route parameters to build the path.
@@ -360,7 +364,16 @@
 function hook_menu_links_discovered_alter(&$links) {
   // Change the weight and title of the user.logout link.
   $links['user.logout']['weight'] = -10;
-  $links['user.logout']['title'] = 'Logout';
+  $links['user.logout']['title'] = new \Drupal\Core\StringTranslation\TranslationWrapper('Logout');
+  // Conditionally add an additional link with a title that's not translated.
+  if (\Drupal::moduleHandler()->moduleExists('search')) {
+    $links['menu.api.search'] = array(
+      'title' => \Drupal::config('system.site')->get('name'),
+      'route_name' => 'menu.api.search',
+      'description' => new \Drupal\Core\StringTranslation\TranslationWrapper('View popular search phrases for this site.'),
+      'parent' => 'system.admin_reports',
+    );
+  }
 }
 
 /**
diff --git a/core/lib/Drupal/Core/Password/PhpassHashedPassword.php b/core/lib/Drupal/Core/Password/PhpassHashedPassword.php
index 6e9257a1d..2df9e43e6 100644
--- a/core/lib/Drupal/Core/Password/PhpassHashedPassword.php
+++ b/core/lib/Drupal/Core/Password/PhpassHashedPassword.php
@@ -44,7 +44,7 @@ class PhpassHashedPassword implements PasswordInterface {
   protected $countLog2;
 
   /**
-   * Constructs a new phpass password hashing instance.
+   * Constructs a new password hashing instance.
    *
    * @param int $countLog2
    *   Password stretching iteration count. Specifies the number of times the
@@ -60,13 +60,13 @@ class PhpassHashedPassword implements PasswordInterface {
   /**
    * Encodes bytes into printable base 64 using the *nix standard from crypt().
    *
-   * @param String $input
+   * @param string $input
    *   The string containing bytes to encode.
-   * @param Integer $count
+   * @param int $count
    *   The number of characters (bytes) to encode.
    *
-   * @return String
-   *   Encoded string
+   * @return string
+   *   Encoded string.
    */
   protected function base64Encode($input, $count) {
     $output = '';
@@ -95,7 +95,7 @@ class PhpassHashedPassword implements PasswordInterface {
   }
 
   /**
-   * Generates a random base 64-encoded salt prefixed with settings for the hash.
+   * Generates a random base 64-encoded salt prefixed with hash settings.
    *
    * Proper use of salts may defeat a number of attacks, including:
    *  - The ability to try candidate passwords against multiple hashes at once.
@@ -103,7 +103,7 @@ class PhpassHashedPassword implements PasswordInterface {
    *  - The ability to determine whether two users have the same (or different)
    *    password without actually having to guess one of the passwords.
    *
-   * @return String
+   * @return string
    *   A 12 character string containing the iteration count and a random salt.
    */
   protected function generateSalt() {
@@ -118,11 +118,11 @@ class PhpassHashedPassword implements PasswordInterface {
   /**
    * Ensures that $count_log2 is within set bounds.
    *
-   * @param Integer $count_log2
+   * @param int $count_log2
    *   Integer that determines the number of iterations used in the hashing
    *   process. A larger value is more secure, but takes more time to complete.
    *
-   * @return Integer
+   * @return int
    *   Integer within set bounds that is closest to $count_log2.
    */
   protected function enforceLog2Boundaries($count_log2) {
@@ -144,16 +144,16 @@ class PhpassHashedPassword implements PasswordInterface {
    * for an attacker to try to break the hash by brute-force computation of the
    * hashes of a large number of plain-text words or strings to find a match.
    *
-   * @param String $algo
+   * @param string $algo
    *   The string name of a hashing algorithm usable by hash(), like 'sha256'.
-   * @param String $password
+   * @param string $password
    *   Plain-text password up to 512 bytes (128 to 512 UTF-8 characters) to
    *   hash.
-   * @param String $setting
-   *   An existing hash or the output of $this->generateSalt().  Must be
-   *   at least 12 characters (the settings and salt).
+   * @param string $setting
+   *   An existing hash or the output of $this->generateSalt(). Must be at least
+   *   12 characters (the settings and salt).
    *
-   * @return String
+   * @return string
    *   A string containing the hashed password (and salt) or FALSE on failure.
    *   The return string will be truncated at HASH_LENGTH characters max.
    */
@@ -200,11 +200,14 @@ class PhpassHashedPassword implements PasswordInterface {
   }
 
   /**
-   * Parse the log2 iteration count from a stored hash or setting string.
+   * Parses the log2 iteration count from a stored hash or setting string.
    *
-   * @param String $setting
-   *   An existing hash or the output of $this->generateSalt().  Must be
-   *   at least 12 characters (the settings and salt).
+   * @param string $setting
+   *   An existing hash or the output of $this->generateSalt(). Must be at least
+   *   12 characters (the settings and salt).
+   *
+   * @return int
+   *   The log2 iteration count.
    */
   public function getCountLog2($setting) {
     return strpos(static::$ITOA64, $setting[3]);
diff --git a/core/lib/Drupal/Core/Path/AliasManager.php b/core/lib/Drupal/Core/Path/AliasManager.php
index 2e04097e6..9fe0e2c8b 100644
--- a/core/lib/Drupal/Core/Path/AliasManager.php
+++ b/core/lib/Drupal/Core/Path/AliasManager.php
@@ -12,6 +12,9 @@ use Drupal\Core\CacheDecorator\CacheDecoratorInterface;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\Core\Language\LanguageManagerInterface;
 
+/**
+ * The default alias manager implementation.
+ */
 class AliasManager implements AliasManagerInterface, CacheDecoratorInterface {
 
   /**
diff --git a/core/lib/Drupal/Core/Path/AliasManagerInterface.php b/core/lib/Drupal/Core/Path/AliasManagerInterface.php
index 177d1a412..0803eebbe 100644
--- a/core/lib/Drupal/Core/Path/AliasManagerInterface.php
+++ b/core/lib/Drupal/Core/Path/AliasManagerInterface.php
@@ -7,6 +7,11 @@
 
 namespace Drupal\Core\Path;
 
+/**
+ * Find an alias for a path and vice versa.
+ *
+ * @see \Drupal\Core\Path\AliasStorageInterface
+ */
 interface AliasManagerInterface {
 
   /**
diff --git a/core/lib/Drupal/Core/Path/AliasWhitelistInterface.php b/core/lib/Drupal/Core/Path/AliasWhitelistInterface.php
index f0c51e5fd..31376f87d 100644
--- a/core/lib/Drupal/Core/Path/AliasWhitelistInterface.php
+++ b/core/lib/Drupal/Core/Path/AliasWhitelistInterface.php
@@ -9,4 +9,12 @@ namespace Drupal\Core\Path;
 
 use Drupal\Core\Cache\CacheCollectorInterface;
 
+/**
+ * Cache the alias whitelist.
+ *
+ * The whitelist contains the first element of the router paths of all
+ * aliases. For example, if /node/12345 has an alias then "node" is added to
+ * the whitelist. This optimization allows skipping the lookup for every
+ * /user/{user} path if "user" is not in the whitelist.
+ */
 interface AliasWhitelistInterface extends CacheCollectorInterface {}
diff --git a/core/lib/Drupal/Core/PathProcessor/NullPathProcessorManager.php b/core/lib/Drupal/Core/PathProcessor/NullPathProcessorManager.php
new file mode 100644
index 000000000..d2bbb12f7
--- /dev/null
+++ b/core/lib/Drupal/Core/PathProcessor/NullPathProcessorManager.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\PathProcessor\NullPathProcessorManager.
+ */
+
+namespace Drupal\Core\PathProcessor;
+
+use Drupal\Core\Render\BubbleableMetadata;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * Provides a null implementation of the path processor manager.
+ *
+ * This can be used for example in really early installer phases.
+ */
+class NullPathProcessorManager implements InboundPathProcessorInterface, OutboundPathProcessorInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function processInbound($path, Request $request) {
+    return $path;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function processOutbound($path, &$options = array(), Request $request = NULL, BubbleableMetadata $bubbleable_metadata = NULL) {
+    return $path;
+  }
+
+}
diff --git a/core/lib/Drupal/Core/PathProcessor/OutboundPathProcessorInterface.php b/core/lib/Drupal/Core/PathProcessor/OutboundPathProcessorInterface.php
index 774f385b0..8826a93c5 100644
--- a/core/lib/Drupal/Core/PathProcessor/OutboundPathProcessorInterface.php
+++ b/core/lib/Drupal/Core/PathProcessor/OutboundPathProcessorInterface.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\Core\PathProcessor;
 
-use Drupal\Core\Cache\CacheableMetadata;
+use Drupal\Core\Render\BubbleableMetadata;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -25,12 +25,12 @@ interface OutboundPathProcessorInterface {
    *   generateFromPath() method.
    * @param \Symfony\Component\HttpFoundation\Request $request
    *   The HttpRequest object representing the current request.
-   * @param \Drupal\Core\Cache\CacheableMetadata $cacheable_metadata
-   *   (optional) Object to collect path processors' cacheability.
+   * @param \Drupal\Core\Render\BubbleableMetadata $bubbleable_metadata
+   *   (optional) Object to collect path processors' bubbleable metadata.
    *
    * @return
    *   The processed path.
    */
-  public function processOutbound($path, &$options = array(), Request $request = NULL, CacheableMetadata $cacheable_metadata = NULL);
+  public function processOutbound($path, &$options = array(), Request $request = NULL, BubbleableMetadata $bubbleable_metadata = NULL);
 
 }
diff --git a/core/lib/Drupal/Core/PathProcessor/PathProcessorAlias.php b/core/lib/Drupal/Core/PathProcessor/PathProcessorAlias.php
index 206e56635..d7bd41615 100644
--- a/core/lib/Drupal/Core/PathProcessor/PathProcessorAlias.php
+++ b/core/lib/Drupal/Core/PathProcessor/PathProcessorAlias.php
@@ -7,8 +7,8 @@
 
 namespace Drupal\Core\PathProcessor;
 
-use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Path\AliasManagerInterface;
+use Drupal\Core\Render\BubbleableMetadata;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -44,7 +44,7 @@ class PathProcessorAlias implements InboundPathProcessorInterface, OutboundPathP
   /**
    * Implements Drupal\Core\PathProcessor\OutboundPathProcessorInterface::processOutbound().
    */
-  public function processOutbound($path, &$options = array(), Request $request = NULL, CacheableMetadata $cacheable_metadata = NULL) {
+  public function processOutbound($path, &$options = array(), Request $request = NULL, BubbleableMetadata $bubbleable_metadata = NULL) {
     if (empty($options['alias'])) {
       $langcode = isset($options['language']) ? $options['language']->getId() : NULL;
       $path = $this->aliasManager->getAliasByPath($path, $langcode);
diff --git a/core/lib/Drupal/Core/PathProcessor/PathProcessorFront.php b/core/lib/Drupal/Core/PathProcessor/PathProcessorFront.php
index bd1d8c1bb..161661ba2 100644
--- a/core/lib/Drupal/Core/PathProcessor/PathProcessorFront.php
+++ b/core/lib/Drupal/Core/PathProcessor/PathProcessorFront.php
@@ -7,8 +7,8 @@
 
 namespace Drupal\Core\PathProcessor;
 
-use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Render\BubbleableMetadata;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -48,7 +48,7 @@ class PathProcessorFront implements InboundPathProcessorInterface, OutboundPathP
   /**
    * Implements Drupal\Core\PathProcessor\OutboundPathProcessorInterface::processOutbound().
    */
-  public function processOutbound($path, &$options = array(), Request $request = NULL, CacheableMetadata $cacheable_metadata = NULL) {
+  public function processOutbound($path, &$options = array(), Request $request = NULL, BubbleableMetadata $bubbleable_metadata = NULL) {
     // The special path '<front>' links to the default front page.
     if ($path === '/<front>') {
       $path = '/';
diff --git a/core/lib/Drupal/Core/PathProcessor/PathProcessorManager.php b/core/lib/Drupal/Core/PathProcessor/PathProcessorManager.php
index 9974bc948..bd623273b 100644
--- a/core/lib/Drupal/Core/PathProcessor/PathProcessorManager.php
+++ b/core/lib/Drupal/Core/PathProcessor/PathProcessorManager.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\Core\PathProcessor;
 
-use Drupal\Core\Cache\CacheableMetadata;
+use Drupal\Core\Render\BubbleableMetadata;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -108,10 +108,10 @@ class PathProcessorManager implements InboundPathProcessorInterface, OutboundPat
   /**
    * Implements Drupal\Core\PathProcessor\OutboundPathProcessorInterface::processOutbound().
    */
-  public function processOutbound($path, &$options = array(), Request $request = NULL, CacheableMetadata $cacheable_metadata = NULL) {
+  public function processOutbound($path, &$options = array(), Request $request = NULL, BubbleableMetadata $bubbleable_metadata = NULL) {
     $processors = $this->getOutbound();
     foreach ($processors as $processor) {
-      $path = $processor->processOutbound($path, $options, $request, $cacheable_metadata);
+      $path = $processor->processOutbound($path, $options, $request, $bubbleable_metadata);
     }
     return $path;
   }
diff --git a/core/lib/Drupal/Core/Plugin/CachedDiscoveryClearer.php b/core/lib/Drupal/Core/Plugin/CachedDiscoveryClearer.php
index 9ab429f2a..2001eea00 100644
--- a/core/lib/Drupal/Core/Plugin/CachedDiscoveryClearer.php
+++ b/core/lib/Drupal/Core/Plugin/CachedDiscoveryClearer.php
@@ -14,7 +14,7 @@ use Drupal\Component\Plugin\PluginManagerInterface;
 /**
  * Defines a class which is capable of clearing the cache on plugin managers.
  */
-class CachedDiscoveryClearer {
+class CachedDiscoveryClearer implements CachedDiscoveryClearerInterface {
 
   /**
    * The stored discoveries.
@@ -24,18 +24,14 @@ class CachedDiscoveryClearer {
   protected $cachedDiscoveries = array();
 
   /**
-   * Adds a plugin manager to the active list.
-   *
-   * @param \Drupal\Component\Plugin\Discovery\CachedDiscoveryInterface $cached_discovery
-   *   An object that implements the cached discovery interface, typically a
-   *   plugin manager.
+   * {@inheritdoc}
    */
   public function addCachedDiscovery(CachedDiscoveryInterface $cached_discovery) {
     $this->cachedDiscoveries[] = $cached_discovery;
   }
 
   /**
-   * Clears the cache on all cached discoveries.
+   * {@inheritdoc}
    */
   public function clearCachedDefinitions() {
     foreach ($this->cachedDiscoveries as $cached_discovery) {
diff --git a/core/lib/Drupal/Core/Plugin/CachedDiscoveryClearerInterface.php b/core/lib/Drupal/Core/Plugin/CachedDiscoveryClearerInterface.php
new file mode 100644
index 000000000..05b0b0091
--- /dev/null
+++ b/core/lib/Drupal/Core/Plugin/CachedDiscoveryClearerInterface.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Plugin\CachedDiscoveryClearerInterface.
+ */
+
+namespace Drupal\Core\Plugin;
+
+use Drupal\Component\Plugin\Discovery\CachedDiscoveryInterface;
+
+/**
+ * Provides a way to clear static caches of all plugin managers.
+ */
+interface CachedDiscoveryClearerInterface {
+
+  /**
+   * Adds a plugin manager to the active list.
+   *
+   * @param \Drupal\Component\Plugin\Discovery\CachedDiscoveryInterface $cached_discovery
+   *   An object that implements the cached discovery interface, typically a
+   *   plugin manager.
+   */
+  public function addCachedDiscovery(CachedDiscoveryInterface $cached_discovery);
+
+  /**
+   * Clears the cache on all cached discoveries.
+   */
+  public function clearCachedDefinitions();
+
+}
diff --git a/core/lib/Drupal/Core/Plugin/Context/Context.php b/core/lib/Drupal/Core/Plugin/Context/Context.php
index 9835dd7a6..837d601d9 100644
--- a/core/lib/Drupal/Core/Plugin/Context/Context.php
+++ b/core/lib/Drupal/Core/Plugin/Context/Context.php
@@ -9,7 +9,8 @@ namespace Drupal\Core\Plugin\Context;
 
 use Drupal\Component\Plugin\Context\Context as ComponentContext;
 use Drupal\Component\Plugin\Exception\ContextException;
-use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Core\Cache\CacheableDependencyInterface;
+use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\TypedData\TypedDataInterface;
 use Drupal\Core\TypedData\TypedDataTrait;
 
@@ -34,6 +35,21 @@ class Context extends ComponentContext implements ContextInterface {
    */
   protected $contextDefinition;
 
+  /**
+   * The cacheability metadata.
+   *
+   * @var \Drupal\Core\Cache\CacheableMetadata
+   */
+  protected $cacheabilityMetadata;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function __construct(ContextDefinitionInterface $context_definition) {
+    parent::__construct($context_definition);
+    $this->cacheabilityMetadata = new CacheableMetadata();
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -49,17 +65,29 @@ class Context extends ComponentContext implements ContextInterface {
       }
       elseif ($definition->isRequired()) {
         $type = $definition->getDataType();
-        throw new ContextException(SafeMarkup::format("The @type context is required and not present.", array('@type' => $type)));
+        throw new ContextException("The '$type' context is required and not present.");
       }
       return $default_value;
     }
     return $this->getTypedDataManager()->getCanonicalRepresentation($this->contextData);
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function hasContextValue() {
+    return (bool) $this->contextData || parent::hasContextValue();
+  }
+
   /**
    * {@inheritdoc}
    */
   public function setContextValue($value) {
+    // Add the value as a cacheable dependency only if implements the interface
+    // to prevent it from disabling caching with a max-age 0.
+    if ($value instanceof CacheableDependencyInterface) {
+      $this->addCacheableDependency($value);
+    }
     if ($value instanceof TypedDataInterface) {
       return $this->setContextData($value);
     }
@@ -113,4 +141,33 @@ class Context extends ComponentContext implements ContextInterface {
     return $this->getContextData()->validate();
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function addCacheableDependency($dependency) {
+    $this->cacheabilityMetadata = $this->cacheabilityMetadata->merge(CacheableMetadata::createFromObject($dependency));
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheContexts() {
+    return $this->cacheabilityMetadata->getCacheContexts();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheTags() {
+    return $this->cacheabilityMetadata->getCacheTags();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheMaxAge() {
+    return $this->cacheabilityMetadata->getCacheMaxAge();
+  }
+
 }
diff --git a/core/lib/Drupal/Core/Plugin/Context/ContextDefinition.php b/core/lib/Drupal/Core/Plugin/Context/ContextDefinition.php
index 34ad3621b..40fd66249 100644
--- a/core/lib/Drupal/Core/Plugin/Context/ContextDefinition.php
+++ b/core/lib/Drupal/Core/Plugin/Context/ContextDefinition.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\Core\Plugin\Context;
 
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\TypedData\TypedDataTrait;
 
 /**
@@ -245,7 +244,7 @@ class ContextDefinition implements ContextDefinitionInterface {
     }
 
     if (!$definition) {
-      throw new \Exception(SafeMarkup::format('The data type "@type" is invalid', array('@type' => $this->getDataType())));
+      throw new \Exception("The data type '{$this->getDataType()}' is invalid");
     }
     $definition->setLabel($this->getLabel())
       ->setDescription($this->getDescription())
diff --git a/core/lib/Drupal/Core/Plugin/Context/ContextHandler.php b/core/lib/Drupal/Core/Plugin/Context/ContextHandler.php
index fe9b78e75..373c73c98 100644
--- a/core/lib/Drupal/Core/Plugin/Context/ContextHandler.php
+++ b/core/lib/Drupal/Core/Plugin/Context/ContextHandler.php
@@ -8,7 +8,7 @@
 namespace Drupal\Core\Plugin\Context;
 
 use Drupal\Component\Plugin\Exception\ContextException;
-use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Core\Cache\CacheableDependencyInterface;
 use Drupal\Core\Plugin\ContextAwarePluginInterface;
 
 /**
@@ -74,19 +74,51 @@ class ContextHandler implements ContextHandlerInterface {
   public function applyContextMapping(ContextAwarePluginInterface $plugin, $contexts, $mappings = array()) {
     $mappings += $plugin->getContextMapping();
     // Loop through each of the expected contexts.
-    foreach (array_keys($plugin->getContextDefinitions()) as $plugin_context_id) {
+
+    $missing_value = [];
+
+    foreach ($plugin->getContextDefinitions() as $plugin_context_id => $plugin_context_definition) {
       // If this context was given a specific name, use that.
       $context_id = isset($mappings[$plugin_context_id]) ? $mappings[$plugin_context_id] : $plugin_context_id;
       if (!empty($contexts[$context_id])) {
         // This assignment has been used, remove it.
         unset($mappings[$plugin_context_id]);
-        $plugin->setContextValue($plugin_context_id, $contexts[$context_id]->getContextValue());
+
+        // Plugins have their on context objects, only the value is applied.
+        // They also need to know about the cacheability metadata of where that
+        // value is coming from, so pass them through to those objects.
+        $plugin_context = $plugin->getContext($plugin_context_id);
+        if ($plugin_context instanceof ContextInterface && $contexts[$context_id] instanceof CacheableDependencyInterface) {
+          $plugin_context->addCacheableDependency($contexts[$context_id]);
+        }
+
+        // Pass the value to the plugin if there is one.
+        if ($contexts[$context_id]->hasContextValue()) {
+          $plugin->setContextValue($plugin_context_id, $contexts[$context_id]->getContextValue());
+        }
+        elseif ($plugin_context_definition->isRequired()) {
+          // Collect required contexts that exist but are missing a value.
+          $missing_value[] = $plugin_context_id;
+        }
       }
+      elseif ($plugin_context_definition->isRequired()) {
+        // Collect required contexts that are missing.
+        $missing_value[] = $plugin_context_id;
+      }
+      else {
+        // Ignore mappings for optional missing context.
+        unset($mappings[$plugin_context_id]);
+      }
+    }
+
+    // If there are any required contexts without a value, throw an exception.
+    if ($missing_value) {
+      throw new ContextException(sprintf('Required contexts without a value: %s.', implode(', ', $missing_value)));
     }
 
     // If there are any mappings that were not satisfied, throw an exception.
     if (!empty($mappings)) {
-      throw new ContextException(SafeMarkup::format('Assigned contexts were not satisfied: @mappings', ['@mappings' => implode(',', array_keys($mappings))]));
+      throw new ContextException('Assigned contexts were not satisfied: ' . implode(',', array_keys($mappings)));
     }
   }
 
diff --git a/core/lib/Drupal/Core/Plugin/Context/ContextInterface.php b/core/lib/Drupal/Core/Plugin/Context/ContextInterface.php
index bb3861737..5b1e6bd23 100644
--- a/core/lib/Drupal/Core/Plugin/Context/ContextInterface.php
+++ b/core/lib/Drupal/Core/Plugin/Context/ContextInterface.php
@@ -8,12 +8,13 @@
 namespace Drupal\Core\Plugin\Context;
 
 use Drupal\Component\Plugin\Context\ContextInterface as ComponentContextInterface;
+use Drupal\Core\Cache\CacheableDependencyInterface;
 use Drupal\Core\TypedData\TypedDataInterface;
 
 /**
  * Interface for context.
  */
-interface ContextInterface extends ComponentContextInterface {
+interface ContextInterface extends ComponentContextInterface, CacheableDependencyInterface {
 
   /**
    * Gets the context value as typed data object.
@@ -32,4 +33,22 @@ interface ContextInterface extends ComponentContextInterface {
    */
   public function setContextData(TypedDataInterface $data);
 
+  /**
+   * Adds a dependency on an object: merges its cacheability metadata.
+   *
+   * E.g. when a context depends on some configuration, an entity, or an access
+   * result, we must make sure their cacheability metadata is present on the
+   * response. This method makes doing that simple.
+   *
+   * @param \Drupal\Core\Cache\CacheableDependencyInterface|mixed $dependency
+   *   The dependency. If the object implements CacheableDependencyInterface,
+   *   then its cacheability metadata will be used. Otherwise, the passed in
+   *   object must be assumed to be uncacheable, so max-age 0 is set.
+   *
+   * @return $this
+   *
+   * @see \Drupal\Core\Cache\CacheableMetadata::createFromObject()
+   */
+  public function addCacheableDependency($dependency);
+
 }
diff --git a/core/lib/Drupal/Core/Plugin/Context/ContextProviderInterface.php b/core/lib/Drupal/Core/Plugin/Context/ContextProviderInterface.php
new file mode 100644
index 000000000..4f6b5ef23
--- /dev/null
+++ b/core/lib/Drupal/Core/Plugin/Context/ContextProviderInterface.php
@@ -0,0 +1,82 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Plugin\Context\ContextProviderInterface.
+ */
+
+namespace Drupal\Core\Plugin\Context;
+
+/**
+ * Defines an interface for providing plugin contexts.
+ *
+ * Implementations only need to deal with unqualified context IDs so they only
+ * need to be unique in the context of a given service provider.
+ *
+ * The fully qualified context ID then includes the service ID:
+ * @{service_id}:{unqualified_context_id}.
+ *
+ * @see \Drupal\Core\Plugin\Context\ContextRepositoryInterface
+ */
+interface ContextProviderInterface {
+
+  /**
+   * Gets runtime context values for the given context IDs.
+   *
+   * For context-aware plugins to function correctly, all of the contexts that
+   * they require must be populated with values. So this method should set a
+   * value for each context that it adds. For example:
+   *
+   * @code
+   *   // Determine a specific node to pass as context to a block.
+   *   $node = ...
+   *
+   *   // Set that specific node as the value of the 'node' context.
+   *   $context = new Context(new ContextDefinition('entity:node'));
+   *   $context->setContextValue($node);
+   *   return ['node' => $context];
+   * @endcode
+   *
+   * On the other hand, there are cases, on which providers no longer are
+   * possible to provide context objects, even without the value, so the caller
+   * should not expect it.
+   *
+   * @param string[] $unqualified_context_ids
+   *   The requested context IDs. The context provider must only return contexts
+   *   for those IDs.
+   *
+   * @return \Drupal\Core\Plugin\Context\ContextInterface[]
+   *   The determined available contexts, keyed by the unqualified context_id.
+   *
+   * @see \Drupal\Core\Plugin\Context\ContextProviderInterface:getAvailableContexts()
+   */
+  public function getRuntimeContexts(array $unqualified_context_ids);
+
+  /**
+   * Gets all available contexts for the purposes of configuration.
+   *
+   * When a context aware plugin is being configured, the configuration UI must
+   * know which named contexts are potentially available, but does not care
+   * about the value, since the value can be different for each request, and
+   * might not be available at all during the configuration UI's request.
+   *
+   * For example:
+   * @code
+   *   // During configuration, there is no specific node to pass as context.
+   *   // However, inform the system that a context named 'node' is
+   *   // available, and provide its definition, so that context aware plugins
+   *   // can be configured to use it. When the plugin, for example a block,
+   *   // needs to evaluate the context, the value of this context will be
+   *   // supplied by getRuntimeContexts().
+   *   $context = new Context(new ContextDefinition('entity:node'));
+   *   return ['node' => $context];
+   * @endcode
+   *
+   * @return \Drupal\Core\Plugin\Context\ContextInterface[]
+   *   All available contexts keyed by the unqualified context ID.
+   *
+   * @see \Drupal\Core\Plugin\Context\ContextProviderInterface::getRuntimeContext()
+   */
+  public function getAvailableContexts();
+
+}
diff --git a/core/lib/Drupal/Core/Plugin/Context/ContextRepositoryInterface.php b/core/lib/Drupal/Core/Plugin/Context/ContextRepositoryInterface.php
new file mode 100644
index 000000000..6d7d6096b
--- /dev/null
+++ b/core/lib/Drupal/Core/Plugin/Context/ContextRepositoryInterface.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Plugin\Context\ContextRepositoryInterface.
+ */
+
+namespace Drupal\Core\Plugin\Context;
+
+/**
+ * Offers a global context repository.
+ *
+ * Provides a list of all available contexts, which is mostly useful for
+ * configuration on forms, as well as a method to get the concrete contexts with
+ * their values, given a list of fully qualified context IDs.
+ *
+ * @see \Drupal\Core\Plugin\Context\ContextProviderInterface
+ */
+interface ContextRepositoryInterface {
+
+  /**
+   * Gets runtime context values for the given context IDs.
+   *
+   * Given that context providers might not return contexts for the given
+   * context IDs, it is also not guaranteed that the context repository returns
+   * contexts for all specified IDs.
+   *
+   * @param string[] $context_ids
+   *   Fully qualified context IDs, which looks like
+   *   @{service_id}:{unqualified_context_id}, so for example
+   *   node.node_route_context:node.
+   *
+   * @return \Drupal\Core\Plugin\Context\ContextInterface[]
+   *   The determined contexts, keyed by the fully qualified context ID.
+   */
+  public function getRuntimeContexts(array $context_ids);
+
+  /**
+   * Gets all available contexts for the purposes of configuration.
+   *
+   * @return \Drupal\Core\Plugin\Context\ContextInterface[]
+   *   All available contexts.
+   */
+  public function getAvailableContexts();
+
+}
diff --git a/core/lib/Drupal/Core/Plugin/Context/LazyContextRepository.php b/core/lib/Drupal/Core/Plugin/Context/LazyContextRepository.php
new file mode 100644
index 000000000..4e9325ec5
--- /dev/null
+++ b/core/lib/Drupal/Core/Plugin/Context/LazyContextRepository.php
@@ -0,0 +1,112 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Plugin\Context\LazyContextRepository.
+ */
+
+namespace Drupal\Core\Plugin\Context;
+
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Provides a context repository which uses context provider services.
+ */
+class LazyContextRepository implements ContextRepositoryInterface {
+
+  /**
+   * The set of available context providers service IDs.
+   *
+   * @var string[]
+   *   Context provider service IDs.
+   */
+  protected $contextProviderServiceIDs = [];
+
+  /**
+   * The service container.
+   *
+   * @var \Symfony\Component\DependencyInjection\ContainerInterface
+   */
+  protected $container;
+
+  /**
+   * The statically cached contexts.
+   *
+   * @var \Drupal\Core\Plugin\Context\ContextInterface[]
+   */
+  protected $contexts = [];
+
+  /**
+   * Constructs a LazyContextRepository object.
+   *
+   * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
+   *   The current service container.
+   * @param string[] $context_provider_service_ids
+   *   The set of the available context provider service IDs.
+   */
+  public function __construct(ContainerInterface $container, array $context_provider_service_ids) {
+    $this->container = $container;
+    $this->contextProviderServiceIDs = $context_provider_service_ids;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getRuntimeContexts(array $context_ids) {
+    $contexts = [];
+
+    // Create a map of context providers (service IDs) to unqualified context
+    // IDs.
+    $context_ids_by_service = [];
+    foreach ($context_ids as $id) {
+      if (isset($this->contexts[$id])) {
+        $contexts[$id] = $this->contexts[$id];
+        continue;
+      }
+      // The IDs have been passed in @{service_id}:{unqualified_context_id}
+      // format.
+      // @todo Convert to an assert once https://www.drupal.org/node/2408013 is
+      //   in.
+      if ($id[0] === '@' && strpos($id, ':') !== FALSE) {
+        list($service_id, $unqualified_context_id) = explode(':', $id, 2);
+        // Remove the leading '@'.
+        $service_id = substr($service_id, 1);
+      }
+      else {
+        throw new \InvalidArgumentException('You must provide the context IDs in the @{service_id}:{unqualified_context_id} format.');
+      }
+      $context_ids_by_service[$service_id][] = $unqualified_context_id;
+    }
+
+    // Iterate over all missing context providers (services), gather the
+    // runtime contexts and assign them as requested.
+    foreach ($context_ids_by_service as $service_id => $unqualified_context_ids) {
+      $contexts_by_service = $this->container->get($service_id)->getRuntimeContexts($unqualified_context_ids);
+
+      $wanted_contexts = array_intersect_key($contexts_by_service, array_flip($unqualified_context_ids));
+      foreach ($wanted_contexts as $unqualified_context_id => $context) {
+        $context_id = '@' . $service_id . ':' . $unqualified_context_id;
+        $this->contexts[$context_id] = $contexts[$context_id] = $context;
+      }
+    }
+
+    return $contexts;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getAvailableContexts() {
+    $contexts = [];
+    foreach ($this->contextProviderServiceIDs as $service_id) {
+      $contexts_by_service = $this->container->get($service_id)->getAvailableContexts();
+      foreach ($contexts_by_service as $unqualified_context_id => $context) {
+        $context_id = '@' . $service_id . ':' . $unqualified_context_id;
+        $contexts[$context_id] = $context;
+      }
+    }
+
+    return $contexts;
+  }
+
+}
diff --git a/core/lib/Drupal/Core/Plugin/ContextAwarePluginBase.php b/core/lib/Drupal/Core/Plugin/ContextAwarePluginBase.php
index e58e39e94..51a39d7b1 100644
--- a/core/lib/Drupal/Core/Plugin/ContextAwarePluginBase.php
+++ b/core/lib/Drupal/Core/Plugin/ContextAwarePluginBase.php
@@ -10,6 +10,8 @@ namespace Drupal\Core\Plugin;
 use Drupal\Component\Plugin\ConfigurablePluginInterface;
 use Drupal\Component\Plugin\ContextAwarePluginBase as ComponentContextAwarePluginBase;
 use Drupal\Component\Plugin\Exception\ContextException;
+use Drupal\Core\Cache\Cache;
+use Drupal\Core\Cache\CacheableDependencyInterface;
 use Drupal\Core\DependencyInjection\DependencySerializationTrait;
 use Drupal\Core\Plugin\Context\Context;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
@@ -91,4 +93,53 @@ abstract class ContextAwarePluginBase extends ComponentContextAwarePluginBase im
     return \Drupal::service('context.handler');
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheContexts() {
+    $cache_contexts = [];
+    // Applied contexts can affect the cache contexts when this plugin is
+    // involved in caching, collect and return them.
+    foreach ($this->getContexts() as $context) {
+      /** @var $context \Drupal\Core\Cache\CacheableDependencyInterface */
+      if ($context instanceof CacheableDependencyInterface) {
+        $cache_contexts = Cache::mergeContexts($cache_contexts, $context->getCacheContexts());
+      }
+    }
+    return $cache_contexts;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheTags() {
+    $tags = [];
+    // Applied contexts can affect the cache tags when this plugin is
+    // involved in caching, collect and return them.
+    foreach ($this->getContexts() as $context) {
+      /** @var $context \Drupal\Core\Cache\CacheableDependencyInterface */
+      if ($context instanceof CacheableDependencyInterface) {
+        $tags = Cache::mergeTags($tags, $context->getCacheTags());
+      }
+    }
+    return $tags;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheMaxAge() {
+    $max_age = Cache::PERMANENT;
+
+    // Applied contexts can affect the cache max age when this plugin is
+    // involved in caching, collect and return them.
+    foreach ($this->getContexts() as $context) {
+      /** @var $context \Drupal\Core\Cache\CacheableDependencyInterface */
+      if ($context instanceof CacheableDependencyInterface) {
+        $max_age = Cache::mergeMaxAges($max_age, $context->getCacheMaxAge());
+      }
+    }
+    return $max_age;
+  }
+
 }
diff --git a/core/lib/Drupal/Core/Plugin/DefaultPluginManager.php b/core/lib/Drupal/Core/Plugin/DefaultPluginManager.php
index ceabcd995..7c8799aed 100644
--- a/core/lib/Drupal/Core/Plugin/DefaultPluginManager.php
+++ b/core/lib/Drupal/Core/Plugin/DefaultPluginManager.php
@@ -336,7 +336,7 @@ class DefaultPluginManager extends PluginManagerBase implements PluginManagerInt
   /**
    * Determines if the provider of a definition exists.
    *
-   * @return boolean
+   * @return bool
    *   TRUE if provider exists, FALSE otherwise.
    */
   protected function providerExists($provider) {
diff --git a/core/lib/Drupal/Core/Plugin/Discovery/YamlDiscovery.php b/core/lib/Drupal/Core/Plugin/Discovery/YamlDiscovery.php
index 0b7d10f68..0d519f45b 100644
--- a/core/lib/Drupal/Core/Plugin/Discovery/YamlDiscovery.php
+++ b/core/lib/Drupal/Core/Plugin/Discovery/YamlDiscovery.php
@@ -10,9 +10,18 @@ namespace Drupal\Core\Plugin\Discovery;
 use Drupal\Component\Plugin\Discovery\DiscoveryInterface;
 use Drupal\Component\Discovery\YamlDiscovery as ComponentYamlDiscovery;
 use Drupal\Component\Plugin\Discovery\DiscoveryTrait;
+use Drupal\Core\StringTranslation\TranslationWrapper;
 
 /**
  * Allows YAML files to define plugin definitions.
+ *
+ * If the value of a key (like title) in the definition is translatable then
+ * the addTranslatableProperty() method can be used to mark it as such and also
+ * to add translation context. Then
+ * \Drupal\Core\StringTranslation\TranslationWrapper will be used to translate
+ * the string and also to mark it safe. Only strings written in the YAML files
+ * should be marked as safe, strings coming from dynamic plugin definitions
+ * potentially containing user input should not.
  */
 class YamlDiscovery implements DiscoveryInterface {
 
@@ -25,6 +34,15 @@ class YamlDiscovery implements DiscoveryInterface {
    */
   protected $discovery;
 
+  /**
+   * Contains an array of translatable properties passed along to t().
+   *
+   * @see \Drupal\Core\Plugin\Discovery\YamlDiscovery::addTranslatableProperty()
+   *
+   * @var array
+   */
+  protected $translatableProperties = [];
+
   /**
    * Construct a YamlDiscovery object.
    *
@@ -38,6 +56,23 @@ class YamlDiscovery implements DiscoveryInterface {
     $this->discovery = new ComponentYamlDiscovery($name, $directories);
   }
 
+  /**
+   * Set one of the YAML values as being translatable.
+   *
+   * @param string $value_key
+   *   The key corresponding to the value in the YAML that contains a
+   *   translatable string.
+   * @param string $context_key
+   *   (Optional) the translation context for the value specified by the
+   *   $value_key.
+   *
+   * @return $this
+   */
+  public function addTranslatableProperty($value_key, $context_key = '') {
+    $this->translatableProperties[$value_key] = $context_key;
+    return $this;
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -48,6 +83,20 @@ class YamlDiscovery implements DiscoveryInterface {
     $definitions = array();
     foreach ($plugins as $provider => $list) {
       foreach ($list as $id => $definition) {
+        // Add translation wrappers.
+        foreach ($this->translatableProperties as $property => $context_key) {
+          if (isset($definition[$property])) {
+            $options = [];
+            // Move the t() context from the definition to the translation
+            // wrapper.
+            if ($context_key && isset($definition[$context_key])) {
+              $options['context'] = $definition[$context_key];
+              unset($definition[$context_key]);
+            }
+            $definition[$property] = new TranslationWrapper($definition[$property], [], $options);
+          }
+        }
+        // Add ID and provider.
         $definitions[$id] = $definition + array(
           'provider' => $provider,
           'id' => $id,
diff --git a/core/lib/Drupal/Core/Plugin/PluginFormInterface.php b/core/lib/Drupal/Core/Plugin/PluginFormInterface.php
index 9fb3ad5f6..fee05ec58 100644
--- a/core/lib/Drupal/Core/Plugin/PluginFormInterface.php
+++ b/core/lib/Drupal/Core/Plugin/PluginFormInterface.php
@@ -10,18 +10,7 @@ namespace Drupal\Core\Plugin;
 use Drupal\Core\Form\FormStateInterface;
 
 /**
- * Provides an interface for a plugin that contains a form.
- *
- * Plugin forms are usually contained in other forms. In order to know where the
- * plugin form is located in the parent form, #parents and #array_parents must
- * be known, but these are not available during the initial build phase. In
- * order to have these properties available when building the plugin form's
- * elements, let buildConfigurationForm() return a form element that has a
- * #process callback and build the rest of the form in the callback. By the time
- * the callback is executed, the element's #parents and #array_parents
- * properties will have been set by the form API. For more documentation on
- * #parents and #array_parents, see
- * https://api.drupal.org/api/drupal/developer!topics!forms_api_reference.html/8.
+ * Provides an interface for an embeddable plugin form.
  *
  * @ingroup plugin_api
  */
@@ -30,10 +19,21 @@ interface PluginFormInterface {
   /**
    * Form constructor.
    *
+   * Plugin forms are embedded in other forms. In order to know where the plugin
+   * form is located in the parent form, #parents and #array_parents must be
+   * known, but these are not available during the initial build phase. In order
+   * to have these properties available when building the plugin form's
+   * elements, let this method return a form element that has a #process
+   * callback and build the rest of the form in the callback. By the time the
+   * callback is executed, the element's #parents and #array_parents properties
+   * will have been set by the form API. For more documentation on #parents and
+   * #array_parents, see
+   * https://api.drupal.org/api/drupal/developer!topics!forms_api_reference.html/8.
+   *
    * @param array $form
-   *   An associative array containing the structure of the form.
+   *   An associative array containing the initial structure of the plugin form.
    * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
+   *   The current state of the complete form.
    *
    * @return array
    *   The form structure.
@@ -44,9 +44,10 @@ interface PluginFormInterface {
    * Form validation handler.
    *
    * @param array $form
-   *   An associative array containing the structure of the form.
+   *   An associative array containing the structure of the plugin form as built
+   *   by static::buildConfigurationForm().
    * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
+   *   The current state of the complete form.
    */
   public function validateConfigurationForm(array &$form, FormStateInterface $form_state);
 
@@ -54,9 +55,10 @@ interface PluginFormInterface {
    * Form submission handler.
    *
    * @param array $form
-   *   An associative array containing the structure of the form.
+   *   An associative array containing the structure of the plugin form as built
+   *   by static::buildConfigurationForm().
    * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
+   *   The current state of the complete form.
    */
   public function submitConfigurationForm(array &$form, FormStateInterface $form_state);
 
diff --git a/core/lib/Drupal/Core/ProxyClass/Batch/BatchStorage.php b/core/lib/Drupal/Core/ProxyClass/Batch/BatchStorage.php
new file mode 100644
index 000000000..95575b210
--- /dev/null
+++ b/core/lib/Drupal/Core/ProxyClass/Batch/BatchStorage.php
@@ -0,0 +1,116 @@
+<?php
+
+/**
+ * @file
+ * Contains Drupal\Core\ProxyClass\Batch\BatchStorage.
+ */
+
+/**
+ * This file was generated via php core/scripts/generate-proxy-class.php 'Drupal\Core\Batch\BatchStorage' "core/lib/Drupal/Core".
+ */
+
+namespace Drupal\Core\ProxyClass\Batch {
+
+    /**
+     * Provides a proxy class for \Drupal\Core\Batch\BatchStorage.
+     *
+     * @see \Drupal\Component\ProxyBuilder
+     */
+    class BatchStorage implements \Drupal\Core\Batch\BatchStorageInterface
+    {
+
+        use \Drupal\Core\DependencyInjection\DependencySerializationTrait;
+
+        /**
+         * The id of the original proxied service.
+         *
+         * @var string
+         */
+        protected $drupalProxyOriginalServiceId;
+
+        /**
+         * The real proxied service, after it was lazy loaded.
+         *
+         * @var \Drupal\Core\Batch\BatchStorage
+         */
+        protected $service;
+
+        /**
+         * The service container.
+         *
+         * @var \Symfony\Component\DependencyInjection\ContainerInterface
+         */
+        protected $container;
+
+        /**
+         * Constructs a ProxyClass Drupal proxy object.
+         *
+         * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
+         *   The container.
+         * @param string $drupal_proxy_original_service_id
+         *   The service ID of the original service.
+         */
+        public function __construct(\Symfony\Component\DependencyInjection\ContainerInterface $container, $drupal_proxy_original_service_id)
+        {
+            $this->container = $container;
+            $this->drupalProxyOriginalServiceId = $drupal_proxy_original_service_id;
+        }
+
+        /**
+         * Lazy loads the real service from the container.
+         *
+         * @return object
+         *   Returns the constructed real service.
+         */
+        protected function lazyLoadItself()
+        {
+            if (!isset($this->service)) {
+                $this->service = $this->container->get($this->drupalProxyOriginalServiceId);
+            }
+
+            return $this->service;
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function load($id)
+        {
+            return $this->lazyLoadItself()->load($id);
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function delete($id)
+        {
+            return $this->lazyLoadItself()->delete($id);
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function update(array $batch)
+        {
+            return $this->lazyLoadItself()->update($batch);
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function cleanup()
+        {
+            return $this->lazyLoadItself()->cleanup();
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function create(array $batch)
+        {
+            return $this->lazyLoadItself()->create($batch);
+        }
+
+    }
+
+}
diff --git a/core/lib/Drupal/Core/ProxyClass/Config/ConfigInstaller.php b/core/lib/Drupal/Core/ProxyClass/Config/ConfigInstaller.php
new file mode 100644
index 000000000..3eff9a8fb
--- /dev/null
+++ b/core/lib/Drupal/Core/ProxyClass/Config/ConfigInstaller.php
@@ -0,0 +1,141 @@
+<?php
+
+/**
+ * @file
+ * Contains Drupal\Core\ProxyClass\Config\ConfigInstaller.
+ */
+
+/**
+ * This file was generated via php core/scripts/generate-proxy-class.php 'Drupal\Core\Config\ConfigInstaller' "core/lib/Drupal/Core".
+ */
+
+namespace Drupal\Core\ProxyClass\Config {
+
+    /**
+     * Provides a proxy class for \Drupal\Core\Config\ConfigInstaller.
+     *
+     * @see \Drupal\Component\ProxyBuilder
+     */
+    class ConfigInstaller implements \Drupal\Core\Config\ConfigInstallerInterface
+    {
+
+        use \Drupal\Core\DependencyInjection\DependencySerializationTrait;
+
+        /**
+         * The id of the original proxied service.
+         *
+         * @var string
+         */
+        protected $drupalProxyOriginalServiceId;
+
+        /**
+         * The real proxied service, after it was lazy loaded.
+         *
+         * @var \Drupal\Core\Config\ConfigInstaller
+         */
+        protected $service;
+
+        /**
+         * The service container.
+         *
+         * @var \Symfony\Component\DependencyInjection\ContainerInterface
+         */
+        protected $container;
+
+        /**
+         * Constructs a ProxyClass Drupal proxy object.
+         *
+         * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
+         *   The container.
+         * @param string $drupal_proxy_original_service_id
+         *   The service ID of the original service.
+         */
+        public function __construct(\Symfony\Component\DependencyInjection\ContainerInterface $container, $drupal_proxy_original_service_id)
+        {
+            $this->container = $container;
+            $this->drupalProxyOriginalServiceId = $drupal_proxy_original_service_id;
+        }
+
+        /**
+         * Lazy loads the real service from the container.
+         *
+         * @return object
+         *   Returns the constructed real service.
+         */
+        protected function lazyLoadItself()
+        {
+            if (!isset($this->service)) {
+                $this->service = $this->container->get($this->drupalProxyOriginalServiceId);
+            }
+
+            return $this->service;
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function installDefaultConfig($type, $name)
+        {
+            return $this->lazyLoadItself()->installDefaultConfig($type, $name);
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function installOptionalConfig(\Drupal\Core\Config\StorageInterface $storage = NULL, $dependency = array (
+        ))
+        {
+            return $this->lazyLoadItself()->installOptionalConfig($storage, $dependency);
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function installCollectionDefaultConfig($collection)
+        {
+            return $this->lazyLoadItself()->installCollectionDefaultConfig($collection);
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function setSourceStorage(\Drupal\Core\Config\StorageInterface $storage)
+        {
+            return $this->lazyLoadItself()->setSourceStorage($storage);
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function getSourceStorage()
+        {
+            return $this->lazyLoadItself()->getSourceStorage();
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function setSyncing($status)
+        {
+            return $this->lazyLoadItself()->setSyncing($status);
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function isSyncing()
+        {
+            return $this->lazyLoadItself()->isSyncing();
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function checkConfigurationToInstall($type, $name)
+        {
+            return $this->lazyLoadItself()->checkConfigurationToInstall($type, $name);
+        }
+
+    }
+
+}
diff --git a/core/lib/Drupal/Core/ProxyClass/Cron.php b/core/lib/Drupal/Core/ProxyClass/Cron.php
new file mode 100644
index 000000000..ec1903c4e
--- /dev/null
+++ b/core/lib/Drupal/Core/ProxyClass/Cron.php
@@ -0,0 +1,84 @@
+<?php
+
+/**
+ * @file
+ * Contains Drupal\Core\ProxyClass\Cron.
+ */
+
+/**
+ * This file was generated via php core/scripts/generate-proxy-class.php 'Drupal\Core\Cron' "core/lib/Drupal/Core".
+ */
+
+namespace Drupal\Core\ProxyClass {
+
+    /**
+     * Provides a proxy class for \Drupal\Core\Cron.
+     *
+     * @see \Drupal\Component\ProxyBuilder
+     */
+    class Cron implements \Drupal\Core\CronInterface
+    {
+
+        use \Drupal\Core\DependencyInjection\DependencySerializationTrait;
+
+        /**
+         * The id of the original proxied service.
+         *
+         * @var string
+         */
+        protected $drupalProxyOriginalServiceId;
+
+        /**
+         * The real proxied service, after it was lazy loaded.
+         *
+         * @var \Drupal\Core\Cron
+         */
+        protected $service;
+
+        /**
+         * The service container.
+         *
+         * @var \Symfony\Component\DependencyInjection\ContainerInterface
+         */
+        protected $container;
+
+        /**
+         * Constructs a ProxyClass Drupal proxy object.
+         *
+         * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
+         *   The container.
+         * @param string $drupal_proxy_original_service_id
+         *   The service ID of the original service.
+         */
+        public function __construct(\Symfony\Component\DependencyInjection\ContainerInterface $container, $drupal_proxy_original_service_id)
+        {
+            $this->container = $container;
+            $this->drupalProxyOriginalServiceId = $drupal_proxy_original_service_id;
+        }
+
+        /**
+         * Lazy loads the real service from the container.
+         *
+         * @return object
+         *   Returns the constructed real service.
+         */
+        protected function lazyLoadItself()
+        {
+            if (!isset($this->service)) {
+                $this->service = $this->container->get($this->drupalProxyOriginalServiceId);
+            }
+
+            return $this->service;
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function run()
+        {
+            return $this->lazyLoadItself()->run();
+        }
+
+    }
+
+}
diff --git a/core/lib/Drupal/Core/ProxyClass/Entity/ContentUninstallValidator.php b/core/lib/Drupal/Core/ProxyClass/Entity/ContentUninstallValidator.php
new file mode 100644
index 000000000..1edf75981
--- /dev/null
+++ b/core/lib/Drupal/Core/ProxyClass/Entity/ContentUninstallValidator.php
@@ -0,0 +1,92 @@
+<?php
+
+/**
+ * @file
+ * Contains Drupal\Core\ProxyClass\Entity\ContentUninstallValidator.
+ */
+
+/**
+ * This file was generated via php core/scripts/generate-proxy-class.php 'Drupal\Core\Entity\ContentUninstallValidator' "core/lib/Drupal/Core".
+ */
+
+namespace Drupal\Core\ProxyClass\Entity {
+
+    /**
+     * Provides a proxy class for \Drupal\Core\Entity\ContentUninstallValidator.
+     *
+     * @see \Drupal\Component\ProxyBuilder
+     */
+    class ContentUninstallValidator implements \Drupal\Core\Extension\ModuleUninstallValidatorInterface
+    {
+
+        use \Drupal\Core\DependencyInjection\DependencySerializationTrait;
+
+        /**
+         * The id of the original proxied service.
+         *
+         * @var string
+         */
+        protected $drupalProxyOriginalServiceId;
+
+        /**
+         * The real proxied service, after it was lazy loaded.
+         *
+         * @var \Drupal\Core\Entity\ContentUninstallValidator
+         */
+        protected $service;
+
+        /**
+         * The service container.
+         *
+         * @var \Symfony\Component\DependencyInjection\ContainerInterface
+         */
+        protected $container;
+
+        /**
+         * Constructs a ProxyClass Drupal proxy object.
+         *
+         * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
+         *   The container.
+         * @param string $drupal_proxy_original_service_id
+         *   The service ID of the original service.
+         */
+        public function __construct(\Symfony\Component\DependencyInjection\ContainerInterface $container, $drupal_proxy_original_service_id)
+        {
+            $this->container = $container;
+            $this->drupalProxyOriginalServiceId = $drupal_proxy_original_service_id;
+        }
+
+        /**
+         * Lazy loads the real service from the container.
+         *
+         * @return object
+         *   Returns the constructed real service.
+         */
+        protected function lazyLoadItself()
+        {
+            if (!isset($this->service)) {
+                $this->service = $this->container->get($this->drupalProxyOriginalServiceId);
+            }
+
+            return $this->service;
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function validate($module)
+        {
+            return $this->lazyLoadItself()->validate($module);
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function setStringTranslation(\Drupal\Core\StringTranslation\TranslationInterface $translation)
+        {
+            return $this->lazyLoadItself()->setStringTranslation($translation);
+        }
+
+    }
+
+}
diff --git a/core/lib/Drupal/Core/ProxyClass/Extension/ModuleInstaller.php b/core/lib/Drupal/Core/ProxyClass/Extension/ModuleInstaller.php
new file mode 100644
index 000000000..54419f054
--- /dev/null
+++ b/core/lib/Drupal/Core/ProxyClass/Extension/ModuleInstaller.php
@@ -0,0 +1,108 @@
+<?php
+
+/**
+ * @file
+ * Contains Drupal\Core\ProxyClass\Extension\ModuleInstaller.
+ */
+
+/**
+ * This file was generated via php core/scripts/generate-proxy-class.php 'Drupal\Core\Extension\ModuleInstaller' "core/lib/Drupal/Core".
+ */
+
+namespace Drupal\Core\ProxyClass\Extension {
+
+    /**
+     * Provides a proxy class for \Drupal\Core\Extension\ModuleInstaller.
+     *
+     * @see \Drupal\Component\ProxyBuilder
+     */
+    class ModuleInstaller implements \Drupal\Core\Extension\ModuleInstallerInterface
+    {
+
+        use \Drupal\Core\DependencyInjection\DependencySerializationTrait;
+
+        /**
+         * The id of the original proxied service.
+         *
+         * @var string
+         */
+        protected $drupalProxyOriginalServiceId;
+
+        /**
+         * The real proxied service, after it was lazy loaded.
+         *
+         * @var \Drupal\Core\Extension\ModuleInstaller
+         */
+        protected $service;
+
+        /**
+         * The service container.
+         *
+         * @var \Symfony\Component\DependencyInjection\ContainerInterface
+         */
+        protected $container;
+
+        /**
+         * Constructs a ProxyClass Drupal proxy object.
+         *
+         * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
+         *   The container.
+         * @param string $drupal_proxy_original_service_id
+         *   The service ID of the original service.
+         */
+        public function __construct(\Symfony\Component\DependencyInjection\ContainerInterface $container, $drupal_proxy_original_service_id)
+        {
+            $this->container = $container;
+            $this->drupalProxyOriginalServiceId = $drupal_proxy_original_service_id;
+        }
+
+        /**
+         * Lazy loads the real service from the container.
+         *
+         * @return object
+         *   Returns the constructed real service.
+         */
+        protected function lazyLoadItself()
+        {
+            if (!isset($this->service)) {
+                $this->service = $this->container->get($this->drupalProxyOriginalServiceId);
+            }
+
+            return $this->service;
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function addUninstallValidator(\Drupal\Core\Extension\ModuleUninstallValidatorInterface $uninstall_validator)
+        {
+            return $this->lazyLoadItself()->addUninstallValidator($uninstall_validator);
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function install(array $module_list, $enable_dependencies = true)
+        {
+            return $this->lazyLoadItself()->install($module_list, $enable_dependencies);
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function uninstall(array $module_list, $uninstall_dependents = true)
+        {
+            return $this->lazyLoadItself()->uninstall($module_list, $uninstall_dependents);
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function validateUninstall(array $module_list)
+        {
+            return $this->lazyLoadItself()->validateUninstall($module_list);
+        }
+
+    }
+
+}
diff --git a/core/lib/Drupal/Core/ProxyClass/Extension/RequiredModuleUninstallValidator.php b/core/lib/Drupal/Core/ProxyClass/Extension/RequiredModuleUninstallValidator.php
new file mode 100644
index 000000000..0e2ed8a0b
--- /dev/null
+++ b/core/lib/Drupal/Core/ProxyClass/Extension/RequiredModuleUninstallValidator.php
@@ -0,0 +1,92 @@
+<?php
+
+/**
+ * @file
+ * Contains Drupal\Core\ProxyClass\Extension\RequiredModuleUninstallValidator.
+ */
+
+/**
+ * This file was generated via php core/scripts/generate-proxy-class.php 'Drupal\Core\Extension\RequiredModuleUninstallValidator' "core/lib/Drupal/Core".
+ */
+
+namespace Drupal\Core\ProxyClass\Extension {
+
+    /**
+     * Provides a proxy class for \Drupal\Core\Extension\RequiredModuleUninstallValidator.
+     *
+     * @see \Drupal\Component\ProxyBuilder
+     */
+    class RequiredModuleUninstallValidator implements \Drupal\Core\Extension\ModuleUninstallValidatorInterface
+    {
+
+        use \Drupal\Core\DependencyInjection\DependencySerializationTrait;
+
+        /**
+         * The id of the original proxied service.
+         *
+         * @var string
+         */
+        protected $drupalProxyOriginalServiceId;
+
+        /**
+         * The real proxied service, after it was lazy loaded.
+         *
+         * @var \Drupal\Core\Extension\RequiredModuleUninstallValidator
+         */
+        protected $service;
+
+        /**
+         * The service container.
+         *
+         * @var \Symfony\Component\DependencyInjection\ContainerInterface
+         */
+        protected $container;
+
+        /**
+         * Constructs a ProxyClass Drupal proxy object.
+         *
+         * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
+         *   The container.
+         * @param string $drupal_proxy_original_service_id
+         *   The service ID of the original service.
+         */
+        public function __construct(\Symfony\Component\DependencyInjection\ContainerInterface $container, $drupal_proxy_original_service_id)
+        {
+            $this->container = $container;
+            $this->drupalProxyOriginalServiceId = $drupal_proxy_original_service_id;
+        }
+
+        /**
+         * Lazy loads the real service from the container.
+         *
+         * @return object
+         *   Returns the constructed real service.
+         */
+        protected function lazyLoadItself()
+        {
+            if (!isset($this->service)) {
+                $this->service = $this->container->get($this->drupalProxyOriginalServiceId);
+            }
+
+            return $this->service;
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function validate($module)
+        {
+            return $this->lazyLoadItself()->validate($module);
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function setStringTranslation(\Drupal\Core\StringTranslation\TranslationInterface $translation)
+        {
+            return $this->lazyLoadItself()->setStringTranslation($translation);
+        }
+
+    }
+
+}
diff --git a/core/lib/Drupal/Core/ProxyClass/Field/FieldModuleUninstallValidator.php b/core/lib/Drupal/Core/ProxyClass/Field/FieldModuleUninstallValidator.php
new file mode 100644
index 000000000..13a71b785
--- /dev/null
+++ b/core/lib/Drupal/Core/ProxyClass/Field/FieldModuleUninstallValidator.php
@@ -0,0 +1,92 @@
+<?php
+
+/**
+ * @file
+ * Contains Drupal\Core\ProxyClass\Field\FieldModuleUninstallValidator.
+ */
+
+/**
+ * This file was generated via php core/scripts/generate-proxy-class.php 'Drupal\Core\Field\FieldModuleUninstallValidator' "core/lib/Drupal/Core".
+ */
+
+namespace Drupal\Core\ProxyClass\Field {
+
+    /**
+     * Provides a proxy class for \Drupal\Core\Field\FieldModuleUninstallValidator.
+     *
+     * @see \Drupal\Component\ProxyBuilder
+     */
+    class FieldModuleUninstallValidator implements \Drupal\Core\Extension\ModuleUninstallValidatorInterface
+    {
+
+        use \Drupal\Core\DependencyInjection\DependencySerializationTrait;
+
+        /**
+         * The id of the original proxied service.
+         *
+         * @var string
+         */
+        protected $drupalProxyOriginalServiceId;
+
+        /**
+         * The real proxied service, after it was lazy loaded.
+         *
+         * @var \Drupal\Core\Field\FieldModuleUninstallValidator
+         */
+        protected $service;
+
+        /**
+         * The service container.
+         *
+         * @var \Symfony\Component\DependencyInjection\ContainerInterface
+         */
+        protected $container;
+
+        /**
+         * Constructs a ProxyClass Drupal proxy object.
+         *
+         * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
+         *   The container.
+         * @param string $drupal_proxy_original_service_id
+         *   The service ID of the original service.
+         */
+        public function __construct(\Symfony\Component\DependencyInjection\ContainerInterface $container, $drupal_proxy_original_service_id)
+        {
+            $this->container = $container;
+            $this->drupalProxyOriginalServiceId = $drupal_proxy_original_service_id;
+        }
+
+        /**
+         * Lazy loads the real service from the container.
+         *
+         * @return object
+         *   Returns the constructed real service.
+         */
+        protected function lazyLoadItself()
+        {
+            if (!isset($this->service)) {
+                $this->service = $this->container->get($this->drupalProxyOriginalServiceId);
+            }
+
+            return $this->service;
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function validate($module_name)
+        {
+            return $this->lazyLoadItself()->validate($module_name);
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function setStringTranslation(\Drupal\Core\StringTranslation\TranslationInterface $translation)
+        {
+            return $this->lazyLoadItself()->setStringTranslation($translation);
+        }
+
+    }
+
+}
diff --git a/core/lib/Drupal/Core/ProxyClass/File/MimeType/ExtensionMimeTypeGuesser.php b/core/lib/Drupal/Core/ProxyClass/File/MimeType/ExtensionMimeTypeGuesser.php
new file mode 100644
index 000000000..a2eda1503
--- /dev/null
+++ b/core/lib/Drupal/Core/ProxyClass/File/MimeType/ExtensionMimeTypeGuesser.php
@@ -0,0 +1,92 @@
+<?php
+
+/**
+ * @file
+ * Contains Drupal\Core\ProxyClass\File\MimeType\ExtensionMimeTypeGuesser.
+ */
+
+/**
+ * This file was generated via php core/scripts/generate-proxy-class.php 'Drupal\Core\File\MimeType\ExtensionMimeTypeGuesser' "core/lib/Drupal/Core".
+ */
+
+namespace Drupal\Core\ProxyClass\File\MimeType {
+
+    /**
+     * Provides a proxy class for \Drupal\Core\File\MimeType\ExtensionMimeTypeGuesser.
+     *
+     * @see \Drupal\Component\ProxyBuilder
+     */
+    class ExtensionMimeTypeGuesser implements \Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesserInterface
+    {
+
+        use \Drupal\Core\DependencyInjection\DependencySerializationTrait;
+
+        /**
+         * The id of the original proxied service.
+         *
+         * @var string
+         */
+        protected $drupalProxyOriginalServiceId;
+
+        /**
+         * The real proxied service, after it was lazy loaded.
+         *
+         * @var \Drupal\Core\File\MimeType\ExtensionMimeTypeGuesser
+         */
+        protected $service;
+
+        /**
+         * The service container.
+         *
+         * @var \Symfony\Component\DependencyInjection\ContainerInterface
+         */
+        protected $container;
+
+        /**
+         * Constructs a ProxyClass Drupal proxy object.
+         *
+         * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
+         *   The container.
+         * @param string $drupal_proxy_original_service_id
+         *   The service ID of the original service.
+         */
+        public function __construct(\Symfony\Component\DependencyInjection\ContainerInterface $container, $drupal_proxy_original_service_id)
+        {
+            $this->container = $container;
+            $this->drupalProxyOriginalServiceId = $drupal_proxy_original_service_id;
+        }
+
+        /**
+         * Lazy loads the real service from the container.
+         *
+         * @return object
+         *   Returns the constructed real service.
+         */
+        protected function lazyLoadItself()
+        {
+            if (!isset($this->service)) {
+                $this->service = $this->container->get($this->drupalProxyOriginalServiceId);
+            }
+
+            return $this->service;
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function guess($path)
+        {
+            return $this->lazyLoadItself()->guess($path);
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function setMapping(array $mapping = NULL)
+        {
+            return $this->lazyLoadItself()->setMapping($mapping);
+        }
+
+    }
+
+}
diff --git a/core/lib/Drupal/Core/ProxyClass/File/MimeType/MimeTypeGuesser.php b/core/lib/Drupal/Core/ProxyClass/File/MimeType/MimeTypeGuesser.php
new file mode 100644
index 000000000..fda41ca81
--- /dev/null
+++ b/core/lib/Drupal/Core/ProxyClass/File/MimeType/MimeTypeGuesser.php
@@ -0,0 +1,100 @@
+<?php
+
+/**
+ * @file
+ * Contains Drupal\Core\ProxyClass\File\MimeType\MimeTypeGuesser.
+ */
+
+/**
+ * This file was generated via php core/scripts/generate-proxy-class.php 'Drupal\Core\File\MimeType\MimeTypeGuesser' "core/lib/Drupal/Core".
+ */
+
+namespace Drupal\Core\ProxyClass\File\MimeType {
+
+    /**
+     * Provides a proxy class for \Drupal\Core\File\MimeType\MimeTypeGuesser.
+     *
+     * @see \Drupal\Component\ProxyBuilder
+     */
+    class MimeTypeGuesser implements \Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesserInterface
+    {
+
+        use \Drupal\Core\DependencyInjection\DependencySerializationTrait;
+
+        /**
+         * The id of the original proxied service.
+         *
+         * @var string
+         */
+        protected $drupalProxyOriginalServiceId;
+
+        /**
+         * The real proxied service, after it was lazy loaded.
+         *
+         * @var \Drupal\Core\File\MimeType\MimeTypeGuesser
+         */
+        protected $service;
+
+        /**
+         * The service container.
+         *
+         * @var \Symfony\Component\DependencyInjection\ContainerInterface
+         */
+        protected $container;
+
+        /**
+         * Constructs a ProxyClass Drupal proxy object.
+         *
+         * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
+         *   The container.
+         * @param string $drupal_proxy_original_service_id
+         *   The service ID of the original service.
+         */
+        public function __construct(\Symfony\Component\DependencyInjection\ContainerInterface $container, $drupal_proxy_original_service_id)
+        {
+            $this->container = $container;
+            $this->drupalProxyOriginalServiceId = $drupal_proxy_original_service_id;
+        }
+
+        /**
+         * Lazy loads the real service from the container.
+         *
+         * @return object
+         *   Returns the constructed real service.
+         */
+        protected function lazyLoadItself()
+        {
+            if (!isset($this->service)) {
+                $this->service = $this->container->get($this->drupalProxyOriginalServiceId);
+            }
+
+            return $this->service;
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function guess($path)
+        {
+            return $this->lazyLoadItself()->guess($path);
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function addGuesser(\Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesserInterface $guesser, $priority = 0)
+        {
+            return $this->lazyLoadItself()->addGuesser($guesser, $priority);
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public static function registerWithSymfonyGuesser(\Symfony\Component\DependencyInjection\ContainerInterface $container)
+        {
+            \Drupal\Core\File\MimeType\MimeTypeGuesser::registerWithSymfonyGuesser($container);
+        }
+
+    }
+
+}
diff --git a/core/lib/Drupal/Core/ProxyClass/Lock/DatabaseLockBackend.php b/core/lib/Drupal/Core/ProxyClass/Lock/DatabaseLockBackend.php
new file mode 100644
index 000000000..efaad1bd1
--- /dev/null
+++ b/core/lib/Drupal/Core/ProxyClass/Lock/DatabaseLockBackend.php
@@ -0,0 +1,124 @@
+<?php
+
+/**
+ * @file
+ * Contains Drupal\Core\ProxyClass\Lock\DatabaseLockBackend.
+ */
+
+/**
+ * This file was generated via php core/scripts/generate-proxy-class.php 'Drupal\Core\Lock\DatabaseLockBackend' "core/lib/Drupal/Core".
+ */
+
+namespace Drupal\Core\ProxyClass\Lock {
+
+    /**
+     * Provides a proxy class for \Drupal\Core\Lock\DatabaseLockBackend.
+     *
+     * @see \Drupal\Component\ProxyBuilder
+     */
+    class DatabaseLockBackend implements \Drupal\Core\Lock\LockBackendInterface
+    {
+
+        use \Drupal\Core\DependencyInjection\DependencySerializationTrait;
+
+        /**
+         * The id of the original proxied service.
+         *
+         * @var string
+         */
+        protected $drupalProxyOriginalServiceId;
+
+        /**
+         * The real proxied service, after it was lazy loaded.
+         *
+         * @var \Drupal\Core\Lock\DatabaseLockBackend
+         */
+        protected $service;
+
+        /**
+         * The service container.
+         *
+         * @var \Symfony\Component\DependencyInjection\ContainerInterface
+         */
+        protected $container;
+
+        /**
+         * Constructs a ProxyClass Drupal proxy object.
+         *
+         * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
+         *   The container.
+         * @param string $drupal_proxy_original_service_id
+         *   The service ID of the original service.
+         */
+        public function __construct(\Symfony\Component\DependencyInjection\ContainerInterface $container, $drupal_proxy_original_service_id)
+        {
+            $this->container = $container;
+            $this->drupalProxyOriginalServiceId = $drupal_proxy_original_service_id;
+        }
+
+        /**
+         * Lazy loads the real service from the container.
+         *
+         * @return object
+         *   Returns the constructed real service.
+         */
+        protected function lazyLoadItself()
+        {
+            if (!isset($this->service)) {
+                $this->service = $this->container->get($this->drupalProxyOriginalServiceId);
+            }
+
+            return $this->service;
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function acquire($name, $timeout = 30)
+        {
+            return $this->lazyLoadItself()->acquire($name, $timeout);
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function lockMayBeAvailable($name)
+        {
+            return $this->lazyLoadItself()->lockMayBeAvailable($name);
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function release($name)
+        {
+            return $this->lazyLoadItself()->release($name);
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function releaseAll($lock_id = NULL)
+        {
+            return $this->lazyLoadItself()->releaseAll($lock_id);
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function wait($name, $delay = 30)
+        {
+            return $this->lazyLoadItself()->wait($name, $delay);
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function getLockId()
+        {
+            return $this->lazyLoadItself()->getLockId();
+        }
+
+    }
+
+}
diff --git a/core/lib/Drupal/Core/ProxyClass/Lock/PersistentDatabaseLockBackend.php b/core/lib/Drupal/Core/ProxyClass/Lock/PersistentDatabaseLockBackend.php
new file mode 100644
index 000000000..e7febbfa5
--- /dev/null
+++ b/core/lib/Drupal/Core/ProxyClass/Lock/PersistentDatabaseLockBackend.php
@@ -0,0 +1,124 @@
+<?php
+
+/**
+ * @file
+ * Contains Drupal\Core\ProxyClass\Lock\PersistentDatabaseLockBackend.
+ */
+
+/**
+ * This file was generated via php core/scripts/generate-proxy-class.php 'Drupal\Core\Lock\PersistentDatabaseLockBackend' "core/lib/Drupal/Core".
+ */
+
+namespace Drupal\Core\ProxyClass\Lock {
+
+    /**
+     * Provides a proxy class for \Drupal\Core\Lock\PersistentDatabaseLockBackend.
+     *
+     * @see \Drupal\Component\ProxyBuilder
+     */
+    class PersistentDatabaseLockBackend implements \Drupal\Core\Lock\LockBackendInterface
+    {
+
+        use \Drupal\Core\DependencyInjection\DependencySerializationTrait;
+
+        /**
+         * The id of the original proxied service.
+         *
+         * @var string
+         */
+        protected $drupalProxyOriginalServiceId;
+
+        /**
+         * The real proxied service, after it was lazy loaded.
+         *
+         * @var \Drupal\Core\Lock\PersistentDatabaseLockBackend
+         */
+        protected $service;
+
+        /**
+         * The service container.
+         *
+         * @var \Symfony\Component\DependencyInjection\ContainerInterface
+         */
+        protected $container;
+
+        /**
+         * Constructs a ProxyClass Drupal proxy object.
+         *
+         * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
+         *   The container.
+         * @param string $drupal_proxy_original_service_id
+         *   The service ID of the original service.
+         */
+        public function __construct(\Symfony\Component\DependencyInjection\ContainerInterface $container, $drupal_proxy_original_service_id)
+        {
+            $this->container = $container;
+            $this->drupalProxyOriginalServiceId = $drupal_proxy_original_service_id;
+        }
+
+        /**
+         * Lazy loads the real service from the container.
+         *
+         * @return object
+         *   Returns the constructed real service.
+         */
+        protected function lazyLoadItself()
+        {
+            if (!isset($this->service)) {
+                $this->service = $this->container->get($this->drupalProxyOriginalServiceId);
+            }
+
+            return $this->service;
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function acquire($name, $timeout = 30)
+        {
+            return $this->lazyLoadItself()->acquire($name, $timeout);
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function lockMayBeAvailable($name)
+        {
+            return $this->lazyLoadItself()->lockMayBeAvailable($name);
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function release($name)
+        {
+            return $this->lazyLoadItself()->release($name);
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function releaseAll($lock_id = NULL)
+        {
+            return $this->lazyLoadItself()->releaseAll($lock_id);
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function wait($name, $delay = 30)
+        {
+            return $this->lazyLoadItself()->wait($name, $delay);
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function getLockId()
+        {
+            return $this->lazyLoadItself()->getLockId();
+        }
+
+    }
+
+}
diff --git a/core/lib/Drupal/Core/ProxyClass/PageCache/ChainResponsePolicy.php b/core/lib/Drupal/Core/ProxyClass/PageCache/ChainResponsePolicy.php
new file mode 100644
index 000000000..7b04df7ac
--- /dev/null
+++ b/core/lib/Drupal/Core/ProxyClass/PageCache/ChainResponsePolicy.php
@@ -0,0 +1,92 @@
+<?php
+
+/**
+ * @file
+ * Contains Drupal\Core\ProxyClass\PageCache\ChainResponsePolicy.
+ */
+
+/**
+ * This file was generated via php core/scripts/generate-proxy-class.php 'Drupal\Core\PageCache\ChainResponsePolicy' "core/lib/Drupal/Core".
+ */
+
+namespace Drupal\Core\ProxyClass\PageCache {
+
+    /**
+     * Provides a proxy class for \Drupal\Core\PageCache\ChainResponsePolicy.
+     *
+     * @see \Drupal\Component\ProxyBuilder
+     */
+    class ChainResponsePolicy implements \Drupal\Core\PageCache\ChainResponsePolicyInterface
+    {
+
+        use \Drupal\Core\DependencyInjection\DependencySerializationTrait;
+
+        /**
+         * The id of the original proxied service.
+         *
+         * @var string
+         */
+        protected $drupalProxyOriginalServiceId;
+
+        /**
+         * The real proxied service, after it was lazy loaded.
+         *
+         * @var \Drupal\Core\PageCache\ChainResponsePolicy
+         */
+        protected $service;
+
+        /**
+         * The service container.
+         *
+         * @var \Symfony\Component\DependencyInjection\ContainerInterface
+         */
+        protected $container;
+
+        /**
+         * Constructs a ProxyClass Drupal proxy object.
+         *
+         * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
+         *   The container.
+         * @param string $drupal_proxy_original_service_id
+         *   The service ID of the original service.
+         */
+        public function __construct(\Symfony\Component\DependencyInjection\ContainerInterface $container, $drupal_proxy_original_service_id)
+        {
+            $this->container = $container;
+            $this->drupalProxyOriginalServiceId = $drupal_proxy_original_service_id;
+        }
+
+        /**
+         * Lazy loads the real service from the container.
+         *
+         * @return object
+         *   Returns the constructed real service.
+         */
+        protected function lazyLoadItself()
+        {
+            if (!isset($this->service)) {
+                $this->service = $this->container->get($this->drupalProxyOriginalServiceId);
+            }
+
+            return $this->service;
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function check(\Symfony\Component\HttpFoundation\Response $response, \Symfony\Component\HttpFoundation\Request $request)
+        {
+            return $this->lazyLoadItself()->check($response, $request);
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function addPolicy(\Drupal\Core\PageCache\ResponsePolicyInterface $policy)
+        {
+            return $this->lazyLoadItself()->addPolicy($policy);
+        }
+
+    }
+
+}
diff --git a/core/lib/Drupal/Core/ProxyClass/ParamConverter/AdminPathConfigEntityConverter.php b/core/lib/Drupal/Core/ProxyClass/ParamConverter/AdminPathConfigEntityConverter.php
new file mode 100644
index 000000000..43c1d122e
--- /dev/null
+++ b/core/lib/Drupal/Core/ProxyClass/ParamConverter/AdminPathConfigEntityConverter.php
@@ -0,0 +1,92 @@
+<?php
+
+/**
+ * @file
+ * Contains Drupal\Core\ProxyClass\ParamConverter\AdminPathConfigEntityConverter.
+ */
+
+/**
+ * This file was generated via php core/scripts/generate-proxy-class.php 'Drupal\Core\ParamConverter\AdminPathConfigEntityConverter' "core/lib/Drupal/Core".
+ */
+
+namespace Drupal\Core\ProxyClass\ParamConverter {
+
+    /**
+     * Provides a proxy class for \Drupal\Core\ParamConverter\AdminPathConfigEntityConverter.
+     *
+     * @see \Drupal\Component\ProxyBuilder
+     */
+    class AdminPathConfigEntityConverter implements \Drupal\Core\ParamConverter\ParamConverterInterface
+    {
+
+        use \Drupal\Core\DependencyInjection\DependencySerializationTrait;
+
+        /**
+         * The id of the original proxied service.
+         *
+         * @var string
+         */
+        protected $drupalProxyOriginalServiceId;
+
+        /**
+         * The real proxied service, after it was lazy loaded.
+         *
+         * @var \Drupal\Core\ParamConverter\AdminPathConfigEntityConverter
+         */
+        protected $service;
+
+        /**
+         * The service container.
+         *
+         * @var \Symfony\Component\DependencyInjection\ContainerInterface
+         */
+        protected $container;
+
+        /**
+         * Constructs a ProxyClass Drupal proxy object.
+         *
+         * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
+         *   The container.
+         * @param string $drupal_proxy_original_service_id
+         *   The service ID of the original service.
+         */
+        public function __construct(\Symfony\Component\DependencyInjection\ContainerInterface $container, $drupal_proxy_original_service_id)
+        {
+            $this->container = $container;
+            $this->drupalProxyOriginalServiceId = $drupal_proxy_original_service_id;
+        }
+
+        /**
+         * Lazy loads the real service from the container.
+         *
+         * @return object
+         *   Returns the constructed real service.
+         */
+        protected function lazyLoadItself()
+        {
+            if (!isset($this->service)) {
+                $this->service = $this->container->get($this->drupalProxyOriginalServiceId);
+            }
+
+            return $this->service;
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function convert($value, $definition, $name, array $defaults)
+        {
+            return $this->lazyLoadItself()->convert($value, $definition, $name, $defaults);
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function applies($definition, $name, \Symfony\Component\Routing\Route $route)
+        {
+            return $this->lazyLoadItself()->applies($definition, $name, $route);
+        }
+
+    }
+
+}
diff --git a/core/lib/Drupal/Core/ProxyClass/ParamConverter/MenuLinkPluginConverter.php b/core/lib/Drupal/Core/ProxyClass/ParamConverter/MenuLinkPluginConverter.php
new file mode 100644
index 000000000..9fc29e01e
--- /dev/null
+++ b/core/lib/Drupal/Core/ProxyClass/ParamConverter/MenuLinkPluginConverter.php
@@ -0,0 +1,92 @@
+<?php
+
+/**
+ * @file
+ * Contains Drupal\Core\ProxyClass\ParamConverter\MenuLinkPluginConverter.
+ */
+
+/**
+ * This file was generated via php core/scripts/generate-proxy-class.php 'Drupal\Core\ParamConverter\MenuLinkPluginConverter' "core/lib/Drupal/Core".
+ */
+
+namespace Drupal\Core\ProxyClass\ParamConverter {
+
+    /**
+     * Provides a proxy class for \Drupal\Core\ParamConverter\MenuLinkPluginConverter.
+     *
+     * @see \Drupal\Component\ProxyBuilder
+     */
+    class MenuLinkPluginConverter implements \Drupal\Core\ParamConverter\ParamConverterInterface
+    {
+
+        use \Drupal\Core\DependencyInjection\DependencySerializationTrait;
+
+        /**
+         * The id of the original proxied service.
+         *
+         * @var string
+         */
+        protected $drupalProxyOriginalServiceId;
+
+        /**
+         * The real proxied service, after it was lazy loaded.
+         *
+         * @var \Drupal\Core\ParamConverter\MenuLinkPluginConverter
+         */
+        protected $service;
+
+        /**
+         * The service container.
+         *
+         * @var \Symfony\Component\DependencyInjection\ContainerInterface
+         */
+        protected $container;
+
+        /**
+         * Constructs a ProxyClass Drupal proxy object.
+         *
+         * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
+         *   The container.
+         * @param string $drupal_proxy_original_service_id
+         *   The service ID of the original service.
+         */
+        public function __construct(\Symfony\Component\DependencyInjection\ContainerInterface $container, $drupal_proxy_original_service_id)
+        {
+            $this->container = $container;
+            $this->drupalProxyOriginalServiceId = $drupal_proxy_original_service_id;
+        }
+
+        /**
+         * Lazy loads the real service from the container.
+         *
+         * @return object
+         *   Returns the constructed real service.
+         */
+        protected function lazyLoadItself()
+        {
+            if (!isset($this->service)) {
+                $this->service = $this->container->get($this->drupalProxyOriginalServiceId);
+            }
+
+            return $this->service;
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function convert($value, $definition, $name, array $defaults)
+        {
+            return $this->lazyLoadItself()->convert($value, $definition, $name, $defaults);
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function applies($definition, $name, \Symfony\Component\Routing\Route $route)
+        {
+            return $this->lazyLoadItself()->applies($definition, $name, $route);
+        }
+
+    }
+
+}
diff --git a/core/lib/Drupal/Core/ProxyClass/Plugin/CachedDiscoveryClearer.php b/core/lib/Drupal/Core/ProxyClass/Plugin/CachedDiscoveryClearer.php
new file mode 100644
index 000000000..6f3fba103
--- /dev/null
+++ b/core/lib/Drupal/Core/ProxyClass/Plugin/CachedDiscoveryClearer.php
@@ -0,0 +1,92 @@
+<?php
+
+/**
+ * @file
+ * Contains Drupal\Core\ProxyClass\Plugin\CachedDiscoveryClearer.
+ */
+
+/**
+ * This file was generated via php core/scripts/generate-proxy-class.php 'Drupal\Core\Plugin\CachedDiscoveryClearer' "core/lib/Drupal/Core".
+ */
+
+namespace Drupal\Core\ProxyClass\Plugin {
+
+    /**
+     * Provides a proxy class for \Drupal\Core\Plugin\CachedDiscoveryClearer.
+     *
+     * @see \Drupal\Component\ProxyBuilder
+     */
+    class CachedDiscoveryClearer implements \Drupal\Core\Plugin\CachedDiscoveryClearerInterface
+    {
+
+        use \Drupal\Core\DependencyInjection\DependencySerializationTrait;
+
+        /**
+         * The id of the original proxied service.
+         *
+         * @var string
+         */
+        protected $drupalProxyOriginalServiceId;
+
+        /**
+         * The real proxied service, after it was lazy loaded.
+         *
+         * @var \Drupal\Core\Plugin\CachedDiscoveryClearer
+         */
+        protected $service;
+
+        /**
+         * The service container.
+         *
+         * @var \Symfony\Component\DependencyInjection\ContainerInterface
+         */
+        protected $container;
+
+        /**
+         * Constructs a ProxyClass Drupal proxy object.
+         *
+         * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
+         *   The container.
+         * @param string $drupal_proxy_original_service_id
+         *   The service ID of the original service.
+         */
+        public function __construct(\Symfony\Component\DependencyInjection\ContainerInterface $container, $drupal_proxy_original_service_id)
+        {
+            $this->container = $container;
+            $this->drupalProxyOriginalServiceId = $drupal_proxy_original_service_id;
+        }
+
+        /**
+         * Lazy loads the real service from the container.
+         *
+         * @return object
+         *   Returns the constructed real service.
+         */
+        protected function lazyLoadItself()
+        {
+            if (!isset($this->service)) {
+                $this->service = $this->container->get($this->drupalProxyOriginalServiceId);
+            }
+
+            return $this->service;
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function addCachedDiscovery(\Drupal\Component\Plugin\Discovery\CachedDiscoveryInterface $cached_discovery)
+        {
+            return $this->lazyLoadItself()->addCachedDiscovery($cached_discovery);
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function clearCachedDefinitions()
+        {
+            return $this->lazyLoadItself()->clearCachedDefinitions();
+        }
+
+    }
+
+}
diff --git a/core/lib/Drupal/Core/ProxyClass/Render/BareHtmlPageRenderer.php b/core/lib/Drupal/Core/ProxyClass/Render/BareHtmlPageRenderer.php
new file mode 100644
index 000000000..1e554aaf3
--- /dev/null
+++ b/core/lib/Drupal/Core/ProxyClass/Render/BareHtmlPageRenderer.php
@@ -0,0 +1,85 @@
+<?php
+
+/**
+ * @file
+ * Contains Drupal\Core\ProxyClass\Render\BareHtmlPageRenderer.
+ */
+
+/**
+ * This file was generated via php core/scripts/generate-proxy-class.php 'Drupal\Core\Render\BareHtmlPageRenderer' "core/lib/Drupal/Core".
+ */
+
+namespace Drupal\Core\ProxyClass\Render {
+
+    /**
+     * Provides a proxy class for \Drupal\Core\Render\BareHtmlPageRenderer.
+     *
+     * @see \Drupal\Component\ProxyBuilder
+     */
+    class BareHtmlPageRenderer implements \Drupal\Core\Render\BareHtmlPageRendererInterface
+    {
+
+        use \Drupal\Core\DependencyInjection\DependencySerializationTrait;
+
+        /**
+         * The id of the original proxied service.
+         *
+         * @var string
+         */
+        protected $drupalProxyOriginalServiceId;
+
+        /**
+         * The real proxied service, after it was lazy loaded.
+         *
+         * @var \Drupal\Core\Render\BareHtmlPageRenderer
+         */
+        protected $service;
+
+        /**
+         * The service container.
+         *
+         * @var \Symfony\Component\DependencyInjection\ContainerInterface
+         */
+        protected $container;
+
+        /**
+         * Constructs a ProxyClass Drupal proxy object.
+         *
+         * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
+         *   The container.
+         * @param string $drupal_proxy_original_service_id
+         *   The service ID of the original service.
+         */
+        public function __construct(\Symfony\Component\DependencyInjection\ContainerInterface $container, $drupal_proxy_original_service_id)
+        {
+            $this->container = $container;
+            $this->drupalProxyOriginalServiceId = $drupal_proxy_original_service_id;
+        }
+
+        /**
+         * Lazy loads the real service from the container.
+         *
+         * @return object
+         *   Returns the constructed real service.
+         */
+        protected function lazyLoadItself()
+        {
+            if (!isset($this->service)) {
+                $this->service = $this->container->get($this->drupalProxyOriginalServiceId);
+            }
+
+            return $this->service;
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function renderBarePage(array $content, $title, $page_theme_property, array $page_additions = array (
+        ))
+        {
+            return $this->lazyLoadItself()->renderBarePage($content, $title, $page_theme_property, $page_additions);
+        }
+
+    }
+
+}
diff --git a/core/lib/Drupal/Core/ProxyClass/Routing/MatcherDumper.php b/core/lib/Drupal/Core/ProxyClass/Routing/MatcherDumper.php
new file mode 100644
index 000000000..501b0b7fb
--- /dev/null
+++ b/core/lib/Drupal/Core/ProxyClass/Routing/MatcherDumper.php
@@ -0,0 +1,101 @@
+<?php
+
+/**
+ * @file
+ * Contains Drupal\Core\ProxyClass\Routing\MatcherDumper.
+ */
+
+/**
+ * This file was generated via php core/scripts/generate-proxy-class.php 'Drupal\Core\Routing\MatcherDumper' "core/lib/Drupal/Core".
+ */
+
+namespace Drupal\Core\ProxyClass\Routing {
+
+    /**
+     * Provides a proxy class for \Drupal\Core\Routing\MatcherDumper.
+     *
+     * @see \Drupal\Component\ProxyBuilder
+     */
+    class MatcherDumper implements \Drupal\Core\Routing\MatcherDumperInterface
+    {
+
+        use \Drupal\Core\DependencyInjection\DependencySerializationTrait;
+
+        /**
+         * The id of the original proxied service.
+         *
+         * @var string
+         */
+        protected $drupalProxyOriginalServiceId;
+
+        /**
+         * The real proxied service, after it was lazy loaded.
+         *
+         * @var \Drupal\Core\Routing\MatcherDumper
+         */
+        protected $service;
+
+        /**
+         * The service container.
+         *
+         * @var \Symfony\Component\DependencyInjection\ContainerInterface
+         */
+        protected $container;
+
+        /**
+         * Constructs a ProxyClass Drupal proxy object.
+         *
+         * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
+         *   The container.
+         * @param string $drupal_proxy_original_service_id
+         *   The service ID of the original service.
+         */
+        public function __construct(\Symfony\Component\DependencyInjection\ContainerInterface $container, $drupal_proxy_original_service_id)
+        {
+            $this->container = $container;
+            $this->drupalProxyOriginalServiceId = $drupal_proxy_original_service_id;
+        }
+
+        /**
+         * Lazy loads the real service from the container.
+         *
+         * @return object
+         *   Returns the constructed real service.
+         */
+        protected function lazyLoadItself()
+        {
+            if (!isset($this->service)) {
+                $this->service = $this->container->get($this->drupalProxyOriginalServiceId);
+            }
+
+            return $this->service;
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function addRoutes(\Symfony\Component\Routing\RouteCollection $routes)
+        {
+            return $this->lazyLoadItself()->addRoutes($routes);
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function dump(array $options = array (
+        ))
+        {
+            return $this->lazyLoadItself()->dump($options);
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function getRoutes()
+        {
+            return $this->lazyLoadItself()->getRoutes();
+        }
+
+    }
+
+}
diff --git a/core/lib/Drupal/Core/ProxyClass/Routing/RouteBuilder.php b/core/lib/Drupal/Core/ProxyClass/Routing/RouteBuilder.php
new file mode 100644
index 000000000..987db1f82
--- /dev/null
+++ b/core/lib/Drupal/Core/ProxyClass/Routing/RouteBuilder.php
@@ -0,0 +1,108 @@
+<?php
+
+/**
+ * @file
+ * Contains Drupal\Core\ProxyClass\Routing\RouteBuilder.
+ */
+
+/**
+ * This file was generated via php core/scripts/generate-proxy-class.php 'Drupal\Core\Routing\RouteBuilder' "core/lib/Drupal/Core".
+ */
+
+namespace Drupal\Core\ProxyClass\Routing {
+
+    /**
+     * Provides a proxy class for \Drupal\Core\Routing\RouteBuilder.
+     *
+     * @see \Drupal\Component\ProxyBuilder
+     */
+    class RouteBuilder implements \Drupal\Core\Routing\RouteBuilderInterface, \Drupal\Core\DestructableInterface
+    {
+
+        use \Drupal\Core\DependencyInjection\DependencySerializationTrait;
+
+        /**
+         * The id of the original proxied service.
+         *
+         * @var string
+         */
+        protected $drupalProxyOriginalServiceId;
+
+        /**
+         * The real proxied service, after it was lazy loaded.
+         *
+         * @var \Drupal\Core\Routing\RouteBuilder
+         */
+        protected $service;
+
+        /**
+         * The service container.
+         *
+         * @var \Symfony\Component\DependencyInjection\ContainerInterface
+         */
+        protected $container;
+
+        /**
+         * Constructs a ProxyClass Drupal proxy object.
+         *
+         * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
+         *   The container.
+         * @param string $drupal_proxy_original_service_id
+         *   The service ID of the original service.
+         */
+        public function __construct(\Symfony\Component\DependencyInjection\ContainerInterface $container, $drupal_proxy_original_service_id)
+        {
+            $this->container = $container;
+            $this->drupalProxyOriginalServiceId = $drupal_proxy_original_service_id;
+        }
+
+        /**
+         * Lazy loads the real service from the container.
+         *
+         * @return object
+         *   Returns the constructed real service.
+         */
+        protected function lazyLoadItself()
+        {
+            if (!isset($this->service)) {
+                $this->service = $this->container->get($this->drupalProxyOriginalServiceId);
+            }
+
+            return $this->service;
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function setRebuildNeeded()
+        {
+            return $this->lazyLoadItself()->setRebuildNeeded();
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function rebuild()
+        {
+            return $this->lazyLoadItself()->rebuild();
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function rebuildIfNeeded()
+        {
+            return $this->lazyLoadItself()->rebuildIfNeeded();
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function destruct()
+        {
+            return $this->lazyLoadItself()->destruct();
+        }
+
+    }
+
+}
diff --git a/core/lib/Drupal/Core/Queue/QueueInterface.php b/core/lib/Drupal/Core/Queue/QueueInterface.php
index e798376cf..a58aa6b11 100644
--- a/core/lib/Drupal/Core/Queue/QueueInterface.php
+++ b/core/lib/Drupal/Core/Queue/QueueInterface.php
@@ -89,7 +89,7 @@ interface QueueInterface {
    * @param $item
    *   The item returned by \Drupal\Core\Queue\QueueInterface::claimItem().
    *
-   * @return boolean
+   * @return bool
    *   TRUE if the item has been released, FALSE otherwise.
    */
   public function releaseItem($item);
diff --git a/core/lib/Drupal/Core/Render/BubbleableMetadata.php b/core/lib/Drupal/Core/Render/BubbleableMetadata.php
index dd53b73a9..a8a71d788 100644
--- a/core/lib/Drupal/Core/Render/BubbleableMetadata.php
+++ b/core/lib/Drupal/Core/Render/BubbleableMetadata.php
@@ -73,6 +73,40 @@ class BubbleableMetadata extends CacheableMetadata implements AttachmentsInterfa
     return $meta;
   }
 
+  /**
+   * Creates a bubbleable metadata object from a depended object.
+   *
+   * @param \Drupal\Core\Cache\CacheableDependencyInterface|mixed $object
+   *   The object whose cacheability metadata to retrieve. If it implements
+   *   CacheableDependencyInterface, its cacheability metadata will be used,
+   *   otherwise, the passed in object must be assumed to be uncacheable, so
+   *   max-age 0 is set.
+   *
+   * @return static
+   */
+  public static function createFromObject($object) {
+    $meta = parent::createFromObject($object);
+
+    if ($object instanceof AttachmentsInterface) {
+      $meta->attachments = $object->getAttachments();
+    }
+
+    return $meta;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function addCacheableDependency($other_object) {
+    parent::addCacheableDependency($other_object);
+
+    if ($other_object instanceof AttachmentsInterface) {
+      $this->addAttachments($other_object->getAttachments());
+    }
+
+    return $this;
+  }
+
   /**
    * Merges two attachments arrays (which live under the '#attached' key).
    *
diff --git a/core/lib/Drupal/Core/Render/Element.php b/core/lib/Drupal/Core/Render/Element.php
index 67186f7e3..afc769565 100644
--- a/core/lib/Drupal/Core/Render/Element.php
+++ b/core/lib/Drupal/Core/Render/Element.php
@@ -8,6 +8,7 @@
 namespace Drupal\Core\Render;
 
 use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Core\Access\AccessResultInterface;
 
 /**
  * Provides helper methods for Drupal render elements.
@@ -136,11 +137,6 @@ class Element {
     foreach (static::children($elements) as $key) {
       $child = $elements[$key];
 
-      // Skip un-accessible children.
-      if (isset($child['#access']) && !$child['#access']) {
-        continue;
-      }
-
       // Skip value and hidden elements, since they are not rendered.
       if (!static::isVisibleElement($child)) {
         continue;
@@ -162,7 +158,9 @@ class Element {
    *   TRUE if the element is visible, otherwise FALSE.
    */
   public static function isVisibleElement($element) {
-    return (!isset($element['#type']) || !in_array($element['#type'], ['value', 'hidden', 'token'])) && (!isset($element['#access']) || $element['#access']);
+    return (!isset($element['#type']) || !in_array($element['#type'], ['value', 'hidden', 'token']))
+      && (!isset($element['#access'])
+      || (($element['#access'] instanceof AccessResultInterface && $element['#access']->isAllowed()) || ($element['#access'] === TRUE)));
   }
 
   /**
diff --git a/core/lib/Drupal/Core/Render/Element/Color.php b/core/lib/Drupal/Core/Render/Element/Color.php
index 5f33bb6a4..44507048c 100644
--- a/core/lib/Drupal/Core/Render/Element/Color.php
+++ b/core/lib/Drupal/Core/Render/Element/Color.php
@@ -14,6 +14,18 @@ use Drupal\Component\Utility\Color as ColorUtility;
 /**
  * Provides a form element for choosing a color.
  *
+ * Properties:
+ * - #default_value: Default value, in a format like #ffffff.
+ *
+ * Example usage:
+ * @code
+ * $form['color'] = array(
+ *   '#type' => 'color',
+ *   '#title' => 'Color',
+ *   '#default_value' => '#ffffff',
+ * );
+ * @endcode
+ *
  * @FormElement("color")
  */
 class Color extends FormElement {
diff --git a/core/lib/Drupal/Core/Render/Element/Date.php b/core/lib/Drupal/Core/Render/Element/Date.php
index 8585cb34e..233e1baff 100644
--- a/core/lib/Drupal/Core/Render/Element/Date.php
+++ b/core/lib/Drupal/Core/Render/Element/Date.php
@@ -7,15 +7,23 @@
 
 namespace Drupal\Core\Render\Element;
 
+use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Render\Element;
 
 /**
  * Provides a form element for date selection.
  *
- * The #default_value will be today's date if no value is supplied. The format
- * for the #default_value and the #return_value is an array with three elements
- * with the keys: 'year', month', and 'day'. For example,
- * array('year' => 2007, 'month' => 2, 'day' => 15)
+ * Properties:
+ * - #default_value: An array with the keys: 'year', 'month', and 'day'.
+ *   Defaults to the current date if no value is supplied.
+ *
+ * @code
+ * $form['expiration'] = array(
+ *   '#type' => 'date',
+ *   '#title' => t('Content expiration'),
+ *   '#default_value' => array('year' => 2020, 'month' => 2, 'day' => 15,)
+ * );
+ * @endcode
  *
  * @FormElement("date")
  */
@@ -26,22 +34,47 @@ class Date extends FormElement {
    */
   public function getInfo() {
     $class = get_class($this);
-    return array(
+    return [
       '#input' => TRUE,
       '#theme' => 'input__date',
-      '#pre_render' => array(
-        array($class, 'preRenderDate'),
-      ),
-      '#theme_wrappers' => array('form_element'),
-    );
+      '#process' => [[$class, 'processDate']],
+      '#pre_render' => [[$class, 'preRenderDate']],
+      '#theme_wrappers' => ['form_element'],
+    ];
+  }
+
+  /**
+   * Processes a date form element.
+   *
+   * @param array $element
+   *   The form element to process. Properties used:
+   *   - #attributes: An associative array containing:
+   *     - type: The type of date field rendered.
+   *   - #date_date_format: The date format used in PHP formats.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   The current state of the form.
+   * @param array $complete_form
+   *   The complete form structure.
+   *
+   * @return array
+   *   The processed element.
+   */
+  public static function processDate(&$element, FormStateInterface $form_state, &$complete_form) {
+    // Attach JS support for the date field, if we can determine which date
+    // format should be used.
+    if ($element['#attributes']['type'] == 'date' && !empty($element['#date_date_format'])) {
+      $element['#attached']['library'][] = 'core/drupal.date';
+      $element['#attributes']['data-drupal-date-format'] = [$element['#date_date_format']];
+    }
+    return $element;
   }
 
   /**
    * Adds form-specific attributes to a 'date' #type element.
    *
    * Supports HTML5 types of 'date', 'datetime', 'datetime-local', and 'time'.
-   * Falls back to a plain textfield. Used as a sub-element by the datetime
-   * element type.
+   * Falls back to a plain textfield with JS datepicker support. Used as a
+   * sub-element by the datetime element type.
    *
    * @param array $element
    *   An associative array containing the properties of the element.
diff --git a/core/lib/Drupal/Core/Render/Element/Email.php b/core/lib/Drupal/Core/Render/Element/Email.php
index 1160844d2..b927caace 100644
--- a/core/lib/Drupal/Core/Render/Element/Email.php
+++ b/core/lib/Drupal/Core/Render/Element/Email.php
@@ -13,6 +13,19 @@ use Drupal\Core\Render\Element;
 /**
  * Provides a form input element for entering an email address.
  *
+ * Properties:
+ * - #default_value: An RFC-compliant email address.
+ *
+ * Example usage:
+ * @code
+ * $form['email'] = array(
+ *   '#type' => 'email',
+ *   '#title' => t('Email'),
+ * );
+ * @end
+ *
+ * @see \Drupal\Core\Render\Element\Render\Textfield
+ *
  * @FormElement("email")
  */
 class Email extends FormElement {
diff --git a/core/lib/Drupal/Core/Render/Element/File.php b/core/lib/Drupal/Core/Render/Element/File.php
index c8b3c7fa2..b8d52638e 100644
--- a/core/lib/Drupal/Core/Render/Element/File.php
+++ b/core/lib/Drupal/Core/Render/Element/File.php
@@ -13,6 +13,13 @@ use Drupal\Core\Render\Element;
 /**
  * Provides a form element for uploading a file.
  *
+ * If you add this element to a form the enctype="multipart/form-data" attribute
+ * will automatically be added to the form element.
+ *
+ * Properties:
+ * - #multiple: A Boolean indicating whether multiple files may be uploaded.
+ * - #size: The size of the file input element in characters.
+ *
  * @FormElement("file")
  */
 class File extends FormElement {
diff --git a/core/lib/Drupal/Core/Render/Element/FormElement.php b/core/lib/Drupal/Core/Render/Element/FormElement.php
index 401c85056..173a55cb9 100644
--- a/core/lib/Drupal/Core/Render/Element/FormElement.php
+++ b/core/lib/Drupal/Core/Render/Element/FormElement.php
@@ -8,6 +8,8 @@
 namespace Drupal\Core\Render\Element;
 
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Render\BubbleableMetadata;
+use Drupal\Core\Url;
 
 /**
  * Provides a base class for form element plugins.
@@ -111,18 +113,29 @@ abstract class FormElement extends RenderElement implements FormElementInterface
    *   The form element.
    */
   public static function processAutocomplete(&$element, FormStateInterface $form_state, &$complete_form) {
+    $url = NULL;
     $access = FALSE;
+
     if (!empty($element['#autocomplete_route_name'])) {
       $parameters = isset($element['#autocomplete_route_parameters']) ? $element['#autocomplete_route_parameters'] : array();
-
-      $path = \Drupal::urlGenerator()->generate($element['#autocomplete_route_name'], $parameters);
-      $access = \Drupal::service('access_manager')->checkNamedRoute($element['#autocomplete_route_name'], $parameters, \Drupal::currentUser());
+      $url = Url::fromRoute($element['#autocomplete_route_name'], $parameters)->toString(TRUE);
+      /** @var \Drupal\Core\Access\AccessManagerInterface $access_manager */
+      $access_manager = \Drupal::service('access_manager');
+      $access = $access_manager->checkNamedRoute($element['#autocomplete_route_name'], $parameters, \Drupal::currentUser(), TRUE);
     }
+
     if ($access) {
-      $element['#attributes']['class'][] = 'form-autocomplete';
-      $element['#attached']['library'][] = 'core/drupal.autocomplete';
-      // Provide a data attribute for the JavaScript behavior to bind to.
-      $element['#attributes']['data-autocomplete-path'] = $path;
+      $metadata = BubbleableMetadata::createFromRenderArray($element);
+      if ($access->isAllowed()) {
+        $element['#attributes']['class'][] = 'form-autocomplete';
+        $metadata->addAttachments(['library' => ['core/drupal.autocomplete']]);
+        // Provide a data attribute for the JavaScript behavior to bind to.
+        $element['#attributes']['data-autocomplete-path'] = $url->getGeneratedUrl();
+        $metadata = $metadata->merge($url);
+      }
+      $metadata
+        ->merge(BubbleableMetadata::createFromObject($access))
+        ->applyTo($element);
     }
 
     return $element;
diff --git a/core/lib/Drupal/Core/Render/Element/HtmlTag.php b/core/lib/Drupal/Core/Render/Element/HtmlTag.php
index 5dc3afe75..f0c78bbcc 100644
--- a/core/lib/Drupal/Core/Render/Element/HtmlTag.php
+++ b/core/lib/Drupal/Core/Render/Element/HtmlTag.php
@@ -8,6 +8,7 @@
 namespace Drupal\Core\Render\Element;
 
 use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Component\Utility\Xss;
 use Drupal\Core\Template\Attribute;
 
 /**
@@ -50,7 +51,7 @@ class HtmlTag extends RenderElement {
    * pre-render callback being a #markup element, it is not passed through
    * \Drupal\Component\Utility\Xss::filterAdmin(). This is because it is marked
    * safe here, which causes
-   * \Drupal\Component\Utility\SafeMarkup::checkAdminXss() to regard it as safe
+   * \Drupal\Core\Render\Renderer::xssFilterAdminIfUnsafe() to regard it as safe
    * and bypass the call to \Drupal\Component\Utility\Xss::filterAdmin().
    *
    * @param array $element
@@ -161,7 +162,7 @@ class HtmlTag extends RenderElement {
     }
     else {
       // The IE expression might contain some user input data.
-      $expression = SafeMarkup::checkAdminXss($browsers['IE']);
+      $expression = Xss::filterAdmin($browsers['IE']);
     }
 
     // If the #prefix and #suffix properties are used, wrap them with
@@ -173,8 +174,8 @@ class HtmlTag extends RenderElement {
 
     // Ensure what we are dealing with is safe.
     // This would be done later anyway in drupal_render().
-    $prefix = isset($elements['#prefix']) ? SafeMarkup::checkAdminXss($elements['#prefix']) : '';
-    $suffix = isset($elements['#suffix']) ? SafeMarkup::checkAdminXss($elements['#suffix']) : '';
+    $prefix = isset($elements['#prefix']) ? Xss::filterAdmin($elements['#prefix']) : '';
+    $suffix = isset($elements['#suffix']) ? Xss::filterAdmin($elements['#suffix']) : '';
 
     // Now calling SafeMarkup::set is safe, because we ensured the
     // data coming in was at least admin escaped.
diff --git a/core/lib/Drupal/Core/Render/Element/Link.php b/core/lib/Drupal/Core/Render/Element/Link.php
index 29734583d..bec234100 100644
--- a/core/lib/Drupal/Core/Render/Element/Link.php
+++ b/core/lib/Drupal/Core/Render/Element/Link.php
@@ -10,6 +10,7 @@ namespace Drupal\Core\Render\Element;
 use Drupal\Component\Utility\NestedArray;
 use Drupal\Component\Utility\Html as HtmlUtility;
 use Drupal\Core\Cache\CacheableMetadata;
+use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\Core\Url as CoreUrl;
 
 /**
@@ -83,7 +84,7 @@ class Link extends RenderElement {
       $link_generator = \Drupal::service('link_generator');
       $generated_link = $link_generator->generate($element['#title'], $element['#url']->setOptions($options), TRUE);
       $element['#markup'] = $generated_link->getGeneratedLink();
-      $generated_link->merge(CacheableMetadata::createFromRenderArray($element))
+      $generated_link->merge(BubbleableMetadata::createFromRenderArray($element))
         ->applyTo($element);
     }
     return $element;
diff --git a/core/lib/Drupal/Core/Render/Element/MachineName.php b/core/lib/Drupal/Core/Render/Element/MachineName.php
index e678b7bb9..7256e8de0 100644
--- a/core/lib/Drupal/Core/Render/Element/MachineName.php
+++ b/core/lib/Drupal/Core/Render/Element/MachineName.php
@@ -15,9 +15,58 @@ use Drupal\Core\Language\LanguageInterface;
  * Provides a machine name render element.
  *
  * Provides a form element to enter a machine name, which is validated to ensure
- * that the name is unique and does not contain disallowed characters. All
- * disallowed characters are replaced with a replacement character via
- * JavaScript.
+ * that the name is unique and does not contain disallowed characters.
+ *
+ * The element may be automatically populated via JavaScript when used in
+ * conjunction with a separate "source" form element (typically specifying the
+ * human-readable name). As the user types text into the source element, the
+ * JavaScript converts all values to lower case, replaces any remaining
+ * disallowed characters with a replacement, and populates the associated
+ * machine name form element.
+ *
+ * Properties:
+ * - #machine_name: An associative array containing:
+ *   - exists: A callable to invoke for checking whether a submitted machine
+ *     name value already exists. The submitted value is passed as an argument.
+ *     In most cases, an existing API or menu argument loader function can be
+ *     re-used. The callback is only invoked if the submitted value differs from
+ *     the element's #default_value.
+ *   - source: (optional) The #array_parents of the form element containing the
+ *     human-readable name (i.e., as contained in the $form structure) to use as
+ *     source for the machine name. Defaults to array('label').
+ *   - label: (optional) Text to display as label for the machine name value
+ *     after the human-readable name form element. Defaults to t('Machine name').
+ *   - replace_pattern: (optional) A regular expression (without delimiters)
+ *     matching disallowed characters in the machine name. Defaults to
+ *     '[^a-z0-9_]+'.
+ *   - replace: (optional) A character to replace disallowed characters in the
+ *     machine name via JavaScript. Defaults to '_' (underscore). When using a
+ *     different character, 'replace_pattern' needs to be set accordingly.
+ *   - error: (optional) A custom form error message string to show, if the
+ *     machine name contains disallowed characters.
+ *   - standalone: (optional) Whether the live preview should stay in its own
+ *     form element rather than in the suffix of the source element. Defaults
+ *     to FALSE.
+ * - #maxlength: (optional) Maximum allowed length of the machine name. Defaults
+ *   to 64.
+ * - #disabled: (optional) Should be set to TRUE if an existing machine name
+ *   must not be changed after initial creation.
+ *
+ * Usage example:
+ * @code
+ * $form['id'] = array(
+ *   '#type' => 'machine_name',
+ *   '#default_value' => $this->entity->id(),
+ *   '#disabled' => !$this->entity->isNew(),
+ *   '#maxlength' => 64,
+ *   '#description' => $this->t('A unique name for this item. It must only contain lowercase letters, numbers, and underscores.'),
+ *   '#machine_name' => array(
+ *     'exists' => array($this, 'exists'),
+ *   ),
+ * );
+ * @endcode
+ *
+ * @see \Drupal\Core\Render\Element\Textfield
  *
  * @FormElement("machine_name")
  */
@@ -62,35 +111,7 @@ class MachineName extends Textfield {
    * Processes a machine-readable name form element.
    *
    * @param array $element
-   *   The form element to process. Properties used:
-   *   - #machine_name: An associative array containing:
-   *     - exists: A callable to invoke for checking whether a submitted machine
-   *       name value already exists. The submitted value is passed as an
-   *       argument. In most cases, an existing API or menu argument loader
-   *       function can be re-used. The callback is only invoked if the
-   *       submitted value differs from the element's #default_value.
-   *     - source: (optional) The #array_parents of the form element containing
-   *       the human-readable name (i.e., as contained in the $form structure)
-   *       to use as source for the machine name. Defaults to array('label').
-   *     - label: (optional) Text to display as label for the machine name value
-   *       after the human-readable name form element. Defaults to "Machine
-   *       name".
-   *     - replace_pattern: (optional) A regular expression (without delimiters)
-   *       matching disallowed characters in the machine name. Defaults to
-   *       '[^a-z0-9_]+'.
-   *     - replace: (optional) A character to replace disallowed characters in
-   *       the machine name via JavaScript. Defaults to '_' (underscore). When
-   *       using a different character, 'replace_pattern' needs to be set
-   *       accordingly.
-   *     - error: (optional) A custom form error message string to show, if the
-   *       machine name contains disallowed characters.
-   *     - standalone: (optional) Whether the live preview should stay in its
-   *       own form element rather than in the suffix of the source
-   *       element. Defaults to FALSE.
-   *   - #maxlength: (optional) Maximum allowed length of the machine name.
-   *     Defaults to 64.
-   *   - #disabled: (optional) Should be set to TRUE if an existing machine
-   *     name must not be changed after initial creation.
+   *   The form element to process. See main class documentation for properties.
    * @param \Drupal\Core\Form\FormStateInterface $form_state
    *   The current state of the form.
    * @param array $complete_form
diff --git a/core/lib/Drupal/Core/Render/Element/Number.php b/core/lib/Drupal/Core/Render/Element/Number.php
index 20cbee69e..fbb0805e4 100644
--- a/core/lib/Drupal/Core/Render/Element/Number.php
+++ b/core/lib/Drupal/Core/Render/Element/Number.php
@@ -14,6 +14,25 @@ use Drupal\Component\Utility\Number as NumberUtility;
 /**
  * Provides a form element for numeric input, with special numeric validation.
  *
+ * Properties:
+ * - #default_value: A valid floating point number.
+ * - #min: Minimum value.
+ * - #max: Maximum value.
+ * - #step: Ensures that the number is an even multiple of step, offset by #min
+ *   if specified. A #min of 1 and a #step of 2 would allow values of 1, 3, 5,
+ *   etc.
+ *
+ * Usage example:
+ * @code
+ * $form['quantity'] = array(
+ *   '#type' => 'number',
+ *   '#title' => t('Quantity'),
+ * );
+ * @endcode
+ *
+ * @see \Drupal\Core\Render\Element\Range
+ * @see \Drupal\Core\Render\Element\Textfield
+ *
  * @FormElement("number")
  */
 class Number extends FormElement {
diff --git a/core/lib/Drupal/Core/Render/Element/Pager.php b/core/lib/Drupal/Core/Render/Element/Pager.php
index eeb0f9dd5..8e87ccaa5 100644
--- a/core/lib/Drupal/Core/Render/Element/Pager.php
+++ b/core/lib/Drupal/Core/Render/Element/Pager.php
@@ -34,18 +34,29 @@ class Pager extends RenderElement{
       '#quantity' => 9,
       // An array of labels for the controls in the pager.
       '#tags' => [],
+      // The name of the route to be used to build pager links. By default no
+      // path is provided, which will make links relative to the current URL.
+      // This makes the page more effectively cacheable.
+      '#route_name' => '<none>',
     ];
   }
 
   /**
    * #pre_render callback to associate the appropriate cache context.
    *
+   *
    * @param array $pager
    *   A renderable array of #type => pager.
    *
    * @return array
    */
   public static function preRenderPager(array $pager) {
+    // Note: the default pager theme process function
+    // template_preprocess_pager() also calls pager_query_add_page(), which
+    // maintains the existing query string. Therefore
+    // template_preprocess_pager() adds the 'url.query_args' cache context,
+    // which causes the more specific cache context below to be optimized away.
+    // In other themes, however, that may not be the case.
     $pager['#cache']['contexts'][] = 'url.query_args.pagers:' . $pager['#element'];
     return $pager;
   }
diff --git a/core/lib/Drupal/Core/Render/Element/Password.php b/core/lib/Drupal/Core/Render/Element/Password.php
index 03e7719a3..308d53bed 100644
--- a/core/lib/Drupal/Core/Render/Element/Password.php
+++ b/core/lib/Drupal/Core/Render/Element/Password.php
@@ -12,6 +12,18 @@ use Drupal\Core\Render\Element;
 /**
  * Provides a form element for entering a password, with hidden text.
  *
+ * Usage example:
+ * @code
+ * $form['pass'] = array(
+ *   '#type' => 'password',
+ *   '#title => t('Password'),
+ *   '#size' => 25,
+ * );
+ * @endcode
+ *
+ * @see \Drupal\Core\Render\Element\PasswordConfirm
+ * @see \Drupal\Core\Render\Element\Textfield
+ *
  * @FormElement("password")
  */
 class Password extends FormElement {
diff --git a/core/lib/Drupal/Core/Render/Element/PasswordConfirm.php b/core/lib/Drupal/Core/Render/Element/PasswordConfirm.php
index e7195d0f9..7f3efa34e 100644
--- a/core/lib/Drupal/Core/Render/Element/PasswordConfirm.php
+++ b/core/lib/Drupal/Core/Render/Element/PasswordConfirm.php
@@ -15,6 +15,17 @@ use Drupal\Core\Form\FormStateInterface;
  * Formats as a pair of password fields, which do not validate unless the two
  * entered passwords match.
  *
+ * Usage example:
+ * @code
+ * $form['pass'] = array(
+ *   '#type' => 'password_confirm',
+ *   '#title' => t('Password'),
+ *   '#size' => 25,
+ * );
+ * @endcode
+ *
+ * @see \Drupal\Core\Render\Element\Password
+ *
  * @FormElement("password_confirm")
  */
 class PasswordConfirm extends FormElement {
diff --git a/core/lib/Drupal/Core/Render/Element/Range.php b/core/lib/Drupal/Core/Render/Element/Range.php
index 67026aa3d..912116dcb 100644
--- a/core/lib/Drupal/Core/Render/Element/Range.php
+++ b/core/lib/Drupal/Core/Render/Element/Range.php
@@ -11,7 +11,24 @@ use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Render\Element;
 
 /**
- * Provides a form element for input of a number within a specific range.
+ * Provides a slider for input of a number within a specific range.
+ *
+ * Provides an HTML5 input element with type of "range".
+ *
+ * Properties:
+ * - #min: Minimum value (defaults to 0).
+ * - #max: Maximum value (defaults to 100).
+ * Refer to \Drupal\Core\Render\Element\Number for additional properties.
+ *
+ * Usage example:
+ * @code
+ * $form['quantity'] = array(
+ *   '#type' => 'number',
+ *   '#title' => t('Quantity'),
+ * );
+ * @endcode
+ *
+ * @see \Drupal\Core\Render\Element\Number
  *
  * @FormElement("range")
  */
diff --git a/core/lib/Drupal/Core/Render/Element/RenderElement.php b/core/lib/Drupal/Core/Render/Element/RenderElement.php
index a3b362cbd..54463b67c 100644
--- a/core/lib/Drupal/Core/Render/Element/RenderElement.php
+++ b/core/lib/Drupal/Core/Render/Element/RenderElement.php
@@ -10,6 +10,7 @@ namespace Drupal\Core\Render\Element;
 use Drupal\Core\Form\FormBuilderInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Plugin\PluginBase;
+use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\Core\Render\Element;
 use Drupal\Core\Url;
 
@@ -128,14 +129,7 @@ abstract class RenderElement extends PluginBase implements ElementInterface {
    * @see self::preRenderAjaxForm()
    */
   public static function processAjaxForm(&$element, FormStateInterface $form_state, &$complete_form) {
-    $element = static::preRenderAjaxForm($element);
-
-    // If the element was processed as an #ajax element, and a custom URL was
-    // provided, set the form to be cached.
-    if (!empty($element['#ajax_processed']) && !empty($element['#ajax']['url'])) {
-      $form_state->setCached();
-    }
-    return $element;
+    return static::preRenderAjaxForm($element);
   }
 
   /**
@@ -238,10 +232,6 @@ abstract class RenderElement extends PluginBase implements ElementInterface {
       // content negotiation takes care of formatting the response appropriately.
       // However, 'url' and 'options' may be set when wanting server processing
       // to be substantially different for a JavaScript triggered submission.
-      // One such substantial difference is form elements that use
-      // #ajax['callback'] for determining which part of the form needs
-      // re-rendering. For that, we have a special 'system.ajax' route which
-      // must be manually set.
       $settings += [
         'url' => NULL,
         'options' => ['query' => []],
@@ -264,7 +254,11 @@ abstract class RenderElement extends PluginBase implements ElementInterface {
 
       // Convert \Drupal\Core\Url object to string.
       if (isset($settings['url']) && $settings['url'] instanceof Url) {
-        $settings['url'] = $settings['url']->setOptions($settings['options'])->toString();
+        $url = $settings['url']->setOptions($settings['options'])->toString(TRUE);
+        BubbleableMetadata::createFromRenderArray($element)
+          ->merge($url)
+          ->applyTo($element);
+        $settings['url'] = $url->getGeneratedUrl();
       }
       else {
         $settings['url'] = NULL;
diff --git a/core/lib/Drupal/Core/Render/Element/Search.php b/core/lib/Drupal/Core/Render/Element/Search.php
index be001c149..d1e2f635c 100644
--- a/core/lib/Drupal/Core/Render/Element/Search.php
+++ b/core/lib/Drupal/Core/Render/Element/Search.php
@@ -10,11 +10,17 @@ namespace Drupal\Core\Render\Element;
 use Drupal\Core\Render\Element;
 
 /**
- * Provides a form input element for searching.
+ * Provides an HTML5 input element with type of "search".
  *
- * This is commonly used to provide a filter or search box at the top of a
- * long listing page, to allow users to find specific items in the list for
- * faster input.
+ * Usage example:
+ * @code
+ * $form['search'] = array(
+ *   '#type' => 'search',
+ *   '#title' => t('Search'),
+ * );
+ * @endcode
+ *
+ * @see \Drupal\Core\Render\Element\Textfield
  *
  * @FormElement("search")
  */
diff --git a/core/lib/Drupal/Core/Render/Element/Tel.php b/core/lib/Drupal/Core/Render/Element/Tel.php
index 977a23b99..0543c3c71 100644
--- a/core/lib/Drupal/Core/Render/Element/Tel.php
+++ b/core/lib/Drupal/Core/Render/Element/Tel.php
@@ -12,6 +12,19 @@ use Drupal\Core\Render\Element;
 /**
  * Provides a form element for entering a telephone number.
  *
+ * Provides an HTML5 input element with type of "tel". It provides no special
+ * validation.
+ *
+ * Usage example:
+ * @code
+ * $form['phone'] = array(
+ *   '#type' => 'tel',
+ *   '#title' => t('Phone'),
+ * );
+ * @endcode
+ *
+ * @see \Drupal\Core\Render\Element
+ *
  * @FormElement("tel")
  */
 class Tel extends FormElement {
diff --git a/core/lib/Drupal/Core/Render/Element/Textarea.php b/core/lib/Drupal/Core/Render/Element/Textarea.php
index bb5fad7bc..60fc5ccd9 100644
--- a/core/lib/Drupal/Core/Render/Element/Textarea.php
+++ b/core/lib/Drupal/Core/Render/Element/Textarea.php
@@ -12,6 +12,23 @@ use Drupal\Core\Render\Element;
 /**
  * Provides a form element for input of multiple-line text.
  *
+ * Properties:
+ * - #rows: Number of rows in the text box.
+ * - #cols: Number of columns in the text box.
+ * - #resizable: Controls whether the text area is resizable.  Allowed values
+ *   are "none", "vertical", "horizontal", or "both" (defaults to "vertical").
+ *
+ * Usage example:
+ * @code
+ * $form['text'] = array(
+ *   '#type' => 'textarea',
+ *   '#title' => t('Text'),
+ * );
+ * @endcode
+ *
+ * @see \Drupal\Core\Render\Element\Textfield
+ * @see \Drupal\filter\Element\TextFormat
+ *
  * @FormElement("textarea")
  */
 class Textarea extends FormElement {
diff --git a/core/lib/Drupal/Core/Render/Element/Textfield.php b/core/lib/Drupal/Core/Render/Element/Textfield.php
index f6d9a5d7d..213ca07a8 100644
--- a/core/lib/Drupal/Core/Render/Element/Textfield.php
+++ b/core/lib/Drupal/Core/Render/Element/Textfield.php
@@ -13,6 +13,36 @@ use Drupal\Core\Render\Element;
 /**
  * Provides a one-line text field form element.
  *
+ * Properties:
+ * - #maxlength: Maximum number of characters of input allowed.
+ * - #size: The size of the input element in characters.
+ * - #autocomplete_route_name: A route to be used as callback URL by the
+ *   autocomplete JavaScript library.
+ * - #autocomplete_route_parameters: An array of parameters to be used in
+ *   conjunction with the route name.
+ *
+ * Usage example:
+ * @code
+ * $form['title'] = array(
+ *   '#type' => 'textfield',
+ *   '#title' => t('Subject'),
+ *   '#default_value' => $node->title,
+ *   '#size' => 60,
+ *   '#maxlength' => 128,
+ * '#required' => TRUE,
+ * );
+ * @endcode
+ *
+ * @see \Drupal\Core\Render\Element\Color
+ * @see \Drupal\Core\Render\Element\Email
+ * @see \Drupal\Core\Render\Element\MachineName
+ * @see \Drupal\Core\Render\Element\Number
+ * @see \Drupal\Core\Render\Element\Password
+ * @see \Drupal\Core\Render\Element\PasswordConfirm
+ * @see \Drupal\Core\Render\Element\Range
+ * @see \Drupal\Core\Render\Element\Tel
+ * @see \Drupal\Core\Render\Element\Url
+ *
  * @FormElement("textfield")
  */
 class Textfield extends FormElement {
diff --git a/core/lib/Drupal/Core/Render/Element/Url.php b/core/lib/Drupal/Core/Render/Element/Url.php
index 7f923afcd..4cad2542c 100644
--- a/core/lib/Drupal/Core/Render/Element/Url.php
+++ b/core/lib/Drupal/Core/Render/Element/Url.php
@@ -14,6 +14,21 @@ use Drupal\Core\Render\Element;
 /**
  * Provides a form element for input of a URL.
  *
+ * Properties:
+ * - #default_value: A valid URL string.
+ *
+ * Usage example:
+ * @code
+ * $form['homepage'] = array(
+ *   '#type' => 'url',
+ *   '#title' => t('Home Page'),
+ *   '#size' => 30,
+ *   ...
+ * );
+ * @end_code
+ *
+ * @see \Drupal\Core\Render\Element\Textfield
+ *
  * @FormElement("url")
  */
 class Url extends FormElement {
diff --git a/core/lib/Drupal/Core/Render/HtmlResponse.php b/core/lib/Drupal/Core/Render/HtmlResponse.php
index 7053f83e5..c5339d613 100644
--- a/core/lib/Drupal/Core/Render/HtmlResponse.php
+++ b/core/lib/Drupal/Core/Render/HtmlResponse.php
@@ -36,6 +36,7 @@ class HtmlResponse extends Response implements CacheableResponseInterface, Attac
     // A render array can automatically be converted to a string and set the
     // necessary metadata.
     if (is_array($content) && (isset($content['#markup']))) {
+      $content += ['#attached' => ['html_response_placeholders' => []]];
       $this->addCacheableDependency(CacheableMetadata::createFromRenderArray($content));
       $this->setAttachments($content['#attached']);
       $content = $content['#markup'];
diff --git a/core/lib/Drupal/Core/Render/MainContent/AjaxRenderer.php b/core/lib/Drupal/Core/Render/MainContent/AjaxRenderer.php
index 31192f35f..c54799db6 100644
--- a/core/lib/Drupal/Core/Render/MainContent/AjaxRenderer.php
+++ b/core/lib/Drupal/Core/Render/MainContent/AjaxRenderer.php
@@ -64,7 +64,7 @@ class AjaxRenderer implements MainContentRendererInterface {
       }
     }
 
-    $html = $this->drupalRenderRoot($main_content);
+    $html = (string) $this->drupalRenderRoot($main_content);
     $response->setAttachments($main_content['#attached']);
 
     // The selector for the insert command is NULL as the new content will
@@ -72,7 +72,7 @@ class AjaxRenderer implements MainContentRendererInterface {
     // behavior can be changed with #ajax['method'].
     $response->addCommand(new InsertCommand(NULL, $html));
     $status_messages = array('#type' => 'status_messages');
-    $output = $this->drupalRenderRoot($status_messages);
+    $output = (string) $this->drupalRenderRoot($status_messages);
     if (!empty($output)) {
       $response->addCommand(new PrependCommand(NULL, $output));
     }
diff --git a/core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php b/core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php
index cb987f47d..7e06aabd4 100644
--- a/core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php
+++ b/core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php
@@ -14,6 +14,7 @@ use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Render\HtmlResponse;
 use Drupal\Core\Render\PageDisplayVariantSelectionEvent;
 use Drupal\Core\Render\RenderCacheInterface;
+use Drupal\Core\Render\RenderContext;
 use Drupal\Core\Render\RendererInterface;
 use Drupal\Core\Render\RenderEvents;
 use Drupal\Core\Routing\RouteMatchInterface;
@@ -181,7 +182,15 @@ class HtmlRenderer implements MainContentRendererInterface {
       // ::renderResponse().
       // @todo Remove this once https://www.drupal.org/node/2359901 lands.
       if (!empty($main_content)) {
-        $this->renderer->render($main_content, FALSE);
+        $this->renderer->executeInRenderContext(new RenderContext(), function() use (&$main_content) {
+          if (isset($main_content['#cache']['keys'])) {
+            // Retain #title, otherwise, dynamically generated titles would be
+            // missing for controllers whose entire returned render array is
+            // render cached.
+            $main_content['#cache_properties'][] = '#title';
+          }
+          return $this->renderer->render($main_content, FALSE);
+        });
         $main_content = $this->renderCache->getCacheableRenderArray($main_content) + [
           '#title' => isset($main_content['#title']) ? $main_content['#title'] : NULL
         ];
@@ -192,7 +201,9 @@ class HtmlRenderer implements MainContentRendererInterface {
       if (!$page_display instanceof PageVariantInterface) {
         throw new \LogicException('Cannot render the main content for this page because the provided display variant does not implement PageVariantInterface.');
       }
-      $page_display->setMainContent($main_content);
+      $page_display
+        ->setMainContent($main_content)
+        ->setConfiguration($event->getPluginConfiguration());
 
       // Generate a #type => page render array using the page display variant,
       // the page display will build the content for the various page regions.
diff --git a/core/lib/Drupal/Core/Render/MetadataBubblingUrlGenerator.php b/core/lib/Drupal/Core/Render/MetadataBubblingUrlGenerator.php
new file mode 100644
index 000000000..3a4535ed0
--- /dev/null
+++ b/core/lib/Drupal/Core/Render/MetadataBubblingUrlGenerator.php
@@ -0,0 +1,142 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Render\MetadataBubblingUrlGenerator.
+ */
+
+namespace Drupal\Core\Render;
+
+use Drupal\Core\GeneratedUrl;
+use Drupal\Core\Routing\UrlGeneratorInterface;
+use Symfony\Component\Routing\RequestContext as SymfonyRequestContext;
+
+/**
+ * Decorator for the URL generator, which bubbles bubbleable URL metadata.
+ *
+ * Implements a decorator for the URL generator that allows to automatically
+ * collect and bubble up bubbleable metadata associated with URLs due to
+ * outbound path and route processing. This approach helps keeping the render
+ * and the routing subsystems decoupled.
+ *
+ * @see \Drupal\Core\RouteProcessor\OutboundRouteProcessorInterface
+ * @see \Drupal\Core\PathProcessor\OutboundPathProcessorInterface
+ * @see \Drupal\Core\Render\BubbleableMetadata
+ */
+class MetadataBubblingUrlGenerator implements UrlGeneratorInterface {
+
+  /**
+   * The non-bubbling URL generator.
+   *
+   * @var \Drupal\Core\Routing\UrlGeneratorInterface
+   */
+  protected $urlGenerator;
+
+  /**
+   * The renderer.
+   *
+   * @var \Drupal\Core\Render\RendererInterface
+   */
+  protected $renderer;
+
+  /**
+   * Constructs a new bubbling URL generator service.
+   *
+   * @param \Drupal\Core\Routing\UrlGeneratorInterface $url_generator
+   *   The non-bubbling URL generator.
+   * @param \Drupal\Core\Render\RendererInterface $renderer
+   *   The renderer.
+   */
+  public function __construct(UrlGeneratorInterface $url_generator, RendererInterface $renderer) {
+    $this->urlGenerator = $url_generator;
+    $this->renderer = $renderer;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setContext(SymfonyRequestContext $context) {
+    $this->urlGenerator->setContext($context);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getContext() {
+    return $this->urlGenerator->getContext();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getPathFromRoute($name, $parameters = array()) {
+    return $this->urlGenerator->getPathFromRoute($name, $parameters);
+  }
+
+  /**
+   * Bubbles the bubbleable metadata to the current render context.
+   *
+   * @param \Drupal\Core\GeneratedUrl $generated_url
+   *   The generated URL whose bubbleable metadata to bubble.
+   * @param array $options
+   *   (optional) The URL options. Defaults to none.
+   */
+  protected function bubble(GeneratedUrl $generated_url, array $options = []) {
+    // Bubbling metadata makes sense only if the code is executed inside a
+    // render context. All code running outside controllers has no render
+    // context by default, so URLs used there are not supposed to affect the
+    // response cacheability.
+    if ($this->renderer->hasRenderContext()) {
+      $build = [];
+      $generated_url->applyTo($build);
+      $this->renderer->render($build);
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function generate($name, $parameters = array(), $absolute = FALSE) {
+    $options['absolute'] = $absolute;
+    $generated_url = $this->generateFromRoute($name, $parameters, $options, TRUE);
+    $this->bubble($generated_url);
+    return $generated_url->getGeneratedUrl();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function generateFromRoute($name, $parameters = array(), $options = array(), $collect_bubbleable_metadata = FALSE) {
+    $generated_url = $this->urlGenerator->generateFromRoute($name, $parameters, $options, TRUE);
+    if (!$collect_bubbleable_metadata) {
+      $this->bubble($generated_url, $options);
+    }
+    return $collect_bubbleable_metadata ? $generated_url : $generated_url->getGeneratedUrl();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function generateFromPath($path = NULL, $options = array(), $collect_bubbleable_metadata = FALSE) {
+    $generated_url = $this->urlGenerator->generateFromPath($path, $options, TRUE);
+    if (!$collect_bubbleable_metadata) {
+      $this->bubble($generated_url, $options);
+    }
+    return $collect_bubbleable_metadata ? $generated_url : $generated_url->getGeneratedUrl();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function supports($name) {
+    return $this->urlGenerator->supports($name);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getRouteDebugMessage($name, array $parameters = array()) {
+    return $this->urlGenerator->getRouteDebugMessage($name, $parameters);
+  }
+
+}
diff --git a/core/lib/Drupal/Core/Render/PageDisplayVariantSelectionEvent.php b/core/lib/Drupal/Core/Render/PageDisplayVariantSelectionEvent.php
index 17771bde0..5e2f2257c 100644
--- a/core/lib/Drupal/Core/Render/PageDisplayVariantSelectionEvent.php
+++ b/core/lib/Drupal/Core/Render/PageDisplayVariantSelectionEvent.php
@@ -25,6 +25,13 @@ class PageDisplayVariantSelectionEvent extends Event {
    */
   protected $pluginId;
 
+  /**
+   * The configuration for the selected page display variant.
+   *
+   * @var array
+   */
+  protected $pluginConfiguration = [];
+
   /**
    * The current route match.
    *
@@ -50,9 +57,12 @@ class PageDisplayVariantSelectionEvent extends Event {
    *
    * @param string $plugin_id
    *   The ID of the page display variant plugin to use.
+   *
+   * @return $this
    */
   public function setPluginId($plugin_id) {
     $this->pluginId = $plugin_id;
+    return $this;
   }
 
   /**
@@ -64,6 +74,28 @@ class PageDisplayVariantSelectionEvent extends Event {
     return $this->pluginId;
   }
 
+  /**
+   * Set the configuration for the selected page display variant.
+   *
+   * @param array $configuration
+   *   The configuration for the selected page display variant.
+   *
+   * @return $this
+   */
+  public function setPluginConfiguration(array $configuration) {
+    $this->pluginConfiguration = $configuration;
+    return $this;
+  }
+
+  /**
+   * Get the configuration for the selected page display variant.
+   *
+   * @return array
+   */
+  public function getPluginConfiguration() {
+    return $this->pluginConfiguration;
+  }
+
   /**
    * Gets the current route match.
    *
diff --git a/core/lib/Drupal/Core/Render/Plugin/DisplayVariant/SimplePageVariant.php b/core/lib/Drupal/Core/Render/Plugin/DisplayVariant/SimplePageVariant.php
index 66f908605..baef32570 100644
--- a/core/lib/Drupal/Core/Render/Plugin/DisplayVariant/SimplePageVariant.php
+++ b/core/lib/Drupal/Core/Render/Plugin/DisplayVariant/SimplePageVariant.php
@@ -32,6 +32,7 @@ class SimplePageVariant extends VariantBase implements PageVariantInterface {
    */
   public function setMainContent(array $main_content) {
     $this->mainContent = $main_content;
+    return $this;
   }
 
   /**
diff --git a/core/lib/Drupal/Core/Render/RenderCache.php b/core/lib/Drupal/Core/Render/RenderCache.php
index 776bfd49a..880fca36f 100644
--- a/core/lib/Drupal/Core/Render/RenderCache.php
+++ b/core/lib/Drupal/Core/Render/RenderCache.php
@@ -7,7 +7,9 @@
 
 namespace Drupal\Core\Render;
 
+use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Cache\Cache;
+use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Cache\Context\CacheContextsManager;
 use Drupal\Core\Cache\CacheFactoryInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
@@ -96,7 +98,6 @@ class RenderCache implements RenderCacheInterface {
     $data = $this->getCacheableRenderArray($elements);
 
     $bin = isset($elements['#cache']['bin']) ? $elements['#cache']['bin'] : 'render';
-    $expire = ($elements['#cache']['max-age'] === Cache::PERMANENT) ? Cache::PERMANENT : (int) $this->requestStack->getMasterRequest()->server->get('REQUEST_TIME') + $elements['#cache']['max-age'];
     $cache = $this->cacheFactory->get($bin);
 
     // Calculate the pre-bubbling CID.
@@ -207,26 +208,28 @@ class RenderCache implements RenderCacheInterface {
       // across requests. That's the strategy employed below and tested in
       // \Drupal\Tests\Core\Render\RendererBubblingTest::testConditionalCacheContextBubblingSelfHealing().
 
-      // The set of cache contexts for this element, including the bubbled ones,
-      // for which we are handling a cache miss.
-      $cache_contexts = $data['#cache']['contexts'];
-
-      // Get the contexts by which this element should be varied according to
-      // the current redirecting cache item, if any.
-      $stored_cache_contexts = [];
-      $stored_cache_tags = [];
+      // Get the cacheability of this element according to the current (stored)
+      // redirecting cache item, if any.
+      $redirect_cacheability = new CacheableMetadata();
       if ($stored_cache_redirect = $cache->get($pre_bubbling_cid)) {
-        $stored_cache_contexts = $stored_cache_redirect->data['#cache']['contexts'];
-        $stored_cache_tags = $stored_cache_redirect->data['#cache']['tags'];
+        $redirect_cacheability = CacheableMetadata::createFromRenderArray($stored_cache_redirect->data);
       }
 
-      // Calculate the union of the cache contexts for this request and the
-      // stored cache contexts.
-      $merged_cache_contexts = Cache::mergeContexts($stored_cache_contexts, $cache_contexts);
+      // Calculate the union of the cacheability for this request and the
+      // current (stored) redirecting cache item. We need:
+      // - the union of cache contexts, because that is how we know which cache
+      //   item to redirect to;
+      // - the union of cache tags, because that is how we know when the cache
+      //   redirect cache item itself is invalidated;
+      // - the union of max ages, because that is how we know when the cache
+      //   redirect cache item itself becomes stale. (Without this, we might end
+      //   up toggling between a permanently and a briefly cacheable cache
+      //   redirect, because the last update's max-age would always "win".)
+      $redirect_cacheability_updated = CacheableMetadata::createFromRenderArray($data)->merge($redirect_cacheability);
 
       // Stored cache contexts incomplete: this request causes cache contexts to
       // be added to the redirecting cache item.
-      if (array_diff($merged_cache_contexts, $stored_cache_contexts)) {
+      if (array_diff($redirect_cacheability_updated->getCacheContexts(), $redirect_cacheability->getCacheContexts())) {
         $redirect_data = [
           '#cache_redirect' => TRUE,
           '#cache' => [
@@ -234,14 +237,16 @@ class RenderCache implements RenderCacheInterface {
             // across requests.
             'keys' => $elements['#cache']['keys'],
             // The union of the current element's and stored cache contexts.
-            'contexts' => $merged_cache_contexts,
+            'contexts' => $redirect_cacheability_updated->getCacheContexts(),
             // The union of the current element's and stored cache tags.
-            'tags' => Cache::mergeTags($stored_cache_tags, $data['#cache']['tags']),
+            'tags' => $redirect_cacheability_updated->getCacheTags(),
+            // The union of the current element's and stored cache max-ages.
+            'max-age' => $redirect_cacheability_updated->getCacheMaxAge(),
             // The same cache bin as the one for the actual render cache items.
             'bin' => $bin,
           ],
         ];
-        $cache->set($pre_bubbling_cid, $redirect_data, $expire, Cache::mergeTags($redirect_data['#cache']['tags'], ['rendered']));
+        $cache->set($pre_bubbling_cid, $redirect_data, $this->maxAgeToExpire($redirect_cacheability_updated->getCacheMaxAge()), Cache::mergeTags($redirect_data['#cache']['tags'], ['rendered']));
       }
 
       // Current cache contexts incomplete: this request only uses a subset of
@@ -249,20 +254,35 @@ class RenderCache implements RenderCacheInterface {
       // additional (conditional) cache contexts as well, otherwise the
       // redirecting cache item would be pointing to a cache item that can never
       // exist.
-      if (array_diff($merged_cache_contexts, $cache_contexts)) {
+      if (array_diff($redirect_cacheability_updated->getCacheContexts(), $data['#cache']['contexts'])) {
         // Recalculate the cache ID.
         $recalculated_cid_pseudo_element = [
           '#cache' => [
             'keys' => $elements['#cache']['keys'],
-            'contexts' => $merged_cache_contexts,
+            'contexts' => $redirect_cacheability_updated->getCacheContexts(),
           ]
         ];
         $cid = $this->createCacheID($recalculated_cid_pseudo_element);
         // Ensure the about-to-be-cached data uses the merged cache contexts.
-        $data['#cache']['contexts'] = $merged_cache_contexts;
+        $data['#cache']['contexts'] = $redirect_cacheability_updated->getCacheContexts();
       }
     }
-    $cache->set($cid, $data, $expire, Cache::mergeTags($data['#cache']['tags'], ['rendered']));
+    $cache->set($cid, $data, $this->maxAgeToExpire($elements['#cache']['max-age']), Cache::mergeTags($data['#cache']['tags'], ['rendered']));
+  }
+
+  /**
+   * Maps a #cache[max-age] value to an "expire" value for the Cache API.
+   *
+   * @param int $max_age
+   *   A #cache[max-age] value.
+   *
+   * @return int
+   *   A corresponding "expire" value.
+   *
+   * @see \Drupal\Core\Cache\CacheBackendInterface::set()
+   */
+  protected function maxAgeToExpire($max_age) {
+    return ($max_age === Cache::PERMANENT) ? Cache::PERMANENT : (int) $this->requestStack->getMasterRequest()->server->get('REQUEST_TIME') + $max_age;
   }
 
   /**
@@ -270,13 +290,13 @@ class RenderCache implements RenderCacheInterface {
    *
    * Creates the cache ID string based on #cache['keys'] + #cache['contexts'].
    *
-   * @param array $elements
+   * @param array &$elements
    *   A renderable array.
    *
    * @return string
    *   The cache ID string, or FALSE if the element may not be cached.
    */
-  protected function createCacheID(array $elements) {
+  protected function createCacheID(array &$elements) {
     // If the maximum age is zero, then caching is effectively prohibited.
     if (isset($elements['#cache']['max-age']) && $elements['#cache']['max-age'] === 0) {
       return FALSE;
@@ -285,8 +305,11 @@ class RenderCache implements RenderCacheInterface {
     if (isset($elements['#cache']['keys'])) {
       $cid_parts = $elements['#cache']['keys'];
       if (!empty($elements['#cache']['contexts'])) {
-        $contexts = $this->cacheContextsManager->convertTokensToKeys($elements['#cache']['contexts']);
-        $cid_parts = array_merge($cid_parts, $contexts);
+        $context_cache_keys = $this->cacheContextsManager->convertTokensToKeys($elements['#cache']['contexts']);
+        $cid_parts = array_merge($cid_parts, $context_cache_keys->getKeys());
+        CacheableMetadata::createFromRenderArray($elements)
+          ->merge($context_cache_keys)
+          ->applyTo($elements);
       }
       return implode(':', $cid_parts);
     }
@@ -313,6 +336,13 @@ class RenderCache implements RenderCacheInterface {
     // the cache entry size.
     if (!empty($elements['#cache_properties']) && is_array($elements['#cache_properties'])) {
       $data['#cache_properties'] = $elements['#cache_properties'];
+      // Ensure that any safe strings are a SafeString object.
+      foreach (Element::properties(array_flip($elements['#cache_properties'])) as $cache_property) {
+        if (isset($elements[$cache_property]) && is_scalar($elements[$cache_property]) && SafeMarkup::isSafe($elements[$cache_property])) {
+          $elements[$cache_property] = SafeString::create($elements[$cache_property]);
+        }
+      }
+
       // Extract all the cacheable items from the element using cache
       // properties.
       $cacheable_items = array_intersect_key($elements, array_flip($elements['#cache_properties']));
@@ -321,12 +351,14 @@ class RenderCache implements RenderCacheInterface {
         $data['#markup'] = '';
         // Cache only cacheable children's markup.
         foreach ($cacheable_children as $key) {
-          $cacheable_items[$key] = ['#markup' => $cacheable_items[$key]['#markup']];
+          // We can assume that #markup is safe at this point.
+          $cacheable_items[$key] = ['#markup' => SafeString::create($cacheable_items[$key]['#markup'])];
         }
       }
       $data += $cacheable_items;
     }
 
+    $data['#markup'] = SafeString::create($data['#markup']);
     return $data;
   }
 
diff --git a/core/lib/Drupal/Core/Render/RenderContext.php b/core/lib/Drupal/Core/Render/RenderContext.php
new file mode 100644
index 000000000..e49c2913d
--- /dev/null
+++ b/core/lib/Drupal/Core/Render/RenderContext.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * @file
+ * Contains \Drupal\Core\Render\RenderContext.
+ */
+
+namespace Drupal\Core\Render;
+
+/**
+ * The render context: a stack containing bubbleable rendering metadata.
+ *
+ * A stack of \Drupal\Core\Render\BubbleableMetadata objects.
+ *
+ * @see \Drupal\Core\Render\RendererInterface
+ * @see \Drupal\Core\Render\Renderer
+ * @see \Drupal\Core\Render\BubbleableMetadata
+ *
+ * @internal
+ */
+class RenderContext extends \SplStack {
+
+  /**
+   * Updates the current frame of the stack.
+   *
+   * @param array &$element
+   *   The element of the render array that has just been rendered. The stack
+   *   frame for this element will be updated with the bubbleable rendering
+   *   metadata of this element.
+   */
+  public function update(&$element) {
+    // The latest frame represents the bubbleable metadata for the subtree.
+    $frame = $this->pop();
+    // Update the frame, but also update the current element, to ensure it
+    // contains up-to-date information in case it gets render cached.
+    $updated_frame = BubbleableMetadata::createFromRenderArray($element)->merge($frame);
+    $updated_frame->applyTo($element);
+    $this->push($updated_frame);
+  }
+
+  /**
+   * Bubbles the stack.
+   *
+   * Whenever another level in the render array has been rendered, the stack
+   * must be bubbled, to merge its rendering metadata with that of the parent
+   * element.
+   */
+  public function bubble() {
+    // If there's only one frame on the stack, then this is the root call, and
+    // we can't bubble up further. ::renderRoot() will reset the stack, but we
+    // must not reset it here to allow users of ::executeInRenderContext() to
+    // access the stack directly.
+    if ($this->count() === 1) {
+      return;
+    }
+
+    // Merge the current and the parent stack frame.
+    $current = $this->pop();
+    $parent = $this->pop();
+    $this->push($current->merge($parent));
+  }
+
+}
diff --git a/core/lib/Drupal/Core/Render/Renderer.php b/core/lib/Drupal/Core/Render/Renderer.php
index d24b7d763..cbd9ca853 100644
--- a/core/lib/Drupal/Core/Render/Renderer.php
+++ b/core/lib/Drupal/Core/Render/Renderer.php
@@ -7,14 +7,16 @@
 
 namespace Drupal\Core\Render;
 
-use Drupal\Component\Utility\NestedArray;
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Utility\UrlHelper;
+use Drupal\Component\Utility\Xss;
+use Drupal\Core\Access\AccessResultInterface;
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Controller\ControllerResolverInterface;
 use Drupal\Core\Template\Attribute;
 use Drupal\Core\Theme\ThemeManagerInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
  * Turns a render array into a HTML string.
@@ -57,11 +59,35 @@ class Renderer implements RendererInterface {
   protected $rendererConfig;
 
   /**
-   * The stack containing bubbleable rendering metadata.
+   * Whether we're currently in a ::renderRoot() call.
    *
-   * @var \SplStack|null
+   * @var bool
    */
-  protected static $stack;
+  protected $isRenderingRoot = FALSE;
+
+  /**
+   * The request stack.
+   *
+   * @var \Symfony\Component\HttpFoundation\RequestStack
+   */
+  protected $requestStack;
+
+  /**
+   * The render context collection.
+   *
+   * An individual global render context is tied to the current request. We then
+   * need to maintain a different context for each request to correctly handle
+   * rendering in subrequests.
+   *
+   * This must be static as long as some controllers rebuild the container
+   * during a request. This causes multiple renderer instances to co-exist
+   * simultaneously, render state getting lost, and therefore causing pages to
+   * fail to render correctly. As soon as it is guaranteed that during a request
+   * the same container is used, it no longer needs to be static.
+   *
+   * @var \Drupal\Core\Render\RenderContext[]
+   */
+  protected static $contextCollection;
 
   /**
    * Constructs a new Renderer.
@@ -74,33 +100,52 @@ class Renderer implements RendererInterface {
    *   The element info.
    * @param \Drupal\Core\Render\RenderCacheInterface $render_cache
    *   The render cache service.
+   * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack
+   *   The request stack.
    * @param array $renderer_config
    *   The renderer configuration array.
    */
-  public function __construct(ControllerResolverInterface $controller_resolver, ThemeManagerInterface $theme, ElementInfoManagerInterface $element_info, RenderCacheInterface $render_cache, array $renderer_config) {
+  public function __construct(ControllerResolverInterface $controller_resolver, ThemeManagerInterface $theme, ElementInfoManagerInterface $element_info, RenderCacheInterface $render_cache, RequestStack $request_stack, array $renderer_config) {
     $this->controllerResolver = $controller_resolver;
     $this->theme = $theme;
     $this->elementInfo = $element_info;
     $this->renderCache = $render_cache;
     $this->rendererConfig = $renderer_config;
+    $this->requestStack = $request_stack;
+
+    // Initialize the context collection if needed.
+    if (!isset(static::$contextCollection)) {
+      static::$contextCollection = new \SplObjectStorage();
+    }
   }
 
   /**
    * {@inheritdoc}
    */
   public function renderRoot(&$elements) {
-    return $this->render($elements, TRUE);
+    // Disallow calling ::renderRoot() from within another ::renderRoot() call.
+    if ($this->isRenderingRoot) {
+      $this->isRenderingRoot = FALSE;
+      throw new \LogicException('A stray renderRoot() invocation is causing bubbling of attached assets to break.');
+    }
+
+    // Render in its own render context.
+    $this->isRenderingRoot = TRUE;
+    $output = $this->executeInRenderContext(new RenderContext(), function () use (&$elements) {
+      return $this->render($elements, TRUE);
+    });
+    $this->isRenderingRoot = FALSE;
+
+    return $output;
   }
 
   /**
    * {@inheritdoc}
    */
   public function renderPlain(&$elements) {
-    $current_stack = static::$stack;
-    $this->resetStack();
-    $output = $this->renderRoot($elements);
-    static::$stack = $current_stack;
-    return $output;
+    return $this->executeInRenderContext(new RenderContext(), function () use (&$elements) {
+      return $this->render($elements, TRUE);
+    });
   }
 
   /**
@@ -150,16 +195,17 @@ class Renderer implements RendererInterface {
     // possible that any of them throw an exception that will cause a different
     // page to be rendered (e.g. throwing
     // \Symfony\Component\HttpKernel\Exception\NotFoundHttpException will cause
-    // the 404 page to be rendered). That page might also use Renderer::render()
-    // but if exceptions aren't caught here, the stack will be left in an
-    // inconsistent state.
-    // Hence, catch all exceptions and reset the stack and re-throw them.
+    // the 404 page to be rendered). That page might also use
+    // Renderer::renderRoot() but if exceptions aren't caught here, it will be
+    // impossible to call Renderer::renderRoot() again.
+    // Hence, catch all exceptions, reset the isRenderingRoot property and
+    // re-throw exceptions.
     try {
       return $this->doRender($elements, $is_root_call);
     }
     catch (\Exception $e) {
-      // Reset stack and re-throw exception.
-      $this->resetStack();
+      // Mark the ::rootRender() call finished due to this exception & re-throw.
+      $this->isRenderingRoot = FALSE;
       throw $e;
     }
   }
@@ -168,6 +214,10 @@ class Renderer implements RendererInterface {
    * See the docs for ::render().
    */
   protected function doRender(&$elements, $is_root_call = FALSE) {
+    if (empty($elements)) {
+      return '';
+    }
+
     if (!isset($elements['#access']) && isset($elements['#access_callback'])) {
       if (is_string($elements['#access_callback']) && strpos($elements['#access_callback'], '::') === FALSE) {
         $elements['#access_callback'] = $this->controllerResolver->getControllerFromDefinition($elements['#access_callback']);
@@ -176,8 +226,18 @@ class Renderer implements RendererInterface {
     }
 
     // Early-return nothing if user does not have access.
-    if (empty($elements) || (isset($elements['#access']) && !$elements['#access'])) {
-      return '';
+    if (isset($elements['#access'])) {
+      // If #access is an AccessResultInterface object, we must apply it's
+      // cacheability metadata to the render array.
+      if ($elements['#access'] instanceof AccessResultInterface) {
+        $this->addCacheableDependency($elements, $elements['#access']);
+        if (!$elements['#access']->isAllowed()) {
+          return '';
+        }
+      }
+      elseif ($elements['#access'] === FALSE) {
+        return '';
+      }
     }
 
     // Do not print elements twice.
@@ -185,10 +245,11 @@ class Renderer implements RendererInterface {
       return '';
     }
 
-    if (!isset(static::$stack)) {
-      static::$stack = new \SplStack();
+    $context = $this->getCurrentRenderContext();
+    if (!isset($context)) {
+      throw new \LogicException("Render context is empty, because render() was called outside of a renderRoot() or renderPlain() call. Use renderPlain()/renderRoot() or #lazy_builder/#pre_render instead.");
     }
-    static::$stack->push(new BubbleableMetadata());
+    $context->push(new BubbleableMetadata());
 
     // Set the bubbleable rendering metadata that has configurable defaults, if:
     // - this is the root call, to ensure that the final render array definitely
@@ -217,22 +278,16 @@ class Renderer implements RendererInterface {
         if ($is_root_call) {
           $this->replacePlaceholders($elements);
         }
-        // Mark the element markup as safe. If we have cached children, we need
-        // to mark them as safe too. The parent markup contains the child
-        // markup, so if the parent markup is safe, then the markup of the
-        // individual children must be safe as well.
-        $elements['#markup'] = SafeMarkup::set($elements['#markup']);
-        if (!empty($elements['#cache_properties'])) {
-          foreach (Element::children($cached_element) as $key) {
-            SafeMarkup::set($cached_element[$key]['#markup']);
-          }
+        // Mark the element markup as safe if is it a string.
+        if (is_string($elements['#markup'])) {
+          $elements['#markup'] = SafeString::create($elements['#markup']);
         }
         // The render cache item contains all the bubbleable rendering metadata
         // for the subtree.
-        $this->updateStack($elements);
+        $context->update($elements);
         // Render cache hit, so rendering is finished, all necessary info
         // collected!
-        $this->bubbleStack();
+        $context->bubble();
         return $elements['#markup'];
       }
     }
@@ -330,9 +385,9 @@ class Renderer implements RendererInterface {
     if (!empty($elements['#printed'])) {
       // The #printed element contains all the bubbleable rendering metadata for
       // the subtree.
-      $this->updateStack($elements);
+      $context->update($elements);
       // #printed, so rendering is finished, all necessary info collected!
-      $this->bubbleStack();
+      $context->bubble();
       return '';
     }
 
@@ -350,10 +405,10 @@ class Renderer implements RendererInterface {
       $elements['#children'] = '';
     }
 
-    if (isset($elements['#markup'])) {
+    if (!empty($elements['#markup'])) {
       // @todo Decide how to support non-HTML in the render API in
       //   https://www.drupal.org/node/2501313.
-      $elements['#markup'] = SafeMarkup::checkAdminXss($elements['#markup']);
+      $elements['#markup'] = $this->xssFilterAdminIfUnsafe($elements['#markup']);
     }
 
     // Assume that if #theme is set it represents an implemented hook.
@@ -367,7 +422,7 @@ class Renderer implements RendererInterface {
       );
       foreach ($markup_keys as $key) {
         if (!empty($elements[$key]) && is_scalar($elements[$key])) {
-          $elements[$key] = SafeMarkup::checkAdminXss($elements[$key]);
+          $elements[$key] = $this->xssFilterAdminIfUnsafe($elements[$key]);
         }
       }
     }
@@ -392,7 +447,7 @@ class Renderer implements RendererInterface {
       foreach ($children as $key) {
         $elements['#children'] .= $this->doRender($elements[$key]);
       }
-      $elements['#children'] = SafeMarkup::set($elements['#children']);
+      $elements['#children'] = SafeString::create($elements['#children']);
     }
 
     // If #theme is not implemented and the element has raw #markup as a
@@ -403,7 +458,7 @@ class Renderer implements RendererInterface {
     // required. Eventually #theme_wrappers will expect both #markup and
     // #children to be a single string as #children.
     if (!$theme_is_implemented && isset($elements['#markup'])) {
-      $elements['#children'] = SafeMarkup::set($elements['#markup'] . $elements['#children']);
+      $elements['#children'] = SafeString::create($elements['#markup'] . $elements['#children']);
     }
 
     // Let the theme functions in #theme_wrappers add markup around the rendered
@@ -453,13 +508,13 @@ class Renderer implements RendererInterface {
     // with how render cached output gets stored. This ensures that placeholder
     // replacement logic gets the same data to work with, no matter if #cache is
     // disabled, #cache is enabled, there is a cache hit or miss.
-    $prefix = isset($elements['#prefix']) ? SafeMarkup::checkAdminXss($elements['#prefix']) : '';
-    $suffix = isset($elements['#suffix']) ? SafeMarkup::checkAdminXss($elements['#suffix']) : '';
+    $prefix = isset($elements['#prefix']) ? $this->xssFilterAdminIfUnsafe($elements['#prefix']) : '';
+    $suffix = isset($elements['#suffix']) ? $this->xssFilterAdminIfUnsafe($elements['#suffix']) : '';
 
     $elements['#markup'] = $prefix . $elements['#children'] . $suffix;
 
-    // We've rendered this element (and its subtree!), now update the stack.
-    $this->updateStack($elements);
+    // We've rendered this element (and its subtree!), now update the context.
+    $context->update($elements);
 
     // Cache the processed element if both $pre_bubbling_elements and $elements
     // have the metadata necessary to generate a cache ID.
@@ -481,66 +536,71 @@ class Renderer implements RendererInterface {
     // that is handled earlier in Renderer::render().
     if ($is_root_call) {
       $this->replacePlaceholders($elements);
-      if (static::$stack->count() !== 1) {
+      // @todo remove as part of https://www.drupal.org/node/2511330.
+      if ($context->count() !== 1) {
         throw new \LogicException('A stray drupal_render() invocation with $is_root_call = TRUE is causing bubbling of attached assets to break.');
       }
     }
 
     // Rendering is finished, all necessary info collected!
-    $this->bubbleStack();
+    $context->bubble();
 
     $elements['#printed'] = TRUE;
-    $elements['#markup'] = SafeMarkup::set($elements['#markup']);
-    return $elements['#markup'];
+    return SafeString::create($elements['#markup']);
   }
 
   /**
-   * Resets the renderer service's internal stack (used for bubbling metadata).
-   *
-   * Only necessary in very rare/advanced situations, such as when rendering an
-   * error page if an exception occurred *during* rendering.
+   * {@inheritdoc}
    */
-  protected function resetStack() {
-    static::$stack = NULL;
+  public function hasRenderContext() {
+    return (bool) $this->getCurrentRenderContext();
   }
 
   /**
-   * Updates the stack.
-   *
-   * @param array &$element
-   *   The element of the render array that has just been rendered. The stack
-   *   frame for this element will be updated with the bubbleable rendering
-   *   metadata of this element.
+   * {@inheritdoc}
    */
-  protected function updateStack(&$element) {
-    // The latest frame represents the bubbleable metadata for the subtree.
-    $frame = static::$stack->pop();
-    // Update the frame, but also update the current element, to ensure it
-    // contains up-to-date information in case it gets render cached.
-    $updated_frame = BubbleableMetadata::createFromRenderArray($element)->merge($frame);
-    $updated_frame->applyTo($element);
-    static::$stack->push($updated_frame);
-  }
+  public function executeInRenderContext(RenderContext $context, callable $callable) {
+    // Store the current render context.
+    $previous_context = $this->getCurrentRenderContext();
 
-  /**
-   * Bubbles the stack.
-   *
-   * Whenever another level in the render array has been rendered, the stack
-   * must be bubbled, to merge its rendering metadata with that of the parent
-   * element.
-   */
-  protected function bubbleStack() {
-    // If there's only one frame on the stack, then this is the root call, and
-    // we can't bubble up further. Reset the stack for the next root call.
-    if (static::$stack->count() === 1) {
-      $this->resetStack();
-      return;
+    // Set the provided context and call the callable, it will use that context.
+    $this->setCurrentRenderContext($context);
+    $result = $callable();
+    // @todo Convert to an assertion in https://www.drupal.org/node/2408013
+    if ($context->count() > 1) {
+      throw new \LogicException('Bubbling failed.');
     }
 
-    // Merge the current and the parent stack frame.
-    $current = static::$stack->pop();
-    $parent = static::$stack->pop();
-    static::$stack->push($current->merge($parent));
+    // Restore the original render context.
+    $this->setCurrentRenderContext($previous_context);
+
+    return $result;
+  }
+
+  /**
+   * Returns the current render context.
+   *
+   * @return \Drupal\Core\Render\RenderContext
+   *   The current render context.
+   */
+  protected function getCurrentRenderContext() {
+    $request = $this->requestStack->getCurrentRequest();
+    return isset(static::$contextCollection[$request]) ? static::$contextCollection[$request] : NULL;
+  }
+
+  /**
+   * Sets the current render context.
+   *
+   * @param \Drupal\Core\Render\RenderContext|null $context
+   *   The render context. This can be NULL for instance when restoring the
+   *   original render context, which is in fact NULL.
+   *
+   * @return $this
+   */
+  protected function setCurrentRenderContext(RenderContext $context = NULL) {
+    $request = $this->requestStack->getCurrentRequest();
+    static::$contextCollection[$request] = $context;
+    return $this;
   }
 
   /**
@@ -638,4 +698,24 @@ class Renderer implements RendererInterface {
     $meta_a->merge($meta_b)->applyTo($elements);
   }
 
+  /**
+   * Applies a very permissive XSS/HTML filter for admin-only use.
+   *
+   * Note: This method only filters if $string is not marked safe already. This
+   * ensures that HTML intended for display is not filtered.
+   *
+   * @param string|\Drupal\Core\Render\SafeString $string
+   *   A string.
+   *
+   * @return \Drupal\Core\Render\SafeString
+   *   The escaped string wrapped in a SafeString object. If
+   *   SafeMarkup::isSafe($string) returns TRUE, it won't be escaped again.
+   */
+  protected function xssFilterAdminIfUnsafe($string) {
+    if (!SafeMarkup::isSafe($string)) {
+      $string = Xss::filterAdmin($string);
+    }
+    return SafeString::create($string);
+  }
+
 }
diff --git a/core/lib/Drupal/Core/Render/RendererInterface.php b/core/lib/Drupal/Core/Render/RendererInterface.php
index 5d59d4d81..155eec4db 100644
--- a/core/lib/Drupal/Core/Render/RendererInterface.php
+++ b/core/lib/Drupal/Core/Render/RendererInterface.php
@@ -22,13 +22,18 @@ interface RendererInterface {
    * - system internals that are responsible for rendering the final HTML
    * - render arrays for non-HTML responses, such as feeds
    *
+   * (Cannot be executed within another render context.)
+   *
    * @param array $elements
    *   The structured array describing the data to be rendered.
    *
-   * @return string
+   * @return \Drupal\Component\Utility\SafeStringInterface
    *   The rendered HTML.
    *
    * @see ::render()
+   *
+   * @throws \LogicException
+   *   When called from inside another renderRoot() call.
    */
   public function renderRoot(&$elements);
 
@@ -45,13 +50,15 @@ interface RendererInterface {
    * ::renderRoot() call, but that is generally highly problematic (and hence an
    * exception is thrown when a ::renderRoot() call happens within another
    * ::renderRoot() call). However, in this case, we only care about the output,
-   * not about the bubbling. Hence this uses a separate render stack, to not
+   * not about the bubbling. Hence this uses a separate render context, to not
    * affect the parent ::renderRoot() call.
    *
+   * (Can be executed within another render context: it runs in isolation.)
+   *
    * @param array $elements
    *   The structured array describing the data to be rendered.
    *
-   * @return string
+   * @return \Drupal\Component\Utility\SafeStringInterface
    *   The rendered HTML.
    *
    * @see ::renderRoot()
@@ -88,8 +95,8 @@ interface RendererInterface {
    *   or configuration that can affect that rendering changes.
    * - Placeholders, with associated self-contained placeholder render arrays,
    *   for executing code to handle dynamic requirements that cannot be cached.
-   * A stack of \Drupal\Core\Render\BubbleableMetadata objects can be used to
-   * perform this bubbling.
+   * A render context (\Drupal\Core\Render\RenderContext) can be used to perform
+   * bubbling; it is a stack of \Drupal\Core\Render\BubbleableMetadata objects.
    *
    * Additionally, whether retrieving from cache or not, it is important to
    * know all of the assets (CSS and JavaScript) required by the rendered HTML,
@@ -103,9 +110,9 @@ interface RendererInterface {
    *   - If this element has already been printed (#printed = TRUE) or the user
    *     does not have access to it (#access = FALSE), then an empty string is
    *     returned.
-   *   - If no stack data structure has been created yet, it is done now. Next,
+   *   - If no render context is set yet, an exception is thrown. Otherwise,
    *     an empty \Drupal\Core\Render\BubbleableMetadata is pushed onto the
-   *     stack.
+   *     render context.
    *   - If this element has #cache defined then the cached markup for this
    *     element will be returned if it exists in Renderer::render()'s cache. To
    *     use Renderer::render() caching, set the element's #cache property to an
@@ -295,17 +302,16 @@ interface RendererInterface {
    *   (Internal use only.) Whether this is a recursive call or not. See
    *   ::renderRoot().
    *
-   * @return string
+   * @return \Drupal\Component\Utility\SafeStringInterface
    *   The rendered HTML.
    *
    * @throws \LogicException
-   *   If a root call to ::render() does not result in an empty stack, this
-   *   indicates an erroneous ::render() root call (a root call within a
-   *   root call, which makes no sense). Therefore, a logic exception is thrown.
+   *   When called outside of a render context. (i.e. outside of a renderRoot(),
+   *   renderPlain() or executeInRenderContext() call.)
    * @throws \Exception
-   *   If a #pre_render callback throws an exception, it is caught to reset the
-   *   stack used for bubbling rendering metadata, and then the exception is re-
-   *   thrown.
+   *   If a #pre_render callback throws an exception, it is caught to mark the
+   *   renderer as no longer being in a root render call, if any. Then the
+   *   exception is rethrown.
    *
    * @see \Drupal\Core\Render\ElementInfoManagerInterface::getInfo()
    * @see \Drupal\Core\Theme\ThemeManagerInterface::render()
@@ -315,6 +321,49 @@ interface RendererInterface {
    */
   public function render(&$elements, $is_root_call = FALSE);
 
+  /**
+   * Checks whether a render context is active.
+   *
+   * This is useful only in very specific situations to determine whether the
+   * system is already capable of collecting bubbleable metadata. Normally it
+   * should not be necessary to be concerned about this.
+   *
+   * @return bool
+   *   TRUE if the renderer has a render context active, FALSE otherwise.
+   */
+  public function hasRenderContext();
+
+  /**
+   * Executes a callable within a render context.
+   *
+   * Only for very advanced use cases. Prefer using ::renderRoot() and
+   * ::renderPlain() instead.
+   *
+   * All rendering must happen within a render context. Within a render context,
+   * all bubbleable metadata is bubbled and hence tracked. Outside of a render
+   * context, it would be lost. This could lead to missing assets, incorrect
+   * cache variations (and thus security issues), insufficient cache
+   * invalidations, and so on.
+   *
+   * Any and all rendering must therefore happen within a render context, and it
+   * is this method that provides that.
+   *
+   * @see \Drupal\Core\Render\BubbleableMetadata
+   *
+   * @param \Drupal\Core\Render\RenderContext $context
+   *   The render context to execute the callable within.
+   * @param callable $callable
+   *   The callable to execute.
+   * @return mixed
+   *   The callable's return value.
+   *
+   * @see \Drupal\Core\Render\RenderContext
+   *
+   * @throws \LogicException
+   *   In case bubbling has failed, can only happen in case of broken code.
+   */
+  public function executeInRenderContext(RenderContext $context, callable $callable);
+
   /**
    * Merges the bubbleable rendering metadata o/t 2nd render array with the 1st.
    *
diff --git a/core/lib/Drupal/Core/Render/SafeString.php b/core/lib/Drupal/Core/Render/SafeString.php
new file mode 100644
index 000000000..170331e18
--- /dev/null
+++ b/core/lib/Drupal/Core/Render/SafeString.php
@@ -0,0 +1,84 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Render\SafeString.
+ */
+
+namespace Drupal\Core\Render;
+
+use Drupal\Component\Utility\SafeStringInterface;
+use Drupal\Component\Utility\Unicode;
+
+/**
+ * Defines an object that passes safe strings through the render system.
+ *
+ * This object should only be constructed with a known safe string. If there is
+ * any risk that the string contains user-entered data that has not been
+ * filtered first, it must not be used.
+ *
+ * @internal
+ *   This object is marked as internal because it should only be used during
+ *   rendering. Currently, there is no use case for this object by contrib or
+ *   custom code.
+ *
+ * @see \Drupal\Core\Template\TwigExtension::escapeFilter
+ * @see \Twig_Markup
+ * @see \Drupal\Component\Utility\SafeMarkup
+ */
+class SafeString implements SafeStringInterface, \Countable {
+
+  /**
+   * The safe string.
+   *
+   * @var string
+   */
+  protected $string;
+
+  /**
+   * Creates a SafeString object if necessary.
+   *
+   * If $string is equal to a blank string then it is not necessary to create a
+   * SafeString object. If $string is an object that implements
+   * SafeStringInterface it is returned unchanged.
+   *
+   * @param mixed $string
+   *   The string to mark as safe. This value will be cast to a string.
+   *
+   * @return string|\Drupal\Component\Utility\SafeStringInterface
+   *   A safe string.
+   */
+  public static function create($string) {
+    if ($string instanceof SafeStringInterface) {
+      return $string;
+    }
+    $string = (string) $string;
+    if ($string === '') {
+      return '';
+    }
+    $safe_string = new static();
+    $safe_string->string = $string;
+    return $safe_string;
+  }
+
+  /**
+   * Returns the string version of the SafeString object.
+   *
+   * @return string
+   *   The safe string content.
+   */
+  public function __toString() {
+    return $this->string;
+  }
+
+  /**
+   * Returns the string length.
+   *
+   * @return int
+   *   The length of the string.
+   */
+  public function count() {
+    return Unicode::strlen($this->string);
+  }
+
+}
diff --git a/core/lib/Drupal/Core/RouteProcessor/OutboundRouteProcessorInterface.php b/core/lib/Drupal/Core/RouteProcessor/OutboundRouteProcessorInterface.php
index c3349ea05..b76ac4e38 100644
--- a/core/lib/Drupal/Core/RouteProcessor/OutboundRouteProcessorInterface.php
+++ b/core/lib/Drupal/Core/RouteProcessor/OutboundRouteProcessorInterface.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\Core\RouteProcessor;
 
-use Drupal\Core\Cache\CacheableMetadata;
+use Drupal\Core\Render\BubbleableMetadata;
 use Symfony\Component\Routing\Route;
 
 /**
@@ -25,12 +25,12 @@ interface OutboundRouteProcessorInterface {
    * @param array $parameters
    *   An array of parameters to be passed to the route compiler. Passed by
    *   reference.
-   * @param \Drupal\Core\Cache\CacheableMetadata $cacheable_metadata
-   *   (optional) Object to collect route processors' cacheability.
+   * @param \Drupal\Core\Render\BubbleableMetadata $bubbleable_metadata
+   *   (optional) Object to collect route processors' bubbleable metadata.
    *
    * @return
    *   The processed path.
    */
-  public function processOutbound($route_name, Route $route, array &$parameters, CacheableMetadata $cacheable_metadata = NULL);
+  public function processOutbound($route_name, Route $route, array &$parameters, BubbleableMetadata $bubbleable_metadata = NULL);
 
 }
diff --git a/core/lib/Drupal/Core/RouteProcessor/RouteProcessorCurrent.php b/core/lib/Drupal/Core/RouteProcessor/RouteProcessorCurrent.php
index 4d5784390..0dbfcaa77 100644
--- a/core/lib/Drupal/Core/RouteProcessor/RouteProcessorCurrent.php
+++ b/core/lib/Drupal/Core/RouteProcessor/RouteProcessorCurrent.php
@@ -8,6 +8,7 @@
 namespace Drupal\Core\RouteProcessor;
 
 use Drupal\Core\Cache\CacheableMetadata;
+use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Symfony\Component\Routing\Route;
 
@@ -36,7 +37,7 @@ class RouteProcessorCurrent implements OutboundRouteProcessorInterface {
   /**
    * {@inheritdoc}
    */
-  public function processOutbound($route_name, Route $route, array &$parameters, CacheableMetadata $cacheable_metadata = NULL) {
+  public function processOutbound($route_name, Route $route, array &$parameters, BubbleableMetadata $bubbleable_metadata = NULL) {
     if ($route_name === '<current>') {
       if ($current_route = $this->routeMatch->getRouteObject()) {
         $requirements = $current_route->getRequirements();
@@ -52,8 +53,8 @@ class RouteProcessorCurrent implements OutboundRouteProcessorInterface {
         $route->setOptions($current_route->getOptions());
         $route->setDefaults($current_route->getDefaults());
         $parameters = array_merge($parameters, $this->routeMatch->getRawParameters()->all());
-        if ($cacheable_metadata) {
-          $cacheable_metadata->addCacheContexts(['route']);
+        if ($bubbleable_metadata) {
+          $bubbleable_metadata->addCacheContexts(['route']);
         }
       }
       else {
diff --git a/core/lib/Drupal/Core/RouteProcessor/RouteProcessorManager.php b/core/lib/Drupal/Core/RouteProcessor/RouteProcessorManager.php
index c19b17740..430af35ef 100644
--- a/core/lib/Drupal/Core/RouteProcessor/RouteProcessorManager.php
+++ b/core/lib/Drupal/Core/RouteProcessor/RouteProcessorManager.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\Core\RouteProcessor;
 
-use Drupal\Core\Cache\CacheableMetadata;
+use Drupal\Core\Render\BubbleableMetadata;
 use Symfony\Component\Routing\Route;
 
 /**
@@ -51,10 +51,10 @@ class RouteProcessorManager implements OutboundRouteProcessorInterface {
   /**
    * {@inheritdoc}
    */
-  public function processOutbound($route_name, Route $route, array &$parameters, CacheableMetadata $cacheable_metadata = NULL) {
+  public function processOutbound($route_name, Route $route, array &$parameters, BubbleableMetadata $bubbleable_metadata = NULL) {
     $processors = $this->getOutbound();
     foreach ($processors as $processor) {
-      $processor->processOutbound($route_name, $route, $parameters, $cacheable_metadata);
+      $processor->processOutbound($route_name, $route, $parameters, $bubbleable_metadata);
     }
   }
 
diff --git a/core/lib/Drupal/Core/Routing/LocalAwareRedirectResponseTrait.php b/core/lib/Drupal/Core/Routing/LocalAwareRedirectResponseTrait.php
new file mode 100644
index 000000000..8ffa2f677
--- /dev/null
+++ b/core/lib/Drupal/Core/Routing/LocalAwareRedirectResponseTrait.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Routing\LocalAwareRedirectResponseTrait.
+ */
+
+namespace Drupal\Core\Routing;
+
+use Drupal\Component\Utility\UrlHelper;
+
+/**
+ * Provides a trait which ensures that a URL is safe to redirect to.
+ */
+trait LocalAwareRedirectResponseTrait {
+
+  /**
+   * The request context.
+   *
+   * @var \Drupal\Core\Routing\RequestContext
+   */
+  protected $requestContext;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function isLocal($url) {
+    return !UrlHelper::isExternal($url) || UrlHelper::externalIsLocal($url, $this->getRequestContext()->getCompleteBaseUrl());
+  }
+
+  /**
+   * Returns the request context.
+   *
+   * @return \Drupal\Core\Routing\RequestContext
+   */
+  protected function getRequestContext() {
+    if (!isset($this->requestContext)) {
+      $this->requestContext = \Drupal::service('router.request_context');
+    }
+    return $this->requestContext;
+  }
+
+  /**
+   * Sets the request context.
+   *
+   * @param \Drupal\Core\Routing\RequestContext $request_context
+   *   The request context.
+   *
+   * @return $this
+   */
+  public function setRequestContext(RequestContext $request_context) {
+    $this->requestContext = $request_context;
+
+    return $this;
+  }
+
+}
diff --git a/core/lib/Drupal/Core/Routing/LocalRedirectResponse.php b/core/lib/Drupal/Core/Routing/LocalRedirectResponse.php
new file mode 100644
index 000000000..d8ad719bc
--- /dev/null
+++ b/core/lib/Drupal/Core/Routing/LocalRedirectResponse.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Routing\LocalRedirectResponse.
+ */
+
+namespace Drupal\Core\Routing;
+
+use Drupal\Component\HttpFoundation\SecuredRedirectResponse;
+
+/**
+ * Provides a redirect response which cannot redirect to an external URL.
+ */
+class LocalRedirectResponse extends SecuredRedirectResponse {
+
+  use LocalAwareRedirectResponseTrait {
+    LocalAwareRedirectResponseTrait::isLocal as isSafe;
+  }
+
+}
diff --git a/core/lib/Drupal/Core/Routing/NullGenerator.php b/core/lib/Drupal/Core/Routing/NullGenerator.php
index e095b5cc1..29957f8b7 100644
--- a/core/lib/Drupal/Core/Routing/NullGenerator.php
+++ b/core/lib/Drupal/Core/Routing/NullGenerator.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\Core\Routing;
 
-use Drupal\Core\Cache\CacheableMetadata;
+use Drupal\Core\Render\BubbleableMetadata;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Routing\RequestContext as SymfonyRequestContext;
 use Symfony\Component\Routing\Exception\RouteNotFoundException;
@@ -51,7 +51,7 @@ class NullGenerator extends UrlGenerator {
   /**
    * {@inheritdoc}
    */
-  protected function processRoute($name, Route $route, array &$parameters, CacheableMetadata $cacheable_metadata = NULL) {
+  protected function processRoute($name, Route $route, array &$parameters, BubbleableMetadata $bubbleable_metadata = NULL) {
   }
 
   /**
@@ -76,7 +76,7 @@ class NullGenerator extends UrlGenerator {
   /**
    * Overrides Drupal\Core\Routing\UrlGenerator::processPath().
    */
-  protected function processPath($path, &$options = array(), CacheableMetadata $cacheable_metadata = NULL) {
+  protected function processPath($path, &$options = array(), BubbleableMetadata $bubbleable_metadata = NULL) {
     return $path;
   }
 }
diff --git a/core/lib/Drupal/Core/Routing/RequestFormatRouteFilter.php b/core/lib/Drupal/Core/Routing/RequestFormatRouteFilter.php
index 4d5189a2d..a0f023852 100644
--- a/core/lib/Drupal/Core/Routing/RequestFormatRouteFilter.php
+++ b/core/lib/Drupal/Core/Routing/RequestFormatRouteFilter.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\Core\Routing;
 
-use Drupal\Component\Utility\SafeMarkup;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\NotAcceptableHttpException;
 use Symfony\Component\Routing\Route;
@@ -51,7 +50,7 @@ class RequestFormatRouteFilter implements RouteFilterInterface {
     // We do not throw a
     // \Symfony\Component\Routing\Exception\ResourceNotFoundException here
     // because we don't want to return a 404 status code, but rather a 406.
-    throw new NotAcceptableHttpException(SafeMarkup::format('No route found for the specified format @format.', ['@format' => $format]));
+    throw new NotAcceptableHttpException("No route found for the specified format $format.");
   }
 
 }
diff --git a/core/lib/Drupal/Core/Routing/TrustedRedirectResponse.php b/core/lib/Drupal/Core/Routing/TrustedRedirectResponse.php
new file mode 100644
index 000000000..c7a43a21c
--- /dev/null
+++ b/core/lib/Drupal/Core/Routing/TrustedRedirectResponse.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Routing\TrustedRedirectResponse.
+ */
+
+namespace Drupal\Core\Routing;
+
+use Drupal\Component\HttpFoundation\SecuredRedirectResponse;
+
+/**
+ * Provides a redirect response which contains trusted URLs.
+ *
+ * Use this class in case you know that you want to redirect to an external URL.
+ */
+class TrustedRedirectResponse extends SecuredRedirectResponse {
+
+  use LocalAwareRedirectResponseTrait;
+
+  /**
+   * A list of trusted URLs, which are safe to redirect to.
+   *
+   * @var string[]
+   */
+  protected $trustedUrls = array();
+
+  /**
+   * {@inheritdoc}
+   */
+  public function __construct($url, $status = 302, $headers = array()) {
+    $this->trustedUrls[$url] = TRUE;
+    parent::__construct($url, $status, $headers);
+  }
+
+  /**
+   * Sets the target URL to a trusted URL.
+   *
+   * @param string $url
+   *   A trusted URL.
+   *
+   * @return $this
+   */
+  public function setTrustedTargetUrl($url) {
+    $this->trustedUrls[$url] = TRUE;
+    return $this->setTargetUrl($url);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function isSafe($url) {
+    return !empty($this->trustedUrls[$url]) || $this->isLocal($url);
+  }
+
+}
diff --git a/core/lib/Drupal/Core/Routing/UrlGenerator.php b/core/lib/Drupal/Core/Routing/UrlGenerator.php
index bd3c1a088..d990e400d 100644
--- a/core/lib/Drupal/Core/Routing/UrlGenerator.php
+++ b/core/lib/Drupal/Core/Routing/UrlGenerator.php
@@ -7,8 +7,8 @@
 
 namespace Drupal\Core\Routing;
 
-use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\GeneratedUrl;
+use Drupal\Core\Render\BubbleableMetadata;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Routing\RequestContext as SymfonyRequestContext;
 use Symfony\Component\Routing\Route as SymfonyRoute;
@@ -54,14 +54,19 @@ class UrlGenerator implements UrlGeneratorInterface {
   /**
    * Overrides characters that will not be percent-encoded in the path segment.
    *
+   * The first two elements are the first two parameters of str_replace(), so
+   * if you override this variable you can also use arrays for the encoded
+   * and decoded characters.
+   *
    * @see \Symfony\Component\Routing\Generator\UrlGenerator
    */
-  protected $decodedChars = array(
+  protected $decodedChars = [
     // the slash can be used to designate a hierarchical structure and we want allow using it with this meaning
     // some webservers don't allow the slash in encoded form in the path for security reasons anyway
     // see http://stackoverflow.com/questions/4069002/http-400-if-2f-part-of-get-url-in-jboss
-    '%2F' => '/',
-  );
+    '%2F', // Map from these encoded characters.
+    '/', // Map to these decoded characters.
+  ];
 
   /**
    *  Constructs a new generator object.
@@ -72,19 +77,18 @@ class UrlGenerator implements UrlGeneratorInterface {
    *   The path processor to convert the system path to one suitable for urls.
    * @param \Drupal\Core\RouteProcessor\OutboundRouteProcessorInterface $route_processor
    *   The route processor.
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config
-   *    The config factory.
    * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack
    *   A request stack object.
+   * @param string[] $filter_protocols
+   *   (optional) An array of protocols allowed for URL generation.
    */
-  public function __construct(RouteProviderInterface $provider, OutboundPathProcessorInterface $path_processor, OutboundRouteProcessorInterface $route_processor, ConfigFactoryInterface $config, RequestStack $request_stack) {
+  public function __construct(RouteProviderInterface $provider, OutboundPathProcessorInterface $path_processor, OutboundRouteProcessorInterface $route_processor, RequestStack $request_stack, array $filter_protocols = ['http', 'https']) {
     $this->provider = $provider;
     $this->context = new RequestContext();
 
     $this->pathProcessor = $path_processor;
     $this->routeProcessor = $route_processor;
-    $allowed_protocols = $config->get('system.filter')->get('protocols') ?: array('http', 'https');
-    UrlHelper::setAllowedProtocols($allowed_protocols);
+    UrlHelper::setAllowedProtocols($filter_protocols);
     $this->requestStack = $request_stack;
   }
 
@@ -212,7 +216,7 @@ class UrlGenerator implements UrlGeneratorInterface {
     }
 
     // The contexts base URL is already encoded (see Symfony\Component\HttpFoundation\Request)
-    $url = strtr(rawurlencode($url), $this->decodedChars);
+    $url = str_replace($this->decodedChars[0], $this->decodedChars[1], rawurlencode($url));
 
     // Drupal paths rarely include dots, so skip this processing if possible.
     if (strpos($url, '/.') !== FALSE) {
@@ -277,13 +281,10 @@ class UrlGenerator implements UrlGeneratorInterface {
   /**
    * {@inheritdoc}
    */
-  public function generateFromRoute($name, $parameters = array(), $options = array(), $collect_cacheability_metadata = FALSE) {
-    $generated_url = $collect_cacheability_metadata ? new GeneratedUrl() : NULL;
-
+  public function generateFromRoute($name, $parameters = array(), $options = array(), $collect_bubbleable_metadata = FALSE) {
     $options += array('prefix' => '');
     $route = $this->getRoute($name);
-    $name = $this->getRouteDebugMessage($name);
-    $this->processRoute($name, $route, $parameters, $generated_url);
+    $generated_url = $collect_bubbleable_metadata ? new GeneratedUrl() : NULL;
 
     $query_params = [];
     // Symfony adds any parameters that are not path slugs as query strings.
@@ -291,6 +292,23 @@ class UrlGenerator implements UrlGeneratorInterface {
       $query_params = $options['query'];
     }
 
+    $fragment = '';
+    if (isset($options['fragment'])) {
+      if (($fragment = trim($options['fragment'])) != '') {
+        $fragment = '#' . $fragment;
+      }
+    }
+
+    // Generate a relative URL having no path, just query string and fragment.
+    if ($route->getOption('_no_path')) {
+      $query = $query_params ? '?' . http_build_query($query_params, '', '&') : '';
+      $url = $query . $fragment;
+      return $collect_bubbleable_metadata ? $generated_url->setGeneratedUrl($url) : $url;
+    }
+
+    $options += array('prefix' => '');
+    $name = $this->getRouteDebugMessage($name);
+    $this->processRoute($name, $route, $parameters, $generated_url);
     $path = $this->getInternalPathFromRoute($name, $route, $parameters, $query_params);
     $path = $this->processPath($path, $options, $generated_url);
 
@@ -300,13 +318,6 @@ class UrlGenerator implements UrlGeneratorInterface {
       $path = '/' . str_replace('%2F', '/', rawurlencode($prefix)) . $path;
     }
 
-    $fragment = '';
-    if (isset($options['fragment'])) {
-      if (($fragment = trim($options['fragment'])) != '') {
-        $fragment = '#' . $fragment;
-      }
-    }
-
     // The base_url might be rewritten from the language rewrite in domain mode.
     if (isset($options['base_url'])) {
       $base_url = $options['base_url'];
@@ -321,20 +332,15 @@ class UrlGenerator implements UrlGeneratorInterface {
       }
 
       $url = $base_url . $path . $fragment;
-      return $collect_cacheability_metadata ? $generated_url->setGeneratedUrl($url) : $url;
+      return $collect_bubbleable_metadata ? $generated_url->setGeneratedUrl($url) : $url;
     }
 
     $base_url = $this->context->getBaseUrl();
 
     $absolute = !empty($options['absolute']);
     if (!$absolute || !$host = $this->context->getHost()) {
-
-      if ($route->getOption('_only_fragment')) {
-        return $collect_cacheability_metadata ? $generated_url->setGeneratedUrl($fragment) : $fragment;
-      }
-
       $url = $base_url . $path . $fragment;
-      return $collect_cacheability_metadata ? $generated_url->setGeneratedUrl($url) : $url;
+      return $collect_bubbleable_metadata ? $generated_url->setGeneratedUrl($url) : $url;
     }
 
     // Prepare an absolute URL by getting the correct scheme, host and port from
@@ -355,19 +361,19 @@ class UrlGenerator implements UrlGeneratorInterface {
     } elseif ('https' === $scheme && 443 != $this->context->getHttpsPort()) {
       $port = ':' . $this->context->getHttpsPort();
     }
-    if ($collect_cacheability_metadata) {
+    if ($collect_bubbleable_metadata) {
       $generated_url->addCacheContexts(['url.site']);
     }
     $url = $scheme . '://' . $host . $port . $base_url . $path . $fragment;
-    return $collect_cacheability_metadata ? $generated_url->setGeneratedUrl($url) : $url;
+    return $collect_bubbleable_metadata ? $generated_url->setGeneratedUrl($url) : $url;
 
   }
 
   /**
    * {@inheritdoc}
    */
-  public function generateFromPath($path = NULL, $options = array(), $collect_cacheability_metadata = FALSE) {
-    $generated_url = $collect_cacheability_metadata ? new GeneratedUrl() : NULL;
+  public function generateFromPath($path = NULL, $options = array(), $collect_bubbleable_metadata = FALSE) {
+    $generated_url = $collect_bubbleable_metadata ? new GeneratedUrl() : NULL;
 
     $request = $this->requestStack->getCurrentRequest();
     $current_base_path = $request->getBasePath() . '/';
@@ -432,7 +438,7 @@ class UrlGenerator implements UrlGeneratorInterface {
       }
       // Reassemble.
       $url = $path . $options['fragment'];
-      return $collect_cacheability_metadata ? $generated_url->setGeneratedUrl($url) : $url;
+      return $collect_bubbleable_metadata ? $generated_url->setGeneratedUrl($url) : $url;
     }
     else {
       $path = ltrim($this->processPath('/' . $path, $options, $generated_url), '/');
@@ -463,20 +469,20 @@ class UrlGenerator implements UrlGeneratorInterface {
     $base = $options['absolute'] ? $options['base_url'] : $current_base_path;
     $prefix = empty($path) ? rtrim($options['prefix'], '/') : $options['prefix'];
 
-    if ($options['absolute'] && $collect_cacheability_metadata) {
+    if ($options['absolute'] && $collect_bubbleable_metadata) {
       $generated_url->addCacheContexts(['url.site']);
     }
 
     $path = str_replace('%2F', '/', rawurlencode($prefix . $path));
     $query = $options['query'] ? ('?' . UrlHelper::buildQuery($options['query'])) : '';
     $url = $base . $options['script'] . $path . $query . $options['fragment'];
-    return $collect_cacheability_metadata ? $generated_url->setGeneratedUrl($url) : $url;
+    return $collect_bubbleable_metadata ? $generated_url->setGeneratedUrl($url) : $url;
   }
 
   /**
    * Passes the path to a processor manager to allow alterations.
    */
-  protected function processPath($path, &$options = array(), CacheableMetadata $cacheable_metadata = NULL) {
+  protected function processPath($path, &$options = array(), BubbleableMetadata $bubbleable_metadata = NULL) {
     // Router-based paths may have a querystring on them.
     if ($query_pos = strpos($path, '?')) {
       // We don't need to do a strict check here because position 0 would mean we
@@ -488,7 +494,7 @@ class UrlGenerator implements UrlGeneratorInterface {
       $actual_path = $path;
       $query_string = '';
     }
-    $path = $this->pathProcessor->processOutbound($actual_path === '/' ? $actual_path : rtrim($actual_path, '/'), $options, $this->requestStack->getCurrentRequest(), $cacheable_metadata);
+    $path = $this->pathProcessor->processOutbound($actual_path === '/' ? $actual_path : rtrim($actual_path, '/'), $options, $this->requestStack->getCurrentRequest(), $bubbleable_metadata);
     $path .= $query_string;
     return $path;
   }
@@ -502,11 +508,11 @@ class UrlGenerator implements UrlGeneratorInterface {
    *   The route object to process.
    * @param array $parameters
    *   An array of parameters to be passed to the route compiler.
-   * @param \Drupal\Core\Cache\CacheableMetadata $cacheable_metadata
-   *   (optional) Object to collect route processors' cacheability.
+   * @param \Drupal\Core\Render\BubbleableMetadata $bubbleable_metadata
+   *   (optional) Object to collect route processors' bubbleable metadata.
    */
-  protected function processRoute($name, SymfonyRoute $route, array &$parameters, CacheableMetadata $cacheable_metadata = NULL) {
-    $this->routeProcessor->processOutbound($name, $route, $parameters, $cacheable_metadata);
+  protected function processRoute($name, SymfonyRoute $route, array &$parameters, BubbleableMetadata $bubbleable_metadata = NULL) {
+    $this->routeProcessor->processOutbound($name, $route, $parameters, $bubbleable_metadata);
   }
 
   /**
diff --git a/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php b/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php
index 551171b44..f75940fb6 100644
--- a/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php
+++ b/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php
@@ -70,14 +70,14 @@ interface UrlGeneratorInterface extends VersatileGeneratorInterface {
    *     set if _url() is invoked by Drupal\Core\Entity\Entity::uri().
    *   - 'entity': The entity object (such as a node) for which the URL is being
    *     generated. Only set if _url() is invoked by Drupal\Core\Entity\Entity::uri().
-   * @param bool $collect_cacheability_metadata
+   * @param bool $collect_bubbleable_metadata
    *   (optional) Defaults to FALSE. When TRUE, both the generated URL and its
-   *   associated cacheability metadata are returned.
+   *   associated bubbleable metadata are returned.
    *
    * @return string|\Drupal\Core\GeneratedUrl
    *   A string containing a URL to the given path.
-   *   When $collect_cacheability_metadata is TRUE, a GeneratedUrl object is
-   *   returned, containing the generated URL plus cacheability metadata.
+   *   When $collect_bubbleable_metadata is TRUE, a GeneratedUrl object is
+   *   returned, containing the generated URL plus bubbleable metadata.
    *
    * @throws \Drupal\Core\Routing\GeneratorNotInitializedException.
    *
@@ -92,7 +92,7 @@ interface UrlGeneratorInterface extends VersatileGeneratorInterface {
    * @see \Drupal\Core\Url
    * @see \Drupal\Core\GeneratedUrl
    */
-  public function generateFromPath($path = NULL, $options = array(), $collect_cacheability_metadata = FALSE);
+  public function generateFromPath($path = NULL, $options = array(), $collect_bubbleable_metadata = FALSE);
 
   /**
    * Gets the internal path (system path) of a route.
@@ -142,14 +142,14 @@ interface UrlGeneratorInterface extends VersatileGeneratorInterface {
    *     modify the base URL when a language dependent URL requires so.
    *   - 'prefix': Only used internally, to modify the path when a language
    *     dependent URL requires so.
-   * @param bool $collect_cacheability_metadata
+   * @param bool $collect_bubbleable_metadata
    *   (optional) Defaults to FALSE. When TRUE, both the generated URL and its
-   *   associated cacheability metadata are returned.
+   *   associated bubbleable metadata are returned.
    *
    * @return string|\Drupal\Core\GeneratedUrl
    *   The generated URL for the given route.
-   *   When $collect_cacheability_metadata is TRUE, a GeneratedUrl object is
-   *   returned, containing the generated URL plus cacheability metadata.
+   *   When $collect_bubbleable_metadata is TRUE, a GeneratedUrl object is
+   *   returned, containing the generated URL plus bubbleable metadata.
    *
    * @throws \Symfony\Component\Routing\Exception\RouteNotFoundException
    *   Thrown when the named route does not exist.
@@ -159,6 +159,6 @@ interface UrlGeneratorInterface extends VersatileGeneratorInterface {
    *   Thrown when a parameter value for a placeholder is not correct because it
    *   does not match the requirement.
    */
-  public function generateFromRoute($name, $parameters = array(), $options = array(), $collect_cacheability_metadata = FALSE);
+  public function generateFromRoute($name, $parameters = array(), $options = array(), $collect_bubbleable_metadata = FALSE);
 
 }
diff --git a/core/lib/Drupal/Core/Session/SessionConfiguration.php b/core/lib/Drupal/Core/Session/SessionConfiguration.php
index 994b4b924..a76b97946 100644
--- a/core/lib/Drupal/Core/Session/SessionConfiguration.php
+++ b/core/lib/Drupal/Core/Session/SessionConfiguration.php
@@ -129,12 +129,6 @@ class SessionConfiguration implements SessionConfigurationInterface {
     }
     else {
       $host = $request->getHost();
-
-      // Strip www. from hostname.
-      if (strpos($host, 'www.') === 0) {
-        $host = substr($host, 4);
-      }
-
       // To maximize compatibility and normalize the behavior across user
       // agents, the cookie domain should start with a dot.
       $cookie_domain = '.' . $host;
diff --git a/core/lib/Drupal/Core/Session/SessionManager.php b/core/lib/Drupal/Core/Session/SessionManager.php
index 2c35259a3..079eec43c 100644
--- a/core/lib/Drupal/Core/Session/SessionManager.php
+++ b/core/lib/Drupal/Core/Session/SessionManager.php
@@ -152,7 +152,7 @@ class SessionManager extends NativeSessionStorage implements SessionManagerInter
   /**
    * Forcibly start a PHP session.
    *
-   * @return boolean
+   * @return bool
    *   TRUE if the session is started.
    */
   protected function startNow() {
diff --git a/core/lib/Drupal/Core/Site/Settings.php b/core/lib/Drupal/Core/Site/Settings.php
index c757d1e63..21298b412 100644
--- a/core/lib/Drupal/Core/Site/Settings.php
+++ b/core/lib/Drupal/Core/Site/Settings.php
@@ -170,7 +170,7 @@ final class Settings {
    */
   public static function getApcuPrefix($identifier, $root, $site_path = '') {
     if (static::get('apcu_ensure_unique_prefix', TRUE)) {
-      return 'drupal.' . $identifier . '.' . hash_hmac('sha256', $identifier, static::get('hash_salt', $root . '/' . $site_path));
+      return 'drupal.' . $identifier . '.' . hash_hmac('sha256', $identifier, static::get('hash_salt') . '.' . $root . '/' . $site_path);
     }
     return 'drupal.' . $identifier . '.' . Crypt::hashBase64($root . '/' . $site_path);
   }
diff --git a/core/lib/Drupal/Core/StreamWrapper/StreamWrapperManager.php b/core/lib/Drupal/Core/StreamWrapper/StreamWrapperManager.php
index dc9f4b6c4..6886bb20f 100644
--- a/core/lib/Drupal/Core/StreamWrapper/StreamWrapperManager.php
+++ b/core/lib/Drupal/Core/StreamWrapper/StreamWrapperManager.php
@@ -12,7 +12,6 @@ use Symfony\Component\DependencyInjection\ContainerAware;
 /**
  * Provides a StreamWrapper manager.
  *
- * @see file_get_stream_wrappers()
  * @see \Drupal\Core\StreamWrapper\StreamWrapperInterface
  */
 class StreamWrapperManager extends ContainerAware implements StreamWrapperManagerInterface {
diff --git a/core/lib/Drupal/Core/StreamWrapper/StreamWrapperManagerInterface.php b/core/lib/Drupal/Core/StreamWrapper/StreamWrapperManagerInterface.php
index 34e5f8144..238b96825 100644
--- a/core/lib/Drupal/Core/StreamWrapper/StreamWrapperManagerInterface.php
+++ b/core/lib/Drupal/Core/StreamWrapper/StreamWrapperManagerInterface.php
@@ -10,7 +10,6 @@ namespace Drupal\Core\StreamWrapper;
 /**
  * Provides a StreamWrapper manager.
  *
- * @see file_get_stream_wrappers()
  * @see \Drupal\Core\StreamWrapper\StreamWrapperInterface
  */
 interface StreamWrapperManagerInterface {
@@ -39,8 +38,8 @@ interface StreamWrapperManagerInterface {
    * returns only stream wrappers that use local file storage:
    *
    * @code
-   *   $local_stream_wrappers =
-   *   file_get_stream_wrappers(StreamWrapperInterface::LOCAL);
+   *   $stream_wrapper_manager = \Drupal::service('stream_wrapper_manager');
+   *   $local_stream_wrappers = $stream_wrapper_manager->getWrappers(StreamWrapperInterface::LOCAL);
    * @endcode
    *
    * The $filter parameter can only filter to types containing a particular
@@ -50,9 +49,11 @@ interface StreamWrapperManagerInterface {
    * array_diff_key() function can be used to help with this. For example, this
    * returns only stream wrappers that do not use local file storage:
    * @code
-   *   $remote_stream_wrappers =
-   *   array_diff_key(file_get_stream_wrappers(StreamWrapperInterface::ALL),
-   *   file_get_stream_wrappers(StreamWrapperInterface::LOCAL));
+   *   $stream_wrapper_manager = \Drupal::service('stream_wrapper_manager');
+   *   $remote_stream_wrappers = array_diff_key(
+   *     $stream_wrapper_manager->getWrappers(StreamWrapperInterface::ALL),
+   *     $stream_wrapper_manager->getWrappers(StreamWrapperInterface::LOCAL)
+   *   );
    * @endcode
    *
    * @param int $filter
@@ -112,35 +113,52 @@ interface StreamWrapperManagerInterface {
   public function getDescriptions($filter = StreamWrapperInterface::ALL);
 
   /**
-   * Returns a stream wrapper via scheme.
+   * Returns a reference to the stream wrapper class responsible for a scheme.
+   *
+   * This helper method returns a stream instance using a scheme. That is, the
+   * passed string does not contain a "://". For example, "public" is a scheme
+   * but "public://" is a URI (stream). This is because the later contains both
+   * a scheme and target despite target being empty.
+   *
+   * Note: the instance URI will be initialized to "scheme://" so that you can
+   * make the customary method calls as if you had retrieved an instance by URI.
    *
    * @param string $scheme
-   *   The scheme of the stream wrapper.
+   *   If the stream was "public://target", "public" would be the scheme.
    *
    * @return \Drupal\Core\StreamWrapper\StreamWrapperInterface|bool
-   *   A stream wrapper object, or false if the scheme is not available.
+   *   Returns a new stream wrapper object appropriate for the given $scheme.
+   *   For example, for the public scheme a stream wrapper object
+   *   (Drupal\Core\StreamWrapper\PublicStream).
+   *   FALSE is returned if no registered handler could be found.
    */
   public function getViaScheme($scheme);
 
   /**
-   * Returns a stream wrapper via URI.
+   * Returns a reference to the stream wrapper class responsible for a URI.
+   *
+   * The scheme determines the stream wrapper class that should be
+   * used by consulting the stream wrapper registry.
    *
    * @param string $uri
-   *   The URI of the stream wrapper.
+   *   A stream, referenced as "scheme://target".
    *
    * @return \Drupal\Core\StreamWrapper\StreamWrapperInterface|bool
-   *   A stream wrapper object, or false if the scheme is not available.
+   *   Returns a new stream wrapper object appropriate for the given URI or
+   *   FALSE if no registered handler could be found. For example, a URI of
+   *   "private://example.txt" would return a new private stream wrapper object
+   *   (Drupal\Core\StreamWrapper\PrivateStream).
    */
   public function getViaUri($uri);
 
   /**
-   * Returns the stream wrapper class.
+   * Returns the stream wrapper class name for a given scheme.
    *
    * @param string $scheme
-   *   The stream wrapper scheme.
+   *   Stream scheme.
    *
    * @return string|bool
-   *   The stream wrapper class, or false if the scheme does not exist.
+   *   Return string if a scheme has a registered handler, or FALSE.
    */
   public function getClass($scheme);
 
diff --git a/core/lib/Drupal/Core/StringTranslation/TranslationWrapper.php b/core/lib/Drupal/Core/StringTranslation/TranslationWrapper.php
index e2c1a980d..6bf591a37 100644
--- a/core/lib/Drupal/Core/StringTranslation/TranslationWrapper.php
+++ b/core/lib/Drupal/Core/StringTranslation/TranslationWrapper.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\Core\StringTranslation;
 
+use Drupal\Component\Utility\SafeStringInterface;
+
 /**
  * Provides a class to wrap a translatable string.
  *
@@ -16,7 +18,7 @@ namespace Drupal\Core\StringTranslation;
  *
  * @see \Drupal\Core\Annotation\Translation
  */
-class TranslationWrapper {
+class TranslationWrapper implements SafeStringInterface {
   use StringTranslationTrait;
 
   /**
@@ -82,6 +84,16 @@ class TranslationWrapper {
     return isset($this->options[$name]) ? $this->options[$name] : '';
   }
 
+  /**
+   * Gets all options from this translation wrapper.
+   *
+   * @return mixed[]
+   *   The array of options.
+   */
+  public function getOptions() {
+    return $this->options;
+  }
+
   /**
    * Implements the magic __toString() method.
    */
diff --git a/core/lib/Drupal/Core/Template/Attribute.php b/core/lib/Drupal/Core/Template/Attribute.php
index b8c05909b..ff01040f5 100644
--- a/core/lib/Drupal/Core/Template/Attribute.php
+++ b/core/lib/Drupal/Core/Template/Attribute.php
@@ -43,10 +43,11 @@ use Drupal\Component\Utility\SafeStringInterface;
  * htmlspecialchars() and the entire attribute string is marked safe for output.
  */
 class Attribute implements \ArrayAccess, \IteratorAggregate, SafeStringInterface {
+
   /**
    * Stores the attribute data.
    *
-   * @var array
+   * @var \Drupal\Core\Template\AttributeValueBase[]
    */
   protected $storage = array();
 
@@ -261,6 +262,21 @@ class Attribute implements \ArrayAccess, \IteratorAggregate, SafeStringInterface
     return $return;
   }
 
+  /**
+   * Returns all storage elements as an array.
+   *
+   * @return array
+   *   An associative array of attributes.
+   */
+  public function toArray() {
+    $return = [];
+    foreach ($this->storage as $name => $value) {
+      $return[$name] = $value->value();
+    }
+
+    return $return;
+  }
+
   /**
    * Implements the magic __clone() method.
    */
diff --git a/core/lib/Drupal/Core/Template/TwigEnvironment.php b/core/lib/Drupal/Core/Template/TwigEnvironment.php
index 92257120c..dc7de1624 100644
--- a/core/lib/Drupal/Core/Template/TwigEnvironment.php
+++ b/core/lib/Drupal/Core/Template/TwigEnvironment.php
@@ -7,7 +7,10 @@
 
 namespace Drupal\Core\Template;
 
+use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\PhpStorage\PhpStorageFactory;
+use Drupal\Core\Render\SafeString;
 
 /**
  * A class that defines a Twig environment for Drupal.
@@ -34,14 +37,15 @@ class TwigEnvironment extends \Twig_Environment {
    *
    * @param string $root
    *   The app root.
+   * @param \Drupal\Core\Cache\CacheBackendInterface $cache
+   *   The cache bin.
    * @param \Twig_LoaderInterface $loader
    *   The Twig loader or loader chain.
    * @param array $options
    *   The options for the Twig environment.
    */
-  public function __construct($root, \Twig_LoaderInterface $loader = NULL, $options = array()) {
-    // @todo Pass as arguments from the DIC.
-    $this->cache_object = \Drupal::cache();
+  public function __construct($root, CacheBackendInterface $cache, \Twig_LoaderInterface $loader = NULL, $options = array()) {
+    $this->cache_object = $cache;
 
     // Ensure that twig.engine is loaded, given that it is needed to render a
     // template because functions like TwigExtension::escapeFilter() are called.
@@ -115,12 +119,7 @@ class TwigEnvironment extends \Twig_Environment {
     if (!class_exists($cls, FALSE)) {
       $cache_filename = $this->getCacheFilename($name);
 
-      if ($cache_filename === FALSE) {
-        $compiled_source = $this->compileSource($this->loader->getSource($name), $name);
-        eval('?' . '>' . $compiled_source);
-      }
-      else {
-
+      if ($cache_filename !== FALSE) {
         // If autoreload is on, check that the template has not been
         // modified since the last compilation.
         if ($this->isAutoReload() && !$this->isFresh($cache_filename, $name)) {
@@ -132,6 +131,10 @@ class TwigEnvironment extends \Twig_Environment {
           $this->storage()->load($cache_filename);
         }
       }
+      if (!class_exists($cls, FALSE)) {
+        $compiled_source = $this->compileSource($this->loader->getSource($name), $name);
+        eval('?' . '>' . $compiled_source);
+      }
     }
 
     if (!$this->runtimeInitialized) {
@@ -193,15 +196,15 @@ class TwigEnvironment extends \Twig_Environment {
    * @param array $context
    *   An array of parameters to pass to the template.
    *
-   * @return string
-   *   The rendered inline template.
+   * @return \Drupal\Component\Utility\SafeStringInterface|string
+   *   The rendered inline template as a SafeString object.
    *
    * @see \Drupal\Core\Template\Loader\StringLoader::exists()
    */
   public function renderInline($template_string, array $context = array()) {
     // Prefix all inline templates with a special comment.
     $template_string = '{# inline_template_start #}' . $template_string;
-    return $this->loadTemplate($template_string, NULL)->render($context);
+    return SafeString::create($this->loadTemplate($template_string, NULL)->render($context));
   }
 
 }
diff --git a/core/lib/Drupal/Core/Template/TwigExtension.php b/core/lib/Drupal/Core/Template/TwigExtension.php
index b3bc42532..482c8882b 100644
--- a/core/lib/Drupal/Core/Template/TwigExtension.php
+++ b/core/lib/Drupal/Core/Template/TwigExtension.php
@@ -222,7 +222,7 @@ class TwigExtension extends \Twig_Extension {
     $options['absolute'] = TRUE;
     $generated_url = $this->urlGenerator->generateFromRoute($name, $parameters, $options, TRUE);
 
-    // Return as render array, so we can bubble the cacheability metadata.
+    // Return as render array, so we can bubble the bubbleable metadata.
     $build = ['#markup' => $generated_url->getGeneratedUrl()];
     $generated_url->applyTo($build);
     return $build;
@@ -247,7 +247,7 @@ class TwigExtension extends \Twig_Extension {
     $options['absolute'] = TRUE;
     $generated_url = $this->urlGenerator->generateFromPath($path, $options, TRUE);
 
-    // Return as render array, so we can bubble the cacheability metadata.
+    // Return as render array, so we can bubble the bubbleable metadata.
     $build = ['#markup' => $generated_url->getGeneratedUrl()];
     $generated_url->applyTo($build);
     return $build;
@@ -260,17 +260,20 @@ class TwigExtension extends \Twig_Extension {
    *   The link text for the anchor tag as a translated string.
    * @param \Drupal\Core\Url|string $url
    *   The URL object or string used for the link.
-   * @param array $attributes
-   *   An optional array of link attributes.
+   * @param array|\Drupal\Core\Template\Attribute $attributes
+   *   An optional array or Attribute object of link attributes.
    *
    * @return array
    *   A render array representing a link to the given URL.
    */
-  public function getLink($text, $url, array $attributes = []) {
+  public function getLink($text, $url, $attributes = []) {
     if (!$url instanceof Url) {
       $url = Url::fromUri($url);
     }
     if ($attributes) {
+      if ($attributes instanceof Attribute) {
+        $attributes = $attributes->toArray();
+      }
       if ($existing_attributes = $url->getOption('attributes')) {
         $attributes = array_merge($existing_attributes, $attributes);
       }
diff --git a/core/lib/Drupal/Core/Template/TwigNodeVisitor.php b/core/lib/Drupal/Core/Template/TwigNodeVisitor.php
index a08ec2d47..ac1e676c3 100644
--- a/core/lib/Drupal/Core/Template/TwigNodeVisitor.php
+++ b/core/lib/Drupal/Core/Template/TwigNodeVisitor.php
@@ -21,14 +21,14 @@ class TwigNodeVisitor implements \Twig_NodeVisitorInterface {
   /**
    * {@inheritdoc}
    */
-  function enterNode(\Twig_NodeInterface $node, \Twig_Environment $env) {
+  public function enterNode(\Twig_NodeInterface $node, \Twig_Environment $env) {
     return $node;
   }
 
   /**
    * {@inheritdoc}
    */
-  function leaveNode(\Twig_NodeInterface $node, \Twig_Environment $env) {
+  public function leaveNode(\Twig_NodeInterface $node, \Twig_Environment $env) {
     // We use this to inject a call to render_var -> TwigExtension->renderVar()
     // before anything is printed.
     if ($node instanceof \Twig_Node_Print) {
@@ -62,7 +62,7 @@ class TwigNodeVisitor implements \Twig_NodeVisitorInterface {
   /**
    * {@inheritdoc}
    */
-  function getPriority() {
+  public function getPriority() {
     // Just above the Optimizer, which is the normal last one.
     return 256;
   }
diff --git a/core/lib/Drupal/Core/Test/EventSubscriber/HttpRequestSubscriber.php b/core/lib/Drupal/Core/Test/EventSubscriber/HttpRequestSubscriber.php
deleted file mode 100644
index 776f2c15c..000000000
--- a/core/lib/Drupal/Core/Test/EventSubscriber/HttpRequestSubscriber.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\Core\Test\EventSubscriber\HttpRequestSubscriber.
- */
-
-namespace Drupal\Core\Test\EventSubscriber;
-
-use GuzzleHttp\Event\BeforeEvent;
-use GuzzleHttp\Event\SubscriberInterface;
-
-/**
- * Overrides the User-Agent HTTP header for outbound HTTP requests.
- */
-class HttpRequestSubscriber implements SubscriberInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getEvents() {
-    return array(
-      'before' => array('onBeforeSendRequest'),
-    );
-  }
-
-  /**
-   * Event callback for the 'before' event
-   */
-  public function onBeforeSendRequest(BeforeEvent $event) {
-    // If the database prefix is being used by SimpleTest to run the tests in a copied
-    // database then set the user-agent header to the database prefix so that any
-    // calls to other Drupal pages will run the SimpleTest prefixed database. The
-    // user-agent is used to ensure that multiple testing sessions running at the
-    // same time won't interfere with each other as they would if the database
-    // prefix were stored statically in a file or database variable.
-    if ($test_prefix = drupal_valid_test_ua()) {
-      $event->getRequest()->setHeader('User-Agent', drupal_generate_test_ua($test_prefix));
-    }
-  }
-
-}
diff --git a/core/lib/Drupal/Core/Test/HttpClientMiddleware/TestHttpClientMiddleware.php b/core/lib/Drupal/Core/Test/HttpClientMiddleware/TestHttpClientMiddleware.php
new file mode 100644
index 000000000..148818971
--- /dev/null
+++ b/core/lib/Drupal/Core/Test/HttpClientMiddleware/TestHttpClientMiddleware.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Test\HttpClientMiddleware\TestHttpClientMiddleware.
+ */
+
+namespace Drupal\Core\Test\HttpClientMiddleware;
+
+use Psr\Http\Message\RequestInterface;
+
+/**
+ * Overrides the User-Agent HTTP header for outbound HTTP requests.
+ */
+class TestHttpClientMiddleware {
+
+  /**
+   * {@inheritdoc}
+   *
+   * HTTP middleware that replaces the user agent for simpletest requests.
+   */
+  public function __invoke() {
+    // If the database prefix is being used by SimpleTest to run the tests in a copied
+    // database then set the user-agent header to the database prefix so that any
+    // calls to other Drupal pages will run the SimpleTest prefixed database. The
+    // user-agent is used to ensure that multiple testing sessions running at the
+    // same time won't interfere with each other as they would if the database
+    // prefix were stored statically in a file or database variable.
+    return function ($handler) {
+      return function (RequestInterface $request, array $options) use ($handler) {
+        if ($test_prefix = drupal_valid_test_ua()) {
+          $request = $request->withHeader('User-Agent', drupal_generate_test_ua($test_prefix));
+        }
+        return $handler($request, $options);
+      };
+    };
+  }
+
+}
diff --git a/core/lib/Drupal/Core/Theme/AjaxBasePageNegotiator.php b/core/lib/Drupal/Core/Theme/AjaxBasePageNegotiator.php
index b15ce93be..9d904ee2d 100644
--- a/core/lib/Drupal/Core/Theme/AjaxBasePageNegotiator.php
+++ b/core/lib/Drupal/Core/Theme/AjaxBasePageNegotiator.php
@@ -15,12 +15,12 @@ use Symfony\Component\HttpFoundation\RequestStack;
 /**
  * Defines a theme negotiator that deals with the active theme on ajax requests.
  *
- * Many different pages can invoke an Ajax request to system/ajax or another
- * generic Ajax path. It is almost always desired for an Ajax response to be
- * rendered using the same theme as the base page, because most themes are built
- * with the assumption that they control the entire page, so if the CSS for two
- * themes are both loaded for a given page, they may conflict with each other.
- * For example, Bartik is Drupal's default theme, and Seven is Drupal's default
+ * Many different pages can invoke an Ajax request to a generic Ajax path. It is
+ * almost always desired for an Ajax response to be rendered using the same
+ * theme as the base page, because most themes are built with the assumption
+ * that they control the entire page, so if the CSS for two themes are both
+ * loaded for a given page, they may conflict with each other. For example,
+ * Bartik is Drupal's default theme, and Seven is Drupal's default
  * administration theme. Depending on whether the "Use the administration theme
  * when editing or creating content" checkbox is checked, the node edit form may
  * be displayed in either theme, but the Ajax response to the Field module's
diff --git a/core/lib/Drupal/Core/Theme/ThemeManager.php b/core/lib/Drupal/Core/Theme/ThemeManager.php
index 3f7ffae48..31c10a739 100644
--- a/core/lib/Drupal/Core/Theme/ThemeManager.php
+++ b/core/lib/Drupal/Core/Theme/ThemeManager.php
@@ -93,13 +93,6 @@ class ThemeManager implements ThemeManagerInterface {
     return $this;
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function render($hook, array $variables) {
-    return $this->theme($hook, $variables);
-  }
-
   /**
    * {@inheritdoc}
    */
@@ -137,11 +130,9 @@ class ThemeManager implements ThemeManagerInterface {
   }
 
   /**
-   * Generates themed output (internal use only).
-   *
-   * @see \Drupal\Core\Render\RendererInterface::render();
+   * {@inheritdoc}
    */
-  protected function theme($hook, $variables = array()) {
+  public function render($hook, array $variables) {
     static $default_attributes;
 
     $active_theme = $this->getActiveTheme();
@@ -302,14 +293,23 @@ class ThemeManager implements ThemeManagerInterface {
           $preprocessor_function($variables, $hook, $info);
         }
       }
-      // Allow theme preprocess functions to set $variables['#attached'] and use
-      // it like the #attached property on render arrays. In Drupal 8, this is
-      // the (only) officially supported method of attaching assets from
-      // preprocess functions. Assets attached here should be associated with
-      // the template that we're preprocessing variables for.
-      if (isset($variables['#attached'])) {
-        $preprocess_attached = ['#attached' => $variables['#attached']];
-        drupal_render($preprocess_attached);
+      // Allow theme preprocess functions to set $variables['#attached'] and
+      // $variables['#cache'] and use them like the corresponding element
+      // properties on render arrays. In Drupal 8, this is the (only) officially
+      // supported method of attaching bubbleable metadata from preprocess
+      // functions. Assets attached here should be associated with the template
+      // that we are preprocessing variables for.
+      $preprocess_bubbleable = [];
+      foreach (['#attached', '#cache'] as $key) {
+        if (isset($variables[$key])) {
+          $preprocess_bubbleable[$key] = $variables[$key];
+        }
+      }
+      // We do not allow preprocess functions to define cacheable elements.
+      unset($preprocess_bubbleable['#cache']['keys']);
+      if ($preprocess_bubbleable) {
+        // @todo Inject the Renderer in https://www.drupal.org/node/2529438.
+        drupal_render($preprocess_bubbleable);
       }
     }
 
diff --git a/core/lib/Drupal/Core/TypedData/ComplexDataInterface.php b/core/lib/Drupal/Core/TypedData/ComplexDataInterface.php
index b60f84d03..56be8749b 100644
--- a/core/lib/Drupal/Core/TypedData/ComplexDataInterface.php
+++ b/core/lib/Drupal/Core/TypedData/ComplexDataInterface.php
@@ -94,7 +94,7 @@ interface ComplexDataInterface extends TraversableTypedDataInterface  {
   /**
    * Determines whether the data structure is empty.
    *
-   * @return boolean
+   * @return bool
    *   TRUE if the data structure is empty, FALSE otherwise.
    */
   public function isEmpty();
diff --git a/core/lib/Drupal/Core/TypedData/ListDataDefinition.php b/core/lib/Drupal/Core/TypedData/ListDataDefinition.php
index b710a75ea..e0fd5306d 100644
--- a/core/lib/Drupal/Core/TypedData/ListDataDefinition.php
+++ b/core/lib/Drupal/Core/TypedData/ListDataDefinition.php
@@ -87,7 +87,7 @@ class ListDataDefinition extends DataDefinition implements ListDataDefinitionInt
       $item_type_definition = \Drupal::typedDataManager()
         ->getDefinition($this->getItemDefinition()->getDataType());
       if (!$item_type_definition) {
-        throw new \LogicException(format_string('An invalid data type @plugin_id has been specified for list items.', array('@plugin_id' => $this->getItemDefinition()->getDataType())));
+        throw new \LogicException("An invalid data type '{$this->getItemDefinition()->getDataType()}' has been specified for list items");
       }
       return $item_type_definition['list_class'];
     }
diff --git a/core/lib/Drupal/Core/TypedData/ListInterface.php b/core/lib/Drupal/Core/TypedData/ListInterface.php
index 936054fa1..5639ba8ce 100644
--- a/core/lib/Drupal/Core/TypedData/ListInterface.php
+++ b/core/lib/Drupal/Core/TypedData/ListInterface.php
@@ -25,7 +25,7 @@ interface ListInterface extends TraversableTypedDataInterface, \ArrayAccess, \Co
   /**
    * Determines whether the list contains any non-empty items.
    *
-   * @return boolean
+   * @return bool
    *   TRUE if the list is empty, FALSE otherwise.
    */
   public function isEmpty();
diff --git a/core/lib/Drupal/Core/TypedData/TypedDataManager.php b/core/lib/Drupal/Core/TypedData/TypedDataManager.php
index 89fa657ea..858d13d1f 100644
--- a/core/lib/Drupal/Core/TypedData/TypedDataManager.php
+++ b/core/lib/Drupal/Core/TypedData/TypedDataManager.php
@@ -8,7 +8,6 @@
 namespace Drupal\Core\TypedData;
 
 use Drupal\Component\Plugin\Exception\PluginException;
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\DependencyInjection\ClassResolverInterface;
 use Drupal\Core\DependencyInjection\DependencySerializationTrait;
@@ -99,7 +98,7 @@ class TypedDataManager extends DefaultPluginManager {
     $type_definition = $this->getDefinition($data_type);
 
     if (!isset($type_definition)) {
-      throw new \InvalidArgumentException(format_string('Invalid data type %plugin_id has been given.', array('%plugin_id' => $data_type)));
+      throw new \InvalidArgumentException("Invalid data type '$data_type' has been given");
     }
 
     // Allow per-data definition overrides of the used classes, i.e. take over
@@ -179,7 +178,7 @@ class TypedDataManager extends DefaultPluginManager {
   public function createDataDefinition($data_type) {
     $type_definition = $this->getDefinition($data_type);
     if (!isset($type_definition)) {
-      throw new \InvalidArgumentException(format_string('Invalid data type %plugin_id has been given.', array('%plugin_id' => $data_type)));
+      throw new \InvalidArgumentException("Invalid data type '$data_type' has been given");
     }
     $class = $type_definition['definition_class'];
     return $class::createFromDataType($data_type);
@@ -199,7 +198,7 @@ class TypedDataManager extends DefaultPluginManager {
   public function createListDataDefinition($item_type) {
     $type_definition = $this->getDefinition($item_type);
     if (!isset($type_definition)) {
-      throw new \InvalidArgumentException(format_string('Invalid data type %plugin_id has been given.', array('%plugin_id' => $item_type)));
+      throw new \InvalidArgumentException("Invalid data type '$item_type' has been given");
     }
     $class = $type_definition['list_definition_class'];
     return $class::createFromItemType($item_type);
@@ -298,7 +297,7 @@ class TypedDataManager extends DefaultPluginManager {
         throw new \InvalidArgumentException("The passed object has to either implement the ComplexDataInterface or the ListInterface.");
       }
       if (!$definition) {
-        throw new \InvalidArgumentException('Property ' . SafeMarkup::checkPlain($property_name) . ' is unknown.');
+        throw new \InvalidArgumentException("Property $property_name is unknown.");
       }
       // Create the prototype without any value, but with initial parenting
       // so that constructors can set up the objects correclty.
diff --git a/core/lib/Drupal/Core/Updater/Updater.php b/core/lib/Drupal/Core/Updater/Updater.php
index 177b11d10..4f56cd9e8 100644
--- a/core/lib/Drupal/Core/Updater/Updater.php
+++ b/core/lib/Drupal/Core/Updater/Updater.php
@@ -365,7 +365,7 @@ class Updater {
    * Returns the full path to a directory where backups should be written.
    */
   public function getBackupDir() {
-    return file_stream_wrapper_get_instance_by_scheme('temporary')->getDirectoryPath();
+    return \Drupal::service('stream_wrapper_manager')->getViaScheme('temporary')->getDirectoryPath();
   }
 
   /**
diff --git a/core/lib/Drupal/Core/Url.php b/core/lib/Drupal/Core/Url.php
index 33895a5f2..5da8ffb85 100644
--- a/core/lib/Drupal/Core/Url.php
+++ b/core/lib/Drupal/Core/Url.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\Core;
 
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Utility\UrlHelper;
 use Drupal\Core\DependencyInjection\DependencySerializationTrait;
 use Drupal\Core\Routing\RouteMatchInterface;
@@ -232,7 +231,7 @@ class Url {
     // because these are URI reserved characters that a scheme name may not
     // start with.
     if ((strpos($user_input, '/') !== 0) && (strpos($user_input, '#') !== 0) && (strpos($user_input, '?') !== 0)) {
-      throw new \InvalidArgumentException(SafeMarkup::format("The user-entered string @user_input must begin with a '/', '?', or '#'.", ['@user_input' => $user_input]));
+      throw new \InvalidArgumentException("The user-entered string '$user_input' must begin with a '/', '?', or '#'.");
     }
 
     // fromUri() requires an absolute URI, so prepend the appropriate scheme
@@ -296,10 +295,10 @@ class Url {
   public static function fromUri($uri, $options = []) {
     $uri_parts = parse_url($uri);
     if ($uri_parts === FALSE) {
-      throw new \InvalidArgumentException(SafeMarkup::format('The URI "@uri" is malformed.', ['@uri' => $uri]));
+      throw new \InvalidArgumentException("The URI '$uri' is malformed.");
     }
     if (empty($uri_parts['scheme'])) {
-      throw new \InvalidArgumentException(SafeMarkup::format('The URI "@uri" is invalid. You must use a valid URI scheme.', ['@uri' => $uri]));
+      throw new \InvalidArgumentException("The URI '$uri' is invalid. You must use a valid URI scheme.");
     }
     $uri_parts += ['path' => ''];
     // Discard empty fragment in $options for consistency with parse_url().
@@ -362,7 +361,7 @@ class Url {
   protected static function fromEntityUri(array $uri_parts, array $options, $uri) {
     list($entity_type_id, $entity_id) = explode('/', $uri_parts['path'], 2);
     if ($uri_parts['scheme'] != 'entity' || $entity_id === '') {
-      throw new \InvalidArgumentException(SafeMarkup::format('The entity URI "@uri" is invalid. You must specify the entity id in the URL. e.g., entity:node/1 for loading the canonical path to node entity with id 1.', ['@uri' => $uri]));
+      throw new \InvalidArgumentException("The entity URI '$uri' is invalid. You must specify the entity id in the URL. e.g., entity:node/1 for loading the canonical path to node entity with id 1.");
     }
 
     return new static("entity.$entity_type_id.canonical", [$entity_type_id => $entity_id], $options);
@@ -422,13 +421,13 @@ class Url {
     }
     else {
       if ($uri_parts['path'][0] !== '/') {
-        throw new \InvalidArgumentException(SafeMarkup::format('The internal path component "@path" is invalid. Its path component must have a leading slash, e.g. internal:/foo.', ['@path' => $uri_parts['path']]));
+        throw new \InvalidArgumentException("The internal path component '{$uri_parts['path']}' is invalid. Its path component must have a leading slash, e.g. internal:/foo.");
       }
       // Remove the leading slash.
       $uri_parts['path'] = substr($uri_parts['path'], 1);
 
       if (UrlHelper::isExternal($uri_parts['path'])) {
-        throw new \InvalidArgumentException(SafeMarkup::format('The internal path component "@path" is external. You are not allowed to specify an external URL together with internal:/.', ['@path' => $uri_parts['path']]));
+        throw new \InvalidArgumentException("The internal path component '{$uri_parts['path']}' is external. You are not allowed to specify an external URL together with internal:/.");
       }
     }
 
@@ -462,7 +461,7 @@ class Url {
     $route_parts = explode(';', $uri_parts['path'], 2);
     $route_name = $route_parts[0];
     if ($route_name === '') {
-      throw new \InvalidArgumentException(SafeMarkup::format('The route URI "@uri" is invalid. You must have a route name in the URI. e.g., route:system.admin', ['@uri' => $uri]));
+      throw new \InvalidArgumentException("The route URI '$uri' is invalid. You must have a route name in the URI. e.g., route:system.admin");
     }
     $route_parameters = [];
     if (!empty($route_parts[1])) {
@@ -732,21 +731,21 @@ class Url {
    * http://example.com/node/1 depending on the options array, plus any
    * specified query string or fragment.
    *
-   * @param bool $collect_cacheability_metadata
+   * @param bool $collect_bubbleable_metadata
    *   (optional) Defaults to FALSE. When TRUE, both the generated URL and its
-   *   associated cacheability metadata are returned.
+   *   associated bubbleable metadata are returned.
    *
    * @return string|\Drupal\Core\GeneratedUrl
    *   A string URL.
-   *   When $collect_cacheability_metadata is TRUE, a GeneratedUrl object is
-   *   returned, containing the generated URL plus cacheability metadata.
+   *   When $collect_bubbleable_metadata is TRUE, a GeneratedUrl object is
+   *   returned, containing the generated URL plus bubbleable metadata.
    */
-  public function toString($collect_cacheability_metadata = FALSE) {
+  public function toString($collect_bubbleable_metadata = FALSE) {
     if ($this->unrouted) {
-      return $this->unroutedUrlAssembler()->assemble($this->getUri(), $this->getOptions(), $collect_cacheability_metadata);
+      return $this->unroutedUrlAssembler()->assemble($this->getUri(), $this->getOptions(), $collect_bubbleable_metadata);
     }
 
-    return $this->urlGenerator()->generateFromRoute($this->getRouteName(), $this->getRouteParameters(), $this->getOptions(), $collect_cacheability_metadata);
+    return $this->urlGenerator()->generateFromRoute($this->getRouteName(), $this->getRouteParameters(), $this->getOptions(), $collect_bubbleable_metadata);
   }
 
   /**
diff --git a/core/lib/Drupal/Core/Utility/Error.php b/core/lib/Drupal/Core/Utility/Error.php
index c72fba43e..304763a06 100644
--- a/core/lib/Drupal/Core/Utility/Error.php
+++ b/core/lib/Drupal/Core/Utility/Error.php
@@ -33,7 +33,7 @@ class Error {
   /**
    * Decodes an exception and retrieves the correct caller.
    *
-   * @param \Exception|\BaseException $exception
+   * @param \Exception|\Throwable $exception
    *   The exception object that was thrown.
    *
    * @return array
@@ -82,7 +82,7 @@ class Error {
   /**
    * Renders an exception error message without further exceptions.
    *
-   * @param \Exception|\BaseException $exception
+   * @param \Exception|\Throwable $exception
    *   The exception object that was thrown.
    *
    * @return string
diff --git a/core/lib/Drupal/Core/Utility/LinkGenerator.php b/core/lib/Drupal/Core/Utility/LinkGenerator.php
index 128dafd8e..a59539492 100644
--- a/core/lib/Drupal/Core/Utility/LinkGenerator.php
+++ b/core/lib/Drupal/Core/Utility/LinkGenerator.php
@@ -9,10 +9,12 @@ namespace Drupal\Core\Utility;
 
 use Drupal\Component\Serialization\Json;
 use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Component\Utility\SafeStringInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\GeneratedLink;
 use Drupal\Core\Link;
 use Drupal\Core\Path\AliasManagerInterface;
+use Drupal\Core\Render\RendererInterface;
 use Drupal\Core\Routing\UrlGeneratorInterface;
 use Drupal\Core\Template\Attribute;
 use Drupal\Core\Url;
@@ -36,6 +38,13 @@ class LinkGenerator implements LinkGeneratorInterface {
    */
   protected $moduleHandler;
 
+  /**
+   * The renderer service.
+   *
+   * @var \Drupal\Core\Render\RendererInterface
+   */
+  protected $renderer;
+
   /**
    * Constructs a LinkGenerator instance.
    *
@@ -43,17 +52,20 @@ class LinkGenerator implements LinkGeneratorInterface {
    *   The url generator.
    * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
    *   The module handler.
+   * @param \Drupal\Core\Render\RendererInterface $renderer
+   *   The renderer service.
    */
-  public function __construct(UrlGeneratorInterface $url_generator, ModuleHandlerInterface $module_handler) {
+  public function __construct(UrlGeneratorInterface $url_generator, ModuleHandlerInterface $module_handler, RendererInterface $renderer) {
     $this->urlGenerator = $url_generator;
     $this->moduleHandler = $module_handler;
+    $this->renderer = $renderer;
   }
 
   /**
    * {@inheritdoc}
    */
-  public function generateFromLink(Link $link, $collect_cacheability_metadata = FALSE) {
-    return $this->generate($link->getText(), $link->getUrl(), $collect_cacheability_metadata);
+  public function generateFromLink(Link $link, $collect_bubbleable_metadata = FALSE) {
+    return $this->generate($link->getText(), $link->getUrl(), $collect_bubbleable_metadata);
   }
 
   /**
@@ -68,15 +80,14 @@ class LinkGenerator implements LinkGeneratorInterface {
    *
    * @see system_page_attachments()
    */
-  public function generate($text, Url $url, $collect_cacheability_metadata = FALSE) {
+  public function generate($text, Url $url, $collect_bubbleable_metadata = FALSE) {
     // Performance: avoid Url::toString() needing to retrieve the URL generator
     // service from the container.
     $url->setUrlGenerator($this->urlGenerator);
 
     // Start building a structured representation of our link to be altered later.
     $variables = array(
-      // @todo Inject the service when drupal_render() is converted to one.
-      'text' => is_array($text) ? drupal_render($text) : $text,
+      'text' => is_array($text) ? $this->renderer->render($text) : $text,
       'url' => $url,
       'options' => $url->getOptions(),
     );
@@ -96,6 +107,13 @@ class LinkGenerator implements LinkGeneratorInterface {
       $variables['options']['attributes']['hreflang'] = $variables['options']['language']->getId();
     }
 
+    // Ensure that query values are strings.
+    array_walk($variables['options']['query'], function(&$value) {
+      if ($value instanceof SafeStringInterface) {
+        $value = (string) $value;
+      }
+    });
+
     // Set the "active" class if the 'set_active_class' option is not empty.
     if (!empty($variables['options']['set_active_class']) && !$url->isExternal()) {
       // Add a "data-drupal-link-query" attribute to let the
@@ -131,11 +149,11 @@ class LinkGenerator implements LinkGeneratorInterface {
     unset($variables['options']['attributes']);
     $url->setOptions($variables['options']);
 
-    if (!$collect_cacheability_metadata) {
-      $url_string = $url->toString($collect_cacheability_metadata);
+    if (!$collect_bubbleable_metadata) {
+      $url_string = $url->toString($collect_bubbleable_metadata);
     }
     else {
-      $generated_url = $url->toString($collect_cacheability_metadata);
+      $generated_url = $url->toString($collect_bubbleable_metadata);
       $url_string = $generated_url->getGeneratedUrl();
       $generated_link = GeneratedLink::createFromObject($generated_url);
     }
@@ -145,7 +163,7 @@ class LinkGenerator implements LinkGeneratorInterface {
 
     $result = SafeMarkup::format('<a@attributes>@text</a>', array('@attributes' => new Attribute($attributes), '@text' => $variables['text']));
 
-    return $collect_cacheability_metadata ? $generated_link->setGeneratedLink($result) : $result;
+    return $collect_bubbleable_metadata ? $generated_link->setGeneratedLink($result) : $result;
   }
 
 }
diff --git a/core/lib/Drupal/Core/Utility/LinkGeneratorInterface.php b/core/lib/Drupal/Core/Utility/LinkGeneratorInterface.php
index b65526a00..733c449be 100644
--- a/core/lib/Drupal/Core/Utility/LinkGeneratorInterface.php
+++ b/core/lib/Drupal/Core/Utility/LinkGeneratorInterface.php
@@ -60,14 +60,14 @@ interface LinkGeneratorInterface {
    *     class will be applied to the link. It is important to use this
    *     sparingly since it is usually unnecessary and requires extra
    *     processing.
-   * @param bool $collect_cacheability_metadata
+   * @param bool $collect_bubbleable_metadata
    *   (optional) Defaults to FALSE. When TRUE, both the generated link and its
-   *   associated cacheability metadata are returned.
+   *   associated bubbleable metadata are returned.
    *
    * @return string|\Drupal\Core\GeneratedLink
    *   An HTML string containing a link to the given route and parameters.
-   *   When $collect_cacheability_metadata is TRUE, a GeneratedLink object is
-   *   returned, containing the generated link plus cacheability metadata.
+   *   When $collect_bubbleable_metadata is TRUE, a GeneratedLink object is
+   *   returned, containing the generated link plus bubbleable metadata.
    *
    * @throws \Symfony\Component\Routing\Exception\RouteNotFoundException
    *   Thrown when the named route doesn't exist.
@@ -77,22 +77,22 @@ interface LinkGeneratorInterface {
    *   Thrown when a parameter value for a placeholder is not correct because it
    *   does not match the requirement.
    */
-  public function generate($text, Url $url, $collect_cacheability_metadata = FALSE);
+  public function generate($text, Url $url, $collect_bubbleable_metadata = FALSE);
 
   /**
    * Renders a link from a link object.
    *
    * @param \Drupal\Core\Link $link
    *   A link object to convert to a string.
-   * @param bool $collect_cacheability_metadata
+   * @param bool $collect_bubbleable_metadata
    *   (optional) Defaults to FALSE. When TRUE, both the generated link and its
-   *   associated cacheability metadata are returned.
+   *   associated bubbleable metadata are returned.
    *
    * @return string|\Drupal\Core\GeneratedLink
    *   An HTML string containing a link to the given route and parameters.
-   *   When $collect_cacheability_metadata is TRUE, a GeneratedLink object is
-   *   returned, containing the generated link plus cacheability metadata.
+   *   When $collect_bubbleable_metadata is TRUE, a GeneratedLink object is
+   *   returned, containing the generated link plus bubbleable metadata.
    */
-  public function generateFromLink(Link $link, $collect_cacheability_metadata = FALSE);
+  public function generateFromLink(Link $link, $collect_bubbleable_metadata = FALSE);
 
 }
diff --git a/core/lib/Drupal/Core/Utility/Token.php b/core/lib/Drupal/Core/Utility/Token.php
index 075abb58d..9966726e5 100644
--- a/core/lib/Drupal/Core/Utility/Token.php
+++ b/core/lib/Drupal/Core/Utility/Token.php
@@ -8,11 +8,15 @@
 namespace Drupal\Core\Utility;
 
 use Drupal\Core\Cache\Cache;
+use Drupal\Core\Cache\CacheableDependencyInterface;
 use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\Cache\CacheTagsInvalidatorInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\Core\Language\LanguageManagerInterface;
+use Drupal\Core\Render\AttachmentsInterface;
+use Drupal\Core\Render\BubbleableMetadata;
+use Drupal\Core\Render\RendererInterface;
 
 /**
  * Drupal placeholder/token replacement system.
@@ -104,6 +108,13 @@ class Token {
    */
   protected $cacheTagsInvalidator;
 
+  /**
+   * The renderer.
+   *
+   * @var \Drupal\Core\Render\RendererInterface
+   */
+  protected $renderer;
+
   /**
    * Constructs a new class instance.
    *
@@ -115,12 +126,15 @@ class Token {
    *   The language manager.
    * @param \Drupal\Core\Cache\CacheTagsInvalidatorInterface $cache_tags_invalidator
    *   The cache tags invalidator.
+   * @param \Drupal\Core\Render\RendererInterface $renderer
+   *   The renderer.
    */
-  public function __construct(ModuleHandlerInterface $module_handler, CacheBackendInterface $cache, LanguageManagerInterface $language_manager, CacheTagsInvalidatorInterface $cache_tags_invalidator) {
+  public function __construct(ModuleHandlerInterface $module_handler, CacheBackendInterface $cache, LanguageManagerInterface $language_manager, CacheTagsInvalidatorInterface $cache_tags_invalidator, RendererInterface $renderer) {
     $this->cache = $cache;
     $this->languageManager = $language_manager;
     $this->moduleHandler = $module_handler;
     $this->cacheTagsInvalidator = $cache_tags_invalidator;
+    $this->renderer = $renderer;
   }
 
   /**
@@ -152,19 +166,39 @@ class Token {
    *     \Drupal\Component\Utility\Xss::filter(),
    *     \Drupal\Component\Utility\SafeMarkup::checkPlain() or other appropriate
    *     scrubbing functions before displaying data to users.
+   * @param \Drupal\Core\Render\BubbleableMetadata $bubbleable_metadata|null
+   *   (optional) An object to which static::generate() and the hooks and
+   *   functions that it invokes will add their required bubbleable metadata.
+   *
+   *   To ensure that the metadata associated with the token replacements gets
+   *   attached to the same render array that contains the token-replaced text,
+   *   callers of this method are encouraged to pass in a BubbleableMetadata
+   *   object and apply it to the corresponding render array. For example:
+   *   @code
+   *     $bubbleable_metadata = new BubbleableMetadata();
+   *     $build['#markup'] = $token_service->replace('Tokens: [node:nid] [current-user:uid]', ['node' => $node], [], $bubbleable_metadata);
+   *     $bubbleable_metadata->applyTo($build);
+   *   @endcode
+   *
+   *   When the caller does not pass in a BubbleableMetadata object, this
+   *   method creates a local one, and applies the collected metadata to the
+   *   Renderer's currently active render context.
    *
    * @return string
    *   Text with tokens replaced.
    */
-  public function replace($text, array $data = array(), array $options = array()) {
+  public function replace($text, array $data = array(), array $options = array(), BubbleableMetadata $bubbleable_metadata = NULL) {
     $text_tokens = $this->scan($text);
     if (empty($text_tokens)) {
       return $text;
     }
 
+    $bubbleable_metadata_is_passed_in = (bool) $bubbleable_metadata;
+    $bubbleable_metadata = $bubbleable_metadata ?: new BubbleableMetadata();
+
     $replacements = array();
     foreach ($text_tokens as $type => $tokens) {
-      $replacements += $this->generate($type, $tokens, $data, $options);
+      $replacements += $this->generate($type, $tokens, $data, $options, $bubbleable_metadata);
       if (!empty($options['clear'])) {
         $replacements += array_fill_keys($tokens, '');
       }
@@ -173,12 +207,20 @@ class Token {
     // Optionally alter the list of replacement values.
     if (!empty($options['callback'])) {
       $function = $options['callback'];
-      $function($replacements, $data, $options);
+      $function($replacements, $data, $options, $bubbleable_metadata);
     }
 
     $tokens = array_keys($replacements);
     $values = array_values($replacements);
 
+    // If a local $bubbleable_metadata object was created, apply the metadata
+    // it collected to the renderer's currently active render context.
+    if (!$bubbleable_metadata_is_passed_in && $this->renderer->hasRenderContext()) {
+      $build = [];
+      $bubbleable_metadata->applyTo($build);
+      $this->renderer->render($build);
+    }
+
     return str_replace($tokens, $values, $text);
   }
 
@@ -226,14 +268,14 @@ class Token {
    *   An array of tokens to be replaced, keyed by the literal text of the token
    *   as it appeared in the source text.
    * @param array $data
-   *   (optional) An array of keyed objects. For simple replacement scenarios
-   *   'node', 'user', and others are common keys, with an accompanying node or
-   *   user object being the value. Some token types, like 'site', do not require
+   *   An array of keyed objects. For simple replacement scenarios: 'node',
+   *   'user', and others are common keys, with an accompanying node or user
+   *   object being the value. Some token types, like 'site', do not require
    *   any explicit information from $data and can be replaced even if it is
    *   empty.
    * @param array $options
-   *   (optional) A keyed array of settings and flags to control the token
-   *   replacement process. Supported options are:
+   *   A keyed array of settings and flags to control the token replacement
+   *   process. Supported options are:
    *   - langcode: A language code to be used when generating locale-sensitive
    *     tokens.
    *   - callback: A callback function that will be used to post-process the
@@ -245,6 +287,9 @@ class Token {
    *     responsibility for running \Drupal\Component\Utility\Xss::filter(),
    *     \Drupal\Component\Utility\SafeMarkup::checkPlain() or other appropriate
    *     scrubbing functions before displaying data to users.
+   * @param \Drupal\Core\Render\BubbleableMetadata $bubbleable_metadata
+   *    The bubbleable metadata. This is passed to the token replacement
+   *    implementations so that they can attach their metadata.
    *
    * @return array
    *   An associative array of replacement values, keyed by the original 'raw'
@@ -254,9 +299,16 @@ class Token {
    * @see hook_tokens()
    * @see hook_tokens_alter()
    */
-  public function generate($type, array $tokens, array $data = array(), array $options = array()) {
+  public function generate($type, array $tokens, array $data, array $options, BubbleableMetadata $bubbleable_metadata) {
     $options += array('sanitize' => TRUE);
-    $replacements = $this->moduleHandler->invokeAll('tokens', array($type, $tokens, $data, $options));
+
+    foreach ($data as $object) {
+      if ($object instanceof CacheableDependencyInterface || $object instanceof AttachmentsInterface) {
+        $bubbleable_metadata->addCacheableDependency($object);
+      }
+    }
+
+    $replacements = $this->moduleHandler->invokeAll('tokens', [$type, $tokens, $data, $options, $bubbleable_metadata]);
 
     // Allow other modules to alter the replacements.
     $context = array(
@@ -265,7 +317,7 @@ class Token {
       'data' => $data,
       'options' => $options,
     );
-    $this->moduleHandler->alter('tokens', $replacements, $context);
+    $this->moduleHandler->alter('tokens', $replacements, $context, $bubbleable_metadata);
 
     return $replacements;
   }
diff --git a/core/lib/Drupal/Core/Utility/UnroutedUrlAssembler.php b/core/lib/Drupal/Core/Utility/UnroutedUrlAssembler.php
index 955680864..3c97c4452 100644
--- a/core/lib/Drupal/Core/Utility/UnroutedUrlAssembler.php
+++ b/core/lib/Drupal/Core/Utility/UnroutedUrlAssembler.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\Core\Utility;
 
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Utility\UrlHelper;
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\GeneratedUrl;
@@ -40,14 +39,13 @@ class UnroutedUrlAssembler implements UnroutedUrlAssemblerInterface {
    *
    * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack
    *   A request stack object.
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config
-   *    The config factory.
    * @param \Drupal\Core\PathProcessor\OutboundPathProcessorInterface $path_processor
    *   The output path processor.
+   * @param string[] $filter_protocols
+   *   (optional) An array of protocols allowed for URL generation.
    */
-  public function __construct(RequestStack $request_stack, ConfigFactoryInterface $config, OutboundPathProcessorInterface $path_processor) {
-    $allowed_protocols = $config->get('system.filter')->get('protocols') ?: ['http', 'https'];
-    UrlHelper::setAllowedProtocols($allowed_protocols);
+  public function __construct(RequestStack $request_stack, OutboundPathProcessorInterface $path_processor, array $filter_protocols = ['http', 'https']) {
+    UrlHelper::setAllowedProtocols($filter_protocols);
     $this->requestStack = $request_stack;
     $this->pathProcessor = $path_processor;
   }
@@ -58,24 +56,24 @@ class UnroutedUrlAssembler implements UnroutedUrlAssemblerInterface {
    * This is a helper function that calls buildExternalUrl() or buildLocalUrl()
    * based on a check of whether the path is a valid external URL.
    */
-  public function assemble($uri, array $options = [], $collect_cacheability_metadata = FALSE) {
+  public function assemble($uri, array $options = [], $collect_bubbleable_metadata = FALSE) {
     // Note that UrlHelper::isExternal will return FALSE if the $uri has a
     // disallowed protocol.  This is later made safe since we always add at
     // least a leading slash.
     if (parse_url($uri, PHP_URL_SCHEME) === 'base') {
-      return $this->buildLocalUrl($uri, $options, $collect_cacheability_metadata);
+      return $this->buildLocalUrl($uri, $options, $collect_bubbleable_metadata);
     }
     elseif (UrlHelper::isExternal($uri)) {
       // UrlHelper::isExternal() only returns true for safe protocols.
-      return $this->buildExternalUrl($uri, $options, $collect_cacheability_metadata);
+      return $this->buildExternalUrl($uri, $options, $collect_bubbleable_metadata);
     }
-    throw new \InvalidArgumentException(SafeMarkup::format('The URI "@uri" is invalid. You must use a valid URI scheme. Use base: for a path, e.g., to a Drupal file that needs the base path. Do not use this for internal paths controlled by Drupal.', ['@uri' => $uri]));
+    throw new \InvalidArgumentException("The URI '$uri' is invalid. You must use a valid URI scheme. Use base: for a path, e.g., to a Drupal file that needs the base path. Do not use this for internal paths controlled by Drupal.");
   }
 
   /**
    * {@inheritdoc}
    */
-  protected function buildExternalUrl($uri, array $options = [], $collect_cacheability_metadata = FALSE) {
+  protected function buildExternalUrl($uri, array $options = [], $collect_bubbleable_metadata = FALSE) {
     $this->addOptionDefaults($options);
     // Split off the fragment.
     if (strpos($uri, '#') !== FALSE) {
@@ -100,14 +98,14 @@ class UnroutedUrlAssembler implements UnroutedUrlAssemblerInterface {
     }
     // Reassemble.
     $url = $uri . $options['fragment'];
-    return $collect_cacheability_metadata ? (new GeneratedUrl())->setGeneratedUrl($url) : $url;
+    return $collect_bubbleable_metadata ? (new GeneratedUrl())->setGeneratedUrl($url) : $url;
   }
 
   /**
    * {@inheritdoc}
    */
-  protected function buildLocalUrl($uri, array $options = [], $collect_cacheability_metadata = FALSE) {
-    $generated_url = $collect_cacheability_metadata ? new GeneratedUrl() : NULL;
+  protected function buildLocalUrl($uri, array $options = [], $collect_bubbleable_metadata = FALSE) {
+    $generated_url = $collect_bubbleable_metadata ? new GeneratedUrl() : NULL;
 
     $this->addOptionDefaults($options);
     $request = $this->requestStack->getCurrentRequest();
@@ -149,7 +147,7 @@ class UnroutedUrlAssembler implements UnroutedUrlAssemblerInterface {
       else {
         $base = $current_base_url;
       }
-      if ($collect_cacheability_metadata) {
+      if ($collect_bubbleable_metadata) {
         $generated_url->addCacheContexts(['url.site']);
       }
     }
@@ -162,7 +160,7 @@ class UnroutedUrlAssembler implements UnroutedUrlAssemblerInterface {
     $uri = str_replace('%2F', '/', rawurlencode($prefix . $uri));
     $query = $options['query'] ? ('?' . UrlHelper::buildQuery($options['query'])) : '';
     $url = $base . $options['script'] . $uri . $query . $options['fragment'];
-    return $collect_cacheability_metadata ? $generated_url->setGeneratedUrl($url) : $url;
+    return $collect_bubbleable_metadata ? $generated_url->setGeneratedUrl($url) : $url;
   }
 
   /**
diff --git a/core/lib/Drupal/Core/Utility/UnroutedUrlAssemblerInterface.php b/core/lib/Drupal/Core/Utility/UnroutedUrlAssemblerInterface.php
index 9e8ca9071..858c4bfe6 100644
--- a/core/lib/Drupal/Core/Utility/UnroutedUrlAssemblerInterface.php
+++ b/core/lib/Drupal/Core/Utility/UnroutedUrlAssemblerInterface.php
@@ -44,18 +44,18 @@ interface UnroutedUrlAssemblerInterface {
    *   - 'https': Whether this URL should point to a secure location. If not
    *     defined, the current scheme is used, so the user stays on HTTP or HTTPS
    *     respectively. TRUE enforces HTTPS and FALSE enforces HTTP.
-   * @param bool $collect_cacheability_metadata
+   * @param bool $collect_bubbleable_metadata
    *   (optional) Defaults to FALSE. When TRUE, both the generated URL and its
-   *   associated cacheability metadata are returned.
+   *   associated bubbleable metadata are returned.
    *
    * @return string|\Drupal\Core\GeneratedUrl
    *   A string containing a relative or absolute URL.
-   *   When $collect_cacheability_metadata is TRUE, a GeneratedUrl object is
-   *   returned, containing the generated URL plus cacheability metadata.
+   *   When $collect_bubbleable_metadata is TRUE, a GeneratedUrl object is
+   *   returned, containing the generated URL plus bubbleable metadata.
    *
    * @throws \InvalidArgumentException
    *   Thrown when the passed in path has no scheme.
    */
-  public function assemble($uri, array $options = array(), $collect_cacheability_metadata = FALSE);
+  public function assemble($uri, array $options = array(), $collect_bubbleable_metadata = FALSE);
 
 }
diff --git a/core/lib/Drupal/Core/Utility/token.api.php b/core/lib/Drupal/Core/Utility/token.api.php
index 51133de50..d2d87edf0 100644
--- a/core/lib/Drupal/Core/Utility/token.api.php
+++ b/core/lib/Drupal/Core/Utility/token.api.php
@@ -34,22 +34,43 @@ use Drupal\user\Entity\User;
  *   An array of tokens to be replaced. The keys are the machine-readable token
  *   names, and the values are the raw [type:token] strings that appeared in the
  *   original text.
- * @param $data
- *   (optional) An associative array of data objects to be used when generating
- *   replacement values, as supplied in the $data parameter to
- *   \Drupal\Core\Utility\Token::replace().
- * @param $options
- *   (optional) An associative array of options for token replacement; see
+ * @param array $data
+ *   An associative array of data objects to be used when generating replacement
+ *   values, as supplied in the $data parameter to
+ *  \Drupal\Core\Utility\Token::replace().
+ * @param array $options
+ *   An associative array of options for token replacement; see
  *   \Drupal\Core\Utility\Token::replace() for possible values.
+ * @param \Drupal\Core\Render\BubbleableMetadata $bubbleable_metadata
+ *   The bubbleable metadata. Prior to invoking this hook,
+ *   \Drupal\Core\Utility\Token::generate() collects metadata for all of the
+ *   data objects in $data. For any data sources not in $data, but that are
+ *   used by the token replacement logic, such as global configuration (e.g.,
+ *   'system.site') and related objects (e.g., $node->getOwner()),
+ *   implementations of this hook must add the corresponding metadata.
+ *   For example:
+ *   @code
+ *     $bubbleable_metadata->addCacheableDependency(\Drupal::config('system.site'));
+ *     $bubbleable_metadata->addCacheableDependency($node->getOwner());
+ *   @endcode
  *
- * @return
+ *   Additionally, implementations of this hook, must forward
+ *   $bubbleable_metadata to the chained tokens that they invoke.
+ *   For example:
+ *   @code
+ *     if ($created_tokens = $token_service->findWithPrefix($tokens, 'created')) {
+ *       $replacements = $token_service->generate('date', $created_tokens, array('date' => $node->getCreatedTime()), $options, $bubbleable_metadata);
+ *     }
+ *   @endcode
+ *
+ * @return array
  *   An associative array of replacement values, keyed by the raw [type:token]
  *   strings from the original text.
  *
  * @see hook_token_info()
  * @see hook_tokens_alter()
  */
-function hook_tokens($type, $tokens, array $data = array(), array $options = array()) {
+function hook_tokens($type, $tokens, array $data, array $options, \Drupal\Core\Render\BubbleableMetadata $bubbleable_metadata) {
   $token_service = \Drupal::token();
 
   $url_options = array('absolute' => TRUE);
@@ -87,6 +108,7 @@ function hook_tokens($type, $tokens, array $data = array(), array $options = arr
         case 'author':
           $account = $node->getOwner() ? $node->getOwner() : User::load(0);
           $replacements[$original] = $sanitize ? SafeMarkup::checkPlain($account->label()) : $account->label();
+          $bubbleable_metadata->addCacheableDependency($account);
           break;
 
         case 'created':
@@ -96,11 +118,11 @@ function hook_tokens($type, $tokens, array $data = array(), array $options = arr
     }
 
     if ($author_tokens = $token_service->findWithPrefix($tokens, 'author')) {
-      $replacements = $token_service->generate('user', $author_tokens, array('user' => $node->getOwner()), $options);
+      $replacements = $token_service->generate('user', $author_tokens, array('user' => $node->getOwner()), $options, $bubbleable_metadata);
     }
 
     if ($created_tokens = $token_service->findWithPrefix($tokens, 'created')) {
-      $replacements = $token_service->generate('date', $created_tokens, array('date' => $node->getCreatedTime()), $options);
+      $replacements = $token_service->generate('date', $created_tokens, array('date' => $node->getCreatedTime()), $options, $bubbleable_metadata);
     }
   }
 
@@ -120,10 +142,14 @@ function hook_tokens($type, $tokens, array $data = array(), array $options = arr
  *   - 'tokens'
  *   - 'data'
  *   - 'options'
+ * @param \Drupal\Core\Render\BubbleableMetadata $bubbleable_metadata
+ *   The bubbleable metadata. In case you alter an existing token based upon
+ *   a data source that isn't in $context['data'], you must add that
+ *   dependency to $bubbleable_metadata.
  *
  * @see hook_tokens()
  */
-function hook_tokens_alter(array &$replacements, array $context) {
+function hook_tokens_alter(array &$replacements, array $context, \Drupal\Core\Render\BubbleableMetadata $bubbleable_metadata) {
   $options = $context['options'];
 
   if (isset($options['langcode'])) {
diff --git a/core/misc/date.js b/core/misc/date.js
new file mode 100644
index 000000000..fe2a23999
--- /dev/null
+++ b/core/misc/date.js
@@ -0,0 +1,56 @@
+/**
+ * @file
+ * Polyfill for HTML5 date input.
+ */
+
+(function ($, Modernizr, Drupal) {
+
+  "use strict";
+
+  /**
+   * Attach datepicker fallback on date elements.
+   *
+   * @type {Drupal~behavior}
+   *
+   * @prop {Drupal~behaviorAttach} attach
+   *   Attaches the behavior. Accepts in `settings.date` an object listing
+   *   elements to process, keyed by the HTML ID of the form element containing
+   *   the human-readable value. Each element is an datepicker settings object.
+   * @prop {Drupal~behaviorDetach} detach
+   *   Detach the behavior destroying datepickers on effected elements.
+   */
+  Drupal.behaviors.date = {
+    attach: function (context, settings) {
+      var $context = $(context);
+      // Skip if date are supported by the browser.
+      if (Modernizr.inputtypes.date === true) {
+        return;
+      }
+      $context.find('input[data-drupal-date-format]').once('datePicker').each(function () {
+        var $input = $(this);
+        var datepickerSettings = {};
+        var dateFormat = $input.data('drupalDateFormat');
+        // The date format is saved in PHP style, we need to convert to jQuery
+        // datepicker.
+        datepickerSettings.dateFormat = dateFormat
+          .replace('Y', 'yy')
+          .replace('m', 'mm')
+          .replace('d', 'dd');
+        // Add min and max date if set on the input.
+        if ($input.attr('min')) {
+          datepickerSettings.minDate = $input.attr('min');
+        }
+        if ($input.attr('max')) {
+          datepickerSettings.maxDate = $input.attr('max');
+        }
+        $input.datepicker(datepickerSettings);
+      });
+    },
+    detach: function (context, settings, trigger) {
+      if (trigger === 'unload') {
+        $(context).find('input[data-drupal-date-format]').findOnce('datePicker').datepicker('destroy');
+      }
+    }
+  };
+
+})(jQuery, Modernizr, Drupal);
diff --git a/core/misc/dialog/dialog.ajax.js b/core/misc/dialog/dialog.ajax.js
index 47f685229..a18ad23e0 100644
--- a/core/misc/dialog/dialog.ajax.js
+++ b/core/misc/dialog/dialog.ajax.js
@@ -67,6 +67,7 @@
         // "display: none", we set its dimensions to zero.
         // See http://mattsnider.com/how-forms-submit-when-pressing-enter/
         var $originalButton = $(this).css({
+          display: 'block',
           width: 0,
           height: 0,
           padding: 0,
@@ -101,7 +102,7 @@
     var $dialog = $(response.selector);
     if (!$dialog.length) {
       // Create the element if needed.
-      $dialog = $('<div id="' + response.selector.replace(/^#/, '') + '"/>').appendTo('body');
+      $dialog = $('<div id="' + response.selector.replace(/^#/, '') + '" class="ui-front"/>').appendTo('body');
     }
     // Set up the wrapper, if there isn't one.
     if (!ajax.wrapper) {
diff --git a/core/modules/action/action.permissions.yml b/core/modules/action/action.permissions.yml
index 0f00dcd83..03b5a449e 100644
--- a/core/modules/action/action.permissions.yml
+++ b/core/modules/action/action.permissions.yml
@@ -1,2 +1,3 @@
 administer actions:
   title: 'Administer actions'
+  restrict access: true
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_action_settings.yml b/core/modules/action/migration_templates/d6_action_settings.yml
similarity index 81%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_action_settings.yml
rename to core/modules/action/migration_templates/d6_action_settings.yml
index 1a518fbff..a1b626561 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_action_settings.yml
+++ b/core/modules/action/migration_templates/d6_action_settings.yml
@@ -11,7 +11,3 @@ process:
 destination:
   plugin: config
   config_name: action.settings
-dependencies:
-  module:
-    - action
-    - migrate_drupal
diff --git a/core/modules/action/src/ActionFormBase.php b/core/modules/action/src/ActionFormBase.php
index bdddc9818..0b972d493 100644
--- a/core/modules/action/src/ActionFormBase.php
+++ b/core/modules/action/src/ActionFormBase.php
@@ -123,8 +123,8 @@ abstract class ActionFormBase extends EntityForm {
   /**
    * {@inheritdoc}
    */
-  public function validate(array $form, FormStateInterface $form_state) {
-    parent::validate($form, $form_state);
+  public function validateForm(array &$form, FormStateInterface $form_state) {
+    parent::validateForm($form, $form_state);
 
     if ($this->plugin instanceof PluginFormInterface) {
       $this->plugin->validateConfigurationForm($form, $form_state);
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Action.php b/core/modules/action/src/Plugin/migrate/source/d6/Action.php
similarity index 88%
rename from core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Action.php
rename to core/modules/action/src/Plugin/migrate/source/d6/Action.php
index d3c753302..2ca774117 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Action.php
+++ b/core/modules/action/src/Plugin/migrate/source/d6/Action.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\Action.
+ * Contains \Drupal\action\Plugin\migrate\source\d6\Action.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+namespace Drupal\action\Plugin\migrate\source\d6;
 
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateActionConfigsTest.php b/core/modules/action/src/Tests/Migrate/d6/MigrateActionConfigsTest.php
similarity index 65%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateActionConfigsTest.php
rename to core/modules/action/src/Tests/Migrate/d6/MigrateActionConfigsTest.php
index 533cd3c5c..b4b254065 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateActionConfigsTest.php
+++ b/core/modules/action/src/Tests/Migrate/d6/MigrateActionConfigsTest.php
@@ -2,19 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateActionConfigsTest.
+ * Contains \Drupal\action\Tests\Migrate\d6\MigrateActionConfigsTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\action\Tests\Migrate\d6;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to action.settings.yml.
  *
- * @group migrate_drupal
+ * @group action
  */
 class MigrateActionConfigsTest extends MigrateDrupal6TestBase {
 
@@ -32,13 +31,8 @@ class MigrateActionConfigsTest extends MigrateDrupal6TestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $migration = entity_load('migration', 'd6_action_settings');
-    $dumps = array(
-      $this->getDumpDirectory() . '/Variable.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->loadDumps(['Variable.php']);
+    $this->executeMigration('d6_action_settings');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/ActionTest.php b/core/modules/action/tests/src/Unit/Plugin/migrate/source/d6/ActionTest.php
similarity index 88%
rename from core/modules/migrate_drupal/tests/src/Unit/source/d6/ActionTest.php
rename to core/modules/action/tests/src/Unit/Plugin/migrate/source/d6/ActionTest.php
index cc88aef09..c45ebee64 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/ActionTest.php
+++ b/core/modules/action/tests/src/Unit/Plugin/migrate/source/d6/ActionTest.php
@@ -2,23 +2,23 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\ActionTest.
+ * Contains \Drupal\Tests\action\Unit\Plugin\migrate\source\d6\ActionTest.
  */
 
-namespace Drupal\Tests\migrate_drupal\Unit\source\d6;
+namespace Drupal\Tests\action\Unit\Plugin\migrate\source\d6;
 
 use Drupal\Tests\migrate\Unit\MigrateSqlSourceTestCase;
 
 /**
  * Tests D6 actions source plugin.
  *
- * @group migrate_drupal
+ * @group action
  */
 class ActionTest extends MigrateSqlSourceTestCase {
 
   // The plugin system is not working during unit testing so the source plugin
   // class needs to be manually specified.
-  const PLUGIN_CLASS = 'Drupal\migrate_drupal\Plugin\migrate\source\d6\Action';
+  const PLUGIN_CLASS = 'Drupal\action\Plugin\migrate\source\d6\Action';
 
   // The fake Migration configuration entity.
   protected $migrationConfiguration = array(
diff --git a/core/modules/aggregator/aggregator.module b/core/modules/aggregator/aggregator.module
index 29ba9fc65..744861cf6 100644
--- a/core/modules/aggregator/aggregator.module
+++ b/core/modules/aggregator/aggregator.module
@@ -6,7 +6,7 @@
  */
 
 use Drupal\aggregator\Entity\Feed;
-use Drupal\Component\Utility\Xss;
+use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Routing\RouteMatchInterface;
 
 /**
@@ -166,7 +166,7 @@ function aggregator_cron() {
  *   The filtered content.
  */
 function aggregator_filter_xss($value) {
-  return Xss::filter($value, preg_split('/\s+|<|>/', \Drupal::config('aggregator.settings')->get('items.allowed_html'), -1, PREG_SPLIT_NO_EMPTY));
+  return SafeMarkup::xssFilter($value, preg_split('/\s+|<|>/', \Drupal::config('aggregator.settings')->get('items.allowed_html'), -1, PREG_SPLIT_NO_EMPTY));
 }
 
 /**
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_aggregator_feed.yml b/core/modules/aggregator/migration_templates/d6_aggregator_feed.yml
similarity index 84%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_aggregator_feed.yml
rename to core/modules/aggregator/migration_templates/d6_aggregator_feed.yml
index 2daaa8a8d..e94ae9e46 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_aggregator_feed.yml
+++ b/core/modules/aggregator/migration_templates/d6_aggregator_feed.yml
@@ -4,7 +4,6 @@ migration_tags:
   - Drupal 6
 source:
   plugin: d6_aggregator_feed
-
 process:
   fid: fid
   title: title
@@ -16,10 +15,5 @@ process:
   image: image
   etag: etag
   modified: modified
-
 destination:
   plugin: entity:aggregator_feed
-dependencies:
-  module:
-    - aggregator
-    - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_aggregator_item.yml b/core/modules/aggregator/migration_templates/d6_aggregator_item.yml
similarity index 79%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_aggregator_item.yml
rename to core/modules/aggregator/migration_templates/d6_aggregator_item.yml
index aa80302e8..615c55013 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_aggregator_item.yml
+++ b/core/modules/aggregator/migration_templates/d6_aggregator_item.yml
@@ -22,9 +22,3 @@ destination:
 migration_dependencies:
   required:
     - d6_aggregator_feed
-dependencies:
-  config:
-    - migrate.migration.d6_aggregator_feed
-  module:
-    - aggregator
-    - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_aggregator_settings.yml b/core/modules/aggregator/migration_templates/d6_aggregator_settings.yml
similarity index 91%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_aggregator_settings.yml
rename to core/modules/aggregator/migration_templates/d6_aggregator_settings.yml
index 9720f6e5a..5b8e6059a 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_aggregator_settings.yml
+++ b/core/modules/aggregator/migration_templates/d6_aggregator_settings.yml
@@ -23,7 +23,3 @@ process:
 destination:
   plugin: config
   config_name: aggregator.settings
-dependencies:
-  module:
-    - aggregator
-    - migrate_drupal
diff --git a/core/modules/aggregator/migration_templates/d7_aggregator_settings.yml b/core/modules/aggregator/migration_templates/d7_aggregator_settings.yml
new file mode 100644
index 000000000..a60d7e35d
--- /dev/null
+++ b/core/modules/aggregator/migration_templates/d7_aggregator_settings.yml
@@ -0,0 +1,25 @@
+id: d7_aggregator_settings
+label: Drupal 7 aggregator configuration
+migration_tags:
+  - Drupal 7
+source:
+  plugin: variable
+  variables:
+    - aggregator_fetcher
+    - aggregator_parser
+    - aggregator_processors
+    - aggregator_allowed_html_tags
+    - aggregator_teaser_length
+    - aggregator_clear
+    - aggregator_summary_items
+process:
+  fetcher: aggregator_fetcher
+  parser: aggregator_parser
+  processors: aggregator_processors
+  'items/allowed_html': aggregator_allowed_html_tags
+  'items/teaser_length': aggregator_teaser_length
+  'items/expire': aggregator_clear
+  'source/list_max': aggregator_summary_items
+destination:
+  plugin: config
+  config_name: aggregator.settings
diff --git a/core/modules/aggregator/src/Controller/AggregatorController.php b/core/modules/aggregator/src/Controller/AggregatorController.php
index eaa82e599..13ff3d9ae 100644
--- a/core/modules/aggregator/src/Controller/AggregatorController.php
+++ b/core/modules/aggregator/src/Controller/AggregatorController.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\aggregator\Controller;
 
-use Drupal\Component\Utility\Xss;
+use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\Datetime\DateFormatter;
 use Drupal\aggregator\FeedInterface;
@@ -187,7 +187,7 @@ class AggregatorController extends ControllerBase {
    *   The feed label.
    */
   public function feedTitle(FeedInterface $aggregator_feed) {
-    return Xss::filter($aggregator_feed->label());
+    return SafeMarkup::xssFilter($aggregator_feed->label());
   }
 
 }
diff --git a/core/modules/aggregator/src/Entity/Item.php b/core/modules/aggregator/src/Entity/Item.php
index 6986aaaa8..92c3b7963 100644
--- a/core/modules/aggregator/src/Entity/Item.php
+++ b/core/modules/aggregator/src/Entity/Item.php
@@ -225,13 +225,15 @@ class Item extends ContentEntityBase implements ItemInterface {
     // handles the regular cases. The Item entity has one special case: a newly
     // created Item is *also* associated with a Feed, so we must invalidate the
     // associated Feed's cache tag.
-    Cache::invalidateTags($this->getCacheTags());
+    if (!$update) {
+      Cache::invalidateTags($this->getCacheTagsToInvalidate());
+    }
   }
 
   /**
    * {@inheritdoc}
    */
-  public function getCacheTags() {
+  public function getCacheTagsToInvalidate() {
     return Feed::load($this->getFeedId())->getCacheTags();
   }
 
diff --git a/core/modules/aggregator/src/Form/OpmlFeedAdd.php b/core/modules/aggregator/src/Form/OpmlFeedAdd.php
index 93437b182..357d0dc3f 100644
--- a/core/modules/aggregator/src/Form/OpmlFeedAdd.php
+++ b/core/modules/aggregator/src/Form/OpmlFeedAdd.php
@@ -122,7 +122,7 @@ class OpmlFeedAdd extends FormBase {
       // @todo Move this to a fetcher implementation.
       try {
         $response = $this->httpClient->get($form_state->getValue('remote'));
-        $data = $response->getBody(TRUE);
+        $data = (string) $response->getBody();
       }
       catch (RequestException $e) {
         $this->logger('aggregator')->warning('Failed to download OPML file due to "%error".', array('%error' => $e->getMessage()));
diff --git a/core/modules/aggregator/src/Plugin/Block/AggregatorFeedBlock.php b/core/modules/aggregator/src/Plugin/Block/AggregatorFeedBlock.php
index fcc25848a..ec424a97e 100644
--- a/core/modules/aggregator/src/Plugin/Block/AggregatorFeedBlock.php
+++ b/core/modules/aggregator/src/Plugin/Block/AggregatorFeedBlock.php
@@ -154,32 +154,27 @@ class AggregatorFeedBlock extends BlockBase implements ContainerFactoryPluginInt
         ->sort('iid', 'DESC')
         ->execute();
 
-      $items = $this->itemStorage->loadMultiple($result);
+      if ($result) {
+        // Only display the block if there are items to show.
+        $items = $this->itemStorage->loadMultiple($result);
 
-      $more_link = array(
-        '#type' => 'more_link',
-        '#url' => $feed->urlInfo(),
-        '#attributes' => array('title' => $this->t("View this feed's recent news.")),
-      );
-      $read_more = drupal_render($more_link);
-      $rendered_items = array();
-      foreach ($items as $item) {
-        $aggregator_block_item = array(
-          '#type' => 'link',
-          '#url' => $item->urlInfo(),
-          '#title' => $item->label(),
-        );
-        $rendered_items[] = drupal_render($aggregator_block_item);
-      }
-      // Only display the block if there are items to show.
-      if (count($rendered_items) > 0) {
-        $item_list = array(
+        $build['list'] = [
           '#theme' => 'item_list',
-          '#items' => $rendered_items,
-        );
-        return array(
-          '#children' => drupal_render($item_list) . $read_more,
-        );
+          '#items' => [],
+        ];
+        foreach ($items as $item) {
+          $build['list']['#items'][$item->id()] = [
+            '#type' => 'link',
+            '#url' => $item->urlInfo(),
+            '#title' => $item->label(),
+          ];
+        }
+        $build['more_link'] = [
+          '#type' => 'more_link',
+          '#url' => $feed->urlInfo(),
+          '#attributes' => ['title' => $this->t("View this feed's recent news.")],
+        ];
+        return $build;
       }
     }
   }
diff --git a/core/modules/aggregator/src/Plugin/aggregator/fetcher/DefaultFetcher.php b/core/modules/aggregator/src/Plugin/aggregator/fetcher/DefaultFetcher.php
index be12c43b9..c9e6f929c 100644
--- a/core/modules/aggregator/src/Plugin/aggregator/fetcher/DefaultFetcher.php
+++ b/core/modules/aggregator/src/Plugin/aggregator/fetcher/DefaultFetcher.php
@@ -10,9 +10,13 @@ namespace Drupal\aggregator\Plugin\aggregator\fetcher;
 use Drupal\aggregator\Plugin\FetcherInterface;
 use Drupal\aggregator\FeedInterface;
 use Drupal\Component\Datetime\DateTimePlus;
+use Drupal\Core\Http\ClientFactory;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Exception\RequestException;
+use GuzzleHttp\Psr7\Request;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\UriInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -32,9 +36,9 @@ class DefaultFetcher implements FetcherInterface, ContainerFactoryPluginInterfac
   /**
    * The HTTP client to fetch the feed data with.
    *
-   * @var \GuzzleHttp\ClientInterface
+   * @var \Drupal\Core\Http\ClientFactory
    */
-  protected $httpClient;
+  protected $httpClientFactory;
 
   /**
    * A logger instance.
@@ -46,13 +50,13 @@ class DefaultFetcher implements FetcherInterface, ContainerFactoryPluginInterfac
   /**
    * Constructs a DefaultFetcher object.
    *
-   * @param \GuzzleHttp\ClientInterface $http_client
+   * @param \Drupal\Core\Http\ClientFactory $http_client_factory
    *   A Guzzle client object.
    * @param \Psr\Log\LoggerInterface $logger
    *   A logger instance.
    */
-  public function __construct(ClientInterface $http_client, LoggerInterface $logger) {
-    $this->httpClient = $http_client;
+  public function __construct(ClientFactory $http_client_factory, LoggerInterface $logger) {
+    $this->httpClientFactory = $http_client_factory;
     $this->logger = $logger;
   }
 
@@ -61,7 +65,7 @@ class DefaultFetcher implements FetcherInterface, ContainerFactoryPluginInterfac
    */
   public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
     return new static(
-      $container->get('http_client'),
+      $container->get('http_client_factory'),
       $container->get('logger.factory')->get('aggregator')
     );
   }
@@ -70,19 +74,26 @@ class DefaultFetcher implements FetcherInterface, ContainerFactoryPluginInterfac
    * {@inheritdoc}
    */
   public function fetch(FeedInterface $feed) {
-    $request = $this->httpClient->createRequest('GET', $feed->getUrl());
+    $request = new Request('GET', $feed->getUrl());
     $feed->source_string = FALSE;
 
     // Generate conditional GET headers.
     if ($feed->getEtag()) {
-      $request->addHeader('If-None-Match', $feed->getEtag());
+      $request = $request->withAddedHeader('If-None-Match', $feed->getEtag());
     }
     if ($feed->getLastModified()) {
-      $request->addHeader('If-Modified-Since', gmdate(DateTimePlus::RFC7231, $feed->getLastModified()));
+      $request = $request->withAddedHeader('If-Modified-Since', gmdate(DateTimePlus::RFC7231, $feed->getLastModified()));
     }
 
     try {
-      $response = $this->httpClient->send($request);
+
+      /** @var \Psr\Http\Message\UriInterface $actual_uri */
+      $actual_uri = NULL;
+      $response = $this->httpClientFactory->fromOptions(['allow_redirects' => [
+        'on_redirect' => function(RequestInterface $request, ResponseInterface $response, UriInterface $uri) use (&$actual_uri) {
+          $actual_uri = (string) $uri;
+        }
+      ]])->send($request);
 
       // In case of a 304 Not Modified, there is no new content, so return
       // FALSE.
@@ -91,13 +102,17 @@ class DefaultFetcher implements FetcherInterface, ContainerFactoryPluginInterfac
       }
 
       $feed->source_string = (string) $response->getBody();
-      $feed->setEtag($response->getHeader('ETag'));
-      $feed->setLastModified(strtotime($response->getHeader('Last-Modified')));
+      if ($response->hasHeader('ETag')) {
+        $feed->setEtag($response->getHeaderLine('ETag'));
+      }
+      if ($response->hasHeader('Last-Modified')) {
+        $feed->setLastModified(strtotime($response->getHeaderLine('Last-Modified')));
+      }
       $feed->http_headers = $response->getHeaders();
 
       // Update the feed URL in case of a 301 redirect.
-      if ($response->getEffectiveUrl() != $feed->getUrl()) {
-        $feed->setUrl($response->getEffectiveUrl());
+      if ($actual_uri && $actual_uri !== $feed->getUrl()) {
+        $feed->setUrl($actual_uri);
       }
       return TRUE;
     }
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/AggregatorFeed.php b/core/modules/aggregator/src/Plugin/migrate/source/d6/AggregatorFeed.php
similarity index 92%
rename from core/modules/migrate_drupal/src/Plugin/migrate/source/d6/AggregatorFeed.php
rename to core/modules/aggregator/src/Plugin/migrate/source/d6/AggregatorFeed.php
index 849599ee7..442886267 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/AggregatorFeed.php
+++ b/core/modules/aggregator/src/Plugin/migrate/source/d6/AggregatorFeed.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\AggregatorFeed.
+ * Contains \Drupal\aggregator\Plugin\migrate\source\d6\AggregatorFeed.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+namespace Drupal\aggregator\Plugin\migrate\source\d6;
 
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/AggregatorItem.php b/core/modules/aggregator/src/Plugin/migrate/source/d6/AggregatorItem.php
similarity index 90%
rename from core/modules/migrate_drupal/src/Plugin/migrate/source/d6/AggregatorItem.php
rename to core/modules/aggregator/src/Plugin/migrate/source/d6/AggregatorItem.php
index 765656049..1c4677eae 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/AggregatorItem.php
+++ b/core/modules/aggregator/src/Plugin/migrate/source/d6/AggregatorItem.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\AggregatorItem.
+ * Contains \Drupal\aggregator\Plugin\migrate\source\d6\AggregatorItem.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+namespace Drupal\aggregator\Plugin\migrate\source\d6;
 
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 
diff --git a/core/modules/aggregator/src/Tests/FeedParserTest.php b/core/modules/aggregator/src/Tests/FeedParserTest.php
index df8c9bf7c..6da2ec8eb 100644
--- a/core/modules/aggregator/src/Tests/FeedParserTest.php
+++ b/core/modules/aggregator/src/Tests/FeedParserTest.php
@@ -26,11 +26,6 @@ class FeedParserTest extends AggregatorTestBase {
     // feeds have hardcoded dates in them (which may be expired when this test
     // is run).
     $this->config('aggregator.settings')->set('items.expire', AGGREGATOR_CLEAR_NEVER)->save();
-    // Reset any reader cache between tests.
-    Reader::reset();
-    // Set our bridge extension manager to Zend Feed.
-    $bridge = $this->container->get('feed.bridge.reader');
-    Reader::setExtensionManager($bridge);
   }
 
   /**
@@ -68,6 +63,15 @@ class FeedParserTest extends AggregatorTestBase {
     $this->assertLinkByHref('http://example.org/2003/12/13/atom03');
     $this->assertText('Some text.');
     $this->assertEqual('urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a', db_query('SELECT guid FROM {aggregator_item} WHERE link = :link', array(':link' => 'http://example.org/2003/12/13/atom03'))->fetchField(), 'Atom entry id element is parsed correctly.');
+
+    // Check for second feed entry.
+    $this->assertText('We tried to stop them, but we failed.');
+    $this->assertLinkByHref('http://example.org/2003/12/14/atom03');
+    $this->assertText('Some other text.');
+    $db_guid = db_query('SELECT guid FROM {aggregator_item} WHERE link = :link', array(
+      ':link' => 'http://example.org/2003/12/14/atom03',
+    ))->fetchField();
+    $this->assertEqual('urn:uuid:1225c695-cfb8-4ebb-bbbb-80da344efa6a', $db_guid, 'Atom entry id element is parsed correctly.');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateAggregatorConfigsTest.php b/core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorConfigsTest.php
similarity index 74%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateAggregatorConfigsTest.php
rename to core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorConfigsTest.php
index 69876f3cd..33d089340 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateAggregatorConfigsTest.php
+++ b/core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorConfigsTest.php
@@ -2,19 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateAggregatorConfigsTest.
+ * Contains \Drupal\aggregator\Tests\Migrate\d6\MigrateAggregatorConfigsTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\aggregator\Tests\Migrate\d6;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to aggregator.settings.yml.
  *
- * @group migrate_drupal
+ * @group aggregator
  */
 class MigrateAggregatorConfigsTest extends MigrateDrupal6TestBase {
 
@@ -32,13 +31,8 @@ class MigrateAggregatorConfigsTest extends MigrateDrupal6TestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $migration = entity_load('migration', 'd6_aggregator_settings');
-    $dumps = array(
-      $this->getDumpDirectory() . '/Variable.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->loadDumps(['Variable.php']);
+    $this->executeMigration('d6_aggregator_settings');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateAggregatorFeedTest.php b/core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorFeedTest.php
similarity index 76%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateAggregatorFeedTest.php
rename to core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorFeedTest.php
index 958d6bcb9..2264e285b 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateAggregatorFeedTest.php
+++ b/core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorFeedTest.php
@@ -2,19 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateAggregatorFeedTest.
+ * Contains \Drupal\aggregator\Tests\Migrate\d6\MigrateAggregatorFeedTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\aggregator\Tests\Migrate\d6;
 
 use Drupal\aggregator\Entity\Feed;
-use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to aggregator_feed entities.
  *
- * @group migrate_drupal
+ * @group aggregator
  */
 class MigrateAggregatorFeedTest extends MigrateDrupal6TestBase {
 
@@ -26,14 +25,8 @@ class MigrateAggregatorFeedTest extends MigrateDrupal6TestBase {
   protected function setUp() {
     parent::setUp();
     $this->installEntitySchema('aggregator_feed');
-
-    $migration = entity_load('migration', 'd6_aggregator_feed');
-    $dumps = array(
-      $this->getDumpDirectory() . '/AggregatorFeed.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->loadDumps(['AggregatorFeed.php']);
+    $this->executeMigration('d6_aggregator_feed');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateAggregatorItemTest.php b/core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorItemTest.php
similarity index 76%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateAggregatorItemTest.php
rename to core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorItemTest.php
index 9e075ba16..20e4ad784 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateAggregatorItemTest.php
+++ b/core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorItemTest.php
@@ -2,20 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateAggregatorItemTest.
+ * Contains \Drupal\aggregator\Tests\Migrate\d6\MigrateAggregatorItemTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\aggregator\Tests\Migrate\d6;
 
 use Drupal\aggregator\Entity\Item;
-use Drupal\Core\Language\LanguageInterface;
-use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade aggregator items.
  *
- * @group migrate_drupal
+ * @group aggregator
  */
 class MigrateAggregatorItemTest extends MigrateDrupal6TestBase {
 
@@ -47,14 +45,8 @@ class MigrateAggregatorItemTest extends MigrateDrupal6TestBase {
     ));
     $entity->enforceIsNew();
     $entity->save();
-    /** @var \Drupal\migrate\entity\Migration $migration */
-    $migration = entity_load('migration', 'd6_aggregator_item');
-    $dumps = array(
-      $this->getDumpDirectory() . '/AggregatorItem.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->loadDumps(['AggregatorItem.php']);
+    $this->executeMigration('d6_aggregator_item');
   }
 
   /**
diff --git a/core/modules/aggregator/src/Tests/Migrate/d7/MigrateAggregatorSettingsTest.php b/core/modules/aggregator/src/Tests/Migrate/d7/MigrateAggregatorSettingsTest.php
new file mode 100644
index 000000000..b95835f39
--- /dev/null
+++ b/core/modules/aggregator/src/Tests/Migrate/d7/MigrateAggregatorSettingsTest.php
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\aggregator\Tests\Migrate\d7\MigrateAggregatorSettingsTest.
+ */
+
+namespace Drupal\aggregator\Tests\Migrate\d7;
+
+use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+
+/**
+ * Tests migration of Aggregator's variables to configuration.
+ *
+ * @group aggregator
+ */
+class MigrateAggregatorSettingsTest extends MigrateDrupal7TestBase {
+
+  public static $modules = ['aggregator'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(static::$modules);
+    $this->loadDumps(['Variable.php']);
+    $this->executeMigration('d7_aggregator_settings');
+  }
+
+  /**
+   * Tests migration of Aggregator variables to configuration.
+   */
+  public function testMigration() {
+    $config = \Drupal::config('aggregator.settings')->get();
+    $this->assertIdentical('aggregator', $config['fetcher']);
+    $this->assertIdentical('aggregator', $config['parser']);
+    $this->assertIdentical(['aggregator'], $config['processors']);
+    $this->assertIdentical('<p> <div> <a>', $config['items']['allowed_html']);
+    $this->assertIdentical(500, $config['items']['teaser_length']);
+    $this->assertIdentical(86400, $config['items']['expire']);
+    $this->assertIdentical(6, $config['source']['list_max']);
+  }
+
+}
diff --git a/core/modules/aggregator/src/Tests/Views/IntegrationTest.php b/core/modules/aggregator/src/Tests/Views/IntegrationTest.php
index 1ec27b96e..944480864 100644
--- a/core/modules/aggregator/src/Tests/Views/IntegrationTest.php
+++ b/core/modules/aggregator/src/Tests/Views/IntegrationTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\aggregator\Tests\Views;
 
+use Drupal\Core\Render\RenderContext;
 use Drupal\Core\Url;
 use Drupal\views\Views;
 use Drupal\views\Tests\ViewTestData;
@@ -66,6 +67,9 @@ class IntegrationTest extends ViewUnitTestBase {
    * Tests basic aggregator_item view.
    */
   public function testAggregatorItemView() {
+    /** @var \Drupal\Core\Render\RendererInterface $renderer */
+    $renderer = \Drupal::service('renderer');
+
     $feed = $this->feedStorage->create(array(
       'title' => $this->randomMachineName(),
       'url' => 'https://www.drupal.org/',
@@ -112,13 +116,22 @@ class IntegrationTest extends ViewUnitTestBase {
     foreach ($view->result as $row) {
       $iid = $view->field['iid']->getValue($row);
       $expected_link = \Drupal::l($items[$iid]->getTitle(), Url::fromUri($items[$iid]->getLink(), ['absolute' => TRUE]));
-      $this->assertEqual($view->field['title']->advancedRender($row), $expected_link, 'Ensure the right link is generated');
+      $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($view, $row) {
+        return $view->field['title']->advancedRender($row);
+      });
+      $this->assertEqual($output, $expected_link, 'Ensure the right link is generated');
 
       $expected_author = aggregator_filter_xss($items[$iid]->getAuthor());
-      $this->assertEqual($view->field['author']->advancedRender($row), $expected_author, 'Ensure the author got filtered');
+      $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($view, $row) {
+        return $view->field['author']->advancedRender($row);
+      });
+      $this->assertEqual($output, $expected_author, 'Ensure the author got filtered');
 
       $expected_description = aggregator_filter_xss($items[$iid]->getDescription());
-      $this->assertEqual($view->field['description']->advancedRender($row), $expected_description, 'Ensure the author got filtered');
+      $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($view, $row) {
+        return $view->field['description']->advancedRender($row);
+      });
+      $this->assertEqual($output, $expected_description, 'Ensure the author got filtered');
     }
   }
 
diff --git a/core/modules/aggregator/tests/modules/aggregator_test/aggregator_test_atom.xml b/core/modules/aggregator/tests/modules/aggregator_test/aggregator_test_atom.xml
index 357b2e5a1..379420267 100644
--- a/core/modules/aggregator/tests/modules/aggregator_test/aggregator_test_atom.xml
+++ b/core/modules/aggregator/tests/modules/aggregator_test/aggregator_test_atom.xml
@@ -17,4 +17,12 @@
     <summary>Some text.</summary>
   </entry>
 
+  <entry>
+    <title>We tried to stop them, but we failed.</title>
+    <link href="http://example.org/2003/12/14/atom03" />
+    <id>urn:uuid:1225c695-cfb8-4ebb-bbbb-80da344efa6a</id>
+    <updated>2003-12-14T16:30:02Z</updated>
+    <summary>Some other text.</summary>
+  </entry>
+
 </feed>
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/AggregatorFeedTest.php b/core/modules/aggregator/tests/src/Unit/Plugin/migrate/source/d6/AggregatorFeedTest.php
similarity index 83%
rename from core/modules/migrate_drupal/tests/src/Unit/source/d6/AggregatorFeedTest.php
rename to core/modules/aggregator/tests/src/Unit/Plugin/migrate/source/d6/AggregatorFeedTest.php
index ecb57ba35..4101f3eb6 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/AggregatorFeedTest.php
+++ b/core/modules/aggregator/tests/src/Unit/Plugin/migrate/source/d6/AggregatorFeedTest.php
@@ -2,21 +2,21 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\AggregatorFeedTest.
+ * Contains \Drupal\Tests\aggregator\Unit\Plugin\migrate\source\d6\AggregatorFeedTest.
  */
 
-namespace Drupal\Tests\migrate_drupal\Unit\source\d6;
+namespace Drupal\Tests\aggregator\Unit\Plugin\migrate\source\d6;
 
 use Drupal\Tests\migrate\Unit\MigrateSqlSourceTestCase;
 
 /**
  * Tests D6 aggregator feed source plugin.
  *
- * @group migrate_drupal
+ * @group aggregator
  */
 class AggregatorFeedTest extends MigrateSqlSourceTestCase {
 
-  const PLUGIN_CLASS = 'Drupal\migrate_drupal\Plugin\migrate\source\d6\AggregatorFeed';
+  const PLUGIN_CLASS = 'Drupal\aggregator\Plugin\migrate\source\d6\AggregatorFeed';
 
   protected $migrationConfiguration = array(
     'id' => 'test',
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/AggregatorItemTest.php b/core/modules/aggregator/tests/src/Unit/Plugin/migrate/source/d6/AggregatorItemTest.php
similarity index 84%
rename from core/modules/migrate_drupal/tests/src/Unit/source/d6/AggregatorItemTest.php
rename to core/modules/aggregator/tests/src/Unit/Plugin/migrate/source/d6/AggregatorItemTest.php
index 29c0c0d19..01bbca090 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/AggregatorItemTest.php
+++ b/core/modules/aggregator/tests/src/Unit/Plugin/migrate/source/d6/AggregatorItemTest.php
@@ -2,21 +2,21 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\AggregatorItemTest.
+ * Contains \Drupal\Tests\aggregator\Unit\Plugin\migrate\source\d6\AggregatorItemTest.
  */
 
-namespace Drupal\Tests\migrate_drupal\Unit\source\d6;
+namespace Drupal\Tests\aggregator\Unit\Plugin\migrate\source\d6;
 
 use Drupal\Tests\migrate\Unit\MigrateSqlSourceTestCase;
 
 /**
  * Tests D6 aggregator item source plugin.
  *
- * @group migrate_drupal
+ * @group aggregator
  */
 class AggregatorItemTest extends MigrateSqlSourceTestCase {
 
-  const PLUGIN_CLASS = 'Drupal\migrate_drupal\Plugin\migrate\source\d6\AggregatorItem';
+  const PLUGIN_CLASS = 'Drupal\aggregator\Plugin\migrate\source\d6\AggregatorItem';
 
   // The fake Migration configuration entity.
   protected $migrationConfiguration = array(
diff --git a/core/modules/block/block.install b/core/modules/block/block.install
new file mode 100644
index 000000000..99ce4ef5e
--- /dev/null
+++ b/core/modules/block/block.install
@@ -0,0 +1,146 @@
+<?php
+
+/**
+ * @file
+ * Contains install and update functions for Block.
+ */
+
+use Drupal\Core\Cache\Cache;
+
+/**
+ * Implements hook_install().
+ */
+function block_install() {
+  // Because the Block module upon installation unconditionally overrides all
+  // HTML output by selecting a different page display variant, we must
+  // invalidate all cached HTML output.
+  Cache::invalidateTags(['rendered']);
+}
+
+/**
+ * @addtogroup updates-8.0.0-beta
+ * @{
+ */
+
+/**
+ * Update block visibility context mapping.
+ */
+function block_update_8001() {
+  // This update function updates blocks for the change from
+  // https://www.drupal.org/node/2354889.
+
+  // Core visibility context plugins are updated automatically; blocks with
+  // unknown plugins are disabled and their previous visibility settings are
+  // saved in key value storage; see change record
+  // https://www.drupal.org/node/2527840 for more explanation.
+
+  // These are all the contexts that Drupal core provides.
+  $context_service_id_map = [
+    'node.node' => '@node.node_route_context:node',
+    'user.current_user' => '@user.current_user_context:current_user',
+  ];
+
+  foreach (array_keys(\Drupal::languageManager()->getDefinedLanguageTypesInfo()) as $language_type_id) {
+    $context_service_id_map['language.' . $language_type_id] = '@language.current_language_context:' . $language_type_id;
+  }
+
+  // Contributed modules should leverage hook_update_dependencies() in order to
+  // be executed before block_update_8002(), so they can update their context
+  // mappings, if wanted.
+  $config_factory = \Drupal::configFactory();
+  $backup_values = $update_backup = [];
+
+  foreach ($config_factory->listAll('block.block.') as $block_config_name) {
+    $block = $config_factory->getEditable($block_config_name);
+    if ($visibility = $block->get('visibility')) {
+      foreach ($visibility as $condition_plugin_id => &$condition) {
+        foreach ($condition['context_mapping'] as $key => $context) {
+          if (!isset($context_service_id_map[$context])) {
+            // Remove the visibility condition for unknown context mapping
+            // entries, so the update process itself runs through and users can
+            // fix their block placements manually OR alternatively contributed
+            // modules can run their own update functions to update mappings
+            // that they provide.
+            $backup_values[$context][] = $condition_plugin_id;
+            unset($visibility[$condition_plugin_id]);
+            continue;
+          }
+          // Replace the context ID based on the defined mapping.
+          $condition['context_mapping'][$key] = $context_service_id_map[$context];
+        }
+      }
+      $block->set('visibility', $visibility);
+
+      if ($backup_values) {
+        // We not only store the missing context mappings but also the previous
+        // block status, in order to allow contributed and custom modules to do
+        // their own updates.
+        $update_backup[$block->get('id')] = [
+          'missing_context_ids' => $backup_values,
+          'status' => $block->get('status')
+        ];
+      }
+    }
+
+    // Mark the resulting configuration as trusted data. This avoids issues with
+    // future schema changes.
+    $block->save(TRUE);
+  }
+
+  if ($update_backup) {
+    \Drupal::keyValue('update_backup')->set('block_update_8001', $update_backup);
+  }
+
+  return t('Block context IDs updated.');
+}
+
+/**
+ * Disable all blocks with missing context IDs in block_update_8001().
+ */
+function block_update_8002() {
+  $block_update_8001 = \Drupal::keyValue('update_backup')->get('block_update_8001', []);
+
+  $block_ids = array_keys($block_update_8001);
+  $config_factory = \Drupal::configFactory();
+  /** @var \Drupal\Core\Config\Config[] $blocks */
+  $blocks = [];
+  foreach ($block_ids as $block_id) {
+    $blocks[$block_id] = $block = $config_factory->getEditable('block.block.' . $block_id);
+    // This block will have an invalid context mapping service and must be
+    // disabled in order to prevent information disclosure.
+
+    // Disable currently enabled blocks.
+    if ($block_update_8001[$block_id]['status']) {
+      $block->set('status', FALSE);
+      $block->save(TRUE);
+    }
+  }
+
+  // Provides a list of plugin labels, keyed by plugin ID.
+  $condition_plugin_id_label_map = array_column(\Drupal::service('plugin.manager.condition')->getDefinitions(), 'label', 'id');
+
+  // Override with the UI labels we are aware of. Sadly they are not machine
+  // accessible, see
+  // \Drupal\node\Plugin\Condition\NodeType::buildConfigurationForm().
+  $condition_plugin_id_label_map['node_type'] = t('Content types');
+  $condition_plugin_id_label_map['request_path'] = t('Pages');
+  $condition_plugin_id_label_map['user_role'] = t('Roles');
+
+  if (count($block_ids) > 0) {
+    $message = t('Encountered an unknown context mapping key coming probably from a contributed or custom module: One or more mappings could not be updated. Please manually review your visibility settings for the following blocks, which are disabled now:');
+    $message .= '<ul>';
+    foreach ($blocks as $disabled_block_id => $disabled_block) {
+      $message .= '<li>' . t('@label (Visibility: @plugin_ids)', array(
+            '@label' => $disabled_block->get('settings.label'),
+            '@plugin_ids' => implode(', ', array_intersect_key($condition_plugin_id_label_map, array_flip(array_keys($block_update_8001[$disabled_block_id]['missing_context_ids']))))
+          )) . '</li>';
+    }
+    $message .= '</ul>';
+
+    return $message;
+  }
+}
+
+/**
+ * @} End of "addtogroup updates-8.0.0-beta".
+ */
diff --git a/core/modules/block/block.module b/core/modules/block/block.module
index e65d07ab5..7862e66d2 100644
--- a/core/modules/block/block.module
+++ b/core/modules/block/block.module
@@ -7,7 +7,6 @@
 
 use Drupal\block\BlockInterface;
 use Drupal\Component\Utility\Html;
-use Drupal\Core\Cache\Cache;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Url;
 use Drupal\language\ConfigurableLanguageInterface;
@@ -58,9 +57,6 @@ function block_theme() {
     'block' => array(
       'render element' => 'elements',
     ),
-    'block_list' => array(
-      'render element' => 'form',
-    ),
   );
 }
 
@@ -85,45 +81,6 @@ function block_page_top(array &$page_top) {
   }
 }
 
-/**
- * Returns an array of block class instances by theme.
- *
- * @param $theme
- *   The theme to rehash blocks for. If not provided, defaults to the currently
- *   used theme.
- *
- * @return
- *   Blocks currently exported by modules.
- */
-function _block_rehash($theme = NULL) {
-  $theme = $theme ? $theme : \Drupal::config('system.theme')->get('default');
-  $regions = system_region_list($theme);
-  $blocks = entity_load_multiple_by_properties('block', array('theme' => $theme));
-  foreach ($blocks as $block_id => $block) {
-    // Remove any invalid block from the list.
-    // @todo Remove this check as part of https://www.drupal.org/node/1776830.
-    if (!$block->getPlugin()) {
-      unset($blocks[$block_id]);
-      continue;
-    }
-    $region = $block->getRegion();
-    $status = $block->status();
-    // Disable blocks in invalid regions.
-    if (!empty($region) && $region != BlockInterface::BLOCK_REGION_NONE && !isset($regions[$region]) && $status) {
-      drupal_set_message(t('The block %info was assigned to the invalid region %region and has been disabled.', array('%info' => $block_id, '%region' => $region)), 'warning');
-      // Disabled blocks are moved into the BlockInterface::BLOCK_REGION_NONE
-      // later so no need to move the block to another region.
-      $block->disable()->save();
-    }
-    // Set region to none if not enabled.
-    if (!$status && $region != BlockInterface::BLOCK_REGION_NONE) {
-      $block->setRegion(BlockInterface::BLOCK_REGION_NONE);
-      $block->save();
-    }
-  }
-  return $blocks;
-}
-
 /**
  * Initializes blocks for installed themes.
  *
@@ -177,9 +134,26 @@ function block_theme_initialize($theme) {
  * Implements hook_rebuild().
  */
 function block_rebuild() {
-  foreach (\Drupal::service('theme_handler')->listInfo() as $name => $data) {
+  foreach (\Drupal::service('theme_handler')->listInfo() as $theme => $data) {
     if ($data->status) {
-      _block_rehash($name);
+      $regions = system_region_list($theme);
+      /** @var \Drupal\block\BlockInterface[] $blocks */
+      $blocks = entity_load_multiple_by_properties('block', ['theme' => $theme]);
+      foreach ($blocks as $block_id => $block) {
+        // Disable blocks in invalid regions.
+        $region = $block->getRegion();
+        if ($region !== BlockInterface::BLOCK_REGION_NONE) {
+          if (!empty($region) && !isset($regions[$region]) && $block->status()) {
+            drupal_set_message(t('The block %info was assigned to the invalid region %region and has been disabled.', ['%info' => $block_id, '%region' => $region]), 'warning');
+            $block->disable();
+          }
+          // Set region to none if not enabled.
+          if (!$block->status()) {
+            $block->setRegion(BlockInterface::BLOCK_REGION_NONE);
+            $block->save();
+          }
+        }
+      }
     }
   }
 }
@@ -307,13 +281,3 @@ function block_configurable_language_delete(ConfigurableLanguageInterface $langu
     }
   }
 }
-
-/**
- * Implements hook_install().
- */
-function block_install() {
-  // Because the Block module upon installation unconditionally overrides all
-  // HTML output by selecting a different page display variant, we must
-  // invalidate all cached HTML output.
-  Cache::invalidateTags(['rendered']);
-}
diff --git a/core/modules/block/block.routing.yml b/core/modules/block/block.routing.yml
index 2f26a385a..396bf0d17 100644
--- a/core/modules/block/block.routing.yml
+++ b/core/modules/block/block.routing.yml
@@ -42,6 +42,15 @@ block.admin_display_theme:
     _access_theme: 'TRUE'
     _permission: 'administer blocks'
 
+block.admin_library:
+  path: 'admin/structure/block/library/{theme}'
+  defaults:
+    _controller: '\Drupal\block\Controller\BlockLibraryController::listBlocks'
+    _title: 'Place block'
+  requirements:
+    _access_theme: 'TRUE'
+    _permission: 'administer blocks'
+
 block.admin_add:
   path: '/admin/structure/block/add/{plugin_id}/{theme}'
   defaults:
diff --git a/core/modules/block/block.services.yml b/core/modules/block/block.services.yml
index df4d0d7f8..fe20e4a66 100644
--- a/core/modules/block/block.services.yml
+++ b/core/modules/block/block.services.yml
@@ -7,21 +7,6 @@ services:
     class: Drupal\block\EventSubscriber\BlockPageDisplayVariantSubscriber
     tags:
       - { name: event_subscriber }
-  block.current_user_context:
-    class: Drupal\block\EventSubscriber\CurrentUserContext
-    arguments: ['@current_user', '@entity.manager']
-    tags:
-      - { name: 'event_subscriber' }
-  block.current_language_context:
-    class: Drupal\block\EventSubscriber\CurrentLanguageContext
-    arguments: ['@language_manager']
-    tags:
-      - { name: 'event_subscriber' }
-  block.node_route_context:
-    class: Drupal\block\EventSubscriber\NodeRouteContext
-    arguments: ['@current_route_match']
-    tags:
-      - { name: 'event_subscriber' }
   block.repository:
     class: Drupal\block\BlockRepository
     arguments: ['@entity.manager', '@theme.manager', '@context.handler']
diff --git a/core/modules/block/css/block.admin.css b/core/modules/block/css/block.admin.css
index d9f32a264..2b9eb4593 100644
--- a/core/modules/block/css/block.admin.css
+++ b/core/modules/block/css/block.admin.css
@@ -1,3 +1,13 @@
+/* Block listing page */
+.region-title .button {
+  margin-left: 1em; /* LTR */
+}
+[dir="rtl"] .region-title .button {
+  margin-left: 0;
+  margin-right: 1em;
+}
+
+/* Block demo mode */
 .block-region {
   background-color: #ff6;
   margin-top: 4px;
@@ -22,87 +32,10 @@ a.block-demo-backlink:hover {
   text-decoration: underline;
 }
 
-.layout-region {
-  box-sizing: border-box;
-}
-.block-list-secondary {
-  border: 1px solid #bfbfbf;
-  border-bottom-width: 0;
-}
-.block-list {
-  padding: 0 0.75em;
-  margin: 0;
-}
-.block-list li {
-  list-style: none;
-  padding: 0.1em 0;
-}
-.block-list a:before {
-  content: '+ ';
-}
-.block-list-secondary .form-type-search {
-  padding: 0 1em;
-}
+/* Configure block form - Block description */
 .block-form .form-item-settings-admin-label label {
   display: inline;
 }
 .block-form .form-item-settings-admin-label label:after {
   content: ':';
 }
-
-/* Wide screens */
-@media
-screen and (min-width: 780px),
-(orientation: landscape) and (min-device-height: 780px) {
-
-  .block-list-primary {
-    float: left; /* LTR */
-    width: 75%;
-    padding-right: 2em;
-  }
-  [dir="rtl"] .block-list-primary {
-    float: right;
-    padding-left: 2em;
-    padding-right: 0;
-  }
-
-  .block-list-secondary {
-    float: right; /* LTR */
-    width: 25%;
-  }
-  [dir="rtl"] .block-list-secondary {
-    float: left;
-  }
-
-  /* @todo File an issue to add a standard class to all text-like inputs */
-  .block-list-secondary .form-autocomplete,
-  .block-list-secondary .form-text,
-  .block-list-secondary .form-tel,
-  .block-list-secondary .form-email,
-  .block-list-secondary .form-url,
-  .block-list-secondary .form-search,
-  .block-list-secondary .form-number,
-  .block-list-secondary .form-color,
-  .block-list-secondary textarea {
-    box-sizing:         border-box;
-    width: 100%;
-    max-width: 100%;
-  }
-}
-
-/**
- * The vertical toolbar mode gets triggered for narrow screens, which throws off
- * the intent of media queries written for the viewport width. When the vertical
- * toolbar is on, we need to suppress layout for the original media width + the
- * toolbar width (240px). In this case, 240px + 780px.
- */
-@media
-screen and (max-width: 1020px) {
-
-  .toolbar-vertical.toolbar-tray-open .block-list-primary,
-  .toolbar-vertical.toolbar-tray-open .block-list-secondary {
-    float: none;
-    width: auto;
-    padding-right: 0;
-  }
-}
diff --git a/core/modules/block/js/block.admin.js b/core/modules/block/js/block.admin.js
index 23109f4e3..048506337 100644
--- a/core/modules/block/js/block.admin.js
+++ b/core/modules/block/js/block.admin.js
@@ -19,66 +19,38 @@
   Drupal.behaviors.blockFilterByText = {
     attach: function (context, settings) {
       var $input = $('input.block-filter-text').once('block-filter-text');
-      var $element = $($input.attr('data-element'));
-      var $blocks;
-      var $details;
+      var $table = $($input.attr('data-element'));
+      var $filter_rows;
 
-      /**
-       * Hides the `<details>` element for a category if it has no visible blocks.
-       *
-       * @param {number} index
-       * @param {HTMLElement} element
-       */
-      function hideCategoryDetails(index, element) {
-        var $catDetails = $(element);
-        $catDetails.toggle($catDetails.find('li:visible').length > 0);
-      }
-
-      /**
-       * Filters the block list.
-       *
-       * @param {jQuery.Event} e
-       */
       function filterBlockList(e) {
         var query = $(e.target).val().toLowerCase();
 
         /**
          * Shows or hides the block entry based on the query.
          *
-         * @param {number} index
-         * @param {HTMLElement} block
+         * @param {number} index The index of the block.
+         * @param {HTMLElement} label The label of the block.
          */
-        function showBlockEntry(index, block) {
-          var $block = $(block);
-          var $sources = $block.find('.block-filter-text-source');
-          var textMatch = $sources.text().toLowerCase().indexOf(query) !== -1;
-          $block.toggle(textMatch);
+        function toggleBlockEntry(index, label) {
+          var $label = $(label);
+          var $row = $label.parent().parent();
+          var textMatch = $label.text().toLowerCase().indexOf(query) !== -1;
+          $row.toggle(textMatch);
         }
 
         // Filter if the length of the query is at least 2 characters.
         if (query.length >= 2) {
-          $blocks.each(showBlockEntry);
-
-          // Note that we first open all <details> to be able to use ':visible'.
-          // Mark the <details> elements that were closed before filtering, so
-          // they can be reclosed when filtering is removed.
-          $details.not('[open]').attr('data-drupal-block-state', 'forced-open');
-          // Hide the category <details> if they don't have any visible rows.
-          $details.attr('open', 'open').each(hideCategoryDetails);
+          $filter_rows.each(toggleBlockEntry);
         }
         else {
-          $blocks.show();
-          $details.show();
-          // Return <details> elements that had been closed before filtering
-          // to a closed state.
-          $details.filter('[data-drupal-block-state="forced-open"]').removeAttr('open data-drupal-block-state');
+          $filter_rows.each(function (index) {
+            $(this).parent().parent().show();
+          });
         }
       }
 
-      if ($element.length) {
-        $details = $element.find('details');
-        $blocks = $details.find('li');
-
+      if ($table.length) {
+        $filter_rows = $table.find('div.block-filter-text-source');
         $input.on('keyup', filterBlockList);
       }
     }
diff --git a/core/modules/block/js/block.js b/core/modules/block/js/block.js
index acf7e4a32..d6157e7a7 100644
--- a/core/modules/block/js/block.js
+++ b/core/modules/block/js/block.js
@@ -26,7 +26,7 @@
         var $checkboxes = $(context).find('input[type="checkbox"]:checked + label');
         var il = $checkboxes.length;
         for (var i = 0; i < il; i++) {
-          vals.push($($checkboxes[i]).text());
+          vals.push($($checkboxes[i]).html());
         }
         if (!vals.length) {
           vals.push(Drupal.t('Not restricted'));
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_block.yml b/core/modules/block/migration_templates/d6_block.yml
similarity index 91%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_block.yml
rename to core/modules/block/migration_templates/d6_block.yml
index 1d831191f..5f91c1614 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_block.yml
+++ b/core/modules/block/migration_templates/d6_block.yml
@@ -92,11 +92,3 @@ migration_dependencies:
     - d6_menu
     - d6_custom_block
     - d6_user_role
-dependencies:
-  config:
-    - migrate.migration.d6_custom_block
-    - migrate.migration.d6_menu
-    - migrate.migration.d6_user_role
-  module:
-    - block
-    - migrate_drupal
diff --git a/core/modules/block/src/BlockAccessControlHandler.php b/core/modules/block/src/BlockAccessControlHandler.php
index 148e3e3c1..b7fea6091 100644
--- a/core/modules/block/src/BlockAccessControlHandler.php
+++ b/core/modules/block/src/BlockAccessControlHandler.php
@@ -9,6 +9,8 @@ namespace Drupal\block;
 
 use Drupal\Component\Plugin\Exception\ContextException;
 use Drupal\Core\Access\AccessResult;
+use Drupal\Core\Cache\Cache;
+use Drupal\Core\Cache\CacheableDependencyInterface;
 use Drupal\Core\Condition\ConditionAccessResolverTrait;
 use Drupal\Core\Entity\EntityAccessControlHandler;
 use Drupal\Core\Entity\EntityHandlerInterface;
@@ -16,6 +18,7 @@ use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Executable\ExecutableManagerInterface;
 use Drupal\Core\Plugin\Context\ContextHandlerInterface;
+use Drupal\Core\Plugin\Context\ContextRepositoryInterface;
 use Drupal\Core\Plugin\ContextAwarePluginInterface;
 use Drupal\Core\Session\AccountInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -43,6 +46,13 @@ class BlockAccessControlHandler extends EntityAccessControlHandler implements En
    */
   protected $contextHandler;
 
+  /**
+   * The context manager service.
+   *
+   * @var \Drupal\Core\Plugin\Context\ContextRepositoryInterface
+   */
+  protected $contextRepository;
+
   /**
    * {@inheritdoc}
    */
@@ -50,7 +60,8 @@ class BlockAccessControlHandler extends EntityAccessControlHandler implements En
     return new static(
       $entity_type,
       $container->get('plugin.manager.condition'),
-      $container->get('context.handler')
+      $container->get('context.handler'),
+      $container->get('context.repository')
     );
   }
 
@@ -63,11 +74,14 @@ class BlockAccessControlHandler extends EntityAccessControlHandler implements En
    *   The ConditionManager for checking visibility of blocks.
    * @param \Drupal\Core\Plugin\Context\ContextHandlerInterface $context_handler
    *   The ContextHandler for applying contexts to conditions properly.
+   * @param \Drupal\Core\Plugin\Context\ContextRepositoryInterface $context_repository
+   *   The lazy context repository service.
    */
-  public function __construct(EntityTypeInterface $entity_type, ExecutableManagerInterface $manager, ContextHandlerInterface $context_handler) {
+  public function __construct(EntityTypeInterface $entity_type, ExecutableManagerInterface $manager, ContextHandlerInterface $context_handler, ContextRepositoryInterface $context_repository ) {
     parent::__construct($entity_type);
     $this->manager = $manager;
     $this->contextHandler = $context_handler;
+    $this->contextRepository = $context_repository;
   }
 
 
@@ -85,33 +99,62 @@ class BlockAccessControlHandler extends EntityAccessControlHandler implements En
       return AccessResult::forbidden()->cacheUntilEntityChanges($entity);
     }
     else {
-      $contexts = $entity->getContexts();
       $conditions = [];
+      $missing_context = FALSE;
       foreach ($entity->getVisibilityConditions() as $condition_id => $condition) {
         if ($condition instanceof ContextAwarePluginInterface) {
           try {
+            $contexts = $this->contextRepository->getRuntimeContexts(array_values($condition->getContextMapping()));
             $this->contextHandler->applyContextMapping($condition, $contexts);
           }
           catch (ContextException $e) {
-            return AccessResult::forbidden()->setCacheMaxAge(0);
+            $missing_context = TRUE;
           }
         }
         $conditions[$condition_id] = $condition;
       }
-      if ($this->resolveConditions($conditions, 'and') !== FALSE) {
+
+      if ($missing_context) {
+        // If any context is missing then we might be missing cacheable
+        // metadata, and don't know based on what conditions the block is
+        // accessible or not. For example, blocks that have a node type
+        // condition will have a missing context on any non-node route like the
+        // frontpage.
+        // @todo Avoid setting max-age 0 for some or all cases, for example by
+        //   treating available contexts without value differently in
+        //   https://www.drupal.org/node/2521956.
+        $access = AccessResult::forbidden()->setCacheMaxAge(0);
+      }
+      elseif ($this->resolveConditions($conditions, 'and') !== FALSE) {
         // Delegate to the plugin.
         $access = $entity->getPlugin()->access($account, TRUE);
       }
       else {
         $access = AccessResult::forbidden();
       }
-      // This should not be hardcoded to an uncacheable access check result, but
-      // in order to fix that, we need condition plugins to return cache contexts,
-      // otherwise it will be impossible to determine by which cache contexts the
-      // result should be varied.
-      // @todo Change this to use $access->cacheUntilEntityChanges($entity) once
-      //   https://www.drupal.org/node/2375695 is resolved.
-      return $access->setCacheMaxAge(0);
+
+      $this->mergeCacheabilityFromConditions($access, $conditions);
+
+      // Ensure that access is evaluated again when the block changes.
+      return $access->cacheUntilEntityChanges($entity);
+    }
+  }
+
+  /**
+   * Merges cacheable metadata from conditions onto the access result object.
+   *
+   * @param \Drupal\Core\Access\AccessResult $access
+   *   The access result object.
+   * @param \Drupal\Core\Condition\ConditionInterface[] $conditions
+   *   List of visibility conditions.
+   */
+  protected function mergeCacheabilityFromConditions(AccessResult $access, array $conditions) {
+    foreach ($conditions as $condition) {
+      if ($condition instanceof CacheableDependencyInterface) {
+        $access->addCacheTags($condition->getCacheTags());
+        $access->addCacheContexts($condition->getCacheContexts());
+        $access->setCacheMaxAge(Cache::mergeMaxAges($access->getCacheMaxAge(), $condition->getCacheMaxAge()));
+      }
     }
   }
 
diff --git a/core/modules/block/src/BlockForm.php b/core/modules/block/src/BlockForm.php
index ac9406a8f..8c13bbbe8 100644
--- a/core/modules/block/src/BlockForm.php
+++ b/core/modules/block/src/BlockForm.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\block;
 
-use Drupal\block\Event\BlockContextEvent;
-use Drupal\block\Event\BlockEvents;
 use Drupal\Component\Utility\Html;
 use Drupal\Core\Entity\EntityForm;
 use Drupal\Core\Entity\EntityManagerInterface;
@@ -18,8 +16,8 @@ use Drupal\Core\Form\FormState;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Language\LanguageManagerInterface;
 use Drupal\Core\Plugin\ContextAwarePluginInterface;
+use Drupal\Core\Plugin\Context\ContextRepositoryInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 /**
  * Provides form for block instance forms.
@@ -68,6 +66,13 @@ class BlockForm extends EntityForm {
    */
   protected $themeHandler;
 
+  /**
+   * The context repository service.
+   *
+   * @var \Drupal\Core\Plugin\Context\ContextRepositoryInterface
+   */
+  protected $contextRepository;
+
   /**
    * Constructs a BlockForm object.
    *
@@ -75,17 +80,17 @@ class BlockForm extends EntityForm {
    *   The entity manager.
    * @param \Drupal\Core\Executable\ExecutableManagerInterface $manager
    *   The ConditionManager for building the visibility UI.
-   * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $dispatcher
-   *   The EventDispatcher for gathering administrative contexts.
+   * @param \Drupal\Core\Plugin\Context\ContextRepositoryInterface $context_repository
+   *   The lazy context repository service.
    * @param \Drupal\Core\Language\LanguageManagerInterface $language
    *   The language manager.
    * @param \Drupal\Core\Extension\ThemeHandlerInterface $theme_handler
    * The theme handler.
    */
-  public function __construct(EntityManagerInterface $entity_manager, ExecutableManagerInterface $manager, EventDispatcherInterface $dispatcher, LanguageManagerInterface $language, ThemeHandlerInterface $theme_handler) {
+  public function __construct(EntityManagerInterface $entity_manager, ExecutableManagerInterface $manager, ContextRepositoryInterface $context_repository, LanguageManagerInterface $language, ThemeHandlerInterface $theme_handler) {
     $this->storage = $entity_manager->getStorage('block');
     $this->manager = $manager;
-    $this->dispatcher = $dispatcher;
+    $this->contextRepository = $context_repository;
     $this->language = $language;
     $this->themeHandler = $theme_handler;
   }
@@ -97,7 +102,7 @@ class BlockForm extends EntityForm {
     return new static(
       $container->get('entity.manager'),
       $container->get('plugin.manager.condition'),
-      $container->get('event_dispatcher'),
+      $container->get('context.repository'),
       $container->get('language_manager'),
       $container->get('theme_handler')
     );
@@ -117,7 +122,7 @@ class BlockForm extends EntityForm {
 
     // Store the gathered contexts in the form state for other objects to use
     // during form building.
-    $form_state->setTemporaryValue('gathered_contexts', $this->dispatcher->dispatch(BlockEvents::ADMINISTRATIVE_CONTEXT, new BlockContextEvent())->getContexts());
+    $form_state->setTemporaryValue('gathered_contexts', $this->contextRepository->getAvailableContexts());
 
     $form['#tree'] = TRUE;
     $form['settings'] = $entity->getPlugin()->buildConfigurationForm(array(), $form_state);
@@ -165,11 +170,13 @@ class BlockForm extends EntityForm {
     }
 
     // Region settings.
+    $entity_region = $entity->getRegion();
+    $region = $entity->isNew() ? $this->getRequest()->query->get('region', $entity_region) : $entity_region;
     $form['region'] = array(
       '#type' => 'select',
       '#title' => $this->t('Region'),
       '#description' => $this->t('Select the region where this block should be displayed.'),
-      '#default_value' => $entity->getRegion(),
+      '#default_value' => $region,
       '#empty_value' => BlockInterface::BLOCK_REGION_NONE,
       '#options' => system_region_list($theme, REGIONS_VISIBLE),
       '#prefix' => '<div id="edit-block-region-wrapper">',
@@ -273,8 +280,8 @@ class BlockForm extends EntityForm {
   /**
    * {@inheritdoc}
    */
-  public function validate(array $form, FormStateInterface $form_state) {
-    parent::validate($form, $form_state);
+  public function validateForm(array &$form, FormStateInterface $form_state) {
+    parent::validateForm($form, $form_state);
 
     // The Block Entity form puts all block plugin form elements in the
     // settings form element, so just pass that to the block for validation.
diff --git a/core/modules/block/src/BlockInterface.php b/core/modules/block/src/BlockInterface.php
index 39ad9a9bf..8955be18d 100644
--- a/core/modules/block/src/BlockInterface.php
+++ b/core/modules/block/src/BlockInterface.php
@@ -95,24 +95,6 @@ interface BlockInterface extends ConfigEntityInterface {
    */
   public function setVisibilityConfig($instance_id, array $configuration);
 
-  /**
-   * Get all available contexts.
-   *
-   * @return \Drupal\Component\Plugin\Context\ContextInterface[]
-   *   An array of set contexts, keyed by context name.
-   */
-  public function getContexts();
-
-  /**
-   * Set the contexts that are available for use within the block entity.
-   *
-   * @param \Drupal\Component\Plugin\Context\ContextInterface[] $contexts
-   *   An array of contexts to set on the block.
-   *
-   * @return $this
-   */
-  public function setContexts(array $contexts);
-
   /**
    * Returns the weight of this block (used for sorting).
    *
diff --git a/core/modules/block/src/BlockListBuilder.php b/core/modules/block/src/BlockListBuilder.php
index aa669fa71..43d7a1c7a 100644
--- a/core/modules/block/src/BlockListBuilder.php
+++ b/core/modules/block/src/BlockListBuilder.php
@@ -8,15 +8,16 @@
 namespace Drupal\block;
 
 use Drupal\Component\Utility\Html;
-use Drupal\Core\Block\BlockManagerInterface;
 use Drupal\Component\Serialization\Json;
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Config\Entity\ConfigEntityListBuilder;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\Form\FormBuilderInterface;
 use Drupal\Core\Form\FormInterface;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Theme\ThemeManagerInterface;
 use Drupal\Core\Url;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
@@ -28,13 +29,6 @@ use Symfony\Component\HttpFoundation\Request;
  */
 class BlockListBuilder extends ConfigEntityListBuilder implements FormInterface {
 
-  /**
-   * The regions containing the blocks.
-   *
-   * @var array
-   */
-  protected $regions;
-
   /**
    * The theme containing the blocks.
    *
@@ -50,11 +44,23 @@ class BlockListBuilder extends ConfigEntityListBuilder implements FormInterface
   protected $request;
 
   /**
-   * The block manager.
+   * The theme manager.
    *
-   * @var \Drupal\Core\Block\BlockManagerInterface
+   * @var \Drupal\Core\Theme\ThemeManagerInterface
    */
-  protected $blockManager;
+  protected $themeManager;
+
+  /**
+   * The form builder.
+   *
+   * @var \Drupal\Core\Form\FormBuilderInterface
+   */
+  protected $formBuilder;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $limit = FALSE;
 
   /**
    * Constructs a new BlockListBuilder object.
@@ -63,13 +69,16 @@ class BlockListBuilder extends ConfigEntityListBuilder implements FormInterface
    *   The entity type definition.
    * @param \Drupal\Core\Entity\EntityStorageInterface $storage
    *   The entity storage class.
-   * @param \Drupal\Core\Block\BlockManagerInterface $block_manager
-   *   The block manager.
+   * @param \Drupal\Core\Theme\ThemeManagerInterface $theme_manager
+   *   The theme manager.
+   * @param \Drupal\Core\Form\FormBuilderInterface $form_builder
+   *   The form builder.
    */
-  public function __construct(EntityTypeInterface $entity_type, EntityStorageInterface $storage, BlockManagerInterface $block_manager) {
+  public function __construct(EntityTypeInterface $entity_type, EntityStorageInterface $storage, ThemeManagerInterface $theme_manager, FormBuilderInterface $form_builder) {
     parent::__construct($entity_type, $storage);
 
-    $this->blockManager = $block_manager;
+    $this->themeManager = $theme_manager;
+    $this->formBuilder = $form_builder;
   }
 
   /**
@@ -79,31 +88,11 @@ class BlockListBuilder extends ConfigEntityListBuilder implements FormInterface
     return new static(
       $entity_type,
       $container->get('entity.manager')->getStorage($entity_type->id()),
-      $container->get('plugin.manager.block')
+      $container->get('theme.manager'),
+      $container->get('form_builder')
     );
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function load() {
-    // If no theme was specified, use the current theme.
-    if (!$this->theme) {
-      $this->theme = \Drupal::theme()->getActiveTheme()->getName();
-    }
-
-    // Store the region list.
-    $this->regions = system_region_list($this->theme, REGIONS_VISIBLE);
-
-    // Load only blocks for this theme, and sort them.
-    // @todo Move the functionality of _block_rehash() out of the listing page.
-    $entities = _block_rehash($this->theme);
-
-    // Sort the blocks using \Drupal\block\Entity\Block::sort().
-    uasort($entities, array($this->entityType->getClass(), 'sort'));
-    return $entities;
-  }
-
   /**
    * {@inheritdoc}
    *
@@ -118,10 +107,9 @@ class BlockListBuilder extends ConfigEntityListBuilder implements FormInterface
    */
   public function render($theme = NULL, Request $request = NULL) {
     $this->request = $request;
-    // If no theme was specified, use the current theme.
-    $this->theme = $theme ?: \Drupal::theme()->getActiveTheme()->getName();
+    $this->theme = $theme;
 
-    return \Drupal::formBuilder()->getForm($this);
+    return $this->formBuilder->getForm($this);
   }
 
   /**
@@ -132,55 +120,40 @@ class BlockListBuilder extends ConfigEntityListBuilder implements FormInterface
   }
 
   /**
-   * Implements \Drupal\Core\Form\FormInterface::buildForm().
-   *
-   * Form constructor for the main block administration form.
+   * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $placement = FALSE;
-    if ($this->request->query->has('block-placement')) {
-      $placement = $this->request->query->get('block-placement');
-      $form['#attached']['drupalSettings']['blockPlacement'] = $placement;
-    }
-    $entities = $this->load();
-    $form['#theme'] = array('block_list');
     $form['#attached']['library'][] = 'core/drupal.tableheader';
     $form['#attached']['library'][] = 'block/drupal.block';
     $form['#attached']['library'][] = 'block/drupal.block.admin';
     $form['#attributes']['class'][] = 'clearfix';
 
-    // Add a last region for disabled blocks.
-    $block_regions_with_disabled = $this->regions + array(BlockInterface::BLOCK_REGION_NONE => BlockInterface::BLOCK_REGION_NONE);
-    $form['block_regions'] = array(
-      '#type' => 'value',
-      '#value' => $block_regions_with_disabled,
-    );
-
-    // Weights range from -delta to +delta, so delta should be at least half
-    // of the amount of blocks present. This makes sure all blocks in the same
-    // region get an unique weight.
-    $weight_delta = round(count($entities) / 2);
-
     // Build the form tree.
-    $form['edited_theme'] = array(
-      '#type' => 'value',
-      '#value' => $this->theme,
+    $form['blocks'] = $this->buildBlocksForm();
+
+    $form['actions'] = array(
+      '#tree' => FALSE,
+      '#type' => 'actions',
     );
-    $form['blocks'] = array(
-      '#type' => 'table',
-      '#header' => array(
-        t('Block'),
-        t('Category'),
-        t('Region'),
-        t('Weight'),
-        t('Operations'),
-      ),
-      '#attributes' => array(
-        'id' => 'blocks',
-      ),
+    $form['actions']['submit'] = array(
+      '#type' => 'submit',
+      '#value' => $this->t('Save blocks'),
+      '#button_type' => 'primary',
     );
 
+    return $form;
+  }
+
+  /**
+   * Builds the main "Blocks" portion of the form.
+   *
+   * @return array
+   */
+  protected function buildBlocksForm() {
     // Build blocks first for each region.
+    $blocks = [];
+    $entities = $this->load();
+    /** @var \Drupal\block\BlockInterface[] $entities */
     foreach ($entities as $entity_id => $entity) {
       $definition = $entity->getPlugin()->getPluginDefinition();
       $blocks[$entity->getRegion()][$entity_id] = array(
@@ -192,36 +165,73 @@ class BlockListBuilder extends ConfigEntityListBuilder implements FormInterface
       );
     }
 
+    $form = array(
+      '#type' => 'table',
+      '#header' => array(
+        $this->t('Block'),
+        $this->t('Category'),
+        $this->t('Region'),
+        $this->t('Weight'),
+        $this->t('Operations'),
+      ),
+      '#attributes' => array(
+        'id' => 'blocks',
+      ),
+    );
+
+    // Weights range from -delta to +delta, so delta should be at least half
+    // of the amount of blocks present. This makes sure all blocks in the same
+    // region get an unique weight.
+    $weight_delta = round(count($entities) / 2);
+
+    $placement = FALSE;
+    if ($this->request->query->has('block-placement')) {
+      $placement = $this->request->query->get('block-placement');
+      $form['#attached']['drupalSettings']['blockPlacement'] = $placement;
+    }
+
     // Loop over each region and build blocks.
+    $regions = $this->systemRegionList($this->getThemeName(), REGIONS_VISIBLE);
+    $block_regions_with_disabled = $regions + array(BlockInterface::BLOCK_REGION_NONE => $this->t('Disabled', array(), array('context' => 'Plural')));
     foreach ($block_regions_with_disabled as $region => $title) {
-      $form['blocks']['#tabledrag'][] = array(
+      $form['#tabledrag'][] = array(
         'action' => 'match',
         'relationship' => 'sibling',
         'group' => 'block-region-select',
         'subgroup' => 'block-region-' . $region,
         'hidden' => FALSE,
       );
-      $form['blocks']['#tabledrag'][] = array(
+      $form['#tabledrag'][] = array(
         'action' => 'order',
         'relationship' => 'sibling',
         'group' => 'block-weight',
         'subgroup' => 'block-weight-' . $region,
       );
 
-      $form['blocks'][$region] = array(
+      $form['region-' . $region] = array(
         '#attributes' => array(
           'class' => array('region-title', 'region-title-' . $region),
           'no_striping' => TRUE,
         ),
       );
-      $form['blocks'][$region]['title'] = array(
-        '#markup' => $region != BlockInterface::BLOCK_REGION_NONE ? $title : t('Disabled', array(), array('context' => 'Plural')),
+      $form['region-' . $region]['title'] = array(
+        '#prefix' => $region != BlockInterface::BLOCK_REGION_NONE ? $title : $block_regions_with_disabled[$region],
+        '#type' => 'link',
+        '#title' => $this->t('Place block <span class="visually-hidden">in the %region region</span>', ['%region' => $block_regions_with_disabled[$region]]),
+        '#url' => Url::fromRoute('block.admin_library', ['theme' => $this->getThemeName()], ['query' => ['region' => $region]]),
         '#wrapper_attributes' => array(
           'colspan' => 5,
         ),
+        '#attributes' => [
+          'class' => ['use-ajax', 'button', 'button--small'],
+          'data-dialog-type' => 'modal',
+          'data-dialog-options' => Json::encode([
+            'width' => 700,
+          ]),
+        ],
       );
 
-      $form['blocks'][$region . '-message'] = array(
+      $form['region-' . $region . '-message'] = array(
         '#attributes' => array(
           'class' => array(
             'region-message',
@@ -230,8 +240,8 @@ class BlockListBuilder extends ConfigEntityListBuilder implements FormInterface
           ),
         ),
       );
-      $form['blocks'][$region . '-message']['message'] = array(
-        '#markup' => '<em>' . t('No blocks in this region') . '</em>',
+      $form['region-' . $region . '-message']['message'] = array(
+        '#markup' => '<em>' . $this->t('No blocks in this region') . '</em>',
         '#wrapper_attributes' => array(
           'colspan' => 5,
         ),
@@ -241,137 +251,87 @@ class BlockListBuilder extends ConfigEntityListBuilder implements FormInterface
         foreach ($blocks[$region] as $info) {
           $entity_id = $info['entity_id'];
 
-          $form['blocks'][$entity_id] = array(
+          $form[$entity_id] = array(
             '#attributes' => array(
               'class' => array('draggable'),
             ),
           );
           if ($placement && $placement == Html::getClass($entity_id)) {
-            $form['blocks'][$entity_id]['#attributes']['class'][] = 'color-warning';
-            $form['blocks'][$entity_id]['#attributes']['class'][] = 'js-block-placed';
+            $form[$entity_id]['#attributes']['class'][] = 'color-warning';
+            $form[$entity_id]['#attributes']['class'][] = 'js-block-placed';
           }
-          $form['blocks'][$entity_id]['info'] = array(
+          $form[$entity_id]['info'] = array(
             '#markup' => SafeMarkup::checkPlain($info['label']),
             '#wrapper_attributes' => array(
               'class' => array('block'),
             ),
           );
-          $form['blocks'][$entity_id]['type'] = array(
+          $form[$entity_id]['type'] = array(
             '#markup' => $info['category'],
           );
-          $form['blocks'][$entity_id]['region-theme']['region'] = array(
+          $form[$entity_id]['region-theme']['region'] = array(
             '#type' => 'select',
             '#default_value' => $region,
             '#empty_value' => BlockInterface::BLOCK_REGION_NONE,
-            '#title' => t('Region for @block block', array('@block' => $info['label'])),
+            '#title' => $this->t('Region for @block block', array('@block' => $info['label'])),
             '#title_display' => 'invisible',
-            '#options' => $this->regions,
+            '#options' => $regions,
             '#attributes' => array(
               'class' => array('block-region-select', 'block-region-' . $region),
             ),
             '#parents' => array('blocks', $entity_id, 'region'),
           );
-          $form['blocks'][$entity_id]['region-theme']['theme'] = array(
+          $form[$entity_id]['region-theme']['theme'] = array(
             '#type' => 'hidden',
-            '#value' => $this->theme,
+            '#value' => $this->getThemeName(),
             '#parents' => array('blocks', $entity_id, 'theme'),
           );
-          $form['blocks'][$entity_id]['weight'] = array(
+          $form[$entity_id]['weight'] = array(
             '#type' => 'weight',
             '#default_value' => $info['weight'],
             '#delta' => $weight_delta,
-            '#title' => t('Weight for @block block', array('@block' => $info['label'])),
+            '#title' => $this->t('Weight for @block block', array('@block' => $info['label'])),
             '#title_display' => 'invisible',
             '#attributes' => array(
               'class' => array('block-weight', 'block-weight-' . $region),
             ),
           );
-          $form['blocks'][$entity_id]['operations'] = $this->buildOperations($info['entity']);
+          $form[$entity_id]['operations'] = $this->buildOperations($info['entity']);
         }
       }
     }
 
     // Do not allow disabling the main system content block when it is present.
-    if (isset($form['blocks']['system_main']['region'])) {
-      $form['blocks']['system_main']['region']['#required'] = TRUE;
-    }
-
-    $form['actions'] = array(
-      '#tree' => FALSE,
-      '#type' => 'actions',
-    );
-    $form['actions']['submit'] = array(
-      '#type' => 'submit',
-      '#value' => t('Save blocks'),
-      '#button_type' => 'primary',
-    );
-
-    $form['place_blocks']['title'] = array(
-      '#type' => 'container',
-      '#markup' => '<h3>' . t('Place blocks') . '</h3>',
-      '#attributes' => array(
-        'class' => array(
-          'entity-meta__header',
-        ),
-      ),
-    );
-
-    $form['place_blocks']['filter'] = array(
-      '#type' => 'search',
-      '#title' => t('Filter'),
-      '#title_display' => 'invisible',
-      '#size' => 30,
-      '#placeholder' => t('Filter by block name'),
-      '#attributes' => array(
-        'class' => array('block-filter-text'),
-        'data-element' => '.entity-meta',
-        'title' => t('Enter a part of the block name to filter by.'),
-      ),
-    );
-
-    $form['place_blocks']['list']['#type'] = 'container';
-    $form['place_blocks']['list']['#attributes']['class'][] = 'entity-meta';
-
-    // Only add blocks which work without any available context.
-    $definitions = $this->blockManager->getDefinitionsForContexts();
-    $sorted_definitions = $this->blockManager->getSortedDefinitions($definitions);
-    foreach ($sorted_definitions as $plugin_id => $plugin_definition) {
-      $category = SafeMarkup::checkPlain($plugin_definition['category']);
-      $category_key = 'category-' . $category;
-      if (!isset($form['place_blocks']['list'][$category_key])) {
-        $form['place_blocks']['list'][$category_key] = array(
-          '#type' => 'details',
-          '#title' => $category,
-          '#open' => TRUE,
-          'content' => array(
-            '#theme' => 'links',
-            '#links' => array(),
-            '#attributes' => array(
-              'class' => array(
-                'block-list',
-              ),
-            ),
-          ),
-        );
-      }
-      $form['place_blocks']['list'][$category_key]['content']['#links'][$plugin_id] = array(
-        'title' => $plugin_definition['admin_label'],
-        'url' => Url::fromRoute('block.admin_add', [
-          'plugin_id' => $plugin_id,
-          'theme' => $this->theme
-        ]),
-        'attributes' => array(
-          'class' => array('use-ajax', 'block-filter-text-source'),
-          'data-dialog-type' => 'modal',
-          'data-dialog-options' => Json::encode(array(
-            'width' => 700,
-          )),
-        ),
-      );
+    if (isset($form['system_main']['region'])) {
+      $form['system_main']['region']['#required'] = TRUE;
     }
     return $form;
   }
 
+  /**
+   * Gets the name of the theme used for this block listing.
+   *
+   * @return string
+   *   The name of the theme.
+   */
+  protected function getThemeName() {
+    // If no theme was specified, use the current theme.
+    if (!$this->theme) {
+      $this->theme = $this->themeManager->getActiveTheme()->getName();
+    }
+    return $this->theme;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getEntityIds() {
+    return $this->getStorage()->getQuery()
+      ->condition('theme', $this->getThemeName())
+      ->sort($this->entityType->getKey('id'))
+      ->execute();
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -379,26 +339,25 @@ class BlockListBuilder extends ConfigEntityListBuilder implements FormInterface
     $operations = parent::getDefaultOperations($entity);
 
     if (isset($operations['edit'])) {
-      $operations['edit']['title'] = t('Configure');
+      $operations['edit']['title'] = $this->t('Configure');
     }
 
     return $operations;
   }
 
   /**
-   * Implements \Drupal\Core\Form\FormInterface::validateForm().
+   * {@inheritdoc}
    */
   public function validateForm(array &$form, FormStateInterface $form_state) {
     // No validation.
   }
 
   /**
-   * Implements \Drupal\Core\Form\FormInterface::submitForm().
-   *
-   * Form submission handler for the main block administration form.
+   * {@inheritdoc}
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
     $entities = $this->storage->loadMultiple(array_keys($form_state->getValue('blocks')));
+    /** @var \Drupal\block\BlockInterface[] $entities */
     foreach ($entities as $entity_id => $entity) {
       $entity_values = $form_state->getValue(array('blocks', $entity_id));
       $entity->setWeight($entity_values['weight']);
@@ -417,4 +376,11 @@ class BlockListBuilder extends ConfigEntityListBuilder implements FormInterface
     $this->request->query->remove('block-placement');
   }
 
+  /**
+   * Wraps system_region_list().
+   */
+  protected function systemRegionList($theme, $show = REGIONS_ALL) {
+    return system_region_list($theme, $show);
+  }
+
 }
diff --git a/core/modules/block/src/BlockPluginCollection.php b/core/modules/block/src/BlockPluginCollection.php
index c1905a794..b757d2322 100644
--- a/core/modules/block/src/BlockPluginCollection.php
+++ b/core/modules/block/src/BlockPluginCollection.php
@@ -9,7 +9,6 @@ namespace Drupal\block;
 
 use Drupal\Component\Plugin\Exception\PluginException;
 use Drupal\Component\Plugin\PluginManagerInterface;
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Plugin\DefaultSingleLazyPluginCollection;
 
 /**
@@ -56,7 +55,7 @@ class BlockPluginCollection extends DefaultSingleLazyPluginCollection {
    */
   protected function initializePlugin($instance_id) {
     if (!$instance_id) {
-      throw new PluginException(SafeMarkup::format("The block '@block' did not specify a plugin.", array('@block' => $this->blockId)));
+      throw new PluginException("The block '{$this->blockId}' did not specify a plugin.");
     }
 
     try {
diff --git a/core/modules/block/src/BlockRepository.php b/core/modules/block/src/BlockRepository.php
index 980e0adb8..9d56fde84 100644
--- a/core/modules/block/src/BlockRepository.php
+++ b/core/modules/block/src/BlockRepository.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\block;
 
+use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Plugin\Context\ContextHandlerInterface;
 use Drupal\Core\Theme\ThemeManagerInterface;
@@ -49,7 +50,7 @@ class BlockRepository implements BlockRepositoryInterface {
   /**
    * {@inheritdoc}
    */
-  public function getVisibleBlocksPerRegion(array $contexts) {
+  public function getVisibleBlocksPerRegion(array &$cacheable_metadata = []) {
     $active_theme = $this->themeManager->getActiveTheme();
     // Build an array of the region names in the right order.
     $empty = array_fill_keys($active_theme->getRegions(), array());
@@ -57,9 +58,18 @@ class BlockRepository implements BlockRepositoryInterface {
     $full = array();
     foreach ($this->blockStorage->loadByProperties(array('theme' => $active_theme->getName())) as $block_id => $block) {
       /** @var \Drupal\block\BlockInterface $block */
+      $access = $block->access('view', NULL, TRUE);
+      $region = $block->getRegion();
+      if (!isset($cacheable_metadata[$region])) {
+        $cacheable_metadata[$region] = CacheableMetadata::createFromObject($access);
+      }
+      else {
+        $cacheable_metadata[$region] = $cacheable_metadata[$region]->merge(CacheableMetadata::createFromObject($access));
+      }
+
       // Set the contexts on the block before checking access.
-      if ($block->setContexts($contexts)->access('view')) {
-        $full[$block->getRegion()][$block_id] = $block;
+      if ($access->isAllowed()) {
+        $full[$region][$block_id] = $block;
       }
     }
 
diff --git a/core/modules/block/src/BlockRepositoryInterface.php b/core/modules/block/src/BlockRepositoryInterface.php
index 082456f0d..59dc26012 100644
--- a/core/modules/block/src/BlockRepositoryInterface.php
+++ b/core/modules/block/src/BlockRepositoryInterface.php
@@ -12,13 +12,14 @@ interface BlockRepositoryInterface {
   /**
    * Returns an array of regions and their block entities.
    *
-   * @param \Drupal\Component\Plugin\Context\ContextInterface[] $contexts
-   *   An array of contexts to set on the blocks.
+   * @param \Drupal\Core\Cache\CacheableMetadata[] $cacheable_metadata
+   *   (optional) List of CacheableMetadata objects, keyed by region. This is
+   *   by reference and is used to pass this information back to the caller.
    *
    * @return array
    *   The array is first keyed by region machine name, with the values
    *   containing an array keyed by block ID, with block entities as the values.
    */
-  public function getVisibleBlocksPerRegion(array $contexts);
+  public function getVisibleBlocksPerRegion(array &$cacheable_metadata = []);
 
 }
diff --git a/core/modules/block/src/BlockViewBuilder.php b/core/modules/block/src/BlockViewBuilder.php
index a68b6eb89..187692de5 100644
--- a/core/modules/block/src/BlockViewBuilder.php
+++ b/core/modules/block/src/BlockViewBuilder.php
@@ -48,6 +48,9 @@ class BlockViewBuilder extends EntityViewBuilder {
       $derivative_id = $plugin->getDerivativeId();
       $configuration = $plugin->getConfiguration();
 
+      $cache_tags = Cache::mergeTags($this->getCacheTags(), $entity->getCacheTags());
+      $cache_tags = Cache::mergeTags($cache_tags, $plugin->getCacheTags());
+
       // Create the render array for the block as a whole.
       // @see template_preprocess_block().
       $build[$entity_id] = array(
@@ -67,12 +70,11 @@ class BlockViewBuilder extends EntityViewBuilder {
         '#id' => $entity->id(),
         '#cache' => [
           'keys' => ['entity_view', 'block', $entity->id()],
-          'contexts' => $plugin->getCacheContexts(),
-          'tags' => Cache::mergeTags(
-            $this->getCacheTags(), // Block view builder cache tag.
-            $entity->getCacheTags(), // Block entity cache tag.
-            $plugin->getCacheTags() // Block plugin cache tags.
+          'contexts' => Cache::mergeContexts(
+            $entity->getCacheContexts(),
+            $plugin->getCacheContexts()
           ),
+          'tags' => $cache_tags,
           'max-age' => $plugin->getCacheMaxAge(),
         ],
         '#pre_render' => [
diff --git a/core/modules/block/src/Controller/BlockLibraryController.php b/core/modules/block/src/Controller/BlockLibraryController.php
new file mode 100644
index 000000000..2a0148fda
--- /dev/null
+++ b/core/modules/block/src/Controller/BlockLibraryController.php
@@ -0,0 +1,179 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\block\Controller\BlockLibraryController.
+ */
+
+namespace Drupal\block\Controller;
+
+use Drupal\Component\Serialization\Json;
+use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Core\Block\BlockManagerInterface;
+use Drupal\Core\Controller\ControllerBase;
+use Drupal\Core\EventSubscriber\MainContentViewSubscriber;
+use Drupal\Core\Menu\LocalActionManagerInterface;
+use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Core\Url;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * Provides a list of block plugins to be added to the layout.
+ */
+class BlockLibraryController extends ControllerBase {
+
+  /**
+   * The block manager.
+   *
+   * @var \Drupal\Core\Block\BlockManagerInterface
+   */
+  protected $blockManager;
+
+  /**
+   * The route match.
+   *
+   * @var \Drupal\Core\Routing\RouteMatchInterface
+   */
+  protected $routeMatch;
+
+  /**
+   * The local action manager.
+   *
+   * @var \Drupal\Core\Menu\LocalActionManagerInterface
+   */
+  protected $localActionManager;
+
+  /**
+   * Constructs a BlockLibraryController object.
+   *
+   * @param \Drupal\Core\Block\BlockManagerInterface $block_manager
+   *   The block manager.
+   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   *   The current route match.
+   * @param \Drupal\Core\Menu\LocalActionManagerInterface $local_action_manager
+   *   The local action manager.
+   */
+  public function __construct(BlockManagerInterface $block_manager, RouteMatchInterface $route_match, LocalActionManagerInterface $local_action_manager) {
+    $this->blockManager = $block_manager;
+    $this->routeMatch = $route_match;
+    $this->localActionManager = $local_action_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static(
+      $container->get('plugin.manager.block'),
+      $container->get('current_route_match'),
+      $container->get('plugin.manager.menu.local_action')
+    );
+  }
+
+  /**
+   * Shows a list of blocks that can be added to a theme's layout.
+   *
+   * @param \Symfony\Component\HttpFoundation\Request $request
+   *   The current request.
+   * @param string $theme
+   *   Theme key of the block list.
+   *
+   * @return array
+   *   A render array as expected by the renderer.
+   */
+  public function listBlocks(Request $request, $theme) {
+    // Since modals do not render any other part of the page, we need to render
+    // them manually as part of this listing.
+    if ($request->query->get(MainContentViewSubscriber::WRAPPER_FORMAT) === 'drupal_modal') {
+      $build['local_actions'] = $this->buildLocalActions();
+    }
+
+    $headers = [
+      ['data' => $this->t('Block')],
+      ['data' => $this->t('Category')],
+      ['data' => $this->t('Operations')],
+    ];
+
+    // Only add blocks which work without any available context.
+    $definitions = $this->blockManager->getDefinitionsForContexts();
+    // Order by category, and then by admin label.
+    $definitions = $this->blockManager->getSortedDefinitions($definitions);
+
+    $region = $request->query->get('region');
+    $rows = [];
+    foreach ($definitions as $plugin_id => $plugin_definition) {
+      $row = [];
+      $row['title']['data'] = [
+        '#markup' => $plugin_definition['admin_label'],
+        '#prefix' => '<div class="block-filter-text-source">',
+        '#suffix' => '</div>',
+      ];
+      $row['category']['data'] = SafeMarkup::checkPlain($plugin_definition['category']);
+      $links['add'] = [
+        'title' => $this->t('Place block'),
+        'url' => Url::fromRoute('block.admin_add', ['plugin_id' => $plugin_id, 'theme' => $theme]),
+        'attributes' => [
+          'class' => ['use-ajax'],
+          'data-dialog-type' => 'modal',
+          'data-dialog-options' => Json::encode([
+            'width' => 700,
+          ]),
+        ],
+      ];
+      if ($region) {
+        $links['add']['query']['region'] = $region;
+      }
+      $row['operations']['data'] = [
+        '#type' => 'operations',
+        '#links' => $links,
+      ];
+      $rows[] = $row;
+    }
+
+    $build['#attached']['library'][] = 'block/drupal.block.admin';
+
+    $build['filter'] = [
+      '#type' => 'search',
+      '#title' => $this->t('Filter'),
+      '#title_display' => 'invisible',
+      '#size' => 30,
+      '#placeholder' => $this->t('Filter by block name'),
+      '#attributes' => [
+        'class' => ['block-filter-text'],
+        'data-element' => '.block-add-table',
+        'title' => $this->t('Enter a part of the block name to filter by.'),
+      ],
+    ];
+
+    $build['blocks'] = [
+      '#type' => 'table',
+      '#header' => $headers,
+      '#rows' => $rows,
+      '#empty' => $this->t('No blocks available.'),
+      '#attributes' => [
+        'class' => ['block-add-table'],
+      ],
+    ];
+
+    return $build;
+  }
+
+  /**
+   * Builds the local actions for this listing.
+   *
+   * @return array
+   *   An array of local actions for this listing.
+   */
+  protected function buildLocalActions() {
+    $build = $this->localActionManager->getActionsForRoute($this->routeMatch->getRouteName());
+    // Without this workaround, the action links will be rendered as <li> with
+    // no wrapping <ul> element.
+    if (!empty($build)) {
+      $build['#prefix'] = '<ul class="action-links">';
+      $build['#suffix'] = '</ul>';
+    }
+    return $build;
+  }
+
+}
diff --git a/core/modules/block/src/Entity/Block.php b/core/modules/block/src/Entity/Block.php
index 948d29370..d2b303199 100644
--- a/core/modules/block/src/Entity/Block.php
+++ b/core/modules/block/src/Entity/Block.php
@@ -246,25 +246,10 @@ class Block extends ConfigEntityBase implements BlockInterface, EntityWithPlugin
     // so we must invalidate the associated block's cache tag (which includes
     // the theme cache tag).
     if (!$update) {
-      Cache::invalidateTags($this->getCacheTags());
+      Cache::invalidateTags($this->getCacheTagsToInvalidate());
     }
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function setContexts(array $contexts) {
-    $this->contexts = $contexts;
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getContexts() {
-    return $this->contexts;
-  }
-
   /**
    * {@inheritdoc}
    */
diff --git a/core/modules/block/src/Event/BlockContextEvent.php b/core/modules/block/src/Event/BlockContextEvent.php
deleted file mode 100644
index 99b0bbdde..000000000
--- a/core/modules/block/src/Event/BlockContextEvent.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\block\Event\BlockContextEvent.
- */
-
-namespace Drupal\block\Event;
-
-use Drupal\Core\Plugin\Context\ContextInterface;
-use Symfony\Component\EventDispatcher\Event;
-
-/**
- * Event subscribers can add context to be used by the block and its conditions.
- *
- * @see \Drupal\block\Event\BlockEvents::ACTIVE_CONTEXT
- * @see \Drupal\block\Event\BlockEvents::ADMINISTRATIVE_CONTEXT
- */
-class BlockContextEvent extends Event {
-
-  /**
-   * The array of available contexts for blocks.
-   *
-   * @var array
-   */
-  protected $contexts = [];
-
-  /**
-   * Sets the context object for a given name.
-   *
-   * @param string $name
-   *   The name to store the context object under.
-   * @param \Drupal\Core\Plugin\Context\ContextInterface $context
-   *   The context object to set.
-   *
-   * @return $this
-   */
-  public function setContext($name, ContextInterface $context) {
-    $this->contexts[$name] = $context;
-    return $this;
-  }
-
-  /**
-   * Returns the context objects.
-   *
-   * @return \Drupal\Component\Plugin\Context\ContextInterface[]
-   *   An array of contexts that have been provided.
-   */
-  public function getContexts() {
-    return $this->contexts;
-  }
-
-}
diff --git a/core/modules/block/src/Event/BlockEvents.php b/core/modules/block/src/Event/BlockEvents.php
deleted file mode 100644
index 118f2f8ef..000000000
--- a/core/modules/block/src/Event/BlockEvents.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\block\Event\BlockEvents.
- */
-
-namespace Drupal\block\Event;
-
-/**
- * Defines events for the Block module.
- */
-final class BlockEvents {
-
-  /**
-   * Name of the event when gathering condition context for a block plugin.
-   *
-   * This event allows you to provide additional context that can be used by
-   * a condition plugin in order to determine the visibility of a block. The
-   * event listener method receives a \Drupal\block\Event\BlockContextEvent
-   * instance. Generally any new context is paired with a new condition plugin
-   * that interprets the provided context and allows the block system to
-   * determine whether or not the block should be displayed.
-   *
-   * @Event
-   *
-   * @see \Drupal\Core\Block\BlockBase::getConditionContexts()
-   * @see \Drupal\block\Event\BlockContextEvent
-   * @see \Drupal\block\EventSubscriber\NodeRouteContext::onBlockActiveContext()
-   * @see \Drupal\Core\Condition\ConditionInterface
-   */
-  const ACTIVE_CONTEXT = 'block.active_context';
-
-  /**
-   * Name of the event when gathering contexts for plugin configuration.
-   *
-   * This event allows you to provide information about your context to the
-   * administration UI without having to provide a value for the context. For
-   * example, during configuration there is no specific node to pass as context.
-   * However, we still need to inform the system that a context named 'node' is
-   * available and provide a definition so that blocks can be configured to use
-   * it.
-   *
-   * The event listener method receives a \Drupal\block\Event\BlockContextEvent
-   * instance.
-   *
-   * @Event
-   *
-   * @see \Drupal\block\BlockForm::form()
-   * @see \Drupal\block\Event\BlockContextEvent
-   * @see \Drupal\block\EventSubscriber\NodeRouteContext::onBlockAdministrativeContext()
-   */
-  const ADMINISTRATIVE_CONTEXT = 'block.administrative_context';
-
-}
diff --git a/core/modules/block/src/EventSubscriber/BlockContextSubscriberBase.php b/core/modules/block/src/EventSubscriber/BlockContextSubscriberBase.php
deleted file mode 100644
index 60158dbb6..000000000
--- a/core/modules/block/src/EventSubscriber/BlockContextSubscriberBase.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\block\EventSubscriber\BlockContextSubscriberBase.
- */
-
-namespace Drupal\block\EventSubscriber;
-
-use Drupal\block\Event\BlockContextEvent;
-use Drupal\block\Event\BlockEvents;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-
-/**
- * Provides a base class for block context subscribers.
- */
-abstract class BlockContextSubscriberBase implements EventSubscriberInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function getSubscribedEvents() {
-    $events[BlockEvents::ACTIVE_CONTEXT][] = 'onBlockActiveContext';
-    $events[BlockEvents::ADMINISTRATIVE_CONTEXT][] = 'onBlockAdministrativeContext';
-    return $events;
-  }
-
-  /**
-   * Determines the available run-time contexts.
-   *
-   * For blocks to render correctly, all of the contexts that they require
-   * must be populated with values. So this method must set a value for each
-   * context that it adds. For example:
-   * @code
-   *   // Determine a specific node to pass as context to blocks.
-   *   $node = ...
-   *
-   *   // Set that specific node as the value of the 'node' context.
-   *   $context = new Context(new ContextDefinition('entity:node'));
-   *   $context->setContextValue($node);
-   *   $event->setContext('node.node', $context);
-   * @endcode
-   *
-   * @param \Drupal\block\Event\BlockContextEvent $event
-   *   The Event to which to register available contexts.
-   */
-  abstract public function onBlockActiveContext(BlockContextEvent $event);
-
-  /**
-   * Determines the available configuration-time contexts.
-   *
-   * When a block is being configured, the configuration UI must know which
-   * named contexts are potentially available, but does not care about the
-   * value, since the value can be different for each request, and might not
-   * be available at all during the configuration UI's request.
-   *
-   * For example:
-   * @code
-   *   // During configuration, there is no specific node to pass as context.
-   *   // However, inform the system that a context named 'node.node' is
-   *   // available, and provide its definition, so that blocks can be
-   *   // configured to use it. When the block is rendered, the value of this
-   *   // context will be supplied by onBlockActiveContext().
-   *   $context = new Context(new ContextDefinition('entity:node'));
-   *   $event->setContext('node.node', $context);
-   * @endcode
-   *
-   * @param \Drupal\block\Event\BlockContextEvent $event
-   *   The Event to which to register available contexts.
-   *
-   * @see static::onBlockActiveContext()
-   */
-  abstract public function onBlockAdministrativeContext(BlockContextEvent $event);
-
-}
diff --git a/core/modules/block/src/Plugin/Derivative/ThemeLocalTask.php b/core/modules/block/src/Plugin/Derivative/ThemeLocalTask.php
index cbc0a73df..c91bc7ce1 100644
--- a/core/modules/block/src/Plugin/Derivative/ThemeLocalTask.php
+++ b/core/modules/block/src/Plugin/Derivative/ThemeLocalTask.php
@@ -69,7 +69,7 @@ class ThemeLocalTask extends DeriverBase implements ContainerDeriverInterface {
       }
       // Default task!
       if ($default_theme == $theme_name) {
-        $this->derivatives[$theme_name]['route_name'] = 'block.admin_display';
+        $this->derivatives[$theme_name]['route_name'] = $base_plugin_definition['parent_id'];
         // Emulate default logic because without the base plugin id we can't
         // change the base_route.
         $this->derivatives[$theme_name]['weight'] = -10;
diff --git a/core/modules/block/src/Plugin/DisplayVariant/BlockPageVariant.php b/core/modules/block/src/Plugin/DisplayVariant/BlockPageVariant.php
index 7b6709372..650cf7834 100644
--- a/core/modules/block/src/Plugin/DisplayVariant/BlockPageVariant.php
+++ b/core/modules/block/src/Plugin/DisplayVariant/BlockPageVariant.php
@@ -8,17 +8,14 @@
 namespace Drupal\block\Plugin\DisplayVariant;
 
 use Drupal\block\BlockRepositoryInterface;
-use Drupal\block\Event\BlockContextEvent;
-use Drupal\block\Event\BlockEvents;
 use Drupal\Core\Block\MainContentBlockPluginInterface;
 use Drupal\Core\Block\MessagesBlockPluginInterface;
+use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Display\PageVariantInterface;
-use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Entity\EntityViewBuilderInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\Core\Display\VariantBase;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 /**
  * Provides a page display variant that decorates the main content with blocks.
@@ -79,16 +76,13 @@ class BlockPageVariant extends VariantBase implements PageVariantInterface, Cont
    *   The block repository.
    * @param \Drupal\Core\Entity\EntityViewBuilderInterface $block_view_builder
    *   The block view builder.
-   * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $dispatcher
-   *   The event dispatcher.
    * @param string[] $block_list_cache_tags
    *   The Block entity type list cache tags.
    */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, BlockRepositoryInterface $block_repository, EntityViewBuilderInterface $block_view_builder, EventDispatcherInterface $dispatcher, array $block_list_cache_tags) {
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, BlockRepositoryInterface $block_repository, EntityViewBuilderInterface $block_view_builder, array $block_list_cache_tags) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
     $this->blockRepository = $block_repository;
     $this->blockViewBuilder = $block_view_builder;
-    $this->dispatcher = $dispatcher;
     $this->blockListCacheTags = $block_list_cache_tags;
   }
 
@@ -102,7 +96,6 @@ class BlockPageVariant extends VariantBase implements PageVariantInterface, Cont
       $plugin_definition,
       $container->get('block.repository'),
       $container->get('entity.manager')->getViewBuilder('block'),
-      $container->get('event_dispatcher'),
       $container->get('entity.manager')->getDefinition('block')->getListCacheTags()
     );
   }
@@ -128,9 +121,9 @@ class BlockPageVariant extends VariantBase implements PageVariantInterface, Cont
         'tags' => $this->blockListCacheTags,
       ],
     ];
-    $contexts = $this->getActiveBlockContexts();
     // Load all region content assigned via blocks.
-    foreach ($this->blockRepository->getVisibleBlocksPerRegion($contexts) as $region => $blocks) {
+    $cacheable_metadata_list = [];
+    foreach ($this->blockRepository->getVisibleBlocksPerRegion($cacheable_metadata_list) as $region => $blocks) {
       /** @var $blocks \Drupal\block\BlockInterface[] */
       foreach ($blocks as $key => $block) {
         $block_plugin = $block->getPlugin();
@@ -172,17 +165,18 @@ class BlockPageVariant extends VariantBase implements PageVariantInterface, Cont
       ];
     }
 
+    // The access results' cacheability is currently added to the top level of the
+    // render array. This is done to prevent issues with empty regions being
+    // displayed.
+    // This would need to be changed to allow caching of block regions, as each
+    // region must then have the relevant cacheable metadata.
+    $merged_cacheable_metadata = CacheableMetadata::createFromRenderArray($build);
+    foreach ($cacheable_metadata_list as $cacheable_metadata) {
+      $merged_cacheable_metadata = $merged_cacheable_metadata->merge($cacheable_metadata);
+    }
+    $merged_cacheable_metadata->applyTo($build);
+
     return $build;
   }
 
-  /**
-   * Returns an array of context objects to set on the blocks.
-   *
-   * @return \Drupal\Component\Plugin\Context\ContextInterface[]
-   *   An array of contexts to set on the blocks.
-   */
-  protected function getActiveBlockContexts() {
-    return $this->dispatcher->dispatch(BlockEvents::ACTIVE_CONTEXT, new BlockContextEvent())->getContexts();
-  }
-
 }
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockPluginId.php b/core/modules/block/src/Plugin/migrate/process/d6/BlockPluginId.php
similarity index 95%
rename from core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockPluginId.php
rename to core/modules/block/src/Plugin/migrate/process/d6/BlockPluginId.php
index 01854bd90..55cbd9686 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockPluginId.php
+++ b/core/modules/block/src/Plugin/migrate/process/d6/BlockPluginId.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\BlockPluginId.
+ * Contains \Drupal\block\Plugin\migrate\process\d6\BlockPluginId.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
+namespace Drupal\block\Plugin\migrate\process\d6;
 
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockRegion.php b/core/modules/block/src/Plugin/migrate/process/d6/BlockRegion.php
similarity index 86%
rename from core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockRegion.php
rename to core/modules/block/src/Plugin/migrate/process/d6/BlockRegion.php
index 0f61515e5..672645b3d 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockRegion.php
+++ b/core/modules/block/src/Plugin/migrate/process/d6/BlockRegion.php
@@ -1,12 +1,12 @@
 <?php
+
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\BlockRegion.
+ * Contains \Drupal\block\Plugin\migrate\process\d6\BlockRegion.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
+namespace Drupal\block\Plugin\migrate\process\d6;
 
-use Drupal\Component\Utility\NestedArray;
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\ProcessPluginBase;
 use Drupal\migrate\Row;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockSettings.php b/core/modules/block/src/Plugin/migrate/process/d6/BlockSettings.php
similarity index 92%
rename from core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockSettings.php
rename to core/modules/block/src/Plugin/migrate/process/d6/BlockSettings.php
index 0d05eb2bd..2b410eb4e 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockSettings.php
+++ b/core/modules/block/src/Plugin/migrate/process/d6/BlockSettings.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\BlockSettings.
+ * Contains \Drupal\block\Plugin\migrate\process\d6\BlockSettings.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
+namespace Drupal\block\Plugin\migrate\process\d6;
 
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\ProcessPluginBase;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockTheme.php b/core/modules/block/src/Plugin/migrate/process/d6/BlockTheme.php
similarity index 95%
rename from core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockTheme.php
rename to core/modules/block/src/Plugin/migrate/process/d6/BlockTheme.php
index 290ed856e..16039331c 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockTheme.php
+++ b/core/modules/block/src/Plugin/migrate/process/d6/BlockTheme.php
@@ -1,10 +1,11 @@
 <?php
+
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\BlockTheme.
+ * Contains \Drupal\block\Plugin\migrate\process\d6\BlockTheme.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
+namespace Drupal\block\Plugin\migrate\process\d6;
 
 use Drupal\migrate\Entity\MigrationInterface;
 use Drupal\migrate\MigrateExecutableInterface;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockVisibility.php b/core/modules/block/src/Plugin/migrate/process/d6/BlockVisibility.php
similarity index 94%
rename from core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockVisibility.php
rename to core/modules/block/src/Plugin/migrate/process/d6/BlockVisibility.php
index f072b17d0..9afd1800f 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockVisibility.php
+++ b/core/modules/block/src/Plugin/migrate/process/d6/BlockVisibility.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\BlockVisibility.
+ * Contains \Drupal\block\Plugin\migrate\process\d6\BlockVisibility.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
+namespace Drupal\block\Plugin\migrate\process\d6;
 
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\migrate\MigrateExecutableInterface;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Block.php b/core/modules/block/src/Plugin/migrate/source/d6/Block.php
similarity index 97%
rename from core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Block.php
rename to core/modules/block/src/Plugin/migrate/source/d6/Block.php
index b27364153..ba13254b2 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Block.php
+++ b/core/modules/block/src/Plugin/migrate/source/d6/Block.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\Block.
+ * Contains \Drupal\block\Plugin\migrate\source\d6\Block.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+namespace Drupal\block\Plugin\migrate\source\d6;
 
 use Drupal\migrate\Row;
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
diff --git a/core/modules/block/src/Tests/BlockCacheTest.php b/core/modules/block/src/Tests/BlockCacheTest.php
index 78ccd04b0..b118e8410 100644
--- a/core/modules/block/src/Tests/BlockCacheTest.php
+++ b/core/modules/block/src/Tests/BlockCacheTest.php
@@ -119,9 +119,11 @@ class BlockCacheTest extends WebTestBase {
   }
 
   /**
-   * Test a cacheable block without any cache context.
+   * Test a cacheable block without any additional cache context.
    */
-  function testCacheGlobal() {
+  function testCachePermissions() {
+    // user.permissions is a required context, so a user with different
+    // permissions will see a different version of the block.
     \Drupal::state()->set('block_test.cache_contexts', []);
 
     $current_content = $this->randomMachineName();
@@ -134,9 +136,12 @@ class BlockCacheTest extends WebTestBase {
     $current_content = $this->randomMachineName();
     \Drupal::state()->set('block_test.content', $current_content);
 
-    $this->drupalLogout();
     $this->drupalGet('user');
     $this->assertText($old_content, 'Block content served from cache.');
+
+    $this->drupalLogout();
+    $this->drupalGet('user');
+    $this->assertText($current_content, 'Block content not served from cache.');
   }
 
   /**
diff --git a/core/modules/block/src/Tests/BlockLanguageCacheTest.php b/core/modules/block/src/Tests/BlockLanguageCacheTest.php
index 45f6803d1..a11bdd627 100644
--- a/core/modules/block/src/Tests/BlockLanguageCacheTest.php
+++ b/core/modules/block/src/Tests/BlockLanguageCacheTest.php
@@ -62,6 +62,7 @@ class BlockLanguageCacheTest extends WebTestBase {
     // Create the block cache for all languages.
     foreach ($this->langcodes as $langcode) {
       $this->drupalGet('admin/structure/block', array('language' => $langcode));
+      $this->clickLinkPartialName('Place block');
     }
 
     // Create a menu in the default language.
@@ -73,6 +74,7 @@ class BlockLanguageCacheTest extends WebTestBase {
     // Check that the block is listed for all languages.
     foreach ($this->langcodes as $langcode) {
       $this->drupalGet('admin/structure/block', array('language' => $langcode));
+      $this->clickLinkPartialName('Place block');
       $this->assertText($edit['label']);
     }
   }
diff --git a/core/modules/block/src/Tests/BlockLanguageTest.php b/core/modules/block/src/Tests/BlockLanguageTest.php
index db908b0d0..265524f90 100644
--- a/core/modules/block/src/Tests/BlockLanguageTest.php
+++ b/core/modules/block/src/Tests/BlockLanguageTest.php
@@ -90,6 +90,7 @@ class BlockLanguageTest extends WebTestBase {
           'langcodes' => array(
             'fr' => 'fr',
           ),
+          'context_mapping' => ['language' => '@language.current_language_context:language_interface'],
         ),
       ),
     );
@@ -141,7 +142,7 @@ class BlockLanguageTest extends WebTestBase {
     // Enable a standard block and set visibility to French only.
     $block_id = strtolower($this->randomMachineName(8));
     $edit = [
-      'visibility[language][context_mapping][language]' => 'language.language_interface',
+      'visibility[language][context_mapping][language]' => '@language.current_language_context:language_interface',
       'visibility[language][langcodes][fr]' => TRUE,
       'id' => $block_id,
       'region' => 'sidebar_first',
@@ -167,7 +168,7 @@ class BlockLanguageTest extends WebTestBase {
 
     // Change visibility to now depend on content language for this block.
     $edit = [
-      'visibility[language][context_mapping][language]' => 'language.language_content'
+      'visibility[language][context_mapping][language]' => '@language.current_language_context:language_content'
     ];
     $this->drupalPostForm('admin/structure/block/manage/' . $block_id, $edit, t('Save block'));
 
diff --git a/core/modules/block/src/Tests/BlockSystemBrandingTest.php b/core/modules/block/src/Tests/BlockSystemBrandingTest.php
index 57ebc857f..a78f67511 100644
--- a/core/modules/block/src/Tests/BlockSystemBrandingTest.php
+++ b/core/modules/block/src/Tests/BlockSystemBrandingTest.php
@@ -53,6 +53,14 @@ class BlockSystemBrandingTest extends BlockTestBase {
     $this->assertTrue(!empty($site_slogan_element), 'The branding block slogan was found.');
     $this->assertCacheTag('config:system.site');
 
+    // Be sure the slogan is XSS-filtered.
+    $this->config('system.site')
+      ->set('slogan', '<script>alert("Community carpentry");</script>')
+      ->save();
+    $this->drupalGet('');
+    $site_slogan_element = $this->xpath($site_slogan_xpath);
+    $this->assertEqual($site_slogan_element[0], 'alert("Community carpentry");', 'The site slogan was XSS-filtered.');
+
     // Turn just the logo off.
     $this->config('block.block.site-branding')
       ->set('settings.use_site_logo', 0)
diff --git a/core/modules/block/src/Tests/BlockTest.php b/core/modules/block/src/Tests/BlockTest.php
index 8c65bc303..5ab46e13c 100644
--- a/core/modules/block/src/Tests/BlockTest.php
+++ b/core/modules/block/src/Tests/BlockTest.php
@@ -334,11 +334,13 @@ class BlockTest extends BlockTestBase {
       'config:block_list',
       'block_view',
       'config:block.block.powered',
+      'config:user.role.anonymous',
       'rendered',
     );
     sort($expected_cache_tags);
+    $keys = \Drupal::service('cache_contexts_manager')->convertTokensToKeys(['languages:language_interface', 'theme', 'user.permissions'])->getKeys();
     $this->assertIdentical($cache_entry->tags, $expected_cache_tags);
-    $cache_entry = \Drupal::cache('render')->get('entity_view:block:powered:en:classy');
+    $cache_entry = \Drupal::cache('render')->get('entity_view:block:powered:' . implode(':', $keys));
     $expected_cache_tags = array(
       'block_view',
       'config:block.block.powered',
@@ -373,6 +375,7 @@ class BlockTest extends BlockTestBase {
       'block_view',
       'config:block.block.powered',
       'config:block.block.powered-2',
+      'config:user.role.anonymous',
       'rendered',
     );
     sort($expected_cache_tags);
@@ -383,7 +386,8 @@ class BlockTest extends BlockTestBase {
       'rendered',
     );
     sort($expected_cache_tags);
-    $cache_entry = \Drupal::cache('render')->get('entity_view:block:powered:en:classy');
+    $keys = \Drupal::service('cache_contexts_manager')->convertTokensToKeys(['languages:language_interface', 'theme', 'user.permissions'])->getKeys();
+    $cache_entry = \Drupal::cache('render')->get('entity_view:block:powered:' . implode(':', $keys));
     $this->assertIdentical($cache_entry->tags, $expected_cache_tags);
     $expected_cache_tags = array(
       'block_view',
@@ -391,7 +395,8 @@ class BlockTest extends BlockTestBase {
       'rendered',
     );
     sort($expected_cache_tags);
-    $cache_entry = \Drupal::cache('render')->get('entity_view:block:powered-2:en:classy');
+    $keys = \Drupal::service('cache_contexts_manager')->convertTokensToKeys(['languages:language_interface', 'theme', 'user.permissions'])->getKeys();
+    $cache_entry = \Drupal::cache('render')->get('entity_view:block:powered-2:' . implode(':', $keys));
     $this->assertIdentical($cache_entry->tags, $expected_cache_tags);
 
     // Now we should have a cache hit again.
diff --git a/core/modules/block/src/Tests/BlockTitleXSSTest.php b/core/modules/block/src/Tests/BlockTitleXSSTest.php
deleted file mode 100644
index 3790d56d1..000000000
--- a/core/modules/block/src/Tests/BlockTitleXSSTest.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\block\Tests\BlockTitleXSSTest.
- */
-
-namespace Drupal\block\Tests;
-
-use Drupal\simpletest\WebTestBase;
-
-/**
- * Tests block XSS in title.
- *
- * @group block
- */
-class BlockTitleXSSTest extends WebTestBase {
-
-  /**
-   * Modules to install.
-   *
-   * @var array
-   */
-  public static $modules = array('block', 'block_test');
-
-  protected function setUp() {
-    parent::setUp();
-
-    $this->drupalPlaceBlock('test_xss_title', array('label' => '<script>alert("XSS label");</script>'));
-  }
-
-  /**
-   * Test XSS in title.
-   */
-  function testXSSInTitle() {
-    \Drupal::state()->set('block_test.content', $this->randomMachineName());
-    $this->drupalGet('');
-    $this->assertNoRaw('<script>alert("XSS label");</script>', 'The block title was properly sanitized when rendered.');
-
-    $this->drupalLogin($this->drupalCreateUser(array('administer blocks', 'access administration pages')));
-    $default_theme = $this->config('system.theme')->get('default');
-    $this->drupalGet('admin/structure/block/list/' . $default_theme);
-    $this->assertNoRaw("<script>alert('XSS subject');</script>", 'The block title was properly sanitized in Block Plugin UI Admin page.');
-  }
-
-}
diff --git a/core/modules/block/src/Tests/BlockUiTest.php b/core/modules/block/src/Tests/BlockUiTest.php
index aba4ba152..37fce6e60 100644
--- a/core/modules/block/src/Tests/BlockUiTest.php
+++ b/core/modules/block/src/Tests/BlockUiTest.php
@@ -126,6 +126,12 @@ class BlockUiTest extends WebTestBase {
         'The block "' . $label . '" has the correct weight assignment (' . $values['test_weight'] . ').'
       );
     }
+
+    // Add a block with a machine name the same as a region name.
+    $this->drupalPlaceBlock('system_powered_by_block', ['region' => 'header', 'id' => 'header']);
+    $this->drupalGet('admin/structure/block');
+    $element = $this->xpath('//tr[contains(@class, :class)]', [':class' => 'region-title-header']);
+    $this->assertTrue(!empty($element));
   }
 
   /**
@@ -133,14 +139,15 @@ class BlockUiTest extends WebTestBase {
    */
   public function testCandidateBlockList() {
     $arguments = array(
-      ':ul_class' => 'block-list',
-      ':li_class' => 'test-block-instantiation',
+      ':title' => 'Display message',
+      ':category' => 'Block test',
       ':href' => 'admin/structure/block/add/test_block_instantiation/classy',
-      ':text' => 'Display message',
     );
+    $pattern = '//tr[.//td/div[text()=:title] and .//td[text()=:category] and .//td//a[contains(@href, :href)]]';
 
     $this->drupalGet('admin/structure/block');
-    $elements = $this->xpath('//details[@id="edit-category-block-test"]//ul[contains(@class, :ul_class)]/li[contains(@class, :li_class)]/a[contains(@href, :href) and text()=:text]', $arguments);
+    $this->clickLinkPartialName('Place block');
+    $elements = $this->xpath($pattern, $arguments);
     $this->assertTrue(!empty($elements), 'The test block appears in the category for its module.');
 
     // Trigger the custom category addition in block_test_block_alter().
@@ -148,7 +155,9 @@ class BlockUiTest extends WebTestBase {
     $this->container->get('plugin.manager.block')->clearCachedDefinitions();
 
     $this->drupalGet('admin/structure/block');
-    $elements = $this->xpath('//details[@id="edit-category-custom-category"]//ul[contains(@class, :ul_class)]/li[contains(@class, :li_class)]/a[contains(@href, :href) and text()=:text]', $arguments);
+    $this->clickLinkPartialName('Place block');
+    $arguments[':category'] = 'Custom category';
+    $elements = $this->xpath($pattern, $arguments);
     $this->assertTrue(!empty($elements), 'The test block appears in a custom category controlled by block_test_block_alter().');
   }
 
diff --git a/core/modules/block/src/Tests/BlockViewBuilderTest.php b/core/modules/block/src/Tests/BlockViewBuilderTest.php
index ccb53e40e..7e3c39a74 100644
--- a/core/modules/block/src/Tests/BlockViewBuilderTest.php
+++ b/core/modules/block/src/Tests/BlockViewBuilderTest.php
@@ -9,7 +9,7 @@ namespace Drupal\block\Tests;
 
 use Drupal\Component\Utility\Html;
 use Drupal\Core\Cache\Cache;
-use Drupal\Core\Cache\Context\UrlCacheContext;
+use Drupal\Core\Language\LanguageInterface;
 use Drupal\simpletest\KernelTestBase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
@@ -27,7 +27,7 @@ class BlockViewBuilderTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('block', 'block_test', 'system');
+  public static $modules = array('block', 'block_test', 'system', 'user');
 
   /**
    * The block being tested.
@@ -160,7 +160,7 @@ class BlockViewBuilderTest extends KernelTestBase {
 
     // Test that a cache entry is created.
     $build = $this->getBlockRenderArray();
-    $cid = 'entity_view:block:test_block:en:core';
+    $cid = 'entity_view:block:test_block:' . implode(':', \Drupal::service('cache_contexts_manager')->convertTokensToKeys(['languages:' . LanguageInterface::TYPE_INTERFACE, 'theme', 'user.permissions'])->getKeys());
     $this->renderer->renderRoot($build);
     $this->assertTrue($this->container->get('cache.render')->get($cid), 'The block render element has been cached.');
 
@@ -190,14 +190,14 @@ class BlockViewBuilderTest extends KernelTestBase {
   public function testBlockViewBuilderAlter() {
     // Establish baseline.
     $build = $this->getBlockRenderArray();
-    $this->assertIdentical($this->renderer->renderRoot($build), 'Llamas &gt; unicorns!');
+    $this->assertIdentical((string) $this->renderer->renderRoot($build), 'Llamas &gt; unicorns!');
 
     // Enable the block view alter hook that adds a suffix, for basic testing.
     \Drupal::state()->set('block_test_view_alter_suffix', TRUE);
-    Cache::invalidateTags($this->block->getCacheTags());
+    Cache::invalidateTags($this->block->getCacheTagsToInvalidate());
     $build = $this->getBlockRenderArray();
     $this->assertTrue(isset($build['#suffix']) && $build['#suffix'] === '<br>Goodbye!', 'A block with content is altered.');
-    $this->assertIdentical($this->renderer->renderRoot($build), 'Llamas &gt; unicorns!<br>Goodbye!');
+    $this->assertIdentical((string) $this->renderer->renderRoot($build), 'Llamas &gt; unicorns!<br>Goodbye!');
     \Drupal::state()->set('block_test_view_alter_suffix', FALSE);
 
     // Force a request via GET so we can test the render cache.
@@ -206,7 +206,7 @@ class BlockViewBuilderTest extends KernelTestBase {
     $request->setMethod('GET');
 
     \Drupal::state()->set('block_test.content', NULL);
-    Cache::invalidateTags($this->block->getCacheTags());
+    Cache::invalidateTags($this->block->getCacheTagsToInvalidate());
 
     $default_keys = array('entity_view', 'block', 'test_block');
     $default_tags = array('block_view', 'config:block.block.test_block');
@@ -214,11 +214,11 @@ class BlockViewBuilderTest extends KernelTestBase {
     // Advanced: cached block, but an alter hook adds an additional cache key.
     $alter_add_key = $this->randomMachineName();
     \Drupal::state()->set('block_test_view_alter_cache_key', $alter_add_key);
-    $cid = 'entity_view:block:test_block:' . $alter_add_key . ':en:core';
+    $cid = 'entity_view:block:test_block:' . $alter_add_key . ':' . implode(':', \Drupal::service('cache_contexts_manager')->convertTokensToKeys(['languages:' . LanguageInterface::TYPE_INTERFACE, 'theme', 'user.permissions'])->getKeys());
     $expected_keys = array_merge($default_keys, array($alter_add_key));
     $build = $this->getBlockRenderArray();
     $this->assertIdentical($expected_keys, $build['#cache']['keys'], 'An altered cacheable block has the expected cache keys.');
-    $this->assertIdentical($this->renderer->renderRoot($build), '');
+    $this->assertIdentical((string) $this->renderer->renderRoot($build), '');
     $cache_entry = $this->container->get('cache.render')->get($cid);
     $this->assertTrue($cache_entry, 'The block render element has been cached with the expected cache ID.');
     $expected_tags = array_merge($default_tags, ['rendered']);
@@ -233,7 +233,7 @@ class BlockViewBuilderTest extends KernelTestBase {
     $build = $this->getBlockRenderArray();
     sort($build['#cache']['tags']);
     $this->assertIdentical($expected_tags, $build['#cache']['tags'], 'An altered cacheable block has the expected cache tags.');
-    $this->assertIdentical($this->renderer->renderRoot($build), '');
+    $this->assertIdentical((string) $this->renderer->renderRoot($build), '');
     $cache_entry = $this->container->get('cache.render')->get($cid);
     $this->assertTrue($cache_entry, 'The block render element has been cached with the expected cache ID.');
     $expected_tags = array_merge($default_tags, [$alter_add_tag, 'rendered']);
@@ -246,7 +246,7 @@ class BlockViewBuilderTest extends KernelTestBase {
     \Drupal::state()->set('block_test_view_alter_append_pre_render_prefix', TRUE);
     $build = $this->getBlockRenderArray();
     $this->assertFalse(isset($build['#prefix']), 'The appended #pre_render callback has not yet run before rendering.');
-    $this->assertIdentical($this->renderer->renderRoot($build), 'Hiya!<br>');
+    $this->assertIdentical((string) $this->renderer->renderRoot($build), 'Hiya!<br>');
     $this->assertTrue(isset($build['#prefix']) && $build['#prefix'] === 'Hiya!<br>', 'A cached block without content is altered.');
 
     // Restore the previous request method.
diff --git a/core/modules/block/src/Tests/BlockXssTest.php b/core/modules/block/src/Tests/BlockXssTest.php
index f24811a32..3d9bfd39d 100644
--- a/core/modules/block/src/Tests/BlockXssTest.php
+++ b/core/modules/block/src/Tests/BlockXssTest.php
@@ -26,7 +26,34 @@ class BlockXssTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = ['block', 'block_content', 'menu_ui', 'views'];
+  public static $modules = ['block', 'block_content', 'block_test', 'menu_ui', 'views'];
+
+  /**
+   * Test XSS in title.
+   */
+  public function testXssInTitle() {
+    $this->drupalPlaceBlock('test_xss_title', ['label' => '<script>alert("XSS label");</script>']);
+
+    \Drupal::state()->set('block_test.content', $this->randomMachineName());
+    $this->drupalGet('');
+    $this->assertNoRaw('<script>alert("XSS label");</script>', 'The block title was properly sanitized when rendered.');
+
+    $this->drupalLogin($this->drupalCreateUser(['administer blocks', 'access administration pages']));
+    $default_theme = $this->config('system.theme')->get('default');
+    $this->drupalGet('admin/structure/block/list/' . $default_theme);
+    $this->assertNoRaw("<script>alert('XSS subject');</script>", 'The block title was properly sanitized in Block Plugin UI Admin page.');
+  }
+
+  /**
+   * Tests XSS in category.
+   */
+  public function testXssInCategory() {
+    $this->drupalPlaceBlock('test_xss_title');
+    $this->drupalLogin($this->drupalCreateUser(['administer blocks', 'access administration pages']));
+    $this->drupalGet(Url::fromRoute('block.admin_display'));
+    $this->clickLinkPartialName('Place block');
+    $this->assertNoRaw("<script>alert('XSS category');</script>");
+  }
 
   /**
    * Tests various modules that provide blocks for XSS.
@@ -51,8 +78,9 @@ class BlockXssTest extends WebTestBase {
     $view->save();
 
     $this->drupalGet(Url::fromRoute('block.admin_display'));
-    $this->clickLink('<script>alert("view");</script>');
-    $this->assertRaw('&lt;script&gt;alert(&quot;view&quot;);&lt;/script&gt;');
+    $this->clickLinkPartialName('Place block');
+    // The block admin label is automatically XSS admin filtered.
+    $this->assertRaw('alert("view");');
     $this->assertNoRaw('<script>alert("view");</script>');
   }
 
@@ -66,8 +94,9 @@ class BlockXssTest extends WebTestBase {
     ])->save();
 
     $this->drupalGet(Url::fromRoute('block.admin_display'));
-    $this->clickLink('<script>alert("menu");</script>');
-    $this->assertRaw('&lt;script&gt;alert(&quot;menu&quot;);&lt;/script&gt;');
+    $this->clickLinkPartialName('Place block');
+    // The block admin label is automatically XSS admin filtered.
+    $this->assertRaw('alert("menu");');
     $this->assertNoRaw('<script>alert("menu");</script>');
   }
 
@@ -86,8 +115,9 @@ class BlockXssTest extends WebTestBase {
     ])->save();
 
     $this->drupalGet(Url::fromRoute('block.admin_display'));
-    $this->clickLink('<script>alert("block_content");</script>');
-    $this->assertRaw('&lt;script&gt;alert(&quot;block_content&quot;);&lt;/script&gt;');
+    $this->clickLinkPartialName('Place block');
+    // The block admin label is automatically XSS admin filtered.
+    $this->assertRaw('alert("block_content");');
     $this->assertNoRaw('<script>alert("block_content");</script>');
   }
 
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateBlockTest.php b/core/modules/block/src/Tests/Migrate/d6/MigrateBlockTest.php
similarity index 92%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateBlockTest.php
rename to core/modules/block/src/Tests/Migrate/d6/MigrateBlockTest.php
index a1ec049c6..232fa4a32 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateBlockTest.php
+++ b/core/modules/block/src/Tests/Migrate/d6/MigrateBlockTest.php
@@ -2,19 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateBlockTest.
+ * Contains \Drupal\block\Tests\Migrate\d6\MigrateBlockTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\block\Tests\Migrate\d6;
 
-use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 use Drupal\block\Entity\Block;
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade block settings to block.block.*.yml.
  *
- * @group migrate_drupal
+ * @group block
  */
 class MigrateBlockTest extends MigrateDrupal6TestBase {
 
@@ -72,16 +71,8 @@ class MigrateBlockTest extends MigrateDrupal6TestBase {
     // Install one of D8's test themes.
     \Drupal::service('theme_handler')->install(array('test_theme'));
 
-    /** @var \Drupal\migrate\entity\Migration $migration */
-    $migration = entity_load('migration', 'd6_block');
-    $dumps = array(
-      $this->getDumpDirectory() . '/Blocks.php',
-      $this->getDumpDirectory() . '/BlocksRoles.php',
-      $this->getDumpDirectory() . '/AggregatorFeed.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->loadDumps(['Blocks.php', 'BlocksRoles.php', 'AggregatorFeed.php']);
+    $this->executeMigration('d6_block');
   }
 
   /**
diff --git a/core/modules/block/src/Tests/Update/BlockContextMappingUpdateTest.php b/core/modules/block/src/Tests/Update/BlockContextMappingUpdateTest.php
new file mode 100644
index 000000000..da03fa054
--- /dev/null
+++ b/core/modules/block/src/Tests/Update/BlockContextMappingUpdateTest.php
@@ -0,0 +1,110 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\block\Tests\Update\BlockContextMappingUpdateTest.
+ */
+
+namespace Drupal\block\Tests\Update;
+
+use Drupal\block\Entity\Block;
+use Drupal\node\Entity\Node;
+use Drupal\system\Tests\Update\UpdatePathTestBase;
+
+/**
+ * Tests the upgrade path for block context mapping renames.
+ *
+ * @see https://www.drupal.org/node/2354889
+ *
+ * @group Update
+ */
+class BlockContextMappingUpdateTest extends UpdatePathTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $modules = ['block_test', 'language'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    $this->databaseDumpFiles = [
+      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
+      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.block-context-manager-2354889.php',
+    ];
+    parent::setUp();
+  }
+
+  /**
+   * Tests that block context mapping is updated properly.
+   */
+  public function testUpdateHookN() {
+    $this->runUpdates();
+    $this->assertRaw('Encountered an unknown context mapping key coming probably from a contributed or custom module: One or more mappings could not be updated. Please manually review your visibility settings for the following blocks, which are disabled now:<ul><li>User login (Visibility: Baloney spam)</li></ul>');
+
+    // Disable maintenance mode.
+    \Drupal::state()->set('system.maintenance_mode', FALSE);
+
+    // We finished updating so we can login the user now.
+    $this->drupalLogin($this->rootUser);
+
+    // The block that we are testing has the following visibility rules:
+    // - only visible on node pages
+    // - only visible to authenticated users.
+    $block_title = 'Test for 2354889';
+
+    // Create two nodes, a page and an article.
+    $page = Node::create([
+      'type' => 'page',
+      'title' => 'Page node',
+    ]);
+    $page->save();
+
+    $article = Node::create([
+      'type' => 'article',
+      'title' => 'Article node',
+    ]);
+    $article->save();
+
+    // Check that the block appears only on Page nodes for authenticated users.
+    $this->drupalGet('node/' . $page->id());
+    $this->assertRaw($block_title, 'Test block is visible on a Page node as an authenticated user.');
+
+    $this->drupalGet('node/' . $article->id());
+    $this->assertNoRaw($block_title, 'Test block is not visible on a Article node as an authenticated user.');
+
+    $this->drupalLogout();
+
+    // Check that the block does not appear on any page for anonymous users.
+    $this->drupalGet('node/' . $page->id());
+    $this->assertNoRaw($block_title, 'Test block is not visible on a Page node as an anonymous user.');
+
+    $this->drupalGet('node/' . $article->id());
+    $this->assertNoRaw($block_title, 'Test block is not visible on a Article node as an anonymous user.');
+
+    // Ensure that all the context mappings got updated properly.
+    $block = Block::load('testfor2354889');
+    $visibility = $block->get('visibility');
+    $this->assertEqual('@node.node_route_context:node', $visibility['node_type']['context_mapping']['node']);
+    $this->assertEqual('@user.current_user_context:current_user', $visibility['user_role']['context_mapping']['user']);
+    $this->assertEqual('@language.current_language_context:language_interface', $visibility['language']['context_mapping']['language']);
+
+    // Check that a block with invalid context is being disabled and that it can
+    // still be edited afterward.
+    $disabled_block = Block::load('thirdtestfor2354889');
+    $this->assertFalse($disabled_block->status(), 'Block with invalid context is disabled');
+
+    $this->assertEqual(['thirdtestfor2354889' => ['missing_context_ids' => ['baloney.spam' => ['node_type']], 'status' => TRUE]], \Drupal::keyValue('update_backup')->get('block_update_8001'));
+
+    $disabled_block_visibility = $disabled_block->get('visibility');
+    $this->assertTrue(!isset($disabled_block_visibility['node_type']), 'The problematic visibility condition has been removed.');
+
+    $admin_user = $this->drupalCreateUser(['administer blocks']);
+    $this->drupalLogin($admin_user);
+
+    $this->drupalGet('admin/structure/block/manage/thirdtestfor2354889');
+    $this->assertResponse('200');
+  }
+
+}
diff --git a/core/modules/block/src/Tests/Views/DisplayBlockTest.php b/core/modules/block/src/Tests/Views/DisplayBlockTest.php
index 3f96ab10f..880f68ced 100644
--- a/core/modules/block/src/Tests/Views/DisplayBlockTest.php
+++ b/core/modules/block/src/Tests/Views/DisplayBlockTest.php
@@ -8,8 +8,6 @@
 namespace Drupal\block\Tests\Views;
 
 use Drupal\Component\Serialization\Json;
-use Drupal\Component\Utility\Html;
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\views\Views;
 use Drupal\views\Tests\ViewTestBase;
 use Drupal\views\Tests\ViewTestData;
@@ -60,19 +58,20 @@ class DisplayBlockTest extends ViewTestBase {
     $edit['block[style][row_plugin]'] = 'fields';
     $this->drupalPostForm('admin/structure/views/add', $edit, t('Save and edit'));
 
+    $pattern = '//tr[.//td[text()=:category] and .//td//a[contains(@href, :href)]]';
+
     // Test that the block was given a default category corresponding to its
     // base table.
     $arguments = array(
-      ':id' => 'edit-category-lists-views',
-      ':li_class' => 'views-block' . Html::getClass($edit['id']) . '-block-1',
       ':href' => \Drupal::Url('block.admin_add', array(
         'plugin_id' => 'views_block:' . $edit['id'] . '-block_1',
         'theme' => 'classy',
       )),
-      ':text' => $edit['label'],
+      ':category' => t('Lists (Views)'),
     );
     $this->drupalGet('admin/structure/block');
-    $elements = $this->xpath('//details[@id=:id]//li[contains(@class, :li_class)]/a[contains(@href, :href) and text()=:text]', $arguments);
+    $this->clickLinkPartialName('Place block');
+    $elements = $this->xpath($pattern, $arguments);
     $this->assertTrue(!empty($elements), 'The test block appears in the category for its base table.');
 
     // Duplicate the block before changing the category.
@@ -81,10 +80,9 @@ class DisplayBlockTest extends ViewTestBase {
 
     // Change the block category to a random string.
     $this->drupalGet('admin/structure/views/view/' . $edit['id'] . '/edit/block_1');
-    $label = t('Lists (Views)');
-    $link = $this->xpath('//a[@id="views-block-1-block-category" and normalize-space(text())=:label]', array(':label' => $label));
+    $link = $this->xpath('//a[@id="views-block-1-block-category" and normalize-space(text())=:category]', $arguments);
     $this->assertTrue(!empty($link));
-    $this->clickLink($label);
+    $this->clickLink(t('Lists (Views)'));
     $category = $this->randomString();
     $this->drupalPostForm(NULL, array('block_category' => $category), t('Apply'));
 
@@ -95,34 +93,30 @@ class DisplayBlockTest extends ViewTestBase {
     $this->drupalPostForm(NULL, array(), t('Save'));
 
     // Test that the blocks are listed under the correct categories.
-    $category_id = Html::getUniqueId('edit-category-' . SafeMarkup::checkPlain($category));
-    $arguments[':id'] = $category_id;
+    $arguments[':category'] = $category;
     $this->drupalGet('admin/structure/block');
-    $elements = $this->xpath('//details[@id=:id]//li[contains(@class, :li_class)]/a[contains(@href, :href) and text()=:text]', $arguments);
+    $this->clickLinkPartialName('Place block');
+    $elements = $this->xpath($pattern, $arguments);
     $this->assertTrue(!empty($elements), 'The test block appears in the custom category.');
 
     $arguments = array(
-      ':id' => 'edit-category-lists-views',
-      ':li_class' => 'views-block' . Html::getClass($edit['id']) . '-block-2',
       ':href' => \Drupal::Url('block.admin_add', array(
         'plugin_id' => 'views_block:' . $edit['id'] . '-block_2',
         'theme' => 'classy',
       )),
-      ':text' => $edit['label'],
+      ':category' => t('Lists (Views)'),
     );
-    $elements = $this->xpath('//details[@id=:id]//li[contains(@class, :li_class)]/a[contains(@href, :href) and text()=:text]', $arguments);
+    $elements = $this->xpath($pattern, $arguments);
     $this->assertTrue(!empty($elements), 'The first duplicated test block remains in the original category.');
 
     $arguments = array(
-      ':id' => $category_id,
-      ':li_class' => 'views-block' . Html::getClass($edit['id']) . '-block-3',
       ':href' => \Drupal::Url('block.admin_add', array(
         'plugin_id' => 'views_block:' . $edit['id'] . '-block_3',
         'theme' => 'classy',
       )),
-      ':text' => $edit['label'],
+      ':category' => $category,
     );
-    $elements = $this->xpath('//details[@id=:id]//li[contains(@class, :li_class)]/a[contains(@href, :href) and text()=:text]', $arguments);
+    $elements = $this->xpath($pattern, $arguments);
     $this->assertTrue(!empty($elements), 'The second duplicated test block appears in the custom category.');
   }
 
diff --git a/core/modules/block/tests/modules/block_test/src/Plugin/Condition/BaloneySpam.php b/core/modules/block/tests/modules/block_test/src/Plugin/Condition/BaloneySpam.php
new file mode 100644
index 000000000..55e12abaa
--- /dev/null
+++ b/core/modules/block/tests/modules/block_test/src/Plugin/Condition/BaloneySpam.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\block_test\Plugin\Condition\BaloneySpam.
+ */
+
+namespace Drupal\block_test\Plugin\Condition;
+
+use Drupal\Core\Condition\ConditionPluginBase;
+
+/**
+ * Provides a 'baloney.spam' condition.
+ *
+ * @Condition(
+ *   id = "baloney.spam",
+ *   label = @Translation("Baloney spam"),
+ * )
+ *
+ */
+class BaloneySpam extends ConditionPluginBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function evaluate() {
+    return TRUE;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function summary() {
+    return 'Summary';
+  }
+
+}
diff --git a/core/modules/block/tests/src/Unit/BlockFormTest.php b/core/modules/block/tests/src/Unit/BlockFormTest.php
index 8acff204a..fbb4096c1 100644
--- a/core/modules/block/tests/src/Unit/BlockFormTest.php
+++ b/core/modules/block/tests/src/Unit/BlockFormTest.php
@@ -30,13 +30,6 @@ class BlockFormTest extends UnitTestCase {
    */
   protected $storage;
 
-  /**
-   * The event dispatcher service.
-   *
-   * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface|\PHPUnit_Framework_MockObject_MockObject
-   */
-  protected $dispatcher;
-
   /**
    * The language manager service.
    *
@@ -59,6 +52,13 @@ class BlockFormTest extends UnitTestCase {
    */
   protected $entityManager;
 
+  /**
+   * The mocked context repository.
+   *
+   * @var \Drupal\Core\Plugin\Context\ContextRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $contextRepository;
+
   /**
    * {@inheritdoc}
    */
@@ -67,7 +67,7 @@ class BlockFormTest extends UnitTestCase {
 
     $this->conditionManager = $this->getMock('Drupal\Core\Executable\ExecutableManagerInterface');
     $this->language = $this->getMock('Drupal\Core\Language\LanguageManagerInterface');
-    $this->dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
+    $this->contextRepository = $this->getMock('Drupal\Core\Plugin\Context\ContextRepositoryInterface');
 
     $this->entityManager = $this->getMock('Drupal\Core\Entity\EntityManagerInterface');
     $this->storage = $this->getMock('Drupal\Core\Config\Entity\ConfigEntityStorageInterface');
@@ -104,7 +104,7 @@ class BlockFormTest extends UnitTestCase {
       ->method('getQuery')
       ->will($this->returnValue($query));
 
-    $block_form_controller = new BlockForm($this->entityManager, $this->conditionManager, $this->dispatcher, $this->language, $this->themeHandler);
+    $block_form_controller = new BlockForm($this->entityManager, $this->conditionManager, $this->contextRepository, $this->language, $this->themeHandler);
 
     // Ensure that the block with just one other instance gets the next available
     // name suggestion.
diff --git a/core/modules/block/tests/src/Unit/BlockRepositoryTest.php b/core/modules/block/tests/src/Unit/BlockRepositoryTest.php
index 56b90caae..aab11fe9f 100644
--- a/core/modules/block/tests/src/Unit/BlockRepositoryTest.php
+++ b/core/modules/block/tests/src/Unit/BlockRepositoryTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\Tests\block\Unit;
 
 use Drupal\block\BlockRepository;
+use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Block\BlockPluginInterface;
 use Drupal\Core\Plugin\ContextAwarePluginInterface;
 use Drupal\Tests\UnitTestCase;
@@ -59,7 +60,7 @@ class BlockRepositoryTest extends UnitTestCase {
       ]);
 
     $theme_manager = $this->getMock('Drupal\Core\Theme\ThemeManagerInterface');
-    $theme_manager->expects($this->once())
+    $theme_manager->expects($this->atLeastOnce())
       ->method('getActiveTheme')
       ->will($this->returnValue($active_theme));
 
@@ -84,15 +85,18 @@ class BlockRepositoryTest extends UnitTestCase {
     $blocks = [];
     foreach ($blocks_config as $block_id => $block_config) {
       $block = $this->getMock('Drupal\block\BlockInterface');
-      $block->expects($this->once())
-        ->method('setContexts')
-        ->willReturnSelf();
       $block->expects($this->once())
         ->method('access')
         ->will($this->returnValue($block_config[0]));
       $block->expects($block_config[0] ? $this->atLeastOnce() : $this->never())
         ->method('getRegion')
         ->willReturn($block_config[1]);
+      $block->expects($this->any())
+        ->method('label')
+        ->willReturn($block_id);
+      $block->expects($this->any())
+        ->method('getWeight')
+        ->willReturn($block_config[2]);
       $blocks[$block_id] = $block;
     }
 
@@ -101,30 +105,34 @@ class BlockRepositoryTest extends UnitTestCase {
       ->with(['theme' => $this->theme])
       ->willReturn($blocks);
     $result = [];
-    foreach ($this->blockRepository->getVisibleBlocksPerRegion([]) as $region => $resulting_blocks) {
+    $cacheable_metadata = [];
+    foreach ($this->blockRepository->getVisibleBlocksPerRegion($cacheable_metadata) as $region => $resulting_blocks) {
       $result[$region] = [];
       foreach ($resulting_blocks as $plugin_id => $block) {
         $result[$region][] = $plugin_id;
       }
     }
-    $this->assertSame($result, $expected_blocks);
+    $this->assertEquals($expected_blocks, $result);
   }
 
   public function providerBlocksConfig() {
     $blocks_config = array(
       'block1' => array(
-        TRUE, 'top', 0
+        AccessResult::allowed(), 'top', 0
       ),
       // Test a block without access.
       'block2' => array(
-        FALSE, 'bottom', 0
-      ),
-      // Test two blocks in the same region with specific weight.
-      'block3' => array(
-        TRUE, 'bottom', 5
+        AccessResult::forbidden(), 'bottom', 0
       ),
+      // Test some blocks in the same region with specific weight.
       'block4' => array(
-        TRUE, 'bottom', -5
+        AccessResult::allowed(), 'bottom', 5
+      ),
+      'block3' => array(
+        AccessResult::allowed(), 'bottom', 5
+      ),
+      'block5' => array(
+        AccessResult::allowed(), 'bottom', -5
       ),
     );
 
@@ -133,7 +141,7 @@ class BlockRepositoryTest extends UnitTestCase {
       [
         'top' => ['block1'],
         'center' => [],
-        'bottom' => ['block4', 'block3'],
+        'bottom' => ['block5', 'block3', 'block4'],
       ]
     ];
     return $test_cases;
@@ -146,24 +154,21 @@ class BlockRepositoryTest extends UnitTestCase {
    */
   public function testGetVisibleBlocksPerRegionWithContext() {
     $block = $this->getMock('Drupal\block\BlockInterface');
-    $block->expects($this->once())
-      ->method('setContexts')
-      ->willReturnSelf();
     $block->expects($this->once())
       ->method('access')
-      ->willReturn(TRUE);
+      ->willReturn(AccessResult::allowed()->addCacheTags(['config:block.block.block_id']));
     $block->expects($this->once())
       ->method('getRegion')
       ->willReturn('top');
     $blocks['block_id'] = $block;
 
-    $contexts = [];
     $this->blockStorage->expects($this->once())
       ->method('loadByProperties')
       ->with(['theme' => $this->theme])
       ->willReturn($blocks);
     $result = [];
-    foreach ($this->blockRepository->getVisibleBlocksPerRegion($contexts) as $region => $resulting_blocks) {
+    $cacheable_metadata = [];
+    foreach ($this->blockRepository->getVisibleBlocksPerRegion($cacheable_metadata) as $region => $resulting_blocks) {
       $result[$region] = [];
       foreach ($resulting_blocks as $plugin_id => $block) {
         $result[$region][] = $plugin_id;
@@ -177,6 +182,10 @@ class BlockRepositoryTest extends UnitTestCase {
       'bottom' => [],
     ];
     $this->assertSame($expected, $result);
+
+    // Assert that the cacheable metadata from the block access results was
+    // collected.
+    $this->assertEquals(['config:block.block.block_id'], $cacheable_metadata['top']->getCacheTags());
   }
 
 }
diff --git a/core/modules/block/tests/src/Unit/Plugin/DisplayVariant/BlockPageVariantTest.php b/core/modules/block/tests/src/Unit/Plugin/DisplayVariant/BlockPageVariantTest.php
index bb5390ce2..147e64a04 100644
--- a/core/modules/block/tests/src/Unit/Plugin/DisplayVariant/BlockPageVariantTest.php
+++ b/core/modules/block/tests/src/Unit/Plugin/DisplayVariant/BlockPageVariantTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\Tests\block\Unit\Plugin\DisplayVariant;
 
+use Drupal\Core\Cache\CacheableMetadata;
+use Drupal\Core\DependencyInjection\Container;
 use Drupal\Tests\UnitTestCase;
 
 /**
@@ -29,13 +31,6 @@ class BlockPageVariantTest extends UnitTestCase {
    */
   protected $blockViewBuilder;
 
-  /**
-   * The event dispatcher.
-   *
-   * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface|\PHPUnit_Framework_MockObject_MockObject
-   */
-  protected $dispatcher;
-
   /**
    * The plugin context handler.
    *
@@ -55,14 +50,23 @@ class BlockPageVariantTest extends UnitTestCase {
    *   A mocked display variant plugin.
    */
   public function setUpDisplayVariant($configuration = array(), $definition = array()) {
+
+    $container = new Container();
+    $cache_context_manager = $this->getMockBuilder('Drupal\Core\Cache\CacheContextsManager')
+      ->disableOriginalConstructor()
+      ->getMock();
+    $container->set('cache_contexts_manager', $cache_context_manager);
+    $cache_context_manager->expects($this->any())
+      ->method('validateTokens')
+      ->with([])
+      ->willReturn([]);
+    \Drupal::setContainer($container);
+
     $this->blockRepository = $this->getMock('Drupal\block\BlockRepositoryInterface');
     $this->blockViewBuilder = $this->getMock('Drupal\Core\Entity\EntityViewBuilderInterface');
-    $this->dispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
-    $this->dispatcher->expects($this->any())
-      ->method('dispatch')
-      ->willReturnArgument(1);
+
     return $this->getMockBuilder('Drupal\block\Plugin\DisplayVariant\BlockPageVariant')
-      ->setConstructorArgs(array($configuration, 'test', $definition, $this->blockRepository, $this->blockViewBuilder, $this->dispatcher, ['config:block_list']))
+      ->setConstructorArgs(array($configuration, 'test', $definition, $this->blockRepository, $this->blockViewBuilder, ['config:block_list']))
       ->setMethods(array('getRegionNames'))
       ->getMock();
   }
@@ -96,7 +100,10 @@ class BlockPageVariantTest extends UnitTestCase {
         '#cache' => [
           'tags' => [
             'config:block_list',
+            'route',
           ],
+          'contexts' => [],
+          'max-age' => -1,
         ],
         'top' => [
           'block1' => [],
@@ -121,7 +128,10 @@ class BlockPageVariantTest extends UnitTestCase {
         '#cache' => [
           'tags' => [
             'config:block_list',
+            'route',
           ],
+          'contexts' => [],
+          'max-age' => -1,
         ],
         'top' => [
           'block1' => [],
@@ -152,7 +162,10 @@ class BlockPageVariantTest extends UnitTestCase {
         '#cache' => [
           'tags' => [
             'config:block_list',
+            'route',
           ],
+          'contexts' => [],
+          'max-age' => -1,
         ],
         'top' => [
           'block1' => [],
@@ -194,20 +207,26 @@ class BlockPageVariantTest extends UnitTestCase {
     $messages_block_plugin = $this->getMock('Drupal\Core\Block\MessagesBlockPluginInterface');
     foreach ($blocks_config as $block_id => $block_config) {
       $block = $this->getMock('Drupal\block\BlockInterface');
+      $block->expects($this->any())
+        ->method('getContexts')
+        ->willReturn([]);
       $block->expects($this->atLeastOnce())
         ->method('getPlugin')
         ->willReturn($block_config[1] ? $main_content_block_plugin : ($block_config[2] ? $messages_block_plugin : $block_plugin));
       $blocks[$block_config[0]][$block_id] = $block;
     }
-
     $this->blockViewBuilder->expects($this->exactly($visible_block_count))
       ->method('view')
       ->will($this->returnValue(array()));
     $this->blockRepository->expects($this->once())
       ->method('getVisibleBlocksPerRegion')
-      ->will($this->returnValue($blocks));
+      ->willReturnCallback(function (&$cacheable_metadata) use ($blocks) {
+        $cacheable_metadata['top'] = (new CacheableMetadata())->addCacheTags(['route']);
+        return $blocks;
+      });
 
-    $this->assertSame($expected_render_array, $display_variant->build());
+    $value = $display_variant->build();
+    $this->assertSame($expected_render_array, $value);
   }
 
   /**
@@ -226,6 +245,8 @@ class BlockPageVariantTest extends UnitTestCase {
         'tags' => [
           'config:block_list',
         ],
+        'contexts' => [],
+        'max-age' => -1,
       ],
       'content' => [
         'system_main' => [],
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/BlockTest.php b/core/modules/block/tests/src/Unit/Plugin/migrate/source/d6/BlockTest.php
similarity index 85%
rename from core/modules/migrate_drupal/tests/src/Unit/source/d6/BlockTest.php
rename to core/modules/block/tests/src/Unit/Plugin/migrate/source/d6/BlockTest.php
index 79e3344cf..861aa2f67 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/BlockTest.php
+++ b/core/modules/block/tests/src/Unit/Plugin/migrate/source/d6/BlockTest.php
@@ -2,23 +2,24 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\BlockTest.
+ * Contains \Drupal\Tests\block\Unit\Plugin\migrate\source\d6\BlockTest.
  */
 
-namespace Drupal\Tests\migrate_drupal\Unit\source\d6;
+namespace Drupal\Tests\block\Unit\Plugin\migrate\source\d6;
 
 use Drupal\Tests\migrate\Unit\MigrateSqlSourceTestCase;
 
 /**
  * Tests D6 block source plugin.
  *
- * @group migrate_drupal
+ * @coversDefaultClass \Drupal\block\Plugin\migrate\source\d6\Block
+ * @group block
  */
 class BlockTest extends MigrateSqlSourceTestCase {
 
   // The plugin system is not working during unit testing so the source plugin
   // class needs to be manually specified.
-  const PLUGIN_CLASS = 'Drupal\migrate_drupal\Plugin\migrate\source\d6\Block';
+  const PLUGIN_CLASS = 'Drupal\block\Plugin\migrate\source\d6\Block';
 
   // The fake Migration configuration entity.
   protected $migrationConfiguration = array(
diff --git a/core/modules/block_content/block_content.links.action.yml b/core/modules/block_content/block_content.links.action.yml
index d94ca3fc4..4772a6fd7 100644
--- a/core/modules/block_content/block_content.links.action.yml
+++ b/core/modules/block_content/block_content.links.action.yml
@@ -8,7 +8,6 @@ block_content_add_action:
   route_name: block_content.add_page
   title: 'Add custom block'
   appears_on:
-    - block.admin_display
-    - block.admin_display_theme
+    - block.admin_library
     - entity.block_content.collection
   class: \Drupal\block_content\Plugin\Menu\LocalAction\BlockContentAddLocalAction
diff --git a/core/modules/block_content/block_content.pages.inc b/core/modules/block_content/block_content.pages.inc
index 23a7deafc..9e019cd3e 100644
--- a/core/modules/block_content/block_content.pages.inc
+++ b/core/modules/block_content/block_content.pages.inc
@@ -5,7 +5,6 @@
  * Provides page callbacks for custom blocks.
  */
 
-use Drupal\Component\Utility\Xss;
 use Drupal\Core\Url;
 use Drupal\block_content\Entity\BlockContentType;
 use Drupal\block_content\Entity\BlockContent;
@@ -28,7 +27,9 @@ function template_preprocess_block_content_add_list(&$variables) {
   foreach ($variables['content'] as $type) {
     $variables['types'][$type->id()] = array(
       'link' => \Drupal::l($type->label(), new Url('block_content.add_form', array('block_content_type' => $type->id()), array('query' => $query))),
-      'description' => Xss::filterAdmin($type->getDescription()),
+      'description' => array(
+        '#markup' => $type->getDescription(),
+      ),
       'title' => $type->label(),
       'localized_options' => array(
         'query' => $query,
diff --git a/core/modules/block_content/config/schema/block_content.schema.yml b/core/modules/block_content/config/schema/block_content.schema.yml
index 2e7c338b2..756f0204d 100644
--- a/core/modules/block_content/config/schema/block_content.schema.yml
+++ b/core/modules/block_content/config/schema/block_content.schema.yml
@@ -16,3 +16,15 @@ block_content.type.*:
     description:
       type: text
       label: 'Description'
+
+migrate.source.d6_box:
+  type: migrate_source_sql
+  label: 'Drupal 6 box'
+  mapping:
+    constants:
+      type: mapping
+      label: 'Constants'
+      mapping:
+        type:
+          type: string
+          label: 'Type'
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_block_content_body_field.yml b/core/modules/block_content/migration_templates/d6_block_content_body_field.yml
similarity index 83%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_block_content_body_field.yml
rename to core/modules/block_content/migration_templates/d6_block_content_body_field.yml
index 08935eed9..e8164e17c 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_block_content_body_field.yml
+++ b/core/modules/block_content/migration_templates/d6_block_content_body_field.yml
@@ -23,10 +23,3 @@ destination:
 migration_dependencies:
   required:
     - d6_block_content_type
-dependencies:
-  config:
-    - migrate.migration.d6_block_content_type
-  module:
-    - block_content
-    - field
-    - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_block_content_type.yml b/core/modules/block_content/migration_templates/d6_block_content_type.yml
similarity index 84%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_block_content_type.yml
rename to core/modules/block_content/migration_templates/d6_block_content_type.yml
index f055a6180..8dcea2f0f 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_block_content_type.yml
+++ b/core/modules/block_content/migration_templates/d6_block_content_type.yml
@@ -14,7 +14,3 @@ process:
   label: 'constants/label'
 destination:
   plugin: entity:block_content_type
-dependencies:
-  module:
-    - block_content
-    - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_custom_block.yml b/core/modules/block_content/migration_templates/d6_custom_block.yml
similarity index 72%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_custom_block.yml
rename to core/modules/block_content/migration_templates/d6_custom_block.yml
index be6cebfad..0564f8920 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_custom_block.yml
+++ b/core/modules/block_content/migration_templates/d6_custom_block.yml
@@ -22,10 +22,3 @@ migration_dependencies:
   required:
     - d6_filter_format
     - d6_block_content_body_field
-dependencies:
-  config:
-    - migrate.migration.d6_block_content_body_field
-    - migrate.migration.d6_filter_format
-  module:
-    - block_content
-    - migrate_drupal
diff --git a/core/modules/block_content/src/BlockContentForm.php b/core/modules/block_content/src/BlockContentForm.php
index 379e57635..ec267cc39 100644
--- a/core/modules/block_content/src/BlockContentForm.php
+++ b/core/modules/block_content/src/BlockContentForm.php
@@ -224,7 +224,8 @@ class BlockContentForm extends ContentEntityForm {
    * {@inheritdoc}
    */
   public function validateForm(array &$form, FormStateInterface $form_state) {
-    if ($this->entity->isNew()) {
+    $entity = parent::validateForm($form, $form_state);
+    if ($entity->isNew()) {
       $exists = $this->blockContentStorage->loadByProperties(array('info' => $form_state->getValue(['info', 0, 'value'])));
       if (!empty($exists)) {
         $form_state->setErrorByName('info', $this->t('A block with description %name already exists.', array(
@@ -232,6 +233,7 @@ class BlockContentForm extends ContentEntityForm {
         )));
       }
     }
+    return $entity;
   }
 
 }
diff --git a/core/modules/block_content/src/BlockContentTypeListBuilder.php b/core/modules/block_content/src/BlockContentTypeListBuilder.php
index 2a51159c9..c62502181 100644
--- a/core/modules/block_content/src/BlockContentTypeListBuilder.php
+++ b/core/modules/block_content/src/BlockContentTypeListBuilder.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\block_content;
 
-use Drupal\Component\Utility\Xss;
 use Drupal\Core\Config\Entity\ConfigEntityListBuilder;
 use Drupal\Core\Entity\EntityInterface;
 
@@ -45,7 +44,7 @@ class BlockContentTypeListBuilder extends ConfigEntityListBuilder {
    */
   public function buildRow(EntityInterface $entity) {
     $row['type'] = $entity->link();
-    $row['description'] = Xss::filterAdmin($entity->getDescription());
+    $row['description']['data']['#markup'] = $entity->getDescription();
     return $row + parent::buildRow($entity);
   }
 
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Box.php b/core/modules/block_content/src/Plugin/migrate/source/d6/Box.php
similarity index 87%
rename from core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Box.php
rename to core/modules/block_content/src/Plugin/migrate/source/d6/Box.php
index f8eec40fc..9596088ec 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Box.php
+++ b/core/modules/block_content/src/Plugin/migrate/source/d6/Box.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\Box.
+ * Contains \Drupal\block_content\Plugin\migrate\source\d6\Box.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+namespace Drupal\block_content\Plugin\migrate\source\d6;
 
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 
diff --git a/core/modules/block_content/src/Tests/BlockContentCacheTagsTest.php b/core/modules/block_content/src/Tests/BlockContentCacheTagsTest.php
index fe2c789ba..1aecb8523 100644
--- a/core/modules/block_content/src/Tests/BlockContentCacheTagsTest.php
+++ b/core/modules/block_content/src/Tests/BlockContentCacheTagsTest.php
@@ -90,13 +90,15 @@ class BlockContentCacheTagsTest extends EntityCacheTagsTestBase {
     // Expected keys, contexts, and tags for the block.
     // @see \Drupal\block\BlockViewBuilder::viewMultiple()
     $expected_block_cache_keys = ['entity_view', 'block', $block->id()];
-    $expected_block_cache_contexts = ['languages:' . LanguageInterface::TYPE_INTERFACE, 'theme'];
-    $expected_block_cache_tags = Cache::mergeTags(['block_view', 'rendered'], $block->getCacheTags(), $block->getPlugin()->getCacheTags());
+    $expected_block_cache_contexts = ['languages:' . LanguageInterface::TYPE_INTERFACE, 'theme', 'user.permissions'];
+    $expected_block_cache_tags = Cache::mergeTags(['block_view', 'rendered'], $block->getCacheTags());
+    $expected_block_cache_tags = Cache::mergeTags($expected_block_cache_tags, $block->getPlugin()->getCacheTags());
 
     // Expected contexts and tags for the BlockContent entity.
     // @see \Drupal\Core\Entity\EntityViewBuilder::getBuildDefaults().
     $expected_entity_cache_contexts = ['theme'];
-    $expected_entity_cache_tags = Cache::mergeTags(['block_content_view'], $this->entity->getCacheTags(), $this->getAdditionalCacheTagsForEntity($this->entity));
+    $expected_entity_cache_tags = Cache::mergeTags(['block_content_view'], $this->entity->getCacheTags());
+    $expected_entity_cache_tags = Cache::mergeTags($expected_entity_cache_tags, $this->getAdditionalCacheTagsForEntity($this->entity));
 
     // Verify that what was render cached matches the above expectations.
     $cid = $this->createCacheId($expected_block_cache_keys, $expected_block_cache_contexts);
diff --git a/core/modules/block_content/src/Tests/BlockContentTypeTest.php b/core/modules/block_content/src/Tests/BlockContentTypeTest.php
index 42705380e..20dc1a2ed 100644
--- a/core/modules/block_content/src/Tests/BlockContentTypeTest.php
+++ b/core/modules/block_content/src/Tests/BlockContentTypeTest.php
@@ -189,6 +189,7 @@ class BlockContentTypeTest extends BlockContentTestBase {
         // block configure form.
         $path = $theme == $default_theme ? 'admin/structure/block' : "admin/structure/block/list/$theme";
         $this->drupalGet($path);
+        $this->clickLinkPartialName('Place block');
         $this->clickLink(t('Add custom block'));
         // The seven theme has markup inside the link, we cannot use clickLink().
         if ($default_theme == 'seven') {
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateBlockContentTest.php b/core/modules/block_content/src/Tests/Migrate/d6/MigrateBlockContentTest.php
similarity index 63%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateBlockContentTest.php
rename to core/modules/block_content/src/Tests/Migrate/d6/MigrateBlockContentTest.php
index eb13b49ef..3a6816105 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateBlockContentTest.php
+++ b/core/modules/block_content/src/Tests/Migrate/d6/MigrateBlockContentTest.php
@@ -2,22 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateBlockContentTest.
+ * Contains \Drupal\block_content\Tests\Migrate\d6\MigrateBlockContentTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\block_content\Tests\Migrate\d6;
 
-use Drupal\Core\Language\Language;
 use Drupal\block_content\Entity\BlockContent;
-use Drupal\Core\Language\LanguageInterface;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade custom blocks.
  *
- * @group migrate_drupal
+ * @group block_content
  */
 class MigrateBlockContentTest extends MigrateDrupal6TestBase {
 
@@ -31,26 +27,16 @@ class MigrateBlockContentTest extends MigrateDrupal6TestBase {
     $this->installConfig(array('block_content'));
     $this->installEntitySchema('block_content');
 
-    $migration = entity_load('migration', 'd6_block_content_type');
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
-    $migration = entity_load('migration', 'd6_block_content_body_field');
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->executeMigration('d6_block_content_type');
+    $this->executeMigration('d6_block_content_body_field');
 
     $this->prepareMigrations(array(
       'd6_filter_format' => array(
         array(array(2), array('full_html'))
       )
     ));
-    /** @var \Drupal\migrate\entity\Migration $migration */
-    $migration = entity_load('migration', 'd6_custom_block');
-    $dumps = array(
-      $this->getDumpDirectory() . '/Boxes.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->loadDumps(['Boxes.php']);
+    $this->executeMigration('d6_custom_block');
   }
 
   /**
diff --git a/core/modules/block_content/tests/modules/block_content_test/block_content_test.module b/core/modules/block_content/tests/modules/block_content_test/block_content_test.module
index d714cb20e..3450b5f04 100644
--- a/core/modules/block_content/tests/modules/block_content_test/block_content_test.module
+++ b/core/modules/block_content/tests/modules/block_content_test/block_content_test.module
@@ -60,6 +60,7 @@ function block_content_test_block_content_insert(BlockContent $block_content) {
   // Set the block_content title to the block_content ID and save.
   if ($block_content->label() == 'new') {
     $block_content->setInfo('BlockContent ' . $block_content->id());
+    $block_content->setNewRevision(FALSE);
     $block_content->save();
   }
   if ($block_content->label() == 'fail_creation') {
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/BoxTest.php b/core/modules/block_content/tests/src/Unit/Plugin/migrate/source/d6/BoxTest.php
similarity index 83%
rename from core/modules/migrate_drupal/tests/src/Unit/source/d6/BoxTest.php
rename to core/modules/block_content/tests/src/Unit/Plugin/migrate/source/d6/BoxTest.php
index fdd33edd5..6c7ef2182 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/BoxTest.php
+++ b/core/modules/block_content/tests/src/Unit/Plugin/migrate/source/d6/BoxTest.php
@@ -2,23 +2,23 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\BoxTest.
+ * Contains \Drupal\Tests\block_content\Unit\Plugin\migrate\source\d6\BoxTest.
  */
 
-namespace Drupal\Tests\migrate_drupal\Unit\source\d6;
+namespace Drupal\Tests\block_content\Unit\Plugin\migrate\source\d6;
 
 use Drupal\Tests\migrate\Unit\MigrateSqlSourceTestCase;
 
 /**
  * Tests D6 block boxes source plugin.
  *
- * @group migrate_drupal
+ * @group block_content
  */
 class BoxTest extends MigrateSqlSourceTestCase {
 
   // The plugin system is not working during unit testing so the source plugin
   // class needs to be manually specified.
-  const PLUGIN_CLASS = 'Drupal\migrate_drupal\Plugin\migrate\source\d6\Box';
+  const PLUGIN_CLASS = 'Drupal\block_content\Plugin\migrate\source\d6\Box';
 
   // The fake Migration configuration entity.
   protected $migrationConfiguration = array(
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_book.yml b/core/modules/book/migration_templates/d6_book.yml
similarity index 77%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_book.yml
rename to core/modules/book/migration_templates/d6_book.yml
index c8007e0e6..683f56aaa 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_book.yml
+++ b/core/modules/book/migration_templates/d6_book.yml
@@ -21,10 +21,3 @@ destination:
 migration_dependencies:
   required:
     - d6_node
-dependencies:
-  config:
-    - migrate.migration.d6_node
-  module:
-    - book
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_book_settings.yml b/core/modules/book/migration_templates/d6_book_settings.yml
similarity index 86%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_book_settings.yml
rename to core/modules/book/migration_templates/d6_book_settings.yml
index 35302d031..e885d37e9 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_book_settings.yml
+++ b/core/modules/book/migration_templates/d6_book_settings.yml
@@ -15,7 +15,3 @@ process:
 destination:
   plugin: config
   config_name: book.settings
-dependencies:
-  module:
-    - book
-    - migrate_drupal
diff --git a/core/modules/book/src/Cache/BookNavigationCacheContext.php b/core/modules/book/src/Cache/BookNavigationCacheContext.php
index 15ce15ad8..d165b95a3 100644
--- a/core/modules/book/src/Cache/BookNavigationCacheContext.php
+++ b/core/modules/book/src/Cache/BookNavigationCacheContext.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\book\Cache;
 
+use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Cache\Context\CacheContextInterface;
 use Symfony\Component\DependencyInjection\ContainerAware;
 use Symfony\Component\HttpFoundation\RequestStack;
@@ -14,6 +15,8 @@ use Symfony\Component\HttpFoundation\RequestStack;
 /**
  * Defines the book navigation cache context service.
  *
+ * Cache context ID: 'route.book_navigation'.
+ *
  * This allows for book navigation location-aware caching. It depends on:
  * - whether the current route represents a book node at all
  * - and if so, where in the book hierarchy we are
@@ -65,7 +68,27 @@ class BookNavigationCacheContext extends ContainerAware implements CacheContextI
     // If we're looking at a book node, get the trail for that node.
     $active_trail = $this->container->get('book.manager')
       ->getActiveTrailIds($node->book['bid'], $node->book);
-    return 'book.' . implode('|', $active_trail);
+    return implode('|', $active_trail);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheableMetadata() {
+    // The book active trail depends on the node and data attached to it.
+    // That information is however not stored as part of the node.
+    $cacheable_metadata = new CacheableMetadata();
+    if ($node = $this->requestStack->getCurrentRequest()->get('node')) {
+      // If the node is part of a book then we can use the cache tag for that
+      // book. If not, then it can't be optimized away.
+      if (!empty($node->book['bid'])) {
+        $cacheable_metadata->addCacheTags(['bid:' . $node->book['bid']]);
+      }
+      else {
+        $cacheable_metadata->setCacheMaxAge(0);
+      }
+    }
+    return $cacheable_metadata;
   }
 
 }
diff --git a/core/modules/migrate/src/Plugin/migrate/destination/Book.php b/core/modules/book/src/Plugin/migrate/destination/Book.php
similarity index 73%
rename from core/modules/migrate/src/Plugin/migrate/destination/Book.php
rename to core/modules/book/src/Plugin/migrate/destination/Book.php
index f6ff9325a..784e7a1ee 100644
--- a/core/modules/migrate/src/Plugin/migrate/destination/Book.php
+++ b/core/modules/book/src/Plugin/migrate/destination/Book.php
@@ -2,12 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\destination\Book.
+ * Contains \Drupal\book\Plugin\migrate\destination\Book.
  */
 
-namespace Drupal\migrate\Plugin\migrate\destination;
+namespace Drupal\book\Plugin\migrate\destination;
 
 use Drupal\Core\Entity\EntityInterface;
+use Drupal\migrate\Plugin\migrate\destination\EntityContentBase;
 use Drupal\migrate\Row;
 
 /**
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Book.php b/core/modules/book/src/Plugin/migrate/source/d6/Book.php
similarity index 93%
rename from core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Book.php
rename to core/modules/book/src/Plugin/migrate/source/d6/Book.php
index ed02351fc..a1ecbb6b3 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Book.php
+++ b/core/modules/book/src/Plugin/migrate/source/d6/Book.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\Book.
+ * Contains \Drupal\book\Plugin\migrate\source\d6\Book.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+namespace Drupal\book\Plugin\migrate\source\d6;
 
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 
diff --git a/core/modules/book/src/ProxyClass/BookUninstallValidator.php b/core/modules/book/src/ProxyClass/BookUninstallValidator.php
new file mode 100644
index 000000000..12f91bbd7
--- /dev/null
+++ b/core/modules/book/src/ProxyClass/BookUninstallValidator.php
@@ -0,0 +1,92 @@
+<?php
+
+/**
+ * @file
+ * Contains Drupal\book\ProxyClass\BookUninstallValidator.
+ */
+
+/**
+ * This file was generated via php core/scripts/generate-proxy-class.php 'Drupal\book\BookUninstallValidator' "core/modules/book/src".
+ */
+
+namespace Drupal\book\ProxyClass {
+
+    /**
+     * Provides a proxy class for \Drupal\book\BookUninstallValidator.
+     *
+     * @see \Drupal\Component\ProxyBuilder
+     */
+    class BookUninstallValidator implements \Drupal\Core\Extension\ModuleUninstallValidatorInterface
+    {
+
+        use \Drupal\Core\DependencyInjection\DependencySerializationTrait;
+
+        /**
+         * The id of the original proxied service.
+         *
+         * @var string
+         */
+        protected $drupalProxyOriginalServiceId;
+
+        /**
+         * The real proxied service, after it was lazy loaded.
+         *
+         * @var \Drupal\book\BookUninstallValidator
+         */
+        protected $service;
+
+        /**
+         * The service container.
+         *
+         * @var \Symfony\Component\DependencyInjection\ContainerInterface
+         */
+        protected $container;
+
+        /**
+         * Constructs a ProxyClass Drupal proxy object.
+         *
+         * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
+         *   The container.
+         * @param string $drupal_proxy_original_service_id
+         *   The service ID of the original service.
+         */
+        public function __construct(\Symfony\Component\DependencyInjection\ContainerInterface $container, $drupal_proxy_original_service_id)
+        {
+            $this->container = $container;
+            $this->drupalProxyOriginalServiceId = $drupal_proxy_original_service_id;
+        }
+
+        /**
+         * Lazy loads the real service from the container.
+         *
+         * @return object
+         *   Returns the constructed real service.
+         */
+        protected function lazyLoadItself()
+        {
+            if (!isset($this->service)) {
+                $this->service = $this->container->get($this->drupalProxyOriginalServiceId);
+            }
+
+            return $this->service;
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function validate($module)
+        {
+            return $this->lazyLoadItself()->validate($module);
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function setStringTranslation(\Drupal\Core\StringTranslation\TranslationInterface $translation)
+        {
+            return $this->lazyLoadItself()->setStringTranslation($translation);
+        }
+
+    }
+
+}
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateBookConfigsTest.php b/core/modules/book/src/Tests/Migrate/d6/MigrateBookConfigsTest.php
similarity index 67%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateBookConfigsTest.php
rename to core/modules/book/src/Tests/Migrate/d6/MigrateBookConfigsTest.php
index deb320890..9ae103057 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateBookConfigsTest.php
+++ b/core/modules/book/src/Tests/Migrate/d6/MigrateBookConfigsTest.php
@@ -2,20 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateBookConfigsTest.
+ * Contains \Drupal\book\Tests\Migrate\d6\MigrateBookConfigsTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\book\Tests\Migrate\d6;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate\MigrateMessage;
-use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to book.settings.yml.
  *
- * @group migrate_drupal
+ * @group book
  */
 class MigrateBookConfigsTest extends MigrateDrupal6TestBase {
 
@@ -33,14 +31,8 @@ class MigrateBookConfigsTest extends MigrateDrupal6TestBase {
    */
   protected function setUp() {
     parent::setUp();
-
-    $migration = entity_load('migration', 'd6_book_settings');
-    $dumps = array(
-      $this->getDumpDirectory() . '/Variable.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, new MigrateMessage());
-    $executable->import();
+    $this->loadDumps(['Variable.php']);
+    $this->executeMigration('d6_book_settings');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateBookTest.php b/core/modules/book/src/Tests/Migrate/d6/MigrateBookTest.php
similarity index 83%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateBookTest.php
rename to core/modules/book/src/Tests/Migrate/d6/MigrateBookTest.php
index a98e8278f..ea7846e1b 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateBookTest.php
+++ b/core/modules/book/src/Tests/Migrate/d6/MigrateBookTest.php
@@ -2,19 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateBookTest.
+ * Contains \Drupal\book\Tests\Migrate\d6\MigrateBookTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\book\Tests\Migrate\d6;
 
-use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 use Drupal\node\Entity\Node;
 
 /**
  * Upgrade book structure.
  *
- * @group migrate_drupal
+ * @group book
  */
 class MigrateBookTest extends MigrateDrupal6TestBase {
 
@@ -44,15 +43,8 @@ class MigrateBookTest extends MigrateDrupal6TestBase {
     }
     $this->prepareMigrations($id_mappings);
     // Load database dumps to provide source data.
-    $dumps = array(
-      $this->getDumpDirectory() . '/Book.php',
-      $this->getDumpDirectory() . '/MenuLinks.php',
-    );
-    $this->loadDumps($dumps);
-    // Migrate books..
-    $migration = entity_load('migration', 'd6_book');
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->loadDumps(['Book.php', 'MenuLinks.php']);
+    $this->executeMigration('d6_book');
   }
 
   /**
diff --git a/core/modules/breakpoint/src/BreakpointManager.php b/core/modules/breakpoint/src/BreakpointManager.php
index b23418f41..66a0830e0 100644
--- a/core/modules/breakpoint/src/BreakpointManager.php
+++ b/core/modules/breakpoint/src/BreakpointManager.php
@@ -169,6 +169,7 @@ class BreakpointManager extends DefaultPluginManager implements BreakpointManage
         $this->breakpointsByGroup[$group] = $breakpoints;
       }
     }
+
     $instances = array();
     foreach ($this->breakpointsByGroup[$group] as $plugin_id => $definition) {
       if (!isset($this->instances[$plugin_id])) {
diff --git a/core/modules/breakpoint/src/Tests/BreakpointDiscoveryTest.php b/core/modules/breakpoint/src/Tests/BreakpointDiscoveryTest.php
index b39c2a814..0668c86f7 100644
--- a/core/modules/breakpoint/src/Tests/BreakpointDiscoveryTest.php
+++ b/core/modules/breakpoint/src/Tests/BreakpointDiscoveryTest.php
@@ -34,34 +34,22 @@ class BreakpointDiscoveryTest extends KernelTestBase {
   public function testThemeBreakpoints() {
     // Verify the breakpoint group for breakpoint_theme_test was created.
     $expected_breakpoints = array(
-      'breakpoint_theme_test.tv' => array(
-        'label' => 'tv',
-        'mediaQuery' => 'only screen and (min-width: 1220px)',
+      'breakpoint_theme_test.mobile' => array(
+        'label' => 'mobile',
+        'mediaQuery' => '(min-width: 0px)',
         'weight' => 0,
         'multipliers' => array(
           '1x',
         ),
         'provider' => 'breakpoint_theme_test',
-        'id' => 'breakpoint_theme_test.tv',
-        'group' => 'breakpoint_theme_test',
-        'class' => 'Drupal\\breakpoint\\Breakpoint',
-      ),
-      'breakpoint_theme_test.wide' => array(
-        'label' => 'wide',
-        'mediaQuery' => '(min-width: 851px)',
-        'weight' => 1,
-        'multipliers' => array(
-          '1x',
-        ),
-        'provider' => 'breakpoint_theme_test',
-        'id' => 'breakpoint_theme_test.wide',
+        'id' => 'breakpoint_theme_test.mobile',
         'group' => 'breakpoint_theme_test',
         'class' => 'Drupal\\breakpoint\\Breakpoint',
       ),
       'breakpoint_theme_test.narrow' => array(
         'label' => 'narrow',
         'mediaQuery' => '(min-width: 560px)',
-        'weight' => 2,
+        'weight' => 1,
         'multipliers' => array(
           '1x',
         ),
@@ -70,15 +58,27 @@ class BreakpointDiscoveryTest extends KernelTestBase {
         'group' => 'breakpoint_theme_test',
         'class' => 'Drupal\\breakpoint\\Breakpoint',
       ),
-      'breakpoint_theme_test.mobile' => array(
-        'label' => 'mobile',
-        'mediaQuery' => '(min-width: 0px)',
+      'breakpoint_theme_test.wide' => array(
+        'label' => 'wide',
+        'mediaQuery' => '(min-width: 851px)',
+        'weight' => 2,
+        'multipliers' => array(
+          '1x',
+        ),
+        'provider' => 'breakpoint_theme_test',
+        'id' => 'breakpoint_theme_test.wide',
+        'group' => 'breakpoint_theme_test',
+        'class' => 'Drupal\\breakpoint\\Breakpoint',
+      ),
+      'breakpoint_theme_test.tv' => array(
+        'label' => 'tv',
+        'mediaQuery' => 'only screen and (min-width: 1220px)',
         'weight' => 3,
         'multipliers' => array(
           '1x',
         ),
         'provider' => 'breakpoint_theme_test',
-        'id' => 'breakpoint_theme_test.mobile',
+        'id' => 'breakpoint_theme_test.tv',
         'group' => 'breakpoint_theme_test',
         'class' => 'Drupal\\breakpoint\\Breakpoint',
       ),
@@ -102,7 +102,7 @@ class BreakpointDiscoveryTest extends KernelTestBase {
       'breakpoint_theme_test.group2.narrow' => array(
         'label' => 'narrow',
         'mediaQuery' => '(min-width: 560px)',
-        'weight' => 2,
+        'weight' => 0,
         'multipliers' => array(
           '1x',
           '2x',
@@ -128,7 +128,7 @@ class BreakpointDiscoveryTest extends KernelTestBase {
       'breakpoint_module_test.breakpoint_theme_test.group2.tv' => array(
         'label' => 'tv',
         'mediaQuery' => '(min-width: 6000px)',
-        'weight' => 0,
+        'weight' => 2,
         'multipliers' => array(
           '1x',
         ),
@@ -153,7 +153,7 @@ class BreakpointDiscoveryTest extends KernelTestBase {
       'breakpoint_module_test.mobile' => array(
         'label' => 'mobile',
         'mediaQuery' => '(min-width: 0px)',
-        'weight' => 1,
+        'weight' => 0,
         'multipliers' => array(
           '1x',
         ),
@@ -165,7 +165,7 @@ class BreakpointDiscoveryTest extends KernelTestBase {
       'breakpoint_module_test.standard' => array(
         'label' => 'standard',
         'mediaQuery' => '(min-width: 560px)',
-        'weight' => 0,
+        'weight' => 1,
         'multipliers' => array(
           '1x',
           '2x',
@@ -178,9 +178,7 @@ class BreakpointDiscoveryTest extends KernelTestBase {
     );
 
     $breakpoints = \Drupal::service('breakpoint.manager')->getBreakpointsByGroup('breakpoint_module_test');
-    foreach ($expected_breakpoints as $id => $expected_breakpoint) {
-      $this->assertEqual($expected_breakpoint, $breakpoints[$id]->getPluginDefinition());
-    }
+    $this->assertEqual(array_keys($expected_breakpoints), array_keys($breakpoints));
   }
 
   /**
diff --git a/core/modules/breakpoint/tests/modules/breakpoint_module_test/breakpoint_module_test.breakpoints.yml b/core/modules/breakpoint/tests/modules/breakpoint_module_test/breakpoint_module_test.breakpoints.yml
index e1edeb235..c490e5f6f 100644
--- a/core/modules/breakpoint/tests/modules/breakpoint_module_test/breakpoint_module_test.breakpoints.yml
+++ b/core/modules/breakpoint/tests/modules/breakpoint_module_test/breakpoint_module_test.breakpoints.yml
@@ -1,12 +1,12 @@
 breakpoint_module_test.mobile:
   label: mobile
   mediaQuery: '(min-width: 0px)'
-  weight: 1
+  weight: 0
   # Don't include multipliers. A 1x multiplier this will be enforced by default.
 breakpoint_module_test.standard:
   label: standard
   mediaQuery: '(min-width: 560px)'
-  weight: 0
+  weight: 1
   # Don't include a 1x multiplier this will be enforced by default.
   multipliers:
     - 2x
@@ -15,7 +15,7 @@ breakpoint_module_test.standard:
 breakpoint_module_test.breakpoint_theme_test.group2.tv:
   label: tv
   mediaQuery: '(min-width: 6000px)'
-  weight: 0
+  weight: 2
   multipliers:
     - 1x
   group: breakpoint_theme_test.group2
diff --git a/core/modules/breakpoint/tests/themes/breakpoint_theme_test/breakpoint_theme_test.breakpoints.yml b/core/modules/breakpoint/tests/themes/breakpoint_theme_test/breakpoint_theme_test.breakpoints.yml
index 3e565e18f..f07aba8dc 100644
--- a/core/modules/breakpoint/tests/themes/breakpoint_theme_test/breakpoint_theme_test.breakpoints.yml
+++ b/core/modules/breakpoint/tests/themes/breakpoint_theme_test/breakpoint_theme_test.breakpoints.yml
@@ -1,32 +1,32 @@
 breakpoint_theme_test.mobile:
   label: mobile
   mediaQuery: '(min-width: 0px)'
-  weight: 3
+  weight: 0
   multipliers:
     - 1x
 breakpoint_theme_test.narrow:
   label: narrow
   mediaQuery: '(min-width: 560px)'
-  weight: 2
+  weight: 1
   multipliers:
     - 1x
 # Out of order breakpoint to test sorting.
 breakpoint_theme_test.tv:
   label: tv
   mediaQuery: 'only screen and (min-width: 1220px)'
-  weight: 0
+  weight: 3
   multipliers:
     - 1x
 breakpoint_theme_test.wide:
   label: wide
   mediaQuery: '(min-width: 851px)'
-  weight: 1
+  weight: 2
   multipliers:
     - 1x
 breakpoint_theme_test.group2.narrow:
   label: narrow
   mediaQuery: '(min-width: 560px)'
-  weight: 2
+  weight: 0
   multipliers:
     - 1x
     - 2x
diff --git a/core/modules/ckeditor/src/Plugin/Editor/CKEditor.php b/core/modules/ckeditor/src/Plugin/Editor/CKEditor.php
index 0e237b17e..d5bd0b9a7 100644
--- a/core/modules/ckeditor/src/Plugin/Editor/CKEditor.php
+++ b/core/modules/ckeditor/src/Plugin/Editor/CKEditor.php
@@ -157,7 +157,7 @@ class CKEditor extends EditorBase implements ContainerFactoryPluginInterface {
         'library' => array('ckeditor/drupal.ckeditor.admin'),
         'drupalSettings' => [
           'ckeditor' => [
-            'toolbarAdmin' => $this->renderer->renderPlain($ckeditor_settings_toolbar),
+            'toolbarAdmin' => (string) $this->renderer->renderPlain($ckeditor_settings_toolbar),
           ],
         ],
       ),
diff --git a/core/modules/ckeditor/src/Tests/CKEditorAdminTest.php b/core/modules/ckeditor/src/Tests/CKEditorAdminTest.php
index d113a7609..3ce82714a 100644
--- a/core/modules/ckeditor/src/Tests/CKEditorAdminTest.php
+++ b/core/modules/ckeditor/src/Tests/CKEditorAdminTest.php
@@ -117,6 +117,18 @@ class CKEditorAdminTest extends WebTestBase {
     $editor = entity_load('editor', 'filtered_html');
     $this->assertFalse($editor, 'No Editor config entity exists yet.');
 
+    // Ensure that drupalSettings is correct.
+    $ckeditor_settings_toolbar = array(
+      '#theme' => 'ckeditor_settings_toolbar',
+      '#editor' => Editor::create(['editor' => 'ckeditor']),
+      '#plugins' => $this->container->get('plugin.manager.ckeditor.plugin')->getButtons(),
+    );
+    $this->assertEqual(
+      $this->drupalSettings['ckeditor']['toolbarAdmin'],
+      $this->container->get('renderer')->renderPlain($ckeditor_settings_toolbar),
+      'CKEditor toolbar settings are rendered as part of drupalSettings.'
+    );
+
     // Ensure the toolbar buttons configuration value is initialized to the
     // expected default value.
     $expected_buttons_value = json_encode($expected_default_settings['toolbar']['rows']);
diff --git a/core/modules/color/color.js b/core/modules/color/color.js
index 1a9d8a579..b41672e54 100644
--- a/core/modules/color/color.js
+++ b/core/modules/color/color.js
@@ -8,7 +8,12 @@
   "use strict";
 
   /**
+   * Displays farbtastic color selector and initialize color administration UI.
+   *
    * @type {Drupal~behavior}
+   *
+   * @prop {Drupal~behaviorAttach} attach
+   *   Attach color selection behavior to relevant context.
    */
   Drupal.behaviors.color = {
     attach: function (context, settings) {
@@ -95,10 +100,14 @@
        * @function Drupal.color~shift_color
        *
        * @param {string} given
-       * @param {Array} ref1
-       * @param {Array} ref2
+       *   A hex color code to shift.
+       * @param {Array.<number>} ref1
+       *   First HSL color reference.
+       * @param {Array.<number>} ref2
+       *   Second HSL color reference.
        *
        * @return {string}
+       *   A hex color, shifted.
        */
       function shift_color(given, ref1, ref2) {
         var d;
@@ -143,9 +152,14 @@
        * Callback for Farbtastic when a new color is chosen.
        *
        * @param {HTMLElement} input
+       *   The input element where the color is chosen.
        * @param {string} color
+       *   The color that was chosen through the input.
        * @param {bool} propagate
+       *   Whether or not to propagate the color to a locked pair value
        * @param {bool} colorScheme
+       *   Flag to indicate if the user is using a color scheme when changing
+       *   the color.
        */
       function callback(input, color, propagate, colorScheme) {
         var matched;
@@ -201,6 +215,7 @@
        * Focuses Farbtastic on a particular field.
        *
        * @param {jQuery.Event} e
+       *   The focus event on the field.
        */
       function focus(e) {
         var input = e.target;
diff --git a/core/modules/color/color.module b/core/modules/color/color.module
index f5622c833..fa9499b10 100644
--- a/core/modules/color/color.module
+++ b/core/modules/color/color.module
@@ -76,25 +76,27 @@ function color_library_info_alter(&$libraries, $extension) {
     $color_paths = \Drupal::config('color.theme.' . $extension)->get('stylesheets');
     if (!empty($color_paths)) {
       foreach (array_keys($libraries) as $name) {
-        // Override stylesheets.
-        foreach ($libraries[$name]['css'] as $category => $css_assets) {
-          foreach ($css_assets as $path  => $metadata) {
-            // Loop over the path array with recolored CSS files to find matching
-            // paths which could replace the non-recolored paths.
-            foreach ($color_paths as $color_path) {
-              // Color module currently requires unique file names to be used,
-              // which allows us to compare different file paths.
-              if (drupal_basename($path) == drupal_basename($color_path)) {
-                // Replace the path to the new css file.
-                // This keeps the order of the stylesheets intact.
-                $index = array_search($path, array_keys($libraries[$name]['css'][$category]));
-                $preceding_css_assets = array_slice($libraries[$name]['css'][$category], 0, $index);
-                $succeeding_css_assets = array_slice($libraries[$name]['css'][$category], $index + 1);
-                $libraries[$name]['css'][$category] = array_merge(
-                  $preceding_css_assets,
-                  [$color_path => $metadata],
-                  $succeeding_css_assets
-                );
+        if(isset($libraries[$name]['css'])) {
+          // Override stylesheets.
+          foreach ($libraries[$name]['css'] as $category => $css_assets) {
+            foreach ($css_assets as $path  => $metadata) {
+              // Loop over the path array with recolored CSS files to find matching
+              // paths which could replace the non-recolored paths.
+              foreach ($color_paths as $color_path) {
+                // Color module currently requires unique file names to be used,
+                // which allows us to compare different file paths.
+                if (drupal_basename($path) == drupal_basename($color_path)) {
+                  // Replace the path to the new css file.
+                  // This keeps the order of the stylesheets intact.
+                  $index = array_search($path, array_keys($libraries[$name]['css'][$category]));
+                  $preceding_css_assets = array_slice($libraries[$name]['css'][$category], 0, $index);
+                  $succeeding_css_assets = array_slice($libraries[$name]['css'][$category], $index + 1);
+                  $libraries[$name]['css'][$category] = array_merge(
+                    $preceding_css_assets,
+                    [$color_path => $metadata],
+                    $succeeding_css_assets
+                  );
+                }
               }
             }
           }
@@ -284,7 +286,7 @@ function template_preprocess_color_scheme_form(&$variables) {
 
   // Attempt to load preview HTML if the theme provides it.
   $preview_html_path = \Drupal::root() . '/' . (isset($info['preview_html']) ? drupal_get_path('theme', $theme) . '/' . $info['preview_html'] : drupal_get_path('module', 'color') . '/preview.html');
-  $variables['html_preview'] = SafeMarkup::set(file_get_contents($preview_html_path));
+  $variables['html_preview']['#markup'] = file_get_contents($preview_html_path);
 }
 
 /**
diff --git a/core/modules/color/preview.js b/core/modules/color/preview.js
index 956b53ef5..551cfd7a1 100644
--- a/core/modules/color/preview.js
+++ b/core/modules/color/preview.js
@@ -8,17 +8,27 @@
   "use strict";
 
   /**
+   * Namespace for color-related functionality for Drupal.
+   *
    * @namespace
    */
   Drupal.color = {
 
     /**
+     * The callback for when the color preview has been attached.
+     *
      * @param {Element} context
+     *   The context to initiate the color behaviour.
      * @param {object} settings
+     *   Settings for the color functionality.
      * @param {HTMLFormElement} form
+     *   The form to initiate the color behaviour on.
      * @param {object} farb
+     *   The farbtastic object.
      * @param {number} height
+     *   Height of gradient.
      * @param {number} width
+     *   Width of gradient.
      */
     callback: function (context, settings, form, farb, height, width) {
       var accum;
diff --git a/core/modules/color/src/Tests/ColorSafePreviewTest.php b/core/modules/color/src/Tests/ColorSafePreviewTest.php
new file mode 100644
index 000000000..9e42f96db
--- /dev/null
+++ b/core/modules/color/src/Tests/ColorSafePreviewTest.php
@@ -0,0 +1,63 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\color\Tests\ColorSafePreviewTest.
+ */
+
+namespace Drupal\color\Tests;
+
+use Drupal\Core\Url;
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Tests sanitizing color preview loaded from theme.
+ *
+ * @group Theme
+ */
+class ColorSafePreviewTest extends WebTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var string[]
+   */
+  public static $modules = ['color', 'color_test'];
+
+  /**
+   * A user with administrative permissions.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $bigUser;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    // Create user.
+    $this->bigUser = $this->drupalCreateUser(['administer themes']);
+  }
+
+  /**
+   * Ensures color preview.html is sanitized.
+   */
+  function testColorPreview() {
+    // Install the color test theme.
+    \Drupal::service('theme_handler')->install(['color_test_theme']);
+    $this->drupalLogin($this->bigUser);
+
+    // Markup is being printed from a HTML file located in:
+    // core/modules/color/tests/modules/color_test/themes/color_test_theme/color/preview.html
+    $url = Url::fromRoute('system.theme_settings_theme', ['theme' => 'color_test_theme']);
+    $this->drupalGet($url);
+    $this->assertText('TEST COLOR PREVIEW');
+
+    $this->assertNoRaw('<script>alert("security filter test");</script>');
+    $this->assertRaw('<h2>TEST COLOR PREVIEW</h2>');
+  }
+
+
+}
diff --git a/core/modules/color/tests/modules/color_test/themes/color_test_theme/color/color.inc b/core/modules/color/tests/modules/color_test/themes/color_test_theme/color/color.inc
index bf0affe5a..b88e8eae7 100644
--- a/core/modules/color/tests/modules/color_test/themes/color_test_theme/color/color.inc
+++ b/core/modules/color/tests/modules/color_test/themes/color_test_theme/color/color.inc
@@ -29,4 +29,5 @@ $info = array(
   'css' => array(
     'css/colors.css',
   ),
+  'preview_html' => 'color/preview.html',
 );
diff --git a/core/modules/color/tests/modules/color_test/themes/color_test_theme/color/preview.html b/core/modules/color/tests/modules/color_test/themes/color_test_theme/color/preview.html
new file mode 100644
index 000000000..f7346ca6b
--- /dev/null
+++ b/core/modules/color/tests/modules/color_test/themes/color_test_theme/color/preview.html
@@ -0,0 +1,8 @@
+<div class="color-preview">
+  <div id="text">
+    <h2>TEST COLOR PREVIEW</h2>
+    <p>Sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud <a href="#">exercitation ullamco</a> laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+  </div>
+  <div id="img"></div>
+</div>
+<script>alert("security filter test");</script>
diff --git a/core/modules/color/tests/modules/color_test/themes/color_test_theme/color_test_theme.libraries.yml b/core/modules/color/tests/modules/color_test/themes/color_test_theme/color_test_theme.libraries.yml
index afe431838..e4d536dc4 100644
--- a/core/modules/color/tests/modules/color_test/themes/color_test_theme/color_test_theme.libraries.yml
+++ b/core/modules/color/tests/modules/color_test/themes/color_test_theme/color_test_theme.libraries.yml
@@ -3,3 +3,10 @@ base:
   css:
     theme:
       css/colors.css: {}
+
+fontsizer:
+  version: VERSION
+  js:
+    js/color_test_theme-fontsize.js: {}
+  dependencies:
+    - core/jquery
diff --git a/core/modules/color/tests/modules/color_test/themes/color_test_theme/js/color_test_theme-fontsize.js b/core/modules/color/tests/modules/color_test/themes/color_test_theme/js/color_test_theme-fontsize.js
new file mode 100644
index 000000000..109f7438a
--- /dev/null
+++ b/core/modules/color/tests/modules/color_test/themes/color_test_theme/js/color_test_theme-fontsize.js
@@ -0,0 +1,9 @@
+/**
+ * @file
+ * Adds javascript functions for font resizing.
+ */
+(function ($) {
+  "use strict";
+
+  $(document).ready(function () {});
+})(jQuery);
diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index 8bcac2ced..20ba4a3b1 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -257,6 +257,9 @@ function comment_node_view_alter(array &$build, EntityInterface $node, EntityVie
  *
  * @return array
  *   An array as expected by drupal_render().
+ *
+ * @deprecated in Drupal 8.x and will be removed before Drupal 9.0.
+ *   Use \Drupal::entityManager()->getViewBuilder('comment')->view().
  */
 function comment_view(CommentInterface $comment, $view_mode = 'full', $langcode = NULL) {
   return entity_view($comment, $view_mode, $langcode);
@@ -277,6 +280,9 @@ function comment_view(CommentInterface $comment, $view_mode = 'full', $langcode
  * @return array
  *   An array in the format expected by drupal_render().
  *
+ * @deprecated in Drupal 8.x and will be removed before Drupal 9.0.
+ *   Use \Drupal::entityManager()->getViewBuilder('comment')->viewMultiple().
+ *
  * @see drupal_render()
  */
 function comment_view_multiple($comments, $view_mode = 'full', $langcode = NULL) {
@@ -339,7 +345,8 @@ function comment_entity_storage_load($entities, $entity_type) {
   if (!\Drupal::entityManager()->getDefinition($entity_type)->isSubclassOf('Drupal\Core\Entity\FieldableEntityInterface')) {
     return;
   }
-  if (!\Drupal::service('comment.manager')->getFields($entity_type)) {
+  // @todo Investigate in https://www.drupal.org/node/2527866 why we need that.
+  if (!\Drupal::hasService('comment.manager') || !\Drupal::service('comment.manager')->getFields($entity_type)) {
     // Do not query database when entity has no comment fields.
     return;
   }
diff --git a/core/modules/comment/comment.tokens.inc b/core/modules/comment/comment.tokens.inc
index 1d20b112e..3a73f39b6 100644
--- a/core/modules/comment/comment.tokens.inc
+++ b/core/modules/comment/comment.tokens.inc
@@ -7,6 +7,8 @@
 
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Utility\Xss;
+use Drupal\Core\Datetime\Entity\DateFormat;
+use Drupal\Core\Render\BubbleableMetadata;
 
 /**
  * Implements hook_token_info().
@@ -105,7 +107,7 @@ function comment_token_info() {
 /**
  * Implements hook_tokens().
  */
-function comment_tokens($type, $tokens, array $data = array(), array $options = array()) {
+function comment_tokens($type, $tokens, array $data, array $options, BubbleableMetadata $bubbleable_metadata) {
   $token_service = \Drupal::token();
 
   $url_options = array('absolute' => TRUE);
@@ -138,6 +140,11 @@ function comment_tokens($type, $tokens, array $data = array(), array $options =
 
         case 'mail':
           $mail = $comment->getAuthorEmail();
+          // Add the user cacheability metadata in case the author of the comment
+          // is not the anonymous user.
+          if ($comment->getOwnerId()) {
+            $bubbleable_metadata->addCacheableDependency($comment->getOwner());
+          }
           $replacements[$original] = $sanitize ? SafeMarkup::checkPlain($mail) : $mail;
           break;
 
@@ -170,26 +177,37 @@ function comment_tokens($type, $tokens, array $data = array(), array $options =
 
         case 'author':
           $name = $comment->getAuthorName();
+          // Add the user cacheability metadata in case the author of the comment
+          // is not the anonymous user.
+          if ($comment->getOwnerId()) {
+            $bubbleable_metadata->addCacheableDependency($comment->getOwner());
+          }
           $replacements[$original] = $sanitize ? Xss::filter($name) : $name;
           break;
 
         case 'parent':
           if ($comment->hasParentComment()) {
             $parent = $comment->getParentComment();
+            $bubbleable_metadata->addCacheableDependency($parent);
             $replacements[$original] = $sanitize ? Xss::filter($parent->getSubject()) : $parent->getSubject();
           }
           break;
 
         case 'created':
+          $date_format = DateFormat::load('medium');
+          $bubbleable_metadata->addCacheableDependency($date_format);
           $replacements[$original] = format_date($comment->getCreatedTime(), 'medium', '', NULL, $langcode);
           break;
 
         case 'changed':
+          $date_format = DateFormat::load('medium');
+          $bubbleable_metadata->addCacheableDependency($date_format);
           $replacements[$original] = format_date($comment->getChangedTime(), 'medium', '', NULL, $langcode);
           break;
 
         case 'entity':
           $entity = $comment->getCommentedEntity();
+          $bubbleable_metadata->addCacheableDependency($entity);
           $title = $entity->label();
           $replacements[$original] = $sanitize ? Xss::filter($title) : $title;
           break;
@@ -199,23 +217,23 @@ function comment_tokens($type, $tokens, array $data = array(), array $options =
     // Chained token relationships.
     if ($entity_tokens = $token_service->findwithPrefix($tokens, 'entity')) {
       $entity = $comment->getCommentedEntity();
-      $replacements += $token_service->generate($comment->getCommentedEntityTypeId(), $entity_tokens, array($comment->getCommentedEntityTypeId() => $entity), $options);
+      $replacements += $token_service->generate($comment->getCommentedEntityTypeId(), $entity_tokens, array($comment->getCommentedEntityTypeId() => $entity), $options, $bubbleable_metadata);
     }
 
     if ($date_tokens = $token_service->findwithPrefix($tokens, 'created')) {
-      $replacements += $token_service->generate('date', $date_tokens, array('date' => $comment->getCreatedTime()), $options);
+      $replacements += $token_service->generate('date', $date_tokens, array('date' => $comment->getCreatedTime()), $options, $bubbleable_metadata);
     }
 
     if ($date_tokens = $token_service->findwithPrefix($tokens, 'changed')) {
-      $replacements += $token_service->generate('date', $date_tokens, array('date' => $comment->getChangedTime()), $options);
+      $replacements += $token_service->generate('date', $date_tokens, array('date' => $comment->getChangedTime()), $options, $bubbleable_metadata);
     }
 
     if (($parent_tokens = $token_service->findwithPrefix($tokens, 'parent')) && $parent = $comment->getParentComment()) {
-      $replacements += $token_service->generate('comment', $parent_tokens, array('comment' => $parent), $options);
+      $replacements += $token_service->generate('comment', $parent_tokens, array('comment' => $parent), $options, $bubbleable_metadata);
     }
 
     if (($author_tokens = $token_service->findwithPrefix($tokens, 'author')) && $account = $comment->getOwner()) {
-      $replacements += $token_service->generate('user', $author_tokens, array('user' => $account), $options);
+      $replacements += $token_service->generate('user', $author_tokens, array('user' => $account), $options, $bubbleable_metadata);
     }
   }
   elseif ($type == 'entity' & !empty($data['entity'])) {
diff --git a/core/modules/comment/js/comment-new-indicator.js b/core/modules/comment/js/comment-new-indicator.js
index 8a2bf074c..756796381 100644
--- a/core/modules/comment/js/comment-new-indicator.js
+++ b/core/modules/comment/js/comment-new-indicator.js
@@ -65,7 +65,7 @@
         var $comment = $(placeholder)
           .removeClass('hidden')
           .text(newCommentString)
-          .closest('.comment')
+          .closest('.js-comment')
           // Add 'new' class to the comment, so it can be styled.
           .addClass('new');
 
diff --git a/core/modules/comment/src/CommentForm.php b/core/modules/comment/src/CommentForm.php
index 0bcacee9e..7dcb4c807 100644
--- a/core/modules/comment/src/CommentForm.php
+++ b/core/modules/comment/src/CommentForm.php
@@ -67,22 +67,6 @@ class CommentForm extends ContentEntityForm {
     $this->renderer = $renderer;
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  protected function init(FormStateInterface $form_state) {
-    $comment = $this->entity;
-
-    // Make the comment inherit the current content language unless specifically
-    // set.
-    if ($comment->isNew()) {
-      $language_content = \Drupal::languageManager()->getCurrentLanguage(LanguageInterface::TYPE_CONTENT);
-      $comment->langcode->value = $language_content->getId();
-    }
-
-    parent::init($form_state);
-  }
-
   /**
    * Overrides Drupal\Core\Entity\EntityForm::form().
    */
@@ -258,7 +242,6 @@ class CommentForm extends ContentEntityForm {
       '#type' => 'submit',
       '#value' => $this->t('Preview'),
       '#access' => $preview_mode != DRUPAL_DISABLED,
-      '#validate' => array('::validate'),
       '#submit' => array('::submitForm', '::preview'),
     );
 
diff --git a/core/modules/comment/src/CommentLazyBuilders.php b/core/modules/comment/src/CommentLazyBuilders.php
index 9d74881b6..d37ab611e 100644
--- a/core/modules/comment/src/CommentLazyBuilders.php
+++ b/core/modules/comment/src/CommentLazyBuilders.php
@@ -12,9 +12,9 @@ use Drupal\Core\Entity\EntityFormBuilderInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
+use Drupal\Core\Render\RendererInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Url;
-use Drupal\Core\Render\Renderer;
 
 /**
  * Defines a service for comment #lazy_builder callbacks.
@@ -59,7 +59,7 @@ class CommentLazyBuilders {
   /**
    * The renderer service.
    *
-   * @var \Drupal\Core\Render\Renderer
+   * @var \Drupal\Core\Render\RendererInterface
    */
   protected $renderer;
 
@@ -76,10 +76,10 @@ class CommentLazyBuilders {
    *   The comment manager service.
    * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
    *   The module handler service.
-   * @param \Drupal\Core\Render\Renderer $renderer
+   * @param \Drupal\Core\Render\RendererInterface $renderer
    *   The renderer service.
    */
-  public function __construct(EntityManagerInterface $entity_manager, EntityFormBuilderInterface $entity_form_builder, AccountInterface $current_user, CommentManagerInterface $comment_manager, ModuleHandlerInterface $module_handler, Renderer $renderer) {
+  public function __construct(EntityManagerInterface $entity_manager, EntityFormBuilderInterface $entity_form_builder, AccountInterface $current_user, CommentManagerInterface $comment_manager, ModuleHandlerInterface $module_handler, RendererInterface $renderer) {
     $this->entityManager = $entity_manager;
     $this->entityFormBuilder = $entity_form_builder;
     $this->currentUser = $current_user;
diff --git a/core/modules/comment/src/CommentTypeListBuilder.php b/core/modules/comment/src/CommentTypeListBuilder.php
index 6f42f8467..4f998718e 100644
--- a/core/modules/comment/src/CommentTypeListBuilder.php
+++ b/core/modules/comment/src/CommentTypeListBuilder.php
@@ -46,7 +46,7 @@ class CommentTypeListBuilder extends ConfigEntityListBuilder {
    */
   public function buildRow(EntityInterface $entity) {
     $row['type'] = SafeMarkup::checkPlain($entity->label());
-    $row['description'] = Xss::filterAdmin($entity->getDescription());
+    $row['description']['data'] = ['#markup' => $entity->getDescription()];
     return $row + parent::buildRow($entity);
   }
 
diff --git a/core/modules/comment/src/CommentViewBuilder.php b/core/modules/comment/src/CommentViewBuilder.php
index 692322046..66bb19315 100644
--- a/core/modules/comment/src/CommentViewBuilder.php
+++ b/core/modules/comment/src/CommentViewBuilder.php
@@ -71,11 +71,9 @@ class CommentViewBuilder extends EntityViewBuilder {
       ->getFieldDefinition($entity->getFieldName())
       ->getSetting('default_mode') === CommentManagerInterface::COMMENT_MODE_THREADED;
     // If threading is enabled, don't render cache individual comments, but do
-    // keep the cache tags, so they can bubble up.
+    // keep the cacheability metadata, so it can bubble up.
     if ($build['#comment_threaded']) {
-      $cache_tags = $build['#cache']['tags'];
-      $build['#cache'] = [];
-      $build['#cache']['tags'] = $cache_tags;
+      unset($build['#cache']['keys']);
     }
 
     return $build;
diff --git a/core/modules/comment/src/Controller/CommentController.php b/core/modules/comment/src/Controller/CommentController.php
index add533331..e52e3b9f6 100644
--- a/core/modules/comment/src/Controller/CommentController.php
+++ b/core/modules/comment/src/Controller/CommentController.php
@@ -11,6 +11,7 @@ use Drupal\comment\CommentInterface;
 use Drupal\comment\CommentManagerInterface;
 use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
 use Drupal\Core\Access\AccessResult;
+use Drupal\Core\Cache\CacheableResponseInterface;
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityManagerInterface;
@@ -129,7 +130,8 @@ class CommentController extends ControllerBase {
       // Find the current display page for this comment.
       $page = $this->entityManager()->getStorage('comment')->getDisplayOrdinal($comment, $field_definition->getSetting('default_mode'), $field_definition->getSetting('per_page'));
       // @todo: Cleaner sub request handling.
-      $redirect_request = Request::create($entity->url(), 'GET', $request->query->all(), $request->cookies->all(), array(), $request->server->all());
+      $subrequest_url = $entity->urlInfo()->toString(TRUE);
+      $redirect_request = Request::create($subrequest_url->getGeneratedUrl(), 'GET', $request->query->all(), $request->cookies->all(), array(), $request->server->all());
       $redirect_request->query->set('page', $page);
       // Carry over the session to the subrequest.
       if ($session = $request->getSession()) {
@@ -137,7 +139,16 @@ class CommentController extends ControllerBase {
       }
       // @todo: Convert the pager to use the request object.
       $request->query->set('page', $page);
-      return $this->httpKernel->handle($redirect_request, HttpKernelInterface::SUB_REQUEST);
+      $response = $this->httpKernel->handle($redirect_request, HttpKernelInterface::SUB_REQUEST);
+      if ($response instanceof CacheableResponseInterface) {
+        // @todo Once path aliases have cache tags (see
+        //   https://www.drupal.org/node/2480077), add test coverage that
+        //   the cache tag for a commented entity's path alias is added to the
+        //   comment's permalink response, because there can be blocks or
+        //   other content whose renderings depend on the subrequest's URL.
+        $response->addCacheableDependency($subrequest_url);
+      }
+      return $response;
     }
     throw new NotFoundHttpException();
   }
diff --git a/core/modules/comment/src/Entity/Comment.php b/core/modules/comment/src/Entity/Comment.php
index bd3fbfc15..fc3411e25 100644
--- a/core/modules/comment/src/Entity/Comment.php
+++ b/core/modules/comment/src/Entity/Comment.php
@@ -81,7 +81,7 @@ class Comment extends ContentEntityBase implements CommentInterface {
     }
     if ($this->isNew()) {
       // Add the comment to database. This next section builds the thread field.
-      // Also see the documentation for comment_view().
+      // @see \Drupal\comment\CommentViewBuilder::buildComponents()
       $thread = $this->getThread();
       if (empty($thread)) {
         if ($this->threadLock) {
diff --git a/core/modules/comment/src/Plugin/Action/UnpublishByKeywordComment.php b/core/modules/comment/src/Plugin/Action/UnpublishByKeywordComment.php
index 6b70450f7..370a7e6b0 100644
--- a/core/modules/comment/src/Plugin/Action/UnpublishByKeywordComment.php
+++ b/core/modules/comment/src/Plugin/Action/UnpublishByKeywordComment.php
@@ -9,8 +9,12 @@ namespace Drupal\comment\Plugin\Action;
 
 use Drupal\Component\Utility\Tags;
 use Drupal\Core\Action\ConfigurableActionBase;
+use Drupal\Core\Entity\EntityViewBuilderInterface;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Drupal\Core\Render\RendererInterface;
 use Drupal\Core\Session\AccountInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Unpublishes a comment containing certain keywords.
@@ -21,14 +25,62 @@ use Drupal\Core\Session\AccountInterface;
  *   type = "comment"
  * )
  */
-class UnpublishByKeywordComment extends ConfigurableActionBase {
+class UnpublishByKeywordComment extends ConfigurableActionBase implements ContainerFactoryPluginInterface {
+
+  /**
+   * The comment entity builder handler.
+   *
+   * @var \Drupal\Core\Entity\EntityViewBuilderInterface
+   */
+  protected $viewBuilder;
+
+  /**
+   * The renderer.
+   *
+   * @var \Drupal\Core\Render\RendererInterface
+   */
+  protected $renderer;
+
+  /**
+   * Constructs a UnpublishByKeywordComment object.
+   *
+   * @param array $configuration
+   *   A configuration array containing information about the plugin instance.
+   * @param string $plugin_id
+   *   The plugin ID for the plugin instance.
+   * @param mixed $plugin_definition
+   *   The plugin implementation definition.
+   * @param \Drupal\Core\Entity\EntityViewBuilderInterface $comment_view_builder
+   *   The comment entity builder handler.
+   * @param \Drupal\Core\Render\RendererInterface $renderer
+   *   The renderer.
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityViewBuilderInterface $comment_view_builder, RendererInterface $renderer) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition);
+
+    $this->viewBuilder = $comment_view_builder;
+    $this->renderer = $renderer;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $container->get('entity.manager')->getViewBuilder('comment'),
+      $container->get('renderer')
+    );
+  }
 
   /**
    * {@inheritdoc}
    */
   public function execute($comment = NULL) {
-    $build = comment_view($comment);
-    $text = \Drupal::service('renderer')->renderPlain($build);
+    $build = $this->viewBuilder->view($comment);
+    $text = $this->renderer->renderPlain($build);
     foreach ($this->configuration['keywords'] as $keyword) {
       if (strpos($text, $keyword) !== FALSE) {
         $comment->setPublished(FALSE);
@@ -52,9 +104,9 @@ class UnpublishByKeywordComment extends ConfigurableActionBase {
    */
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
     $form['keywords'] = array(
-      '#title' => t('Keywords'),
+      '#title' => $this->t('Keywords'),
       '#type' => 'textarea',
-      '#description' => t('The comment will be unpublished if it contains any of the phrases above. Use a case-sensitive, comma-separated list of phrases. Example: funny, bungee jumping, "Company, Inc."'),
+      '#description' => $this->t('The comment will be unpublished if it contains any of the phrases above. Use a case-sensitive, comma-separated list of phrases. Example: funny, bungee jumping, "Company, Inc."'),
       '#default_value' => Tags::implode($this->configuration['keywords']),
     );
     return $form;
diff --git a/core/modules/comment/src/Plugin/Menu/LocalTask/UnapprovedComments.php b/core/modules/comment/src/Plugin/Menu/LocalTask/UnapprovedComments.php
index 0b8f6da46..bbbfa8eb4 100644
--- a/core/modules/comment/src/Plugin/Menu/LocalTask/UnapprovedComments.php
+++ b/core/modules/comment/src/Plugin/Menu/LocalTask/UnapprovedComments.php
@@ -10,12 +10,14 @@ namespace Drupal\comment\Plugin\Menu\LocalTask;
 use Drupal\comment\CommentStorageInterface;
 use Drupal\Core\Menu\LocalTaskDefault;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Provides a local task that shows the amount of unapproved comments.
  */
 class UnapprovedComments extends LocalTaskDefault implements ContainerFactoryPluginInterface {
+  use StringTranslationTrait;
 
   /**
    * The comment storage service.
@@ -57,7 +59,7 @@ class UnapprovedComments extends LocalTaskDefault implements ContainerFactoryPlu
    * {@inheritdoc}
    */
   public function getTitle() {
-    return t('Unapproved comments (@count)', array('@count' => $this->commentStorage->getUnapprovedCount()));
+    return $this->t('Unapproved comments (@count)', array('@count' => $this->commentStorage->getUnapprovedCount()));
   }
 
 }
diff --git a/core/modules/comment/src/Tests/CommentCacheTagsTest.php b/core/modules/comment/src/Tests/CommentCacheTagsTest.php
index 52264340f..2393d96ab 100644
--- a/core/modules/comment/src/Tests/CommentCacheTagsTest.php
+++ b/core/modules/comment/src/Tests/CommentCacheTagsTest.php
@@ -86,11 +86,7 @@ class CommentCacheTagsTest extends EntityWithUriCacheTagsTestBase {
    * {@inheritdoc}
    */
   protected function getAdditionalCacheContextsForEntity(EntityInterface $entity) {
-    return [
-      // Field access for the user picture rendered as part of the node that
-      // this comment is created on.
-      'user.permissions',
-    ];
+    return [];
   }
 
   /**
diff --git a/core/modules/comment/src/Tests/CommentDefaultFormatterCacheTagsTest.php b/core/modules/comment/src/Tests/CommentDefaultFormatterCacheTagsTest.php
index 8e7bf271e..9c40b0c8d 100644
--- a/core/modules/comment/src/Tests/CommentDefaultFormatterCacheTagsTest.php
+++ b/core/modules/comment/src/Tests/CommentDefaultFormatterCacheTagsTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\comment\Tests;
 
+use Drupal\Core\Cache\Cache;
 use Drupal\Core\Session\UserSession;
 use Drupal\comment\CommentInterface;
 use Drupal\system\Tests\Entity\EntityUnitTestBase;
@@ -69,7 +70,8 @@ class CommentDefaultFormatterCacheTagsTest extends EntityUnitTestBase {
       ->getViewBuilder('entity_test')
       ->view($commented_entity);
     $renderer->renderRoot($build);
-    $expected_cache_tags = array(
+    $cache_context_tags = \Drupal::service('cache_contexts_manager')->convertTokensToKeys($build['#cache']['contexts'])->getCacheTags();
+    $expected_cache_tags = Cache::mergeTags($cache_context_tags, [
       'entity_test_view',
       'entity_test:'  . $commented_entity->id(),
       'comment_list',
@@ -78,9 +80,9 @@ class CommentDefaultFormatterCacheTagsTest extends EntityUnitTestBase {
       'config:field.field.entity_test.entity_test.comment',
       'config:field.storage.comment.comment_body',
       'config:user.settings',
-    );
+    ]);
     sort($expected_cache_tags);
-    $this->assertEqual($build['#cache']['tags'], $expected_cache_tags, 'The test entity has the expected cache tags before it has comments.');
+    $this->assertEqual($build['#cache']['tags'], $expected_cache_tags);
 
     // Create a comment on that entity. Comment loading requires that the uid
     // also exists in the {users} table.
@@ -111,7 +113,8 @@ class CommentDefaultFormatterCacheTagsTest extends EntityUnitTestBase {
       ->getViewBuilder('entity_test')
       ->view($commented_entity);
     $renderer->renderRoot($build);
-    $expected_cache_tags = array(
+    $cache_context_tags = \Drupal::service('cache_contexts_manager')->convertTokensToKeys($build['#cache']['contexts'])->getCacheTags();
+    $expected_cache_tags = Cache::mergeTags($cache_context_tags, [
       'entity_test_view',
       'entity_test:' . $commented_entity->id(),
       'comment_list',
@@ -125,9 +128,9 @@ class CommentDefaultFormatterCacheTagsTest extends EntityUnitTestBase {
       'config:field.field.entity_test.entity_test.comment',
       'config:field.storage.comment.comment_body',
       'config:user.settings',
-    );
+    ]);
     sort($expected_cache_tags);
-    $this->assertEqual($build['#cache']['tags'], $expected_cache_tags, 'The test entity has the expected cache tags when it has comments.');
+    $this->assertEqual($build['#cache']['tags'], $expected_cache_tags);
   }
 
 }
diff --git a/core/modules/comment/src/Tests/CommentFieldsTest.php b/core/modules/comment/src/Tests/CommentFieldsTest.php
index a5efac081..ede2e919f 100644
--- a/core/modules/comment/src/Tests/CommentFieldsTest.php
+++ b/core/modules/comment/src/Tests/CommentFieldsTest.php
@@ -165,12 +165,12 @@ class CommentFieldsTest extends CommentTestBase {
     // Install core content type module (book).
     $edit = array();
     $edit['modules[Core][book][enable]'] = 'book';
-    $this->drupalPostForm('admin/modules', $edit, t('Save configuration'));
+    $this->drupalPostForm('admin/modules', $edit, t('Install'));
 
     // Now install the comment module.
     $edit = array();
     $edit['modules[Core][comment][enable]'] = 'comment';
-    $this->drupalPostForm('admin/modules', $edit, t('Save configuration'));
+    $this->drupalPostForm('admin/modules', $edit, t('Install'));
     $this->rebuildContainer();
     $this->assertTrue($this->container->get('module_handler')->moduleExists('comment'), 'Comment module enabled.');
 
diff --git a/core/modules/comment/src/Tests/CommentNonNodeTest.php b/core/modules/comment/src/Tests/CommentNonNodeTest.php
index ee08aa2c9..8d8e38bb5 100644
--- a/core/modules/comment/src/Tests/CommentNonNodeTest.php
+++ b/core/modules/comment/src/Tests/CommentNonNodeTest.php
@@ -180,7 +180,7 @@ class CommentNonNodeTest extends WebTestBase {
    * @param bool $reply
    *   Boolean indicating whether the comment is a reply to another comment.
    *
-   * @return boolean
+   * @return bool
    *   Boolean indicating whether the comment was found.
    */
   function commentExists(CommentInterface $comment = NULL, $reply = FALSE) {
@@ -201,7 +201,7 @@ class CommentNonNodeTest extends WebTestBase {
   /**
    * Checks whether the commenter's contact information is displayed.
    *
-   * @return boolean
+   * @return bool
    *   Contact info is available.
    */
   function commentContactInfoAvailable() {
diff --git a/core/modules/comment/src/Tests/CommentRssTest.php b/core/modules/comment/src/Tests/CommentRssTest.php
index b82da4877..2a878591c 100644
--- a/core/modules/comment/src/Tests/CommentRssTest.php
+++ b/core/modules/comment/src/Tests/CommentRssTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\comment\Tests;
 
 use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
+use Drupal\Core\Cache\Cache;
 use Drupal\Core\Entity\Entity\EntityViewDisplay;
 use Drupal\system\Tests\Cache\AssertPageCacheContextsAndTagsTrait;
 
@@ -52,16 +53,23 @@ class CommentRssTest extends CommentTestBase {
     $this->postComment($this->node, $this->randomMachineName(), $this->randomMachineName());
     $this->drupalGet('rss.xml');
 
-    $this->assertCacheTags([
-      'config:views.view.frontpage', 'node:1', 'node_list', 'node_view', 'user:3',
-    ]);
-    $this->assertCacheContexts([
+    $cache_contexts = [
       'languages:language_interface',
       'theme',
+      'url.site',
       'user.node_grants:view',
       'user.permissions',
       'timezone',
-    ]);
+    ];
+    $this->assertCacheContexts($cache_contexts);
+
+    $cache_context_tags = \Drupal::service('cache_contexts_manager')->convertTokensToKeys($cache_contexts)->getCacheTags();
+    $this->assertCacheTags(Cache::mergeTags($cache_context_tags, [
+      'config:views.view.frontpage',
+      'node:1', 'node_list',
+      'node_view',
+      'user:3',
+    ]));
 
     $raw = '<comments>' . $this->node->url('canonical', array('fragment' => 'comments', 'absolute' => TRUE)) . '</comments>';
     $this->assertRaw($raw, 'Comments as part of RSS feed.');
diff --git a/core/modules/comment/src/Tests/CommentTestBase.php b/core/modules/comment/src/Tests/CommentTestBase.php
index 8ebc4e7dd..a52cbb397 100644
--- a/core/modules/comment/src/Tests/CommentTestBase.php
+++ b/core/modules/comment/src/Tests/CommentTestBase.php
@@ -182,7 +182,7 @@ abstract class CommentTestBase extends WebTestBase {
    * @param bool $reply
    *   Boolean indicating whether the comment is a reply to another comment.
    *
-   * @return boolean
+   * @return bool
    *   Boolean indicating whether the comment was found.
    */
   function commentExists(CommentInterface $comment = NULL, $reply = FALSE) {
@@ -323,7 +323,7 @@ abstract class CommentTestBase extends WebTestBase {
   /**
    * Checks whether the commenter's contact information is displayed.
    *
-   * @return boolean
+   * @return bool
    *   Contact info is available.
    */
   function commentContactInfoAvailable() {
diff --git a/core/modules/comment/src/Tests/CommentTestTrait.php b/core/modules/comment/src/Tests/CommentTestTrait.php
index 58aa9c73b..d8c54c2ca 100644
--- a/core/modules/comment/src/Tests/CommentTestTrait.php
+++ b/core/modules/comment/src/Tests/CommentTestTrait.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\comment\Tests;
 
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Utility\Unicode;
 use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
 
@@ -42,10 +41,7 @@ trait CommentTestTrait {
     $comment_type_storage = $entity_manager->getStorage('comment_type');
     if ($comment_type = $comment_type_storage->load($comment_type_id)) {
       if ($comment_type->getTargetEntityTypeId() !== $entity_type) {
-        throw new \InvalidArgumentException(SafeMarkup::format('The given comment type id %id can only be used with the %entity_type entity type', array(
-          '%id' => $comment_type_id,
-          '%entity_type' => $entity_type,
-        )));
+        throw new \InvalidArgumentException("The given comment type id $comment_type_id can only be used with the $entity_type entity type");
       }
     }
     else {
diff --git a/core/modules/comment/src/Tests/CommentTokenReplaceTest.php b/core/modules/comment/src/Tests/CommentTokenReplaceTest.php
index 3c6b48a3d..c1f4303a2 100644
--- a/core/modules/comment/src/Tests/CommentTokenReplaceTest.php
+++ b/core/modules/comment/src/Tests/CommentTokenReplaceTest.php
@@ -10,6 +10,7 @@ namespace Drupal\comment\Tests;
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Utility\Xss;
 use Drupal\comment\Entity\Comment;
+use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\node\Entity\Node;
 
 /**
@@ -60,6 +61,7 @@ class CommentTokenReplaceTest extends CommentTestBase {
     $tests['[comment:langcode]'] = SafeMarkup::checkPlain($comment->language()->getId());
     $tests['[comment:url]'] = $comment->url('canonical', $url_options + array('fragment' => 'comment-' . $comment->id()));
     $tests['[comment:edit-url]'] = $comment->url('edit-form', $url_options);
+    $tests['[comment:created]'] = \Drupal::service('date.formatter')->format($comment->getCreatedTime(), 'medium', array('langcode' => $language_interface->getId()));
     $tests['[comment:created:since]'] = \Drupal::service('date.formatter')->formatTimeDiffSince($comment->getCreatedTime(), array('langcode' => $language_interface->getId()));
     $tests['[comment:changed:since]'] = \Drupal::service('date.formatter')->formatTimeDiffSince($comment->getChangedTimeAcrossTranslations(), array('langcode' => $language_interface->getId()));
     $tests['[comment:parent:cid]'] = $comment->hasParentComment() ? $comment->getParentComment()->id() : NULL;
@@ -71,12 +73,48 @@ class CommentTokenReplaceTest extends CommentTestBase {
     $tests['[comment:author:uid]'] = $comment->getOwnerId();
     $tests['[comment:author:name]'] = SafeMarkup::checkPlain($this->adminUser->getUsername());
 
+    $base_bubbleable_metadata = BubbleableMetadata::createFromObject($comment);
+    $metadata_tests = [];
+    $metadata_tests['[comment:cid]'] = $base_bubbleable_metadata;
+    $metadata_tests['[comment:hostname]'] = $base_bubbleable_metadata;
+    $bubbleable_metadata = clone $base_bubbleable_metadata;
+    $bubbleable_metadata->addCacheableDependency($this->adminUser);
+    $metadata_tests['[comment:author]'] = $bubbleable_metadata;
+    $bubbleable_metadata = clone $base_bubbleable_metadata;
+    $bubbleable_metadata->addCacheableDependency($this->adminUser);
+    $metadata_tests['[comment:mail]'] = $bubbleable_metadata;
+    $metadata_tests['[comment:homepage]'] = $base_bubbleable_metadata;
+    $metadata_tests['[comment:title]'] = $base_bubbleable_metadata;
+    $metadata_tests['[comment:body]'] = $base_bubbleable_metadata;
+    $metadata_tests['[comment:langcode]'] = $base_bubbleable_metadata;
+    $metadata_tests['[comment:url]'] = $base_bubbleable_metadata;
+    $metadata_tests['[comment:edit-url]'] = $base_bubbleable_metadata;
+    $bubbleable_metadata = clone $base_bubbleable_metadata;
+    $metadata_tests['[comment:created]'] = $bubbleable_metadata->addCacheTags(['rendered']);
+    $bubbleable_metadata = clone $base_bubbleable_metadata;
+    $metadata_tests['[comment:created:since]'] = $bubbleable_metadata->setCacheMaxAge(0);
+    $bubbleable_metadata = clone $base_bubbleable_metadata;
+    $metadata_tests['[comment:changed:since]'] = $bubbleable_metadata->setCacheMaxAge(0);
+    $bubbleable_metadata = clone $base_bubbleable_metadata;
+    $metadata_tests['[comment:parent:cid]'] = $bubbleable_metadata->addCacheTags(['comment:1']);
+    $metadata_tests['[comment:parent:title]'] = $bubbleable_metadata;
+    $bubbleable_metadata = clone $base_bubbleable_metadata;
+    $metadata_tests['[comment:entity]'] = $bubbleable_metadata->addCacheTags(['node:2']);
+    // Test node specific tokens.
+    $metadata_tests['[comment:entity:nid]'] = $bubbleable_metadata;
+    $metadata_tests['[comment:entity:title]'] = $bubbleable_metadata;
+    $bubbleable_metadata = clone $base_bubbleable_metadata;
+    $metadata_tests['[comment:author:uid]'] = $bubbleable_metadata->addCacheTags(['user:2']);
+    $metadata_tests['[comment:author:name]'] = $bubbleable_metadata;
+
     // Test to make sure that we generated something for each token.
     $this->assertFalse(in_array(0, array_map('strlen', $tests)), 'No empty tokens generated.');
 
     foreach ($tests as $input => $expected) {
-      $output = $token_service->replace($input, array('comment' => $comment), array('langcode' => $language_interface->getId()));
+      $bubbleable_metadata = new BubbleableMetadata();
+      $output = $token_service->replace($input, array('comment' => $comment), array('langcode' => $language_interface->getId()), $bubbleable_metadata);
       $this->assertEqual($output, $expected, format_string('Sanitized comment token %token replaced.', array('%token' => $input)));
+      $this->assertEqual($bubbleable_metadata, $metadata_tests[$input]);
     }
 
     // Generate and test unsanitized tokens.
diff --git a/core/modules/comment/src/Tests/CommentTranslationUITest.php b/core/modules/comment/src/Tests/CommentTranslationUITest.php
index cfb63c86e..dc1bf9e54 100644
--- a/core/modules/comment/src/Tests/CommentTranslationUITest.php
+++ b/core/modules/comment/src/Tests/CommentTranslationUITest.php
@@ -32,6 +32,18 @@ class CommentTranslationUITest extends ContentTranslationUITestBase {
    */
   protected $adminUser;
 
+  /**
+   * {inheritdoc}
+   */
+  protected $defaultCacheContexts = [
+    'languages:language_interface',
+    'theme',
+    'user.permissions',
+    'timezone',
+    'url.query_args.pagers:0',
+    'user.roles'
+  ];
+
   /**
    * Modules to install.
    *
diff --git a/core/modules/comment/src/Tests/Views/CommentFieldNameTest.php b/core/modules/comment/src/Tests/Views/CommentFieldNameTest.php
index ab40e6f89..2fcf4686d 100644
--- a/core/modules/comment/src/Tests/Views/CommentFieldNameTest.php
+++ b/core/modules/comment/src/Tests/Views/CommentFieldNameTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\comment\Tests\Views;
 
 use Drupal\comment\Entity\Comment;
+use Drupal\Core\Render\RenderContext;
 use Drupal\Core\Session\AnonymousUserSession;
 use Drupal\user\RoleInterface;
 use Drupal\views\Views;
@@ -58,6 +59,8 @@ class CommentFieldNameTest extends CommentTestBase {
    * Test comment field name.
    */
   public function testCommentFieldName() {
+    /** @var \Drupal\Core\Render\RendererInterface $renderer */
+    $renderer = \Drupal::service('renderer');
     $view = Views::getView('test_comment_field_name');
     $this->executeView($view);
 
@@ -85,8 +88,14 @@ class CommentFieldNameTest extends CommentTestBase {
     $view = Views::getView('test_comment_field_name');
     $this->executeView($view);
     // Test that data rendered.
-    $this->assertIdentical($this->comment->getFieldName(), $view->field['field_name']->advancedRender($view->result[0]));
-    $this->assertIdentical($this->customComment->getFieldName(), $view->field['field_name']->advancedRender($view->result[1]));
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['field_name']->advancedRender($view->result[0]);
+    });
+    $this->assertIdentical($this->comment->getFieldName(), $output);
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['field_name']->advancedRender($view->result[1]);
+    });
+    $this->assertIdentical($this->customComment->getFieldName(), $output);
   }
 
 }
diff --git a/core/modules/comment/templates/comment.html.twig b/core/modules/comment/templates/comment.html.twig
index 31b82e25b..14c52eba0 100644
--- a/core/modules/comment/templates/comment.html.twig
+++ b/core/modules/comment/templates/comment.html.twig
@@ -67,32 +67,22 @@
  */
 #}
 
-<article{{ attributes }}>
-  {% if title %}
-    {{ title_prefix }}
-  {% endif %}
-
+<article{{ attributes.addClass('js-comment') }}>
   {#
-  Hide the "new" indicator by default, let a piece of JavaScript ask
-  the server which comments are new for the user. Rendering the final
-  "new" indicator here would break the render cache.
+    Hide the "new" indicator by default, let a piece of JavaScript ask the
+    server which comments are new for the user. Rendering the final "new"
+    indicator here would break the render cache.
   #}
   <mark class="hidden" data-comment-timestamp="{{ new_indicator_timestamp }}"></mark>
 
-  {% if title %}
-    <h3{{ title_attributes }}>{{ title }}</h3>
-    {{ title_suffix }}
-  {% endif %}
-
-
   <footer>
     {{ user_picture }}
     <p>{{ submitted }}</p>
 
     {#
-      Indicate the semantic relationship between parent and child comments
-      for accessibility. The list is difficult to navigate in a screen
-      reader without this information.
+      Indicate the semantic relationship between parent and child comments for
+      accessibility. The list is difficult to navigate in a screen reader
+      without this information.
     #}
     {% if parent %}
       <p class="visually-hidden">{{ parent }}</p>
@@ -102,9 +92,11 @@
   </footer>
 
   <div{{ content_attributes }}>
-    {{ content|without('links') }}
+    {% if title %}
+      {{ title_prefix }}
+      <h3{{ title_attributes }}>{{ title }}</h3>
+      {{ title_suffix }}
+    {% endif %}
+    {{ content }}
   </div>
-  {% if content.links %}
-    {{ content.links }}
-  {% endif %}
 </article>
diff --git a/core/modules/config/config.links.menu.yml b/core/modules/config/config.links.menu.yml
index 87a9b9240..50d881391 100644
--- a/core/modules/config/config.links.menu.yml
+++ b/core/modules/config/config.links.menu.yml
@@ -1,5 +1,5 @@
 config.sync:
-  title: 'Configuration management'
-  description: 'Import, export, or synchronize your site configuration.'
+  title: 'Configuration synchronization'
+  description: 'Import and export your configuration.'
   route_name: config.sync
   parent: system.admin_config_development
diff --git a/core/modules/config/config.module b/core/modules/config/config.module
index 3be5c4983..f58dff97a 100644
--- a/core/modules/config/config.module
+++ b/core/modules/config/config.module
@@ -15,9 +15,20 @@ function config_help($route_name, RouteMatchInterface $route_match) {
     case 'help.page.config':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Configuration manager module provides a user interface for importing and exporting configuration changes; i.e., for staging configuration data between multiple instances of this web site. For more information, see the online handbook entry for <a href="!url">Configuration manager module</a>', array(
-        '!url' => 'https://www.drupal.org/documentation/administer/config',
-      )) . '</p>';
+      $output .= '<p>' . t('The Configuration Manager module provides a user interface for importing and exporting configuration changes between installations of your website in different environments. Configuration is stored in YAML format. For more information, see the <a href="!url">online documentation for the Configuration Manager module</a>.', array('!url' => 'https://www.drupal.org/documentation/administer/config')) . '</p>';
+      $output .= '<h3>' . t('Uses') . '</h3>';
+      $output .= '<dl>';
+      $output .= '<dt>' . t('Exporting the full configuration') . '</dt>';
+      $output .= '<dd>' . t('You can create and download an archive consisting of all your site\'s configuration exported as <em>*.yml</em> files on the <a href="!url">Export</a> page.' , array('!url' => \Drupal::url('config.export_full'))) . '</dd>';
+      $output .= '<dt>' . t('Importing a full configuration') . '</dt>';
+      $output .= '<dd>' . t('You can upload a full site configuration from an archive file on the <a href="!url">Import</a> page. When importing data from a different environment, the site and import files must have matching configuration values for UUID in the <em>system.site</em> configuration item. That means that your other environments should initially be set up as clones of the target site. Migrations are not supported.', array('!url' => \Drupal::url('config.import_full'))) . '</dd>';
+      $output .= '<dt>' . t('Synchronizing configuration'). '</dt>';
+      $output .= '<dd>' . t('You can review differences between the active configuration and an imported configuration archive on the <a href="!synchronize">Synchronize</a> page to ensure that the changes are as expected, before finalizing the import. The Synchronize page also shows configuration items that would be added or removed.', array('!synchronize' => \Drupal::url('config.sync'))) . '</dd>';
+      $output .= '<dt>' . t('Exporting a single configuration item') . '</dt>';
+      $output .= '<dd>' . t('You can export a single configuration item by selecting a <em>Configuration type</em> and <em>Configuration name</em> on the <a href="!single-export">Single export</a> page. The configuration and its corresponding <em>*.yml file name</em> are then displayed on the page for you to copy.', array('!single-export' => \Drupal::url('config.export_single'))) . '</dd>';
+      $output .= '<dt>' . t('Importing a single configuration item') . '</dt>';
+      $output .= '<dd>' . t('You can import a single configuration item by pasting it in YAML format into the form on the <a href="!single-import">Single import</a> page.', array('!single-import' => \Drupal::url('config.import_single'))) . '</dd>';
+      $output .= '</dl>';
       return $output;
 
     case 'config.sync':
@@ -25,9 +36,24 @@ function config_help($route_name, RouteMatchInterface $route_match) {
       $output .= '<p>' . t('Import configuration that is placed in your staging directory. All changes, deletions, renames, and additions are listed below.') . '</p>';
       return $output;
 
+    case 'config.export_full':
+      $output = '';
+      $output .= '<p>' . t('The full export page can be used to export the full configuration of this site, and download it as a gzipped tar file.') . '</p>';
+      return $output;
+
     case 'config.import_full':
       $output = '';
-      $output .= '<p>' . t('After uploading a configuration archive, you will be able to examine the changes and import them.') . '</p>';
+      $output .= '<p>' . t('The full import page can be used to import a full set of configuration for this site by uploading a gzipped or bzipped tar file consisting of all configuration YAML files. The results will be placed in a the staging directory, so they can be compared in the Synchronize tab. There the import can be finalized.') . '</p>';
+      return $output;
+
+    case 'config.export_single':
+      $output = '';
+      $output .= '<p>' . t('The single export page can be used to display a single configuration item in a YAML structure.') . '</p>';
+      return $output;
+
+    case 'config.import_single':
+      $output = '';
+      $output .= '<p>' . t('The single import page can be used to import a single configuration item by pasting a YAML structure into the text field.') . '</p>';
       return $output;
   }
 }
diff --git a/core/modules/config/src/Tests/CacheabilityMetadataConfigOverrideIntegrationTest.php b/core/modules/config/src/Tests/CacheabilityMetadataConfigOverrideIntegrationTest.php
new file mode 100644
index 000000000..22d0b114a
--- /dev/null
+++ b/core/modules/config/src/Tests/CacheabilityMetadataConfigOverrideIntegrationTest.php
@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\config\Tests\CacheabilityMetadataConfigOverrideIntegrationTest.
+ */
+
+namespace Drupal\config\Tests;
+
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Tests if configuration overrides correctly affect cacheability metadata.
+ *
+ * @group config
+ */
+class CacheabilityMetadataConfigOverrideIntegrationTest extends WebTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = [
+    'block_test',
+    'config_override_integration_test',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setUp() {
+    parent::setUp();
+
+    // @todo If our block does not contain any content then the cache context
+    //   is not bubbling up and the test fails. Remove this line once the cache
+    //   contexts are properly set. See https://www.drupal.org/node/2529980.
+    \Drupal::state()->set('block_test.content', 'Needs to have some content');
+
+    $this->drupalLogin($this->drupalCreateUser());
+  }
+
+  /**
+   * Tests if config overrides correctly set cacheability metadata.
+   */
+  public function testConfigOverride() {
+    // Check the default (disabled) state of the cache context. The block label
+    // should not be overridden.
+    $this->drupalGet('<front>');
+    $this->assertNoText('Overridden block label');
+
+    // Both the cache context and tag should be present.
+    $this->assertCacheContext('config_override_integration_test');
+    $this->assertCacheTag('config_override_integration_test_tag');
+
+    // Flip the state of the cache context. The block label should now be
+    // overridden.
+    \Drupal::state()->set('config_override_integration_test.enabled', TRUE);
+    $this->drupalGet('<front>');
+    $this->assertText('Overridden block label');
+
+    // Both the cache context and tag should still be present.
+    $this->assertCacheContext('config_override_integration_test');
+    $this->assertCacheTag('config_override_integration_test_tag');
+  }
+
+}
diff --git a/core/modules/config/src/Tests/CacheabilityMetadataConfigOverrideTest.php b/core/modules/config/src/Tests/CacheabilityMetadataConfigOverrideTest.php
new file mode 100644
index 000000000..b4752b5f9
--- /dev/null
+++ b/core/modules/config/src/Tests/CacheabilityMetadataConfigOverrideTest.php
@@ -0,0 +1,95 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\config\Tests\CacheabilityMetadataConfigOverrideTest.
+ */
+
+namespace Drupal\config\Tests;
+
+use Drupal\Core\Entity\EntityManagerInterface;
+use Drupal\config_override_test\Cache\PirateDayCacheContext;
+use Drupal\simpletest\KernelTestBase;
+
+/**
+ * Tests if configuration overrides correctly affect cacheability metadata.
+ *
+ * @group config
+ */
+class CacheabilityMetadataConfigOverrideTest extends KernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = [
+    'block',
+    'block_content',
+    'config',
+    'config_override_test',
+    'system',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('block_content');
+    $this->installConfig(['config_override_test']);
+  }
+
+  /**
+   * Tests if config overrides correctly set cacheability metadata.
+   */
+  public function testConfigOverride() {
+    // It's pirate day today!
+    $GLOBALS['it_is_pirate_day'] = TRUE;
+
+    $config_factory = $this->container->get('config.factory');
+    $config = $config_factory->get('system.theme');
+
+    // Check that we are using the Pirate theme.
+    $theme = $config->get('default');
+    $this->assertEqual('pirate', $theme);
+
+    // Check that the cacheability metadata is correct.
+    $this->assertEqual(['pirate_day'], $config->getCacheContexts());
+    $this->assertEqual(['config:system.theme', 'pirate-day-tag'], $config->getCacheTags());
+    $this->assertEqual(PirateDayCacheContext::PIRATE_DAY_MAX_AGE, $config->getCacheMaxAge());
+  }
+
+  /**
+   * Tests if config overrides set cacheability metadata on config entities.
+   */
+  public function testConfigEntityOverride() {
+    // It's pirate day today!
+    $GLOBALS['it_is_pirate_day'] = TRUE;
+
+    // Load the User login block and check that its cacheability metadata is
+    // overridden correctly. This verifies that the metadata is correctly
+    // applied to config entities.
+    /** @var EntityManagerInterface $entity_manager */
+    $entity_manager = $this->container->get('entity.manager');
+    $block = $entity_manager->getStorage('block')->load('call_to_action');
+
+    // Check that our call to action message is appealing to filibusters.
+    $this->assertEqual($block->label(), 'Draw yer cutlasses!');
+
+    // Check that the cacheability metadata is correct.
+    $this->assertEqual(['pirate_day'], $block->getCacheContexts());
+    $this->assertEqual(['config:block.block.call_to_action', 'pirate-day-tag'], $block->getCacheTags());
+    $this->assertEqual(PirateDayCacheContext::PIRATE_DAY_MAX_AGE, $block->getCacheMaxAge());
+
+    // Check that duplicating a config entity does not have the original config
+    // entity's cache tag.
+    $this->assertEqual(['config:block.block.', 'pirate-day-tag'], $block->createDuplicate()->getCacheTags());
+
+    // Check that renaming a config entity does not have the original config
+    // entity's cache tag.
+    $block->set('id', 'call_to_looting')->save();
+    $this->assertEqual(['pirate_day'], $block->getCacheContexts());
+    $this->assertEqual(['config:block.block.call_to_looting', 'pirate-day-tag'], $block->getCacheTags());
+    $this->assertEqual(PirateDayCacheContext::PIRATE_DAY_MAX_AGE, $block->getCacheMaxAge());
+  }
+
+}
diff --git a/core/modules/config/src/Tests/ConfigEntityFormOverrideTest.php b/core/modules/config/src/Tests/ConfigEntityFormOverrideTest.php
index a07da59ed..632d2dcf1 100644
--- a/core/modules/config/src/Tests/ConfigEntityFormOverrideTest.php
+++ b/core/modules/config/src/Tests/ConfigEntityFormOverrideTest.php
@@ -31,6 +31,8 @@ class ConfigEntityFormOverrideTest extends WebTestBase {
     $overridden_label = 'Overridden label';
     $edited_label = 'Edited label';
 
+    $config_test_storage = $this->container->get('entity.manager')->getStorage('config_test');
+
     // Set up an override.
     $settings['config']['config_test.dynamic.dotted.default']['label'] = (object) array(
       'value' => $overridden_label,
@@ -39,7 +41,7 @@ class ConfigEntityFormOverrideTest extends WebTestBase {
     $this->writeSettings($settings);
 
     // Test that the overridden label is loaded with the entity.
-    $this->assertEqual(config_test_load('dotted.default')->label(), $overridden_label);
+    $this->assertEqual($config_test_storage->load('dotted.default')->label(), $overridden_label);
 
     // Test that the original label on the listing page is intact.
     $this->drupalGet('admin/structure/config_test');
@@ -67,7 +69,7 @@ class ConfigEntityFormOverrideTest extends WebTestBase {
     $this->assertIdentical((string) $elements[0]['value'], $edited_label);
 
     // Test that the overridden label is still loaded with the entity.
-    $this->assertEqual(config_test_load('dotted.default')->label(), $overridden_label);
+    $this->assertEqual($config_test_storage->load('dotted.default')->label(), $overridden_label);
   }
 
 }
diff --git a/core/modules/config/src/Tests/ConfigImporterTest.php b/core/modules/config/src/Tests/ConfigImporterTest.php
index ad21c7831..e39baf624 100644
--- a/core/modules/config/src/Tests/ConfigImporterTest.php
+++ b/core/modules/config/src/Tests/ConfigImporterTest.php
@@ -295,8 +295,8 @@ class ConfigImporterTest extends KernelTestBase {
 
     $logs = $this->configImporter->getErrors();
     $this->assertEqual(count($logs), 1);
-    $message = SafeMarkup::format('config_test entity with ID @name already exists', array('@name' => 'secondary'));
-    $this->assertEqual($logs[0], SafeMarkup::format('Unexpected error during import with operation @op for @name: @message.', array('@op' => 'create', '@name' => $name_primary, '@message' => $message)));
+    $message = SafeMarkup::format("'config_test' entity with ID '@name' already exists", array('@name' => 'secondary'));
+    $this->assertEqual($logs[0], SafeMarkup::format('Unexpected error during import with operation @op for @name: !message.', array('@op' => 'create', '@name' => $name_primary, '!message' => $message)));
   }
 
   /**
diff --git a/core/modules/config/src/Tests/ConfigInstallWebTest.php b/core/modules/config/src/Tests/ConfigInstallWebTest.php
index cff60a450..221d09fb3 100644
--- a/core/modules/config/src/Tests/ConfigInstallWebTest.php
+++ b/core/modules/config/src/Tests/ConfigInstallWebTest.php
@@ -127,7 +127,7 @@ class ConfigInstallWebTest extends WebTestBase {
     // will install the config_test module first because it is a dependency of
     // config_install_fail_test.
     // @see \Drupal\system\Form\ModulesListForm::submitForm()
-    $this->drupalPostForm('admin/modules', array('modules[Testing][config_test][enable]' => TRUE, 'modules[Testing][config_install_fail_test][enable]' => TRUE), t('Save configuration'));
+    $this->drupalPostForm('admin/modules', array('modules[Testing][config_test][enable]' => TRUE, 'modules[Testing][config_install_fail_test][enable]' => TRUE), t('Install'));
     $this->assertRaw('Unable to install Configuration install fail test, <em class="placeholder">config_test.dynamic.dotted.default</em> already exists in active configuration.');
 
     // Uninstall the config_test module to test the confirm form.
@@ -138,7 +138,7 @@ class ConfigInstallWebTest extends WebTestBase {
     // The user is shown a confirm form because the config_test module is a
     // dependency.
     // @see \Drupal\system\Form\ModulesListConfirmForm::submitForm()
-    $this->drupalPostForm('admin/modules', array('modules[Testing][config_install_fail_test][enable]' => TRUE), t('Save configuration'));
+    $this->drupalPostForm('admin/modules', array('modules[Testing][config_install_fail_test][enable]' => TRUE), t('Install'));
     $this->drupalPostForm(NULL, array(), t('Continue'));
     $this->assertRaw('Unable to install Configuration install fail test, <em class="placeholder">config_test.dynamic.dotted.default</em> already exists in active configuration.');
 
@@ -152,7 +152,7 @@ class ConfigInstallWebTest extends WebTestBase {
       ->set('label', 'Je suis Charlie')
       ->save();
 
-    $this->drupalPostForm('admin/modules', array('modules[Testing][config_install_fail_test][enable]' => TRUE), t('Save configuration'));
+    $this->drupalPostForm('admin/modules', array('modules[Testing][config_install_fail_test][enable]' => TRUE), t('Install'));
     $this->assertRaw('Unable to install Configuration install fail test, <em class="placeholder">config_test.dynamic.dotted.default, language/fr/config_test.dynamic.dotted.default</em> already exist in active configuration.');
 
     // Test installing a theme through the UI that has existing configuration.
@@ -183,12 +183,12 @@ class ConfigInstallWebTest extends WebTestBase {
     $this->drupalLogin($this->adminUser);
     // We need to install separately since config_install_dependency_test does
     // not depend on config_test and order is important.
-    $this->drupalPostForm('admin/modules', array('modules[Testing][config_test][enable]' => TRUE), t('Save configuration'));
-    $this->drupalPostForm('admin/modules', array('modules[Testing][config_install_dependency_test][enable]' => TRUE), t('Save configuration'));
+    $this->drupalPostForm('admin/modules', array('modules[Testing][config_test][enable]' => TRUE), t('Install'));
+    $this->drupalPostForm('admin/modules', array('modules[Testing][config_install_dependency_test][enable]' => TRUE), t('Install'));
     $this->assertRaw('Unable to install Config install dependency test, <em class="placeholder">config_test.dynamic.other_module_test_with_dependency</em> has unmet dependencies.');
 
-    $this->drupalPostForm('admin/modules', array('modules[Testing][config_other_module_config_test][enable]' => TRUE), t('Save configuration'));
-    $this->drupalPostForm('admin/modules', array('modules[Testing][config_install_dependency_test][enable]' => TRUE), t('Save configuration'));
+    $this->drupalPostForm('admin/modules', array('modules[Testing][config_other_module_config_test][enable]' => TRUE), t('Install'));
+    $this->drupalPostForm('admin/modules', array('modules[Testing][config_install_dependency_test][enable]' => TRUE), t('Install'));
     $this->rebuildContainer();
     $this->assertTrue(entity_load('config_test', 'other_module_test_with_dependency'), 'The config_test.dynamic.other_module_test_with_dependency configuration has been created during install.');
   }
diff --git a/core/modules/config/tests/config_entity_static_cache_test/src/ConfigOverrider.php b/core/modules/config/tests/config_entity_static_cache_test/src/ConfigOverrider.php
index 2867c7d92..3f7937911 100644
--- a/core/modules/config/tests/config_entity_static_cache_test/src/ConfigOverrider.php
+++ b/core/modules/config/tests/config_entity_static_cache_test/src/ConfigOverrider.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\config_entity_static_cache_test;
 
+use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Config\ConfigFactoryOverrideInterface;
 use Drupal\Core\Config\StorageInterface;
 
@@ -40,4 +41,11 @@ class ConfigOverrider implements ConfigFactoryOverrideInterface {
     return NULL;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheableMetadata($name) {
+    return new CacheableMetadata();
+  }
+
 }
diff --git a/core/modules/config/tests/config_override_integration_test/config/install/block.block.config_override_test.yml b/core/modules/config/tests/config_override_integration_test/config/install/block.block.config_override_test.yml
new file mode 100644
index 000000000..be0616ff5
--- /dev/null
+++ b/core/modules/config/tests/config_override_integration_test/config/install/block.block.config_override_test.yml
@@ -0,0 +1,24 @@
+id: config_override_test
+theme: classy
+weight: 0
+status: true
+langcode: en
+region: content
+plugin: test_cache
+settings:
+  label: 'Test HTML block'
+  provider: block_test
+  label_display: visible
+  status: true
+  info: ''
+  view_mode: default
+dependencies:
+  module:
+    - block_test
+  theme:
+    - classy
+visibility:
+  request_path:
+    id: request_path
+    pages: ''
+    negate: false
diff --git a/core/modules/config/tests/config_override_integration_test/config_override_integration_test.info.yml b/core/modules/config/tests/config_override_integration_test/config_override_integration_test.info.yml
new file mode 100644
index 000000000..22b1e94cd
--- /dev/null
+++ b/core/modules/config/tests/config_override_integration_test/config_override_integration_test.info.yml
@@ -0,0 +1,9 @@
+name: 'Configuration override integration test'
+type: module
+package: Testing
+version: VERSION
+core: 8.x
+
+dependencies:
+  - block
+  - block_test
diff --git a/core/modules/config/tests/config_override_integration_test/config_override_integration_test.services.yml b/core/modules/config/tests/config_override_integration_test/config_override_integration_test.services.yml
new file mode 100644
index 000000000..147874e27
--- /dev/null
+++ b/core/modules/config/tests/config_override_integration_test/config_override_integration_test.services.yml
@@ -0,0 +1,9 @@
+services:
+  cache_context.config_override_integration_test:
+    class: Drupal\config_override_integration_test\Cache\ConfigOverrideIntegrationTestCacheContext
+    tags:
+      - { name: cache.context }
+  config_override_integration_test.config_override:
+    class: Drupal\config_override_integration_test\CacheabilityMetadataConfigOverride
+    tags:
+      - { name: config.factory.override }
diff --git a/core/modules/config/tests/config_override_integration_test/src/Cache/ConfigOverrideIntegrationTestCacheContext.php b/core/modules/config/tests/config_override_integration_test/src/Cache/ConfigOverrideIntegrationTestCacheContext.php
new file mode 100644
index 000000000..f2192aa96
--- /dev/null
+++ b/core/modules/config/tests/config_override_integration_test/src/Cache/ConfigOverrideIntegrationTestCacheContext.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\config_override_integration_test\Cache\ConfigOverrideIntegrationTestCacheContext.
+ */
+
+namespace Drupal\config_override_integration_test\Cache;
+
+use Drupal\Core\Cache\CacheableMetadata;
+use Drupal\Core\Cache\Context\CacheContextInterface;
+
+/**
+ * A cache context service intended for the config override integration test.
+ *
+ * Cache context ID: 'config_override_integration_test'.
+ */
+class ConfigOverrideIntegrationTestCacheContext implements CacheContextInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function getLabel() {
+    return t('Config override integration test');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getContext() {
+    // Default to the 'disabled' state.
+    $state = \Drupal::state()->get('config_override_integration_test.enabled', FALSE) ? 'yes' : 'no';
+    return 'config_override_integration_test.' . $state;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheableMetadata() {
+    // Since this depends on State this can change at any time and is not
+    // cacheable.
+    $metadata = new CacheableMetadata();
+    $metadata->setCacheMaxAge(0);
+    return $metadata;
+  }
+
+}
diff --git a/core/modules/config/tests/config_override_integration_test/src/CacheabilityMetadataConfigOverride.php b/core/modules/config/tests/config_override_integration_test/src/CacheabilityMetadataConfigOverride.php
new file mode 100644
index 000000000..fc6a271e0
--- /dev/null
+++ b/core/modules/config/tests/config_override_integration_test/src/CacheabilityMetadataConfigOverride.php
@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\config_override_integration_test\CacheabilityMetadataConfigOverride.
+ */
+
+namespace Drupal\config_override_integration_test;
+
+use Drupal\Core\Cache\CacheableMetadata;
+use Drupal\Core\Config\ConfigFactoryOverrideInterface;
+use Drupal\Core\Config\StorageInterface;
+
+/**
+ * Test implementation of a config override that provides cacheability metadata.
+ */
+class CacheabilityMetadataConfigOverride implements ConfigFactoryOverrideInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function loadOverrides($names) {
+    $overrides = [];
+
+    // Override the test block depending on the state set in the test.
+    $state = \Drupal::state()->get('config_override_integration_test.enabled', FALSE);
+    if (in_array('block.block.config_override_test', $names) && $state !== FALSE) {
+      $overrides = $overrides + [
+        'block.block.config_override_test' => [
+          'settings' => ['label' => 'Overridden block label'],
+        ],
+      ];
+    }
+
+    return $overrides;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheSuffix() {
+    return 'config_override_integration_test';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function createConfigObject($name, $collection = StorageInterface::DEFAULT_COLLECTION) {
+    return NULL;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheableMetadata($name) {
+    $metadata = new CacheableMetadata();
+    if ($name === 'block.block.config_override_test') {
+      $metadata
+        ->setCacheContexts(['config_override_integration_test'])
+        ->setCacheTags(['config_override_integration_test_tag']);
+    }
+    return $metadata;
+  }
+
+}
diff --git a/core/modules/config/tests/config_override_test/config/install/block.block.call_to_action.yml b/core/modules/config/tests/config_override_test/config/install/block.block.call_to_action.yml
new file mode 100644
index 000000000..8951c0d22
--- /dev/null
+++ b/core/modules/config/tests/config_override_test/config/install/block.block.call_to_action.yml
@@ -0,0 +1,26 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - block_content
+  theme:
+    - classy
+id: call_to_action
+theme: classy
+region: content
+weight: null
+provider: null
+plugin: 'block_content:d7c9d8ba-663f-41b4-8756-86bc55c44653'
+settings:
+  id: 'block_content:d7c9d8ba-663f-41b4-8756-86bc55c44653'
+  label: 'Shop for cheap now!'
+  provider: block_content
+  label_display: visible
+  status: true
+  info: ''
+  view_mode: default
+visibility:
+  request_path:
+    id: request_path
+    pages: ''
+    negate: false
diff --git a/core/modules/config/tests/config_override_test/config_override_test.info.yml b/core/modules/config/tests/config_override_test/config_override_test.info.yml
index f1f1109cc..051729d3d 100644
--- a/core/modules/config/tests/config_override_test/config_override_test.info.yml
+++ b/core/modules/config/tests/config_override_test/config_override_test.info.yml
@@ -3,3 +3,7 @@ type: module
 package: Testing
 version: VERSION
 core: 8.x
+
+dependencies:
+  - block
+  - block_content
diff --git a/core/modules/config/tests/config_override_test/config_override_test.services.yml b/core/modules/config/tests/config_override_test/config_override_test.services.yml
index c3fae6491..1a074120d 100644
--- a/core/modules/config/tests/config_override_test/config_override_test.services.yml
+++ b/core/modules/config/tests/config_override_test/config_override_test.services.yml
@@ -1,4 +1,8 @@
 services:
+  cache_context.pirate_day:
+    class: Drupal\config_override_test\Cache\PirateDayCacheContext
+    tags:
+      - { name: cache.context }
   config_override_test.overrider:
     class: Drupal\config_override_test\ConfigOverrider
     tags:
@@ -7,3 +11,7 @@ services:
     class: Drupal\config_override_test\ConfigOverriderLowPriority
     tags:
       - { name: config.factory.override, priority: -100 }
+  config_override_test.pirate_day_cacheability_metadata_override:
+    class: Drupal\config_override_test\PirateDayCacheabilityMetadataConfigOverride
+    tags:
+      - { name: config.factory.override }
diff --git a/core/modules/config/tests/config_override_test/src/Cache/PirateDayCacheContext.php b/core/modules/config/tests/config_override_test/src/Cache/PirateDayCacheContext.php
new file mode 100644
index 000000000..c40cc6ab4
--- /dev/null
+++ b/core/modules/config/tests/config_override_test/src/Cache/PirateDayCacheContext.php
@@ -0,0 +1,66 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\config_override_test\Cache\PirateDayCacheContext.
+ */
+
+namespace Drupal\config_override_test\Cache;
+
+use Drupal\Core\Cache\CacheableMetadata;
+use Drupal\Core\Cache\Context\CacheContextInterface;
+
+/**
+ * Defines the PirateDayCacheContext service that allows to cache the booty.
+ *
+ * Cache context ID: 'pirate_day'.
+ */
+class PirateDayCacheContext implements CacheContextInterface {
+
+  /**
+   * The length of Pirate Day. It lasts 24 hours.
+   *
+   * This is a simplified test implementation. In a real life Pirate Day module
+   * this data wouldn't be defined in a constant, but calculated in a static
+   * method. If it were Pirate Day it should return the number of seconds until
+   * midnight, and on all other days it should return the number of seconds
+   * until the start of the next Pirate Day.
+   */
+  const PIRATE_DAY_MAX_AGE = 86400;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function getLabel() {
+    return t('Pirate day');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getContext() {
+    $is_pirate_day = static::isPirateDay() ? 'yarr' : 'nay';
+    return "pirate_day." . $is_pirate_day;
+  }
+
+  /**
+   * Returns whether or not it is Pirate Day.
+   *
+   * To ease testing this is determined with a global variable rather than using
+   * the traditional compass and sextant.
+   *
+   * @return bool
+   *   Returns TRUE if it is Pirate Day today.
+   */
+  public static function isPirateDay() {
+    return !empty($GLOBALS['it_is_pirate_day']);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheableMetadata() {
+    return new CacheableMetadata();
+  }
+
+}
diff --git a/core/modules/config/tests/config_override_test/src/ConfigOverrider.php b/core/modules/config/tests/config_override_test/src/ConfigOverrider.php
index 8eb383604..d19238461 100644
--- a/core/modules/config/tests/config_override_test/src/ConfigOverrider.php
+++ b/core/modules/config/tests/config_override_test/src/ConfigOverrider.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\config_override_test;
 
+use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Config\ConfigFactoryOverrideInterface;
 
 /**
@@ -44,5 +45,11 @@ class ConfigOverrider implements ConfigFactoryOverrideInterface {
     return NULL;
   }
 
-}
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheableMetadata($name) {
+    return new CacheableMetadata();
+  }
 
+}
diff --git a/core/modules/config/tests/config_override_test/src/ConfigOverriderLowPriority.php b/core/modules/config/tests/config_override_test/src/ConfigOverriderLowPriority.php
index 6b11e0a09..ecce74265 100644
--- a/core/modules/config/tests/config_override_test/src/ConfigOverriderLowPriority.php
+++ b/core/modules/config/tests/config_override_test/src/ConfigOverriderLowPriority.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\config_override_test;
 
+use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Config\ConfigFactoryOverrideInterface;
 use Drupal\Core\Config\StorageInterface;
 
@@ -49,5 +50,11 @@ class ConfigOverriderLowPriority implements ConfigFactoryOverrideInterface {
     return NULL;
   }
 
-}
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheableMetadata($name) {
+    return new CacheableMetadata();
+  }
 
+}
diff --git a/core/modules/config/tests/config_override_test/src/PirateDayCacheabilityMetadataConfigOverride.php b/core/modules/config/tests/config_override_test/src/PirateDayCacheabilityMetadataConfigOverride.php
new file mode 100644
index 000000000..85e1700bb
--- /dev/null
+++ b/core/modules/config/tests/config_override_test/src/PirateDayCacheabilityMetadataConfigOverride.php
@@ -0,0 +1,82 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\config_override_test\PirateDayCacheabilityMetadataConfigOverride.
+ */
+
+namespace Drupal\config_override_test;
+
+use Drupal\config_override_test\Cache\PirateDayCacheContext;
+use Drupal\Core\Cache\CacheableMetadata;
+use Drupal\Core\Config\ConfigFactoryOverrideInterface;
+use Drupal\Core\Config\StorageInterface;
+
+/**
+ * Test implementation of a config override that provides cacheability metadata.
+ */
+class PirateDayCacheabilityMetadataConfigOverride implements ConfigFactoryOverrideInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function loadOverrides($names) {
+    $overrides = [];
+
+    // Override the theme and the 'call_to_action' block on Pirate Day.
+    if (PirateDayCacheContext::isPirateDay()) {
+      if (in_array('system.theme', $names)) {
+        $overrides = $overrides + ['system.theme' => ['default' => 'pirate']];
+      }
+      if (in_array('block.block.call_to_action', $names)) {
+        $overrides = $overrides + [
+          'block.block.call_to_action' => [
+            'settings' => ['label' => 'Draw yer cutlasses!'],
+          ],
+        ];
+      }
+    }
+
+    return $overrides;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheSuffix() {
+    return 'PirateDayConfigOverrider';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function createConfigObject($name, $collection = StorageInterface::DEFAULT_COLLECTION) {
+    return NULL;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheableMetadata($name) {
+    $metadata = new CacheableMetadata();
+    $metadata
+      ->setCacheContexts(['pirate_day'])
+      ->setCacheTags(['pirate-day-tag'])
+      ->setCacheMaxAge(PirateDayCacheContext::PIRATE_DAY_MAX_AGE);
+    return $metadata;
+  }
+
+  /**
+   * Returns whether or not our overrides are potentially applicable.
+   *
+   * @param string $name
+   *   The name of the config object that is being constructed.
+   *
+   * @return bool
+   *   TRUE if the merchant ship will be boarded. FALSE if we drink rum instead.
+   */
+  protected function isCacheabilityMetadataApplicable($name) {
+    return in_array($name, ['system.theme', 'block.block.call_to_action']);
+  }
+
+}
diff --git a/core/modules/config/tests/config_test/config_test.module b/core/modules/config/tests/config_test/config_test.module
index c17d688f4..9510abab6 100644
--- a/core/modules/config/tests/config_test/config_test.module
+++ b/core/modules/config/tests/config_test/config_test.module
@@ -10,16 +10,6 @@ use Symfony\Component\HttpFoundation\RedirectResponse;
 
 require_once dirname(__FILE__) . '/config_test.hooks.inc';
 
-/**
- * Loads a ConfigTest object.
- *
- * @param string $id
- *   The ID of the ConfigTest object to load.
- */
-function config_test_load($id) {
-  return entity_load('config_test', $id);
-}
-
 /**
  * Implements hook_cache_flush().
  */
diff --git a/core/modules/config/tests/config_test/src/ConfigTestForm.php b/core/modules/config/tests/config_test/src/ConfigTestForm.php
index 0967206c3..ac0bb17ae 100644
--- a/core/modules/config/tests/config_test/src/ConfigTestForm.php
+++ b/core/modules/config/tests/config_test/src/ConfigTestForm.php
@@ -8,13 +8,41 @@
 namespace Drupal\config_test;
 
 use Drupal\Core\Entity\EntityForm;
+use Drupal\Core\Entity\Query\QueryFactory;
 use Drupal\Core\Form\FormStateInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Form controller for the test config edit forms.
  */
 class ConfigTestForm extends EntityForm {
 
+  /**
+   * The entity query.
+   *
+   * @var \Drupal\Core\Entity\Query\QueryFactory
+   */
+  protected $entityQuery;
+
+  /**
+   * Constructs a new ConfigTestForm.
+   *
+   * @param \Drupal\Core\Entity\Query\QueryFactory $entity_query
+   *   The entity query.
+   */
+  public function __construct(QueryFactory $entity_query) {
+    $this->entityQuery = $entity_query;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static(
+      $container->get('entity.query')
+    );
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -33,7 +61,7 @@ class ConfigTestForm extends EntityForm {
       '#default_value' => $entity->id(),
       '#required' => TRUE,
       '#machine_name' => array(
-        'exists' => 'config_test_load',
+        'exists' => [$this, 'exists'],
         'replace_pattern' => '[^a-z0-9_.]+',
       ),
     );
@@ -142,4 +170,25 @@ class ConfigTestForm extends EntityForm {
     $form_state->setRedirectUrl($this->entity->urlInfo('collection'));
   }
 
+  /**
+   * Determines if the entity already exists.
+   *
+   * @param string|int $entity_id
+   *   The entity ID.
+   * @param array $element
+   *   The form element.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   The current state of the form.
+   *
+   * @return bool
+   *   TRUE if the entity exists, FALSE otherwise.
+   */
+  public function exists($entity_id, array $element, FormStateInterface $form_state) {
+    /** @var \Drupal\Core\Config\Entity\ConfigEntityInterface $entity */
+    $entity = $form_state->getFormObject()->getEntity();
+    return (bool) $this->entityQuery->get($entity->getEntityTypeId())
+      ->condition($entity->getEntityType()->getKey('id'), $entity_id)
+      ->execute();
+  }
+
 }
diff --git a/core/modules/config_translation/config_translation.links.contextual.yml b/core/modules/config_translation/config_translation.links.contextual.yml
index 71c4544fd..0ad2b35b2 100644
--- a/core/modules/config_translation/config_translation.links.contextual.yml
+++ b/core/modules/config_translation/config_translation.links.contextual.yml
@@ -1,4 +1,3 @@
 config_translation.contextual_links:
-  title: 'Translate @type_name'
   deriver: 'Drupal\config_translation\Plugin\Derivative\ConfigTranslationContextualLinks'
   weight: 100
diff --git a/core/modules/config_translation/config_translation.links.task.yml b/core/modules/config_translation/config_translation.links.task.yml
index 513eb58e5..7140da10a 100644
--- a/core/modules/config_translation/config_translation.links.task.yml
+++ b/core/modules/config_translation/config_translation.links.task.yml
@@ -1,4 +1,3 @@
 config_translation.local_tasks:
-  title: 'Translate @type_name'
   deriver: 'Drupal\config_translation\Plugin\Derivative\ConfigTranslationLocalTasks'
   weight: 100
diff --git a/core/modules/config_translation/config_translation.module b/core/modules/config_translation/config_translation.module
index b4f882b75..3c81f78e3 100644
--- a/core/modules/config_translation/config_translation.module
+++ b/core/modules/config_translation/config_translation.module
@@ -188,6 +188,7 @@ function config_translation_config_schema_info_alter(&$definitions) {
     'text_format' => '\Drupal\config_translation\FormElement\TextFormat',
     'mapping' => '\Drupal\config_translation\FormElement\ListElement',
     'sequence' => '\Drupal\config_translation\FormElement\ListElement',
+    'plural_label' => '\Drupal\config_translation\FormElement\PluralVariants',
   );
 
   // Enhance the text and date type definitions with classes to generate proper
diff --git a/core/modules/config_translation/src/ConfigEntityMapper.php b/core/modules/config_translation/src/ConfigEntityMapper.php
index 269bfac86..4a6d275db 100644
--- a/core/modules/config_translation/src/ConfigEntityMapper.php
+++ b/core/modules/config_translation/src/ConfigEntityMapper.php
@@ -8,8 +8,8 @@
 namespace Drupal\config_translation;
 
 use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Config\Entity\ConfigEntityInterface;
 use Drupal\Core\Config\TypedConfigManagerInterface;
-use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Language\LanguageManagerInterface;
 use Drupal\Core\Routing\RouteMatch;
@@ -43,7 +43,7 @@ class ConfigEntityMapper extends ConfigNamesMapper {
   /**
    * Loaded entity instance to help produce the translation interface.
    *
-   * @var \Drupal\Core\Entity\EntityInterface
+   * @var \Drupal\Core\Config\Entity\ConfigEntityInterface
    */
   protected $entity;
 
@@ -125,13 +125,13 @@ class ConfigEntityMapper extends ConfigNamesMapper {
    * configuration names to use to check permissions or display a translation
    * screen.
    *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The entity to set.
+   * @param \Drupal\Core\Config\Entity\ConfigEntityInterface $entity
+   *   The configuration entity to set.
    *
    * @return bool
    *   TRUE, if the entity was set successfully; FALSE otherwise.
    */
-  public function setEntity(EntityInterface $entity) {
+  public function setEntity(ConfigEntityInterface $entity) {
     if (isset($this->entity)) {
       return FALSE;
     }
@@ -143,6 +143,7 @@ class ConfigEntityMapper extends ConfigNamesMapper {
     // page with more names if form altering added more configuration to an
     // entity. This is not a Drupal 8 best practice (ideally the configuration
     // would have pluggable components), but this may happen as well.
+    /** @var \Drupal\Core\Config\Entity\ConfigEntityTypeInterface $entity_type_info */
     $entity_type_info = $this->entityManager->getDefinition($this->entityType);
     $this->addConfigName($entity_type_info->getConfigPrefix() . '.' . $entity->id());
 
diff --git a/core/modules/config_translation/src/ConfigFieldMapper.php b/core/modules/config_translation/src/ConfigFieldMapper.php
index e9d48e4e7..a593fffd2 100644
--- a/core/modules/config_translation/src/ConfigFieldMapper.php
+++ b/core/modules/config_translation/src/ConfigFieldMapper.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\config_translation;
 
+use Drupal\Core\Config\Entity\ConfigEntityInterface;
+
 /**
  * Configuration mapper for fields.
  *
@@ -49,4 +51,22 @@ class ConfigFieldMapper extends ConfigEntityMapper {
     return $this->t('@label fields', array('@label' => $base_entity_info->getLabel()));
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function setEntity(ConfigEntityInterface $entity) {
+    if (parent::setEntity($entity)) {
+
+      // Field storage config can also contain translatable values. Add the name
+      // of the config as well to the list of configs for this entity.
+      /** @var \Drupal\field\FieldStorageConfigInterface $field_storage */
+      $field_storage = $this->entity->getFieldStorageDefinition();
+      /** @var \Drupal\Core\Config\Entity\ConfigEntityTypeInterface $entity_type_info */
+      $entity_type_info = $this->entityManager->getDefinition($field_storage->getEntityTypeId());
+      $this->addConfigName($entity_type_info->getConfigPrefix() . '.' . $field_storage->id());
+      return TRUE;
+    }
+    return FALSE;
+  }
+
 }
diff --git a/core/modules/config_translation/src/ConfigMapperManager.php b/core/modules/config_translation/src/ConfigMapperManager.php
index 56b2182eb..2731aa0e5 100644
--- a/core/modules/config_translation/src/ConfigMapperManager.php
+++ b/core/modules/config_translation/src/ConfigMapperManager.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\config_translation;
 
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException;
 use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\Config\TypedConfigManagerInterface;
@@ -134,7 +133,7 @@ class ConfigMapperManager extends DefaultPluginManager implements ConfigMapperMa
     parent::processDefinition($definition, $plugin_id);
 
     if (!isset($definition['base_route_name'])) {
-      throw new InvalidPluginDefinitionException($plugin_id, SafeMarkup::format("The plugin definition of the mapper '%plugin_id' does not contain a base_route_name.", array('%plugin_id' => $plugin_id)));
+      throw new InvalidPluginDefinitionException($plugin_id, "The plugin definition of the mapper '$plugin_id' does not contain a base_route_name.");
     }
   }
 
diff --git a/core/modules/config_translation/src/Controller/ConfigTranslationEntityListBuilder.php b/core/modules/config_translation/src/Controller/ConfigTranslationEntityListBuilder.php
index 1db0164a2..0c50f2a49 100644
--- a/core/modules/config_translation/src/Controller/ConfigTranslationEntityListBuilder.php
+++ b/core/modules/config_translation/src/Controller/ConfigTranslationEntityListBuilder.php
@@ -84,8 +84,8 @@ class ConfigTranslationEntityListBuilder extends ConfigEntityListBuilder impleme
   /**
    * {@inheritdoc}
    */
-  public function getDefaultOperations(EntityInterface $entity) {
-    $operations = parent::getDefaultOperations($entity);
+  public function getOperations(EntityInterface $entity) {
+    $operations = parent::getOperations($entity);
     foreach (array_keys($operations) as $operation) {
       // This is a translation UI for translators. Show the translation
       // operation only.
diff --git a/core/modules/config_translation/src/FormElement/FormElementBase.php b/core/modules/config_translation/src/FormElement/FormElementBase.php
index e13cc3122..7db01e1c4 100644
--- a/core/modules/config_translation/src/FormElement/FormElementBase.php
+++ b/core/modules/config_translation/src/FormElement/FormElementBase.php
@@ -91,7 +91,6 @@ abstract class FormElementBase implements ElementInterface {
    *   A render array for the source value.
    */
   protected function getSourceElement(LanguageInterface $source_language, $source_config) {
-    // @todo Should support singular+plurals https://www.drupal.org/node/2454829
     if ($source_config) {
       $value = '<span lang="' . $source_language->getId() . '">' . nl2br($source_config) . '</span>';
     }
@@ -162,7 +161,6 @@ abstract class FormElementBase implements ElementInterface {
    */
   protected function getTranslationElement(LanguageInterface $translation_language, $source_config, $translation_config) {
     // Add basic properties that apply to all form elements.
-    // @todo Should support singular+plurals https://www.drupal.org/node/2454829
     return array(
       '#title' => $this->t('!label <span class="visually-hidden">(!source_language)</span>', array(
         '!label' => $this->t($this->definition['label']),
diff --git a/core/modules/config_translation/src/FormElement/PluralVariants.php b/core/modules/config_translation/src/FormElement/PluralVariants.php
new file mode 100644
index 000000000..ec6b97763
--- /dev/null
+++ b/core/modules/config_translation/src/FormElement/PluralVariants.php
@@ -0,0 +1,82 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\config_translation\FormElement\PluralVariants.
+ */
+
+namespace Drupal\config_translation\FormElement;
+
+use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Core\Config\Config;
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\language\Config\LanguageConfigOverride;
+
+/**
+ * Defines form elements for plurals in configuration translation.
+ */
+class PluralVariants extends FormElementBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getSourceElement(LanguageInterface $source_language, $source_config) {
+    $plurals = $this->getNumberOfPlurals($source_language->getId());
+    $values = explode(LOCALE_PLURAL_DELIMITER, $source_config);
+    $element = array(
+      '#type' => 'fieldset',
+      '#title' => SafeMarkup::format('@label <span class="visually-hidden">(@source_language)</span>', array(
+        '@label' => $this->t($this->definition->getLabel()),
+        '@source_language' => $source_language->getName(),
+      )),
+      '#tree' => TRUE,
+    );
+    for ($i = 0; $i < $plurals; $i++) {
+      $element[$i] = array(
+        '#type' => 'item',
+        // @todo Should use better labels https://www.drupal.org/node/2499639
+        '#title' => $i == 0 ? $this->t('Singular form') : $this->formatPlural($i, 'First plural form', '@count. plural form'),
+        '#markup' => SafeMarkup::format('<span lang="@langcode">@value</span>', array(
+          '@langcode' => $source_language->getId(),
+          '@value' => isset($values[$i]) ? $values[$i] : $this->t('(Empty)'),
+        )),
+      );
+    }
+    return $element;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getTranslationElement(LanguageInterface $translation_language, $source_config, $translation_config) {
+    $plurals = $this->getNumberOfPlurals($translation_language->getId());
+    $values = explode(LOCALE_PLURAL_DELIMITER, $translation_config);
+    $element = array(
+      '#type' => 'fieldset',
+      '#title' => SafeMarkup::format('@label <span class="visually-hidden">(@translation_language)</span>', array(
+        '@label' => $this->t($this->definition->getLabel()),
+        '@translation_language' => $translation_language->getName(),
+      )),
+      '#tree' => TRUE,
+    );
+    for ($i = 0; $i < $plurals; $i++) {
+      $element[$i] = array(
+        '#type' => 'textfield',
+        // @todo Should use better labels https://www.drupal.org/node/2499639
+        '#title' => $i == 0 ? $this->t('Singular form') : $this->formatPlural($i, 'First plural form', '@count. plural form'),
+        '#default_value' => isset($values[$i]) ? $values[$i] : '',
+        '#attributes' => array('lang' => $translation_language->getId()),
+      );
+    }
+    return $element;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setConfig(Config $base_config, LanguageConfigOverride $config_translation, $config_values, $base_key = NULL) {
+    $config_values = implode(LOCALE_PLURAL_DELIMITER, $config_values);
+    parent::setConfig($base_config, $config_translation, $config_values, $base_key);
+  }
+
+}
diff --git a/core/modules/config_translation/src/Plugin/Menu/ContextualLink/ConfigTranslationContextualLink.php b/core/modules/config_translation/src/Plugin/Menu/ContextualLink/ConfigTranslationContextualLink.php
index 98ffb0e58..c8989fc48 100644
--- a/core/modules/config_translation/src/Plugin/Menu/ContextualLink/ConfigTranslationContextualLink.php
+++ b/core/modules/config_translation/src/Plugin/Menu/ContextualLink/ConfigTranslationContextualLink.php
@@ -9,11 +9,13 @@ namespace Drupal\config_translation\Plugin\Menu\ContextualLink;
 
 use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Menu\ContextualLinkDefault;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
 
 /**
  * Defines a contextual link plugin with a dynamic title.
  */
 class ConfigTranslationContextualLink extends ContextualLinkDefault {
+  use StringTranslationTrait;
 
   /**
    * The mapper plugin discovery service.
@@ -26,17 +28,12 @@ class ConfigTranslationContextualLink extends ContextualLinkDefault {
    * {@inheritdoc}
    */
   public function getTitle() {
-    $options = array();
-    if (!empty($this->pluginDefinition['title_context'])) {
-      $options['context'] = $this->pluginDefinition['title_context'];
-    }
-
-    // Take custom 'config_translation_plugin_id' plugin definition key to
-    // retrieve title. We need to retrieve a runtime title (as opposed to
-    // storing the title on the plugin definition for the link) because
-    // it contains translated parts that we need in the runtime language.
+    // Use the custom 'config_translation_plugin_id' plugin definition key to
+    // retrieve the title. We need to retrieve a runtime title (as opposed to
+    // storing the title on the plugin definition for the link) because it
+    // contains translated parts that we need in the runtime language.
     $type_name = Unicode::strtolower($this->mapperManager()->createInstance($this->pluginDefinition['config_translation_plugin_id'])->getTypeLabel());
-    return $this->t($this->pluginDefinition['title'], array('@type_name' => $type_name), $options);
+    return $this->t('Translate @type_name', array('@type_name' => $type_name));
   }
 
   /**
diff --git a/core/modules/config_translation/src/Plugin/Menu/LocalTask/ConfigTranslationLocalTask.php b/core/modules/config_translation/src/Plugin/Menu/LocalTask/ConfigTranslationLocalTask.php
index 46a2ec2b7..496ed9629 100644
--- a/core/modules/config_translation/src/Plugin/Menu/LocalTask/ConfigTranslationLocalTask.php
+++ b/core/modules/config_translation/src/Plugin/Menu/LocalTask/ConfigTranslationLocalTask.php
@@ -9,11 +9,13 @@ namespace Drupal\config_translation\Plugin\Menu\LocalTask;
 
 use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Menu\LocalTaskDefault;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
 
 /**
  * Defines a local task plugin with a dynamic title.
  */
 class ConfigTranslationLocalTask extends LocalTaskDefault {
+  use StringTranslationTrait;
 
   /**
    * The mapper plugin discovery service.
@@ -26,17 +28,12 @@ class ConfigTranslationLocalTask extends LocalTaskDefault {
    * {@inheritdoc}
    */
   public function getTitle() {
-    $options = array();
-    if (!empty($this->pluginDefinition['title_context'])) {
-      $options['context'] = $this->pluginDefinition['title_context'];
-    }
-
     // Take custom 'config_translation_plugin_id' plugin definition key to
     // retrieve title. We need to retrieve a runtime title (as opposed to
     // storing the title on the plugin definition for the link) because
     // it contains translated parts that we need in the runtime language.
     $type_name = Unicode::strtolower($this->mapperManager()->createInstance($this->pluginDefinition['config_translation_plugin_id'])->getTypeLabel());
-    return $this->t($this->pluginDefinition['title'], array('@type_name' => $type_name), $options);
+    return $this->t('Translate @type_name', array('@type_name' => $type_name));
   }
 
   /**
diff --git a/core/modules/config_translation/src/Tests/ConfigTranslationOverviewTest.php b/core/modules/config_translation/src/Tests/ConfigTranslationOverviewTest.php
index a2f6a6cf9..0916dcd79 100644
--- a/core/modules/config_translation/src/Tests/ConfigTranslationOverviewTest.php
+++ b/core/modules/config_translation/src/Tests/ConfigTranslationOverviewTest.php
@@ -23,7 +23,16 @@ class ConfigTranslationOverviewTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('contact', 'config_translation', 'views', 'views_ui', 'contextual', 'config_test', 'config_translation_test');
+  public static $modules = [
+    'config_test',
+    'config_translation',
+    'config_translation_test',
+    'contact',
+    'contextual',
+    'entity_test_operation',
+    'views',
+    'views_ui',
+  ];
 
   /**
    * Languages to enable.
@@ -67,6 +76,14 @@ class ConfigTranslationOverviewTest extends WebTestBase {
     $this->drupalGet('admin/config/regional/config-translation');
     $this->assertLinkByHref('admin/config/regional/config-translation/config_test');
     $this->assertLinkByHref('admin/config/people/accounts/translate');
+    // Make sure there is only a single operation for each dropbutton, either
+    // 'List' or 'Translate'.
+    foreach ($this->cssSelect('ul.dropbutton') as $i => $dropbutton) {
+      $this->assertIdentical(1, $dropbutton->count());
+      foreach ($dropbutton->li as $link) {
+        $this->assertTrue(((string) $link->a === 'Translate') || ((string) $link->a === 'List'));
+      }
+    }
 
     $labels = array(
       '&$nxd~i0',
@@ -86,6 +103,15 @@ class ConfigTranslationOverviewTest extends WebTestBase {
       $this->assertLinkByHref($base_url . '/translate');
       $this->assertText(SafeMarkup::checkPlain($test_entity->label()));
 
+      // Make sure there is only a single 'Translate' operation for each
+      // dropbutton.
+      foreach ($this->cssSelect('ul.dropbutton') as $i => $dropbutton) {
+        $this->assertIdentical(1, $dropbutton->count());
+        foreach ($dropbutton->li as $link) {
+          $this->assertIdentical('Translate', (string) $link->a);
+        }
+      }
+
       $entity_type = \Drupal::entityManager()->getDefinition($test_entity->getEntityTypeId());
       $this->drupalGet($base_url . '/translate');
 
@@ -127,6 +153,8 @@ class ConfigTranslationOverviewTest extends WebTestBase {
     $original_label = 'Default';
     $overridden_label = 'Overridden label';
 
+    $config_test_storage = $this->container->get('entity.manager')->getStorage('config_test');
+
     // Set up an override.
     $settings['config']['config_test.dynamic.dotted.default']['label'] = (object) array(
       'value' => $overridden_label,
@@ -135,7 +163,7 @@ class ConfigTranslationOverviewTest extends WebTestBase {
     $this->writeSettings($settings);
 
     // Test that the overridden label is loaded with the entity.
-    $this->assertEqual(config_test_load('dotted.default')->label(), $overridden_label);
+    $this->assertEqual($config_test_storage->load('dotted.default')->label(), $overridden_label);
 
     // Test that the original label on the listing page is intact.
     $this->drupalGet('admin/config/regional/config-translation/config_test');
diff --git a/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php b/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php
index c7218dffc..a05f7e70a 100644
--- a/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php
+++ b/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php
@@ -13,6 +13,8 @@ use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Config\FileStorage;
 use Drupal\Core\Language\Language;
 use Drupal\Core\Language\LanguageInterface;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\simpletest\WebTestBase;
 
@@ -28,7 +30,21 @@ class ConfigTranslationUiTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'contact', 'contact_test', 'config_translation', 'config_translation_test', 'views', 'views_ui', 'contextual', 'filter', 'filter_test');
+  public static $modules = [
+    'config_translation',
+    'config_translation_test',
+    'contact',
+    'contact_test',
+    'contextual',
+    'entity_test',
+    'field_test',
+    'field_ui',
+    'filter',
+    'filter_test',
+    'node',
+    'views',
+    'views_ui',
+  ];
 
   /**
    * Languages to enable.
@@ -89,6 +105,7 @@ class ConfigTranslationUiTest extends WebTestBase {
         'administer themes',
         'bypass node access',
         'administer content types',
+        'translate interface',
       ]
     );
     // Create and login user.
@@ -609,6 +626,136 @@ class ConfigTranslationUiTest extends WebTestBase {
     $this->assertFieldByName('translation[config_names][views.view.frontpage][display][default][display_options][title]', $display_options_master . " FR");
   }
 
+  /**
+   * Test the number of source elements for plural strings in config translation forms.
+   */
+  public function testPluralConfigStringsSourceElements() {
+    $this->drupalLogin($this->adminUser);
+
+    // Languages to test, with various number of plural forms.
+    $languages = array(
+      'vi' => array('plurals' => 1, 'expected' => array(TRUE, FALSE, FALSE, FALSE)),
+      'fr' => array('plurals' => 2, 'expected' => array(TRUE, TRUE, FALSE, FALSE)),
+      'sl' => array('plurals' => 4, 'expected' => array(TRUE, TRUE, TRUE, TRUE)),
+    );
+
+    foreach ($languages as $langcode => $data) {
+      // Import a .po file to add a new language with a given number of plural forms
+      $name = tempnam('temporary://', $langcode . '_') . '.po';
+      file_put_contents($name, $this->getPoFile($data['plurals']));
+      $this->drupalPostForm('admin/config/regional/translate/import', array(
+        'langcode' => $langcode,
+        'files[file]' => $name,
+      ), t('Import'));
+
+      // Change the config langcode of the 'files' view.
+      $config = \Drupal::service('config.factory')->getEditable('views.view.files');
+      $config->set('langcode', $langcode);
+      $config->save();
+
+      // Go to the translation page of the 'files' view.
+      $translation_url = 'admin/structure/views/view/files/translate/' . $langcode . '/add';
+      $this->drupalGet($translation_url);
+
+      // Check if the expected number of source elements are present.
+      foreach ($data['expected'] as $index => $expected) {
+        if ($expected) {
+          $this->assertRaw('edit-source-config-names-viewsviewfiles-display-default-display-options-fields-count-format-plural-string-' . $index);
+        }
+        else {
+          $this->assertNoRaw('edit-source-config-names-viewsviewfiles-display-default-display-options-fields-count-format-plural-string-' . $index);
+        }
+      }
+    }
+  }
+
+  /**
+   * Test translation of plural strings with multiple plural forms in config.
+   */
+  public function testPluralConfigStrings() {
+    $this->drupalLogin($this->adminUser);
+
+    // First import a .po file with multiple plural forms.
+    // This will also automatically add the 'sl' language.
+    $name = tempnam('temporary://', "sl_") . '.po';
+    file_put_contents($name, $this->getPoFile(4));
+    $this->drupalPostForm('admin/config/regional/translate/import', array(
+      'langcode' => 'sl',
+      'files[file]' => $name,
+    ), t('Import'));
+
+    // Translate the files view, as this one uses numeric formatters.
+    $description = 'Singular form';
+    $field_value = '1 place';
+    $field_value_plural = '@count places';
+    $translation_url = 'admin/structure/views/view/files/translate/sl/add';
+    $this->drupalGet($translation_url);
+
+    // Make sure original text is present on this page, in addition to 2 new
+    // empty fields.
+    $this->assertRaw($description);
+    $this->assertFieldByName('translation[config_names][views.view.files][display][default][display_options][fields][count][format_plural_string][0]', $field_value);
+    $this->assertFieldByName('translation[config_names][views.view.files][display][default][display_options][fields][count][format_plural_string][1]', $field_value_plural);
+    $this->assertFieldByName('translation[config_names][views.view.files][display][default][display_options][fields][count][format_plural_string][2]', '');
+    $this->assertFieldByName('translation[config_names][views.view.files][display][default][display_options][fields][count][format_plural_string][3]', '');
+
+    // Then make sure it also works.
+    $edit = [
+      'translation[config_names][views.view.files][display][default][display_options][fields][count][format_plural_string][0]' => $field_value . ' SL',
+      'translation[config_names][views.view.files][display][default][display_options][fields][count][format_plural_string][1]' => $field_value_plural . ' 1 SL',
+      'translation[config_names][views.view.files][display][default][display_options][fields][count][format_plural_string][2]' => $field_value_plural . ' 2 SL',
+      'translation[config_names][views.view.files][display][default][display_options][fields][count][format_plural_string][3]' => $field_value_plural . ' 3 SL',
+    ];
+    $this->drupalPostForm($translation_url, $edit, t('Save translation'));
+
+    // Make sure the values have changed.
+    $this->drupalGet($translation_url);
+    $this->assertFieldByName('translation[config_names][views.view.files][display][default][display_options][fields][count][format_plural_string][0]', "$field_value SL");
+    $this->assertFieldByName('translation[config_names][views.view.files][display][default][display_options][fields][count][format_plural_string][1]', "$field_value_plural 1 SL");
+    $this->assertFieldByName('translation[config_names][views.view.files][display][default][display_options][fields][count][format_plural_string][2]', "$field_value_plural 2 SL");
+    $this->assertFieldByName('translation[config_names][views.view.files][display][default][display_options][fields][count][format_plural_string][3]', "$field_value_plural 3 SL");
+  }
+
+  /**
+   * Tests the translation of field and field storage configuration.
+   */
+  public function testFieldConfigTranslation() {
+    // Add a test field which has a translatable field setting and a
+    // translatable field storage setting.
+    $field_name = strtolower($this->randomMachineName());
+    $field_storage = FieldStorageConfig::create([
+      'field_name' => $field_name,
+      'entity_type' => 'entity_test',
+      'type' => 'test_field',
+    ]);
+
+    $translatable_storage_setting = $this->randomString();
+    $field_storage->setSetting('translatable_storage_setting', $translatable_storage_setting);
+    $field_storage->save();
+
+    $bundle = strtolower($this->randomMachineName());
+    entity_test_create_bundle($bundle);
+    $field = FieldConfig::create([
+      'field_name' => $field_name,
+      'entity_type' => 'entity_test',
+      'bundle' => $bundle,
+    ]);
+
+    $translatable_field_setting = $this->randomString();
+    $field->setSetting('translatable_field_setting', $translatable_field_setting);
+    $field->save();
+
+    $this->drupalLogin($this->translatorUser);
+
+    $this->drupalGet("/entity_test/structure/$bundle/fields/entity_test.$bundle.$field_name/translate");
+    $this->clickLink('Add');
+
+    $this->assertText('Translatable field setting');
+    $this->assertRaw(SafeMarkup::checkPlain($translatable_field_setting));
+    $this->assertText('Translatable storage setting');
+    $this->assertRaw(SafeMarkup::checkPlain($translatable_storage_setting));
+  }
+
   /**
    * Test translation storage in locale storage.
    */
@@ -936,4 +1083,43 @@ class ConfigTranslationUiTest extends WebTestBase {
     )));
   }
 
+  /**
+   * Helper function that returns a .po file with a given number of plural forms.
+   */
+  public function getPoFile($plurals) {
+    $po_file = array();
+
+    $po_file[1] = <<< EOF
+msgid ""
+msgstr ""
+"Project-Id-Version: Drupal 8\\n"
+"MIME-Version: 1.0\\n"
+"Content-Type: text/plain; charset=UTF-8\\n"
+"Content-Transfer-Encoding: 8bit\\n"
+"Plural-Forms: nplurals=1; plural=0;\\n"
+EOF;
+
+    $po_file[2] = <<< EOF
+msgid ""
+msgstr ""
+"Project-Id-Version: Drupal 8\\n"
+"MIME-Version: 1.0\\n"
+"Content-Type: text/plain; charset=UTF-8\\n"
+"Content-Transfer-Encoding: 8bit\\n"
+"Plural-Forms: nplurals=2; plural=(n>1);\\n"
+EOF;
+
+    $po_file[4] = <<< EOF
+msgid ""
+msgstr ""
+"Project-Id-Version: Drupal 8\\n"
+"MIME-Version: 1.0\\n"
+"Content-Type: text/plain; charset=UTF-8\\n"
+"Content-Transfer-Encoding: 8bit\\n"
+"Plural-Forms: nplurals=4; plural=(((n%100)==1)?(0):(((n%100)==2)?(1):((((n%100)==3)||((n%100)==4))?(2):3)));\\n"
+EOF;
+
+    return $po_file[$plurals];
+  }
+
 }
diff --git a/core/modules/config_translation/tests/src/Unit/ConfigEntityMapperTest.php b/core/modules/config_translation/tests/src/Unit/ConfigEntityMapperTest.php
index 8a2fc59e6..804193197 100644
--- a/core/modules/config_translation/tests/src/Unit/ConfigEntityMapperTest.php
+++ b/core/modules/config_translation/tests/src/Unit/ConfigEntityMapperTest.php
@@ -57,7 +57,7 @@ class ConfigEntityMapperTest extends UnitTestCase {
   protected function setUp() {
     $this->entityManager = $this->getMock('Drupal\Core\Entity\EntityManagerInterface');
 
-    $this->entity = $this->getMock('Drupal\Core\Entity\EntityInterface');
+    $this->entity = $this->getMock('Drupal\Core\Config\Entity\ConfigEntityInterface');
 
     $this->routeProvider = $this->getMock('Drupal\Core\Routing\RouteProviderInterface');
 
@@ -109,6 +109,10 @@ class ConfigEntityMapperTest extends UnitTestCase {
       ->will($this->returnValue('entity_id'));
 
     $entity_type = $this->getMock('Drupal\Core\Config\Entity\ConfigEntityTypeInterface');
+    $entity_type
+      ->expects($this->any())
+      ->method('getConfigPrefix')
+      ->will($this->returnValue('config_prefix'));
     $this->entityManager
       ->expects($this->once())
       ->method('getDefinition')
@@ -118,6 +122,10 @@ class ConfigEntityMapperTest extends UnitTestCase {
     $result = $this->configEntityMapper->setEntity($this->entity);
     $this->assertTrue($result);
 
+    // Ensure that the configuration name was added to the mapper.
+    $plugin_definition = $this->configEntityMapper->getPluginDefinition();
+    $this->assertTrue(in_array('config_prefix.entity_id', $plugin_definition['names']));
+
     // Make sure setEntity() returns FALSE when called a second time.
     $result = $this->configEntityMapper->setEntity($this->entity);
     $this->assertFalse($result);
diff --git a/core/modules/config_translation/tests/src/Unit/ConfigFieldMapperTest.php b/core/modules/config_translation/tests/src/Unit/ConfigFieldMapperTest.php
new file mode 100644
index 000000000..740b7226c
--- /dev/null
+++ b/core/modules/config_translation/tests/src/Unit/ConfigFieldMapperTest.php
@@ -0,0 +1,116 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\config_translation\Unit\ConfigFieldMapperTest.
+ */
+
+namespace Drupal\Tests\config_translation\Unit;
+
+use Drupal\config_translation\ConfigFieldMapper;
+use Drupal\Tests\UnitTestCase;
+
+/**
+ * Tests the functionality provided by the configuration field mapper.
+ *
+ * @group config_translation
+ *
+ * @coversDefaultClass \Drupal\config_translation\ConfigFieldMapper
+ */
+class ConfigFieldMapperTest extends UnitTestCase {
+
+  /**
+   * The configuration field mapper to test.
+   *
+   * @var \Drupal\config_translation\ConfigFieldMapper
+   */
+  protected $configFieldMapper;
+
+  /**
+   * The field config instance used for testing.
+   *
+   * @var \Drupal\field\FieldConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $entity;
+
+  /**
+   * The entity manager used for testing.
+   *
+   * @var \Drupal\Core\Entity\EntityManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $entityManager;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    $this->entityManager = $this->getMock('Drupal\Core\Entity\EntityManagerInterface');
+    $this->entity = $this->getMock('Drupal\field\FieldConfigInterface');
+
+    $definition = array(
+      'class' => '\Drupal\config_translation\ConfigFieldMapper',
+      'base_route_name' => 'entity.field_config.node_field_edit_form',
+      'title' => '!label field',
+      'names' => array(),
+      'entity_type' => 'field_config',
+    );
+
+    $locale_config_manager = $this->getMockBuilder('Drupal\locale\LocaleConfigManager')
+      ->disableOriginalConstructor()
+      ->getMock();
+
+    $this->configFieldMapper = new ConfigFieldMapper(
+      'node_fields',
+      $definition,
+      $this->getConfigFactoryStub(),
+      $this->getMock('Drupal\Core\Config\TypedConfigManagerInterface'),
+      $locale_config_manager,
+      $this->getMock('Drupal\config_translation\ConfigMapperManagerInterface'),
+      $this->getMock('Drupal\Core\Routing\RouteProviderInterface'),
+      $this->getStringTranslationStub(),
+      $this->entityManager,
+      $this->getMock('Drupal\Core\Language\LanguageManagerInterface')
+    );
+  }
+
+  /**
+   * Tests ConfigFieldMapper::setEntity().
+   *
+   * @covers ::setEntity
+   */
+  public function testSetEntity() {
+    $entity_type = $this->getMock('Drupal\Core\Config\Entity\ConfigEntityTypeInterface');
+    $entity_type
+      ->expects($this->any())
+      ->method('getConfigPrefix')
+      ->will($this->returnValue('config_prefix'));
+
+    $this->entityManager
+      ->expects($this->any())
+      ->method('getDefinition')
+      ->will($this->returnValue($entity_type));
+
+    $field_storage = $this->getMock('Drupal\field\FieldStorageConfigInterface');
+    $field_storage
+      ->expects($this->any())
+      ->method('id')
+      ->will($this->returnValue('field_storage_id'));
+
+    $this->entity
+      ->expects($this->any())
+      ->method('getFieldStorageDefinition')
+      ->will($this->returnValue($field_storage));
+
+    $result = $this->configFieldMapper->setEntity($this->entity);
+    $this->assertTrue($result);
+
+    // Ensure that the configuration name was added to the mapper.
+    $plugin_definition = $this->configFieldMapper->getPluginDefinition();
+    $this->assertTrue(in_array('config_prefix.field_storage_id', $plugin_definition['names']));
+
+    // Make sure setEntity() returns FALSE when called a second time.
+    $result = $this->configFieldMapper->setEntity($this->entity);
+    $this->assertFalse($result);
+  }
+
+}
diff --git a/core/modules/contact/config/schema/contact.schema.yml b/core/modules/contact/config/schema/contact.schema.yml
index 5a62e9da3..e8df71aba 100644
--- a/core/modules/contact/config/schema/contact.schema.yml
+++ b/core/modules/contact/config/schema/contact.schema.yml
@@ -43,3 +43,14 @@ contact.settings:
     user_default_enabled:
       type: boolean
       label: 'Personal contact form enabled by default'
+
+migrate.source.d6_contact_settings:
+  type: migrate_source_sql
+  label: 'Drupal 6 contact settings'
+  mapping:
+    variables:
+      type: sequence
+      label: 'Variables'
+      sequence:
+        type: string
+        label: 'Variable'
diff --git a/core/modules/contact/contact.module b/core/modules/contact/contact.module
index 5d4c26bc4..1f479f2bd 100644
--- a/core/modules/contact/contact.module
+++ b/core/modules/contact/contact.module
@@ -143,7 +143,7 @@ function contact_mail($key, &$message, $params) {
       $message['subject'] .= t('[!form] !subject', $variables, $options);
       $message['body'][] = t("!sender-name (!sender-url) sent a message using the contact form at !form-url.", $variables, $options);
       $build = entity_view($contact_message, 'mail', $language->getId());
-      $message['body'][] = \Drupal::service('renderer')->renderPlain($build);
+      $message['body'][] = (string) \Drupal::service('renderer')->renderPlain($build);
       break;
 
     case 'page_autoreply':
@@ -162,7 +162,7 @@ function contact_mail($key, &$message, $params) {
       $message['body'][] = t("!sender-name (!sender-url) has sent you a message via your contact form at !site-name.", $variables, $options);
       $message['body'][] = t("If you don't want to receive such emails, you can change your settings at !recipient-edit-url.", $variables, $options);
       $build = entity_view($contact_message, 'mail', $language->getId());
-      $message['body'][] = \Drupal::service('renderer')->renderPlain($build);
+      $message['body'][] = (string) \Drupal::service('renderer')->renderPlain($build);
       break;
   }
 }
diff --git a/core/modules/contact/contact.routing.yml b/core/modules/contact/contact.routing.yml
index 2608a377f..d81bb9fc2 100644
--- a/core/modules/contact/contact.routing.yml
+++ b/core/modules/contact/contact.routing.yml
@@ -39,7 +39,7 @@ contact.site_page:
   requirements:
     _permission: 'access site-wide contact form'
 
-contact.site_page_form:
+entity.contact_form.canonical:
   path: '/contact/{contact_form}'
   defaults:
     _title: 'Contact'
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_contact_category.yml b/core/modules/contact/migration_templates/d6_contact_category.yml
similarity index 87%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_contact_category.yml
rename to core/modules/contact/migration_templates/d6_contact_category.yml
index cab9f3be1..d50e4fe75 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_contact_category.yml
+++ b/core/modules/contact/migration_templates/d6_contact_category.yml
@@ -20,7 +20,3 @@ process:
   weight: weight
 destination:
   plugin: entity:contact_form
-dependencies:
-  module:
-    - contact
-    - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_contact_settings.yml b/core/modules/contact/migration_templates/d6_contact_settings.yml
similarity index 82%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_contact_settings.yml
rename to core/modules/contact/migration_templates/d6_contact_settings.yml
index d0e4a3da8..e0897feec 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_contact_settings.yml
+++ b/core/modules/contact/migration_templates/d6_contact_settings.yml
@@ -20,9 +20,3 @@ destination:
 migration_dependencies:
   required:
     - d6_contact_category
-dependencies:
-  config:
-    - migrate.migration.d6_contact_category
-  module:
-    - contact
-    - migrate_drupal
diff --git a/core/modules/contact/src/ContactFormEditForm.php b/core/modules/contact/src/ContactFormEditForm.php
index 3300c593b..c545b0e53 100644
--- a/core/modules/contact/src/ContactFormEditForm.php
+++ b/core/modules/contact/src/ContactFormEditForm.php
@@ -112,8 +112,8 @@ class ContactFormEditForm extends EntityForm implements ContainerInjectionInterf
   /**
    * {@inheritdoc}
    */
-  public function validate(array $form, FormStateInterface $form_state) {
-    parent::validate($form, $form_state);
+  public function validateForm(array &$form, FormStateInterface $form_state) {
+    parent::validateForm($form, $form_state);
 
     // Validate and each email recipient.
     $recipients = explode(',', $form_state->getValue('recipients'));
diff --git a/core/modules/contact/src/ContactFormListBuilder.php b/core/modules/contact/src/ContactFormListBuilder.php
index fd4727f63..5a2b6b0fa 100644
--- a/core/modules/contact/src/ContactFormListBuilder.php
+++ b/core/modules/contact/src/ContactFormListBuilder.php
@@ -10,6 +10,7 @@ namespace Drupal\contact;
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Config\Entity\ConfigEntityListBuilder;
 use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Link;
 
 /**
  * Defines a class to build a listing of contact form entities.
@@ -32,13 +33,14 @@ class ContactFormListBuilder extends ConfigEntityListBuilder {
    * {@inheritdoc}
    */
   public function buildRow(EntityInterface $entity) {
-    $row['form'] = $this->getLabel($entity);
     // Special case the personal form.
     if ($entity->id() == 'personal') {
+      $row['form'] = $this->getLabel($entity);
       $row['recipients'] = t('Selected user');
       $row['selected'] = t('No');
     }
     else {
+      $row['form'] = $entity->link(NULL, 'canonical');
       $row['recipients'] = SafeMarkup::checkPlain(implode(', ', $entity->getRecipients()));
       $default_form = \Drupal::config('contact.settings')->get('default_form');
       $row['selected'] = ($default_form == $entity->id() ? t('Yes') : t('No'));
diff --git a/core/modules/contact/src/Entity/ContactForm.php b/core/modules/contact/src/Entity/ContactForm.php
index 0967c907e..1a9f73a81 100644
--- a/core/modules/contact/src/Entity/ContactForm.php
+++ b/core/modules/contact/src/Entity/ContactForm.php
@@ -36,6 +36,7 @@ use Drupal\contact\ContactFormInterface;
  *     "delete-form" = "/admin/structure/contact/manage/{contact_form}/delete",
  *     "edit-form" = "/admin/structure/contact/manage/{contact_form}",
  *     "collection" = "/admin/structure/contact",
+ *     "canonical" = "/contact/{contact_form}",
  *   },
  *   config_export = {
  *     "id",
diff --git a/core/modules/contact/src/MessageForm.php b/core/modules/contact/src/MessageForm.php
index 78de6ddc5..adad13102 100644
--- a/core/modules/contact/src/MessageForm.php
+++ b/core/modules/contact/src/MessageForm.php
@@ -168,8 +168,8 @@ class MessageForm extends ContentEntityForm {
     $elements = parent::actions($form, $form_state);
     $elements['submit']['#value'] = $this->t('Send message');
     $elements['preview'] = array(
+      '#type' => 'submit',
       '#value' => $this->t('Preview'),
-      '#validate' => array('::validate'),
       '#submit' => array('::submitForm', '::preview'),
     );
     return $elements;
@@ -187,10 +187,8 @@ class MessageForm extends ContentEntityForm {
   /**
    * {@inheritdoc}
    */
-  public function validate(array $form, FormStateInterface $form_state) {
-    parent::validate($form, $form_state);
-
-    $message = $this->entity;
+  public function validateForm(array &$form, FormStateInterface $form_state) {
+    $message = parent::validateForm($form, $form_state);
 
     // Check if flood control has been activated for sending emails.
     if (!$this->currentUser()->hasPermission('administer contact forms') && (!$message->isPersonal() || !$this->currentUser()->hasPermission('administer users'))) {
@@ -204,6 +202,8 @@ class MessageForm extends ContentEntityForm {
         )));
       }
     }
+
+    return $message;
   }
 
   /**
@@ -231,20 +231,4 @@ class MessageForm extends ContentEntityForm {
     $message->save();
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  protected function init(FormStateInterface $form_state) {
-    $message = $this->entity;
-
-    // Make the message inherit the current content language unless specifically
-    // set.
-    if ($message->isNew() && !$message->langcode->value) {
-      $language_content = $this->languageManager->getCurrentLanguage(LanguageInterface::TYPE_CONTENT);
-      $message->langcode->value = $language_content->getId();
-    }
-
-    parent::init($form_state);
-  }
-
 }
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/ContactCategory.php b/core/modules/contact/src/Plugin/migrate/source/d6/ContactCategory.php
similarity index 91%
rename from core/modules/migrate_drupal/src/Plugin/migrate/source/d6/ContactCategory.php
rename to core/modules/contact/src/Plugin/migrate/source/d6/ContactCategory.php
index 97ecdc3d0..153b597f0 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/ContactCategory.php
+++ b/core/modules/contact/src/Plugin/migrate/source/d6/ContactCategory.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\ContactCategory.
+ * Contains \Drupal\contact\Plugin\migrate\source\d6\ContactCategory.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+namespace Drupal\contact\Plugin\migrate\source\d6;
 
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 use Drupal\migrate\Row;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/ContactSettings.php b/core/modules/contact/src/Plugin/migrate/source/d6/ContactSettings.php
similarity index 80%
rename from core/modules/migrate_drupal/src/Plugin/migrate/source/d6/ContactSettings.php
rename to core/modules/contact/src/Plugin/migrate/source/d6/ContactSettings.php
index 6bcfd7ac8..48e7a5e5c 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/ContactSettings.php
+++ b/core/modules/contact/src/Plugin/migrate/source/d6/ContactSettings.php
@@ -2,10 +2,11 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\ContactSettings.
+ * Contains \Drupal\contact\Plugin\migrate\source\d6\ContactSettings.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+namespace Drupal\contact\Plugin\migrate\source\d6;
+
 use Drupal\migrate_drupal\Plugin\migrate\source\Variable;
 
 /**
diff --git a/core/modules/contact/src/Tests/ContactSitewideTest.php b/core/modules/contact/src/Tests/ContactSitewideTest.php
index c815d35ae..87d693a38 100644
--- a/core/modules/contact/src/Tests/ContactSitewideTest.php
+++ b/core/modules/contact/src/Tests/ContactSitewideTest.php
@@ -250,10 +250,17 @@ class ContactSitewideTest extends WebTestBase {
     // Test field UI and field integration.
     $this->drupalGet('admin/structure/contact');
 
+    $view_link = $this->xpath('//table/tbody/tr/td/a[contains(@href, :href) and text()=:text]', [
+      ':href' => \Drupal::url('entity.contact_form.canonical', ['contact_form' => $contact_form]),
+      ':text' => $label,
+      ]
+    );
+    $this->assertTrue(!empty($view_link), 'Contact listing links to contact form.');
+
     // Find out in which row the form we want to add a field to is.
     $i = 0;
     foreach($this->xpath('//table/tbody/tr') as $row) {
-      if (((string)$row->td[0]) == $label) {
+      if (((string) $row->td[0]->a) == $label) {
         break;
       }
       $i++;
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateContactCategoryTest.php b/core/modules/contact/src/Tests/Migrate/d6/MigrateContactCategoryTest.php
similarity index 77%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateContactCategoryTest.php
rename to core/modules/contact/src/Tests/Migrate/d6/MigrateContactCategoryTest.php
index dd01a6c52..459b515c1 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateContactCategoryTest.php
+++ b/core/modules/contact/src/Tests/Migrate/d6/MigrateContactCategoryTest.php
@@ -2,20 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateContactCategoryTest.
+ * Contains \Drupal\contact\Tests\Migrate\d6\MigrateContactCategoryTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\contact\Tests\Migrate\d6;
 
 use Drupal\contact\Entity\ContactForm;
-use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate\MigrateMessage;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Migrate contact categories to contact.form.*.yml.
  *
- * @group migrate_drupal
+ * @group contact
  */
 class MigrateContactCategoryTest extends MigrateDrupal6TestBase {
 
@@ -31,13 +29,8 @@ class MigrateContactCategoryTest extends MigrateDrupal6TestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $migration = entity_load('migration', 'd6_contact_category');
-    $dumps = array(
-      $this->getDumpDirectory() . '/Contact.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, new MigrateMessage());
-    $executable->import();
+    $this->loadDumps(['Contact.php']);
+    $this->executeMigration('d6_contact_category');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateContactConfigsTest.php b/core/modules/contact/src/Tests/Migrate/d6/MigrateContactConfigsTest.php
similarity index 69%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateContactConfigsTest.php
rename to core/modules/contact/src/Tests/Migrate/d6/MigrateContactConfigsTest.php
index 1b4874427..99eb40560 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateContactConfigsTest.php
+++ b/core/modules/contact/src/Tests/Migrate/d6/MigrateContactConfigsTest.php
@@ -2,20 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateContactConfigsTest.
+ * Contains \Drupal\contact\Tests\Migrate\d6\MigrateContactConfigsTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\contact\Tests\Migrate\d6;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate\MigrateMessage;
-use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to contact.settings.yml.
  *
- * @group migrate_drupal
+ * @group contact
  */
 class MigrateContactConfigsTest extends MigrateDrupal6TestBase {
 
@@ -41,14 +39,8 @@ class MigrateContactConfigsTest extends MigrateDrupal6TestBase {
       ),
     );
     $this->prepareMigrations($id_mappings);
-    $migration = entity_load('migration', 'd6_contact_settings');
-    $dumps = array(
-      $this->getDumpDirectory() . '/Variable.php',
-      $this->getDumpDirectory() . '/Contact.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, new MigrateMessage());
-    $executable->import();
+    $this->loadDumps(['Variable.php', 'Contact.php']);
+    $this->executeMigration('d6_contact_settings');
   }
 
   /**
diff --git a/core/modules/contact/src/Tests/Views/ContactLinkTest.php b/core/modules/contact/src/Tests/Views/ContactLinkTest.php
index 4c82d1878..cb137d3fb 100644
--- a/core/modules/contact/src/Tests/Views/ContactLinkTest.php
+++ b/core/modules/contact/src/Tests/Views/ContactLinkTest.php
@@ -86,7 +86,7 @@ class ContactLinkTest extends ViewTestBase {
     // Disable contact link for no_contact.
     $this->userData->set('contact', $no_contact_account->id(), 'enabled', FALSE);
     // @todo Remove cache invalidation in https://www.drupal.org/node/2477903.
-    Cache::invalidateTags($no_contact_account->getCacheTags());
+    Cache::invalidateTags($no_contact_account->getCacheTagsToInvalidate());
     $this->drupalGet('test-contact-link');
     $this->assertContactLinks($accounts, array('root', 'admin'));
   }
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/ContactCategoryTest.php b/core/modules/contact/tests/src/Unit/Plugin/migrate/source/d6/ContactCategoryTest.php
similarity index 82%
rename from core/modules/migrate_drupal/tests/src/Unit/source/d6/ContactCategoryTest.php
rename to core/modules/contact/tests/src/Unit/Plugin/migrate/source/d6/ContactCategoryTest.php
index a3c40552f..0a77e644e 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/ContactCategoryTest.php
+++ b/core/modules/contact/tests/src/Unit/Plugin/migrate/source/d6/ContactCategoryTest.php
@@ -2,21 +2,21 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\ContactCategoryTest.
+ * Contains \Drupal\Tests\contact\Unit\Plugin\migrate\source\d6\ContactCategoryTest.
  */
 
-namespace Drupal\Tests\migrate_drupal\Unit\source\d6;
+namespace Drupal\Tests\contact\Unit\Plugin\migrate\source\d6;
 
 use Drupal\Tests\migrate\Unit\MigrateSqlSourceTestCase;
 
 /**
  * Tests D6 contact category source plugin.
  *
- * @group migrate_drupal
+ * @group contact
  */
 class ContactCategoryTest extends MigrateSqlSourceTestCase {
 
-  const PLUGIN_CLASS = 'Drupal\migrate_drupal\Plugin\migrate\source\d6\ContactCategory';
+  const PLUGIN_CLASS = 'Drupal\contact\Plugin\migrate\source\d6\ContactCategory';
 
   protected $migrationConfiguration = array(
     'id' => 'test',
diff --git a/core/modules/content_translation/content_translation.module b/core/modules/content_translation/content_translation.module
index 3b29ecc99..da027710f 100644
--- a/core/modules/content_translation/content_translation.module
+++ b/core/modules/content_translation/content_translation.module
@@ -13,6 +13,7 @@ use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Core\StringTranslation\TranslationWrapper;
 
 /**
  * Implements hook_help().
@@ -251,8 +252,8 @@ function content_translation_views_data_alter(array &$data) {
  */
 function content_translation_menu_links_discovered_alter(array &$links) {
   // Clarify where translation settings are located.
-  $links['language.content_settings_page']['title'] = 'Content language and translation';
-  $links['language.content_settings_page']['description'] = 'Configure language and translation support for content.';
+  $links['language.content_settings_page']['title'] = new TranslationWrapper('Content language and translation');
+  $links['language.content_settings_page']['description'] = new TranslationWrapper('Configure language and translation support for content.');
 }
 
 /**
@@ -466,7 +467,6 @@ function content_translation_language_configuration_element_process(array $eleme
       // default to no translatability.
       '#default_value' => $context['bundle'] ? \Drupal::service('content_translation.manager')->isEnabled($context['entity_type'], $context['bundle']) : FALSE,
       '#element_validate' => array('content_translation_language_configuration_element_validate'),
-      '#prefix' => '<label>' . t('Translation') . '</label>',
     );
 
     $submit_name = isset($form['actions']['save_continue']) ? 'save_continue' : 'submit';
diff --git a/core/modules/content_translation/src/ContentTranslationHandler.php b/core/modules/content_translation/src/ContentTranslationHandler.php
index 28529eb0b..10cf5f3b8 100644
--- a/core/modules/content_translation/src/ContentTranslationHandler.php
+++ b/core/modules/content_translation/src/ContentTranslationHandler.php
@@ -473,9 +473,7 @@ class ContentTranslationHandler implements ContentTranslationHandlerInterface, E
     $form['#entity_builders'][] = array($this, 'entityFormEntityBuild');
 
     // Handle entity validation.
-    if (isset($form['actions']['submit'])) {
-      $form['actions']['submit']['#validate'][] = array($this, 'entityFormValidate');
-    }
+    $form['#validate'][] = array($this, 'entityFormValidate');
 
     // Handle entity deletion.
     if (isset($form['actions']['delete'])) {
diff --git a/core/modules/content_translation/src/Controller/ContentTranslationController.php b/core/modules/content_translation/src/Controller/ContentTranslationController.php
index ec884b120..9c6879ac9 100644
--- a/core/modules/content_translation/src/Controller/ContentTranslationController.php
+++ b/core/modules/content_translation/src/Controller/ContentTranslationController.php
@@ -8,6 +8,7 @@
 namespace Drupal\content_translation\Controller;
 
 use Drupal\content_translation\ContentTranslationManagerInterface;
+use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\Core\Language\LanguageInterface;
@@ -92,6 +93,10 @@ class ContentTranslationController extends ControllerBase {
     $manager = $this->manager;
     $entity_type = $entity->getEntityType();
 
+    // Start collecting the cacheability metadata, starting with the entity and
+    // later merge in the access result cacheability metadata.
+    $cacheability = CacheableMetadata::createFromObject($entity);
+
     $languages = $this->languageManager()->getLanguages();
     $original = $entity->getUntranslated()->language()->getId();
     $translations = $entity->getTranslationLanguages();
@@ -180,11 +185,16 @@ class ContentTranslationController extends ControllerBase {
           // If the user is allowed to edit the entity we point the edit link to
           // the entity form, otherwise if we are not dealing with the original
           // language we point the link to the translation form.
-          if ($entity->access('update') && $entity_type->hasLinkTemplate('edit-form')) {
+          $update_access = $entity->access('update', NULL, TRUE);
+          $translation_access = $handler->getTranslationAccess($entity, 'update');
+          $cacheability = $cacheability
+            ->merge(CacheableMetadata::createFromObject($update_access))
+            ->merge(CacheableMetadata::createFromObject($translation_access));
+          if ($update_access->isAllowed() && $entity_type->hasLinkTemplate('edit-form')) {
             $links['edit']['url'] = $entity->urlInfo('edit-form');
             $links['edit']['language'] = $language;
           }
-          elseif (!$is_original && $handler->getTranslationAccess($entity, 'update')->isAllowed()) {
+          elseif (!$is_original && $translation_access->isAllowed()) {
             $links['edit']['url'] = $edit_url;
           }
 
@@ -206,6 +216,11 @@ class ContentTranslationController extends ControllerBase {
           }
           else {
             $source_name = isset($languages[$source]) ? $languages[$source]->getName() : $this->t('n/a');
+            $delete_access = $entity->access('delete', NULL, TRUE);
+            $translation_access = $handler->getTranslationAccess($entity, 'delete');
+            $cacheability = $cacheability
+              ->merge(CacheableMetadata::createFromObject($delete_access))
+              ->merge(CacheableMetadata::createFromObject($translation_access));
             if ($entity->access('delete') && $entity_type->hasLinkTemplate('delete-form')) {
               $links['delete'] = array(
                 'title' => $this->t('Delete'),
@@ -213,7 +228,7 @@ class ContentTranslationController extends ControllerBase {
                 'language' => $language,
               );
             }
-            elseif ($handler->getTranslationAccess($entity, 'delete')->isAllowed()) {
+            elseif ($translation_access->isAllowed()) {
               $links['delete'] = array(
                 'title' => $this->t('Delete'),
                 'url' => $delete_url,
@@ -226,7 +241,10 @@ class ContentTranslationController extends ControllerBase {
           $row_title = $source_name = $this->t('n/a');
           $source = $entity->language()->getId();
 
-          if ($source != $langcode && $handler->getTranslationAccess($entity, 'create')->isAllowed()) {
+          $create_translation_access = $handler->getTranslationAccess($entity, 'create');
+          $cacheability = $cacheability
+            ->merge(CacheableMetadata::createFromObject($create_translation_access));
+          if ($source != $langcode && $create_translation_access->isAllowed()) {
             if ($translatable) {
               $links['add'] = array(
                 'title' => $this->t('Add'),
@@ -284,6 +302,9 @@ class ContentTranslationController extends ControllerBase {
     // Add metadata to the build render array to let other modules know about
     // which entity this is.
     $build['#entity'] = $entity;
+    $cacheability
+      ->addCacheTags($entity->getCacheTags())
+      ->applyTo($build);
 
     $build['content_translation_overview'] = array(
       '#theme' => 'table',
diff --git a/core/modules/content_translation/src/Tests/ContentTranslationSettingsTest.php b/core/modules/content_translation/src/Tests/ContentTranslationSettingsTest.php
index 4d51eb5c8..c928bacc5 100644
--- a/core/modules/content_translation/src/Tests/ContentTranslationSettingsTest.php
+++ b/core/modules/content_translation/src/Tests/ContentTranslationSettingsTest.php
@@ -231,7 +231,7 @@ class ContentTranslationSettingsTest extends WebTestBase {
    * @param array $edit
    *   An array of values to submit to the content translation settings page.
    *
-   * @return boolean
+   * @return bool
    *   TRUE if the assertion succeeded, FALSE otherwise.
    */
   protected function assertSettings($entity_type, $bundle, $enabled, $edit) {
diff --git a/core/modules/content_translation/src/Tests/ContentTranslationUITestBase.php b/core/modules/content_translation/src/Tests/ContentTranslationUITestBase.php
index e5243594c..5faa85cf6 100644
--- a/core/modules/content_translation/src/Tests/ContentTranslationUITestBase.php
+++ b/core/modules/content_translation/src/Tests/ContentTranslationUITestBase.php
@@ -7,18 +7,22 @@
 
 namespace Drupal\content_translation\Tests;
 
+use Drupal\Core\Cache\Cache;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Language\Language;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\Core\Url;
 use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\Component\Utility\SafeMarkup;
+use Drupal\system\Tests\Cache\AssertPageCacheContextsAndTagsTrait;
 
 /**
  * Tests the Content Translation UI.
  */
 abstract class ContentTranslationUITestBase extends ContentTranslationTestBase {
 
+  use AssertPageCacheContextsAndTagsTrait;
+
   /**
    * The id of the entity being translated.
    *
@@ -33,6 +37,15 @@ abstract class ContentTranslationUITestBase extends ContentTranslationTestBase {
    */
   protected $testLanguageSelector = TRUE;
 
+  /**
+   * Default cache contexts expected on a non-translated entity.
+   *
+   * Cache contexts will not be checked if this list is empty.
+   *
+   * @var string[]
+   */
+  protected $defaultCacheContexts = ['languages:language_interface', 'theme', 'user.permissions'];
+
   /**
    * Tests the basic translation UI.
    */
@@ -64,6 +77,11 @@ abstract class ContentTranslationUITestBase extends ContentTranslationTestBase {
     $this->assertTrue($entity, 'Entity found in the database.');
     $this->drupalGet($entity->urlInfo());
     $this->assertResponse(200, 'Entity URL is valid.');
+
+    // Ensure that the content language cache context is not yet added to the
+    // page.
+    $this->assertCacheContexts($this->defaultCacheContexts);
+
     $this->drupalGet($entity->urlInfo('drupal:content-translation-overview'));
     $this->assertNoText('Source language', 'Source language column correctly hidden.');
 
@@ -87,9 +105,14 @@ abstract class ContentTranslationUITestBase extends ContentTranslationTestBase {
     ], array('language' => $language));
     $this->drupalPostForm($add_url, $this->getEditValues($values, $langcode), $this->getFormSubmitActionForNewTranslation($entity, $langcode));
 
-    // Get the entity and reset its cache, so that the new translation gets the
-    // updated values.
+    // Ensure that the content language cache context is not yet added to the
+    // page.
     $entity = entity_load($this->entityTypeId, $this->entityId, TRUE);
+    $this->drupalGet($entity->urlInfo());
+    $this->assertCacheContexts(Cache::mergeContexts(['languages:language_content'], $this->defaultCacheContexts));
+
+    // Reset the cache of the entity, so that the new translation gets the
+    // updated values.
     $metadata_source_translation = $this->manager->getTranslationMetadata($entity->getTranslation($default_langcode));
     $metadata_target_translation = $this->manager->getTranslationMetadata($entity->getTranslation($langcode));
 
diff --git a/core/modules/content_translation/src/Tests/ContentTranslationWorkflowsTest.php b/core/modules/content_translation/src/Tests/ContentTranslationWorkflowsTest.php
index 3de797ec5..223bb8193 100644
--- a/core/modules/content_translation/src/Tests/ContentTranslationWorkflowsTest.php
+++ b/core/modules/content_translation/src/Tests/ContentTranslationWorkflowsTest.php
@@ -113,6 +113,13 @@ class ContentTranslationWorkflowsTest extends ContentTranslationTestBase {
       $this->drupalLogin($user);
       $this->drupalGet($translations_url);
 
+      // Make sure that the user.permissions cache context and the cache tags
+      // for the entity are present.
+      $this->assertCacheContext('user.permissions');
+      foreach ($this->entity->getCacheTags() as $cache_tag) {
+        $this->assertCacheTag($cache_tag);
+      }
+
       foreach ($ops as $op => $label) {
         if ($op != $current_op) {
           $this->assertNoLink($label, format_string('No %op link found.', array('%op' => $label)));
diff --git a/core/modules/content_translation/tests/src/Unit/Access/ContentTranslationManageAccessCheckTest.php b/core/modules/content_translation/tests/src/Unit/Access/ContentTranslationManageAccessCheckTest.php
index 512e73544..6c95f7eb9 100644
--- a/core/modules/content_translation/tests/src/Unit/Access/ContentTranslationManageAccessCheckTest.php
+++ b/core/modules/content_translation/tests/src/Unit/Access/ContentTranslationManageAccessCheckTest.php
@@ -9,6 +9,7 @@ namespace Drupal\Tests\content_translation\Unit\Access;
 
 use Drupal\content_translation\Access\ContentTranslationManageAccessCheck;
 use Drupal\Core\Access\AccessResult;
+use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\Language\Language;
 use Drupal\Tests\UnitTestCase;
 use Symfony\Component\Routing\Route;
@@ -22,6 +23,28 @@ use Symfony\Component\Routing\Route;
  */
 class ContentTranslationManageAccessCheckTest extends UnitTestCase {
 
+  /**
+   * The cache contexts manager.
+   *
+   * @var \Drupal\Core\Cache\Context\CacheContextsManager|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $cacheContextsManager;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->cacheContextsManager = $this->getMockBuilder('Drupal\Core\Cache\Context\CacheContextsManager')
+      ->disableOriginalConstructor()
+      ->getMock();
+
+    $container = new ContainerBuilder();
+    $container->set('cache_contexts_manager', $this->cacheContextsManager);
+    \Drupal::setContainer($container);
+  }
+
   /**
    * Tests the create access method.
    *
@@ -76,6 +99,9 @@ class ContentTranslationManageAccessCheckTest extends UnitTestCase {
     $entity->expects($this->once())
       ->method('getCacheTags')
       ->will($this->returnValue(array('node:1337')));
+    $entity->expects($this->once())
+      ->method('getCacheContexts')
+      ->willReturn(array());
 
     // Set the route requirements.
     $route = new Route('test_route');
diff --git a/core/modules/contextual/css/contextual.theme.css b/core/modules/contextual/css/contextual.theme.css
index 92e9b745c..065065d11 100644
--- a/core/modules/contextual/css/contextual.theme.css
+++ b/core/modules/contextual/css/contextual.theme.css
@@ -107,7 +107,6 @@
   text-decoration: none;
 }
 .no-touch .contextual-region .contextual .contextual-links li a:hover {
-  color: white;
-  background-image: -webkit-linear-gradient(rgb(78,159,234) 0%, rgb(65,126,210) 100%);
-  background-image: linear-gradient(rgb(78,159,234) 0%,rgb(65,126,210) 100%);
+  color: #000;
+  background: #f7fcff;
 }
diff --git a/core/modules/contextual/js/toolbar/models/StateModel.js b/core/modules/contextual/js/toolbar/models/StateModel.js
index 0c261c5d0..691eaab7c 100644
--- a/core/modules/contextual/js/toolbar/models/StateModel.js
+++ b/core/modules/contextual/js/toolbar/models/StateModel.js
@@ -66,20 +66,17 @@
      */
     initialize: function (attrs, options) {
       // Respond to new/removed contextual links.
-      this.listenTo(options.contextualCollection, {
-        'reset remove add': this.countContextualLinks,
-        'add': this.lockNewContextualLinks
-      });
+      this.listenTo(options.contextualCollection, 'reset remove add', this.countContextualLinks);
+      this.listenTo(options.contextualCollection, 'add', this.lockNewContextualLinks);
 
-      this.listenTo(this, {
-        // Automatically determine visibility.
-        'change:contextualCount': this.updateVisibility,
-        // Whenever edit mode is toggled, lock all contextual links.
-        'change:isViewing': function (model, isViewing) {
-          options.contextualCollection.each(function (contextualModel) {
-            contextualModel.set('isLocked', !isViewing);
-          });
-        }
+      // Automatically determine visibility.
+      this.listenTo(this, 'change:contextualCount', this.updateVisibility);
+
+      // Whenever edit mode is toggled, lock all contextual links.
+      this.listenTo(this, 'change:isViewing', function (model, isViewing) {
+        options.contextualCollection.each(function (contextualModel) {
+          contextualModel.set('isLocked', !isViewing);
+        });
       });
     },
 
diff --git a/core/modules/contextual/src/ContextualController.php b/core/modules/contextual/src/ContextualController.php
index 975113dc9..ca248d196 100644
--- a/core/modules/contextual/src/ContextualController.php
+++ b/core/modules/contextual/src/ContextualController.php
@@ -44,7 +44,7 @@ class ContextualController implements ContainerAwareInterface {
         '#type' => 'contextual_links',
         '#contextual_links' => _contextual_id_to_links($id),
       );
-      $rendered[$id] = $this->container->get('renderer')->renderRoot($element);
+      $rendered[$id] = (string) $this->container->get('renderer')->renderRoot($element);
     }
 
     return new JsonResponse($rendered);
diff --git a/core/modules/contextual/src/Tests/ContextualDynamicContextTest.php b/core/modules/contextual/src/Tests/ContextualDynamicContextTest.php
index 8846ab935..b8ed11c37 100644
--- a/core/modules/contextual/src/Tests/ContextualDynamicContextTest.php
+++ b/core/modules/contextual/src/Tests/ContextualDynamicContextTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\contextual\Tests;
 
 use Drupal\Component\Serialization\Json;
+use Drupal\Core\Url;
 use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\simpletest\WebTestBase;
 use Drupal\Core\Template\Attribute;
@@ -46,7 +47,7 @@ class ContextualDynamicContextTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('contextual', 'node', 'views', 'views_ui', 'language');
+  public static $modules = array('contextual', 'node', 'views', 'views_ui', 'language', 'menu_test');
 
   protected function setUp() {
     parent::setUp();
@@ -137,6 +138,11 @@ class ContextualDynamicContextTest extends WebTestBase {
     $id = 'node:node=' . $node3->id() . ':changed=' . $node3->getChangedTime() . '&langcode=it';
     $this->drupalGet('node', ['language' => ConfigurableLanguage::createFromLangcode('it')]);
     $this->assertContextualLinkPlaceHolder($id);
+
+    // Get a page where contextual links are directly rendered.
+    $this->drupalGet(Url::fromRoute('menu_test.contextual_test'));
+    $this->assertEscaped("<script>alert('Welcome to the jungle!')</script>");
+    $this->assertLink('Edit menu - contextual');
   }
 
   /**
diff --git a/core/modules/datetime/datetime.views.inc b/core/modules/datetime/datetime.views.inc
new file mode 100644
index 000000000..c12a3aca4
--- /dev/null
+++ b/core/modules/datetime/datetime.views.inc
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * @file
+ * Provides views data for the datetime module.
+ */
+
+use Drupal\field\FieldStorageConfigInterface;
+
+/**
+ * Implements hook_field_views_data().
+ */
+function datetime_field_views_data(FieldStorageConfigInterface $field_storage) {
+  // @todo This code only covers configurable fields, handle base table fields
+  //   in https://www.drupal.org/node/2489476.
+  $data = views_field_default_views_data($field_storage);
+  foreach ($data as $table_name => $table_data) {
+    // Set the 'datetime' filter type.
+    $data[$table_name][$field_storage->getName() . '_value']['filter']['id'] = 'datetime';
+
+    // Set the 'datetime' argument type.
+    $data[$table_name][$field_storage->getName() . '_value']['argument']['id'] = 'datetime';
+
+    // Create year, month, and day arguments.
+    $group = $data[$table_name][$field_storage->getName() . '_value']['group'];
+    $arguments = [
+      // Argument type => help text.
+      'year' => t('Date in the form of YYYY.'),
+      'month' => t('Date in the form of MM.'),
+      'day' => t('Date in the form of DD.'),
+    ];
+    foreach ($arguments as $argument_type => $help_text) {
+      $data[$table_name][$field_storage->getName() . '_value_' . $argument_type] = [
+        'title' => $field_storage->getLabel() . ' (' . $argument_type . ')',
+        'help' => $help_text,
+        'argument' => [
+          'field' => $field_storage->getName() . '_value',
+          'id' => 'datetime_' . $argument_type,
+        ],
+        'group' => $group,
+      ];
+    }
+
+    // Set the 'datetime' sort handler.
+    $data[$table_name][$field_storage->getName() . '_value']['sort']['id'] = 'datetime';
+  }
+
+  return $data;
+}
diff --git a/core/modules/datetime/src/Plugin/views/argument/Date.php b/core/modules/datetime/src/Plugin/views/argument/Date.php
new file mode 100644
index 000000000..7bd5cdf33
--- /dev/null
+++ b/core/modules/datetime/src/Plugin/views/argument/Date.php
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\datetime\Plugin\views\Argument\Date.
+ */
+
+namespace Drupal\datetime\Plugin\views\Argument;
+
+use Drupal\views\Plugin\views\argument\Date as NumericDate;
+
+/**
+ * Abstract argument handler for dates.
+ *
+ * Adds an option to set a default argument based on the current date.
+ *
+ * Definitions terms:
+ * - many to one: If true, the "many to one" helper will be used.
+ * - invalid input: A string to give to the user for obviously invalid input.
+ *                  This is deprecated in favor of argument validators.
+ *
+ * @see \Drupal\views\ManyTonOneHelper
+ *
+ * @ingroup views_argument_handlers
+ *
+ * @ViewsArgument("datetime")
+ */
+class Date extends NumericDate {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getDateField() {
+    // Return the real field, since it is already in string format.
+    return "$this->tableAlias.$this->realField";
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getDateFormat($format) {
+    // Pass in the string-field option.
+    return $this->query->getDateFormat($this->getDateField(), $format, TRUE);
+  }
+}
diff --git a/core/modules/datetime/src/Plugin/views/argument/DayDate.php b/core/modules/datetime/src/Plugin/views/argument/DayDate.php
new file mode 100644
index 000000000..f100db044
--- /dev/null
+++ b/core/modules/datetime/src/Plugin/views/argument/DayDate.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\datetime\Plugin\views\argument\DayDate.
+ */
+
+namespace Drupal\datetime\Plugin\views\argument;
+
+/**
+ * Argument handler for a day.
+ *
+ * @ViewsArgument("datetime_day")
+ */
+class DayDate extends Date {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $argFormat = 'd';
+
+}
diff --git a/core/modules/datetime/src/Plugin/views/argument/MonthDate.php b/core/modules/datetime/src/Plugin/views/argument/MonthDate.php
new file mode 100644
index 000000000..2aac64daf
--- /dev/null
+++ b/core/modules/datetime/src/Plugin/views/argument/MonthDate.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\datetime\Plugin\views\argument\MonthDate.
+ */
+
+namespace Drupal\datetime\Plugin\views\argument;
+
+/**
+ * Argument handler for a month.
+ *
+ * @ViewsArgument("datetime_month")
+ */
+class MonthDate extends Date {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $argFormat = 'm';
+
+}
diff --git a/core/modules/datetime/src/Plugin/views/argument/YearDate.php b/core/modules/datetime/src/Plugin/views/argument/YearDate.php
new file mode 100644
index 000000000..c34dde33b
--- /dev/null
+++ b/core/modules/datetime/src/Plugin/views/argument/YearDate.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\datetime\Plugin\views\argument\YearDate.
+ */
+
+namespace Drupal\datetime\Plugin\views\argument;
+
+/**
+ * Argument handler for a year.
+ *
+ * @ViewsArgument("datetime_year")
+ */
+class YearDate extends Date {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $argFormat = 'Y';
+
+}
diff --git a/core/modules/datetime/src/Plugin/views/filter/Date.php b/core/modules/datetime/src/Plugin/views/filter/Date.php
new file mode 100644
index 000000000..cc3caf716
--- /dev/null
+++ b/core/modules/datetime/src/Plugin/views/filter/Date.php
@@ -0,0 +1,131 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\datetime\Plugin\views\filter\Date.
+ */
+
+namespace Drupal\datetime\Plugin\views\filter;
+
+use Drupal\Core\Datetime\DateFormatter;
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Drupal\datetime\Plugin\Field\FieldType\DateTimeItem;
+use Drupal\views\FieldAPIHandlerTrait;
+use Drupal\views\Plugin\views\filter\Date as NumericDate;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
+
+/**
+ * Date/time views filter.
+ *
+ * Even thought dates are stored as strings, the numeric filter is extended
+ * because it provides more sensible operators.
+ *
+ * @ingroup views_filter_handlers
+ *
+ * @ViewsFilter("datetime")
+ */
+class Date extends NumericDate implements ContainerFactoryPluginInterface {
+
+  use FieldAPIHandlerTrait;
+
+  /**
+   * The date formatter service.
+   *
+   * @var \Drupal\Core\Datetime\DateFormatter
+   */
+  protected $dateFormatter;
+
+  /**
+   * Date format for SQL conversion.
+   *
+   * @var string
+   *
+   * @see \Drupal\views\Plugin\views\query\Sql::getDateFormat()
+   */
+  protected $dateFormat = DATETIME_DATETIME_STORAGE_FORMAT;
+
+  /**
+   * The request stack used to determin current time.
+   *
+   * @var \Symfony\Component\HttpFoundation\RequestStack
+   */
+  protected $requestStack;
+
+  /**
+   * Constructs a new Date handler.
+   *
+   * @param array $configuration
+   *   A configuration array containing information about the plugin instance.
+   * @param string $plugin_id
+   *   The plugin ID for the plugin instance.
+   * @param mixed $plugin_definition
+   *   The plugin implementation definition.
+   * @param \Drupal\Core\Datetime\DateFormatter $date_formatter
+   *   The date formatter service.
+   * @param \Symfony\Component\HttpFoundation\RequestStack
+   *   The request stack used to determine the current time.
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, DateFormatter $date_formatter, RequestStack $request_stack) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition);
+    $this->dateFormatter = $date_formatter;
+    $this->requestStack = $request_stack;
+
+    // Date format depends on field storage format.
+    $definition = $this->getFieldStorageDefinition();
+    if ($definition->getSetting('datetime_type') === DateTimeItem::DATETIME_TYPE_DATE) {
+      $this->dateFormat = DATETIME_DATE_STORAGE_FORMAT;
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $container->get('date.formatter'),
+      $container->get('request_stack')
+    );
+  }
+
+  /**
+   * Override parent method, which deals with dates as integers.
+   */
+  protected function opBetween($field) {
+    $origin = ($this->value['type'] == 'offset') ? $this->requestStack->getCurrentRequest()->server->get('REQUEST_TIME') : 0;
+    $a = intval(strtotime($this->value['min'], $origin));
+    $b = intval(strtotime($this->value['max'], $origin));
+
+    // Formatting will vary on date storage.
+
+
+    // Convert to ISO format and format for query. UTC timezone is used since
+    // dates are stored in UTC.
+    $a = $this->query->getDateFormat("'" . $this->dateFormatter->format($a, 'custom', DATETIME_DATETIME_STORAGE_FORMAT, DATETIME_STORAGE_TIMEZONE) . "'", $this->dateFormat, TRUE);
+    $b = $this->query->getDateFormat("'" . $this->dateFormatter->format($b, 'custom', DATETIME_DATETIME_STORAGE_FORMAT, DATETIME_STORAGE_TIMEZONE) . "'", $this->dateFormat, TRUE);
+
+    // This is safe because we are manually scrubbing the values.
+    $operator = strtoupper($this->operator);
+    $field = $this->query->getDateFormat($field, $this->dateFormat, TRUE);
+    $this->query->addWhereExpression($this->options['group'], "$field $operator $a AND $b");
+  }
+
+  /**
+   * Override parent method, which deals with dates as integers.
+   */
+  protected function opSimple($field) {
+    $origin =  (!empty($this->value['type']) && $this->value['type'] == 'offset') ? $this->requestStack->getCurrentRequest()->server->get('REQUEST_TIME') : 0;
+    $value = intval(strtotime($this->value['value'], $origin));
+
+    // Convert to ISO. UTC is used since dates are stored in UTC.
+    $value = $this->query->getDateFormat("'" . $this->dateFormatter->format($value, 'custom', DATETIME_DATETIME_STORAGE_FORMAT, DATETIME_STORAGE_TIMEZONE) . "'", $this->dateFormat, TRUE);
+
+    // This is safe because we are manually scrubbing the value.
+    $field = $this->query->getDateFormat($field, $this->dateFormat, TRUE);
+    $this->query->addWhereExpression($this->options['group'], "$field $this->operator $value");
+  }
+
+}
diff --git a/core/modules/datetime/src/Plugin/views/sort/Date.php b/core/modules/datetime/src/Plugin/views/sort/Date.php
new file mode 100644
index 000000000..12eddc6ed
--- /dev/null
+++ b/core/modules/datetime/src/Plugin/views/sort/Date.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\datetime\Plugin\views\sort\Date.
+ */
+
+namespace Drupal\datetime\Plugin\views\sort;
+
+use Drupal\views\Plugin\views\sort\Date as NumericDate;
+
+/**
+ * Basic sort handler for datetime fields.
+ *
+ * This handler enables granularity, which is the ability to make dates
+ * equivalent based upon nearness.
+ *
+ * @ViewsSort("datetime")
+ */
+class Date extends NumericDate {
+
+  /**
+   * Override to account for dates stored as strings.
+   */
+  public function getDateField() {
+    // Return the real field, since it is already in string format.
+    return "$this->tableAlias.$this->realField";
+  }
+
+  /**
+   * Override query to provide 'second' granularity.
+   */
+  public function query() {
+    $this->ensureMyTable();
+    switch ($this->options['granularity']) {
+      case 'second':
+        $formula = $this->getDateFormat('YmdHis');
+        $this->query->addOrderBy(NULL, $formula, $this->options['order'], $this->tableAlias . '_' . $this->field . '_' . $this->options['granularity']);
+        return;
+    }
+
+    // All other granularities are handled by the numeric sort handler.
+    parent::query();
+  }
+
+  /**
+   * {@inheritdoc}
+   *
+   * Overridden in order to pass in the string date flag.
+   */
+  public function getDateFormat($format) {
+    return $this->query->getDateFormat($this->getDateField(), $format, TRUE);
+  }
+
+
+}
diff --git a/core/modules/datetime/src/Tests/DateTimeFieldTest.php b/core/modules/datetime/src/Tests/DateTimeFieldTest.php
index d54dbb55a..60637ffc2 100644
--- a/core/modules/datetime/src/Tests/DateTimeFieldTest.php
+++ b/core/modules/datetime/src/Tests/DateTimeFieldTest.php
@@ -438,6 +438,46 @@ class DateTimeFieldTest extends WebTestBase {
     $this->assertOptionSelected("edit-$field_name-0-value-hour", '5', 'Correct hour selected.');
     $this->assertOptionSelected("edit-$field_name-0-value-minute", '15', 'Correct minute selected.');
     $this->assertOptionSelected("edit-$field_name-0-value-ampm", 'am', 'Correct ampm selected.');
+
+    // Test the widget using increment other than 1 and 24 hour mode.
+    entity_get_form_display($this->field->getTargetEntityTypeId(), $this->field->getTargetBundle(), 'default')
+      ->setComponent($field_name, array(
+        'type' => 'datetime_datelist',
+        'settings' => array(
+          'increment' => 15,
+          'date_order' => 'YMD',
+          'time_type' => '24',
+        ),
+      ))
+      ->save();
+    \Drupal::entityManager()->clearCachedFieldDefinitions();
+
+    // Display creation form.
+    $this->drupalGet('entity_test/add');
+
+    // Other elements are unaffected by the changed settings.
+    $this->assertFieldByXPath("//*[@id=\"edit-$field_name-0-value-hour\"]", NULL, 'Hour element found.');
+    $this->assertOptionSelected("edit-$field_name-0-value-hour", '', 'No hour selected.');
+    $this->assertNoFieldByXPath("//*[@id=\"edit-$field_name-0-value-ampm\"]", NULL, 'AMPM element not found.');
+
+    // Submit a valid date and ensure it is accepted.
+    $date_value = array('year' => 2012, 'month' => 12, 'day' => 31, 'hour' => 17, 'minute' => 15);
+
+    $edit = array();
+    foreach ($date_value as $part => $value) {
+      $edit["{$field_name}[0][value][$part]"] = $value;
+    }
+
+    $this->drupalPostForm(NULL, $edit, t('Save'));
+    preg_match('|entity_test/manage/(\d+)|', $this->url, $match);
+    $id = $match[1];
+    $this->assertText(t('entity_test @id has been created.', array('@id' => $id)));
+
+    $this->assertOptionSelected("edit-$field_name-0-value-year", '2012', 'Correct year selected.');
+    $this->assertOptionSelected("edit-$field_name-0-value-month", '12', 'Correct month selected.');
+    $this->assertOptionSelected("edit-$field_name-0-value-day", '31', 'Correct day selected.');
+    $this->assertOptionSelected("edit-$field_name-0-value-hour", '17', 'Correct hour selected.');
+    $this->assertOptionSelected("edit-$field_name-0-value-minute", '15', 'Correct minute selected.');
   }
 
   /**
diff --git a/core/modules/datetime/src/Tests/Views/ArgumentDateTimeTest.php b/core/modules/datetime/src/Tests/Views/ArgumentDateTimeTest.php
new file mode 100644
index 000000000..18906846f
--- /dev/null
+++ b/core/modules/datetime/src/Tests/Views/ArgumentDateTimeTest.php
@@ -0,0 +1,141 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\datetime\Tests\Views\ArgumentDateTimeTest.
+ */
+
+namespace Drupal\datetime\Tests\Views;
+
+use Drupal\views\Views;
+
+/**
+ * Tests the Drupal\datetime\Plugin\views\filter\Date handler.
+ *
+ * @group datetime
+ */
+class ArgumentDateTimeTest extends DateTimeHandlerTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $testViews = ['test_argument_datetime'];
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setUp() {
+    parent::setUp();
+
+    // Add some basic test nodes.
+    $dates = [
+      '2000-10-10',
+      '2001-10-10',
+      '2002-01-01',
+    ];
+    foreach ($dates as $date) {
+      $this->nodes[] = $this->drupalCreateNode([
+        'field_date' => [
+          'value' => $date,
+        ]
+      ]);
+    }
+  }
+
+  /**
+   * Test year argument.
+   *
+   * @see \Drupal\datetime\Plugin\views\argument\YearDate
+   */
+  public function testDatetimeArgumentYear() {
+    $view = Views::getView('test_argument_datetime');
+
+    // The 'default' display has the 'year' argument.
+    $view->setDisplay('default');
+    $this->executeView($view, ['2000']);
+    $expected = [];
+    $expected[] = ['nid' => $this->nodes[0]->id()];
+    $this->assertIdenticalResultset($view, $expected, $this->map);
+    $view->destroy();
+
+    $view->setDisplay('default');
+    $this->executeView($view, ['2002']);
+    $expected = [];
+    $expected[] = ['nid' => $this->nodes[2]->id()];
+    $this->assertIdenticalResultset($view, $expected, $this->map);
+    $view->destroy();
+  }
+
+  /**
+   * Test month argument.
+   *
+   * @see \Drupal\datetime\Plugin\views\argument\MonthDate
+   */
+  public function testDatetimeArgumentMonth() {
+    $view = Views::getView('test_argument_datetime');
+    // The 'embed_1' display has the 'month' argument.
+    $view->setDisplay('embed_1');
+
+    $this->executeView($view, ['10']);
+    $expected = [];
+    $expected[] = ['nid' => $this->nodes[0]->id()];
+    $expected[] = ['nid' => $this->nodes[1]->id()];
+    $this->assertIdenticalResultset($view, $expected, $this->map);
+    $view->destroy();
+
+    $view->setDisplay('embed_1');
+    $this->executeView($view, ['01']);
+    $expected = [];
+    $expected[] = ['nid' => $this->nodes[2]->id()];
+    $this->assertIdenticalResultset($view, $expected, $this->map);
+    $view->destroy();
+  }
+
+  /**
+   * Test day argument.
+   *
+   * @see \Drupal\datetime\Plugin\views\argument\DayDate
+   */
+  public function testDatetimeArgumentDay() {
+    $view = Views::getView('test_argument_datetime');
+
+    // The 'embed_2' display has the 'day' argument.
+    $view->setDisplay('embed_2');
+    $this->executeView($view, ['10']);
+    $expected = [];
+    $expected[] = ['nid' => $this->nodes[0]->id()];
+    $expected[] = ['nid' => $this->nodes[1]->id()];
+    $this->assertIdenticalResultset($view, $expected, $this->map);
+    $view->destroy();
+
+    $view->setDisplay('embed_2');
+    $this->executeView($view, ['01']);
+    $expected = [];
+    $expected[] = ['nid' => $this->nodes[2]->id()];
+    $this->assertIdenticalResultset($view, $expected, $this->map);
+    $view->destroy();
+  }
+
+  /**
+   * Test year, month, and day arguments combined.
+   */
+  public function testDatetimeArgumentAll() {
+    $view = Views::getView('test_argument_datetime');
+    // The 'embed_3' display has year, month, and day arguments.
+    $view->setDisplay('embed_3');
+
+    $this->executeView($view, ['2000', '10', '10']);
+    $expected = [];
+    $expected[] = ['nid' => $this->nodes[0]->id()];
+    $this->assertIdenticalResultset($view, $expected, $this->map);
+    $view->destroy();
+
+    $view->setDisplay('embed_3');
+    $this->executeView($view, ['2002', '01', '01']);
+    $expected = [];
+    $expected[] = ['nid' => $this->nodes[2]->id()];
+    $this->assertIdenticalResultset($view, $expected, $this->map);
+    $view->destroy();
+  }
+
+}
diff --git a/core/modules/datetime/src/Tests/Views/DateTimeHandlerTestBase.php b/core/modules/datetime/src/Tests/Views/DateTimeHandlerTestBase.php
new file mode 100644
index 000000000..b9a46992f
--- /dev/null
+++ b/core/modules/datetime/src/Tests/Views/DateTimeHandlerTestBase.php
@@ -0,0 +1,78 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\datetime\Tests\Views\DateTimeHandlerTestBase.
+ */
+
+namespace Drupal\datetime\Tests\Views;
+
+use Drupal\datetime\Plugin\Field\FieldType\DateTimeItem;
+use Drupal\views\Tests\Handler\HandlerTestBase;
+use Drupal\views\Tests\ViewTestData;
+
+/**
+ * Base class for testing datetime handlers.
+ */
+abstract class DateTimeHandlerTestBase extends HandlerTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['datetime_test', 'node', 'datetime'];
+
+  /**
+   * Name of the field.
+   *
+   * Note, this is used in the default test view.
+   *
+   * @var string
+   */
+  protected static $field_name = 'field_date';
+
+  /**
+   * Nodes to test.
+   *
+   * @var \Drupal\node\NodeInterface[]
+   */
+  protected $nodes = [];
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setUp() {
+    parent::setUp();
+
+    // Add a date field to page nodes.
+    $node_type = entity_create('node_type', [
+      'type' => 'page',
+      'name' => 'page'
+    ]);
+    $node_type->save();
+    $fieldStorage = entity_create('field_storage_config', [
+      'field_name' => static::$field_name,
+      'entity_type' => 'node',
+      'type' => 'datetime',
+      'settings' => ['datetime_type' => DateTimeItem::DATETIME_TYPE_DATETIME],
+    ]);
+    $fieldStorage->save();
+    $field = entity_create('field_config', [
+      'field_storage' => $fieldStorage,
+      'bundle' => 'page',
+      'required' => TRUE,
+    ]);
+    $field->save();
+
+    // Views needs to be aware of the new field.
+    $this->container->get('views.views_data')->clear();
+
+    // Set column map.
+    $this->map = [
+      'nid' => 'nid',
+    ];
+
+    // Load test views.
+    ViewTestData::createTestViews(get_class($this), ['datetime_test']);
+  }
+
+}
diff --git a/core/modules/datetime/src/Tests/Views/FilterDateTest.php b/core/modules/datetime/src/Tests/Views/FilterDateTest.php
new file mode 100644
index 000000000..5e54f78e2
--- /dev/null
+++ b/core/modules/datetime/src/Tests/Views/FilterDateTest.php
@@ -0,0 +1,115 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\datetime\Tests\Views\FilterDateTest.
+ */
+
+namespace Drupal\datetime\Tests\Views;
+use Drupal\datetime\Plugin\Field\FieldType\DateTimeItem;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\views\Views;
+
+/**
+ * Tests date-only fields.
+ *
+ * @group datetime
+ */
+class FilterDateTest extends DateTimeHandlerTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $testViews = ['test_filter_datetime'];
+
+  /**
+   * For offset tests, set to the current time.
+   */
+  protected static $date;
+
+  /**
+   * {@inheritdoc}
+   *
+   * Create nodes with relative dates of yesterday, today, and tomorrow.
+   */
+  public function setUp() {
+    parent::setUp();
+
+    // Set to 'today'.
+    static::$date = REQUEST_TIME;
+
+    // Change field storage to date-only.
+    $storage = FieldStorageConfig::load('node.' . static::$field_name);
+    $storage->setSetting('datetime_type', DateTimeItem::DATETIME_TYPE_DATE);
+    $storage->save();
+
+    $dates = [
+      // Tomorrow.
+      \Drupal::service('date.formatter')->format(static::$date + 86400, 'custom', DATETIME_DATE_STORAGE_FORMAT, DATETIME_STORAGE_TIMEZONE),
+      // Today.
+      \Drupal::service('date.formatter')->format(static::$date, 'custom', DATETIME_DATE_STORAGE_FORMAT, DATETIME_STORAGE_TIMEZONE),
+      // Yesterday.
+      \Drupal::service('date.formatter')->format(static::$date - 86400, 'custom', DATETIME_DATE_STORAGE_FORMAT, DATETIME_STORAGE_TIMEZONE),
+    ];
+
+    foreach ($dates as $date) {
+      $this->nodes[] = $this->drupalCreateNode([
+        'field_date' => [
+          'value' => $date,
+        ]
+      ]);
+    }
+  }
+
+  /**
+   * Test offsets with date-only fields.
+   */
+  public function testDateOffsets() {
+    $view = Views::getView('test_filter_datetime');
+    $field = static::$field_name . '_value';
+
+    // Test simple operations.
+    $view->initHandlers();
+
+    // A greater than or equal to 'now', should return the 'today' and
+    // the 'tomorrow' node.
+    $view->filter[$field]->operator = '>=';
+    $view->filter[$field]->value['type'] = 'offset';
+    $view->filter[$field]->value['value'] = 'now';
+    $view->setDisplay('default');
+    $this->executeView($view);
+    $expected_result = [
+      ['nid' => $this->nodes[0]->id()],
+      ['nid' => $this->nodes[1]->id()],
+    ];
+    $this->assertIdenticalResultset($view, $expected_result, $this->map);
+    $view->destroy();
+
+    // Only dates in the past.
+    $view->initHandlers();
+    $view->filter[$field]->operator = '<';
+    $view->filter[$field]->value['type'] = 'offset';
+    $view->filter[$field]->value['value'] = 'now';
+    $view->setDisplay('default');
+    $this->executeView($view);
+    $expected_result = [
+      ['nid' => $this->nodes[2]->id()],
+    ];
+    $this->assertIdenticalResultset($view, $expected_result, $this->map);
+    $view->destroy();
+
+    // Test offset for between operator. Only the 'tomorrow' node should appear.
+    $view->initHandlers();
+    $view->filter[$field]->operator = 'between';
+    $view->filter[$field]->value['type'] = 'offset';
+    $view->filter[$field]->value['max'] = '+2 days';
+    $view->filter[$field]->value['min'] = '+1 day';
+    $view->setDisplay('default');
+    $this->executeView($view);
+    $expected_result = [
+      ['nid' => $this->nodes[0]->id()],
+    ];
+    $this->assertIdenticalResultset($view, $expected_result, $this->map);
+  }
+
+}
diff --git a/core/modules/datetime/src/Tests/Views/FilterDateTimeTest.php b/core/modules/datetime/src/Tests/Views/FilterDateTimeTest.php
new file mode 100644
index 000000000..137f45ccf
--- /dev/null
+++ b/core/modules/datetime/src/Tests/Views/FilterDateTimeTest.php
@@ -0,0 +1,195 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\datetime\Tests\Views\FilterDateTimeTest.
+ */
+
+namespace Drupal\datetime\Tests\Views;
+
+use Drupal\Core\Datetime\Element\Datetime;
+use Drupal\views\Views;
+
+/**
+ * Tests the Drupal\datetime\Plugin\views\filter\Date handler.
+ *
+ * @group datetime
+ */
+class FilterDateTimeTest extends DateTimeHandlerTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $testViews = ['test_filter_datetime'];
+
+  /**
+   * For offset tests, set a date 1 day in the future.
+   */
+  protected static $date;
+
+  /**
+   * Use a non-UTC timezone.
+   */
+  protected static $timezone = 'America/Vancouver';
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setUp() {
+    parent::setUp();
+
+    static::$date = REQUEST_TIME + 86400;
+
+    // Set the timezone.
+    date_default_timezone_set(static::$timezone);
+
+    // Add some basic test nodes.
+    $dates = [
+      '2000-10-10T00:01:30',
+      '2001-10-10T12:12:12',
+      '2002-10-10T14:14:14',
+      // The date storage timezone is used (this mimics the steps taken in the
+      // widget: \Drupal\datetime\Plugin\Field\FieldWidget::messageFormValues().
+      \Drupal::service('date.formatter')->format(static::$date, 'custom', DATETIME_DATETIME_STORAGE_FORMAT, DATETIME_STORAGE_TIMEZONE),
+    ];
+    foreach ($dates as $date) {
+      $this->nodes[] = $this->drupalCreateNode([
+        'field_date' => [
+          'value' => $date,
+        ]
+      ]);
+    }
+  }
+
+  /**
+   * Test filter operations.
+   */
+  public function testDatetimeFilter() {
+    $this->_testOffset();
+    $this->_testBetween();
+    $this->_testExact();
+  }
+
+  /**
+   * Test offset operations.
+   */
+  protected function _testOffset() {
+    $view = Views::getView('test_filter_datetime');
+    $field = static::$field_name . '_value';
+
+    // Test simple operations.
+    $view->initHandlers();
+
+    $view->filter[$field]->operator = '>';
+    $view->filter[$field]->value['type'] = 'offset';
+    $view->filter[$field]->value['value'] = '+1 hour';
+    $view->setDisplay('default');
+    $this->executeView($view);
+    $expected_result = [
+      ['nid' => $this->nodes[3]->id()],
+    ];
+    $this->assertIdenticalResultset($view, $expected_result, $this->map);
+    $view->destroy();
+
+    // Test offset for between operator.
+    $view->initHandlers();
+    $view->filter[$field]->operator = 'between';
+    $view->filter[$field]->value['type'] = 'offset';
+    $view->filter[$field]->value['max'] = '+2 days';
+    $view->filter[$field]->value['min'] = '+1 hour';
+    $view->setDisplay('default');
+    $this->executeView($view);
+    $expected_result = [
+      ['nid' => $this->nodes[3]->id()],
+    ];
+    $this->assertIdenticalResultset($view, $expected_result, $this->map);
+  }
+
+  /**
+   *  Test between operations.
+   */
+  protected function _testBetween() {
+    $view = Views::getView('test_filter_datetime');
+    $field = static::$field_name . '_value';
+
+    // Test between with min and max.
+    $view->initHandlers();
+    $view->filter[$field]->operator = 'between';
+    $view->filter[$field]->value['min'] = '2001-01-01';
+    $view->filter[$field]->value['max'] = '2002-01-01';
+    $view->setDisplay('default');
+    $this->executeView($view);
+    $expected_result = [
+      ['nid' => $this->nodes[1]->id()],
+    ];
+    $this->assertIdenticalResultset($view, $expected_result, $this->map);
+    $view->destroy();
+
+    // Test between with just max.
+    $view->initHandlers();
+    $view->filter[$field]->operator = 'between';
+    $view->filter[$field]->value['max'] = '2002-01-01';
+    $view->setDisplay('default');
+    $this->executeView($view);
+    $expected_result = [
+      ['nid' => $this->nodes[0]->id()],
+      ['nid' => $this->nodes[1]->id()],
+    ];
+    $this->assertIdenticalResultset($view, $expected_result, $this->map);
+    $view->destroy();
+
+    // Test not between with min and max.
+    $view->initHandlers();
+    $view->filter[$field]->operator = 'not between';
+    $view->filter[$field]->value['min'] = '2001-01-01';
+    $view->filter[$field]->value['max'] = '2002-01-01';
+    $view->setDisplay('default');
+    $this->executeView($view);
+    $expected_result = [
+      ['nid' => $this->nodes[0]->id()],
+      ['nid' => $this->nodes[2]->id()],
+      ['nid' => $this->nodes[3]->id()],
+    ];
+    $this->assertIdenticalResultset($view, $expected_result, $this->map);
+    $view->destroy();
+
+    // Test not between with just max.
+    $view->initHandlers();
+    $view->filter[$field]->operator = 'not between';
+    $view->filter[$field]->value['max'] = '2001-01-01';
+    $view->setDisplay('default');
+    $this->executeView($view);
+    $expected_result = [
+      ['nid' => $this->nodes[1]->id()],
+      ['nid' => $this->nodes[2]->id()],
+      ['nid' => $this->nodes[3]->id()],
+    ];
+    $this->assertIdenticalResultset($view, $expected_result, $this->map);
+  }
+
+  /**
+   * Test exact date matching.
+   */
+  protected function _testExact() {
+    $view = Views::getView('test_filter_datetime');
+    $field = static::$field_name . '_value';
+
+    // Test between with min and max.
+    $view->initHandlers();
+    $view->filter[$field]->operator = '=';
+    $view->filter[$field]->value['min'] = '';
+    $view->filter[$field]->value['max'] = '';
+    // Use the date from node 3. Use the site timezone (mimics a value entered
+    // through the UI).
+    $view->filter[$field]->value['value'] = \Drupal::service('date.formatter')->format(static::$date, 'custom', DATETIME_DATETIME_STORAGE_FORMAT, static::$timezone);
+    $view->setDisplay('default');
+    $this->executeView($view);
+    $expected_result = [
+      ['nid' => $this->nodes[3]->id()],
+    ];
+    $this->assertIdenticalResultset($view, $expected_result, $this->map);
+    $view->destroy();
+
+  }
+
+}
diff --git a/core/modules/datetime/src/Tests/Views/SortDateTimeTest.php b/core/modules/datetime/src/Tests/Views/SortDateTimeTest.php
new file mode 100644
index 000000000..f3f89366c
--- /dev/null
+++ b/core/modules/datetime/src/Tests/Views/SortDateTimeTest.php
@@ -0,0 +1,99 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\datetime\Tests\Views\SortDateTimeTest.
+ */
+
+namespace Drupal\datetime\Tests\Views;
+
+use Drupal\views\Views;
+
+/**
+ * Tests for core Drupal\datetime\Plugin\views\sort\Date handler.
+ *
+ * @group datetime
+ */
+class SortDateTimeTest extends DateTimeHandlerTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $testViews = ['test_sort_datetime'];
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setUp() {
+    parent::setUp();
+
+    // Add some basic test nodes.
+    $dates = [
+      '2014-10-10T00:03:00',
+      '2000-10-10T00:01:00',
+      '2000-10-10T00:02:00',
+      '2000-10-10T00:03:00',
+    ];
+    foreach ($dates as $date) {
+      $this->nodes[] = $this->drupalCreateNode([
+        'field_date' => [
+          'value' => $date,
+        ]
+      ]);
+    }
+  }
+
+  /**
+   * Tests the datetime sort handler.
+   */
+  public function testDateTimeSort() {
+    $field = static::$field_name . '_value';
+    $view = Views::getView('test_sort_datetime');
+
+    // Sort order is DESC.
+    $view->initHandlers();
+    $view->sort[$field]->options['granularity'] = 'minute';
+    $view->setDisplay('default');
+    $this->executeView($view);
+    $expected_result = [
+      ['nid' => $this->nodes[0]->id()],
+      ['nid' => $this->nodes[3]->id()],
+      ['nid' => $this->nodes[2]->id()],
+      ['nid' => $this->nodes[1]->id()],
+    ];
+    $this->assertIdenticalResultset($view, $expected_result, $this->map);
+    $view->destroy();
+
+    // Check ASC.
+    $view->initHandlers();
+    $field = static::$field_name . '_value';
+    $view->sort[$field]->options['order'] = 'ASC';
+    $view->setDisplay('default');
+    $this->executeView($view);
+    $expected_result = [
+      ['nid' => $this->nodes[1]->id()],
+      ['nid' => $this->nodes[2]->id()],
+      ['nid' => $this->nodes[3]->id()],
+      ['nid' => $this->nodes[0]->id()],
+    ];
+    $this->assertIdenticalResultset($view, $expected_result, $this->map);
+    $view->destroy();
+
+    // Change granularity to 'year', and the secondary node ID order should
+    // define the order of nodes with the same year.
+    $view->initHandlers();
+    $view->sort[$field]->options['granularity'] = 'year';
+    $view->sort[$field]->options['order'] = 'DESC';
+    $view->setDisplay('default');
+    $this->executeView($view);
+    $expected_result = [
+      ['nid' => $this->nodes[0]->id()],
+      ['nid' => $this->nodes[1]->id()],
+      ['nid' => $this->nodes[2]->id()],
+      ['nid' => $this->nodes[3]->id()],
+    ];
+    $this->assertIdenticalResultset($view, $expected_result, $this->map);
+    $view->destroy();
+  }
+
+}
diff --git a/core/modules/datetime/tests/modules/datetime_test/datetime_test.info.yml b/core/modules/datetime/tests/modules/datetime_test/datetime_test.info.yml
new file mode 100644
index 000000000..84ba9e41d
--- /dev/null
+++ b/core/modules/datetime/tests/modules/datetime_test/datetime_test.info.yml
@@ -0,0 +1,8 @@
+name: 'Datetime test'
+type: module
+description: 'Provides default views for tests.'
+package: Testing
+version: VERSION
+core: 8.x
+dependencies:
+  - views
diff --git a/core/modules/datetime/tests/modules/datetime_test/test_views/views.view.test_argument_datetime.yml b/core/modules/datetime/tests/modules/datetime_test/test_views/views.view.test_argument_datetime.yml
new file mode 100644
index 000000000..e22ad30c8
--- /dev/null
+++ b/core/modules/datetime/tests/modules/datetime_test/test_views/views.view.test_argument_datetime.yml
@@ -0,0 +1,99 @@
+langcode: und
+status: true
+dependencies: {  }
+id: test_argument_datetime
+label: ''
+module: views
+description: ''
+tag: ''
+base_table: node_field_data
+base_field: nid
+core: '8'
+display:
+  default:
+    display_options:
+      defaults:
+        fields: false
+        pager: false
+        sorts: false
+      arguments:
+        field_date_value_year:
+          field: field_date_value_year
+          id: field_date_value
+          table: node__field_date
+          plugin_id: datetime_year
+      fields:
+        id:
+          field: nid
+          id: nid
+          relationship: none
+          table: node
+          plugin_id: numeric
+      pager:
+        options:
+          offset: 0
+        type: none
+      sorts:
+        id:
+          field: nid
+          id: nid
+          order: ASC
+          relationship: none
+          table: node
+          plugin_id: numeric
+    display_plugin: default
+    display_title: Master
+    id: default
+    position: 0
+  embed_1:
+    display_options:
+      defaults:
+        arguments: false
+      arguments:
+        field_date_value_month:
+          field: field_date_value_month
+          id: field_date_value
+          table: node__field_date
+          plugin_id: datetime_month
+    display_plugin: embed
+    id: embed_1
+    display_title: ''
+    position: null
+  embed_2:
+    display_options:
+      defaults:
+        arguments: false
+      arguments:
+        field_date_value_day:
+          field: field_date_value_day
+          id: field_date_value
+          table: node__field_date
+          plugin_id: datetime_day
+    display_plugin: embed
+    id: embed_2
+    display_title: ''
+    position: null
+  embed_3:
+    display_options:
+      defaults:
+        arguments: false
+      arguments:
+        field_date_value_year:
+          field: field_date_value_year
+          id: field_date_value
+          table: node__field_date
+          plugin_id: datetime_year
+        field_date_value_month:
+          field: field_date_value_month
+          id: field_date_value
+          table: node__field_date
+          plugin_id: datetime_month
+        field_date_value_day:
+          field: field_date_value_day
+          id: field_date_value
+          table: node__field_date
+          plugin_id: datetime_day
+    display_plugin: embed
+    id: embed_2
+    display_title: ''
+    position: null
diff --git a/core/modules/datetime/tests/modules/datetime_test/test_views/views.view.test_filter_datetime.yml b/core/modules/datetime/tests/modules/datetime_test/test_views/views.view.test_filter_datetime.yml
new file mode 100644
index 000000000..c9b23ded6
--- /dev/null
+++ b/core/modules/datetime/tests/modules/datetime_test/test_views/views.view.test_filter_datetime.yml
@@ -0,0 +1,56 @@
+langcode: und
+status: true
+dependencies:
+  module:
+    - node
+id: test_filter_datetime
+label: ''
+module: views
+description: ''
+tag: ''
+base_table: node_field_data
+base_field: nid
+core: '8'
+display:
+  default:
+    display_options:
+      access:
+        type: none
+      cache:
+        type: none
+      exposed_form:
+        type: basic
+      fields:
+        nid:
+          field: nid
+          id: nid
+          table: node
+          plugin_id: node
+      filters:
+        field_date_value:
+          id: field_date_value
+          table: node__field_date
+          field: field_date_value
+          plugin_id: datetime
+      sorts:
+        id:
+          field: nid
+          id: nid
+          order: ASC
+          relationship: none
+          table: node
+          plugin_id: numeric
+      pager:
+        type: full
+      query:
+        options:
+          query_comment: ''
+        type: views_query
+      style:
+        type: default
+      row:
+        type: fields
+    display_plugin: default
+    display_title: Master
+    id: default
+    position: 0
diff --git a/core/modules/datetime/tests/modules/datetime_test/test_views/views.view.test_sort_datetime.yml b/core/modules/datetime/tests/modules/datetime_test/test_views/views.view.test_sort_datetime.yml
new file mode 100644
index 000000000..8b8d052ae
--- /dev/null
+++ b/core/modules/datetime/tests/modules/datetime_test/test_views/views.view.test_sort_datetime.yml
@@ -0,0 +1,57 @@
+langcode: und
+status: true
+dependencies:
+  module:
+    - node
+id: test_sort_datetime
+label: ''
+module: views
+description: ''
+tag: ''
+base_table: node_field_data
+base_field: nid
+core: '8'
+display:
+  default:
+    display_options:
+      access:
+        type: none
+      cache:
+        type: none
+      exposed_form:
+        type: basic
+      fields:
+        nid:
+          field: nid
+          id: nid
+          table: node
+          plugin_id: node
+      sorts:
+        field_date_value:
+          field: field_date_value
+          id: field_date_value
+          relationship: none
+          table: node__field_date
+          order: DESC
+          plugin_id: datetime
+        id:
+          field: nid
+          id: nid
+          order: ASC
+          relationship: none
+          table: node
+          plugin_id: numeric
+      pager:
+        type: full
+      query:
+        options:
+          query_comment: ''
+        type: views_query
+      style:
+        type: default
+      row:
+        type: fields
+    display_plugin: default
+    display_title: Master
+    id: default
+    position: 0
diff --git a/core/modules/dblog/dblog.module b/core/modules/dblog/dblog.module
index 01c4d2395..91c6038e6 100644
--- a/core/modules/dblog/dblog.module
+++ b/core/modules/dblog/dblog.module
@@ -11,6 +11,7 @@
 
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Core\StringTranslation\TranslationWrapper;
 
 /**
  * Implements hook_help().
@@ -41,9 +42,9 @@ function dblog_help($route_name, RouteMatchInterface $route_match) {
 function dblog_menu_links_discovered_alter(&$links) {
   if (\Drupal::moduleHandler()->moduleExists('search')) {
     $links['dblog.search'] = array(
-      'title' => 'Top search phrases',
+      'title' => new TranslationWrapper('Top search phrases'),
       'route_name' => 'dblog.search',
-      'description' => 'View most popular search phrases.',
+      'description' => new TranslationWrapper('View most popular search phrases.'),
       'parent' => 'system.admin_reports',
     );
   }
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_dblog_settings.yml b/core/modules/dblog/migration_templates/d6_dblog_settings.yml
similarity index 81%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_dblog_settings.yml
rename to core/modules/dblog/migration_templates/d6_dblog_settings.yml
index fb387f57e..6c94b1e2e 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_dblog_settings.yml
+++ b/core/modules/dblog/migration_templates/d6_dblog_settings.yml
@@ -11,7 +11,3 @@ process:
 destination:
   plugin: config
   config_name: dblog.settings
-dependencies:
-  module:
-    - dblog
-    - migrate_drupal
diff --git a/core/modules/dblog/migration_templates/d7_dblog_settings.yml b/core/modules/dblog/migration_templates/d7_dblog_settings.yml
new file mode 100644
index 000000000..8e681fdbc
--- /dev/null
+++ b/core/modules/dblog/migration_templates/d7_dblog_settings.yml
@@ -0,0 +1,13 @@
+id: d7_dblog_settings
+label: Drupal 7 database logging configuration
+migration_tags:
+  - Drupal 7
+source:
+  plugin: variable
+  variables:
+    - dblog_row_limit
+process:
+  row_limit: dblog_row_limit
+destination:
+  plugin: config
+  config_name: dblog.settings
diff --git a/core/modules/dblog/src/Controller/DbLogController.php b/core/modules/dblog/src/Controller/DbLogController.php
index 2e2eccf3a..3982da677 100644
--- a/core/modules/dblog/src/Controller/DbLogController.php
+++ b/core/modules/dblog/src/Controller/DbLogController.php
@@ -207,7 +207,7 @@ class DbLogController extends ControllerBase {
           $this->dateFormatter->format($dblog->timestamp, 'short'),
           $message,
           array('data' => $username),
-          Xss::filter($dblog->link),
+          SafeMarkup::xssFilter($dblog->link),
         ),
         // Attributes for table row.
         'class' => array(Html::getClass('dblog-' . $dblog->type), $classes[$dblog->severity]),
@@ -285,7 +285,7 @@ class DbLogController extends ControllerBase {
         ),
         array(
           array('data' => $this->t('Operations'), 'header' => TRUE),
-          SafeMarkup::checkAdminXss($dblog->link),
+          array('data' => array('#markup' => $dblog->link)),
         ),
       );
       $build['dblog_table'] = array(
diff --git a/core/modules/dblog/src/Tests/DbLogFormInjectionTest.php b/core/modules/dblog/src/Tests/DbLogFormInjectionTest.php
index 6957f517d..62fa23455 100644
--- a/core/modules/dblog/src/Tests/DbLogFormInjectionTest.php
+++ b/core/modules/dblog/src/Tests/DbLogFormInjectionTest.php
@@ -99,6 +99,9 @@ class DbLogFormInjectionTest extends KernelTestBase implements FormInterface {
    */
   public function testLoggerSerialization() {
     $form_state = new FormState();
+
+    // Forms are only serialized during POST requests.
+    $form_state->setRequestMethod('POST');
     $form_state->setCached();
     $form_builder = $this->container->get('form_builder');
     $form_id = $form_builder->getFormId($this, $form_state);
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateDblogConfigsTest.php b/core/modules/dblog/src/Tests/Migrate/d6/MigrateDblogConfigsTest.php
similarity index 61%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateDblogConfigsTest.php
rename to core/modules/dblog/src/Tests/Migrate/d6/MigrateDblogConfigsTest.php
index 33cca917f..f3dcfa163 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateDblogConfigsTest.php
+++ b/core/modules/dblog/src/Tests/Migrate/d6/MigrateDblogConfigsTest.php
@@ -2,20 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateDblogConfigsTest.
+ * Contains \Drupal\dblog\Tests\Migrate\d6\MigrateDblogConfigsTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\dblog\Tests\Migrate\d6;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate\MigrateMessage;
-use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to dblog.settings.yml.
  *
- * @group migrate_drupal
+ * @group dblog
  */
 class MigrateDblogConfigsTest extends MigrateDrupal6TestBase {
 
@@ -33,13 +31,8 @@ class MigrateDblogConfigsTest extends MigrateDrupal6TestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $migration = entity_load('migration', 'd6_dblog_settings');
-    $dumps = array(
-      $this->getDumpDirectory() . '/Variable.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, new MigrateMessage());
-    $executable->import();
+    $this->loadDumps(['Variable.php']);
+    $this->executeMigration('d6_dblog_settings');
   }
 
   /**
diff --git a/core/modules/dblog/src/Tests/Migrate/d7/MigrateDblogConfigsTest.php b/core/modules/dblog/src/Tests/Migrate/d7/MigrateDblogConfigsTest.php
new file mode 100644
index 000000000..7d1f28a15
--- /dev/null
+++ b/core/modules/dblog/src/Tests/Migrate/d7/MigrateDblogConfigsTest.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\dblog\Tests\Migrate\d7\MigrateDblogConfigsTest.
+ */
+
+namespace Drupal\dblog\Tests\Migrate\d7;
+
+use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+
+/**
+ * Upgrade variables to dblog.settings.yml.
+ *
+ * @group dblog
+ */
+class MigrateDblogConfigsTest extends MigrateDrupal7TestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['dblog'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(static::$modules);
+    $this->loadDumps(['Variable.php']);
+    $this->executeMigration('d7_dblog_settings');
+  }
+
+  /**
+   * Tests migration of dblog variables to dblog.settings.yml.
+   */
+  public function testDblogSettings() {
+    $config = $this->config('dblog.settings');
+    $this->assertIdentical(1000, $config->get('row_limit'));
+  }
+
+}
diff --git a/core/modules/dblog/src/Tests/Views/ViewsIntegrationTest.php b/core/modules/dblog/src/Tests/Views/ViewsIntegrationTest.php
index c7f37975d..063ce2550 100644
--- a/core/modules/dblog/src/Tests/Views/ViewsIntegrationTest.php
+++ b/core/modules/dblog/src/Tests/Views/ViewsIntegrationTest.php
@@ -34,7 +34,7 @@ class ViewsIntegrationTest extends ViewUnitTestBase {
    *
    * @var array
    */
-  public static $modules = array('dblog', 'dblog_test_views');
+  public static $modules = array('dblog', 'dblog_test_views', 'user');
 
   /**
    * {@inheritdoc}
diff --git a/core/modules/editor/editor.module b/core/modules/editor/editor.module
index 7fa3c05e8..470f26938 100644
--- a/core/modules/editor/editor.module
+++ b/core/modules/editor/editor.module
@@ -11,7 +11,7 @@ use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Render\Element;
 use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\Component\Utility\NestedArray;
+use Drupal\Core\StringTranslation\TranslationWrapper;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\filter\FilterFormatInterface;
 use Drupal\filter\Plugin\FilterInterface;
@@ -47,8 +47,8 @@ function editor_help($route_name, RouteMatchInterface $route_match) {
  * of text editors.
  */
 function editor_menu_links_discovered_alter(array &$links) {
-  $links['filter.admin_overview']['title'] = 'Text formats and editors';
-  $links['filter.admin_overview']['description'] = 'Configure how user-contributed content is filtered and formatted, as well as the text editor user interface (WYSIWYGs or toolbars).';
+  $links['filter.admin_overview']['title'] = new TranslationWrapper('Text formats and editors');
+  $links['filter.admin_overview']['description'] = new TranslationWrapper('Configure how user-contributed content is filtered and formatted, as well as the text editor user interface (WYSIWYGs or toolbars).');
 }
 
 /**
diff --git a/core/modules/editor/src/EditorController.php b/core/modules/editor/src/EditorController.php
index 44feda30f..192f3411e 100644
--- a/core/modules/editor/src/EditorController.php
+++ b/core/modules/editor/src/EditorController.php
@@ -48,7 +48,7 @@ class EditorController extends ControllerBase {
     // Direct text editing is only supported for single-valued fields.
     $field = $entity->getTranslation($langcode)->$field_name;
     $editable_text = check_markup($field->value, $field->format, $langcode, array(FilterInterface::TYPE_TRANSFORM_REVERSIBLE, FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE));
-    $response->addCommand(new GetUntransformedTextCommand($editable_text));
+    $response->addCommand(new GetUntransformedTextCommand((string) $editable_text));
 
     return $response;
   }
diff --git a/core/modules/editor/src/Form/EditorImageDialog.php b/core/modules/editor/src/Form/EditorImageDialog.php
index 8b37f723f..9c2feb5a3 100644
--- a/core/modules/editor/src/Form/EditorImageDialog.php
+++ b/core/modules/editor/src/Form/EditorImageDialog.php
@@ -15,12 +15,40 @@ use Drupal\Core\Ajax\AjaxResponse;
 use Drupal\Core\Ajax\HtmlCommand;
 use Drupal\editor\Ajax\EditorDialogSave;
 use Drupal\Core\Ajax\CloseModalDialogCommand;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Drupal\Core\Entity\EntityStorageInterface;
 
 /**
  * Provides an image dialog for text editors.
  */
 class EditorImageDialog extends FormBase {
 
+  /**
+   * The file storage service.
+   *
+   * @var \Drupal\Core\Entity\EntityStorageInterface
+   */
+  protected $fileStorage;
+
+  /**
+   * Constructs a form object for image dialog.
+   *
+   * @param \Drupal\Core\Entity\EntityStorageInterface $file_storage
+   *   The file storage service.
+   */
+  public function __construct(EntityStorageInterface $file_storage) {
+    $this->fileStorage = $file_storage;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static(
+      $container->get('entity.manager')->getStorage('file')
+    );
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -208,7 +236,7 @@ class EditorImageDialog extends FormBase {
     // attributes and set data-entity-type to 'file'.
     $fid = $form_state->getValue(array('fid', 0));
     if (!empty($fid)) {
-      $file = file_load($fid);
+      $file = $this->fileStorage->load($fid);
       $file_url = file_create_url($file->getFileUri());
       // Transform absolute image URLs to relative image URLs: prevent problems
       // on multisite set-ups and prevent mixed content errors.
diff --git a/core/modules/entity_reference/src/Plugin/views/display/EntityReference.php b/core/modules/entity_reference/src/Plugin/views/display/EntityReference.php
index 83f998f60..e55481c0a 100644
--- a/core/modules/entity_reference/src/Plugin/views/display/EntityReference.php
+++ b/core/modules/entity_reference/src/Plugin/views/display/EntityReference.php
@@ -137,10 +137,11 @@ class EntityReference extends DisplayPluginBase {
       $conditions = db_or();
 
       // Build the condition using the selected search fields.
-      foreach ($style_options['options']['search_fields'] as $field_alias) {
-        if (!empty($field_alias)) {
+      foreach ($style_options['options']['search_fields'] as $field_id) {
+        if (!empty($field_id)) {
           // Get the table and field names for the checked field.
-          $field = $this->view->query->fields[$this->view->field[$field_alias]->field_alias];
+          $field_alias = $this->view->query->addField($this->view->field[$field_id]->table, $field_id);
+          $field = $this->view->query->fields[$field_alias];
           // Add an OR condition for the field.
           $conditions->condition($field['table'] . '.' . $field['field'], $value, 'LIKE');
         }
diff --git a/core/modules/entity_reference/src/Plugin/views/style/EntityReference.php b/core/modules/entity_reference/src/Plugin/views/style/EntityReference.php
index e3aeb34a8..328d96e15 100644
--- a/core/modules/entity_reference/src/Plugin/views/style/EntityReference.php
+++ b/core/modules/entity_reference/src/Plugin/views/style/EntityReference.php
@@ -47,7 +47,7 @@ class EntityReference extends StylePluginBase {
    */
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['search_fields'] = array('default' => NULL);
+    $options['search_fields'] = array('default' => array());
 
     return $options;
   }
diff --git a/core/modules/entity_reference/src/Tests/EntityReferenceAdminTest.php b/core/modules/entity_reference/src/Tests/EntityReferenceAdminTest.php
index 6c72d49bf..eb8b85fb7 100644
--- a/core/modules/entity_reference/src/Tests/EntityReferenceAdminTest.php
+++ b/core/modules/entity_reference/src/Tests/EntityReferenceAdminTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\entity_reference\Tests;
 
+use Drupal\Core\Entity\Entity;
 use Drupal\field_ui\Tests\FieldUiTestTrait;
 use Drupal\simpletest\WebTestBase;
 use Drupal\taxonomy\Entity\Vocabulary;
@@ -45,14 +46,21 @@ class EntityReferenceAdminTest extends WebTestBase {
     parent::setUp();
     $this->drupalPlaceBlock('system_breadcrumb_block');
 
-    // Create test user.
-    $admin_user = $this->drupalCreateUser(array('access content', 'administer node fields', 'administer node display', 'administer views'));
-    $this->drupalLogin($admin_user);
-
     // Create a content type, with underscores.
     $type_name = strtolower($this->randomMachineName(8)) . '_test';
     $type = $this->drupalCreateContentType(array('name' => $type_name, 'type' => $type_name));
     $this->type = $type->id();
+
+    // Create test user.
+    $admin_user = $this->drupalCreateUser(array(
+      'access content',
+      'administer node fields',
+      'administer node display',
+      'administer views',
+      'create ' . $type_name . ' content',
+      'edit own ' . $type_name . ' content',
+    ));
+    $this->drupalLogin($admin_user);
   }
 
   /**
@@ -191,10 +199,66 @@ class EntityReferenceAdminTest extends WebTestBase {
     );
     $this->drupalPostAjaxForm($bundle_path . '/fields/' . $field_name, $edit, 'settings[handler]');
     $edit = array(
+      'required' => FALSE,
       'settings[handler_settings][view][view_and_display]' => 'test_entity_reference_entity_test:entity_reference_1',
     );
     $this->drupalPostForm(NULL, $edit, t('Save settings'));
     $this->assertResponse(200);
+
+    // Create a new view and display it as a entity reference.
+    $edit = array(
+      'id' => 'node_test_view',
+      'label' => 'Node Test View',
+      'show[wizard_key]' => 'node',
+      'page[create]' => 1,
+      'page[title]' => 'Test Node View',
+      'page[path]' => 'test/node/view',
+      'page[style][style_plugin]' => 'default',
+      'page[style][row_plugin]' => 'fields',
+    );
+    $this->drupalPostForm('admin/structure/views/add', $edit, t('Save and edit'));
+    $this->drupalPostForm(NULL, array(), t('Duplicate as Entity Reference'));
+    $this->clickLink(t('Settings'));
+    $edit = array(
+      'style_options[search_fields][title]' => 'title',
+    );
+    $this->drupalPostForm(NULL, $edit, t('Apply'));
+    $this->drupalPostForm('admin/structure/views/view/node_test_view/edit/entity_reference_1', array(), t('Save'));
+    $this->clickLink(t('Settings'));
+
+    // Create a test entity reference field.
+    $field_name = 'test_entity_ref_field';
+    $edit = array(
+      'new_storage_type' => 'field_ui:entity_reference:node',
+      'label' => 'Test Entity Reference Field',
+      'field_name' => $field_name,
+    );
+    $this->drupalPostForm($bundle_path . '/fields/add-field', $edit, t('Save and continue'));
+    $this->drupalPostForm(NULL, array(), t('Save field settings'));
+
+    // Add the view to the test field.
+    $edit = array(
+      'settings[handler]' => 'views',
+    );
+    $this->drupalPostAjaxForm(NULL, $edit, 'settings[handler]');
+    $edit = array(
+      'required' => FALSE,
+      'settings[handler_settings][view][view_and_display]' => 'node_test_view:entity_reference_1',
+    );
+    $this->drupalPostForm(NULL, $edit, t('Save settings'));
+
+    // Create a node.
+    $edit = array(
+      'title[0][value]' => 'Foo Node',
+    );
+    $this->drupalPostForm('node/add/' . $this->type, $edit, t('Save'));
+
+    // Try to add a new node and fill the entity reference field.
+    $this->drupalGet('node/add/' . $this->type);
+    $result = $this->xpath('//input[@name="field_test_entity_ref_field[0][target_id]" and contains(@data-autocomplete-path, "/entity_reference_autocomplete/node/views/")]');
+    $target_url = $this->getAbsoluteUrl($result[0]['data-autocomplete-path']);
+    $this->drupalGet($target_url, array('query' => array('q' => 'Foo')));
+    $this->assertRaw('Foo');
   }
 
   /**
diff --git a/core/modules/entity_reference/src/Tests/EntityReferenceFieldTranslatedReferenceViewTest.php b/core/modules/entity_reference/src/Tests/EntityReferenceFieldTranslatedReferenceViewTest.php
index 648920b7e..f72a4de4f 100644
--- a/core/modules/entity_reference/src/Tests/EntityReferenceFieldTranslatedReferenceViewTest.php
+++ b/core/modules/entity_reference/src/Tests/EntityReferenceFieldTranslatedReferenceViewTest.php
@@ -188,7 +188,7 @@ class EntityReferenceFieldTranslatedReferenceViewTest extends WebTestBase {
       'entity_type' => $this->testEntityTypeName,
       'type' => 'entity_reference',
       'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
-      'translatable' => FALSE,
+      'translatable' => TRUE,
       'settings' => array(
         'allowed_values' => array(
           array(
@@ -292,7 +292,7 @@ class EntityReferenceFieldTranslatedReferenceViewTest extends WebTestBase {
       'langcode' => $this->baseLangcode,
     ));
     $node->save();
-    $node->addTranslation($this->translateToLangcode, array());
+    $node->addTranslation($this->translateToLangcode, $node->toArray());
     $node->save();
 
     return $node;
diff --git a/core/modules/field/src/Entity/FieldConfig.php b/core/modules/field/src/Entity/FieldConfig.php
index 500fa426c..6054d0221 100644
--- a/core/modules/field/src/Entity/FieldConfig.php
+++ b/core/modules/field/src/Entity/FieldConfig.php
@@ -110,12 +110,12 @@ class FieldConfig extends FieldConfigBase implements FieldConfigInterface {
         throw new FieldException('Attempt to create a field without a field_name.');
       }
       if (empty($values['entity_type'])) {
-        throw new FieldException(SafeMarkup::format('Attempt to create a field @field_name without an entity_type.', array('@field_name' => $values['field_name'])));
+        throw new FieldException("Attempt to create a field '{$values['field_name']}' without an entity_type.");
       }
     }
     // 'bundle' is required in either case.
     if (empty($values['bundle'])) {
-      throw new FieldException(SafeMarkup::format('Attempt to create a field @field_name without a bundle.', array('@field_name' => $values['field_name'])));
+      throw new FieldException("Attempt to create a field '{$values['field_name']}' without a bundle.");
     }
 
     parent::__construct($values, $entity_type);
@@ -288,9 +288,10 @@ class FieldConfig extends FieldConfigBase implements FieldConfigInterface {
     if (!$this->fieldStorage) {
       $fields = $this->entityManager()->getFieldStorageDefinitions($this->entity_type);
       if (!isset($fields[$this->field_name])) {
-        throw new FieldException(SafeMarkup::format('Attempt to create a field @field_name that does not exist on entity type @entity_type.', array('@field_name' => $this->field_name, '@entity_type' => $this->entity_type)));      }
+        throw new FieldException('Attempt to create a field {$this->field_name} that does not exist on entity type {$this->entity_type}.');
+      }
       if (!$fields[$this->field_name] instanceof FieldStorageConfigInterface) {
-        throw new FieldException(SafeMarkup::format('Attempt to create a configurable field of non-configurable field storage @field_name.', array('@field_name' => $this->field_name, '@entity_type' => $this->entity_type)));
+        throw new FieldException("Attempt to create a configurable field of non-configurable field storage {$this->field_name}.");
       }
       $this->fieldStorage = $fields[$this->field_name];
     }
diff --git a/core/modules/field/src/Entity/FieldStorageConfig.php b/core/modules/field/src/Entity/FieldStorageConfig.php
index 66b6fff4d..5fff1aa59 100644
--- a/core/modules/field/src/Entity/FieldStorageConfig.php
+++ b/core/modules/field/src/Entity/FieldStorageConfig.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\field\Entity;
 
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Config\Entity\ConfigEntityBase;
 use Drupal\Core\Entity\EntityStorageInterface;
@@ -242,13 +241,13 @@ class FieldStorageConfig extends ConfigEntityBase implements FieldStorageConfigI
       throw new FieldException('Attempt to create a field storage without a field name.');
     }
     if (!preg_match('/^[_a-z]+[_a-z0-9]*$/', $values['field_name'])) {
-      throw new FieldException(SafeMarkup::format('Attempt to create a field storage @field_name with invalid characters. Only lowercase alphanumeric characters and underscores are allowed, and only lowercase letters and underscore are allowed as the first character', array('@field_name' => $values['field_name'])));
+      throw new FieldException("Attempt to create a field storage {$values['field_name']} with invalid characters. Only lowercase alphanumeric characters and underscores are allowed, and only lowercase letters and underscore are allowed as the first character");
     }
     if (empty($values['type'])) {
-      throw new FieldException(SafeMarkup::format('Attempt to create a field storage @field_name with no type.', array('@field_name' => $values['field_name'])));
+      throw new FieldException("Attempt to create a field storage {$values['field_name']} with no type.");
     }
     if (empty($values['entity_type'])) {
-      throw new FieldException(SafeMarkup::format('Attempt to create a field storage @field_name with no entity_type.', array('@field_name' => $values['field_name'])));
+      throw new FieldException("Attempt to create a field storage {$values['field_name']} with no entity_type.");
     }
 
     parent::__construct($values, $entity_type);
@@ -309,24 +308,19 @@ class FieldStorageConfig extends ConfigEntityBase implements FieldStorageConfigI
     // We use Unicode::strlen() because the DB layer assumes that column widths
     // are given in characters rather than bytes.
     if (Unicode::strlen($this->getName()) > static::NAME_MAX_LENGTH) {
-      throw new FieldException(SafeMarkup::format(
-        'Attempt to create a field storage with an name longer than @max characters: %name', array(
-          '@max' => static::NAME_MAX_LENGTH,
-          '%name' => $this->getName(),
-        )
-      ));
+      throw new FieldException('Attempt to create a field storage with an name longer than ' . static::NAME_MAX_LENGTH . ' characters: ' . $this->getName());
     }
 
     // Disallow reserved field names.
     $disallowed_field_names = array_keys($entity_manager->getBaseFieldDefinitions($this->getTargetEntityTypeId()));
     if (in_array($this->getName(), $disallowed_field_names)) {
-      throw new FieldException(SafeMarkup::format('Attempt to create field storage %name which is reserved by entity type %type.', array('%name' => $this->getName(), '%type' => $this->getTargetEntityTypeId())));
+      throw new FieldException("Attempt to create field storage {$this->getName()} which is reserved by entity type {$this->getTargetEntityTypeId()}.");
     }
 
     // Check that the field type is known.
     $field_type = $field_type_manager->getDefinition($this->getType(), FALSE);
     if (!$field_type) {
-      throw new FieldException(SafeMarkup::format('Attempt to create a field storage of unknown type %type.', array('%type' => $this->getType())));
+      throw new FieldException("Attempt to create a field storage of unknown type {$this->getType()}.");
     }
     $this->module = $field_type['provider'];
 
diff --git a/core/modules/field/src/ProxyClass/FieldUninstallValidator.php b/core/modules/field/src/ProxyClass/FieldUninstallValidator.php
new file mode 100644
index 000000000..89667bff1
--- /dev/null
+++ b/core/modules/field/src/ProxyClass/FieldUninstallValidator.php
@@ -0,0 +1,92 @@
+<?php
+
+/**
+ * @file
+ * Contains Drupal\field\ProxyClass\FieldUninstallValidator.
+ */
+
+/**
+ * This file was generated via php core/scripts/generate-proxy-class.php 'Drupal\field\FieldUninstallValidator' "core/modules/field/src".
+ */
+
+namespace Drupal\field\ProxyClass {
+
+    /**
+     * Provides a proxy class for \Drupal\field\FieldUninstallValidator.
+     *
+     * @see \Drupal\Component\ProxyBuilder
+     */
+    class FieldUninstallValidator implements \Drupal\Core\Extension\ModuleUninstallValidatorInterface
+    {
+
+        use \Drupal\Core\DependencyInjection\DependencySerializationTrait;
+
+        /**
+         * The id of the original proxied service.
+         *
+         * @var string
+         */
+        protected $drupalProxyOriginalServiceId;
+
+        /**
+         * The real proxied service, after it was lazy loaded.
+         *
+         * @var \Drupal\field\FieldUninstallValidator
+         */
+        protected $service;
+
+        /**
+         * The service container.
+         *
+         * @var \Symfony\Component\DependencyInjection\ContainerInterface
+         */
+        protected $container;
+
+        /**
+         * Constructs a ProxyClass Drupal proxy object.
+         *
+         * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
+         *   The container.
+         * @param string $drupal_proxy_original_service_id
+         *   The service ID of the original service.
+         */
+        public function __construct(\Symfony\Component\DependencyInjection\ContainerInterface $container, $drupal_proxy_original_service_id)
+        {
+            $this->container = $container;
+            $this->drupalProxyOriginalServiceId = $drupal_proxy_original_service_id;
+        }
+
+        /**
+         * Lazy loads the real service from the container.
+         *
+         * @return object
+         *   Returns the constructed real service.
+         */
+        protected function lazyLoadItself()
+        {
+            if (!isset($this->service)) {
+                $this->service = $this->container->get($this->drupalProxyOriginalServiceId);
+            }
+
+            return $this->service;
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function validate($module)
+        {
+            return $this->lazyLoadItself()->validate($module);
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function setStringTranslation(\Drupal\Core\StringTranslation\TranslationInterface $translation)
+        {
+            return $this->lazyLoadItself()->setStringTranslation($translation);
+        }
+
+    }
+
+}
diff --git a/core/modules/field/src/Tests/EntityReference/EntityReferenceFormatterTest.php b/core/modules/field/src/Tests/EntityReference/EntityReferenceFormatterTest.php
index 6f04ba2bf..3c7b9d6c5 100644
--- a/core/modules/field/src/Tests/EntityReference/EntityReferenceFormatterTest.php
+++ b/core/modules/field/src/Tests/EntityReference/EntityReferenceFormatterTest.php
@@ -200,11 +200,8 @@ class EntityReferenceFormatterTest extends EntityUnitTestBase {
 ';
     $renderer->renderRoot($build[0]);
     $this->assertEqual($build[0]['#markup'], 'default | ' . $this->referencedEntity->label() .  $expected_rendered_name_field_1 . $expected_rendered_body_field_1, sprintf('The markup returned by the %s formatter is correct for an item with a saved entity.', $formatter));
-    $expected_cache_tags = Cache::mergeTags(
-      \Drupal::entityManager()->getViewBuilder($this->entityType)->getCacheTags(),
-      $this->referencedEntity->getCacheTags(),
-      FilterFormat::load('full_html')->getCacheTags()
-    );
+    $expected_cache_tags = Cache::mergeTags(\Drupal::entityManager()->getViewBuilder($this->entityType)->getCacheTags(), $this->referencedEntity->getCacheTags());
+    $expected_cache_tags = Cache::mergeTags($expected_cache_tags, FilterFormat::load('full_html')->getCacheTags());
     $this->assertEqual($build[0]['#cache']['tags'], $expected_cache_tags, format_string('The @formatter formatter has the expected cache tags.', array('@formatter' => $formatter)));
 
     // Test the second field item.
diff --git a/core/modules/field/src/Tests/FieldDataCountTest.php b/core/modules/field/src/Tests/FieldDataCountTest.php
index ebf0591de..aef5e7e82 100644
--- a/core/modules/field/src/Tests/FieldDataCountTest.php
+++ b/core/modules/field/src/Tests/FieldDataCountTest.php
@@ -29,6 +29,11 @@ class FieldDataCountTest extends FieldUnitTestBase {
    */
   protected $storageRev;
 
+  /**
+   * @var \Drupal\Core\Entity\DynamicallyFieldableEntityStorageInterface
+   */
+  protected $storageUser;
+
   /**
    * {@inheritdoc}
    */
@@ -37,6 +42,7 @@ class FieldDataCountTest extends FieldUnitTestBase {
     $this->installEntitySchema('entity_test_rev');
     $this->storage = \Drupal::entityManager()->getStorage('entity_test');
     $this->storageRev = \Drupal::entityManager()->getStorage('entity_test_rev');
+    $this->storageUser = \Drupal::entityManager()->getStorage('user');
   }
 
   /**
@@ -136,4 +142,22 @@ class FieldDataCountTest extends FieldUnitTestBase {
     $this->assertEqual(count($entity->{$this->fieldTestData->field_name_2}), $cardinality, format_string('Revision %revision_id: expected number of values.', array('%revision_id' => $first_revision)));
   }
 
+  /**
+   * Verify that we can count a table that contains an entry with index 0.
+   */
+  public function testCountWithIndex0() {
+    // Create an entry for the anonymous user, who has user ID 0.
+    $user = $this->storageUser
+      ->create(array(
+        'uid' => 0,
+        'name' => 'anonymous',
+        'mail' => NULL,
+        'status' => FALSE,
+      ));
+    $user->save();
+
+    $storage = $user->getFieldDefinition('name')->getFieldStorageDefinition();
+    $this->assertIdentical(TRUE, $this->storageUser->countFieldData($storage, TRUE));
+  }
+
 }
diff --git a/core/modules/field/tests/modules/field_test/config/schema/field_test.schema.yml b/core/modules/field/tests/modules/field_test/config/schema/field_test.schema.yml
index 48f5dcf37..8e06db17b 100644
--- a/core/modules/field/tests/modules/field_test/config/schema/field_test.schema.yml
+++ b/core/modules/field/tests/modules/field_test/config/schema/field_test.schema.yml
@@ -65,6 +65,9 @@ field.storage_settings.test_field:
     config_data_from_storage_setting:
       type: boolean
       label: 'Test FieldItemInterface::storageSettingsToConfigData()'
+    translatable_storage_setting:
+      type: label
+      label: 'Translatable storage setting'
 
 field.storage_settings.test_field_with_dependencies:
   type: field.storage_settings.test_field
@@ -88,6 +91,9 @@ field.field_settings.test_field:
     config_data_from_field_setting:
       type: boolean
       label: 'Test FieldItemInterface::fieldSettingsToConfigData()'
+    translatable_field_setting:
+      type: label
+      label: 'Translatable field setting'
 
 field.field_settings.test_field_with_dependencies:
   type: field.field_settings.test_field
diff --git a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/TestItem.php b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/TestItem.php
index 9886b0307..42eb11e8d 100644
--- a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/TestItem.php
+++ b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/TestItem.php
@@ -33,6 +33,7 @@ class TestItem extends FieldItemBase {
       'test_field_storage_setting' => 'dummy test string',
       'changeable' => 'a changeable field storage setting',
       'unchangeable' => 'an unchangeable field storage setting',
+      'translatable_storage_setting' => 'a translatable field storage setting',
     ) + parent::defaultStorageSettings();
   }
 
@@ -42,6 +43,7 @@ class TestItem extends FieldItemBase {
   public static function defaultFieldSettings() {
     return array(
       'test_field_setting' => 'dummy test string',
+      'translatable_field_setting' => 'a translatable field setting',
     ) + parent::defaultFieldSettings();
   }
 
diff --git a/core/modules/field/tests/src/Unit/FieldConfigEntityUnitTest.php b/core/modules/field/tests/src/Unit/FieldConfigEntityUnitTest.php
index 2bce97d08..f249c6c15 100644
--- a/core/modules/field/tests/src/Unit/FieldConfigEntityUnitTest.php
+++ b/core/modules/field/tests/src/Unit/FieldConfigEntityUnitTest.php
@@ -178,7 +178,7 @@ class FieldConfigEntityUnitTest extends UnitTestCase {
    * Test that invalid bundles are handled.
    *
    * @expectedException \LogicException
-   * @expectedExceptionMessage Missing bundle entity, entity type <em class="placeholder">bundle_entity_type</em>, entity id <em class="placeholder">test_bundle_not_exists</em>.
+   * @expectedExceptionMessage Missing bundle entity, entity type bundle_entity_type, entity id test_bundle_not_exists.
    */
   public function testCalculateDependenciesIncorrectBundle() {
     $storage = $this->getMock('\Drupal\Core\Config\Entity\ConfigEntityStorageInterface');
diff --git a/core/modules/field_ui/field_ui.js b/core/modules/field_ui/field_ui.js
index f73df41d5..c15e4a01c 100644
--- a/core/modules/field_ui/field_ui.js
+++ b/core/modules/field_ui/field_ui.js
@@ -9,6 +9,9 @@
 
   /**
    * @type {Drupal~behavior}
+   *
+   * @prop {Drupal~behaviorAttach} attach
+   *   Adds behaviors to the field storage add form.
    */
   Drupal.behaviors.fieldUIFieldStorageAddForm = {
     attach: function (context) {
@@ -56,8 +59,14 @@
   };
 
   /**
+   * Attaches the fieldUIOverview behavior.
    *
    * @type {Drupal~behavior}
+   *
+   * @prop {Drupal~behaviorAttach} attach
+   *   Attaches the fieldUIOverview behavior.
+   *
+   * @see Drupal.fieldUIOverview.attach
    */
   Drupal.behaviors.fieldUIDisplayOverview = {
     attach: function (context, settings) {
@@ -68,6 +77,8 @@
   };
 
   /**
+   * Namespace for the field UI overview.
+   *
    * @namespace
    */
   Drupal.fieldUIOverview = {
@@ -76,8 +87,11 @@
      * Attaches the fieldUIOverview behavior.
      *
      * @param {HTMLTableElement} table
+     *   The table element for the overview.
      * @param {object} rowsData
+     *   The data of the rows in the table.
      * @param {object} rowHandlers
+     *   Handlers to be added to the rows.
      */
     attach: function (table, rowsData, rowHandlers) {
       var tableDrag = Drupal.tableDrag[table.id];
@@ -243,6 +257,7 @@
    *   Additional data to be populated in the constructed object.
    *
    * @return {Drupal.fieldUIDisplayOverview.field}
+   *   The field row handler constructed.
    */
   Drupal.fieldUIDisplayOverview.field = function (row, data) {
     this.row = row;
@@ -263,6 +278,7 @@
      * Returns the region corresponding to the current form values of the row.
      *
      * @return {string}
+     *   Either 'hidden' or 'content'.
      */
     getRegion: function () {
       return (this.$pluginSelect.val() === 'hidden') ? 'hidden' : 'content';
diff --git a/core/modules/field_ui/src/FieldUI.php b/core/modules/field_ui/src/FieldUI.php
index 598381770..42107d330 100644
--- a/core/modules/field_ui/src/FieldUI.php
+++ b/core/modules/field_ui/src/FieldUI.php
@@ -40,10 +40,15 @@ class FieldUI {
    * @param array $destinations
    *   An array of destinations to redirect to.
    *
-   * @return \Drupal\Core\Url
+   * @return \Drupal\Core\Url|null
    *   The next destination to redirect to.
    */
   public static function getNextDestination(array $destinations) {
+    // If there are no valid destinations left, return here.
+    if (empty($destinations)) {
+      return NULL;
+    }
+
     $next_destination = array_shift($destinations);
     if (is_array($next_destination)) {
       $next_destination['options']['query']['destinations'] = $destinations;
@@ -59,7 +64,7 @@ class FieldUI {
       }
       // Redirect to any given path within the same domain.
       // @todo Revisit this in https://www.drupal.org/node/2418219.
-      $next_destination = Url::fromUserInput('/' . $options['path']);
+      $next_destination = Url::fromUserInput('/' . $options['path'], $options);
     }
     return $next_destination;
   }
diff --git a/core/modules/field_ui/src/Form/EntityDisplayFormBase.php b/core/modules/field_ui/src/Form/EntityDisplayFormBase.php
index d675cef26..3ba0258a3 100644
--- a/core/modules/field_ui/src/Form/EntityDisplayFormBase.php
+++ b/core/modules/field_ui/src/Form/EntityDisplayFormBase.php
@@ -567,7 +567,7 @@ abstract class EntityDisplayFormBase extends EntityForm {
         if ($form_state->get('plugin_settings_update') === $field_name) {
           // Only store settings actually used by the selected plugin.
           $default_settings = $this->pluginManager->getDefaultSettings($options['type']);
-          $options['settings'] = array_intersect_key($values['settings_edit_form']['settings'], $default_settings);
+          $options['settings'] = isset($values['settings_edit_form']['settings']) ? array_intersect_key($values['settings_edit_form']['settings'], $default_settings) : [];
           $options['third_party_settings'] = isset($values['settings_edit_form']['third_party_settings']) ? $values['settings_edit_form']['third_party_settings'] : [];
           $form_state->set('plugin_settings_update', NULL);
         }
diff --git a/core/modules/field_ui/src/Form/EntityDisplayModeAddForm.php b/core/modules/field_ui/src/Form/EntityDisplayModeAddForm.php
index d6d801b75..350a2e99b 100644
--- a/core/modules/field_ui/src/Form/EntityDisplayModeAddForm.php
+++ b/core/modules/field_ui/src/Form/EntityDisplayModeAddForm.php
@@ -38,8 +38,8 @@ class EntityDisplayModeAddForm extends EntityDisplayModeFormBase {
   /**
    * {@inheritdoc}
    */
-  public function validate(array $form, FormStateInterface $form_state) {
-    parent::validate($form, $form_state);
+  public function validateForm(array &$form, FormStateInterface $form_state) {
+    parent::validateForm($form, $form_state);
 
     $form_state->setValueForElement($form['id'], $this->targetEntityTypeId . '.' . $form_state->getValue('id'));
   }
diff --git a/core/modules/field_ui/src/Form/FieldConfigEditForm.php b/core/modules/field_ui/src/Form/FieldConfigEditForm.php
index 866ff9a48..52ace9581 100644
--- a/core/modules/field_ui/src/Form/FieldConfigEditForm.php
+++ b/core/modules/field_ui/src/Form/FieldConfigEditForm.php
@@ -150,8 +150,8 @@ class FieldConfigEditForm extends EntityForm {
   /**
    * {@inheritdoc}
    */
-  public function validate(array $form, FormStateInterface $form_state) {
-    parent::validate($form, $form_state);
+  public function validateForm(array &$form, FormStateInterface $form_state) {
+    parent::validateForm($form, $form_state);
 
     if (isset($form['default_value'])) {
       $item = $form['#entity']->get($this->entity->getName());
diff --git a/core/modules/field_ui/src/Form/FieldStorageConfigEditForm.php b/core/modules/field_ui/src/Form/FieldStorageConfigEditForm.php
index 58c4ea903..adafcc790 100644
--- a/core/modules/field_ui/src/Form/FieldStorageConfigEditForm.php
+++ b/core/modules/field_ui/src/Form/FieldStorageConfigEditForm.php
@@ -146,8 +146,8 @@ class FieldStorageConfigEditForm extends EntityForm {
   /**
    * {@inheritdoc}
    */
-  public function validate(array $form, FormStateInterface $form_state) {
-    parent::validate($form, $form_state);
+  public function validateForm(array &$form, FormStateInterface $form_state) {
+    parent::validateForm($form, $form_state);
 
     // Validate field cardinality.
     if ($form_state->getValue('cardinality') === 'number' && !$form_state->getValue('cardinality_number')) {
diff --git a/core/modules/field_ui/src/Tests/ManageDisplayTest.php b/core/modules/field_ui/src/Tests/ManageDisplayTest.php
index 04a353fcb..9ed319f26 100644
--- a/core/modules/field_ui/src/Tests/ManageDisplayTest.php
+++ b/core/modules/field_ui/src/Tests/ManageDisplayTest.php
@@ -163,6 +163,11 @@ class ManageDisplayTest extends WebTestBase {
     $edit = array('fields[field_test][type]' => 'field_no_settings', 'refresh_rows' => 'field_test');
     $this->drupalPostAjaxForm(NULL, $edit, array('op' => t('Refresh')));
     $this->assertFieldByName('field_test_settings_edit');
+
+    // Make sure we can save the third party settings when there are no settings available
+    $this->drupalPostAjaxForm(NULL, array(), "field_test_settings_edit");
+    $this->drupalPostAjaxForm(NULL, $edit, "field_test_plugin_settings_update");
+
     // Uninstall the module providing third party settings and ensure the button
     // is no longer there.
     \Drupal::service('module_installer')->uninstall(array('field_third_party_test'));
diff --git a/core/modules/field_ui/src/Tests/ManageFieldsTest.php b/core/modules/field_ui/src/Tests/ManageFieldsTest.php
index 3b90bffc5..3b2ac3eba 100644
--- a/core/modules/field_ui/src/Tests/ManageFieldsTest.php
+++ b/core/modules/field_ui/src/Tests/ManageFieldsTest.php
@@ -616,6 +616,20 @@ class ManageFieldsTest extends WebTestBase {
     $this->assertUrl($url, array(), 'Stayed on the same page.');
   }
 
+  /**
+   * Tests that external URLs in the 'destinations' query parameter are blocked.
+   */
+  public function testExternalDestinations() {
+    $options = [
+      'query' => ['destinations' => ['http://example.com']],
+    ];
+    $this->drupalPostForm('admin/structure/types/manage/article/fields/node.article.body/storage', [], 'Save field settings', $options);
+    // The external redirect should not fire.
+    $this->assertUrl('admin/structure/types/manage/article/fields/node.article.body/storage', $options);
+    $this->assertResponse(200);
+    $this->assertRaw('Attempt to update field <em class="placeholder">Body</em> failed: <em class="placeholder">The internal path component &#039;http://example.com&#039; is external. You are not allowed to specify an external URL together with internal:/.</em>.');
+  }
+
   /**
    * Tests that deletion removes field storages and fields as expected for a term.
    */
diff --git a/core/modules/field_ui/tests/src/Unit/FieldUiTest.php b/core/modules/field_ui/tests/src/Unit/FieldUiTest.php
new file mode 100644
index 000000000..fc055bf12
--- /dev/null
+++ b/core/modules/field_ui/tests/src/Unit/FieldUiTest.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field_ui\Unit\FieldUiTest.
+ */
+
+namespace Drupal\Tests\field_ui\Unit;
+
+use Drupal\Core\DependencyInjection\ContainerBuilder;
+use Drupal\field_ui\FieldUI;
+use Drupal\Tests\UnitTestCase;
+
+/**
+ * @coversDefaultClass \Drupal\field_ui\FieldUI
+ *
+ * @group field_ui
+ */
+class FieldUiTest extends UnitTestCase {
+
+  /**
+   * The path validator.
+   *
+   * @var \Drupal\Core\Path\PathValidatorInterface|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $pathValidator;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->pathValidator = $this->getMock('Drupal\Core\Path\PathValidatorInterface');
+    $container = new ContainerBuilder();
+    $container->set('path.validator', $this->pathValidator);
+    \Drupal::setContainer($container);
+  }
+
+  /**
+   * @covers ::getNextDestination
+   */
+  public function testGetNextDestination() {
+    $destinations = ['admin', 'admin/content'];
+    $expected_uri = 'base:admin';
+    $expected_query = [
+      'destinations' => ['admin/content'],
+    ];
+    $actual = FieldUI::getNextDestination($destinations);
+    $this->assertSame($expected_uri, $actual->getUri());
+    $this->assertSame($expected_query, $actual->getOption('query'));
+  }
+
+  /**
+   * @covers ::getNextDestination
+   */
+  public function testGetNextDestinationEmpty() {
+    $destinations = [];
+    $actual = FieldUI::getNextDestination($destinations);
+    $this->assertNull($actual);
+  }
+
+  /**
+   * @covers ::getNextDestination
+   */
+  public function testGetNextDestinationRouteName() {
+    $destinations = [['route_name' => 'system.admin'], ['route_name' => 'system.admin_content']];
+    $expected_route_name = 'system.admin';
+    $expected_query = [
+      'destinations' => [['route_name' => 'system.admin_content']],
+    ];
+    $actual = FieldUI::getNextDestination($destinations);
+    $this->assertSame($expected_route_name, $actual->getRouteName());
+    $this->assertSame($expected_query, $actual->getOption('query'));
+  }
+
+}
diff --git a/core/modules/file/file.module b/core/modules/file/file.module
index 01b4ddb71..a99591678 100644
--- a/core/modules/file/file.module
+++ b/core/modules/file/file.module
@@ -6,8 +6,10 @@
  */
 
 use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Core\Datetime\Entity\DateFormat;
 use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\Core\Render\Element;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Url;
@@ -631,6 +633,7 @@ function file_file_download($uri) {
  */
 function file_cron() {
   $age = \Drupal::config('system.file')->get('temporary_maximum_age');
+  $file_storage = \Drupal::entityManager()->getStorage('file');
 
   // Only delete temporary files if older than $age. Note that automatic cleanup
   // is disabled if $age set to 0.
@@ -640,7 +643,7 @@ function file_cron() {
       ->condition('changed', REQUEST_TIME - $age, '<')
       ->range(0, 100)
       ->execute();
-    $files = file_load_multiple($fids);
+    $files = $file_storage->loadMultiple($fids);
     foreach ($files as $file) {
       $references = \Drupal::service('file.usage')->listUsage($file);
       if (empty($references)) {
@@ -937,7 +940,7 @@ function file_file_predelete(File $file) {
 /**
  * Implements hook_tokens().
  */
-function file_tokens($type, $tokens, array $data = array(), array $options = array()) {
+function file_tokens($type, $tokens, array $data, array $options, BubbleableMetadata $bubbleable_metadata) {
   $token_service = \Drupal::token();
 
   $url_options = array('absolute' => TRUE);
@@ -986,30 +989,36 @@ function file_tokens($type, $tokens, array $data = array(), array $options = arr
 
         // These tokens are default variations on the chained tokens handled below.
         case 'created':
+          $date_format = DateFormat::load('medium');
+          $bubbleable_metadata->addCacheableDependency($date_format);
           $replacements[$original] = format_date($file->getCreatedTime(), 'medium', '', NULL, $langcode);
           break;
 
         case 'changed':
+          $date_format = DateFormat::load('medium');
+          $bubbleable_metadata = $bubbleable_metadata->addCacheableDependency($date_format);
           $replacements[$original] = format_date($file->getChangedTime(), 'medium', '', NULL, $langcode);
           break;
 
         case 'owner':
-          $name = $file->getOwner()->label();
+          $owner = $file->getOwner();
+          $bubbleable_metadata->addCacheableDependency($owner);
+          $name = $owner->label();
           $replacements[$original] = $sanitize ? SafeMarkup::checkPlain($name) : $name;
           break;
       }
     }
 
     if ($date_tokens = $token_service->findWithPrefix($tokens, 'created')) {
-      $replacements += $token_service->generate('date', $date_tokens, array('date' => $file->getCreatedTime()), $options);
+      $replacements += $token_service->generate('date', $date_tokens, array('date' => $file->getCreatedTime()), $options, $bubbleable_metadata);
     }
 
     if ($date_tokens = $token_service->findWithPrefix($tokens, 'changed')) {
-      $replacements += $token_service->generate('date', $date_tokens, array('date' => $file->getChangedTime()), $options);
+      $replacements += $token_service->generate('date', $date_tokens, array('date' => $file->getChangedTime()), $options, $bubbleable_metadata);
     }
 
     if (($owner_tokens = $token_service->findWithPrefix($tokens, 'owner')) && $file->getOwner()) {
-      $replacements += $token_service->generate('user', $owner_tokens, array('user' => $file->getOwner()), $options);
+      $replacements += $token_service->generate('user', $owner_tokens, array('user' => $file->getOwner()), $options, $bubbleable_metadata);
     }
   }
 
@@ -1225,7 +1234,7 @@ function template_preprocess_file_link(&$variables) {
   $file = $variables['file'];
   $options = array();
 
-  $file_entity = ($file instanceof File) ? $file : file_load($file->fid);
+  $file_entity = ($file instanceof File) ? $file : File::load($file->fid);
   $url = file_create_url($file_entity->getFileUri());
 
   $mime_type = $file->getMimeType();
diff --git a/core/modules/file/src/Controller/FileWidgetAjaxController.php b/core/modules/file/src/Controller/FileWidgetAjaxController.php
index 1c1b7e3a7..d05a4dd7b 100644
--- a/core/modules/file/src/Controller/FileWidgetAjaxController.php
+++ b/core/modules/file/src/Controller/FileWidgetAjaxController.php
@@ -7,13 +7,12 @@
 
 namespace Drupal\file\Controller;
 
-use Drupal\system\Controller\FormAjaxController;
 use Symfony\Component\HttpFoundation\JsonResponse;
 
 /**
  * Defines a controller to respond to file widget AJAX requests.
  */
-class FileWidgetAjaxController extends FormAjaxController {
+class FileWidgetAjaxController {
 
   /**
    * Returns the progress status for a file upload process.
diff --git a/core/modules/file/src/Plugin/Field/FieldType/FileFieldItemList.php b/core/modules/file/src/Plugin/Field/FieldType/FileFieldItemList.php
index f8ee03c84..90dcaa913 100644
--- a/core/modules/file/src/Plugin/Field/FieldType/FileFieldItemList.php
+++ b/core/modules/file/src/Plugin/Field/FieldType/FileFieldItemList.php
@@ -23,59 +23,54 @@ class FileFieldItemList extends EntityReferenceFieldItemList {
   /**
    * {@inheritdoc}
    */
-  public function insert() {
-    parent::insert();
+  public function postSave($update) {
     $entity = $this->getEntity();
 
-    // Add a new usage for newly uploaded files.
-    foreach ($this->referencedEntities() as $file) {
-      \Drupal::service('file.usage')->add($file, 'file', $entity->getEntityTypeId(), $entity->id());
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function update() {
-    parent::update();
-    $entity = $this->getEntity();
-
-    // Get current target file entities and file IDs.
-    $files = $this->referencedEntities();
-    $fids = array();
-
-    foreach ($files as $file) {
-      $fids[] = $file->id();
-    }
-
-    // On new revisions, all files are considered to be a new usage and no
-    // deletion of previous file usages are necessary.
-    if (!empty($entity->original) && $entity->getRevisionId() != $entity->original->getRevisionId()) {
-      foreach ($files as $file) {
+    if (!$update) {
+      // Add a new usage for newly uploaded files.
+      foreach ($this->referencedEntities() as $file) {
         \Drupal::service('file.usage')->add($file, 'file', $entity->getEntityTypeId(), $entity->id());
       }
-      return;
     }
+    else {
+      // Get current target file entities and file IDs.
+      $files = $this->referencedEntities();
+      $ids = array();
 
-    // Get the file IDs attached to the field before this update.
-    $field_name = $this->getFieldDefinition()->getName();
-    $original_fids = array();
-    $original_items = $entity->original->getTranslation($this->getLangcode())->$field_name;
-    foreach ($original_items as $item) {
-      $original_fids[] = $item->target_id;
-    }
+      /** @var \Drupal\file\FileInterface $file */
+      foreach ($files as $file) {
+        $ids[] = $file->id();
+      }
 
-    // Decrement file usage by 1 for files that were removed from the field.
-    $removed_fids = array_filter(array_diff($original_fids, $fids));
-    $removed_files = \Drupal::entityManager()->getStorage('file')->loadMultiple($removed_fids);
-    foreach ($removed_files as $file) {
-      \Drupal::service('file.usage')->delete($file, 'file', $entity->getEntityTypeId(), $entity->id());
-    }
+      // On new revisions, all files are considered to be a new usage and no
+      // deletion of previous file usages are necessary.
+      if (!empty($entity->original) && $entity->getRevisionId() != $entity->original->getRevisionId()) {
+        foreach ($files as $file) {
+          \Drupal::service('file.usage')->add($file, 'file', $entity->getEntityTypeId(), $entity->id());
+        }
+        return;
+      }
 
-    // Add new usage entries for newly added files.
-    foreach ($files as $file) {
-      if (!in_array($file->id(), $original_fids)) {
-        \Drupal::service('file.usage')->add($file, 'file', $entity->getEntityTypeId(), $entity->id());
+      // Get the file IDs attached to the field before this update.
+      $field_name = $this->getFieldDefinition()->getName();
+      $original_ids = array();
+      $original_items = $entity->original->getTranslation($this->getLangcode())->$field_name;
+      foreach ($original_items as $item) {
+        $original_ids[] = $item->target_id;
+      }
+
+      // Decrement file usage by 1 for files that were removed from the field.
+      $removed_ids = array_filter(array_diff($original_ids, $ids));
+      $removed_files = \Drupal::entityManager()->getStorage('file')->loadMultiple($removed_ids);
+      foreach ($removed_files as $file) {
+        \Drupal::service('file.usage')->delete($file, 'file', $entity->getEntityTypeId(), $entity->id());
+      }
+
+      // Add new usage entries for newly added files.
+      foreach ($files as $file) {
+        if (!in_array($file->id(), $original_ids)) {
+          \Drupal::service('file.usage')->add($file, 'file', $entity->getEntityTypeId(), $entity->id());
+        }
       }
     }
   }
diff --git a/core/modules/file/src/Plugin/Field/FieldWidget/FileWidget.php b/core/modules/file/src/Plugin/Field/FieldWidget/FileWidget.php
index fbc30d89e..a2d1fefc6 100644
--- a/core/modules/file/src/Plugin/Field/FieldWidget/FileWidget.php
+++ b/core/modules/file/src/Plugin/Field/FieldWidget/FileWidget.php
@@ -20,6 +20,7 @@ use Drupal\Core\Render\ElementInfoManagerInterface;
 use Drupal\Core\Url;
 use Drupal\file\Element\ManagedFile;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Drupal\file\Entity\File;
 
 /**
  * Plugin implementation of the 'file_generic' widget.
@@ -346,10 +347,10 @@ class FileWidget extends WidgetBase implements ContainerFactoryPluginInterface {
       $removed_files = array_slice($values['fids'], $keep);
       $removed_names = array();
       foreach ($removed_files as $fid) {
-        $file = file_load($fid);
+        $file = File::load($fid);
         $removed_names[] = $file->getFilename();
       }
-      $args = array('%field' => $field_storage->getFieldName(), '@max' => $field_storage->getCardinality(), '@count' => $keep, '%list' => implode(', ', $removed_names));
+      $args = array('%field' => $field_storage->getName(), '@max' => $field_storage->getCardinality(), '@count' => $uploaded, '%list' => implode(', ', $removed_names));
       $message = t('Field %field can only hold @max values but there were @count uploaded. The following files have been omitted as a result: %list.', $args);
       drupal_set_message($message, 'warning');
       $values['fids'] = array_slice($values['fids'], 0, $keep);
diff --git a/core/modules/file/src/Tests/CopyTest.php b/core/modules/file/src/Tests/CopyTest.php
index 4b9444901..68c589bef 100644
--- a/core/modules/file/src/Tests/CopyTest.php
+++ b/core/modules/file/src/Tests/CopyTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\file\Tests;
 
+use Drupal\file\Entity\File;
+
 /**
  * Tests the file copy function.
  *
@@ -39,7 +41,7 @@ class CopyTest extends FileManagedUnitTestBase {
 
     // Reload the file from the database and check that the changes were
     // actually saved.
-    $this->assertFileUnchanged($result, file_load($result->id(), TRUE));
+    $this->assertFileUnchanged($result, File::load($result->id()));
   }
 
   /**
@@ -66,9 +68,9 @@ class CopyTest extends FileManagedUnitTestBase {
 
     // Load all the affected files to check the changes that actually made it
     // to the database.
-    $loaded_source = file_load($source->id(), TRUE);
-    $loaded_target = file_load($target->id(), TRUE);
-    $loaded_result = file_load($result->id(), TRUE);
+    $loaded_source = File::load($source->id());
+    $loaded_target = File::load($target->id());
+    $loaded_result = File::load($result->id());
 
     // Verify that the source file wasn't changed.
     $this->assertFileUnchanged($source, $loaded_source);
@@ -106,9 +108,9 @@ class CopyTest extends FileManagedUnitTestBase {
 
     // Load all the affected files to check the changes that actually made it
     // to the database.
-    $loaded_source = file_load($source->id(), TRUE);
-    $loaded_target = file_load($target->id(), TRUE);
-    $loaded_result = file_load($result->id(), TRUE);
+    $loaded_source = File::load($source->id());
+    $loaded_target = File::load($target->id());
+    $loaded_result = File::load($result->id());
 
     // Verify that the source file wasn't changed.
     $this->assertFileUnchanged($source, $loaded_source);
@@ -141,7 +143,7 @@ class CopyTest extends FileManagedUnitTestBase {
     // Check that the correct hooks were called.
     $this->assertFileHooksCalled(array());
 
-    $this->assertFileUnchanged($source, file_load($source->id(), TRUE));
-    $this->assertFileUnchanged($target, file_load($target->id(), TRUE));
+    $this->assertFileUnchanged($source, File::load($source->id()));
+    $this->assertFileUnchanged($target, File::load($target->id()));
   }
 }
diff --git a/core/modules/file/src/Tests/DeleteTest.php b/core/modules/file/src/Tests/DeleteTest.php
index f89dfbff8..1ec037669 100644
--- a/core/modules/file/src/Tests/DeleteTest.php
+++ b/core/modules/file/src/Tests/DeleteTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\file\Tests;
 
+use Drupal\file\Entity\File;
+
 /**
  * Tests the file delete function.
  *
@@ -24,7 +26,7 @@ class DeleteTest extends FileManagedUnitTestBase {
     $file->delete();
     $this->assertFileHooksCalled(array('delete'));
     $this->assertFalse(file_exists($file->getFileUri()), 'Test file has actually been deleted.');
-    $this->assertFalse(file_load($file->id()), 'File was removed from the database.');
+    $this->assertFalse(File::load($file->id()), 'File was removed from the database.');
   }
 
   /**
@@ -40,7 +42,7 @@ class DeleteTest extends FileManagedUnitTestBase {
     $usage = $file_usage->listUsage($file);
     $this->assertEqual($usage['testing']['test'], array(1 => 1), 'Test file is still in use.');
     $this->assertTrue(file_exists($file->getFileUri()), 'File still exists on the disk.');
-    $this->assertTrue(file_load($file->id()), 'File still exists in the database.');
+    $this->assertTrue(File::load($file->id()), 'File still exists in the database.');
 
     // Clear out the call to hook_file_load().
     file_test_reset();
@@ -50,7 +52,7 @@ class DeleteTest extends FileManagedUnitTestBase {
     $this->assertFileHooksCalled(array('load', 'update'));
     $this->assertTrue(empty($usage), 'File usage data was removed.');
     $this->assertTrue(file_exists($file->getFileUri()), 'File still exists on the disk.');
-    $file = file_load($file->id());
+    $file = File::load($file->id());
     $this->assertTrue($file, 'File still exists in the database.');
     $this->assertTrue($file->isTemporary(), 'File is temporary.');
     file_test_reset();
@@ -69,6 +71,6 @@ class DeleteTest extends FileManagedUnitTestBase {
     // file_cron() loads
     $this->assertFileHooksCalled(array('delete'));
     $this->assertFalse(file_exists($file->getFileUri()), 'File has been deleted after its last usage was removed.');
-    $this->assertFalse(file_load($file->id()), 'File was removed from the database.');
+    $this->assertFalse(File::load($file->id()), 'File was removed from the database.');
   }
 }
diff --git a/core/modules/file/src/Tests/DownloadTest.php b/core/modules/file/src/Tests/DownloadTest.php
index 25aab9b68..d2df0d266 100644
--- a/core/modules/file/src/Tests/DownloadTest.php
+++ b/core/modules/file/src/Tests/DownloadTest.php
@@ -30,7 +30,7 @@ class DownloadTest extends FileManagedTestBase {
     $url = file_create_url($file->getFileUri());
     // URLs can't contain characters outside the ASCII set so $filename has to be
     // encoded.
-    $filename = $GLOBALS['base_url'] . '/' . file_stream_wrapper_get_instance_by_scheme('public')->getDirectoryPath() . '/' . rawurlencode($file->getFilename());
+    $filename = $GLOBALS['base_url'] . '/' . \Drupal::service('stream_wrapper_manager')->getViaScheme('public')->getDirectoryPath() . '/' . rawurlencode($file->getFilename());
     $this->assertEqual($filename, $url, 'Correctly generated a URL for a created file.');
     $this->drupalHead($url);
     $this->assertResponse(200, 'Confirmed that the generated URL is correct by downloading the created file.');
@@ -117,7 +117,7 @@ class DownloadTest extends FileManagedTestBase {
       $clean_urls = $clean_url_setting == 'clean';
       $request = $this->prepareRequestForGenerator($clean_urls);
       $base_path = $request->getSchemeAndHttpHost() . $request->getBasePath();
-      $this->checkUrl('public', '', $basename, $base_path . '/' . file_stream_wrapper_get_instance_by_scheme('public')->getDirectoryPath() . '/' . $basename_encoded);
+      $this->checkUrl('public', '', $basename, $base_path . '/' . \Drupal::service('stream_wrapper_manager')->getViaScheme('public')->getDirectoryPath() . '/' . $basename_encoded);
       $this->checkUrl('private', '', $basename, $base_path . '/' . $script_path . 'system/files/' . $basename_encoded);
     }
     $this->assertEqual(file_create_url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg=='), 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==', t('Generated URL matches expected URL.'));
diff --git a/core/modules/file/src/Tests/FileFieldDisplayTest.php b/core/modules/file/src/Tests/FileFieldDisplayTest.php
index f4db76525..5cbb9707d 100644
--- a/core/modules/file/src/Tests/FileFieldDisplayTest.php
+++ b/core/modules/file/src/Tests/FileFieldDisplayTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\file\Tests;
 
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
+use Drupal\file\Entity\File;
 
 /**
  * Tests the display of file fields in node and views.
@@ -57,7 +58,7 @@ class FileFieldDisplayTest extends FileFieldTestBase {
     $node_storage = $this->container->get('entity.manager')->getStorage('node');
     $node_storage->resetCache(array($nid));
     $node = $node_storage->load($nid);
-    $node_file = file_load($node->{$field_name}->target_id);
+    $node_file = File::load($node->{$field_name}->target_id);
     $file_link = array(
       '#theme' => 'file_link',
       '#file' => $node_file,
diff --git a/core/modules/file/src/Tests/FileFieldPathTest.php b/core/modules/file/src/Tests/FileFieldPathTest.php
index d7e034607..346fc7a27 100644
--- a/core/modules/file/src/Tests/FileFieldPathTest.php
+++ b/core/modules/file/src/Tests/FileFieldPathTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\file\Tests;
 
+use Drupal\file\Entity\File;
+
 /**
  * Tests that files are uploaded to proper locations.
  *
@@ -29,7 +31,7 @@ class FileFieldPathTest extends FileFieldTestBase {
     // Check that the file was uploaded to the file root.
     $node_storage->resetCache(array($nid));
     $node = $node_storage->load($nid);
-    $node_file = file_load($node->{$field_name}->target_id);
+    $node_file = File::load($node->{$field_name}->target_id);
     $this->assertPathMatch('public://' . $test_file->getFilename(), $node_file->getFileUri(), format_string('The file %file was uploaded to the correct path.', array('%file' => $node_file->getFileUri())));
 
     // Change the path to contain multiple subdirectories.
@@ -41,7 +43,7 @@ class FileFieldPathTest extends FileFieldTestBase {
     // Check that the file was uploaded into the subdirectory.
     $node_storage->resetCache(array($nid));
     $node = $node_storage->load($nid);
-    $node_file = file_load($node->{$field_name}->target_id, TRUE);
+    $node_file = File::load($node->{$field_name}->target_id);
     $this->assertPathMatch('public://foo/bar/baz/' . $test_file->getFilename(), $node_file->getFileUri(), format_string('The file %file was uploaded to the correct path.', array('%file' => $node_file->getFileUri())));
 
     // Check the path when used with tokens.
@@ -54,7 +56,7 @@ class FileFieldPathTest extends FileFieldTestBase {
     // Check that the file was uploaded into the subdirectory.
     $node_storage->resetCache(array($nid));
     $node = $node_storage->load($nid);
-    $node_file = file_load($node->{$field_name}->target_id);
+    $node_file = File::load($node->{$field_name}->target_id);
     // Do token replacement using the same user which uploaded the file, not
     // the user running the test case.
     $data = array('user' => $this->adminUser);
diff --git a/core/modules/file/src/Tests/FileFieldRSSContentTest.php b/core/modules/file/src/Tests/FileFieldRSSContentTest.php
index 7455301c6..5314a7bbb 100644
--- a/core/modules/file/src/Tests/FileFieldRSSContentTest.php
+++ b/core/modules/file/src/Tests/FileFieldRSSContentTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\file\Tests;
 
 use Drupal\node\Entity\Node;
+use Drupal\file\Entity\File;
 
 /**
  * Ensure that files added to nodes appear correctly in RSS feeds.
@@ -63,7 +64,7 @@ class FileFieldRSSContentTest extends FileFieldTestBase {
     // Get the uploaded file from the node.
     $node_storage->resetCache(array($nid));
     $node = $node_storage->load($nid);
-    $node_file = file_load($node->{$field_name}->target_id);
+    $node_file = File::load($node->{$field_name}->target_id);
 
     // Check that the RSS enclosure appears in the RSS feed.
     $this->drupalGet('rss.xml');
diff --git a/core/modules/file/src/Tests/FileFieldRevisionTest.php b/core/modules/file/src/Tests/FileFieldRevisionTest.php
index bb3cf8a50..7da2a9072 100644
--- a/core/modules/file/src/Tests/FileFieldRevisionTest.php
+++ b/core/modules/file/src/Tests/FileFieldRevisionTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\file\Tests;
 
+use Drupal\file\Entity\File;
+
 /**
  * Tests creating and deleting revisions with files attached.
  *
@@ -40,7 +42,7 @@ class FileFieldRevisionTest extends FileFieldTestBase {
     // Check that the file exists on disk and in the database.
     $node_storage->resetCache(array($nid));
     $node = $node_storage->load($nid);
-    $node_file_r1 = file_load($node->{$field_name}->target_id);
+    $node_file_r1 = File::load($node->{$field_name}->target_id);
     $node_vid_r1 = $node->getRevisionId();
     $this->assertFileExists($node_file_r1, 'New file saved to disk on node creation.');
     $this->assertFileEntryExists($node_file_r1, 'File entry exists in database on node creation.');
@@ -50,7 +52,7 @@ class FileFieldRevisionTest extends FileFieldTestBase {
     $this->replaceNodeFile($test_file, $field_name, $nid);
     $node_storage->resetCache(array($nid));
     $node = $node_storage->load($nid);
-    $node_file_r2 = file_load($node->{$field_name}->target_id);
+    $node_file_r2 = File::load($node->{$field_name}->target_id);
     $node_vid_r2 = $node->getRevisionId();
     $this->assertFileExists($node_file_r2, 'Replacement file exists on disk after creating new revision.');
     $this->assertFileEntryExists($node_file_r2, 'Replacement file entry exists in database after creating new revision.');
@@ -58,7 +60,7 @@ class FileFieldRevisionTest extends FileFieldTestBase {
 
     // Check that the original file is still in place on the first revision.
     $node = node_revision_load($node_vid_r1);
-    $current_file = file_load($node->{$field_name}->target_id);
+    $current_file = File::load($node->{$field_name}->target_id);
     $this->assertEqual($node_file_r1->id(), $current_file->id(), 'Original file still in place after replacing file in new revision.');
     $this->assertFileExists($node_file_r1, 'Original file still in place after replacing file in new revision.');
     $this->assertFileEntryExists($node_file_r1, 'Original file entry still in place after replacing file in new revision');
@@ -69,7 +71,7 @@ class FileFieldRevisionTest extends FileFieldTestBase {
     $this->drupalPostForm('node/' . $nid . '/edit', array('revision' => '1'), t('Save and keep published'));
     $node_storage->resetCache(array($nid));
     $node = $node_storage->load($nid);
-    $node_file_r3 = file_load($node->{$field_name}->target_id);
+    $node_file_r3 = File::load($node->{$field_name}->target_id);
     $node_vid_r3 = $node->getRevisionId();
     $this->assertEqual($node_file_r2->id(), $node_file_r3->id(), 'Previous revision file still in place after creating a new revision without a new file.');
     $this->assertFileIsPermanent($node_file_r3, 'New revision file is permanent.');
@@ -78,7 +80,7 @@ class FileFieldRevisionTest extends FileFieldTestBase {
     $this->drupalPostForm('node/' . $nid . '/revisions/' . $node_vid_r1 . '/revert', array(), t('Revert'));
     $node_storage->resetCache(array($nid));
     $node = $node_storage->load($nid);
-    $node_file_r4 = file_load($node->{$field_name}->target_id);
+    $node_file_r4 = File::load($node->{$field_name}->target_id);
     $this->assertEqual($node_file_r1->id(), $node_file_r4->id(), 'Original revision file still in place after reverting to the original revision.');
     $this->assertFileIsPermanent($node_file_r4, 'Original revision file still permanent after reverting to the original revision.');
 
diff --git a/core/modules/file/src/Tests/FileFieldTestBase.php b/core/modules/file/src/Tests/FileFieldTestBase.php
index 4f8d9c8d8..5874cf5db 100644
--- a/core/modules/file/src/Tests/FileFieldTestBase.php
+++ b/core/modules/file/src/Tests/FileFieldTestBase.php
@@ -11,6 +11,7 @@ use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\file\FileInterface;
 use Drupal\simpletest\WebTestBase;
+use Drupal\file\Entity\File;
 
 /**
  * Provides methods specifically for testing File module's field handling.
@@ -45,7 +46,8 @@ abstract class FileFieldTestBase extends WebTestBase {
     // Get a file to upload.
     $file = current($this->drupalGetTestFiles($type_name, $size));
 
-    // Add a filesize property to files as would be read by file_load().
+    // Add a filesize property to files as would be read by
+    // \Drupal\file\Entity\File::load().
     $file->filesize = filesize($file->uri);
 
     return entity_create('file', (array) $file);
@@ -145,18 +147,57 @@ abstract class FileFieldTestBase extends WebTestBase {
 
   /**
    * Uploads a file to a node.
+   *
+   * @param \Drupal\file\FileInterface $file
+   *   The File to be uploaded.
+   * @param string $field_name
+   *   The name of the field on which the files should be saved.
+   * @param $nid_or_type
+   *   A numeric node id to upload files to an existing node, or a string
+   *   indicating the desired bundle for a new node.
+   * @param bool $new_revision
+   *   The revision number.
+   * @param array $extras
+   *   Additional values when a new node is created.
+   *
+   * @return int
+   *   The node id.
    */
-  function uploadNodeFile($file, $field_name, $nid_or_type, $new_revision = TRUE, $extras = array()) {
+  function uploadNodeFile(FileInterface $file, $field_name, $nid_or_type, $new_revision = TRUE, array $extras = array()) {
+    return $this->uploadNodeFiles([$file], $field_name, $nid_or_type, $new_revision, $extras);
+  }
+
+  /**
+   * Uploads multiple files to a node.
+   *
+   * @param \Drupal\file\FileInterface[] $files
+   *   The files to be uploaded.
+   * @param string $field_name
+   *   The name of the field on which the files should be saved.
+   * @param $nid_or_type
+   *   A numeric node id to upload files to an existing node, or a string
+   *   indicating the desired bundle for a new node.
+   * @param bool $new_revision
+   *   The revision number.
+   * @param array $extras
+   *   Additional values when a new node is created.
+   *
+   * @return int
+   *   The node id.
+   */
+  function uploadNodeFiles(array $files, $field_name, $nid_or_type, $new_revision = TRUE, array $extras = array()) {
     $edit = array(
       'title[0][value]' => $this->randomMachineName(),
       'revision' => (string) (int) $new_revision,
     );
 
+    $node_storage = $this->container->get('entity.manager')->getStorage('node');
     if (is_numeric($nid_or_type)) {
       $nid = $nid_or_type;
+      $node_storage->resetCache(array($nid));
+      $node = $node_storage->load($nid);
     }
     else {
-      $node_storage = $this->container->get('entity.manager')->getStorage('node');
       // Add a new node.
       $extras['type'] = $nid_or_type;
       $node = $this->drupalCreateNode($extras);
@@ -169,13 +210,23 @@ abstract class FileFieldTestBase extends WebTestBase {
       $this->assertNotEqual($nid, $node->getRevisionId(), 'Node revision exists.');
     }
 
-    // Attach a file to the node.
+    // Attach files to the node.
     $field_storage = FieldStorageConfig::loadByName('node', $field_name);
-    $name = 'files[' . $field_name . '_0]';
+    // File input name depends on number of files already uploaded.
+    $field_num = count($node->{$field_name});
+    $name = 'files[' . $field_name . "_$field_num]";
     if ($field_storage->getCardinality() != 1) {
       $name .= '[]';
     }
-    $edit[$name] = drupal_realpath($file->getFileUri());
+    foreach ($files as $file) {
+      $file_path = $this->container->get('file_system')->realpath($file->getFileUri());
+      if (count($files) == 1) {
+        $edit[$name] = $file_path;
+      }
+      else {
+        $edit[$name][] = $file_path;
+      }
+    }
     $this->drupalPostForm("node/$nid/edit", $edit, t('Save and keep published'));
 
     return $nid;
@@ -221,7 +272,7 @@ abstract class FileFieldTestBase extends WebTestBase {
    */
   function assertFileEntryExists($file, $message = NULL) {
     $this->container->get('entity.manager')->getStorage('file')->resetCache();
-    $db_file = file_load($file->id());
+    $db_file = File::load($file->id());
     $message = isset($message) ? $message : format_string('File %file exists in database at the correct path.', array('%file' => $file->getFileUri()));
     $this->assertEqual($db_file->getFileUri(), $file->getFileUri(), $message);
   }
@@ -240,7 +291,7 @@ abstract class FileFieldTestBase extends WebTestBase {
   function assertFileEntryNotExists($file, $message) {
     $this->container->get('entity.manager')->getStorage('file')->resetCache();
     $message = isset($message) ? $message : format_string('File %file exists in database at the correct path.', array('%file' => $file->getFileUri()));
-    $this->assertFalse(file_load($file->id()), $message);
+    $this->assertFalse(File::load($file->id()), $message);
   }
 
   /**
diff --git a/core/modules/file/src/Tests/FileFieldValidateTest.php b/core/modules/file/src/Tests/FileFieldValidateTest.php
index d98f6cd6c..46e34ee27 100644
--- a/core/modules/file/src/Tests/FileFieldValidateTest.php
+++ b/core/modules/file/src/Tests/FileFieldValidateTest.php
@@ -9,6 +9,7 @@ namespace Drupal\file\Tests;
 
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\field\Entity\FieldConfig;
+use Drupal\file\Entity\File;
 
 /**
  * Tests validation functions such as file type, max file size, max size per
@@ -44,7 +45,7 @@ class FileFieldValidateTest extends FileFieldTestBase {
     $node_storage->resetCache(array($nid));
     $node = $node_storage->load($nid);
 
-    $node_file = file_load($node->{$field_name}->target_id);
+    $node_file = File::load($node->{$field_name}->target_id);
     $this->assertFileExists($node_file, 'File exists after uploading to the required field.');
     $this->assertFileEntryExists($node_file, 'File entry exists after uploading to the required field.');
 
@@ -63,7 +64,7 @@ class FileFieldValidateTest extends FileFieldTestBase {
     $nid = $this->uploadNodeFile($test_file, $field_name, $type_name);
     $node_storage->resetCache(array($nid));
     $node = $node_storage->load($nid);
-    $node_file = file_load($node->{$field_name}->target_id);
+    $node_file = File::load($node->{$field_name}->target_id);
     $this->assertFileExists($node_file, 'File exists after uploading to the required multiple value field.');
     $this->assertFileEntryExists($node_file, 'File entry exists after uploading to the required multiple value field.');
   }
@@ -95,7 +96,7 @@ class FileFieldValidateTest extends FileFieldTestBase {
       $nid = $this->uploadNodeFile($small_file, $field_name, $type_name);
       $node_storage->resetCache(array($nid));
       $node = $node_storage->load($nid);
-      $node_file = file_load($node->{$field_name}->target_id);
+      $node_file = File::load($node->{$field_name}->target_id);
       $this->assertFileExists($node_file, format_string('File exists after uploading a file (%filesize) under the max limit (%maxsize).', array('%filesize' => format_size($small_file->getSize()), '%maxsize' => $max_filesize)));
       $this->assertFileEntryExists($node_file, format_string('File entry exists after uploading a file (%filesize) under the max limit (%maxsize).', array('%filesize' => format_size($small_file->getSize()), '%maxsize' => $max_filesize)));
 
@@ -112,7 +113,7 @@ class FileFieldValidateTest extends FileFieldTestBase {
     $nid = $this->uploadNodeFile($large_file, $field_name, $type_name);
     $node_storage->resetCache(array($nid));
     $node = $node_storage->load($nid);
-    $node_file = file_load($node->{$field_name}->target_id);
+    $node_file = File::load($node->{$field_name}->target_id);
     $this->assertFileExists($node_file, format_string('File exists after uploading a file (%filesize) with no max limit.', array('%filesize' => format_size($large_file->getSize()))));
     $this->assertFileEntryExists($node_file, format_string('File entry exists after uploading a file (%filesize) with no max limit.', array('%filesize' => format_size($large_file->getSize()))));
   }
@@ -136,7 +137,7 @@ class FileFieldValidateTest extends FileFieldTestBase {
     $nid = $this->uploadNodeFile($test_file, $field_name, $type_name);
     $node_storage->resetCache(array($nid));
     $node = $node_storage->load($nid);
-    $node_file = file_load($node->{$field_name}->target_id);
+    $node_file = File::load($node->{$field_name}->target_id);
     $this->assertFileExists($node_file, 'File exists after uploading a file with no extension checking.');
     $this->assertFileEntryExists($node_file, 'File entry exists after uploading a file with no extension checking.');
 
@@ -155,7 +156,7 @@ class FileFieldValidateTest extends FileFieldTestBase {
     $nid = $this->uploadNodeFile($test_file, $field_name, $type_name);
     $node_storage->resetCache(array($nid));
     $node = $node_storage->load($nid);
-    $node_file = file_load($node->{$field_name}->target_id);
+    $node_file = File::load($node->{$field_name}->target_id);
     $this->assertFileExists($node_file, 'File exists after uploading a file with extension checking.');
     $this->assertFileEntryExists($node_file, 'File entry exists after uploading a file with extension checking.');
   }
diff --git a/core/modules/file/src/Tests/FileFieldWidgetTest.php b/core/modules/file/src/Tests/FileFieldWidgetTest.php
index c03e118cc..7c24aabff 100644
--- a/core/modules/file/src/Tests/FileFieldWidgetTest.php
+++ b/core/modules/file/src/Tests/FileFieldWidgetTest.php
@@ -12,6 +12,7 @@ use Drupal\comment\Tests\CommentTestTrait;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field_ui\Tests\FieldUiTestTrait;
 use Drupal\user\RoleInterface;
+use Drupal\file\Entity\File;
 
 /**
  * Tests the file field widget, single and multi-valued, with and without AJAX,
@@ -58,7 +59,7 @@ class FileFieldWidgetTest extends FileFieldTestBase {
       $nid = $this->uploadNodeFile($test_file, $field_name, $type_name);
       $node_storage->resetCache(array($nid));
       $node = $node_storage->load($nid);
-      $node_file = file_load($node->{$field_name}->target_id);
+      $node_file = File::load($node->{$field_name}->target_id);
       $this->assertFileExists($node_file, 'New file saved to disk on node creation.');
 
       // Ensure the file can be downloaded.
@@ -111,8 +112,9 @@ class FileFieldWidgetTest extends FileFieldTestBase {
     // names).
     $field_name = 'test_file_field_1';
     $field_name2 = 'test_file_field_2';
-    $this->createFileField($field_name, 'node', $type_name, array('cardinality' => 3));
-    $this->createFileField($field_name2, 'node', $type_name, array('cardinality' => 3));
+    $cardinality = 3;
+    $this->createFileField($field_name, 'node', $type_name, array('cardinality' => $cardinality));
+    $this->createFileField($field_name2, 'node', $type_name, array('cardinality' => $cardinality));
 
     $test_file = $this->getTestFile('text');
 
@@ -214,6 +216,49 @@ class FileFieldWidgetTest extends FileFieldTestBase {
       $node = $node_storage->load($nid);
       $this->assertTrue(empty($node->{$field_name}->target_id), 'Node was successfully saved without any files.');
     }
+
+    $upload_files = array($test_file, $test_file);
+    // Try to upload multiple files, but fewer than the maximum.
+    $nid = $this->uploadNodeFiles($upload_files, $field_name, $type_name);
+    $node_storage->resetCache(array($nid));
+    $node = $node_storage->load($nid);
+    $this->assertEqual(count($node->{$field_name}), count($upload_files), 'Node was successfully saved with mulitple files.');
+
+    // Try to upload more files than allowed on revision.
+    $this->uploadNodeFiles($upload_files, $field_name, $nid, 1);
+    $args = array(
+      '%field' => $field_name,
+      '@count' => $cardinality
+    );
+    $this->assertRaw(t('%field: this field cannot hold more than @count values.', $args));
+    $node_storage->resetCache(array($nid));
+    $node = $node_storage->load($nid);
+    $this->assertEqual(count($node->{$field_name}), count($upload_files), 'More files than allowed could not be saved to node.');
+
+    // Try to upload exactly the allowed number of files on revision.
+    $this->uploadNodeFile($test_file, $field_name, $nid, 1);
+    $node_storage->resetCache(array($nid));
+    $node = $node_storage->load($nid);
+    $this->assertEqual(count($node->{$field_name}), $cardinality, 'Node was successfully revised to maximum number of files.');
+
+    // Try to upload exactly the allowed number of files, new node.
+    $upload_files[] = $test_file;
+    $nid = $this->uploadNodeFiles($upload_files, $field_name, $type_name);
+    $node_storage->resetCache(array($nid));
+    $node = $node_storage->load($nid);
+    $this->assertEqual(count($node->{$field_name}), $cardinality, 'Node was successfully saved with maximum number of files.');
+
+    // Try to upload more files than allowed, new node.
+    $upload_files[] = $test_file;
+    $this->uploadNodeFiles($upload_files, $field_name, $type_name);
+
+    $args = [
+      '%field' => $field_name,
+      '@max' => $cardinality,
+      '@count' => count($upload_files),
+      '%list' => $test_file->getFileName(),
+    ];
+    $this->assertRaw(t('Field %field can only hold @max values but there were @count uploaded. The following files have been omitted as a result: %list.', $args));
   }
 
   /**
@@ -238,7 +283,7 @@ class FileFieldWidgetTest extends FileFieldTestBase {
     $nid = $this->uploadNodeFile($test_file, $field_name, $type_name);
     $node_storage->resetCache(array($nid));
     $node = $node_storage->load($nid);
-    $node_file = file_load($node->{$field_name}->target_id);
+    $node_file = File::load($node->{$field_name}->target_id);
     $this->assertFileExists($node_file, 'New file saved to disk on node creation.');
 
     // Ensure the private file is available to the user who uploaded it.
diff --git a/core/modules/file/src/Tests/FileListingTest.php b/core/modules/file/src/Tests/FileListingTest.php
index b752c3ffd..72b2378fc 100644
--- a/core/modules/file/src/Tests/FileListingTest.php
+++ b/core/modules/file/src/Tests/FileListingTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\file\Tests;
 
 use Drupal\node\Entity\Node;
+use Drupal\file\Entity\File;
 
 /**
  * Tests file listing page functionality.
@@ -103,7 +104,7 @@ class FileListingTest extends FileFieldTestBase {
     $this->drupalGet('admin/content/files');
 
     foreach ($nodes as $node) {
-      $file = entity_load('file', $node->file->target_id);
+      $file = File::load($node->file->target_id);
       $this->assertText($file->getFilename());
       $this->assertLinkByHref(file_create_url($file->getFileUri()));
       $this->assertLinkByHref('admin/content/files/usage/' . $file->id());
@@ -117,11 +118,11 @@ class FileListingTest extends FileFieldTestBase {
     $nodes[1]->save();
 
     $this->drupalGet('admin/content/files');
-    $file = entity_load('file', $orphaned_file);
+    $file = File::load($orphaned_file);
     $usage = $this->sumUsages($file_usage->listUsage($file));
     $this->assertRaw('admin/content/files/usage/' . $file->id() . '">' . $usage);
 
-    $file = entity_load('file', $used_file);
+    $file = File::load($used_file);
     $usage = $this->sumUsages($file_usage->listUsage($file));
     $this->assertRaw('admin/content/files/usage/' . $file->id() . '">' . $usage);
 
@@ -130,7 +131,7 @@ class FileListingTest extends FileFieldTestBase {
 
     // Test file usage page.
     foreach ($nodes as $node) {
-      $file = entity_load('file', $node->file->target_id);
+      $file = File::load($node->file->target_id);
       $usage = $file_usage->listUsage($file);
       $this->drupalGet('admin/content/files/usage/' . $file->id());
       $this->assertResponse(200);
diff --git a/core/modules/file/src/Tests/FileTokenReplaceTest.php b/core/modules/file/src/Tests/FileTokenReplaceTest.php
index 1f0d733f6..2d289c4f3 100644
--- a/core/modules/file/src/Tests/FileTokenReplaceTest.php
+++ b/core/modules/file/src/Tests/FileTokenReplaceTest.php
@@ -8,6 +8,8 @@
 namespace Drupal\file\Tests;
 
 use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Core\Render\BubbleableMetadata;
+use Drupal\file\Entity\File;
 
 /**
  * Generates text using placeholders for dummy content to check file token
@@ -40,7 +42,7 @@ class FileTokenReplaceTest extends FileFieldTestBase {
     // Load the node and the file.
     $node_storage->resetCache(array($nid));
     $node = $node_storage->load($nid);
-    $file = file_load($node->{$field_name}->target_id);
+    $file = File::load($node->{$field_name}->target_id);
 
     // Generate and test sanitized tokens.
     $tests = array();
@@ -57,12 +59,31 @@ class FileTokenReplaceTest extends FileFieldTestBase {
     $tests['[file:owner]'] = SafeMarkup::checkPlain(user_format_name($this->adminUser));
     $tests['[file:owner:uid]'] = $file->getOwnerId();
 
+    $base_bubbleable_metadata = BubbleableMetadata::createFromObject($file);
+    $metadata_tests = [];
+    $metadata_tests['[file:fid]'] = $base_bubbleable_metadata;
+    $metadata_tests['[file:name]'] = $base_bubbleable_metadata;
+    $metadata_tests['[file:path]'] = $base_bubbleable_metadata;
+    $metadata_tests['[file:mime]'] = $base_bubbleable_metadata;
+    $metadata_tests['[file:size]'] = $base_bubbleable_metadata;
+    $metadata_tests['[file:url]'] = $base_bubbleable_metadata;
+    $bubbleable_metadata = clone $base_bubbleable_metadata;
+    $metadata_tests['[file:created]'] = $bubbleable_metadata->addCacheTags(['rendered']);
+    $metadata_tests['[file:created:short]'] = $bubbleable_metadata;
+    $metadata_tests['[file:changed]'] = $bubbleable_metadata;
+    $metadata_tests['[file:changed:short]'] = $bubbleable_metadata;
+    $bubbleable_metadata = clone $base_bubbleable_metadata;
+    $metadata_tests['[file:owner]'] = $bubbleable_metadata->addCacheTags(['user:2']);
+    $metadata_tests['[file:owner:uid]'] = $bubbleable_metadata;
+
     // Test to make sure that we generated something for each token.
     $this->assertFalse(in_array(0, array_map('strlen', $tests)), 'No empty tokens generated.');
 
     foreach ($tests as $input => $expected) {
-      $output = $token_service->replace($input, array('file' => $file), array('langcode' => $language_interface->getId()));
+      $bubbleable_metadata = new BubbleableMetadata();
+      $output = $token_service->replace($input, array('file' => $file), array('langcode' => $language_interface->getId()), $bubbleable_metadata);
       $this->assertEqual($output, $expected, format_string('Sanitized file token %token replaced.', array('%token' => $input)));
+      $this->assertEqual($bubbleable_metadata, $metadata_tests[$input]);
     }
 
     // Generate and test unsanitized tokens.
diff --git a/core/modules/file/src/Tests/LoadTest.php b/core/modules/file/src/Tests/LoadTest.php
index a9cf13187..7a0fde9ce 100644
--- a/core/modules/file/src/Tests/LoadTest.php
+++ b/core/modules/file/src/Tests/LoadTest.php
@@ -7,8 +7,10 @@
 
 namespace Drupal\file\Tests;
 
+use Drupal\file\Entity\File;
+
 /**
- * Tests the file_load() function.
+ * Tests \Drupal\file\Entity\File::load().
  *
  * @group file
  */
@@ -17,7 +19,7 @@ class LoadTest extends FileManagedUnitTestBase {
    * Try to load a non-existent file by fid.
    */
   function testLoadMissingFid() {
-    $this->assertFalse(file_load(-1), 'Try to load an invalid fid fails.');
+    $this->assertFalse(File::load(-1), 'Try to load an invalid fid fails.');
     $this->assertFileHooksCalled(array());
   }
 
@@ -45,10 +47,9 @@ class LoadTest extends FileManagedUnitTestBase {
   function testSingleValues() {
     // Create a new file entity from scratch so we know the values.
     $file = $this->createFile('druplicon.txt', NULL, 'public');
-
-    $by_fid_file = file_load($file->id());
+    $by_fid_file = File::load($file->id());
     $this->assertFileHookCalled('load');
-    $this->assertTrue(is_object($by_fid_file), 'file_load() returned an object.');
+    $this->assertTrue(is_object($by_fid_file), '\Drupal\file\Entity\File::load() returned an object.');
     $this->assertEqual($by_fid_file->id(), $file->id(), 'Loading by fid got the same fid.', 'File');
     $this->assertEqual($by_fid_file->getFileUri(), $file->getFileUri(), 'Loading by fid got the correct filepath.', 'File');
     $this->assertEqual($by_fid_file->getFilename(), $file->getFilename(), 'Loading by fid got the correct filename.', 'File');
@@ -68,16 +69,16 @@ class LoadTest extends FileManagedUnitTestBase {
     file_test_reset();
     $by_path_files = entity_load_multiple_by_properties('file', array('uri' => $file->getFileUri()));
     $this->assertFileHookCalled('load');
-    $this->assertEqual(1, count($by_path_files), 'file_load_multiple() returned an array of the correct size.');
+    $this->assertEqual(1, count($by_path_files), 'entity_load_multiple_by_properties() returned an array of the correct size.');
     $by_path_file = reset($by_path_files);
     $this->assertTrue($by_path_file->file_test['loaded'], 'file_test_file_load() was able to modify the file during load.');
     $this->assertEqual($by_path_file->id(), $file->id(), 'Loading by filepath got the correct fid.', 'File');
 
     // Load by fid.
     file_test_reset();
-    $by_fid_files = file_load_multiple(array($file->id()));
+    $by_fid_files = File::loadMultiple(array($file->id()));
     $this->assertFileHooksCalled(array());
-    $this->assertEqual(1, count($by_fid_files), 'file_load_multiple() returned an array of the correct size.');
+    $this->assertEqual(1, count($by_fid_files), '\Drupal\file\Entity\File::loadMultiple() returned an array of the correct size.');
     $by_fid_file = reset($by_fid_files);
     $this->assertTrue($by_fid_file->file_test['loaded'], 'file_test_file_load() was able to modify the file during load.');
     $this->assertEqual($by_fid_file->getFileUri(), $file->getFileUri(), 'Loading by fid got the correct filepath.', 'File');
diff --git a/core/modules/file/src/Tests/MoveTest.php b/core/modules/file/src/Tests/MoveTest.php
index f3380db06..817799293 100644
--- a/core/modules/file/src/Tests/MoveTest.php
+++ b/core/modules/file/src/Tests/MoveTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\file\Tests;
 
+use Drupal\file\Entity\File;
+
 /**
  * Tests the file move function.
  *
@@ -38,7 +40,7 @@ class MoveTest extends FileManagedUnitTestBase {
 
     // Reload the file from the database and check that the changes were
     // actually saved.
-    $loaded_file = file_load($result->id(), TRUE);
+    $loaded_file = File::load($result->id());
     $this->assertTrue($loaded_file, 'File can be loaded from the database.');
     $this->assertFileUnchanged($result, $loaded_file);
   }
@@ -66,14 +68,14 @@ class MoveTest extends FileManagedUnitTestBase {
     $this->assertFileHooksCalled(array('move', 'load', 'update'));
 
     // Compare the returned value to what made it into the database.
-    $this->assertFileUnchanged($result, file_load($result->id(), TRUE));
+    $this->assertFileUnchanged($result, File::load($result->id()));
     // The target file should not have been altered.
-    $this->assertFileUnchanged($target, file_load($target->id(), TRUE));
+    $this->assertFileUnchanged($target, File::load($target->id()));
     // Make sure we end up with two distinct files afterwards.
     $this->assertDifferentFile($target, $result);
 
     // Compare the source and results.
-    $loaded_source = file_load($source->id(), TRUE);
+    $loaded_source = File::load($source->id());
     $this->assertEqual($loaded_source->id(), $result->id(), "Returned file's id matches the source.");
     $this->assertNotEqual($loaded_source->getFileUri(), $source->getFileUri(), 'Returned file path has changed from the original.');
   }
@@ -102,7 +104,7 @@ class MoveTest extends FileManagedUnitTestBase {
 
     // Reload the file from the database and check that the changes were
     // actually saved.
-    $loaded_result = file_load($result->id(), TRUE);
+    $loaded_result = File::load($result->id());
     $this->assertFileUnchanged($result, $loaded_result);
     // Check that target was re-used.
     $this->assertSameFile($target, $loaded_result);
@@ -129,7 +131,7 @@ class MoveTest extends FileManagedUnitTestBase {
 
     // Load the file from the database and make sure it is identical to what
     // was returned.
-    $this->assertFileUnchanged($source, file_load($source->id(), TRUE));
+    $this->assertFileUnchanged($source, File::load($source->id()));
   }
 
   /**
@@ -156,7 +158,7 @@ class MoveTest extends FileManagedUnitTestBase {
 
     // Load the file from the database and make sure it is identical to what
     // was returned.
-    $this->assertFileUnchanged($source, file_load($source->id(), TRUE));
-    $this->assertFileUnchanged($target, file_load($target->id(), TRUE));
+    $this->assertFileUnchanged($source, File::load($source->id()));
+    $this->assertFileUnchanged($target, File::load($target->id()));
   }
 }
diff --git a/core/modules/file/src/Tests/SaveDataTest.php b/core/modules/file/src/Tests/SaveDataTest.php
index 24d8fb5a1..4ca49ad89 100644
--- a/core/modules/file/src/Tests/SaveDataTest.php
+++ b/core/modules/file/src/Tests/SaveDataTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\file\Tests;
 
+use Drupal\file\Entity\File;
+
 /**
  * Tests the file_save_data() function.
  *
@@ -32,7 +34,7 @@ class SaveDataTest extends FileManagedUnitTestBase {
     $this->assertFileHooksCalled(array('insert'));
 
     // Verify that what was returned is what's in the database.
-    $this->assertFileUnchanged($result, file_load($result->id(), TRUE));
+    $this->assertFileUnchanged($result, File::load($result->id()));
   }
 
   /**
@@ -57,7 +59,7 @@ class SaveDataTest extends FileManagedUnitTestBase {
     $this->assertFileHooksCalled(array('insert'));
 
     // Verify that what was returned is what's in the database.
-    $this->assertFileUnchanged($result, file_load($result->id(), TRUE));
+    $this->assertFileUnchanged($result, File::load($result->id()));
   }
 
   /**
@@ -82,10 +84,10 @@ class SaveDataTest extends FileManagedUnitTestBase {
 
     // Ensure that the existing file wasn't overwritten.
     $this->assertDifferentFile($existing, $result);
-    $this->assertFileUnchanged($existing, file_load($existing->id(), TRUE));
+    $this->assertFileUnchanged($existing, File::load($existing->id()));
 
     // Verify that was returned is what's in the database.
-    $this->assertFileUnchanged($result, file_load($result->id(), TRUE));
+    $this->assertFileUnchanged($result, File::load($result->id()));
   }
 
   /**
@@ -112,7 +114,7 @@ class SaveDataTest extends FileManagedUnitTestBase {
     $this->assertSameFile($existing, $result);
 
     // Verify that what was returned is what's in the database.
-    $this->assertFileUnchanged($result, file_load($result->id(), TRUE));
+    $this->assertFileUnchanged($result, File::load($result->id()));
   }
 
   /**
@@ -131,6 +133,6 @@ class SaveDataTest extends FileManagedUnitTestBase {
     $this->assertFileHooksCalled(array());
 
     // Ensure that the existing file wasn't overwritten.
-    $this->assertFileUnchanged($existing, file_load($existing->id(), TRUE));
+    $this->assertFileUnchanged($existing, File::load($existing->id()));
   }
 }
diff --git a/core/modules/file/src/Tests/SaveTest.php b/core/modules/file/src/Tests/SaveTest.php
index 254917747..97d4882e6 100644
--- a/core/modules/file/src/Tests/SaveTest.php
+++ b/core/modules/file/src/Tests/SaveTest.php
@@ -36,7 +36,7 @@ class SaveTest extends FileManagedUnitTestBase {
     $this->assertFileHooksCalled(array('insert'));
 
     $this->assertTrue($file->id() > 0, 'A new file ID is set when saving a new file to the database.', 'File');
-    $loaded_file = file_load($file->id());
+    $loaded_file = File::load($file->id());
     $this->assertNotNull($loaded_file, 'Record exists in the database.');
     $this->assertEqual($loaded_file->isPermanent(), $file->isPermanent(), 'Status was saved correctly.');
     $this->assertEqual($file->getSize(), filesize($file->getFileUri()), 'File size was set correctly.', 'File');
@@ -53,7 +53,7 @@ class SaveTest extends FileManagedUnitTestBase {
 
     $this->assertEqual($file->id(), $file->id(), 'The file ID of an existing file is not changed when updating the database.', 'File');
     $this->assertTrue($file->getChangedTime() >= $file->getChangedTime(), "Timestamp didn't go backwards.", 'File');
-    $loaded_file = file_load($file->id());
+    $loaded_file = File::load($file->id());
     $this->assertNotNull($loaded_file, 'Record still exists in the database.', 'File');
     $this->assertEqual($loaded_file->isPermanent(), $file->isPermanent(), 'Status was saved correctly.');
     $this->assertEqual($loaded_file->langcode->value, 'en', 'Langcode was saved correctly.');
diff --git a/core/modules/file/src/Tests/SaveUploadTest.php b/core/modules/file/src/Tests/SaveUploadTest.php
index 155a67afa..baeb443bc 100644
--- a/core/modules/file/src/Tests/SaveUploadTest.php
+++ b/core/modules/file/src/Tests/SaveUploadTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\file\Tests;
 
+use Drupal\file\Entity\File;
+
 /**
  * Tests the file_save_upload() function.
  *
@@ -81,7 +83,7 @@ class SaveUploadTest extends FileManagedTestBase {
   function testNormal() {
     $max_fid_after = db_query('SELECT MAX(fid) AS fid FROM {file_managed}')->fetchField();
     $this->assertTrue($max_fid_after > $this->maxFidBefore, 'A new file was created.');
-    $file1 = file_load($max_fid_after);
+    $file1 = File::load($max_fid_after);
     $this->assertTrue($file1, 'Loaded the file.');
     // MIME type of the uploaded image may be either image/jpeg or image/png.
     $this->assertEqual(substr($file1->getMimeType(), 0, 5), 'image', 'A MIME type was set.');
@@ -100,13 +102,13 @@ class SaveUploadTest extends FileManagedTestBase {
     // Check that the correct hooks were called.
     $this->assertFileHooksCalled(array('validate', 'insert'));
 
-    $file2 = file_load($max_fid_after);
+    $file2 = File::load($max_fid_after);
     $this->assertTrue($file2, 'Loaded the file');
     // MIME type of the uploaded image may be either image/jpeg or image/png.
     $this->assertEqual(substr($file2->getMimeType(), 0, 5), 'image', 'A MIME type was set.');
 
-    // Load both files using file_load_multiple().
-    $files = file_load_multiple(array($file1->id(), $file2->id()));
+    // Load both files using File::loadMultiple().
+    $files = File::loadMultiple(array($file1->id(), $file2->id()));
     $this->assertTrue(isset($files[$file1->id()]), 'File was loaded successfully');
     $this->assertTrue(isset($files[$file2->id()]), 'File was loaded successfully');
 
diff --git a/core/modules/file/src/Tests/Views/ExtensionViewsFieldTest.php b/core/modules/file/src/Tests/Views/ExtensionViewsFieldTest.php
index 75623f4e5..f7d2b3fc0 100644
--- a/core/modules/file/src/Tests/Views/ExtensionViewsFieldTest.php
+++ b/core/modules/file/src/Tests/Views/ExtensionViewsFieldTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\file\Tests\Views;
 
+use Drupal\Core\Render\RenderContext;
 use Drupal\file\Entity\File;
 use Drupal\views\Views;
 use Drupal\views\Tests\ViewUnitTestBase;
@@ -69,17 +70,22 @@ class ExtensionViewsFieldTest extends ViewUnitTestBase {
    * Tests file extension views field handler extension_detect_tar option.
    */
   public function testFileExtensionTarOption() {
+    /** @var \Drupal\Core\Render\RendererInterface $renderer */
+    $renderer = \Drupal::service('renderer');
+
     $view = Views::getView('file_extension_view');
     $view->setDisplay();
     $this->executeView($view);
 
     // Test without the tar option.
-    $this->assertEqual($view->field['extension']->advancedRender($view->result[0]), 'png');
-    $this->assertEqual($view->field['extension']->advancedRender($view->result[1]), 'tar');
-    $this->assertEqual($view->field['extension']->advancedRender($view->result[2]), 'gz');
-    $this->assertEqual($view->field['extension']->advancedRender($view->result[3]), '');
-    // Test with the tar option.
+    $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      $this->assertEqual($view->field['extension']->advancedRender($view->result[0]), 'png');
+      $this->assertEqual($view->field['extension']->advancedRender($view->result[1]), 'tar');
+      $this->assertEqual($view->field['extension']->advancedRender($view->result[2]), 'gz');
+      $this->assertEqual($view->field['extension']->advancedRender($view->result[3]), '');
+    });
 
+    // Test with the tar option.
     $view = Views::getView('file_extension_view');
     $view->setDisplay();
     $view->initHandlers();
@@ -87,10 +93,12 @@ class ExtensionViewsFieldTest extends ViewUnitTestBase {
     $view->field['extension']->options['settings']['extension_detect_tar'] = TRUE;
     $this->executeView($view);
 
-    $this->assertEqual($view->field['extension']->advancedRender($view->result[0]), 'png');
-    $this->assertEqual($view->field['extension']->advancedRender($view->result[1]), 'tar');
-    $this->assertEqual($view->field['extension']->advancedRender($view->result[2]), 'tar.gz');
-    $this->assertEqual($view->field['extension']->advancedRender($view->result[3]), '');
+    $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      $this->assertEqual($view->field['extension']->advancedRender($view->result[0]), 'png');
+      $this->assertEqual($view->field['extension']->advancedRender($view->result[1]), 'tar');
+      $this->assertEqual($view->field['extension']->advancedRender($view->result[2]), 'tar.gz');
+      $this->assertEqual($view->field['extension']->advancedRender($view->result[3]), '');
+    });
   }
 
 }
diff --git a/core/modules/file/tests/file_test/file_test.module b/core/modules/file/tests/file_test/file_test.module
index e7ec56cb3..7b25af456 100644
--- a/core/modules/file/tests/file_test/file_test.module
+++ b/core/modules/file/tests/file_test/file_test.module
@@ -222,7 +222,7 @@ function file_test_file_url_alter(&$uri) {
       }
       // Public created files.
       else {
-        $wrapper = file_stream_wrapper_get_instance_by_scheme($scheme);
+        $wrapper = \Drupal::service('stream_wrapper_manager')->getViaScheme($scheme);
         $path = $wrapper->getDirectoryPath() . '/' . file_uri_target($uri);
       }
 
@@ -252,7 +252,7 @@ function file_test_file_url_alter(&$uri) {
       }
       // Public created files.
       else {
-        $wrapper = file_stream_wrapper_get_instance_by_scheme($scheme);
+        $wrapper = \Drupal::service('stream_wrapper_manager')->getViaScheme($scheme);
         $path = $wrapper->getDirectoryPath() . '/' . file_uri_target($uri);
       }
 
@@ -275,7 +275,7 @@ function file_test_file_url_alter(&$uri) {
       }
       // Public created files.
       else {
-        $wrapper = file_stream_wrapper_get_instance_by_scheme($scheme);
+        $wrapper = \Drupal::service('stream_wrapper_manager')->getViaScheme($scheme);
         $path = $wrapper->getDirectoryPath() . '/' . file_uri_target($uri);
       }
 
diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module
index 400d6cc0a..2287d7aed 100644
--- a/core/modules/filter/filter.module
+++ b/core/modules/filter/filter.module
@@ -288,7 +288,7 @@ function filter_fallback_format() {
  *   FilterInterface::TYPE_HTML_RESTRICTOR is the only type that cannot be
  *   skipped.
  *
- * @return string
+ * @return \Drupal\Component\Utility\SafeStringInterface
  *   The filtered text.
  *
  * @see filter_process_text()
@@ -353,7 +353,10 @@ function _filter_tips($format_id, $long = FALSE) {
       if ($filter->status) {
         $tip = $filter->tips($long);
         if (isset($tip)) {
-          $tips[$format->label()][$name] = array('tip' => $tip, 'id' => $name);
+          $tips[$format->label()][$name] = array(
+            'tip' => array('#markup' => $tip),
+            'id' => $name,
+          );
         }
       }
     }
@@ -430,7 +433,6 @@ function template_preprocess_filter_tips(&$variables) {
   foreach ($variables['tips'] as $name => $tiplist) {
     foreach ($tiplist as $tip_key => $tip) {
       $tiplist[$tip_key]['attributes'] = new Attribute();
-      $tiplist[$tip_key]['tip'] = Xss::filterAdmin($tiplist[$tip_key]['tip']);
     }
 
     $variables['tips'][$name] = array(
@@ -499,7 +501,7 @@ function _filter_url($text, $filter) {
   // we cannot cleanly differ between protocols here without hard-coding MAILTO,
   // so '//' is optional for all protocols.
   // @see \Drupal\Component\Utility\UrlHelper::filterBadProtocol()
-  $protocols = \Drupal::config('system.filter')->get('protocols');
+  $protocols = \Drupal::getContainer()->getParameter('filter_protocols') ?: ['http', 'https'];
   $protocols = implode(':(?://)?|', $protocols) . ':(?://)?';
 
   $valid_url_path_characters = "[\p{L}\p{M}\p{N}!\*\';:=\+,\.\$\/%#\[\]\-_~@&]";
@@ -535,7 +537,7 @@ function _filter_url($text, $filter) {
   $tasks['_filter_url_parse_full_links'] = $pattern;
 
   // Match email addresses.
-  $url_pattern = "[\p{L}\p{M}\p{N}._-]{1,254}@(?:$domain)";
+  $url_pattern = "[\p{L}\p{M}\p{N}._+-]{1,254}@(?:$domain)";
   $pattern = "`($url_pattern)`u";
   $tasks['_filter_url_parse_email_links'] = $pattern;
 
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_filter_format.yml b/core/modules/filter/migration_templates/d6_filter_format.yml
similarity index 93%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_filter_format.yml
rename to core/modules/filter/migration_templates/d6_filter_format.yml
index 9efaf7a6a..16982d39a 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_filter_format.yml
+++ b/core/modules/filter/migration_templates/d6_filter_format.yml
@@ -43,7 +43,3 @@ process:
 destination:
   plugin: entity:filter_format
   no_stub: true
-dependencies:
-  module:
-    - filter
-    - migrate_drupal
diff --git a/core/modules/filter/src/Element/TextFormat.php b/core/modules/filter/src/Element/TextFormat.php
index aaff8b427..9247dbadb 100644
--- a/core/modules/filter/src/Element/TextFormat.php
+++ b/core/modules/filter/src/Element/TextFormat.php
@@ -15,6 +15,27 @@ use Drupal\Core\Url;
 /**
  * Provides a text format render element.
  *
+ * Properties:
+ * - #base_type: The form element #type to use for the 'value' element.
+ *   'textarea' by default.
+ * - #format: (optional) The text format ID to preselect. If omitted, the
+ *   default format for the current user will be used.
+ * - #allowed_formats: (optional) An array of text format IDs that are available
+ *   for this element. If omitted, all text formats that the current user has
+ *   access to will be allowed.
+ *
+ * Usage Example:
+ * @code
+ * $form['body'] = array(
+ *   '#type' => 'text_format',
+ *   '#title' => 'Body',
+ *   '#format' => 'full_html',
+ *   '#default_value' => '<p>The quick brown fox jumped over the lazy dog.</p>',
+ * );
+ * @endcode
+ *
+ * @see \Drupal\Core\Render\Element\Textarea
+ *
  * @RenderElement("text_format")
  */
 class TextFormat extends RenderElement {
@@ -54,14 +75,7 @@ class TextFormat extends RenderElement {
    * @endcode
    *
    * @param array $element
-   *   The form element to process. Properties used:
-   *   - #base_type: The form element #type to use for the 'value' element.
-   *     'textarea' by default.
-   *   - #format: (optional) The text format ID to preselect. If omitted, the
-   *     default format for the current user will be used.
-   *   - #allowed_formats: (optional) An array of text format IDs that are
-   *     available for this element. If omitted, all text formats that the
-   *     current user has access to will be allowed.
+   *   The form element to process. See main class documentation for properties.
    * @param \Drupal\Core\Form\FormStateInterface $form_state
    *   The current state of the form.
    * @param array $complete_form
@@ -178,12 +192,17 @@ class TextFormat extends RenderElement {
       '#parents' => array_merge($element['#parents'], array('format')),
     );
 
-    $element['format']['help'] = array(
+    $element['format']['help'] = [
       '#type' => 'container',
-      '#attributes' => array('class' => array('filter-help')),
-      '#markup' => \Drupal::l(t('About text formats'), new Url('filter.tips_all', array(), array('attributes' => array('target' => '_blank')))),
+      'about' => [
+        '#type' => 'link',
+        '#title' => t('About text formats'),
+        '#url' => new Url('filter.tips_all'),
+        '#attributes' => ['target' => '_blank'],
+      ],
+      '#attributes' => ['class' => ['filter-help']],
       '#weight' => 0,
-    );
+    ];
 
     $all_formats = filter_formats();
     $format_exists = isset($all_formats[$element['#format']]);
diff --git a/core/modules/filter/src/FilterFormatFormBase.php b/core/modules/filter/src/FilterFormatFormBase.php
index ff140c3b0..77b543359 100644
--- a/core/modules/filter/src/FilterFormatFormBase.php
+++ b/core/modules/filter/src/FilterFormatFormBase.php
@@ -204,8 +204,8 @@ abstract class FilterFormatFormBase extends EntityForm {
   /**
    * {@inheritdoc}
    */
-  public function validate(array $form, FormStateInterface $form_state) {
-    parent::validate($form, $form_state);
+  public function validateForm(array &$form, FormStateInterface $form_state) {
+    parent::validateForm($form, $form_state);
 
     // @todo Move trimming upstream.
     $format_format = trim($form_state->getValue('format'));
diff --git a/core/modules/filter/src/Plugin/Filter/FilterCaption.php b/core/modules/filter/src/Plugin/Filter/FilterCaption.php
index 6f90565eb..ed241d88e 100644
--- a/core/modules/filter/src/Plugin/Filter/FilterCaption.php
+++ b/core/modules/filter/src/Plugin/Filter/FilterCaption.php
@@ -45,7 +45,7 @@ class FilterCaption extends FilterBase {
         // Sanitize caption: decode HTML encoding, limit allowed HTML tags; only
         // allow inline tags that are allowed by default, plus <br>.
         $caption = Html::decodeEntities($caption);
-        $caption = Xss::filter($caption, array('a', 'em', 'strong', 'cite', 'code', 'br'));
+        $caption = SafeMarkup::xssFilter($caption, array('a', 'em', 'strong', 'cite', 'code', 'br'));
 
         // The caption must be non-empty.
         if (Unicode::strlen($caption) === 0) {
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/FilterFormat.php b/core/modules/filter/src/Plugin/migrate/source/d6/FilterFormat.php
similarity index 95%
rename from core/modules/migrate_drupal/src/Plugin/migrate/source/d6/FilterFormat.php
rename to core/modules/filter/src/Plugin/migrate/source/d6/FilterFormat.php
index f832179c2..6d99e05ec 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/FilterFormat.php
+++ b/core/modules/filter/src/Plugin/migrate/source/d6/FilterFormat.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\FilterFormat.
+ * Contains \Drupal\filter\Plugin\migrate\source\d6\FilterFormat.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+namespace Drupal\filter\Plugin\migrate\source\d6;
 
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 use Drupal\migrate\Row;
diff --git a/core/modules/filter/src/ProxyClass/FilterUninstallValidator.php b/core/modules/filter/src/ProxyClass/FilterUninstallValidator.php
new file mode 100644
index 000000000..63fa96ca1
--- /dev/null
+++ b/core/modules/filter/src/ProxyClass/FilterUninstallValidator.php
@@ -0,0 +1,92 @@
+<?php
+
+/**
+ * @file
+ * Contains Drupal\filter\ProxyClass\FilterUninstallValidator.
+ */
+
+/**
+ * This file was generated via php core/scripts/generate-proxy-class.php 'Drupal\filter\FilterUninstallValidator' "core/modules/filter/src".
+ */
+
+namespace Drupal\filter\ProxyClass {
+
+    /**
+     * Provides a proxy class for \Drupal\filter\FilterUninstallValidator.
+     *
+     * @see \Drupal\Component\ProxyBuilder
+     */
+    class FilterUninstallValidator implements \Drupal\Core\Extension\ModuleUninstallValidatorInterface
+    {
+
+        use \Drupal\Core\DependencyInjection\DependencySerializationTrait;
+
+        /**
+         * The id of the original proxied service.
+         *
+         * @var string
+         */
+        protected $drupalProxyOriginalServiceId;
+
+        /**
+         * The real proxied service, after it was lazy loaded.
+         *
+         * @var \Drupal\filter\FilterUninstallValidator
+         */
+        protected $service;
+
+        /**
+         * The service container.
+         *
+         * @var \Symfony\Component\DependencyInjection\ContainerInterface
+         */
+        protected $container;
+
+        /**
+         * Constructs a ProxyClass Drupal proxy object.
+         *
+         * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
+         *   The container.
+         * @param string $drupal_proxy_original_service_id
+         *   The service ID of the original service.
+         */
+        public function __construct(\Symfony\Component\DependencyInjection\ContainerInterface $container, $drupal_proxy_original_service_id)
+        {
+            $this->container = $container;
+            $this->drupalProxyOriginalServiceId = $drupal_proxy_original_service_id;
+        }
+
+        /**
+         * Lazy loads the real service from the container.
+         *
+         * @return object
+         *   Returns the constructed real service.
+         */
+        protected function lazyLoadItself()
+        {
+            if (!isset($this->service)) {
+                $this->service = $this->container->get($this->drupalProxyOriginalServiceId);
+            }
+
+            return $this->service;
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function validate($module)
+        {
+            return $this->lazyLoadItself()->validate($module);
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function setStringTranslation(\Drupal\Core\StringTranslation\TranslationInterface $translation)
+        {
+            return $this->lazyLoadItself()->setStringTranslation($translation);
+        }
+
+    }
+
+}
diff --git a/core/modules/filter/src/Tests/FilterAPITest.php b/core/modules/filter/src/Tests/FilterAPITest.php
index ff23d39bb..263b31ee4 100644
--- a/core/modules/filter/src/Tests/FilterAPITest.php
+++ b/core/modules/filter/src/Tests/FilterAPITest.php
@@ -60,7 +60,7 @@ class FilterAPITest extends EntityUnitTestBase {
     $text = "<p>Llamas are <not> awesome!</p>";
     $expected_filtered_text = "&lt;p&gt;Llamas are  awesome!&lt;/p&gt;";
 
-    $this->assertIdentical(check_markup($text, 'crazy'), $expected_filtered_text, 'Filters applied in correct order.');
+    $this->assertEqual(check_markup($text, 'crazy'), $expected_filtered_text, 'Filters applied in correct order.');
   }
 
   /**
@@ -73,14 +73,14 @@ class FilterAPITest extends EntityUnitTestBase {
 
     $actual_filtered_text = check_markup($text, 'filtered_html', '', array());
     $this->verbose("Actual:<pre>$actual_filtered_text</pre>Expected:<pre>$expected_filtered_text</pre>");
-    $this->assertIdentical(
+    $this->assertEqual(
       $actual_filtered_text,
       $expected_filtered_text,
       'Expected filter result.'
     );
     $actual_filtered_text_without_html_generators = check_markup($text, 'filtered_html', '', array(FilterInterface::TYPE_MARKUP_LANGUAGE));
     $this->verbose("Actual:<pre>$actual_filtered_text_without_html_generators</pre>Expected:<pre>$expected_filter_text_without_html_generators</pre>");
-    $this->assertIdentical(
+    $this->assertEqual(
       $actual_filtered_text_without_html_generators,
       $expected_filter_text_without_html_generators,
       'Expected filter result when skipping FilterInterface::TYPE_MARKUP_LANGUAGE filters.'
@@ -91,7 +91,7 @@ class FilterAPITest extends EntityUnitTestBase {
     // most extensive test possible.
     $actual_filtered_text_without_html_generators = check_markup($text, 'filtered_html', '', array(FilterInterface::TYPE_HTML_RESTRICTOR, FilterInterface::TYPE_MARKUP_LANGUAGE));
     $this->verbose("Actual:<pre>$actual_filtered_text_without_html_generators</pre>Expected:<pre>$expected_filter_text_without_html_generators</pre>");
-    $this->assertIdentical(
+    $this->assertEqual(
       $actual_filtered_text_without_html_generators,
       $expected_filter_text_without_html_generators,
       'Expected filter result when skipping FilterInterface::TYPE_MARKUP_LANGUAGE filters, even when trying to disable filters of the FilterInterface::TYPE_HTML_RESTRICTOR type.'
@@ -221,6 +221,10 @@ class FilterAPITest extends EntityUnitTestBase {
           'weight' => 0,
           'status' => TRUE,
         ),
+        'filter_test_cache_merge' => array(
+          'weight' => 0,
+          'status' => TRUE,
+        ),
         'filter_test_placeholders' => array(
           'weight' => 1,
           'status' => TRUE,
@@ -257,6 +261,8 @@ class FilterAPITest extends EntityUnitTestBase {
       // The cache tags set by the filter_test_cache_tags filter.
       'foo:bar',
       'foo:baz',
+      // The cache tags set by the filter_test_cache_merge filter.
+      'merge:tag',
     );
     $this->assertEqual($expected_cache_tags, $build['#cache']['tags'], 'Expected cache tags present.');
     $expected_cache_contexts = [
@@ -265,6 +271,8 @@ class FilterAPITest extends EntityUnitTestBase {
       // The default cache contexts for Renderer.
       'languages:' . LanguageInterface::TYPE_INTERFACE,
       'theme',
+      // The cache tags set by the filter_test_cache_merge filter.
+      'user.permissions',
     ];
     $this->assertEqual($expected_cache_contexts, $build['#cache']['contexts'], 'Expected cache contexts present.');
     $expected_markup = '<p>Hello, world!</p><p>This is a dynamic llama.</p>';
diff --git a/core/modules/filter/src/Tests/FilterUnitTest.php b/core/modules/filter/src/Tests/FilterUnitTest.php
index 7fdf8f9d5..fe7664c31 100644
--- a/core/modules/filter/src/Tests/FilterUnitTest.php
+++ b/core/modules/filter/src/Tests/FilterUnitTest.php
@@ -9,6 +9,7 @@ namespace Drupal\filter\Tests;
 
 use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Core\Render\RenderContext;
 use Drupal\editor\EditorXssFilter\Standard;
 use Drupal\filter\Entity\FilterFormat;
 use Drupal\filter\FilterPluginCollection;
@@ -101,10 +102,14 @@ class FilterUnitTest extends KernelTestBase {
    * Tests the caption filter.
    */
   function testCaptionFilter() {
+    /** @var \Drupal\Core\Render\RendererInterface $renderer */
+    $renderer = \Drupal::service('renderer');
     $filter = $this->filters['filter_caption'];
 
-    $test = function($input) use ($filter) {
-      return $filter->process($input, 'und');
+    $test = function($input) use ($filter, $renderer) {
+      return $renderer->executeInRenderContext(new RenderContext(), function () use ($input, $filter) {
+        return $filter->process($input, 'und');
+      });
     };
 
     $attached_library = array(
@@ -190,12 +195,14 @@ class FilterUnitTest extends KernelTestBase {
         'filter_html_nofollow' => 0,
       )
     ));
-    $test_with_html_filter = function ($input) use ($filter, $html_filter) {
-      // 1. Apply HTML filter's processing step.
-      $output = $html_filter->process($input, 'und');
-      // 2. Apply caption filter's processing step.
-      $output = $filter->process($output, 'und');
-      return $output->getProcessedText();
+    $test_with_html_filter = function ($input) use ($filter, $html_filter, $renderer) {
+      return $renderer->executeInRenderContext(new RenderContext(), function () use ($input, $filter, $html_filter) {
+        // 1. Apply HTML filter's processing step.
+        $output = $html_filter->process($input, 'und');
+        // 2. Apply caption filter's processing step.
+        $output = $filter->process($output, 'und');
+        return $output->getProcessedText();
+      });
     };
     // Editor XSS filter.
     $test_editor_xss_filter = function ($input) {
@@ -252,11 +259,15 @@ class FilterUnitTest extends KernelTestBase {
    * Tests the combination of the align and caption filters.
    */
   function testAlignAndCaptionFilters() {
+    /** @var \Drupal\Core\Render\RendererInterface $renderer */
+    $renderer = \Drupal::service('renderer');
     $align_filter = $this->filters['filter_align'];
     $caption_filter = $this->filters['filter_caption'];
 
-    $test = function($input) use ($align_filter, $caption_filter) {
-      return $caption_filter->process($align_filter->process($input, 'und'), 'und');
+    $test = function($input) use ($align_filter, $caption_filter, $renderer) {
+      return $renderer->executeInRenderContext(new RenderContext(), function () use ($input, $align_filter, $caption_filter) {
+        return $caption_filter->process($align_filter->process($input, 'und'), 'und');
+      });
     };
 
     $attached_library = array(
@@ -504,7 +515,7 @@ class FilterUnitTest extends KernelTestBase {
     // Create a email that is too long.
     $long_email = str_repeat('a', 254) . '@example.com';
     $too_long_email = str_repeat('b', 255) . '@example.com';
-
+    $email_with_plus_sign = 'one+two@example.com';
 
     // Filter selection/pattern matching.
     $tests = array(
@@ -517,12 +528,13 @@ http://example.com or www.example.com
       ),
       // MAILTO URLs.
       '
-person@example.com or mailto:person2@example.com or ' . $long_email . ' but not ' . $too_long_email . '
+person@example.com or mailto:person2@example.com or ' . $email_with_plus_sign . ' or ' . $long_email . ' but not ' . $too_long_email . '
 ' => array(
         '<a href="mailto:person@example.com">person@example.com</a>' => TRUE,
         '<a href="mailto:person2@example.com">mailto:person2@example.com</a>' => TRUE,
         '<a href="mailto:' . $long_email . '">' . $long_email . '</a>' => TRUE,
         '<a href="mailto:' . $too_long_email . '">' . $too_long_email . '</a>' => FALSE,
+        '<a href="mailto:' . $email_with_plus_sign . '">' . $email_with_plus_sign . '</a>' => TRUE,
       ),
       // URI parts and special characters.
       '
@@ -582,7 +594,7 @@ me@me.tv
       ),
       // Absolute URL protocols.
       // The list to test is found in the beginning of _filter_url() at
-      // $protocols = $this->config('system.filter')->get('protocols').
+      // $protocols = \Drupal::getContainer()->getParameter('filter_protocols').
       '
 https://example.com,
 ftp://ftp.example.com,
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateFilterFormatTest.php b/core/modules/filter/src/Tests/Migrate/d6/MigrateFilterFormatTest.php
similarity index 74%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateFilterFormatTest.php
rename to core/modules/filter/src/Tests/Migrate/d6/MigrateFilterFormatTest.php
index 1c11f83da..62f374b6d 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateFilterFormatTest.php
+++ b/core/modules/filter/src/Tests/Migrate/d6/MigrateFilterFormatTest.php
@@ -2,18 +2,17 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateFilterFormatTest.
+ * Contains \Drupal\filter\Tests\Migrate\d6\MigrateFilterFormatTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\filter\Tests\Migrate\d6;
 
-use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to filter.formats.*.yml.
  *
- * @group migrate_drupal
+ * @group filter
  */
 class MigrateFilterFormatTest extends MigrateDrupal6TestBase {
 
@@ -27,15 +26,8 @@ class MigrateFilterFormatTest extends MigrateDrupal6TestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $migration = entity_load('migration', 'd6_filter_format');
-    $dumps = array(
-      $this->getDumpDirectory() . '/Filters.php',
-      $this->getDumpDirectory() . '/FilterFormats.php',
-      $this->getDumpDirectory() . '/Variable.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->loadDumps(['Filters.php', 'FilterFormats.php', 'Variable.php']);
+    $this->executeMigration('d6_filter_format');
   }
 
   /**
diff --git a/core/modules/filter/tests/filter_test/src/Plugin/Filter/FilterTestCacheMerge.php b/core/modules/filter/tests/filter_test/src/Plugin/Filter/FilterTestCacheMerge.php
new file mode 100644
index 000000000..9e56c9bf9
--- /dev/null
+++ b/core/modules/filter/tests/filter_test/src/Plugin/Filter/FilterTestCacheMerge.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\filter_test\Plugin\Filter\FilterTestCacheMerge.
+ */
+
+namespace Drupal\filter_test\Plugin\Filter;
+
+use Drupal\filter\FilterProcessResult;
+use Drupal\filter\Plugin\FilterBase;
+use Drupal\Core\Cache\CacheableMetadata;
+use Drupal\Core\Language\LanguageInterface;
+
+/**
+ * Provides a test filter to merge with CacheableMetadata.
+ *
+ * @Filter(
+ *   id = "filter_test_cache_merge",
+ *   title = @Translation("Testing filter"),
+ *   description = @Translation("Does not change content; merges cacheable metadata."),
+ *   type = Drupal\filter\Plugin\FilterInterface::TYPE_TRANSFORM_REVERSIBLE
+ * )
+ */
+class FilterTestCacheMerge extends FilterBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function process($text, $langcode) {
+    $result = new FilterProcessResult($text);
+
+    $metadata = new CacheableMetadata();
+    $metadata->addCacheTags(['merge:tag']);
+    $metadata->addCacheContexts(['user.permissions']);
+    $result = $result->merge($metadata);
+
+    return $result;
+  }
+
+}
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/FilterFormatTest.php b/core/modules/filter/tests/src/Unit/Plugin/migrate/source/d6/FilterFormatTest.php
similarity index 91%
rename from core/modules/migrate_drupal/tests/src/Unit/source/d6/FilterFormatTest.php
rename to core/modules/filter/tests/src/Unit/Plugin/migrate/source/d6/FilterFormatTest.php
index 49ec31a50..ebdb776bb 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/FilterFormatTest.php
+++ b/core/modules/filter/tests/src/Unit/Plugin/migrate/source/d6/FilterFormatTest.php
@@ -2,23 +2,23 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\FilterFormatTest.
+ * Contains \Drupal\Tests\filter\Unit\Plugin\migrate\source\d6\FilterFormatTest.
  */
 
-namespace Drupal\Tests\migrate_drupal\Unit\source\d6;
+namespace Drupal\Tests\filter\Unit\Plugin\migrate\source\d6;
 
 use Drupal\Tests\migrate\Unit\MigrateSqlSourceTestCase;
 
 /**
  * Tests D6 filter_formats table source plugin.
  *
- * @group migrate_drupal
+ * @group filter
  */
 class FilterFormatTest extends MigrateSqlSourceTestCase {
 
   // The plugin system is not working during unit testing so the source plugin
   // class needs to be manually specified.
-  const PLUGIN_CLASS = 'Drupal\migrate_drupal\Plugin\migrate\source\d6\FilterFormat';
+  const PLUGIN_CLASS = 'Drupal\filter\Plugin\migrate\source\d6\FilterFormat';
 
   // The fake Migration configuration entity.
   protected $migrationConfiguration = array(
diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module
index 8ce12ba2e..90086a6a8 100644
--- a/core/modules/forum/forum.module
+++ b/core/modules/forum/forum.module
@@ -540,7 +540,7 @@ function template_preprocess_forum_list(&$variables) {
   $row = 0;
   // Sanitize each forum so that the template can safely print the data.
   foreach ($variables['forums'] as $id => $forum) {
-    $variables['forums'][$id]->description = Xss::filterAdmin($forum->description->value);
+    $variables['forums'][$id]->description = array('#markup' => $forum->description->value);
     $variables['forums'][$id]->link = forum_uri($forum);
     $variables['forums'][$id]->name = SafeMarkup::checkPlain($forum->label());
     $variables['forums'][$id]->is_container = !empty($forum->forum_container->value);
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_forum_settings.yml b/core/modules/forum/migration_templates/d6_forum_settings.yml
similarity index 85%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_forum_settings.yml
rename to core/modules/forum/migration_templates/d6_forum_settings.yml
index 72e4814f3..2df6496d7 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_forum_settings.yml
+++ b/core/modules/forum/migration_templates/d6_forum_settings.yml
@@ -27,9 +27,3 @@ destination:
 migration_dependencies:
   required:
     - d6_taxonomy_vocabulary
-dependencies:
-  config:
-    - migrate.migration.d6_taxonomy_vocabulary
-  module:
-    - forum
-    - migrate_drupal
diff --git a/core/modules/forum/src/Form/Overview.php b/core/modules/forum/src/Form/Overview.php
index 24f5142aa..dae7fb54c 100644
--- a/core/modules/forum/src/Form/Overview.php
+++ b/core/modules/forum/src/Form/Overview.php
@@ -86,9 +86,7 @@ class Overview extends OverviewTerms {
     // Remove the alphabetical reset.
     unset($form['actions']['reset_alphabetical']);
 
-    // The form needs to have submit and validate handlers set explicitly.
     // Use the existing taxonomy overview submit handler.
-    $form['#submit'] = array('::submitForm');
     $form['terms']['#empty'] = $this->t('No containers or forums available. <a href="@container">Add container</a> or <a href="@forum">Add forum</a>.', array(
       '@container' => $this->url('forum.add_container'),
       '@forum' => $this->url('forum.add_forum')
diff --git a/core/modules/forum/src/ProxyClass/ForumUninstallValidator.php b/core/modules/forum/src/ProxyClass/ForumUninstallValidator.php
new file mode 100644
index 000000000..59a747ebb
--- /dev/null
+++ b/core/modules/forum/src/ProxyClass/ForumUninstallValidator.php
@@ -0,0 +1,92 @@
+<?php
+
+/**
+ * @file
+ * Contains Drupal\forum\ProxyClass\ForumUninstallValidator.
+ */
+
+/**
+ * This file was generated via php core/scripts/generate-proxy-class.php 'Drupal\forum\ForumUninstallValidator' "core/modules/forum/src".
+ */
+
+namespace Drupal\forum\ProxyClass {
+
+    /**
+     * Provides a proxy class for \Drupal\forum\ForumUninstallValidator.
+     *
+     * @see \Drupal\Component\ProxyBuilder
+     */
+    class ForumUninstallValidator implements \Drupal\Core\Extension\ModuleUninstallValidatorInterface
+    {
+
+        use \Drupal\Core\DependencyInjection\DependencySerializationTrait;
+
+        /**
+         * The id of the original proxied service.
+         *
+         * @var string
+         */
+        protected $drupalProxyOriginalServiceId;
+
+        /**
+         * The real proxied service, after it was lazy loaded.
+         *
+         * @var \Drupal\forum\ForumUninstallValidator
+         */
+        protected $service;
+
+        /**
+         * The service container.
+         *
+         * @var \Symfony\Component\DependencyInjection\ContainerInterface
+         */
+        protected $container;
+
+        /**
+         * Constructs a ProxyClass Drupal proxy object.
+         *
+         * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
+         *   The container.
+         * @param string $drupal_proxy_original_service_id
+         *   The service ID of the original service.
+         */
+        public function __construct(\Symfony\Component\DependencyInjection\ContainerInterface $container, $drupal_proxy_original_service_id)
+        {
+            $this->container = $container;
+            $this->drupalProxyOriginalServiceId = $drupal_proxy_original_service_id;
+        }
+
+        /**
+         * Lazy loads the real service from the container.
+         *
+         * @return object
+         *   Returns the constructed real service.
+         */
+        protected function lazyLoadItself()
+        {
+            if (!isset($this->service)) {
+                $this->service = $this->container->get($this->drupalProxyOriginalServiceId);
+            }
+
+            return $this->service;
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function validate($module)
+        {
+            return $this->lazyLoadItself()->validate($module);
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function setStringTranslation(\Drupal\Core\StringTranslation\TranslationInterface $translation)
+        {
+            return $this->lazyLoadItself()->setStringTranslation($translation);
+        }
+
+    }
+
+}
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateForumConfigsTest.php b/core/modules/forum/src/Tests/Migrate/d6/MigrateForumConfigsTest.php
similarity index 76%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateForumConfigsTest.php
rename to core/modules/forum/src/Tests/Migrate/d6/MigrateForumConfigsTest.php
index f91dade33..803de4b07 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateForumConfigsTest.php
+++ b/core/modules/forum/src/Tests/Migrate/d6/MigrateForumConfigsTest.php
@@ -2,19 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateForumConfigsTest.
+ * Contains \Drupal\forum\Tests\Migrate\d6\MigrateForumConfigsTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\forum\Tests\Migrate\d6;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to forum.settings.yml.
  *
- * @group migrate_drupal
+ * @group forum
  */
 class MigrateForumConfigsTest extends MigrateDrupal6TestBase {
 
@@ -37,13 +36,8 @@ class MigrateForumConfigsTest extends MigrateDrupal6TestBase {
         array(array(1), array('vocabulary_1_i_0_')),
       )
     ));
-    $migration = entity_load('migration', 'd6_forum_settings');
-    $dumps = array(
-      $this->getDumpDirectory() . '/Variable.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->loadDumps(['Variable.php']);
+    $this->executeMigration('d6_forum_settings');
   }
 
   /**
diff --git a/core/modules/hal/src/Normalizer/FileEntityNormalizer.php b/core/modules/hal/src/Normalizer/FileEntityNormalizer.php
index f993024f6..52ee04b76 100644
--- a/core/modules/hal/src/Normalizer/FileEntityNormalizer.php
+++ b/core/modules/hal/src/Normalizer/FileEntityNormalizer.php
@@ -64,7 +64,7 @@ class FileEntityNormalizer extends ContentEntityNormalizer {
    * {@inheritdoc}
    */
   public function denormalize($data, $class, $format = NULL, array $context = array()) {
-    $file_data = $this->httpClient->get($data['uri'][0]['value'])->getBody(TRUE);
+    $file_data = (string) $this->httpClient->get($data['uri'][0]['value'])->getBody();
 
     $path = 'temporary://' . drupal_basename($data['uri'][0]['value']);
     $data['uri'] = file_unmanaged_save_data($file_data, $path);
diff --git a/core/modules/help/tests/modules/help_test/src/SupernovaGenerator.php b/core/modules/help/tests/modules/help_test/src/SupernovaGenerator.php
index 3b6adec23..635ecaa65 100644
--- a/core/modules/help/tests/modules/help_test/src/SupernovaGenerator.php
+++ b/core/modules/help/tests/modules/help_test/src/SupernovaGenerator.php
@@ -39,7 +39,7 @@ class SupernovaGenerator implements UrlGeneratorInterface {
   /**
    * {@inheritdoc}
    */
-  public function generateFromPath($path = NULL, $options = array(), $collect_cacheability_metadata = FALSE) {
+  public function generateFromPath($path = NULL, $options = array(), $collect_bubbleable_metadata = FALSE) {
     throw new \Exception();
   }
 
@@ -53,7 +53,7 @@ class SupernovaGenerator implements UrlGeneratorInterface {
   /**
    * {@inheritdoc}
    */
-  public function generateFromRoute($name, $parameters = array(), $options = array(), $collect_cacheability_metadata = FALSE) {
+  public function generateFromRoute($name, $parameters = array(), $options = array(), $collect_bubbleable_metadata = FALSE) {
     throw new \Exception();
   }
 
diff --git a/core/modules/image/image.services.yml b/core/modules/image/image.services.yml
index 88770c67f..2f17bb5c8 100644
--- a/core/modules/image/image.services.yml
+++ b/core/modules/image/image.services.yml
@@ -1,6 +1,7 @@
 services:
   path_processor.image_styles:
     class: Drupal\image\PathProcessor\PathProcessorImageStyles
+    arguments: ['@stream_wrapper_manager']
     tags:
       - { name: path_processor_inbound, priority: 300 }
   plugin.manager.image.effect:
diff --git a/core/modules/image/src/Entity/ImageStyle.php b/core/modules/image/src/Entity/ImageStyle.php
index a05d3a881..d956d881f 100644
--- a/core/modules/image/src/Entity/ImageStyle.php
+++ b/core/modules/image/src/Entity/ImageStyle.php
@@ -226,7 +226,7 @@ class ImageStyle extends ConfigEntityBase implements ImageStyleInterface, Entity
     // to the actual file path, this avoids bootstrapping PHP once the files are
     // built.
     if ($clean_urls === FALSE && file_uri_scheme($uri) == 'public' && !file_exists($uri)) {
-      $directory_path = file_stream_wrapper_get_instance_by_uri($uri)->getDirectoryPath();
+      $directory_path = \Drupal::service('stream_wrapper_manager')->getViaUri($uri)->getDirectoryPath();
       return Url::fromUri('base:' . $directory_path . '/' . file_uri_target($uri), array('absolute' => TRUE, 'query' => $token_query))->toString();
     }
 
@@ -267,7 +267,7 @@ class ImageStyle extends ConfigEntityBase implements ImageStyleInterface, Entity
     // Clear caches so that formatters may be added for this style.
     drupal_theme_rebuild();
 
-    Cache::invalidateTags($this->getCacheTags());
+    Cache::invalidateTags($this->getCacheTagsToInvalidate());
 
     return $this;
   }
diff --git a/core/modules/image/src/Form/ImageEffectFormBase.php b/core/modules/image/src/Form/ImageEffectFormBase.php
index 7b7f25b61..66edd95ba 100644
--- a/core/modules/image/src/Form/ImageEffectFormBase.php
+++ b/core/modules/image/src/Form/ImageEffectFormBase.php
@@ -13,7 +13,6 @@ use Drupal\Core\Form\FormStateInterface;
 use Drupal\image\ConfigurableImageEffectInterface;
 use Drupal\image\ImageStyleInterface;
 use Drupal\Component\Plugin\Exception\PluginNotFoundException;
-use Drupal\Component\Utility\SafeMarkup;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
@@ -61,7 +60,7 @@ abstract class ImageEffectFormBase extends FormBase {
       $this->imageEffect = $this->prepareImageEffect($image_effect);
     }
     catch (PluginNotFoundException $e) {
-      throw new NotFoundHttpException(SafeMarkup::format("Invalid effect id: '@id'.", array('@id' => $image_effect)));
+      throw new NotFoundHttpException("Invalid effect id: '$image_effect'.");
     }
     $request = $this->getRequest();
 
diff --git a/core/modules/image/src/PathProcessor/PathProcessorImageStyles.php b/core/modules/image/src/PathProcessor/PathProcessorImageStyles.php
index c723860a0..f3948d869 100644
--- a/core/modules/image/src/PathProcessor/PathProcessorImageStyles.php
+++ b/core/modules/image/src/PathProcessor/PathProcessorImageStyles.php
@@ -8,6 +8,7 @@
 namespace Drupal\image\PathProcessor;
 
 use Drupal\Core\PathProcessor\InboundPathProcessorInterface;
+use Drupal\Core\StreamWrapper\StreamWrapperManagerInterface;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -27,11 +28,28 @@ use Symfony\Component\HttpFoundation\Request;
  */
 class PathProcessorImageStyles implements InboundPathProcessorInterface {
 
+  /**
+   * The stream wrapper manager service.
+   *
+   * @var \Drupal\Core\StreamWrapper\StreamWrapperManagerInterface
+   */
+  protected $streamWrapperManager;
+
+  /**
+   * Constructs a new PathProcessorImageStyles object.
+   *
+   * @param \Drupal\Core\StreamWrapper\StreamWrapperManagerInterface $stream_wrapper_manager
+   *   The stream wrapper manager service.
+   */
+  public function __construct(StreamWrapperManagerInterface $stream_wrapper_manager) {
+    $this->streamWrapperManager = $stream_wrapper_manager;
+  }
+
   /**
    * {@inheritdoc}
    */
   public function processInbound($path, Request $request) {
-    $directory_path = file_stream_wrapper_get_instance_by_scheme('public')->getDirectoryPath();
+    $directory_path = $this->streamWrapperManager->getViaScheme('public')->getDirectoryPath();
     if (strpos($path, '/' . $directory_path . '/styles/') === 0) {
       $path_prefix = '/' . $directory_path . '/styles/';
     }
@@ -43,7 +61,7 @@ class PathProcessorImageStyles implements InboundPathProcessorInterface {
     }
 
     // Strip out path prefix.
-    $rest = preg_replace('|^' . $path_prefix . '|', '', $path);
+    $rest = preg_replace('|^' . preg_quote($path_prefix, '|') . '|', '', $path);
 
     // Get the image style, scheme and path.
     if (substr_count($rest, '/') >= 2) {
diff --git a/core/modules/image/src/Routing/ImageStyleRoutes.php b/core/modules/image/src/Routing/ImageStyleRoutes.php
index 32e8f2b26..44829ed26 100644
--- a/core/modules/image/src/Routing/ImageStyleRoutes.php
+++ b/core/modules/image/src/Routing/ImageStyleRoutes.php
@@ -7,12 +7,41 @@
 
 namespace Drupal\image\Routing;
 
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
+use Drupal\Core\StreamWrapper\StreamWrapperManagerInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\Routing\Route;
 
 /**
  * Defines a route subscriber to register a url for serving image styles.
  */
-class ImageStyleRoutes {
+class ImageStyleRoutes implements ContainerInjectionInterface {
+
+  /**
+   * The stream wrapper manager service.
+   *
+   * @var \Drupal\Core\StreamWrapper\StreamWrapperManagerInterface
+   */
+  protected $streamWrapperManager;
+
+  /**
+   * Constructs a new PathProcessorImageStyles object.
+   *
+   * @param \Drupal\Core\StreamWrapper\StreamWrapperManagerInterface $stream_wrapper_manager
+   *   The stream wrapper manager service.
+   */
+  public function __construct(StreamWrapperManagerInterface $stream_wrapper_manager) {
+    $this->streamWrapperManager = $stream_wrapper_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static(
+      $container->get('stream_wrapper_manager')
+    );
+  }
 
   /**
    * Returns an array of route objects.
@@ -26,7 +55,7 @@ class ImageStyleRoutes {
     // disabled image derivatives will always be served through the menu system.
     // If clean URLs are enabled and the image derivative already exists, PHP
     // will be bypassed.
-    $directory_path = file_stream_wrapper_get_instance_by_scheme('public')->getDirectoryPath();
+    $directory_path = $this->streamWrapperManager->getViaScheme('public')->getDirectoryPath();
 
     $routes['image.style_public'] = new Route(
       '/' . $directory_path . '/styles/{image_style}/{scheme}',
diff --git a/core/modules/image/src/Tests/ImageAdminStylesTest.php b/core/modules/image/src/Tests/ImageAdminStylesTest.php
index 5501d8024..194c016ce 100644
--- a/core/modules/image/src/Tests/ImageAdminStylesTest.php
+++ b/core/modules/image/src/Tests/ImageAdminStylesTest.php
@@ -11,6 +11,7 @@ use Drupal\Component\Utility\SafeMarkup;
 use Drupal\image\Entity\ImageStyle;
 use Drupal\image\ImageStyleInterface;
 use Drupal\node\Entity\Node;
+use Drupal\file\Entity\File;
 
 /**
  * Tests creation, deletion, and editing of image styles and effects.
@@ -302,7 +303,7 @@ class ImageAdminStylesTest extends ImageFieldTestBase {
 
     // Get node field original image URI.
     $fid = $node->get($field_name)->target_id;
-    $original_uri = file_load($fid)->getFileUri();
+    $original_uri = File::load($fid)->getFileUri();
 
     // Test that image is displayed using newly created style.
     $this->drupalGet('node/' . $nid);
@@ -436,7 +437,7 @@ class ImageAdminStylesTest extends ImageFieldTestBase {
 
     // Get node field original image URI.
     $fid = $node->get($field_name)->target_id;
-    $original_uri = file_load($fid)->getFileUri();
+    $original_uri = File::load($fid)->getFileUri();
 
     // Test that image is displayed using newly created style.
     $this->drupalGet('node/' . $nid);
diff --git a/core/modules/language/language.module b/core/modules/language/language.module
index 342e7302d..29c93d2cf 100644
--- a/core/modules/language/language.module
+++ b/core/modules/language/language.module
@@ -282,42 +282,6 @@ function language_get_default_langcode($entity_type, $bundle) {
   return $configuration->getDefaultLangcode();
 }
 
-/**
- * Implements hook_language_types_info().
- *
- * Defines the three core language types:
- * - Interface language is the only configurable language type in core. It is
- *   used by t() as the default language if none is specified.
- * - Content language is by default non-configurable and inherits the interface
- *   language negotiated value. It is used by the Field API to determine the
- *   display language for fields if no explicit value is specified.
- * - URL language is by default non-configurable and is determined through the
- *   URL language negotiation method or the URL fallback language negotiation
- *   method if no language can be detected. It is used by l() as the default
- *   language if none is specified.
- */
-function language_language_types_info() {
-  return array(
-    LanguageInterface::TYPE_INTERFACE => array(
-      'name' => t('Interface text'),
-      'description' => t('Order of language detection methods for interface text. If a translation of interface text is available in the detected language, it will be displayed.'),
-      'locked' => TRUE,
-    ),
-    LanguageInterface::TYPE_CONTENT => array(
-      'name' => t('Content'),
-      'description' => t('Order of language detection methods for content. If a version of content is available in the detected language, it will be displayed.'),
-      'fixed' => array(LanguageNegotiationUI::METHOD_ID),
-      'locked' => TRUE,
-    ),
-    LanguageInterface::TYPE_URL => array(
-      'name' => t('URL'),
-      'description' => t('Order of language detection methods for URLs. The detected language will be used as the default when generating URLs for internal links on the site.'),
-      'fixed' => array(LanguageNegotiationUrl::METHOD_ID, LanguageNegotiationUrlFallback::METHOD_ID),
-      'locked' => TRUE,
-    ),
-  );
-}
-
 /**
  * Reads language prefixes and uses the langcode if no prefix is set.
  */
@@ -540,3 +504,16 @@ function language_tour_tips_alter(array &$tour_tips, EntityInterface $entity) {
     }
   }
 }
+
+/**
+ * Implements hook_language_types_info_alter().
+ *
+ * We can't set the fixed properties in \Drupal\Core\Language\LanguageManager,
+ * where the rest of the properties for the default language types are defined.
+ * The LanguageNegation classes are only loaded when the language module is
+ * enabled and we can't be sure of that in the LanguageManager.
+ */
+function language_language_types_info_alter(array &$language_types) {
+  $language_types[LanguageInterface::TYPE_CONTENT]['fixed'] = [LanguageNegotiationUI::METHOD_ID];
+  $language_types[LanguageInterface::TYPE_URL]['fixed'] = [LanguageNegotiationUrl::METHOD_ID, LanguageNegotiationUrlFallback::METHOD_ID];
+}
diff --git a/core/modules/language/language.services.yml b/core/modules/language/language.services.yml
index b9de79a0b..fc9bba1cf 100644
--- a/core/modules/language/language.services.yml
+++ b/core/modules/language/language.services.yml
@@ -9,7 +9,7 @@ services:
       - [initLanguageManager]
   language.config_subscriber:
     class: Drupal\language\EventSubscriber\ConfigSubscriber
-    arguments: ['@language_manager', '@language.default']
+    arguments: ['@language_manager', '@language.default', '@config.factory']
     tags:
       - { name: event_subscriber }
   language.config_factory_override:
diff --git a/core/modules/language/src/Config/LanguageConfigCollectionNameTrait.php b/core/modules/language/src/Config/LanguageConfigCollectionNameTrait.php
index 651209ae0..00cd1b9f1 100644
--- a/core/modules/language/src/Config/LanguageConfigCollectionNameTrait.php
+++ b/core/modules/language/src/Config/LanguageConfigCollectionNameTrait.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\language\Config;
 
-use Drupal\Component\Utility\SafeMarkup;
-
 /**
  * Provides a common trait for working with language override collection names.
  */
@@ -45,7 +43,7 @@ trait LanguageConfigCollectionNameTrait {
   protected function getLangcodeFromCollectionName($collection) {
     preg_match('/^language\.(.*)$/', $collection, $matches);
     if (!isset($matches[1])) {
-      throw new \InvalidArgumentException(SafeMarkup::format('!collection is not a valid language override collection', array('!collection' => $collection)));
+      throw new \InvalidArgumentException("'$collection' is not a valid language override collection");
     }
     return $matches[1];
   }
diff --git a/core/modules/language/src/Config/LanguageConfigFactoryOverride.php b/core/modules/language/src/Config/LanguageConfigFactoryOverride.php
index 3d0a67ba8..e547d1e13 100644
--- a/core/modules/language/src/Config/LanguageConfigFactoryOverride.php
+++ b/core/modules/language/src/Config/LanguageConfigFactoryOverride.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\language\Config;
 
+use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Config\ConfigCollectionInfo;
 use Drupal\Core\Config\ConfigCrudEvent;
 use Drupal\Core\Config\ConfigFactoryOverrideBase;
@@ -222,4 +223,15 @@ class LanguageConfigFactoryOverride extends ConfigFactoryOverrideBase implements
     }
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheableMetadata($name) {
+    $metadata = new CacheableMetadata();
+    if ($this->language) {
+      $metadata->setCacheContexts(['languages:language_interface']);
+    }
+    return $metadata;
+  }
+
 }
diff --git a/core/modules/language/src/ConfigurableLanguageManager.php b/core/modules/language/src/ConfigurableLanguageManager.php
index a4ca11b6a..d51692f1a 100644
--- a/core/modules/language/src/ConfigurableLanguageManager.php
+++ b/core/modules/language/src/ConfigurableLanguageManager.php
@@ -8,7 +8,6 @@
 namespace Drupal\language;
 
 use Drupal\Core\Language\LanguageInterface;
-use Drupal\Core\PhpStorage\PhpStorageFactory;
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Language\Language;
@@ -105,7 +104,7 @@ class ConfigurableLanguageManager extends LanguageManager implements Configurabl
    * {@inheritdoc}
    */
   public static function rebuildServices() {
-    PhpStorageFactory::get('service_container')->deleteAll();
+    \Drupal::service('kernel')->invalidateContainer();
   }
 
   /**
@@ -183,10 +182,14 @@ class ConfigurableLanguageManager extends LanguageManager implements Configurabl
    */
   public function getDefinedLanguageTypesInfo() {
     if (!isset($this->languageTypesInfo)) {
+      $defaults = parent::getDefinedLanguageTypesInfo();
+
       $info = $this->moduleHandler->invokeAll('language_types_info');
+      $language_info = $info + $defaults;
+
       // Let other modules alter the list of language types.
-      $this->moduleHandler->alter('language_types_info', $info);
-      $this->languageTypesInfo = $info;
+      $this->moduleHandler->alter('language_types_info', $language_info);
+      $this->languageTypesInfo = $language_info;
     }
     return $this->languageTypesInfo;
   }
diff --git a/core/modules/language/src/Entity/ContentLanguageSettings.php b/core/modules/language/src/Entity/ContentLanguageSettings.php
index 76a8a2573..da69686fe 100644
--- a/core/modules/language/src/Entity/ContentLanguageSettings.php
+++ b/core/modules/language/src/Entity/ContentLanguageSettings.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\language\Entity;
 
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Config\Entity\ConfigEntityBase;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Language\LanguageInterface;
@@ -200,7 +199,7 @@ class ContentLanguageSettings extends ConfigEntityBase implements ContentLanguag
       // If the target entity type uses entities to manage its bundles then
       // depend on the bundle entity.
       if (!$bundle_entity = $this->entityManager()->getStorage($bundle_entity_type_id)->load($this->target_bundle)) {
-        throw new \LogicException(SafeMarkup::format('Missing bundle entity, entity type %type, entity id %bundle.', array('%type' => $bundle_entity_type_id, '%bundle' => $this->target_bundle)));
+        throw new \LogicException("Missing bundle entity, entity type $bundle_entity_type_id, entity id {$this->target_bundle}.");
       }
       $this->addDependency('config', $bundle_entity->getConfigDependencyName());
     }
diff --git a/core/modules/language/src/EventSubscriber/ConfigSubscriber.php b/core/modules/language/src/EventSubscriber/ConfigSubscriber.php
index ef3f65d5e..e1875ce7d 100644
--- a/core/modules/language/src/EventSubscriber/ConfigSubscriber.php
+++ b/core/modules/language/src/EventSubscriber/ConfigSubscriber.php
@@ -7,11 +7,13 @@
 
 namespace Drupal\language\EventSubscriber;
 
+use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Language\Language;
 use Drupal\Core\Language\LanguageDefault;
 use Drupal\Core\Language\LanguageManagerInterface;
-use Drupal\Core\PhpStorage\PhpStorageFactory;
 use Drupal\Core\Config\ConfigCrudEvent;
 use Drupal\Core\Config\ConfigEvents;
+use Drupal\language\ConfigurableLanguageManager;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**
@@ -33,6 +35,13 @@ class ConfigSubscriber implements EventSubscriberInterface {
    */
   protected $languageDefault;
 
+  /**
+   * The configuration factory.
+   *
+   * @var \Drupal\Core\Config\ConfigFactoryInterface
+   */
+  protected $configFactory;
+
   /**
    * Constructs a new class object.
    *
@@ -40,31 +49,58 @@ class ConfigSubscriber implements EventSubscriberInterface {
    *   The language manager.
    * @param \Drupal\Core\Language\LanguageDefault $language_default
    *   The default language.
+   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
+   *   The configuration factory.
    */
-  public function __construct(LanguageManagerInterface $language_manager, LanguageDefault $language_default) {
+  public function __construct(LanguageManagerInterface $language_manager, LanguageDefault $language_default, ConfigFactoryInterface $config_factory) {
     $this->languageManager = $language_manager;
     $this->languageDefault = $language_default;
+    $this->configFactory = $config_factory;
   }
 
   /**
    * Causes the container to be rebuilt on the next request.
    *
+   * This event subscriber assumes that the new default langcode and old default
+   * langcode are valid langcodes. If the schema definition of either
+   * system.site:default_langcode or language.negotiation::url.prefixes changes
+   * then this event must be changed to work with both the old and new schema
+   * definition so this event is update safe.
+   *
    * @param ConfigCrudEvent $event
    *   The configuration event.
    */
   public function onConfigSave(ConfigCrudEvent $event) {
     $saved_config = $event->getConfig();
     if ($saved_config->getName() == 'system.site' && $event->isChanged('default_langcode')) {
-      $language = $this->languageManager->getLanguage($saved_config->get('default_langcode'));
+      $new_default_langcode = $saved_config->get('default_langcode');
+      $default_language = $this->configFactory->get('language.entity.' . $new_default_langcode);
       // During an import the language might not exist yet.
-      if ($language) {
-        $this->languageDefault->set($language);
+      if (!$default_language->isNew()) {
+        $this->languageDefault->set(new Language($default_language->get()));
         $this->languageManager->reset();
-        language_negotiation_url_prefixes_update();
+
+        // Directly update language negotiation settings instead of calling
+        // language_negotiation_url_prefixes_update() to ensure that the code
+        // obeys the hook_update_N() restrictions.
+        $negotiation_config = $this->configFactory->getEditable('language.negotiation');
+        $negotiation_changed = FALSE;
+        $url_prefixes = $negotiation_config->get('url.prefixes');
+        $old_default_langcode = $saved_config->getOriginal('default_langcode');
+        if (empty($url_prefixes[$old_default_langcode])) {
+          $negotiation_config->set('url.prefixes.' . $old_default_langcode, $old_default_langcode);
+          $negotiation_changed = TRUE;
+        }
+        if (empty($url_prefixes[$new_default_langcode])) {
+          $negotiation_config->set('url.prefixes.' . $new_default_langcode, '');
+          $negotiation_changed = TRUE;
+        }
+        if ($negotiation_changed) {
+          $negotiation_config->save(TRUE);
+        }
       }
-      // Trigger a container rebuild on the next request by deleting compiled
-      // from PHP storage.
-      PhpStorageFactory::get('service_container')->deleteAll();
+      // Trigger a container rebuild on the next request by invalidating it.
+      ConfigurableLanguageManager::rebuildServices();
     }
   }
 
diff --git a/core/modules/language/src/Form/NegotiationConfigureForm.php b/core/modules/language/src/Form/NegotiationConfigureForm.php
index d33138b24..938564e11 100644
--- a/core/modules/language/src/Form/NegotiationConfigureForm.php
+++ b/core/modules/language/src/Form/NegotiationConfigureForm.php
@@ -301,7 +301,7 @@ class NegotiationConfigureForm extends ConfigFormBase {
           $table_form['enabled'][$method_id]['#attributes'] = array('disabled' => 'disabled');
         }
 
-        $table_form['description'][$method_id] = array('#markup' => Xss::filterAdmin($method['description']));
+        $table_form['description'][$method_id] = array('#markup' => $method['description']);
 
         $config_op = array();
         if (isset($method['config_route_name'])) {
diff --git a/core/modules/language/src/HttpKernel/PathProcessorLanguage.php b/core/modules/language/src/HttpKernel/PathProcessorLanguage.php
index a69330994..e25e2b5e0 100644
--- a/core/modules/language/src/HttpKernel/PathProcessorLanguage.php
+++ b/core/modules/language/src/HttpKernel/PathProcessorLanguage.php
@@ -8,10 +8,10 @@
 namespace Drupal\language\HttpKernel;
 
 use Drupal\Component\Utility\Unicode;
-use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\PathProcessor\InboundPathProcessorInterface;
 use Drupal\Core\PathProcessor\OutboundPathProcessorInterface;
+use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\language\ConfigurableLanguageManagerInterface;
 use Drupal\language\LanguageNegotiatorInterface;
 use Symfony\Component\HttpFoundation\Request;
@@ -95,7 +95,7 @@ class PathProcessorLanguage implements InboundPathProcessorInterface, OutboundPa
   /**
    * {@inheritdoc}
    */
-  public function processOutbound($path, &$options = array(), Request $request = NULL, CacheableMetadata $cacheable_metadata = NULL) {
+  public function processOutbound($path, &$options = array(), Request $request = NULL, BubbleableMetadata $bubbleable_metadata = NULL) {
     if (!isset($this->multilingual)) {
       $this->multilingual = $this->languageManager->isMultilingual();
     }
@@ -106,7 +106,7 @@ class PathProcessorLanguage implements InboundPathProcessorInterface, OutboundPa
         $this->initProcessors($scope);
       }
       foreach ($this->processors[$scope] as $instance) {
-        $path = $instance->processOutbound($path, $options, $request, $cacheable_metadata);
+        $path = $instance->processOutbound($path, $options, $request, $bubbleable_metadata);
       }
       // No language dependent path allowed in this mode.
       if (empty($this->processors[$scope])) {
diff --git a/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationSession.php b/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationSession.php
index fe9500a4a..9f4710956 100644
--- a/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationSession.php
+++ b/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationSession.php
@@ -7,9 +7,9 @@
 
 namespace Drupal\language\Plugin\LanguageNegotiation;
 
-use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\Core\PathProcessor\OutboundPathProcessorInterface;
+use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\Core\Url;
 use Drupal\language\LanguageNegotiationMethodBase;
 use Drupal\language\LanguageSwitcherInterface;
@@ -86,7 +86,7 @@ class LanguageNegotiationSession extends LanguageNegotiationMethodBase implement
   /**
    * {@inheritdoc}
    */
-  public function processOutbound($path, &$options = array(), Request $request = NULL, CacheableMetadata $cacheable_metadata = NULL) {
+  public function processOutbound($path, &$options = array(), Request $request = NULL, BubbleableMetadata $bubbleable_metadata = NULL) {
     if ($request) {
       // The following values are not supposed to change during a single page
       // request processing.
@@ -115,10 +115,10 @@ class LanguageNegotiationSession extends LanguageNegotiationMethodBase implement
         if (!isset($options['query'][$this->queryParam])) {
           $options['query'][$this->queryParam] = $this->queryValue;
         }
-        if ($cacheable_metadata) {
+        if ($bubbleable_metadata) {
           // Cached URLs that have been processed by this outbound path
           // processor must be:
-          $cacheable_metadata
+          $bubbleable_metadata
             // - invalidated when the language negotiation config changes, since
             //   another query parameter may be used to determine the language.
             ->addCacheTags($this->config->get('language.negotiation')->getCacheTags())
diff --git a/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationUrl.php b/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationUrl.php
index 0c57d8b84..ef6891c9b 100644
--- a/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationUrl.php
+++ b/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationUrl.php
@@ -7,10 +7,10 @@
 
 namespace Drupal\language\Plugin\LanguageNegotiation;
 
-use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\Core\PathProcessor\InboundPathProcessorInterface;
 use Drupal\Core\PathProcessor\OutboundPathProcessorInterface;
+use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\Core\Url;
 use Drupal\language\LanguageNegotiationMethodBase;
 use Drupal\language\LanguageSwitcherInterface;
@@ -123,7 +123,7 @@ class LanguageNegotiationUrl extends LanguageNegotiationMethodBase implements In
   /**
    * Implements Drupal\Core\PathProcessor\InboundPathProcessorInterface::processOutbound().
    */
-  public function processOutbound($path, &$options = array(), Request $request = NULL, CacheableMetadata $cacheable_metadata = NULL) {
+  public function processOutbound($path, &$options = array(), Request $request = NULL, BubbleableMetadata $bubbleable_metadata = NULL) {
     $url_scheme = 'http';
     $port = 80;
     if ($request) {
@@ -144,8 +144,8 @@ class LanguageNegotiationUrl extends LanguageNegotiationMethodBase implements In
     if ($config['source'] == LanguageNegotiationUrl::CONFIG_PATH_PREFIX) {
       if (is_object($options['language']) && !empty($config['prefixes'][$options['language']->getId()])) {
         $options['prefix'] = $config['prefixes'][$options['language']->getId()] . '/';
-        if ($cacheable_metadata) {
-          $cacheable_metadata->addCacheContexts(['languages:' . LanguageInterface::TYPE_URL]);
+        if ($bubbleable_metadata) {
+          $bubbleable_metadata->addCacheContexts(['languages:' . LanguageInterface::TYPE_URL]);
         }
       }
     }
@@ -184,8 +184,8 @@ class LanguageNegotiationUrl extends LanguageNegotiationMethodBase implements In
 
         // Add Drupal's subfolder from the base_path if there is one.
         $options['base_url'] .= rtrim(base_path(), '/');
-        if ($cacheable_metadata) {
-          $cacheable_metadata->addCacheContexts(['languages:' . LanguageInterface::TYPE_URL, 'url.site']);
+        if ($bubbleable_metadata) {
+          $bubbleable_metadata->addCacheContexts(['languages:' . LanguageInterface::TYPE_URL, 'url.site']);
         }
       }
     }
diff --git a/core/modules/language/src/ProxyClass/LanguageConverter.php b/core/modules/language/src/ProxyClass/LanguageConverter.php
new file mode 100644
index 000000000..95a14e119
--- /dev/null
+++ b/core/modules/language/src/ProxyClass/LanguageConverter.php
@@ -0,0 +1,92 @@
+<?php
+
+/**
+ * @file
+ * Contains Drupal\language\ProxyClass\LanguageConverter.
+ */
+
+/**
+ * This file was generated via php core/scripts/generate-proxy-class.php 'Drupal\language\LanguageConverter' "core/modules/language/src".
+ */
+
+namespace Drupal\language\ProxyClass {
+
+    /**
+     * Provides a proxy class for \Drupal\language\LanguageConverter.
+     *
+     * @see \Drupal\Component\ProxyBuilder
+     */
+    class LanguageConverter implements \Drupal\Core\ParamConverter\ParamConverterInterface
+    {
+
+        use \Drupal\Core\DependencyInjection\DependencySerializationTrait;
+
+        /**
+         * The id of the original proxied service.
+         *
+         * @var string
+         */
+        protected $drupalProxyOriginalServiceId;
+
+        /**
+         * The real proxied service, after it was lazy loaded.
+         *
+         * @var \Drupal\language\LanguageConverter
+         */
+        protected $service;
+
+        /**
+         * The service container.
+         *
+         * @var \Symfony\Component\DependencyInjection\ContainerInterface
+         */
+        protected $container;
+
+        /**
+         * Constructs a ProxyClass Drupal proxy object.
+         *
+         * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
+         *   The container.
+         * @param string $drupal_proxy_original_service_id
+         *   The service ID of the original service.
+         */
+        public function __construct(\Symfony\Component\DependencyInjection\ContainerInterface $container, $drupal_proxy_original_service_id)
+        {
+            $this->container = $container;
+            $this->drupalProxyOriginalServiceId = $drupal_proxy_original_service_id;
+        }
+
+        /**
+         * Lazy loads the real service from the container.
+         *
+         * @return object
+         *   Returns the constructed real service.
+         */
+        protected function lazyLoadItself()
+        {
+            if (!isset($this->service)) {
+                $this->service = $this->container->get($this->drupalProxyOriginalServiceId);
+            }
+
+            return $this->service;
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function convert($value, $definition, $name, array $defaults)
+        {
+            return $this->lazyLoadItself()->convert($value, $definition, $name, $defaults);
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function applies($definition, $name, \Symfony\Component\Routing\Route $route)
+        {
+            return $this->lazyLoadItself()->applies($definition, $name, $route);
+        }
+
+    }
+
+}
diff --git a/core/modules/language/src/Tests/LanguageListModuleInstallTest.php b/core/modules/language/src/Tests/LanguageListModuleInstallTest.php
index eae3f1a90..00a76777a 100644
--- a/core/modules/language/src/Tests/LanguageListModuleInstallTest.php
+++ b/core/modules/language/src/Tests/LanguageListModuleInstallTest.php
@@ -34,7 +34,7 @@ class LanguageListModuleInstallTest extends WebTestBase {
     $this->drupalLogin($admin_user);
     $edit = array();
     $edit['modules[Multilingual][language][enable]'] = 'language';
-    $this->drupalPostForm('admin/modules', $edit, t('Save configuration'));
+    $this->drupalPostForm('admin/modules', $edit, t('Install'));
 
     $this->assertEqual(\Drupal::state()->get('language_test.language_count_preinstall', 0), 1, 'Using LanguageManager::getLanguages() returns 1 language during Language installation.');
 
diff --git a/core/modules/language/src/Tests/LanguageUrlRewritingTest.php b/core/modules/language/src/Tests/LanguageUrlRewritingTest.php
index 81602d1f4..f590861b4 100644
--- a/core/modules/language/src/Tests/LanguageUrlRewritingTest.php
+++ b/core/modules/language/src/Tests/LanguageUrlRewritingTest.php
@@ -139,7 +139,7 @@ class LanguageUrlRewritingTest extends WebTestBase {
 
     // Create an absolute French link.
     $language = \Drupal::languageManager()->getLanguage('fr');
-    $url = Url::fromRoute('<none>', [], [
+    $url = Url::fromRoute('<front>', [], [
       'absolute' => TRUE,
       'language' => $language,
     ])->toString();
@@ -149,7 +149,7 @@ class LanguageUrlRewritingTest extends WebTestBase {
     $this->assertEqual($url, $expected, 'The right port is used.');
 
     // If we set the port explicitly, it should not be overridden.
-    $url = Url::fromRoute('<none>', [], [
+    $url = Url::fromRoute('<front>', [], [
       'absolute' => TRUE,
       'language' => $language,
       'base_url' => $request->getBaseUrl() . ':90',
diff --git a/core/modules/language/tests/src/Unit/LanguageNegotiationUrlTest.php b/core/modules/language/tests/src/Unit/LanguageNegotiationUrlTest.php
index 76d72b552..34abb6105 100644
--- a/core/modules/language/tests/src/Unit/LanguageNegotiationUrlTest.php
+++ b/core/modules/language/tests/src/Unit/LanguageNegotiationUrlTest.php
@@ -8,8 +8,8 @@
 namespace Drupal\Tests\language\Unit {
 
 use Drupal\Core\Cache\Cache;
-use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Language\LanguageInterface;
+use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\Core\Session\UserSession;
 use Drupal\Tests\UnitTestCase;
 use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUrl;
@@ -91,10 +91,10 @@ class LanguageNegotiationUrlTest extends UnitTestCase {
     $method->setCurrentUser($this->user);
     $this->assertEquals($expected_langcode, $method->getLangcode($request));
 
-    $cacheability = new CacheableMetadata();
+    $cacheability = new BubbleableMetadata();
     $options = [];
     $method->processOutbound('foo', $options, $request, $cacheability);
-    $expected_cacheability = new CacheableMetadata();
+    $expected_cacheability = new BubbleableMetadata();
     if ($expected_langcode) {
       $this->assertSame($prefix . '/', $options['prefix']);
       $expected_cacheability->setCacheContexts(['languages:' . LanguageInterface::TYPE_URL]);
@@ -180,10 +180,10 @@ class LanguageNegotiationUrlTest extends UnitTestCase {
     $method->setCurrentUser($this->user);
     $this->assertEquals($expected_langcode, $method->getLangcode($request));
 
-    $cacheability = new CacheableMetadata();
+    $cacheability = new BubbleableMetadata();
     $options = [];
     $this->assertSame('foo', $method->processOutbound('foo', $options, $request, $cacheability));
-    $expected_cacheability = new CacheableMetadata();
+    $expected_cacheability = new BubbleableMetadata();
     if ($expected_langcode !== FALSE && count($domains) > 1) {
       $expected_cacheability->setCacheMaxAge(Cache::PERMANENT)->setCacheContexts(['languages:' . LanguageInterface::TYPE_URL, 'url.site']);
     }
diff --git a/core/modules/locale/locale.batch.inc b/core/modules/locale/locale.batch.inc
index d06178f11..4b67ddb2a 100644
--- a/core/modules/locale/locale.batch.inc
+++ b/core/modules/locale/locale.batch.inc
@@ -6,6 +6,9 @@
  */
 
 use GuzzleHttp\Exception\RequestException;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\UriInterface;
 
 /**
  * Load the common translation API.
@@ -234,15 +237,20 @@ function locale_translation_batch_fetch_finished($success, $results) {
 function locale_translation_http_check($uri) {
   $logger = \Drupal::logger('locale');
   try {
-    $response = \Drupal::httpClient()->head($uri);
+    $actual_uri = NULL;
+    $response = \Drupal::service('http_client_factory')->fromOptions(['allow_redirects' => [
+      'on_redirect' => function(RequestInterface $request, ResponseInterface $response, UriInterface $request_uri) use (&$actual_uri) {
+        $actual_uri = (string) $request_uri;
+      }
+    ]])->head($uri);
     $result = array();
 
     // Return the effective URL if it differs from the requested.
-    if ($response->getEffectiveUrl() != $uri) {
-      $result['location'] = $response->getEffectiveUrl();
+    if ($actual_uri && $actual_uri !== $uri) {
+      $result['location'] = $actual_uri;
     }
 
-    $result['last_modified'] = $response->hasHeader('Last-Modified') ? strtotime($response->getHeader('Last-Modified')) : 0;
+    $result['last_modified'] = $response->hasHeader('Last-Modified') ? strtotime($response->getHeaderLine('Last-Modified')) : 0;
     return $result;
   }
   catch (RequestException $e) {
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_locale_settings.yml b/core/modules/locale/migration_templates/d6_locale_settings.yml
similarity index 85%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_locale_settings.yml
rename to core/modules/locale/migration_templates/d6_locale_settings.yml
index a38bd9221..e9440cc84 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_locale_settings.yml
+++ b/core/modules/locale/migration_templates/d6_locale_settings.yml
@@ -13,7 +13,3 @@ process:
 destination:
   plugin: config
   config_name: locale.settings
-dependencies:
-  module:
-    - locale
-    - migrate_drupal
diff --git a/core/modules/locale/src/Form/TranslateEditForm.php b/core/modules/locale/src/Form/TranslateEditForm.php
index 44e86e72b..bac65c7ee 100644
--- a/core/modules/locale/src/Form/TranslateEditForm.php
+++ b/core/modules/locale/src/Form/TranslateEditForm.php
@@ -123,6 +123,7 @@ class TranslateEditForm extends TranslateFormBase {
           for ($i = 0; $i < $plurals; $i++) {
             $form['strings'][$string->lid]['translations'][$i] = array(
               '#type' => 'textarea',
+              // @todo Should use better labels https://www.drupal.org/node/2499639
               '#title' => ($i == 0 ? $this->t('Singular form') : $this->formatPlural($i, 'First plural form', '@count. plural form')),
               '#rows' => $rows,
               '#default_value' => isset($translation_array[$i]) ? $translation_array[$i] : '',
diff --git a/core/modules/locale/src/Form/TranslationStatusForm.php b/core/modules/locale/src/Form/TranslationStatusForm.php
index 6fc338333..d2571399a 100644
--- a/core/modules/locale/src/Form/TranslationStatusForm.php
+++ b/core/modules/locale/src/Form/TranslationStatusForm.php
@@ -99,7 +99,7 @@ class TranslationStatusForm extends FormBase {
           ),
           'status' => array(
             'class' => array('description', 'priority-low'),
-            'data' => drupal_render($locale_translation_update_info),
+            'data' => $locale_translation_update_info,
           ),
         );
         if (!empty($update['not_found'])) {
diff --git a/core/modules/locale/src/LocaleLookup.php b/core/modules/locale/src/LocaleLookup.php
index f5b4fc164..d46ae4b2b 100644
--- a/core/modules/locale/src/LocaleLookup.php
+++ b/core/modules/locale/src/LocaleLookup.php
@@ -117,7 +117,7 @@ class LocaleLookup extends CacheCollector {
       // for example, strings for admin menu items and settings forms are not
       // cached for anonymous users.
       $user = \Drupal::currentUser();
-      $rids = $user ? implode(':', array_keys($user->getRoles())) : '0';
+      $rids = $user ? implode(':', $user->getRoles()) : '';
       $this->cid = "locale:{$this->langcode}:{$this->context}:$rids";
 
       // Getting the roles from the current user might have resulted in t()
diff --git a/core/modules/locale/src/StringBase.php b/core/modules/locale/src/StringBase.php
index eecd50500..d0340ef01 100644
--- a/core/modules/locale/src/StringBase.php
+++ b/core/modules/locale/src/StringBase.php
@@ -190,9 +190,7 @@ abstract class StringBase implements StringInterface {
       $storage->save($this);
     }
     else {
-      throw new StringStorageException(SafeMarkup::format('The string cannot be saved because its not bound to a storage: @string', array(
-        '@string' => $this->getString(),
-      )));
+      throw new StringStorageException('The string cannot be saved because its not bound to a storage: ' . $this->getString());
     }
     return $this;
   }
@@ -206,9 +204,7 @@ abstract class StringBase implements StringInterface {
         $storage->delete($this);
       }
       else {
-        throw new StringStorageException(SafeMarkup::format('The string cannot be deleted because its not bound to a storage: @string', array(
-          '@string' => $this->getString(),
-        )));
+        throw new StringStorageException('The string cannot be deleted because its not bound to a storage: ' . $this->getString());
       }
     }
     return $this;
diff --git a/core/modules/locale/src/StringDatabaseStorage.php b/core/modules/locale/src/StringDatabaseStorage.php
index 06f9f97dd..de624849d 100644
--- a/core/modules/locale/src/StringDatabaseStorage.php
+++ b/core/modules/locale/src/StringDatabaseStorage.php
@@ -199,9 +199,7 @@ class StringDatabaseStorage implements StringStorageInterface {
       }
     }
     else {
-      throw new StringStorageException(format_string('The string cannot be deleted because it lacks some key fields: @string', array(
-        '@string' => $string->getString(),
-      )));
+      throw new StringStorageException('The string cannot be deleted because it lacks some key fields: ' . $string->getString());
     }
     return $this;
   }
@@ -483,9 +481,7 @@ class StringDatabaseStorage implements StringStorageInterface {
         ->execute();
     }
     else {
-      throw new StringStorageException(format_string('The string cannot be saved: @string', array(
-          '@string' => $string->getString(),
-      )));
+      throw new StringStorageException('The string cannot be saved: ' . $string->getString());
     }
   }
 
@@ -516,9 +512,7 @@ class StringDatabaseStorage implements StringStorageInterface {
         ->execute();
     }
     else {
-      throw new StringStorageException(format_string('The string cannot be updated: @string', array(
-          '@string' => $string->getString(),
-      )));
+      throw new StringStorageException('The string cannot be updated: ' . $string->getString());
     }
   }
 
diff --git a/core/modules/locale/src/Tests/LocaleConfigTranslationTest.php b/core/modules/locale/src/Tests/LocaleConfigTranslationTest.php
index 64ea79738..39fcccd80 100644
--- a/core/modules/locale/src/Tests/LocaleConfigTranslationTest.php
+++ b/core/modules/locale/src/Tests/LocaleConfigTranslationTest.php
@@ -125,7 +125,7 @@ class LocaleConfigTranslationTest extends WebTestBase {
     $this->assertFalse($string, 'Configuration strings have been created upon installation.');
 
     // Enable the image module.
-    $this->drupalPostForm('admin/modules', array('modules[Field types][image][enable]' => "1"), t('Save configuration'));
+    $this->drupalPostForm('admin/modules', array('modules[Field types][image][enable]' => "1"), t('Install'));
     $this->rebuildContainer();
 
     $string = $this->storage->findString(array('source' => 'Medium (220×220)', 'context' => '', 'type' => 'configuration'));
@@ -204,12 +204,12 @@ class LocaleConfigTranslationTest extends WebTestBase {
   public function testOptionalConfiguration() {
     $this->assertNodeConfig(FALSE, FALSE);
     // Enable the node module.
-    $this->drupalPostForm('admin/modules', ['modules[Core][node][enable]' => "1"], t('Save configuration'));
+    $this->drupalPostForm('admin/modules', ['modules[Core][node][enable]' => "1"], t('Install'));
     $this->drupalPostForm(NULL, [], t('Continue'));
     $this->rebuildContainer();
     $this->assertNodeConfig(TRUE, FALSE);
     // Enable the views module (which node provides some optional config for).
-    $this->drupalPostForm('admin/modules', ['modules[Core][views][enable]' => "1"], t('Save configuration'));
+    $this->drupalPostForm('admin/modules', ['modules[Core][views][enable]' => "1"], t('Install'));
     $this->rebuildContainer();
     $this->assertNodeConfig(TRUE, TRUE);
   }
diff --git a/core/modules/locale/src/Tests/LocaleLocaleLookupTest.php b/core/modules/locale/src/Tests/LocaleLocaleLookupTest.php
index ef53b8c89..3870cb0f4 100644
--- a/core/modules/locale/src/Tests/LocaleLocaleLookupTest.php
+++ b/core/modules/locale/src/Tests/LocaleLocaleLookupTest.php
@@ -42,7 +42,7 @@ class LocaleLocaleLookupTest extends WebTestBase {
    */
   public function testCircularDependency() {
     // Ensure that we can enable early_translation_test on a non-english site.
-    $this->drupalPostForm('admin/modules', array('modules[Testing][early_translation_test][enable]' => TRUE), t('Save configuration'));
+    $this->drupalPostForm('admin/modules', array('modules[Testing][early_translation_test][enable]' => TRUE), t('Install'));
     $this->assertResponse(200);
   }
 
diff --git a/core/modules/locale/src/Tests/LocaleUpdateTest.php b/core/modules/locale/src/Tests/LocaleUpdateTest.php
index c4f4fe8f1..494c43349 100644
--- a/core/modules/locale/src/Tests/LocaleUpdateTest.php
+++ b/core/modules/locale/src/Tests/LocaleUpdateTest.php
@@ -315,7 +315,7 @@ class LocaleUpdateTest extends LocaleUpdateBase {
     $edit = array(
       'modules[Testing][locale_test_translate][enable]' => 'locale_test_translate',
     );
-    $this->drupalPostForm('admin/modules', $edit, t('Save configuration'));
+    $this->drupalPostForm('admin/modules', $edit, t('Install'));
 
     // Check if translations have been imported.
     $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.',
@@ -350,7 +350,7 @@ class LocaleUpdateTest extends LocaleUpdateBase {
     $edit = array(
       'modules[Testing][locale_test_translate][enable]' => 'locale_test_translate',
     );
-    $this->drupalPostForm('admin/modules', $edit, t('Save configuration'));
+    $this->drupalPostForm('admin/modules', $edit, t('Install'));
 
     // Check if there is no Dutch translation yet.
     $this->assertTranslation('Extraday', '', 'nl');
@@ -394,7 +394,7 @@ class LocaleUpdateTest extends LocaleUpdateBase {
     $edit = array(
       'modules[Testing][locale_test_translate][enable]' => 'locale_test_translate',
     );
-    $this->drupalPostForm('admin/modules', $edit, t('Save configuration'));
+    $this->drupalPostForm('admin/modules', $edit, t('Install'));
 
     // Create a custom language with language code 'xx' and a random
     // name.
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateLocaleConfigsTest.php b/core/modules/locale/src/Tests/Migrate/d6/MigrateLocaleConfigsTest.php
similarity index 67%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateLocaleConfigsTest.php
rename to core/modules/locale/src/Tests/Migrate/d6/MigrateLocaleConfigsTest.php
index 721745dc4..7e42bb050 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateLocaleConfigsTest.php
+++ b/core/modules/locale/src/Tests/Migrate/d6/MigrateLocaleConfigsTest.php
@@ -2,19 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateLocaleConfigsTest.
+ * Contains \Drupal\locale\Tests\Migrate\d6\MigrateLocaleConfigsTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\locale\Tests\Migrate\d6;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to locale.settings.yml.
  *
- * @group migrate_drupal
+ * @group locale
  */
 class MigrateLocaleConfigsTest extends MigrateDrupal6TestBase {
 
@@ -32,13 +31,8 @@ class MigrateLocaleConfigsTest extends MigrateDrupal6TestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $migration = entity_load('migration', 'd6_locale_settings');
-    $dumps = array(
-      $this->getDumpDirectory() . '/Variable.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->loadDumps(['Variable.php']);
+    $this->executeMigration('d6_locale_settings');
   }
 
   /**
diff --git a/core/modules/locale/tests/src/Unit/LocaleLookupTest.php b/core/modules/locale/tests/src/Unit/LocaleLookupTest.php
index fafcb458c..a65084019 100644
--- a/core/modules/locale/tests/src/Unit/LocaleLookupTest.php
+++ b/core/modules/locale/tests/src/Unit/LocaleLookupTest.php
@@ -111,7 +111,7 @@ class LocaleLookupTest extends UnitTestCase {
 
     $this->cache->expects($this->once())
       ->method('get')
-      ->with('locale:en:irrelevant:0', FALSE);
+      ->with('locale:en:irrelevant:anonymous', FALSE);
 
     $this->storage->expects($this->once())
       ->method('findTranslation')
@@ -183,7 +183,7 @@ class LocaleLookupTest extends UnitTestCase {
 
     $this->cache->expects($this->once())
       ->method('get')
-      ->with('locale:' . $langcode . ':' . $context . ':0', FALSE);
+      ->with('locale:' . $langcode . ':' . $context . ':anonymous', FALSE);
 
     $locale_lookup = new LocaleLookup($langcode, $context, $this->storage, $this->cache, $this->lock, $this->configFactory, $this->languageManager, $this->requestStack);
     $this->assertSame($expected, $locale_lookup->get($string));
diff --git a/core/modules/menu_link_content/config/schema/menu_link_content.schema.yml b/core/modules/menu_link_content/config/schema/menu_link_content.schema.yml
new file mode 100644
index 000000000..ed5f71eed
--- /dev/null
+++ b/core/modules/menu_link_content/config/schema/menu_link_content.schema.yml
@@ -0,0 +1,7 @@
+migrate.source.d6_menu_link:
+  type: migrate_source_sql
+  label: 'Drupal 6 menu link'
+  mapping:
+    constants:
+      type: migrate_entity_constant
+      label: 'Constants'
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_menu_links.yml b/core/modules/menu_link_content/migration_templates/d6_menu_links.yml
similarity index 88%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_menu_links.yml
rename to core/modules/menu_link_content/migration_templates/d6_menu_links.yml
index c98a3a721..67531604e 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_menu_links.yml
+++ b/core/modules/menu_link_content/migration_templates/d6_menu_links.yml
@@ -45,9 +45,3 @@ destination:
 migration_dependencies:
   required:
     - d6_menu
-dependencies:
-  config:
-    - migrate.migration.d6_menu
-  module:
-    - menu_link_content
-    - migrate_drupal
diff --git a/core/modules/menu_link_content/src/Form/MenuLinkContentDeleteForm.php b/core/modules/menu_link_content/src/Form/MenuLinkContentDeleteForm.php
index e75d075f2..ba8eb768b 100644
--- a/core/modules/menu_link_content/src/Form/MenuLinkContentDeleteForm.php
+++ b/core/modules/menu_link_content/src/Form/MenuLinkContentDeleteForm.php
@@ -19,7 +19,10 @@ class MenuLinkContentDeleteForm extends ContentEntityDeleteForm {
    * {@inheritdoc}
    */
   public function getCancelUrl() {
-    return new Url('entity.menu.edit_form', array('menu' => $this->entity->getMenuName()));
+    if ($this->moduleHandler->moduleExists('menu_ui')) {
+      return new Url('entity.menu.edit_form', array('menu' => $this->entity->getMenuName()));
+    }
+    return $this->entity->urlInfo();
   }
 
   /**
diff --git a/core/modules/menu_link_content/src/Plugin/Menu/MenuLinkContent.php b/core/modules/menu_link_content/src/Plugin/Menu/MenuLinkContent.php
index f120b6193..a9a7d2c6a 100644
--- a/core/modules/menu_link_content/src/Plugin/Menu/MenuLinkContent.php
+++ b/core/modules/menu_link_content/src/Plugin/Menu/MenuLinkContent.php
@@ -8,7 +8,6 @@
 namespace Drupal\menu_link_content\Plugin\Menu;
 
 use Drupal\Component\Plugin\Exception\PluginException;
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Language\LanguageManagerInterface;
 use Drupal\Core\Menu\MenuLinkBase;
@@ -138,7 +137,7 @@ class MenuLinkContent extends MenuLinkBase implements ContainerFactoryPluginInte
         $entity = reset($loaded_entities);
       }
       if (!$entity) {
-        throw new PluginException(SafeMarkup::format('Entity not found through the menu link plugin definition and could not fallback on UUID @uuid', array('@uuid' => $uuid)));
+        throw new PluginException("Entity not found through the menu link plugin definition and could not fallback on UUID '$uuid'");
       }
       // Clone the entity object to avoid tampering with the static cache.
       $this->entity = clone $entity;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/MenuLink.php b/core/modules/menu_link_content/src/Plugin/migrate/source/d6/MenuLink.php
similarity index 96%
rename from core/modules/migrate_drupal/src/Plugin/migrate/source/d6/MenuLink.php
rename to core/modules/menu_link_content/src/Plugin/migrate/source/d6/MenuLink.php
index 4711477d3..8e285ad62 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/MenuLink.php
+++ b/core/modules/menu_link_content/src/Plugin/migrate/source/d6/MenuLink.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\MenuLink.
+ * Contains \Drupal\menu_link_content\Plugin\migrate\source\d6\MenuLink.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+namespace Drupal\menu_link_content\Plugin\migrate\source\d6;
 
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 use Drupal\migrate\Row;
diff --git a/core/modules/menu_link_content/src/Tests/MenuLinkContentCacheabilityBubblingTest.php b/core/modules/menu_link_content/src/Tests/MenuLinkContentCacheabilityBubblingTest.php
index 7980c7720..825f49388 100644
--- a/core/modules/menu_link_content/src/Tests/MenuLinkContentCacheabilityBubblingTest.php
+++ b/core/modules/menu_link_content/src/Tests/MenuLinkContentCacheabilityBubblingTest.php
@@ -8,9 +8,9 @@
 namespace Drupal\menu_link_content\Tests;
 
 use Drupal\Core\Cache\Cache;
-use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\Core\Menu\MenuTreeParameters;
+use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\menu_link_content\Entity\MenuLinkContent;
 use Drupal\simpletest\KernelTestBase;
 use Drupal\user\Entity\User;
@@ -19,7 +19,7 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Route;
 
 /**
- * Ensures that rendered menu links bubble the necessary cacheability metadata
+ * Ensures that rendered menu links bubble the necessary bubbleable metadata
  * for outbound path/route processing.
  *
  * @group menu_link_content
@@ -47,7 +47,7 @@ class MenuLinkContentCacheabilityBubblingTest extends KernelTestBase {
   }
 
   /**
-   * Tests bubbling of menu links' outbound route/path processing cacheability.
+   * Tests bubbleable metadata of menu links' outbound route/path processing.
    */
   public function testOutboundPathAndRouteProcessing() {
     \Drupal::service('router.builder')->rebuild();
@@ -66,10 +66,10 @@ class MenuLinkContentCacheabilityBubblingTest extends KernelTestBase {
     $renderer = \Drupal::service('renderer');
 
 
-    $default_menu_cacheability = (new CacheableMetadata())
+    $default_menu_cacheability = (new BubbleableMetadata())
       ->setCacheMaxAge(Cache::PERMANENT)
       ->setCacheTags(['config:system.menu.tools'])
-      ->setCacheContexts(['languages:' . LanguageInterface::TYPE_INTERFACE, 'theme']);
+      ->setCacheContexts(['languages:' . LanguageInterface::TYPE_INTERFACE, 'theme', 'user.permissions']);
 
     User::create(['uid' => 1, 'name' => $this->randomString()])->save();
     User::create(['uid' => 2, 'name' => $this->randomString()])->save();
@@ -87,26 +87,26 @@ class MenuLinkContentCacheabilityBubblingTest extends KernelTestBase {
       // \Drupal\Core\RouteProcessor\RouteProcessorCurrent: 'route' cache context.
       [
         'uri' => 'route:<current>',
-        'cacheability' => (new CacheableMetadata())->setCacheContexts(['route']),
+        'cacheability' => (new BubbleableMetadata())->setCacheContexts(['route']),
       ],
-      // \Drupal\Core\Access\RouteProcessorCsrf: max-age = 0.
+      // \Drupal\Core\Access\RouteProcessorCsrf: placeholder.
       [
         'uri' => 'route:outbound_processing_test.route.csrf',
-        'cacheability' => (new CacheableMetadata())->setCacheMaxAge(0),
+        'cacheability' => (new BubbleableMetadata())->setCacheContexts(['session'])->setAttachments(['placeholders' => []]),
       ],
       // \Drupal\Core\PathProcessor\PathProcessorFront: permanently cacheable.
       [
         'uri' => 'internal:/',
-        'cacheability' => (new CacheableMetadata()),
+        'cacheability' => (new BubbleableMetadata()),
       ],
       // \Drupal\url_alter_test\PathProcessorTest: user entity's cache tags.
       [
         'uri' => 'internal:/user/1',
-        'cacheability' => (new CacheableMetadata())->setCacheTags(User::load(1)->getCacheTags()),
+        'cacheability' => (new BubbleableMetadata())->setCacheTags(User::load(1)->getCacheTags()),
       ],
       [
         'uri' => 'internal:/user/2',
-        'cacheability' => (new CacheableMetadata())->setCacheTags(User::load(2)->getCacheTags()),
+        'cacheability' => (new BubbleableMetadata())->setCacheTags(User::load(2)->getCacheTags()),
       ],
     ];
 
@@ -122,7 +122,7 @@ class MenuLinkContentCacheabilityBubblingTest extends KernelTestBase {
       $renderer->renderRoot($build);
 
       $expected_cacheability = $default_menu_cacheability->merge($expectation['cacheability']);
-      $this->assertEqual($expected_cacheability, CacheableMetadata::createFromRenderArray($build));
+      $this->assertEqual($expected_cacheability, BubbleableMetadata::createFromRenderArray($build));
 
       $menu_link_content->delete();
     }
@@ -130,7 +130,7 @@ class MenuLinkContentCacheabilityBubblingTest extends KernelTestBase {
     // Now test them all together in one menu: the rendered menu's cacheability
     // metadata should be the combination of the cacheability of all links, and
     // thus of all tested outbound path & route processors.
-    $expected_cacheability = new CacheableMetadata();
+    $expected_cacheability = new BubbleableMetadata();
     foreach ($test_cases as $expectation) {
       $menu_link_content = MenuLinkContent::create([
         'link' => ['uri' => $expectation['uri']],
@@ -143,7 +143,7 @@ class MenuLinkContentCacheabilityBubblingTest extends KernelTestBase {
     $build = $menu_tree->build($tree);
     $renderer->renderRoot($build);
     $expected_cacheability = $expected_cacheability->merge($default_menu_cacheability);
-    $this->assertEqual($expected_cacheability, CacheableMetadata::createFromRenderArray($build));
+    $this->assertEqual($expected_cacheability, BubbleableMetadata::createFromRenderArray($build));
   }
 
 }
diff --git a/core/modules/menu_link_content/src/Tests/MenuLinkContentDeleteFormTest.php b/core/modules/menu_link_content/src/Tests/MenuLinkContentDeleteFormTest.php
new file mode 100644
index 000000000..c411f8310
--- /dev/null
+++ b/core/modules/menu_link_content/src/Tests/MenuLinkContentDeleteFormTest.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * @file
+ * Contains \Drupal\menu_link_content\Tests\MenuLinkContentDeleteFormTest.
+ */
+
+namespace Drupal\menu_link_content\Tests;
+
+use Drupal\menu_link_content\Entity\MenuLinkContent;
+use Drupal\simpletest\WebTestBase;
+use Drupal\system\Entity\Menu;
+
+/**
+ * Tests the menu link content delete UI.
+ *
+ * @group Menu
+ */
+class MenuLinkContentDeleteFormTest extends WebTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['menu_link_content'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $web_user = $this->drupalCreateUser(['administer menu']);
+    $this->drupalLogin($web_user);
+  }
+
+  /**
+   * Tests the MenuLinkContentDeleteForm class.
+   */
+  public function testMenuLinkContentDeleteForm() {
+    // Add new menu item.
+    $this->drupalPostForm(
+      'admin/structure/menu/manage/admin/add',
+      [
+        'title[0][value]' => t('Front page'),
+        'link[0][uri]' => '<front>',
+      ],
+      t('Save')
+    );
+    $this->assertText(t('The menu link has been saved.'));
+
+    $menu_link = MenuLinkContent::load(1);
+    $this->drupalGet($menu_link->urlInfo('delete-form'));
+    $this->assertRaw(t('Are you sure you want to delete the custom menu link %name?', ['%name' => $menu_link->label()]));
+    $this->assertLink(t('Cancel'));
+    // Make sure cancel link points to link edit
+    $this->assertLinkByHref($menu_link->url('edit-form'));
+
+    \Drupal::service('module_installer')->install(['menu_ui']);
+    // Make sure cancel URL points to menu_ui route now.
+    $this->drupalGet($menu_link->urlInfo('delete-form'));
+    $menu = Menu::load($menu_link->getMenuName());
+    $this->assertLinkByHref($menu->url('edit-form'));
+    $this->drupalPostForm(NULL, [], t('Delete'));
+    $this->assertRaw(t('The menu link %title has been deleted.', ['%title' => $menu_link->label()]));
+  }
+
+}
diff --git a/core/modules/menu_link_content/src/Tests/MenuLinkContentDeriverTest.php b/core/modules/menu_link_content/src/Tests/MenuLinkContentDeriverTest.php
index c7a1ae1fc..b7238f8cb 100644
--- a/core/modules/menu_link_content/src/Tests/MenuLinkContentDeriverTest.php
+++ b/core/modules/menu_link_content/src/Tests/MenuLinkContentDeriverTest.php
@@ -7,7 +7,9 @@
 
 namespace Drupal\menu_link_content\Tests;
 
+use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Menu\MenuTreeParameters;
+use Drupal\Core\StringTranslation\TranslationWrapper;
 use Drupal\menu_link_content\Entity\MenuLinkContent;
 use Drupal\simpletest\KernelTestBase;
 use Symfony\Component\Routing\Route;
@@ -45,7 +47,7 @@ class MenuLinkContentDeriverTest extends KernelTestBase {
 
     // Set up a custom menu link pointing to a specific path.
     MenuLinkContent::create([
-      'title' => 'Example',
+      'title' => '<script>alert("Welcome to the discovered jungle!")</script>',
       'link' => [['uri' => 'internal:/example-path']],
       'menu_name' => 'tools',
     ])->save();
@@ -67,6 +69,10 @@ class MenuLinkContentDeriverTest extends KernelTestBase {
     /** @var \Drupal\Core\Menu\MenuLinkTreeElement $tree_element */
     $tree_element = reset($menu_tree);
     $this->assertEqual('route_name_2', $tree_element->link->getRouteName());
+    $title = $tree_element->link->getTitle();
+    $this->assertFalse($title instanceof TranslationWrapper);
+    $this->assertIdentical('<script>alert("Welcome to the discovered jungle!")</script>', $title);
+    $this->assertFalse(SafeMarkup::isSafe($title));
   }
 
 }
diff --git a/core/modules/menu_link_content/src/Tests/MenuLinkContentFormTest.php b/core/modules/menu_link_content/src/Tests/MenuLinkContentFormTest.php
index 1c9d10ee4..9395d662c 100644
--- a/core/modules/menu_link_content/src/Tests/MenuLinkContentFormTest.php
+++ b/core/modules/menu_link_content/src/Tests/MenuLinkContentFormTest.php
@@ -22,7 +22,6 @@ class MenuLinkContentFormTest extends WebTestBase {
    */
   public static $modules = array(
     'menu_link_content',
-    'menu_ui',
   );
 
   /**
diff --git a/core/modules/menu_link_content/src/Tests/MenuLinkContentTranslationUITest.php b/core/modules/menu_link_content/src/Tests/MenuLinkContentTranslationUITest.php
index b0688081d..615da6bdb 100644
--- a/core/modules/menu_link_content/src/Tests/MenuLinkContentTranslationUITest.php
+++ b/core/modules/menu_link_content/src/Tests/MenuLinkContentTranslationUITest.php
@@ -17,6 +17,11 @@ use Drupal\menu_link_content\Entity\MenuLinkContent;
  */
 class MenuLinkContentTranslationUITest extends ContentTranslationUITestBase {
 
+  /**
+   * {inheritdoc}
+   */
+  protected $defaultCacheContexts = ['languages:language_interface', 'theme', 'user.permissions', 'user.roles:authenticated'];
+
   /**
    * Modules to enable.
    *
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateMenuLinkTest.php b/core/modules/menu_link_content/src/Tests/Migrate/d6/MigrateMenuLinkTest.php
similarity index 86%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateMenuLinkTest.php
rename to core/modules/menu_link_content/src/Tests/Migrate/d6/MigrateMenuLinkTest.php
index 18aea259d..527c35488 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateMenuLinkTest.php
+++ b/core/modules/menu_link_content/src/Tests/Migrate/d6/MigrateMenuLinkTest.php
@@ -2,18 +2,17 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateMenuLinkTest.
+ * Contains \Drupal\menu_link_content\Tests\Migrate\d6\MigrateMenuLinkTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\menu_link_content\Tests\Migrate\d6;
 
-use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Menu link migration.
  *
- * @group migrate_drupal
+ * @group menu_link_content
  */
 class MigrateMenuLinkTest extends MigrateDrupal6TestBase {
 
@@ -43,13 +42,8 @@ class MigrateMenuLinkTest extends MigrateDrupal6TestBase {
       ),
     ));
 
-    $migration = entity_load('migration', 'd6_menu_links');
-    $dumps = array(
-      $this->getDumpDirectory() . '/MenuLinks.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->loadDumps(['MenuLinks.php']);
+    $this->executeMigration('d6_menu_links');
   }
 
   public function testMenuLinks() {
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/MenuLinkSourceTest.php b/core/modules/menu_link_content/tests/src/Unit/Plugin/migrate/source/d6/MenuLinkSourceTest.php
similarity index 91%
rename from core/modules/migrate_drupal/tests/src/Unit/source/d6/MenuLinkSourceTest.php
rename to core/modules/menu_link_content/tests/src/Unit/Plugin/migrate/source/d6/MenuLinkSourceTest.php
index fb9e0e736..e641c09e6 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/MenuLinkSourceTest.php
+++ b/core/modules/menu_link_content/tests/src/Unit/Plugin/migrate/source/d6/MenuLinkSourceTest.php
@@ -2,23 +2,23 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\MenuLinkSourceTest.
+ * Contains \Drupal\Tests\menu_link_content\Unit\Plugin\migrate\source\d6\MenuLinkSourceTest.
  */
 
-namespace Drupal\Tests\migrate_drupal\Unit\source\d6;
+namespace Drupal\Tests\menu_link_content\Unit\Plugin\migrate\source\d6;
 
 use Drupal\Tests\migrate\Unit\MigrateSqlSourceTestCase;
 
 /**
  * Tests D6 menu link source plugin.
  *
- * @group migrate_drupal
+ * @group menu_link_content
  */
 class MenuLinkSourceTest extends MigrateSqlSourceTestCase {
 
   // The plugin system is not working during unit testing so the source plugin
   // class needs to be manually specified.
-  const PLUGIN_CLASS = 'Drupal\migrate_drupal\Plugin\migrate\source\d6\MenuLink';
+  const PLUGIN_CLASS = 'Drupal\menu_link_content\Plugin\migrate\source\d6\MenuLink';
 
   // The fake Migration configuration entity.
   protected $migrationConfiguration = array(
diff --git a/core/modules/menu_ui/menu_ui.module b/core/modules/menu_ui/menu_ui.module
index 0c097ba36..f26dade62 100644
--- a/core/modules/menu_ui/menu_ui.module
+++ b/core/modules/menu_ui/menu_ui.module
@@ -415,7 +415,7 @@ function menu_ui_form_node_type_form_alter(&$form, FormStateInterface $form_stat
   );
   $options_cacheability->applyTo($form['menu']['menu_parent']);
 
-  $form['actions']['submit']['#validate'][] = 'menu_ui_form_node_type_form_validate';
+  $form['#validate'][] = 'menu_ui_form_node_type_form_validate';
   $form['#entity_builders'][] = 'menu_ui_form_node_type_form_builder';
 }
 
diff --git a/core/modules/menu_ui/menu_ui.permissions.yml b/core/modules/menu_ui/menu_ui.permissions.yml
deleted file mode 100644
index 9bc104f53..000000000
--- a/core/modules/menu_ui/menu_ui.permissions.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-administer menu:
-  title: 'Administer menus and menu items'
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_menu_settings.yml b/core/modules/menu_ui/migration_templates/d6_menu_settings.yml
similarity index 88%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_menu_settings.yml
rename to core/modules/menu_ui/migration_templates/d6_menu_settings.yml
index 8ec039d84..9f332fb67 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_menu_settings.yml
+++ b/core/modules/menu_ui/migration_templates/d6_menu_settings.yml
@@ -15,7 +15,3 @@ process:
 destination:
   plugin: config
   config_name: menu_ui.settings
-dependencies:
-  module:
-    - menu_ui
-    - migrate_drupal
diff --git a/core/modules/menu_ui/src/Controller/MenuController.php b/core/modules/menu_ui/src/Controller/MenuController.php
index 72870547f..560bb1843 100644
--- a/core/modules/menu_ui/src/Controller/MenuController.php
+++ b/core/modules/menu_ui/src/Controller/MenuController.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\menu_ui\Controller;
 
-use Drupal\Component\Utility\Xss;
+use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\Menu\MenuParentFormSelectorInterface;
 use Drupal\system\MenuInterface;
@@ -77,7 +77,7 @@ class MenuController extends ControllerBase {
    *   The menu label.
    */
   public function menuTitle(MenuInterface $menu) {
-    return Xss::filter($menu->label());
+    return SafeMarkup::xssFilter($menu->label());
   }
 
 }
diff --git a/core/modules/menu_ui/src/MenuListBuilder.php b/core/modules/menu_ui/src/MenuListBuilder.php
index d93f94516..95d029c4f 100644
--- a/core/modules/menu_ui/src/MenuListBuilder.php
+++ b/core/modules/menu_ui/src/MenuListBuilder.php
@@ -39,7 +39,7 @@ class MenuListBuilder extends ConfigEntityListBuilder {
       'data' => $this->getLabel($entity),
       'class' => array('menu-label'),
     );
-    $row['description'] = Xss::filterAdmin($entity->getDescription());
+    $row['description']['data'] = ['#markup' => $entity->getDescription()];
     return $row + parent::buildRow($entity);
   }
 
diff --git a/core/modules/menu_ui/src/Plugin/Menu/LocalAction/MenuLinkAdd.php b/core/modules/menu_ui/src/Plugin/Menu/LocalAction/MenuLinkAdd.php
index 81152c25d..606dbaaf5 100644
--- a/core/modules/menu_ui/src/Plugin/Menu/LocalAction/MenuLinkAdd.php
+++ b/core/modules/menu_ui/src/Plugin/Menu/LocalAction/MenuLinkAdd.php
@@ -8,7 +8,7 @@
 namespace Drupal\menu_ui\Plugin\Menu\LocalAction;
 
 use Drupal\Core\Menu\LocalActionDefault;
-use Drupal\Core\Routing\RedirectDestination;
+use Drupal\Core\Routing\RedirectDestinationInterface;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Routing\RouteProviderInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -21,7 +21,7 @@ class MenuLinkAdd extends LocalActionDefault {
   /**
    * The redirect destination.
    *
-   * @var \Drupal\Core\Routing\RedirectDestination
+   * @var \Drupal\Core\Routing\RedirectDestinationInterface
    */
   private $redirectDestination;
 
@@ -36,10 +36,10 @@ class MenuLinkAdd extends LocalActionDefault {
    *   The plugin implementation definition.
    * @param \Drupal\Core\Routing\RouteProviderInterface $route_provider
    *   The route provider to load routes by name.
-   * @param \Drupal\Core\Routing\RedirectDestination $redirect_destination
+   * @param \Drupal\Core\Routing\RedirectDestinationInterface $redirect_destination
    *   The redirect destination.
    */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, RouteProviderInterface $route_provider, RedirectDestination $redirect_destination) {
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, RouteProviderInterface $route_provider, RedirectDestinationInterface $redirect_destination) {
     parent::__construct($configuration, $plugin_id, $plugin_definition, $route_provider);
 
     $this->redirectDestination = $redirect_destination;
diff --git a/core/modules/menu_ui/src/Tests/MenuCacheTagsTest.php b/core/modules/menu_ui/src/Tests/MenuCacheTagsTest.php
index adff9a033..520627ed7 100644
--- a/core/modules/menu_ui/src/Tests/MenuCacheTagsTest.php
+++ b/core/modules/menu_ui/src/Tests/MenuCacheTagsTest.php
@@ -110,7 +110,7 @@ class MenuCacheTagsTest extends PageCacheTagsTestBase {
     $this->verifyPageCache($url, 'MISS');
 
     // Verify a cache hit.
-    $this->verifyPageCache($url, 'HIT', ['config:block_list', 'rendered']);
+    $this->verifyPageCache($url, 'HIT', ['config:block_list', 'config:user.role.anonymous', 'rendered']);
   }
 
 }
diff --git a/core/modules/menu_ui/src/Tests/MenuTest.php b/core/modules/menu_ui/src/Tests/MenuTest.php
index 3a1bac557..34dacc5f6 100644
--- a/core/modules/menu_ui/src/Tests/MenuTest.php
+++ b/core/modules/menu_ui/src/Tests/MenuTest.php
@@ -219,6 +219,7 @@ class MenuTest extends MenuWebTestBase {
 
     // Confirm that the custom menu block is available.
     $this->drupalGet('admin/structure/block/list/' . $this->config('system.theme')->get('default'));
+    $this->clickLinkPartialName('Place block');
     $this->assertText($label);
 
     // Enable the block.
@@ -532,6 +533,7 @@ class MenuTest extends MenuWebTestBase {
     // Make sure menu shows up with new name in block addition.
     $default_theme = $this->config('system.theme')->get('default');
     $this->drupalget('admin/structure/block/list/' . $default_theme);
+    $this->clickLinkPartialName('Place block');
     $this->assertText($edit['label']);
   }
 
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateMenuConfigsTest.php b/core/modules/menu_ui/src/Tests/Migrate/d6/MigrateMenuConfigsTest.php
similarity index 64%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateMenuConfigsTest.php
rename to core/modules/menu_ui/src/Tests/Migrate/d6/MigrateMenuConfigsTest.php
index d12a9e6b7..f6182fe51 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateMenuConfigsTest.php
+++ b/core/modules/menu_ui/src/Tests/Migrate/d6/MigrateMenuConfigsTest.php
@@ -2,19 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateMenuConfigsTest.
+ * Contains \Drupal\menu_ui\Tests\Migrate\d6\MigrateMenuConfigsTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\menu_ui\Tests\Migrate\d6;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to menu_ui.settings.yml.
  *
- * @group migrate_drupal
+ * @group menu_ui
  */
 class MigrateMenuConfigsTest extends MigrateDrupal6TestBase {
 
@@ -32,13 +31,8 @@ class MigrateMenuConfigsTest extends MigrateDrupal6TestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $migration = entity_load('migration', 'd6_menu_settings');
-    $dumps = array(
-      $this->getDumpDirectory() . '/Variable.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->loadDumps(['Variable.php']);
+    $this->executeMigration('d6_menu_settings');
   }
 
   /**
diff --git a/core/modules/migrate/migrate.services.yml b/core/modules/migrate/migrate.services.yml
index 3f2d32d56..c4e52e0e5 100644
--- a/core/modules/migrate/migrate.services.yml
+++ b/core/modules/migrate/migrate.services.yml
@@ -5,6 +5,9 @@ services:
       - { name: cache.bin }
     factory: cache_factory:get
     arguments: [migrate]
+  migrate.template_storage:
+    class: Drupal\migrate\MigrateTemplateStorage
+    arguments: ['@module_handler']
   plugin.manager.migrate.source:
     class: Drupal\migrate\Plugin\MigratePluginManager
     arguments: [source, '@container.namespaces', '@cache.discovery', '@module_handler', 'Drupal\migrate\Annotation\MigrateSource']
diff --git a/core/modules/migrate/src/Entity/Migration.php b/core/modules/migrate/src/Entity/Migration.php
index e3f920cb5..c92f97542 100644
--- a/core/modules/migrate/src/Entity/Migration.php
+++ b/core/modules/migrate/src/Entity/Migration.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\migrate\Entity;
 
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Config\Entity\ConfigEntityBase;
 use Drupal\migrate\Exception\RequirementsException;
 use Drupal\migrate\MigrateException;
@@ -381,7 +380,7 @@ class Migration extends ConfigEntityBase implements MigrationInterface, Requirem
       }
     }
     if ($missing_migrations) {
-      throw new RequirementsException(SafeMarkup::format('Missing migrations @requirements.', ['@requirements' => implode(', ', $missing_migrations)]), ['requirements' => $missing_migrations]);
+      throw new RequirementsException('Missing migrations ' . implode(', ', $missing_migrations) . '.', ['requirements' => $missing_migrations]);
     }
   }
 
diff --git a/core/modules/migrate/src/MigrateTemplateStorage.php b/core/modules/migrate/src/MigrateTemplateStorage.php
new file mode 100644
index 000000000..d08f1aa8b
--- /dev/null
+++ b/core/modules/migrate/src/MigrateTemplateStorage.php
@@ -0,0 +1,102 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\migrate\MigrateTemplateStorage.
+ */
+
+namespace Drupal\migrate;
+
+use Drupal\Component\Serialization\Yaml;
+use Drupal\Core\Extension\ModuleHandlerInterface;
+
+/**
+ * Storage to access migration template configuration in enabled extensions.
+ */
+class MigrateTemplateStorage {
+  /**
+   * Extension sub-directory containing default configuration for migrations.
+   */
+
+  const MIGRATION_TEMPLATE_DIRECTORY = 'migration_templates';
+
+  /**
+   * Template subdirectory.
+   *
+   * @var string
+   */
+  protected $directory;
+
+  /**
+   * @var \Drupal\Core\Extension\ModuleHandlerInterface
+   */
+  protected $moduleHandler;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function __construct(ModuleHandlerInterface $module_handler, $directory = self::MIGRATION_TEMPLATE_DIRECTORY) {
+    $this->moduleHandler = $module_handler;
+    $this->directory = $directory;
+  }
+
+  /**
+   * Find all migration templates with the specified tag.
+   *
+   * @param $tag
+   *   The tag to match.
+   *
+   * @return array
+   *   Any templates (parsed YAML config) that matched, keyed by the ID.
+   */
+  public function findTemplatesByTag($tag) {
+    $templates = $this->getAllTemplates();
+    $matched_templates = [];
+    foreach ($templates as $template_name => $template) {
+      if (!empty($template['migration_tags'])) {
+        if (in_array($tag, $template['migration_tags'])) {
+          $matched_templates[$template_name] = $template;
+        }
+      }
+    }
+    return $matched_templates;
+  }
+
+  /**
+   * Retrieve a template given a specific name.
+   *
+   * @param string $name
+   *   A migration template name.
+   *
+   * @return NULL|array
+   *   A parsed migration template, or NULL if it doesn't exist.
+   */
+  public function getTemplateByName($name) {
+    $templates = $this->getAllTemplates();
+    return isset($templates[$name]) ? $templates[$name] : NULL;
+  }
+
+  /**
+   * Retrieves all migration templates belonging to enabled extensions.
+   *
+   * @return array
+   *   Array of parsed templates, keyed by the fully-qualified id.
+   */
+  public function getAllTemplates() {
+    $templates = [];
+    foreach ($this->moduleHandler->getModuleDirectories() as $directory) {
+      $full_directory = $directory . '/' . $this->directory;
+      if (file_exists($full_directory)) {
+        $files = scandir($full_directory);
+        foreach ($files as $file) {
+          if ($file[0] !== '.' && fnmatch('*.yml', $file)) {
+            $templates[basename($file, '.yml')] = Yaml::decode(file_get_contents("$full_directory/$file"));
+          }
+        }
+      }
+    }
+
+    return $templates;
+  }
+
+}
diff --git a/core/modules/migrate/src/Plugin/MigratePluginManager.php b/core/modules/migrate/src/Plugin/MigratePluginManager.php
index f6eee47fa..84f227843 100644
--- a/core/modules/migrate/src/Plugin/MigratePluginManager.php
+++ b/core/modules/migrate/src/Plugin/MigratePluginManager.php
@@ -70,20 +70,4 @@ class MigratePluginManager extends DefaultPluginManager {
     return $plugin;
   }
 
-  /**
-   * Helper for the plugin type to interface map.
-   *
-   * @return array
-   *   An array map from plugin type to interface.
-   */
-  protected function getPluginInterfaceMap() {
-    return [
-      'destination' => 'Drupal\migrate\Plugin\MigrateDestinationInterface',
-      'process' => 'Drupal\migrate\Plugin\MigrateProcessInterface',
-      'source' => 'Drupal\migrate\Plugin\MigrateSourceInterface',
-      'id_map' => 'Drupal\migrate\Plugin\MigrateIdMapInterface',
-      'entity_field' => 'Drupal\migrate\Plugin\MigrateEntityDestinationFieldInterface',
-    ];
-  }
-
 }
diff --git a/core/modules/migrate/src/Plugin/migrate/destination/EntityFile.php b/core/modules/migrate/src/Plugin/migrate/destination/EntityFile.php
index f945164f6..57d690925 100644
--- a/core/modules/migrate/src/Plugin/migrate/destination/EntityFile.php
+++ b/core/modules/migrate/src/Plugin/migrate/destination/EntityFile.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\migrate\Plugin\migrate\destination;
 
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\File\FileSystemInterface;
@@ -83,7 +82,7 @@ class EntityFile extends EntityContentBase {
 
     // Ensure the source file exists, if it's a local URI or path.
     if ($this->isLocalUri($source) && !file_exists($source)) {
-      throw new MigrateException(SafeMarkup::format('File @source does not exist.', ['@source' => $source]));
+      throw new MigrateException("File '$source' does not exist.");
     }
 
     // If the start and end file is exactly the same, there is nothing to do.
@@ -99,7 +98,7 @@ class EntityFile extends EntityContentBase {
         $success = $this->writeFile($source, $destination, $replace);
       }
       else {
-        throw new MigrateException(SafeMarkup::format('Could not create directory @dir', ['@dir' => $dir]));
+        throw new MigrateException("Could not create directory '$dir'");
       }
     }
 
@@ -107,7 +106,7 @@ class EntityFile extends EntityContentBase {
       return parent::import($row, $old_destination_id_values);
     }
     else {
-      throw new MigrateException(SafeMarkup::format('File %source could not be copied to %destination.', ['%source' => $source, '%destination' => $destination]));
+      throw new MigrateException("File $source could not be copied to $destination.");
     }
   }
 
@@ -121,7 +120,7 @@ class EntityFile extends EntityContentBase {
    * @param integer $replace
    *  FILE_EXISTS_REPLACE (default) or FILE_EXISTS_RENAME.
    *
-   * @return boolean
+   * @return bool
    *  TRUE on success, FALSE on failure.
    */
   protected function writeFile($source, $destination, $replace = FILE_EXISTS_REPLACE) {
@@ -164,7 +163,7 @@ class EntityFile extends EntityContentBase {
    * @param string $uri
    *  The URI or path.
    *
-   * @return boolean|string
+   * @return string|false
    *  The directory component of the path or URI, or FALSE if it could not
    *  be determined.
    */
@@ -187,7 +186,7 @@ class EntityFile extends EntityContentBase {
    * @param string $destination
    *  The destination URI.
    *
-   * @return boolean
+   * @return bool
    *  TRUE if the source and destination URIs refer to the same physical path,
    *  otherwise FALSE.
    */
@@ -210,7 +209,7 @@ class EntityFile extends EntityContentBase {
    * @param string $uri
    *  The URI or path to test.
    *
-   * @return boolean
+   * @return bool
    */
   protected function isLocalUri($uri) {
     $scheme = $this->fileSystem->uriScheme($uri);
diff --git a/core/modules/migrate/src/Plugin/migrate/destination/Null.php b/core/modules/migrate/src/Plugin/migrate/destination/NullDestination.php
similarity index 82%
rename from core/modules/migrate/src/Plugin/migrate/destination/Null.php
rename to core/modules/migrate/src/Plugin/migrate/destination/NullDestination.php
index d5e6ba2db..1bffa9ea4 100644
--- a/core/modules/migrate/src/Plugin/migrate/destination/Null.php
+++ b/core/modules/migrate/src/Plugin/migrate/destination/NullDestination.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\destination\Null.
+ * Contains \Drupal\migrate\Plugin\migrate\destination\NullDestination.
  */
 
 namespace Drupal\migrate\Plugin\migrate\destination;
@@ -16,7 +16,7 @@ use Drupal\migrate\Row;
  *   requirements_met = false
  * )
  */
-class Null extends DestinationBase {
+class NullDestination extends DestinationBase {
 
   /**
    * {@inheritdoc}
diff --git a/core/modules/migrate/src/Plugin/migrate/process/Concat.php b/core/modules/migrate/src/Plugin/migrate/process/Concat.php
index 6e45e5d02..174818d80 100644
--- a/core/modules/migrate/src/Plugin/migrate/process/Concat.php
+++ b/core/modules/migrate/src/Plugin/migrate/process/Concat.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\migrate\Plugin\migrate\process;
 
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\migrate\MigrateException;
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\ProcessPluginBase;
@@ -34,7 +33,7 @@ class Concat extends ProcessPluginBase {
       return implode($delimiter, $value);
     }
     else {
-      throw new MigrateException(sprintf('%s is not an array', SafeMarkup::checkPlain(var_export($value, TRUE))));
+      throw new MigrateException(sprintf('%s is not an array', var_export($value, TRUE)));
     }
   }
 
diff --git a/core/modules/migrate/src/Plugin/migrate/source/DummyQueryTrait.php b/core/modules/migrate/src/Plugin/migrate/source/DummyQueryTrait.php
new file mode 100644
index 000000000..42a9943bb
--- /dev/null
+++ b/core/modules/migrate/src/Plugin/migrate/source/DummyQueryTrait.php
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\migrate\Plugin\migrate\source\DummyQueryTrait.
+ */
+
+namespace Drupal\migrate\Plugin\migrate\source;
+
+/**
+ * Trait providing a dummy select query object for source plugins based on
+ * SqlBase which override initializeIterator() to obtain their data from other
+ * SqlBase services instead of a direct query. This ensures that query() returns
+ * a valid object, even though it isn't used for iteration.
+ */
+trait DummyQueryTrait {
+
+  /**
+   * @return \Drupal\Core\Database\Query\SelectInterface
+   */
+  public function query() {
+    // Pass an arbritrary table name - the query should never be executed anyway.
+    $query = $this->select(uniqid(), 's')
+      ->range(0, 1);
+    $query->addExpression('1');
+    return $query;
+  }
+
+}
diff --git a/core/modules/migrate/src/Tests/EntityFileTest.php b/core/modules/migrate/src/Tests/EntityFileTest.php
index 509e98b6f..718e0a750 100644
--- a/core/modules/migrate/src/Tests/EntityFileTest.php
+++ b/core/modules/migrate/src/Tests/EntityFileTest.php
@@ -94,7 +94,7 @@ class EntityFileTest extends KernelTestBase {
       $this->fail('Expected Drupal\migrate\MigrateException when importing ' . $destination);
     }
     catch (MigrateException $e) {
-      $this->assertIdentical($e->getMessage(), 'File ' . $destination . ' does not exist.');
+      $this->assertIdentical($e->getMessage(), "File '$destination' does not exist.");
     }
   }
 
diff --git a/core/modules/migrate/src/Tests/MigrateTestBase.php b/core/modules/migrate/src/Tests/MigrateTestBase.php
index 967f7726c..538db5596 100644
--- a/core/modules/migrate/src/Tests/MigrateTestBase.php
+++ b/core/modules/migrate/src/Tests/MigrateTestBase.php
@@ -8,7 +8,9 @@
 namespace Drupal\migrate\Tests;
 
 use Drupal\Core\Database\Database;
+use Drupal\migrate\Entity\Migration;
 use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate\MigrateMessageInterface;
 use Drupal\migrate\Row;
 use Drupal\simpletest\KernelTestBase;
@@ -43,6 +45,13 @@ abstract class MigrateTestBase extends KernelTestBase implements MigrateMessageI
    */
   protected $migrateMessages;
 
+  /**
+   * The primary migration being tested.
+   *
+   * @var \Drupal\migrate\Entity\MigrationInterface
+   */
+  protected $migration;
+
   public static $modules = array('migrate');
 
   /**
@@ -73,21 +82,6 @@ abstract class MigrateTestBase extends KernelTestBase implements MigrateMessageI
     parent::tearDown();
   }
 
-  /**
-   * Prepare the migration.
-   *
-   * @param \Drupal\migrate\Entity\MigrationInterface $migration
-   *   The migration object.
-   * @param array $files
-   *   An array of files.
-   */
-  protected function prepare(MigrationInterface $migration, array $files = array()) {
-    $this->loadDumps($files);
-    if ($this instanceof MigrateDumpAlterInterface) {
-      static::migrateDumpAlter($this);
-    }
-  }
-
   /**
    * Load Drupal 6 database dumps to be used.
    *
@@ -96,7 +90,7 @@ abstract class MigrateTestBase extends KernelTestBase implements MigrateMessageI
    * @param string $method
    *   The name of the method in the dump class to use. Defaults to load.
    */
-  protected function loadDumps($files, $method = 'load') {
+  protected function loadDumps(array $files, $method = 'load') {
     // Load the database from the portable PHP dump.
     // The files may be gzipped.
     foreach ($files as $file) {
@@ -137,6 +131,25 @@ abstract class MigrateTestBase extends KernelTestBase implements MigrateMessageI
     }
   }
 
+  /**
+   * Executes a single migration.
+   *
+   * @param string|\Drupal\migrate\Entity\MigrationInterface $migration
+   *  The migration to execute, or its ID.
+   */
+  protected function executeMigration($migration) {
+    if (is_string($migration)) {
+      $this->migration = Migration::load($migration);
+    }
+    else {
+      $this->migration = $migration;
+    }
+    if ($this instanceof MigrateDumpAlterInterface) {
+      static::migrateDumpAlter($this);
+    }
+    (new MigrateExecutable($this->migration, $this))->import();
+  }
+
   /**
    * {@inheritdoc}
    */
diff --git a/core/modules/migrate/src/Tests/TemplateTest.php b/core/modules/migrate/src/Tests/TemplateTest.php
new file mode 100644
index 000000000..15c230557
--- /dev/null
+++ b/core/modules/migrate/src/Tests/TemplateTest.php
@@ -0,0 +1,78 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\migrate\Tests\TemplateTest
+ */
+
+namespace Drupal\migrate\Tests;
+
+/**
+ * Test the migration template functionality.
+ *
+ * @group migrate
+ */
+class TemplateTest extends MigrateTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('template_test');
+
+  /**
+   * Test different connection types.
+   */
+  public function testTemplates() {
+    $migration_templates = \Drupal::service('migrate.template_storage')->findTemplatesByTag("Template Test");
+    $expected_url = [
+        'id' => 'url_template',
+        'label' => 'Template test - url',
+        'migration_tags' => ['Template Test'],
+        'source' => ['plugin' => 'empty'],
+        'process' => ['src' => 'foobar'],
+        'destination' => ['plugin' => 'url_alias'],
+    ];
+    $expected_node = [
+        'id' => 'node_template',
+        'label' => 'Template test - node',
+        'migration_tags' => ['Template Test'],
+        'source' => ['plugin' => 'empty'],
+        'process' => ['src' => 'barfoo'],
+        'destination' => ['plugin' => 'entity:node'],
+    ];
+    $this->assertIdentical($migration_templates['migrate.migration.url_template'], $expected_url);
+    $this->assertIdentical($migration_templates['migrate.migration.node_template'], $expected_node);
+    $this->assertFalse(isset($migration_templates['migrate.migration.other_template']));
+  }
+
+  /**
+   * Tests retrieving a template by name.
+   */
+  public function testGetTemplateByName() {
+    /** @var \Drupal\migrate\MigrateTemplateStorage $template_storage */
+    $template_storage = \Drupal::service('migrate.template_storage');
+
+    $expected_url = [
+        'id' => 'url_template',
+        'label' => 'Template test - url',
+        'migration_tags' => ['Template Test'],
+        'source' => ['plugin' => 'empty'],
+        'process' => ['src' => 'foobar'],
+        'destination' => ['plugin' => 'url_alias'],
+    ];
+    $expected_node = [
+        'id' => 'node_template',
+        'label' => 'Template test - node',
+        'migration_tags' => ['Template Test'],
+        'source' => ['plugin' => 'empty'],
+        'process' => ['src' => 'barfoo'],
+        'destination' => ['plugin' => 'entity:node'],
+    ];
+    $this->assertIdentical($template_storage->getTemplateByName('migrate.migration.url_template'), $expected_url);
+    $this->assertIdentical($template_storage->getTemplateByName('migrate.migration.node_template'), $expected_node);
+    $this->assertNull($template_storage->getTemplateByName('migrate.migration.dne'));
+  }
+
+}
diff --git a/core/modules/migrate/tests/modules/template_test/migration_templates/migrate.migration.node_template.yml b/core/modules/migrate/tests/modules/template_test/migration_templates/migrate.migration.node_template.yml
new file mode 100644
index 000000000..6eead8b70
--- /dev/null
+++ b/core/modules/migrate/tests/modules/template_test/migration_templates/migrate.migration.node_template.yml
@@ -0,0 +1,10 @@
+id: node_template
+label: Template test - node
+migration_tags:
+  - Template Test
+source:
+  plugin: empty
+process:
+  src: barfoo
+destination:
+  plugin: entity:node
diff --git a/core/modules/migrate/tests/modules/template_test/migration_templates/migrate.migration.other_template.yml b/core/modules/migrate/tests/modules/template_test/migration_templates/migrate.migration.other_template.yml
new file mode 100644
index 000000000..3d974f007
--- /dev/null
+++ b/core/modules/migrate/tests/modules/template_test/migration_templates/migrate.migration.other_template.yml
@@ -0,0 +1,10 @@
+id: other_template
+label: Template with a different tag
+migration_tags:
+  - Different Template Test
+source:
+  plugin: empty
+process:
+  src: raboof
+destination:
+  plugin: entity:user
diff --git a/core/modules/migrate/tests/modules/template_test/migration_templates/migrate.migration.url_template.yml b/core/modules/migrate/tests/modules/template_test/migration_templates/migrate.migration.url_template.yml
new file mode 100644
index 000000000..fd8211945
--- /dev/null
+++ b/core/modules/migrate/tests/modules/template_test/migration_templates/migrate.migration.url_template.yml
@@ -0,0 +1,10 @@
+id: url_template
+label: Template test - url
+migration_tags:
+  - Template Test
+source:
+  plugin: empty
+process:
+  src: foobar
+destination:
+  plugin: url_alias
diff --git a/core/modules/migrate/tests/modules/template_test/template_test.info.yml b/core/modules/migrate/tests/modules/template_test/template_test.info.yml
new file mode 100644
index 000000000..d396c63d2
--- /dev/null
+++ b/core/modules/migrate/tests/modules/template_test/template_test.info.yml
@@ -0,0 +1,5 @@
+name: 'Migration template test'
+type: module
+package: Testing
+version: VERSION
+core: 8.x
diff --git a/core/modules/migrate/tests/src/Unit/MigrateSqlSourceTestCase.php b/core/modules/migrate/tests/src/Unit/MigrateSqlSourceTestCase.php
index 98180d51a..e644a0460 100644
--- a/core/modules/migrate/tests/src/Unit/MigrateSqlSourceTestCase.php
+++ b/core/modules/migrate/tests/src/Unit/MigrateSqlSourceTestCase.php
@@ -58,6 +58,13 @@ abstract class MigrateSqlSourceTestCase extends MigrateTestCase {
    */
   protected $expectedResults = array();
 
+  /**
+   * Expected count of source rows.
+   *
+   * @var int
+   */
+  protected $expectedCount = 0;
+
   /**
    * The source plugin instance under test.
    *
@@ -97,6 +104,7 @@ abstract class MigrateSqlSourceTestCase extends MigrateTestCase {
       ->method('getSourcePlugin')
       ->will($this->returnValue($plugin));
     $this->source = $plugin;
+    $this->expectedCount = count($this->expectedResults);
   }
 
   /**
@@ -106,6 +114,13 @@ abstract class MigrateSqlSourceTestCase extends MigrateTestCase {
     $this->queryResultTest($this->source, $this->expectedResults);
   }
 
+  /**
+   * Test the source returns the row count expected.
+   */
+  public function testSourceCount() {
+    $this->assertEquals($this->source->count(), $this->expectedCount);
+  }
+
   /**
    * @param \Drupal\migrate\Row $row
    * @param string $key
diff --git a/core/modules/migrate/tests/src/Unit/TestSqlIdMap.php b/core/modules/migrate/tests/src/Unit/TestSqlIdMap.php
index 203bd62de..68d80774a 100644
--- a/core/modules/migrate/tests/src/Unit/TestSqlIdMap.php
+++ b/core/modules/migrate/tests/src/Unit/TestSqlIdMap.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\Tests\migrate\Unit;
 
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Database\Connection;
 use Drupal\migrate\Entity\MigrationInterface;
 use Drupal\migrate\MigrateException;
@@ -61,7 +60,7 @@ class TestSqlIdMap extends Sql implements \Iterator {
           'not null' => FALSE,
         );
       default:
-        throw new MigrateException(SafeMarkup::format('@type not supported', array('@type' => $id_definition['type'])));
+        throw new MigrateException($id_definition['type'] . ' not supported');
     }
   }
 }
diff --git a/core/modules/migrate/tests/src/Unit/process/StaticMapTest.php b/core/modules/migrate/tests/src/Unit/process/StaticMapTest.php
index de883ba35..536d58777 100644
--- a/core/modules/migrate/tests/src/Unit/process/StaticMapTest.php
+++ b/core/modules/migrate/tests/src/Unit/process/StaticMapTest.php
@@ -19,12 +19,6 @@ class StaticMapTest extends MigrateProcessTestCase {
    * {@inheritdoc}
    */
   protected function setUp() {
-    $this->row = $this->getMockBuilder('Drupal\migrate\Row')
-      ->disableOriginalConstructor()
-      ->getMock();
-    $this->migrateExecutable = $this->getMockBuilder('Drupal\migrate\MigrateExecutable')
-      ->disableOriginalConstructor()
-      ->getMock();
     $configuration['map']['foo']['bar'] = 'baz';
     $this->plugin = new StaticMap($configuration, 'map', array());
     parent::setUp();
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_filter.yml b/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_filter.yml
deleted file mode 100644
index 8e36db7cc..000000000
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_filter.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-id: d6_system_filter
-label: Drupal 6 filter configuration
-migration_tags:
-  - Drupal 6
-source:
-  plugin: variable
-  variables:
-    - filter_allowed_protocols
-process:
-  protocols: filter_allowed_protocols
-destination:
-  plugin: config
-  config_name: system.filter
-dependencies:
-  module:
-    - migrate_drupal
-    - system
diff --git a/core/modules/migrate_drupal/config/schema/migrate_drupal.source.schema.yml b/core/modules/migrate_drupal/config/schema/migrate_drupal.source.schema.yml
index 9fdf6d861..fdd6b9414 100644
--- a/core/modules/migrate_drupal/config/schema/migrate_drupal.source.schema.yml
+++ b/core/modules/migrate_drupal/config/schema/migrate_drupal.source.schema.yml
@@ -67,34 +67,6 @@ migrate.source.d6_comment_entity_form_display_subject:
       type: migrate_entity_constant
       label: 'Constants'
 
-migrate.source.d6_menu_link:
-  type: migrate_source_sql
-  label: 'Drupal 6 menu link'
-  mapping:
-    constants:
-      type: migrate_entity_constant
-      label: 'Constants'
-
-migrate.source.d6_box:
-  type: migrate_source_sql
-  label: 'Drupal 6 box'
-  mapping:
-    constants:
-      type: mapping
-      label: 'Constants'
-      mapping:
-        type:
-          type: string
-          label: 'Type'
-
-migrate.source.d6_taxonomy_vocabulary:
-  type: migrate_source_sql
-  label: 'Drupal 6 field instance form display'
-  mapping:
-    constants:
-      type: migrate_entity_constant
-      label: 'Constants'
-
 migrate.source.d6_field_instance_per_form_display:
   type: migrate_source_sql
   label: 'Drupal 6 field instance form display'
@@ -103,22 +75,6 @@ migrate.source.d6_field_instance_per_form_display:
       type: migrate_entity_constant
       label: 'Constants'
 
-migrate.source.d6_taxonomy_vocabulary_per_type:
-  type: migrate_source_sql
-  label: 'Drupal 6 field instance form display'
-  mapping:
-    constants:
-      type: migrate_entity_constant
-      label: 'Constants'
-
-migrate.source.d6_taxonomy_vocabulary_per_type:
-  type: migrate_source_sql
-  label: 'Drupal 6 field instance form display'
-  mapping:
-    constants:
-      type: migrate_entity_constant
-      label: 'Constants'
-
 migrate.source.d6_field:
   type: migrate_source_sql
   label: 'Drupal 6 field'
@@ -146,32 +102,6 @@ migrate.source.d6_comment_variable:
       type: migrate_entity_constant
       label: 'Constants'
 
-migrate.source.d6_contact_settings:
-  type: migrate_source_sql
-  label: 'Drupal 6 contact settings'
-  mapping:
-    variables:
-      type: sequence
-      label: 'Variables'
-      sequence:
-        type: string
-        label: 'Variable'
-
-migrate.source.d6_view_mode:
-  type: migrate_source_sql
-  label: 'Drupal 6 view mode'
-  mapping:
-    constants:
-      type: mapping
-      label: 'Constants'
-      mapping:
-        targetEntityType:
-          type: string
-          label: 'Target entity type'
-        status:
-          type: boolean
-          label: 'Status'
-
 migrate.source.d6_profile_field:
   type: migrate_source_sql
   label: 'Drupal 6 profile field'
@@ -188,34 +118,6 @@ migrate.source.d6_field_formatter_settings:
       type: migrate_entity_constant
       label: 'Constants'
 
-migrate.source.d6_node_type:
-  type: migrate_source_sql
-  label: 'Drupal 6 node type'
-  mapping:
-    constants:
-      type: migrate_entity_constant
-      label: 'Constants'
-
-migrate.source.d6_node:
-  type: migrate_source_sql
-  label: 'Drupal 6 node'
-  mapping:
-    node_type:
-      # The node type can be specified both as a string ID of a node type or an
-      # array of node type IDs, so there is no way to consistently parse this.
-      type: ignore
-      label: 'Node type'
-
-migrate.source.d6_node_revision:
-  type: migrate_source_sql
-  label: 'Drupal 6 node'
-  mapping:
-    node_type:
-      # The node type can be specified both as a string ID of a node type or an
-      # array of node type IDs, so there is no way to consistently parse this.
-      type: ignore
-      label: 'Node type'
-
 migrate.source.d6_upload_instance:
   type: migrate_source_sql
   label: 'Drupal 6 upload form display'
diff --git a/core/modules/migrate_drupal/migrate_drupal.services.yml b/core/modules/migrate_drupal/migrate_drupal.services.yml
index 301ced83c..684ecb8b0 100644
--- a/core/modules/migrate_drupal/migrate_drupal.services.yml
+++ b/core/modules/migrate_drupal/migrate_drupal.services.yml
@@ -1,7 +1,7 @@
 services:
   plugin.manager.migrate.load:
-    class: Drupal\migrate_drupal\Plugin\MigratePluginManager
+    class: Drupal\migrate\Plugin\MigratePluginManager
     arguments: [load, '@container.namespaces', '@cache.discovery', '@module_handler']
   plugin.manager.migrate.cckfield:
-    class: Drupal\migrate_drupal\Plugin\MigratePluginManager
+    class: Drupal\migrate\Plugin\MigratePluginManager
     arguments: [cckfield, '@container.namespaces', '@cache.discovery', '@module_handler']
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_cck_field_revision.yml b/core/modules/migrate_drupal/migration_templates/d6_cck_field_revision.yml
similarity index 69%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_cck_field_revision.yml
rename to core/modules/migrate_drupal/migration_templates/d6_cck_field_revision.yml
index b3203f913..fa159894c 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_cck_field_revision.yml
+++ b/core/modules/migrate_drupal/migration_templates/d6_cck_field_revision.yml
@@ -15,10 +15,3 @@ migration_dependencies:
   required:
     - d6_cck_field_values
     - d6_node_revision
-dependencies:
-  config:
-    - migrate.migration.d6_cck_field_values
-    - migrate.migration.d6_node_revision
-  module:
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_cck_field_values.yml b/core/modules/migrate_drupal/migration_templates/d6_cck_field_values.yml
similarity index 66%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_cck_field_values.yml
rename to core/modules/migrate_drupal/migration_templates/d6_cck_field_values.yml
index 0457ecfe7..27027baf7 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_cck_field_values.yml
+++ b/core/modules/migrate_drupal/migration_templates/d6_cck_field_values.yml
@@ -19,11 +19,3 @@ migration_dependencies:
     - d6_node
     - d6_field_formatter_settings
     - d6_field_instance_widget_settings
-dependencies:
-  config:
-    - migrate.migration.d6_field_formatter_settings
-    - migrate.migration.d6_field_instance_widget_settings
-    - migrate.migration.d6_node
-  module:
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment.yml b/core/modules/migrate_drupal/migration_templates/d6_comment.yml
similarity index 75%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment.yml
rename to core/modules/migrate_drupal/migration_templates/d6_comment.yml
index 94fb020f0..1a41ec7ae 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment.yml
+++ b/core/modules/migrate_drupal/migration_templates/d6_comment.yml
@@ -43,15 +43,3 @@ migration_dependencies:
     - d6_comment_entity_display
     - d6_comment_entity_form_display
     - d6_filter_format
-dependencies:
-  config:
-    - migrate.migration.d6_comment_entity_display
-    - migrate.migration.d6_comment_entity_form_display
-    - migrate.migration.d6_comment_type
-    - migrate.migration.d6_filter_format
-    - migrate.migration.d6_node
-    - migrate.migration.d6_user
-  module:
-    - comment
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_entity_display.yml b/core/modules/migrate_drupal/migration_templates/d6_comment_entity_display.yml
similarity index 83%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_entity_display.yml
rename to core/modules/migrate_drupal/migration_templates/d6_comment_entity_display.yml
index 99e373b40..e06c08fcc 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_entity_display.yml
+++ b/core/modules/migrate_drupal/migration_templates/d6_comment_entity_display.yml
@@ -24,9 +24,3 @@ destination:
 migration_dependencies:
   required:
     - d6_comment_field_instance
-dependencies:
-  config:
-    - migrate.migration.d6_comment_field_instance
-  module:
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_entity_form_display.yml b/core/modules/migrate_drupal/migration_templates/d6_comment_entity_form_display.yml
similarity index 83%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_entity_form_display.yml
rename to core/modules/migrate_drupal/migration_templates/d6_comment_entity_form_display.yml
index 059517f20..a05a11bae 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_entity_form_display.yml
+++ b/core/modules/migrate_drupal/migration_templates/d6_comment_entity_form_display.yml
@@ -23,9 +23,3 @@ destination:
 migration_dependencies:
   required:
     - d6_comment_field_instance
-dependencies:
-  config:
-    - migrate.migration.d6_comment_field_instance
-  module:
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_entity_form_display_subject.yml b/core/modules/migrate_drupal/migration_templates/d6_comment_entity_form_display_subject.yml
similarity index 87%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_entity_form_display_subject.yml
rename to core/modules/migrate_drupal/migration_templates/d6_comment_entity_form_display_subject.yml
index 8a3627289..a7e3e6b24 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_entity_form_display_subject.yml
+++ b/core/modules/migrate_drupal/migration_templates/d6_comment_entity_form_display_subject.yml
@@ -30,9 +30,3 @@ destination:
 migration_dependencies:
   required:
     - d6_comment_type
-dependencies:
-  config:
-    - migrate.migration.d6_comment_type
-  module:
-    - comment
-    - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_field.yml b/core/modules/migrate_drupal/migration_templates/d6_comment_field.yml
similarity index 77%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_field.yml
rename to core/modules/migrate_drupal/migration_templates/d6_comment_field.yml
index ab22f23cf..aca8783c1 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_field.yml
+++ b/core/modules/migrate_drupal/migration_templates/d6_comment_field.yml
@@ -17,11 +17,3 @@ destination:
 migration_dependencies:
   required:
     - d6_comment_type
-dependencies:
-  config:
-    - migrate.migration.d6_comment_type
-  module:
-    - comment
-    - field
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_field_instance.yml b/core/modules/migrate_drupal/migration_templates/d6_comment_field_instance.yml
similarity index 84%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_field_instance.yml
rename to core/modules/migrate_drupal/migration_templates/d6_comment_field_instance.yml
index 669ea9437..f00b5278b 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_field_instance.yml
+++ b/core/modules/migrate_drupal/migration_templates/d6_comment_field_instance.yml
@@ -32,11 +32,3 @@ migration_dependencies:
   required:
     - d6_comment_field
     - d6_node_type
-dependencies:
-  config:
-    - migrate.migration.d6_comment_field
-    - migrate.migration.d6_node_type
-  module:
-    - field
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_type.yml b/core/modules/migrate_drupal/migration_templates/d6_comment_type.yml
similarity index 82%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_type.yml
rename to core/modules/migrate_drupal/migration_templates/d6_comment_type.yml
index 35dfde0ad..54ffec188 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_type.yml
+++ b/core/modules/migrate_drupal/migration_templates/d6_comment_type.yml
@@ -13,8 +13,3 @@ process:
   description: description
 destination:
   plugin: entity:comment_type
-dependencies:
-  module:
-    - comment
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_field.yml b/core/modules/migrate_drupal/migration_templates/d6_field.yml
similarity index 98%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_field.yml
rename to core/modules/migrate_drupal/migration_templates/d6_field.yml
index 191c538f2..9ff9e2444 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_field.yml
+++ b/core/modules/migrate_drupal/migration_templates/d6_field.yml
@@ -131,8 +131,3 @@ process:
 
 destination:
   plugin: md_entity:field_storage_config
-dependencies:
-  module:
-    - field
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_field_formatter_settings.yml b/core/modules/migrate_drupal/migration_templates/d6_field_formatter_settings.yml
similarity index 92%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_field_formatter_settings.yml
rename to core/modules/migrate_drupal/migration_templates/d6_field_formatter_settings.yml
index 883e811c8..425e7d4f0 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_field_formatter_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/d6_field_formatter_settings.yml
@@ -52,10 +52,6 @@ process:
           - type
           - 'display_settings/format'
         map:
-          text:
-            default: text_default
-            trimmed: text_trimmed
-            plain: basic_string
           number_integer:
             default: number_integer
             us_0: number_integer
@@ -91,13 +87,6 @@ process:
             spamspan: email_mailto
             contact: email_mailto
             plain: basic_string
-          filefield:
-            default: file_default
-            url_plain: file_url_plain
-            path_plain: file_url_plain
-            image_plain: image
-            image_nodelink: image
-            image_imagelink: image
           fr_phone:
             default: basic_string
           be_phone:
@@ -261,10 +250,3 @@ migration_dependencies:
   required:
     - d6_field_instance
     - d6_view_modes
-dependencies:
-  config:
-    - migrate.migration.d6_field_instance
-    - migrate.migration.d6_view_modes
-  module:
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_field_instance.yml b/core/modules/migrate_drupal/migration_templates/d6_field_instance.yml
similarity index 87%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_field_instance.yml
rename to core/modules/migrate_drupal/migration_templates/d6_field_instance.yml
index 571043329..f876dfd1f 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_field_instance.yml
+++ b/core/modules/migrate_drupal/migration_templates/d6_field_instance.yml
@@ -50,11 +50,3 @@ migration_dependencies:
   required:
     - d6_node_type
     - d6_field
-dependencies:
-  config:
-    - migrate.migration.d6_field
-    - migrate.migration.d6_node_type
-  module:
-    - field
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_field_instance_widget_settings.yml b/core/modules/migrate_drupal/migration_templates/d6_field_instance_widget_settings.yml
similarity index 89%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_field_instance_widget_settings.yml
rename to core/modules/migrate_drupal/migration_templates/d6_field_instance_widget_settings.yml
index a343abedb..3299d5c86 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_field_instance_widget_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/d6_field_instance_widget_settings.yml
@@ -36,12 +36,10 @@ process:
       bypass: true
       source: widget_type
       map:
-        text_textfield: text_textfield
         number: number
         email_textfield: email_default
         date_select: datetime_default
         date_text: datetime_default
-        filefield_widget: file_generic
         imagefield_widget: image_image
         phone_textfield: telephone_default
         optionwidgets_onoff: boolean_checkbox
@@ -60,9 +58,3 @@ destination:
 migration_dependencies:
   required:
     - d6_field_instance
-dependencies:
-  config:
-    - migrate.migration.d6_field_instance
-  module:
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_file.yml b/core/modules/migrate_drupal/migration_templates/d6_file.yml
similarity index 90%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_file.yml
rename to core/modules/migrate_drupal/migration_templates/d6_file.yml
index 508d0bba6..e8ead684b 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_file.yml
+++ b/core/modules/migrate_drupal/migration_templates/d6_file.yml
@@ -23,7 +23,3 @@ process:
   uid: uid
 destination:
   plugin: entity:file
-dependencies:
-  module:
-    - file
-    - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_file_settings.yml b/core/modules/migrate_drupal/migration_templates/d6_file_settings.yml
similarity index 87%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_file_settings.yml
rename to core/modules/migrate_drupal/migration_templates/d6_file_settings.yml
index f2ca1707d..f08d92e64 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_file_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/d6_file_settings.yml
@@ -15,7 +15,3 @@ process:
 destination:
   plugin: config
   config_name: file.settings
-dependencies:
-  module:
-    - file
-    - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_profile_values.yml b/core/modules/migrate_drupal/migration_templates/d6_profile_values.yml
similarity index 58%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_profile_values.yml
rename to core/modules/migrate_drupal/migration_templates/d6_profile_values.yml
index 047de4d04..d2b81a5bf 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_profile_values.yml
+++ b/core/modules/migrate_drupal/migration_templates/d6_profile_values.yml
@@ -16,12 +16,3 @@ migration_dependencies:
     - d6_user_profile_field_instance
     - d6_user_profile_entity_display
     - d6_user_profile_entity_form_display
-dependencies:
-  config:
-    - migrate.migration.d6_user
-    - migrate.migration.d6_user_profile_entity_display
-    - migrate.migration.d6_user_profile_entity_form_display
-    - migrate.migration.d6_user_profile_field_instance
-  module:
-    - migrate_drupal
-    - user
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload.yml b/core/modules/migrate_drupal/migration_templates/d6_upload.yml
similarity index 77%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload.yml
rename to core/modules/migrate_drupal/migration_templates/d6_upload.yml
index fedda76ed..2d04241af 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload.yml
+++ b/core/modules/migrate_drupal/migration_templates/d6_upload.yml
@@ -25,10 +25,3 @@ migration_dependencies:
   required:
     - d6_file
     - d6_node
-dependencies:
-  config:
-    - migrate.migration.d6_file
-    - migrate.migration.d6_node
-  module:
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_entity_display.yml b/core/modules/migrate_drupal/migration_templates/d6_upload_entity_display.yml
similarity index 84%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_entity_display.yml
rename to core/modules/migrate_drupal/migration_templates/d6_upload_entity_display.yml
index 8daf13f1c..28e154b0a 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_entity_display.yml
+++ b/core/modules/migrate_drupal/migration_templates/d6_upload_entity_display.yml
@@ -25,9 +25,3 @@ destination:
 migration_dependencies:
   required:
     - d6_upload_field_instance
-dependencies:
-  config:
-    - migrate.migration.d6_upload_field_instance
-  module:
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_entity_form_display.yml b/core/modules/migrate_drupal/migration_templates/d6_upload_entity_form_display.yml
similarity index 85%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_entity_form_display.yml
rename to core/modules/migrate_drupal/migration_templates/d6_upload_entity_form_display.yml
index f248d1d25..7725659cb 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_entity_form_display.yml
+++ b/core/modules/migrate_drupal/migration_templates/d6_upload_entity_form_display.yml
@@ -26,9 +26,3 @@ destination:
 migration_dependencies:
   required:
     - d6_upload_field_instance
-dependencies:
-  config:
-    - migrate.migration.d6_upload_field_instance
-  module:
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_field.yml b/core/modules/migrate_drupal/migration_templates/d6_upload_field.yml
similarity index 88%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_field.yml
rename to core/modules/migrate_drupal/migration_templates/d6_upload_field.yml
index 15df33af5..e92b8019d 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_field.yml
+++ b/core/modules/migrate_drupal/migration_templates/d6_upload_field.yml
@@ -21,9 +21,3 @@ process:
   'settings/display_field': 'constants/display_field'
 destination:
   plugin: md_entity:field_storage_config
-dependencies:
-  module:
-    - field
-    - file
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_field_instance.yml b/core/modules/migrate_drupal/migration_templates/d6_upload_field_instance.yml
similarity index 78%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_field_instance.yml
rename to core/modules/migrate_drupal/migration_templates/d6_upload_field_instance.yml
index 701351263..4410ec011 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_field_instance.yml
+++ b/core/modules/migrate_drupal/migration_templates/d6_upload_field_instance.yml
@@ -22,11 +22,3 @@ migration_dependencies:
   required:
     - d6_upload_field
     - d6_node_type
-dependencies:
-  config:
-    - migrate.migration.d6_node_type
-    - migrate.migration.d6_upload_field
-  module:
-    - field
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user.yml b/core/modules/migrate_drupal/migration_templates/d6_user.yml
similarity index 87%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_user.yml
rename to core/modules/migrate_drupal/migration_templates/d6_user.yml
index b55e2ec03..05ff4a00e 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user.yml
+++ b/core/modules/migrate_drupal/migration_templates/d6_user.yml
@@ -35,9 +35,3 @@ migration_dependencies:
     - d6_user_picture_file
     - d6_user_picture_entity_display
     - d6_user_picture_entity_form_display
-dependencies:
-  config:
-    - migrate.migration.d6_user_role
-  module:
-    - migrate_drupal
-    - user
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_contact_settings.yml b/core/modules/migrate_drupal/migration_templates/d6_user_contact_settings.yml
similarity index 80%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_contact_settings.yml
rename to core/modules/migrate_drupal/migration_templates/d6_user_contact_settings.yml
index 7da9e52ce..04291550c 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_contact_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/d6_user_contact_settings.yml
@@ -21,9 +21,3 @@ destination:
 migration_dependencies:
   required:
     - d6_user
-dependencies:
-  config:
-    - migrate.migration.d6_user
-  module:
-    - contact
-    - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_mail.yml b/core/modules/migrate_drupal/migration_templates/d6_user_mail.yml
similarity index 96%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_mail.yml
rename to core/modules/migrate_drupal/migration_templates/d6_user_mail.yml
index 15ea0d41c..bc3badf6b 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_mail.yml
+++ b/core/modules/migrate_drupal/migration_templates/d6_user_mail.yml
@@ -37,7 +37,3 @@ process:
 destination:
   plugin: config
   config_name: user.mail
-dependencies:
-  module:
-    - migrate_drupal
-    - user
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_entity_display.yml b/core/modules/migrate_drupal/migration_templates/d6_user_picture_entity_display.yml
similarity index 85%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_entity_display.yml
rename to core/modules/migrate_drupal/migration_templates/d6_user_picture_entity_display.yml
index dd6be7989..f38bc3606 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_entity_display.yml
+++ b/core/modules/migrate_drupal/migration_templates/d6_user_picture_entity_display.yml
@@ -28,9 +28,3 @@ destination:
 migration_dependencies:
   required:
     - d6_user_picture_field_instance
-dependencies:
-  config:
-    - migrate.migration.d6_user_picture_field_instance
-  module:
-    - migrate_drupal
-    - user
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_entity_form_display.yml b/core/modules/migrate_drupal/migration_templates/d6_user_picture_entity_form_display.yml
similarity index 85%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_entity_form_display.yml
rename to core/modules/migrate_drupal/migration_templates/d6_user_picture_entity_form_display.yml
index 9d2182b99..4e422287e 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_entity_form_display.yml
+++ b/core/modules/migrate_drupal/migration_templates/d6_user_picture_entity_form_display.yml
@@ -27,9 +27,3 @@ destination:
 migration_dependencies:
   required:
     - d6_user_picture_field_instance
-dependencies:
-  config:
-    - migrate.migration.d6_user_picture_field_instance
-  module:
-    - migrate_drupal
-    - user
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_field.yml b/core/modules/migrate_drupal/migration_templates/d6_user_picture_field.yml
similarity index 86%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_field.yml
rename to core/modules/migrate_drupal/migration_templates/d6_user_picture_field.yml
index eefb62d92..27a39a23c 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_field.yml
+++ b/core/modules/migrate_drupal/migration_templates/d6_user_picture_field.yml
@@ -18,9 +18,3 @@ process:
   cardinality: 'constants/cardinality'
 destination:
   plugin: md_entity:field_storage_config
-dependencies:
-  module:
-    - field
-    - image
-    - migrate_drupal
-    - user
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_field_instance.yml b/core/modules/migrate_drupal/migration_templates/d6_user_picture_field_instance.yml
similarity index 86%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_field_instance.yml
rename to core/modules/migrate_drupal/migration_templates/d6_user_picture_field_instance.yml
index 14dfc0e91..7dc83b19b 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_field_instance.yml
+++ b/core/modules/migrate_drupal/migration_templates/d6_user_picture_field_instance.yml
@@ -28,10 +28,3 @@ destination:
 migration_dependencies:
   required:
     - d6_user_picture_field
-dependencies:
-  config:
-    - migrate.migration.d6_user_picture_field
-  module:
-    - field
-    - migrate_drupal
-    - user
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_file.yml b/core/modules/migrate_drupal/migration_templates/d6_user_picture_file.yml
similarity index 91%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_file.yml
rename to core/modules/migrate_drupal/migration_templates/d6_user_picture_file.yml
index 9be01218c..0bc5a0b3c 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_file.yml
+++ b/core/modules/migrate_drupal/migration_templates/d6_user_picture_file.yml
@@ -24,7 +24,3 @@ migration_dependencies:
   # migration as an optional dependency to ensure it runs first.
   optional:
     - d6_file
-dependencies:
-  module:
-    - file
-    - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_entity_display.yml b/core/modules/migrate_drupal/migration_templates/d6_user_profile_entity_display.yml
similarity index 94%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_entity_display.yml
rename to core/modules/migrate_drupal/migration_templates/d6_user_profile_entity_display.yml
index 7da0e7ad5..3e7b46778 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_entity_display.yml
+++ b/core/modules/migrate_drupal/migration_templates/d6_user_profile_entity_display.yml
@@ -38,7 +38,3 @@ process:
       4: true # PROFILE_HIDDEN
 destination:
   plugin: component_entity_display
-dependencies:
-  module:
-    - migrate_drupal
-    - user
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_entity_form_display.yml b/core/modules/migrate_drupal/migration_templates/d6_user_profile_entity_form_display.yml
similarity index 95%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_entity_form_display.yml
rename to core/modules/migrate_drupal/migration_templates/d6_user_profile_entity_form_display.yml
index 18fab1bbe..d1cde0b65 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_entity_form_display.yml
+++ b/core/modules/migrate_drupal/migration_templates/d6_user_profile_entity_form_display.yml
@@ -47,7 +47,3 @@ process:
       4: true # PROFILE_HIDDEN
 destination:
   plugin: component_entity_form_display
-dependencies:
-  module:
-    - migrate_drupal
-    - user
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_field.yml b/core/modules/migrate_drupal/migration_templates/d6_user_profile_field.yml
similarity index 91%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_field.yml
rename to core/modules/migrate_drupal/migration_templates/d6_user_profile_field.yml
index 1f84573d7..99176739a 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_field.yml
+++ b/core/modules/migrate_drupal/migration_templates/d6_user_profile_field.yml
@@ -32,8 +32,3 @@ process:
       list: -1
 destination:
   plugin: md_entity:field_storage_config
-dependencies:
-  module:
-    - field
-    - migrate_drupal
-    - user
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_field_instance.yml b/core/modules/migrate_drupal/migration_templates/d6_user_profile_field_instance.yml
similarity index 79%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_field_instance.yml
rename to core/modules/migrate_drupal/migration_templates/d6_user_profile_field_instance.yml
index 30c593849..ec0e52667 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_field_instance.yml
+++ b/core/modules/migrate_drupal/migration_templates/d6_user_profile_field_instance.yml
@@ -19,10 +19,3 @@ destination:
 migration_dependencies:
   required:
     - d6_user_profile_field
-dependencies:
-  config:
-    - migrate.migration.d6_user_profile_field
-  module:
-    - field
-    - migrate_drupal
-    - user
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_role.yml b/core/modules/migrate_drupal/migration_templates/d6_user_role.yml
similarity index 92%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_role.yml
rename to core/modules/migrate_drupal/migration_templates/d6_user_role.yml
index 46edcc807..e15058bb6 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_role.yml
+++ b/core/modules/migrate_drupal/migration_templates/d6_user_role.yml
@@ -44,9 +44,3 @@ destination:
 migration_dependencies:
   required:
     - d6_filter_format
-dependencies:
-  config:
-    - migrate.migration.d6_filter_format
-  module:
-    - migrate_drupal
-    - user
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_settings.yml b/core/modules/migrate_drupal/migration_templates/d6_user_settings.yml
similarity index 92%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_settings.yml
rename to core/modules/migrate_drupal/migration_templates/d6_user_settings.yml
index 09e2eb778..5984d51af 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/d6_user_settings.yml
@@ -26,7 +26,3 @@ process:
 destination:
   plugin: config
   config_name: user.settings
-dependencies:
-  module:
-    - migrate_drupal
-    - user
diff --git a/core/modules/migrate_drupal/src/Entity/Migration.php b/core/modules/migrate_drupal/src/Entity/Migration.php
index 7875ddf63..4a34c1671 100644
--- a/core/modules/migrate_drupal/src/Entity/Migration.php
+++ b/core/modules/migrate_drupal/src/Entity/Migration.php
@@ -16,7 +16,7 @@ class Migration extends BaseMigration implements MigrationInterface {
    *
    * @var array
    */
-  public $load = array();
+  protected $load = array();
 
   /**
    * The load plugin.
diff --git a/core/modules/migrate_drupal/src/MigrationStorage.php b/core/modules/migrate_drupal/src/MigrationStorage.php
index 84c69175b..9a33b3607 100644
--- a/core/modules/migrate_drupal/src/MigrationStorage.php
+++ b/core/modules/migrate_drupal/src/MigrationStorage.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\migrate_drupal;
 
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Uuid\UuidInterface;
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Entity\EntityInterface;
@@ -17,7 +16,7 @@ use Drupal\Core\Language\LanguageManagerInterface;
 use Drupal\migrate\Plugin\migrate\source\SourcePluginBase;
 use Drupal\migrate_drupal\Plugin\CckFieldMigrateSourceInterface;
 use Drupal\migrate\MigrationStorage as BaseMigrationStorage;
-use Drupal\migrate_drupal\Plugin\MigratePluginManager;
+use Drupal\migrate\Plugin\MigratePluginManager;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -164,7 +163,7 @@ class MigrationStorage extends BaseMigrationStorage {
    */
   public function save(EntityInterface $entity) {
     if (strpos($entity->id(), ':') !== FALSE) {
-      throw new EntityStorageException(SafeMarkup::format("Dynamic migration %id can't be saved", array('$%id' => $entity->id())));
+      throw new EntityStorageException("Dynamic migration '{$entity->id()}' can't be saved");
     }
     return parent::save($entity);
   }
diff --git a/core/modules/migrate_drupal/src/Plugin/MigratePluginManager.php b/core/modules/migrate_drupal/src/Plugin/MigratePluginManager.php
deleted file mode 100644
index 4a15e77ae..000000000
--- a/core/modules/migrate_drupal/src/Plugin/MigratePluginManager.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\migrate_drupal\Plugin\MigratePluginManager.
- */
-
-namespace Drupal\migrate_drupal\Plugin;
-
-use Drupal\migrate\Plugin\MigratePluginManager as BaseMigratePluginManager;
-
-/**
- * Manages migrate_drupal plugins.
- *
- * @see plugin_api
- *
- * @ingroup migration
- */
-class MigratePluginManager extends BaseMigratePluginManager {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getPluginInterfaceMap() {
-    return parent::getPluginInterfaceMap() + [
-      'load' => 'Drupal\migrate_drupal\Plugin\MigrateLoadInterface',
-      'cckfield' => 'Drupal\migrate_drupal\Plugin\MigrateCckFieldInterface',
-    ];
-  }
-
-}
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/FileField.php b/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/FileField.php
new file mode 100644
index 000000000..d91bd9972
--- /dev/null
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/FileField.php
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\cckfield\FileField.
+ */
+
+namespace Drupal\migrate_drupal\Plugin\migrate\cckfield;
+
+use Drupal\migrate\Entity\MigrationInterface;
+
+/**
+ * @PluginID("filefield")
+ */
+class FileField extends CckFieldPluginBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFieldWidgetMap() {
+    return [
+      'filefield_widget' => 'file_generic',
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFieldFormatterMap() {
+    return [
+      'default' => 'file_default',
+      'url_plain' => 'file_url_plain',
+      'path_plain' => 'file_url_plain',
+      'image_plain' => 'image',
+      'image_nodelink' => 'image',
+      'image_imagelink' => 'image',
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function processCckFieldValues(MigrationInterface $migration, $field_name, $data) {
+    $process = [
+      'plugin' => 'd6_cck_file',
+      'source' => [
+        $field_name,
+        $field_name . '_list',
+        $field_name . '_data',
+      ],
+    ];
+    $migration->mergeProcessOfProperty($field_name, $process);
+  }
+
+}
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/TextField.php b/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/TextField.php
new file mode 100644
index 000000000..268ea606c
--- /dev/null
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/TextField.php
@@ -0,0 +1,71 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\cckfield\TextField.
+ */
+
+namespace Drupal\migrate_drupal\Plugin\migrate\cckfield;
+
+use Drupal\migrate\Entity\MigrationInterface;
+
+/**
+ * @PluginID("text")
+ */
+class TextField extends CckFieldPluginBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFieldWidgetMap() {
+    return [
+      'text_textfield' => 'text_textfield',
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFieldFormatterMap() {
+    return [
+      'default' => 'text_default',
+      'trimmed' => 'text_trimmed',
+      'plain' => 'basic_string',
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function processCckFieldValues(MigrationInterface $migration, $field_name, $data) {
+    // The data is stored differently depending on whether we're using
+    // db storage.
+    $value_key = $data['db_storage'] ? $field_name : "$field_name/value";
+    $format_key = $data['db_storage'] ? $field_name . '_format' : "$field_name/format" ;
+
+    $migration->setProcessOfProperty("$field_name/value", $value_key);
+
+    // See \Drupal\migrate_drupal\Plugin\migrate\source\d6\User::baseFields(),
+    // signature_format for an example of the YAML that represents this
+    // process array.
+    $process = [
+      [
+        'plugin' => 'static_map',
+        'bypass' => TRUE,
+        'source' => $format_key,
+        'map' => [0 => NULL]
+      ],
+      [
+        'plugin' => 'skip_on_empty',
+        'method' => 'process',
+      ],
+      [
+        'plugin' => 'migration',
+        'migration' => 'd6_filter_format',
+        'source' => $format_key,
+      ],
+    ];
+    $migration->mergeProcessOfProperty("$field_name/format", $process);
+  }
+
+}
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/load/LoadEntity.php b/core/modules/migrate_drupal/src/Plugin/migrate/load/LoadEntity.php
index c3b574c51..375fe7bf3 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/load/LoadEntity.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/load/LoadEntity.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\migrate_drupal\Plugin\migrate\load;
 
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Plugin\PluginBase;
 use Drupal\migrate\Entity\MigrationInterface;
@@ -44,7 +43,7 @@ class LoadEntity extends PluginBase implements MigrateLoadInterface {
       throw new MigrateException('Migrations with a load plugin using LoadEntity should have an entity as source.');
     }
     if ($source_plugin->bundleMigrationRequired() && empty($configuration['bundle_migration'])) {
-      throw new MigrateException(SafeMarkup::format('Source plugin @plugin requires the bundle_migration key to be set.', array('@plugin' => $source_plugin->getPluginId())));
+      throw new MigrateException("Source plugin '{$source_plugin->getPluginId()}' requires the bundle_migration key to be set.");
     }
   }
 
@@ -87,16 +86,7 @@ class LoadEntity extends PluginBase implements MigrateLoadInterface {
 
         if ($source_plugin instanceof CckFieldMigrateSourceInterface) {
           foreach ($source_plugin->fieldData() as $field_name => $data) {
-            switch ($data['type']) {
-              case 'filefield':
-                $this->processFileField($field_name, $data, $migration);
-                break;
-              case 'text':
-                $this->processTextField($field_name, $data, $migration);
-                break;
-              default:
-                $migration->setProcessOfProperty($field_name, $field_name);
-            }
+            $migration->setProcessOfProperty($field_name, $field_name);
           }
         }
         else {
@@ -113,67 +103,4 @@ class LoadEntity extends PluginBase implements MigrateLoadInterface {
     return $migrations;
   }
 
-  /**
-   * Manipulate text fields with any per field type processing.
-   *
-   * @param string $field_name
-   *   The field we're processing.
-   * @param array $field_data
-   *   The an array of field type data from the source.
-   * @param \Drupal\migrate\Entity\MigrationInterface $migration
-   *   The migration entity.
-   */
-  protected function processTextField($field_name, $field_data, MigrationInterface $migration) {
-    // The data is stored differently depending on whether we're using
-    // db storage.
-    $value_key = $field_data['db_storage'] ? $field_name : "$field_name/value";
-    $format_key = $field_data['db_storage'] ? $field_name . '_format' : "$field_name/format" ;
-
-    $migration->setProcessOfProperty("$field_name/value", $value_key);
-
-    // See \Drupal\migrate_drupal\Plugin\migrate\source\d6\User::baseFields(),
-    // signature_format for an example of the YAML that represents this
-    // process array.
-    $process = [
-      [
-        'plugin' => 'static_map',
-        'bypass' => TRUE,
-        'source' => $format_key,
-        'map' => [0 => NULL]
-      ],
-      [
-        'plugin' => 'skip_on_empty',
-        'method' => 'process',
-      ],
-      [
-        'plugin' => 'migration',
-        'migration' => 'd6_filter_format',
-        'source' => $format_key,
-      ],
-    ];
-    $migration->mergeProcessOfProperty("$field_name/format", $process);
-  }
-
-  /**
-   * Manipulate file fields with any per field type processing.
-   *
-   * @param string $field_name
-   *   The field we're processing.
-   * @param array $field_data
-   *   The an array of field type data from the source.
-   * @param \Drupal\migrate\Entity\MigrationInterface $migration
-   *   The migration entity.
-   */
-  protected function processFileField($field_name, $field_data, MigrationInterface $migration) {
-    $process = [
-      'plugin' => 'd6_cck_file',
-      'source' => [
-        $field_name,
-        $field_name . '_list',
-        $field_name . '_data',
-      ],
-    ];
-    $migration->mergeProcessOfProperty($field_name, $process);
-  }
-
 }
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php b/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php
index 5257d9401..deb7adfde 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php
@@ -8,7 +8,6 @@
 namespace Drupal\migrate_drupal\Plugin\migrate\source;
 
 use Drupal\Component\Plugin\DependentPluginInterface;
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Entity\DependencyTrait;
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
@@ -102,11 +101,11 @@ abstract class DrupalSqlBase extends SqlBase implements ContainerFactoryPluginIn
       if (isset($this->pluginDefinition['source_provider'])) {
         if ($this->moduleExists($this->pluginDefinition['source_provider'])) {
           if (isset($this->pluginDefinition['minimum_schema_version']) && !$this->getModuleSchemaVersion($this->pluginDefinition['source_provider']) < $this->pluginDefinition['minimum_schema_version']) {
-            throw new RequirementsException(SafeMarkup::format('Required minimum schema version @minimum_schema_version', ['@minimum_schema_version' => $this->pluginDefinition['minimum_schema_version']]), ['minimum_schema_version' => $this->pluginDefinition['minimum_schema_version']]);
+            throw new RequirementsException('Required minimum schema version ' . $this->pluginDefinition['minimum_schema_version'], ['minimum_schema_version' => $this->pluginDefinition['minimum_schema_version']]);
           }
         }
         else {
-          throw new RequirementsException(SafeMarkup::format('Missing source provider @provider', ['@provider' => $this->pluginDefinition['source_provider']]), ['source_provider' => $this->pluginDefinition['source_provider']]);
+          throw new RequirementsException('Missing source provider ' . $this->pluginDefinition['source_provider'], ['source_provider' => $this->pluginDefinition['source_provider']]);
         }
       }
     }
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/CommentVariable.php b/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/CommentVariable.php
index 8dfb5a8ff..e01d28d00 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/CommentVariable.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/CommentVariable.php
@@ -8,6 +8,7 @@
 namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
 
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
+use Drupal\migrate\Plugin\migrate\source\DummyQueryTrait;
 
 /**
  * @MigrateSource(
@@ -16,6 +17,8 @@ use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
  */
 class CommentVariable extends DrupalSqlBase {
 
+  use DummyQueryTrait;
+
   /**
    * {@inheritdoc}
    */
@@ -92,13 +95,6 @@ class CommentVariable extends DrupalSqlBase {
     );
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function query() {
-    // Nothing to do here.
-  }
-
   /**
    * {@inheritdoc}
    */
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/FieldInstancePerViewMode.php b/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/FieldInstancePerViewMode.php
index a0cf124ca..b3dd8a050 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/FieldInstancePerViewMode.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/FieldInstancePerViewMode.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
 
+use Drupal\node\Plugin\migrate\source\d6\ViewModeBase;
+
 /**
  * The field instance per view mode source class.
  *
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/UploadInstance.php b/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/UploadInstance.php
index 6d5f891f2..3b24f5b5e 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/UploadInstance.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/UploadInstance.php
@@ -8,6 +8,7 @@
 namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
 
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
+use Drupal\migrate\Plugin\migrate\source\DummyQueryTrait;
 
 /**
  * Drupal 6 upload instance source from database.
@@ -19,6 +20,8 @@ use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
  */
 class UploadInstance extends DrupalSqlBase {
 
+  use DummyQueryTrait;
+
   /**
    * {@inheritdoc}
    */
@@ -60,13 +63,6 @@ class UploadInstance extends DrupalSqlBase {
     );
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function query() {
-    // Nothing needed here.
-  }
-
   /**
    * {@inheritdoc}
    */
@@ -78,4 +74,11 @@ class UploadInstance extends DrupalSqlBase {
     );
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function count() {
+    return count($this->initializeIterator());
+  }
+
 }
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/UserPictureInstance.php b/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/UserPictureInstance.php
index 667a5518e..f3a9654fb 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/UserPictureInstance.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/UserPictureInstance.php
@@ -8,6 +8,7 @@
 namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
 
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
+use Drupal\migrate\Plugin\migrate\source\DummyQueryTrait;
 
 /**
  * Drupal 6 user picture field instance source.
@@ -20,6 +21,8 @@ use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
  */
 class UserPictureInstance extends DrupalSqlBase {
 
+  use DummyQueryTrait;
+
   /**
    * {@inheritdoc}
    */
@@ -33,6 +36,15 @@ class UserPictureInstance extends DrupalSqlBase {
       )));
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function count() {
+    // This source provides a single row, corresponding to a single picture
+    // field to be added to the user entity.
+    return 1;
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -52,11 +64,4 @@ class UserPictureInstance extends DrupalSqlBase {
     return $ids;
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function query() {
-    // Nothing to do here.
-  }
-
 }
diff --git a/core/modules/migrate_drupal/src/Tests/MigrateDrupalTestBase.php b/core/modules/migrate_drupal/src/Tests/MigrateDrupalTestBase.php
index b8a436fb4..9d4e1a2e1 100644
--- a/core/modules/migrate_drupal/src/Tests/MigrateDrupalTestBase.php
+++ b/core/modules/migrate_drupal/src/Tests/MigrateDrupalTestBase.php
@@ -8,6 +8,10 @@
 namespace Drupal\migrate_drupal\Tests;
 
 use Drupal\migrate\Tests\MigrateTestBase;
+use Drupal\migrate\Entity\Migration;
+use Drupal\Component\Plugin\Exception\PluginNotFoundException;
+use Drupal\migrate\Plugin\migrate\source\SqlBase;
+use Drupal\Core\Database\Query\SelectInterface;
 
 /**
  * Base class for Drupal migration tests.
@@ -26,7 +30,7 @@ abstract class MigrateDrupalTestBase extends MigrateTestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $this->loadDumps([$this->getDumpDirectory() . '/System.php']);
+    $this->loadDumps(['System.php']);
 
     $this->installEntitySchema('user');
     $this->installConfig(['migrate_drupal', 'system']);
@@ -42,4 +46,51 @@ abstract class MigrateDrupalTestBase extends MigrateTestBase {
     return __DIR__ . '/Table';
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function loadDumps(array $files, $method = 'load') {
+    $files = array_map(function($file) { return $this->getDumpDirectory() . '/' . $file; }, $files);
+    parent::loadDumps($files, $method);
+  }
+
+  /**
+   * Turn all the migration templates for the specified drupal version into
+   * real migration entities so we can test them.
+   *
+   * @param string $version
+   *  Drupal version as provided in migration_tags - e.g., 'Drupal 6'.
+   */
+  protected function installMigrations($version) {
+    $migration_templates = \Drupal::service('migrate.template_storage')->findTemplatesByTag($version);
+    foreach ($migration_templates as $template) {
+      try {
+        $migration = Migration::create($template);
+        $migration->save();
+      }
+      catch (PluginNotFoundException $e) {
+        // Migrations requiring modules not enabled will throw an exception.
+        // Ignoring this exception is equivalent to placing config in the
+        // optional subdirectory - the migrations we require for the test will
+        // be successfully saved.
+      }
+    }
+  }
+
+  /**
+   * Test that the source plugin provides a valid query and a valid count.
+   */
+  public function testSourcePlugin() {
+    if (isset($this->migration)) {
+      $source = $this->migration->getSourcePlugin();
+      // Make sure a SqlBase source has a valid query.
+      if ($source instanceof SqlBase) {
+        /** @var SqlBase $source */
+        $this->assertTrue($source->query() instanceof SelectInterface, 'SQL source plugin has valid query');
+      }
+      // Validate that any source returns a valid count.
+      $this->assertTrue(is_numeric($source->count()), 'Source plugin returns valid count');
+    }
+  }
+
 }
diff --git a/core/modules/migrate_drupal/src/Tests/MigrateFullDrupalTestBase.php b/core/modules/migrate_drupal/src/Tests/MigrateFullDrupalTestBase.php
index 6b01174b3..98289c024 100644
--- a/core/modules/migrate_drupal/src/Tests/MigrateFullDrupalTestBase.php
+++ b/core/modules/migrate_drupal/src/Tests/MigrateFullDrupalTestBase.php
@@ -7,10 +7,6 @@
 
 namespace Drupal\migrate_drupal\Tests;
 
-use Drupal\Component\Utility\SafeMarkup;
-use Drupal\Core\Config\ExtensionInstallStorage;
-use Drupal\Core\Config\InstallStorage;
-use Drupal\Core\Config\StorageInterface;
 use Drupal\migrate\MigrateExecutable;
 use Drupal\simpletest\TestBase;
 
@@ -19,6 +15,19 @@ use Drupal\simpletest\TestBase;
  */
 abstract class MigrateFullDrupalTestBase extends MigrateDrupalTestBase {
 
+  /**
+   * The test class which discovered migration tests must extend in order to be
+   * included in this test run.
+   */
+  const BASE_TEST_CLASS = 'Drupal\migrate_drupal\Tests\MigrateDrupalTestBase';
+
+  /**
+   * A list of fully-qualified test classes which should be ignored.
+   *
+   * @var string[]
+   */
+  protected static $blacklist = [];
+
   /**
    * Get the dump classes required for this migration test.
    *
@@ -31,9 +40,24 @@ abstract class MigrateFullDrupalTestBase extends MigrateDrupalTestBase {
    * Get the test classes that needs to be run for this test.
    *
    * @return array
-   *   The list of test fully-classified class names.
+   *   The list of fully-classified test class names.
    */
-  protected abstract function getTestClassesList();
+  protected function getTestClassesList() {
+    $classes = [];
+
+    $discovery = \Drupal::getContainer()->get('test_discovery');
+    foreach (static::$modules as $module) {
+      foreach ($discovery->getTestClasses($module) as $group) {
+        foreach (array_keys($group) as $class) {
+          if (is_subclass_of($class, static::BASE_TEST_CLASS)) {
+            $classes[] = $class;
+          }
+        }
+      }
+    }
+    // Exclude blacklisted classes.
+    return array_diff($classes, static::$blacklist);
+  }
 
   /**
    * {@inheritdoc}
@@ -58,7 +82,6 @@ abstract class MigrateFullDrupalTestBase extends MigrateDrupalTestBase {
     $this->loadDumps($dumps);
 
     $classes = $this->getTestClassesList();
-    $extension_install_storage = new ExtensionInstallStorage(\Drupal::service('config.storage'), InstallStorage::CONFIG_OPTIONAL_DIRECTORY, StorageInterface::DEFAULT_COLLECTION, TRUE);
     foreach ($classes as $class) {
       if (is_subclass_of($class, '\Drupal\migrate\Tests\MigrateDumpAlterInterface')) {
         $class::migrateDumpAlter($this);
@@ -68,16 +91,6 @@ abstract class MigrateFullDrupalTestBase extends MigrateDrupalTestBase {
     // Run every migration in the order specified by the storage controller.
     foreach (entity_load_multiple('migration', static::$migrations) as $migration) {
       (new MigrateExecutable($migration, $this))->import();
-
-      // Ensure that the default migration has the correct dependencies.
-      list($base_name, ) = explode(':', $migration->id(), 2);
-      $default_configuration = $extension_install_storage->read('migrate.migration.' . $base_name);
-      $default_dependencies = isset($default_configuration['dependencies']) ? $default_configuration['dependencies'] : [];
-      $this->assertEqual($default_dependencies, $migration->getDependencies(), SafeMarkup::format('Dependencies in @id match after installing. Default configuration @first is equal to active configuration @second.', array(
-        '@id' => $migration->id(),
-        '@first' => var_export($default_dependencies, TRUE),
-        '@second' => var_export($migration->getDependencies(), TRUE)
-      )));
     }
     foreach ($classes as $class) {
       $test_object = new $class($this->testId);
diff --git a/core/modules/migrate_drupal/src/Tests/Table/d7/Variable.php b/core/modules/migrate_drupal/src/Tests/Table/d7/Variable.php
index f6faf11fa..8f4c3a8ef 100644
--- a/core/modules/migrate_drupal/src/Tests/Table/d7/Variable.php
+++ b/core/modules/migrate_drupal/src/Tests/Table/d7/Variable.php
@@ -49,6 +49,27 @@ class Variable extends DrupalDumpBase {
     ))->values(array(
       'name' => 'admin_theme',
       'value' => 's:5:"seven";',
+    ))->values(array(
+      'name' => 'aggregator_allowed_html_tags',
+      'value' => 's:13:"<p> <div> <a>";',
+    ))->values(array(
+      'name' => 'aggregator_clear',
+      'value' => 'i:86400;',
+    ))->values(array(
+      'name' => 'aggregator_fetcher',
+      'value' => 's:10:"aggregator";',
+    ))->values(array(
+      'name' => 'aggregator_parser',
+      'value' => 's:10:"aggregator";',
+    ))->values(array(
+      'name' => 'aggregator_processors',
+      'value' => 'a:1:{i:0;s:10:"aggregator";}',
+    ))->values(array(
+      'name' => 'aggregator_summary_items',
+      'value' => 'i:6;',
+    ))->values(array(
+      'name' => 'aggregator_teaser_length',
+      'value' => 'i:500;',
     ))->values(array(
       'name' => 'allow_insecure_derivatives',
       'value' => 'b:1;',
@@ -304,6 +325,15 @@ class Variable extends DrupalDumpBase {
     ))->values(array(
       'name' => 'suppress_itok_output',
       'value' => 'b:1;',
+    ))->values(array(
+      'name' => 'syslog_facility',
+      'value' => 'i:8;',
+    ))->values(array(
+      'name' => 'syslog_format',
+      'value' => 's:72:"!base_url|!timestamp|!type|!ip|!request_uri|!referer|!uid|!link|!message";',
+    ))->values(array(
+      'name' => 'syslog_identity',
+      'value' => 's:6:"drupal";',
     ))->values(array(
       'name' => 'theme_default',
       'value' => 's:6:"bartik";',
@@ -419,4 +449,4 @@ class Variable extends DrupalDumpBase {
   }
 
 }
-#dfc4cdd451a6575677b8c10442893d26
+#5b6552f715939e2b33c22779e47e73e3
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldRevisionTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldRevisionTest.php
index 11b08ef7b..9ac6d26e4 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldRevisionTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldRevisionTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\migrate_drupal\Tests\d6;
 
 use Drupal\migrate\MigrateExecutable;
+use Drupal\node\Tests\Migrate\d6\MigrateNodeTestBase;
 
 /**
  * CCK field revision migration.
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldValuesTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldValuesTest.php
index 2bd727b47..02e54602c 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldValuesTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldValuesTest.php
@@ -7,9 +7,9 @@
 
 namespace Drupal\migrate_drupal\Tests\d6;
 
-use Drupal\Core\Database\Database;
 use Drupal\migrate\MigrateExecutable;
 use Drupal\node\Entity\Node;
+use Drupal\node\Tests\Migrate\d6\MigrateNodeTestBase;
 
 /**
  * CCK field content migration.
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentTest.php
index 2c0e9c52d..a6efb8e24 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentTest.php
@@ -7,11 +7,7 @@
 
 namespace Drupal\migrate_drupal\Tests\d6;
 
-use Drupal\comment\Entity\Comment;
 use Drupal\comment\Tests\CommentTestTrait;
-use Drupal\Core\Language\LanguageInterface;
-use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade comments.
@@ -60,21 +56,16 @@ class MigrateCommentTest extends MigrateDrupal6TestBase {
     );
     $this->prepareMigrations($id_mappings);
 
-    /** @var \Drupal\migrate\entity\Migration $migration */
-    $migration = entity_load('migration', 'd6_comment');
-
-    $dumps = array(
-      $this->getDumpDirectory() . '/Node.php',
-      $this->getDumpDirectory() . '/NodeRevisions.php',
-      $this->getDumpDirectory() . '/ContentTypeStory.php',
-      $this->getDumpDirectory() . '/ContentTypeTestPlanet.php',
-      $this->getDumpDirectory() . '/Variable.php',
-      $this->getDumpDirectory() . '/NodeType.php',
-      $this->getDumpDirectory() . '/Comments.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->loadDumps([
+      'Node.php',
+      'NodeRevisions.php',
+      'ContentTypeStory.php',
+      'ContentTypeTestPlanet.php',
+      'Variable.php',
+      'NodeType.php',
+      'Comments.php',
+    ]);
+    $this->executeMigration('d6_comment');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentTypeTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentTypeTest.php
index 6a4560bef..2b4e07de4 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentTypeTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentTypeTest.php
@@ -8,8 +8,6 @@
 namespace Drupal\migrate_drupal\Tests\d6;
 
 use Drupal\comment\Entity\CommentType;
-use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade comment type.
@@ -30,16 +28,8 @@ class MigrateCommentTypeTest extends MigrateDrupal6TestBase {
     $this->installEntitySchema('comment');
     $this->installConfig(['node', 'comment']);
 
-    /** @var \Drupal\migrate\entity\Migration $migration */
-    $migration = entity_load('migration', 'd6_comment_type');
-
-    $dumps = array(
-      $this->getDumpDirectory() . '/Variable.php',
-      $this->getDumpDirectory() . '/NodeType.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->loadDumps(['Variable.php', 'NodeType.php']);
+    $this->executeMigration('d6_comment_type');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableDisplayBase.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableDisplayBase.php
index cafd55d40..e3a0e9003 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableDisplayBase.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableDisplayBase.php
@@ -7,9 +7,6 @@
 
 namespace Drupal\migrate_drupal\Tests\d6;
 
-use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
 /**
  * Base class for Drupal 6 comment variables to Drupal 8 entity display tests.
  */
@@ -30,13 +27,6 @@ abstract class MigrateCommentVariableDisplayBase extends MigrateDrupal6TestBase
    */
   static $modules = array('comment', 'node');
 
-  /**
-   * The database dumps used.
-   *
-   * @var array
-   */
-  protected $dumps;
-
   /**
    * The node types being tested.
    *
@@ -66,21 +56,14 @@ abstract class MigrateCommentVariableDisplayBase extends MigrateDrupal6TestBase
         'required' => 1,
       ))->save();
     }
-    $this->dumps = array(
-      $this->getDumpDirectory() . '/Variable.php',
-      $this->getDumpDirectory() . '/NodeType.php',
-    );
     $id_mappings = array(
       'd6_comment_field_instance' => array(
         array(array('page'), array('node', 'comment', 'page')),
       ),
     );
     $this->prepareMigrations($id_mappings);
-    /** @var \Drupal\migrate\entity\Migration $migration */
-    $migration = entity_load('migration', static::MIGRATION);
-    $this->prepare($migration, $this->dumps);
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->loadDumps(['Variable.php', 'NodeType.php']);
+    $this->executeMigration(static::MIGRATION);
 
   }
 
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableEntityFormDisplaySubjectTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableEntityFormDisplaySubjectTest.php
index f38201592..a65c9fc85 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableEntityFormDisplaySubjectTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableEntityFormDisplaySubjectTest.php
@@ -7,9 +7,6 @@
 
 namespace Drupal\migrate_drupal\Tests\d6;
 
-use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
 /**
  * Upgrade comment subject variable to core.entity_form_display.comment.*.default.yml
  *
@@ -43,15 +40,8 @@ class MigrateCommentVariableEntityFormDisplaySubjectTest extends MigrateDrupal6T
       ),
     );
     $this->prepareMigrations($id_mappings);
-    /** @var \Drupal\migrate\entity\Migration $migration */
-    $migration = entity_load('migration', 'd6_comment_entity_form_display_subject');
-    $dumps = array(
-      $this->getDumpDirectory() . '/Variable.php',
-      $this->getDumpDirectory() . '/NodeType.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->loadDumps(['Variable.php', 'NodeType.php']);
+    $this->executeMigration('d6_comment_entity_form_display_subject');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableFieldTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableFieldTest.php
index 0267dd4dd..c3986baf0 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableFieldTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableFieldTest.php
@@ -8,8 +8,6 @@
 namespace Drupal\migrate_drupal\Tests\d6;
 
 use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade comment variables to field.storage.node.comment.yml.
@@ -42,15 +40,8 @@ class MigrateCommentVariableFieldTest extends MigrateDrupal6TestBase {
       ),
     );
     $this->prepareMigrations($id_mappings);
-    /** @var \Drupal\migrate\entity\Migration $migration */
-    $migration = entity_load('migration', 'd6_comment_field');
-    $dumps = array(
-      $this->getDumpDirectory() . '/Variable.php',
-      $this->getDumpDirectory() . '/NodeType.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->loadDumps(['Variable.php', 'NodeType.php']);
+    $this->executeMigration('d6_comment_field');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableInstanceTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableInstanceTest.php
index 07b70c5c5..22747ead6 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableInstanceTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableInstanceTest.php
@@ -7,9 +7,6 @@
 
 namespace Drupal\migrate_drupal\Tests\d6;
 
-use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
 /**
  * Upgrade comment variables to field.instance.node.*.comment.yml.
  *
@@ -50,15 +47,8 @@ class MigrateCommentVariableInstanceTest extends MigrateDrupal6TestBase {
       'type' => 'comment',
       'translatable' => '0',
     ))->save();
-    /** @var \Drupal\migrate\entity\Migration $migration */
-    $migration = entity_load('migration', 'd6_comment_field_instance');
-    $dumps = array(
-      $this->getDumpDirectory() . '/Variable.php',
-      $this->getDumpDirectory() . '/NodeType.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->loadDumps(['Variable.php', 'NodeType.php']);
+    $this->executeMigration('d6_comment_field_instance');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php
index 697ab2c34..ac5a8367c 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php
@@ -17,6 +17,12 @@ use Drupal\user\Entity\User;
  */
 class MigrateDrupal6Test extends MigrateFullDrupalTestBase {
 
+  const BASE_TEST_CLASS = 'Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase';
+
+  protected static $blacklist = array(
+    'Drupal\migrate_drupal\Tests\dependencies\MigrateDependenciesTest',
+  );
+
   /**
    * Modules to enable.
    *
@@ -43,6 +49,7 @@ class MigrateDrupal6Test extends MigrateFullDrupalTestBase {
     'locale',
     'menu_link_content',
     'menu_ui',
+    'migrate_drupal',
     'node',
     'options',
     'search',
@@ -114,7 +121,6 @@ class MigrateDrupal6Test extends MigrateFullDrupalTestBase {
     'd6_syslog_settings',
     'd6_system_cron',
     'd6_system_file',
-    'd6_system_filter',
     'd6_system_image',
     'd6_system_image_gd',
     'd6_system_logging',
@@ -198,150 +204,54 @@ class MigrateDrupal6Test extends MigrateFullDrupalTestBase {
       'name' => $this->randomMachineName(),
       'status' => 1,
     ])->enforceIsNew(TRUE)->save();
+
+    $this->installMigrations('Drupal 6');
   }
 
   /**
    * {@inheritdoc}
    */
   protected function getDumps() {
-    $tests_path = $this->getDumpDirectory();
-    $dumps = array(
-      $tests_path . '/AggregatorFeed.php',
-      $tests_path . '/AggregatorItem.php',
-      $tests_path . '/Blocks.php',
-      $tests_path . '/BlocksRoles.php',
-      $tests_path . '/Book.php',
-      $tests_path . '/Boxes.php',
-      $tests_path . '/Comments.php',
-      $tests_path . '/Contact.php',
-      $tests_path . '/ContentFieldMultivalue.php',
-      $tests_path . '/ContentFieldTest.php',
-      $tests_path . '/ContentFieldTestTwo.php',
-      $tests_path . '/ContentNodeField.php',
-      $tests_path . '/ContentNodeFieldInstance.php',
-      $tests_path . '/ContentTypeStory.php',
-      $tests_path . '/ContentTypeTestPlanet.php',
-      $tests_path . '/EventTimezones.php',
-      $tests_path . '/Files.php',
-      $tests_path . '/FilterFormats.php',
-      $tests_path . '/Filters.php',
-      $tests_path . '/MenuCustom.php',
-      $tests_path . '/MenuLinks.php',
-      $tests_path . '/Node.php',
-      $tests_path . '/NodeRevisions.php',
-      $tests_path . '/NodeType.php',
-      $tests_path . '/Permission.php',
-      $tests_path . '/ProfileFields.php',
-      $tests_path . '/ProfileValues.php',
-      $tests_path . '/Role.php',
-      $tests_path . '/TermData.php',
-      $tests_path . '/TermHierarchy.php',
-      $tests_path . '/TermNode.php',
-      $tests_path . '/Upload.php',
-      $tests_path . '/UrlAlias.php',
-      $tests_path . '/Users.php',
-      $tests_path . '/UsersRoles.php',
-      $tests_path . '/Variable.php',
-      $tests_path . '/Vocabulary.php',
-      $tests_path . '/VocabularyNodeTypes.php',
+    return array(
+      'AggregatorFeed.php',
+      'AggregatorItem.php',
+      'Blocks.php',
+      'BlocksRoles.php',
+      'Book.php',
+      'Boxes.php',
+      'Comments.php',
+      'Contact.php',
+      'ContentFieldMultivalue.php',
+      'ContentFieldTest.php',
+      'ContentFieldTestTwo.php',
+      'ContentNodeField.php',
+      'ContentNodeFieldInstance.php',
+      'ContentTypeStory.php',
+      'ContentTypeTestPlanet.php',
+      'EventTimezones.php',
+      'Files.php',
+      'FilterFormats.php',
+      'Filters.php',
+      'MenuCustom.php',
+      'MenuLinks.php',
+      'Node.php',
+      'NodeRevisions.php',
+      'NodeType.php',
+      'Permission.php',
+      'ProfileFields.php',
+      'ProfileValues.php',
+      'Role.php',
+      'TermData.php',
+      'TermHierarchy.php',
+      'TermNode.php',
+      'Upload.php',
+      'UrlAlias.php',
+      'Users.php',
+      'UsersRoles.php',
+      'Variable.php',
+      'Vocabulary.php',
+      'VocabularyNodeTypes.php',
     );
-
-    return $dumps;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getTestClassesList() {
-    $classes = array(
-      __NAMESPACE__ . '\MigrateActionConfigsTest',
-      __NAMESPACE__ . '\MigrateAggregatorConfigsTest',
-      __NAMESPACE__ . '\MigrateAggregatorFeedTest',
-      __NAMESPACE__ . '\MigrateAggregatorItemTest',
-      __NAMESPACE__ . '\MigrateBlockTest',
-      __NAMESPACE__ . '\MigrateBookTest',
-      __NAMESPACE__ . '\MigrateBookConfigsTest',
-      __NAMESPACE__ . '\MigrateCckFieldValuesTest',
-      __NAMESPACE__ . '\MigrateCckFieldRevisionTest',
-      __NAMESPACE__ . '\MigrateCommentTypeTest',
-      __NAMESPACE__ . '\MigrateCommentTest',
-      __NAMESPACE__ . '\MigrateCommentVariableEntityDisplayTest',
-      __NAMESPACE__ . '\MigrateCommentVariableEntityFormDisplayTest',
-      __NAMESPACE__ . '\MigrateCommentVariableEntityFormDisplaySubjectTest',
-      __NAMESPACE__ . '\MigrateCommentVariableFieldTest',
-      __NAMESPACE__ . '\MigrateCommentVariableInstanceTest',
-      __NAMESPACE__ . '\MigrateContactCategoryTest',
-      __NAMESPACE__ . '\MigrateContactConfigsTest',
-      __NAMESPACE__ . '\MigrateBlockContentTest',
-      __NAMESPACE__ . '\MigrateDateFormatTest',
-      __NAMESPACE__ . '\MigrateDblogConfigsTest',
-      __NAMESPACE__ . '\MigrateFieldTest',
-      __NAMESPACE__ . '\MigrateFieldInstanceTest',
-      __NAMESPACE__ . '\MigrateFieldFormatterSettingsTest',
-      __NAMESPACE__ . '\MigrateFieldWidgetSettingsTest',
-      __NAMESPACE__ . '\MigrateFileConfigsTest',
-      __NAMESPACE__ . '\MigrateFileTest',
-      __NAMESPACE__ . '\MigrateFilterFormatTest',
-      __NAMESPACE__ . '\MigrateForumConfigsTest',
-      __NAMESPACE__ . '\MigrateLocaleConfigsTest',
-      __NAMESPACE__ . '\MigrateMenuConfigsTest',
-      __NAMESPACE__ . '\MigrateMenuLinkTest',
-      __NAMESPACE__ . '\MigrateMenuTest',
-      __NAMESPACE__ . '\MigrateNodeBundleSettingsTest',
-      __NAMESPACE__ . '\MigrateNodeConfigsTest',
-      __NAMESPACE__ . '\MigrateNodeRevisionTest',
-      __NAMESPACE__ . '\MigrateNodeTest',
-      __NAMESPACE__ . '\MigrateNodeTypeTest',
-      __NAMESPACE__ . '\MigrateUserProfileValuesTest',
-      __NAMESPACE__ . '\MigrateSearchConfigsTest',
-      __NAMESPACE__ . '\MigrateSearchPageTest',
-      __NAMESPACE__ . '\MigrateSimpletestConfigsTest',
-      __NAMESPACE__ . '\MigrateStatisticsConfigsTest',
-      __NAMESPACE__ . '\MigrateSyslogConfigsTest',
-      __NAMESPACE__ . '\MigrateSystemCronTest',
-      __NAMESPACE__ . '\MigrateSystemFileTest',
-      __NAMESPACE__ . '\MigrateSystemFilterTest',
-      __NAMESPACE__ . '\MigrateSystemImageGdTest',
-      __NAMESPACE__ . '\MigrateSystemImageTest',
-      __NAMESPACE__ . '\MigrateSystemLoggingTest',
-      __NAMESPACE__ . '\MigrateSystemMaintenanceTest',
-      __NAMESPACE__ . '\MigrateSystemPerformanceTest',
-      __NAMESPACE__ . '\MigrateSystemRssTest',
-      __NAMESPACE__ . '\MigrateSystemSiteTest',
-      __NAMESPACE__ . '\MigrateTaxonomyConfigsTest',
-      __NAMESPACE__ . '\MigrateTaxonomyTermTest',
-      __NAMESPACE__ . '\MigrateTaxonomyVocabularyTest',
-      __NAMESPACE__ . '\MigrateTermNodeRevisionTest',
-      __NAMESPACE__ . '\MigrateTermNodeTest',
-      __NAMESPACE__ . '\MigrateTextConfigsTest',
-      __NAMESPACE__ . '\MigrateUpdateConfigsTest',
-      __NAMESPACE__ . '\MigrateUploadEntityDisplayTest',
-      __NAMESPACE__ . '\MigrateUploadEntityFormDisplayTest',
-      __NAMESPACE__ . '\MigrateUploadFieldTest',
-      __NAMESPACE__ . '\MigrateUploadInstanceTest',
-      __NAMESPACE__ . '\MigrateUploadTest',
-      __NAMESPACE__ . '\MigrateUrlAliasTest',
-      __NAMESPACE__ . '\MigrateUserConfigsTest',
-      __NAMESPACE__ . '\MigrateUserContactSettingsTest',
-      __NAMESPACE__ . '\MigrateUserProfileEntityDisplayTest',
-      __NAMESPACE__ . '\MigrateUserProfileEntityFormDisplayTest',
-      __NAMESPACE__ . '\MigrateUserProfileFieldTest',
-      __NAMESPACE__ . '\MigrateUserProfileFieldInstanceTest',
-      __NAMESPACE__ . '\MigrateUserPictureEntityDisplayTest',
-      __NAMESPACE__ . '\MigrateUserPictureEntityFormDisplayTest',
-      __NAMESPACE__ . '\MigrateUserPictureFileTest',
-      __NAMESPACE__ . '\MigrateUserPictureFieldTest',
-      __NAMESPACE__ . '\MigrateUserPictureInstanceTest',
-      __NAMESPACE__ . '\MigrateUserRoleTest',
-      __NAMESPACE__ . '\MigrateUserTest',
-      __NAMESPACE__ . '\MigrateViewModesTest',
-      __NAMESPACE__ . '\MigrateVocabularyEntityDisplayTest',
-      __NAMESPACE__ . '\MigrateVocabularyEntityFormDisplayTest',
-      __NAMESPACE__ . '\MigrateVocabularyFieldInstanceTest',
-      __NAMESPACE__ . '\MigrateVocabularyFieldTest',
-    );
-
-    return $classes;
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6TestBase.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6TestBase.php
index e50871893..cad03dafc 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6TestBase.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6TestBase.php
@@ -14,6 +14,14 @@ use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
  */
 abstract class MigrateDrupal6TestBase extends MigrateDrupalTestBase {
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installMigrations('Drupal 6');
+  }
+
   /**
      * {@inheritdoc}
      */
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldFormatterSettingsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldFormatterSettingsTest.php
index 7780b2c28..15169545c 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldFormatterSettingsTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldFormatterSettingsTest.php
@@ -8,8 +8,6 @@
 namespace Drupal\migrate_drupal\Tests\d6;
 
 use Drupal\Core\Entity\Entity\EntityViewMode;
-use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade field formatter settings to entity.display.*.*.yml.
@@ -66,17 +64,14 @@ class MigrateFieldFormatterSettingsTest extends MigrateDrupal6TestBase {
     );
     $this->prepareMigrations($id_mappings);
 
-    $migration = entity_load('migration', 'd6_field_formatter_settings');
-    $dumps = array(
-      $this->getDumpDirectory() . '/ContentNodeFieldInstance.php',
-      $this->getDumpDirectory() . '/ContentNodeField.php',
-      $this->getDumpDirectory() . '/ContentFieldTest.php',
-      $this->getDumpDirectory() . '/ContentFieldTestTwo.php',
-      $this->getDumpDirectory() . '/ContentFieldMultivalue.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->loadDumps([
+      'ContentNodeFieldInstance.php',
+      'ContentNodeField.php',
+      'ContentFieldTest.php',
+      'ContentFieldTestTwo.php',
+      'ContentFieldMultivalue.php',
+    ]);
+    $this->executeMigration('d6_field_formatter_settings');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldInstanceTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldInstanceTest.php
index 17c0949ed..bae1e8548 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldInstanceTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldInstanceTest.php
@@ -8,8 +8,6 @@
 namespace Drupal\migrate_drupal\Tests\d6;
 
 use Drupal\field\Entity\FieldConfig;
-use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 use Drupal\link\LinkItemInterface;
 
 /**
@@ -67,20 +65,15 @@ class MigrateFieldInstanceTest extends MigrateDrupal6TestBase {
     entity_create('node_type', array('type' => 'story'))->save();
     entity_create('node_type', array('type' => 'test_page'))->save();
 
-    $migration = entity_load('migration', 'd6_field_instance');
-    $dumps = array(
-      $this->getDumpDirectory() . '/ContentNodeFieldInstance.php',
-      $this->getDumpDirectory() . '/ContentNodeField.php',
-      $this->getDumpDirectory() . '/ContentFieldTest.php',
-      $this->getDumpDirectory() . '/ContentFieldTestTwo.php',
-      $this->getDumpDirectory() . '/ContentFieldMultivalue.php',
-    );
+    $this->loadDumps([
+      'ContentNodeFieldInstance.php',
+      'ContentNodeField.php',
+      'ContentFieldTest.php',
+      'ContentFieldTestTwo.php',
+      'ContentFieldMultivalue.php',
+    ]);
     $this->createFields();
-
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
-
+    $this->executeMigration('d6_field_instance');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldTest.php
index 04a3f2e2f..1b612b088 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldTest.php
@@ -8,8 +8,6 @@
 namespace Drupal\migrate_drupal\Tests\d6;
 
 use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Migrate fields.
@@ -30,18 +28,14 @@ class MigrateFieldTest extends MigrateDrupal6TestBase {
    */
   protected function setUp() {
     parent::setUp();
-    /** @var \Drupal\migrate\entity\Migration $migration */
-    $migration = entity_load('migration', 'd6_field');
-    $dumps = array(
-      $this->getDumpDirectory() . '/ContentNodeFieldInstance.php',
-      $this->getDumpDirectory() . '/ContentNodeField.php',
-      $this->getDumpDirectory() . '/ContentFieldTest.php',
-      $this->getDumpDirectory() . '/ContentFieldTestTwo.php',
-      $this->getDumpDirectory() . '/ContentFieldMultivalue.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->loadDumps([
+      'ContentNodeFieldInstance.php',
+      'ContentNodeField.php',
+      'ContentFieldTest.php',
+      'ContentFieldTestTwo.php',
+      'ContentFieldMultivalue.php',
+    ]);
+    $this->executeMigration('d6_field');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldWidgetSettingsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldWidgetSettingsTest.php
index b9b79bbdf..cc1540d9d 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldWidgetSettingsTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldWidgetSettingsTest.php
@@ -7,9 +7,6 @@
 
 namespace Drupal\migrate_drupal\Tests\d6;
 
-use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
 /**
  * Migrate field widget settings.
  *
@@ -62,18 +59,14 @@ class MigrateFieldWidgetSettingsTest extends MigrateDrupal6TestBase {
       ),
     );
     $this->prepareMigrations($id_mappings);
-    $migration = entity_load('migration', 'd6_field_instance_widget_settings');
-    $dumps = array(
-      $this->getDumpDirectory() . '/ContentNodeFieldInstance.php',
-      $this->getDumpDirectory() . '/ContentNodeField.php',
-      $this->getDumpDirectory() . '/ContentFieldTest.php',
-      $this->getDumpDirectory() . '/ContentFieldTestTwo.php',
-      $this->getDumpDirectory() . '/ContentFieldMultivalue.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
-
+    $this->loadDumps([
+      'ContentNodeFieldInstance.php',
+      'ContentNodeField.php',
+      'ContentFieldTest.php',
+      'ContentFieldTestTwo.php',
+      'ContentFieldMultivalue.php',
+    ]);
+    $this->executeMigration('d6_field_instance_widget_settings');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateFileConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateFileConfigsTest.php
index f1dd27455..4e974a03e 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateFileConfigsTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateFileConfigsTest.php
@@ -8,9 +8,6 @@
 namespace Drupal\migrate_drupal\Tests\d6;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate\MigrateMessage;
-use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to file.settings.yml.
@@ -33,13 +30,8 @@ class MigrateFileConfigsTest extends MigrateDrupal6TestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $migration = entity_load('migration', 'd6_file_settings');
-    $dumps = array(
-      $this->getDumpDirectory() . '/Variable.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, new MigrateMessage());
-    $executable->import();
+    $this->loadDumps(['Variable.php']);
+    $this->executeMigration('d6_file_settings');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateFileTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateFileTest.php
index a2989d4e7..fa4d5c832 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateFileTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateFileTest.php
@@ -8,10 +8,10 @@
 namespace Drupal\migrate_drupal\Tests\d6;
 
 use Drupal\Component\Utility\Random;
-use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate\Tests\MigrateDumpAlterInterface;
 use Drupal\Core\Database\Database;
 use Drupal\simpletest\TestBase;
+use Drupal\file\Entity\File;
 
 /**
  * file migration.
@@ -43,17 +43,13 @@ class MigrateFileTest extends MigrateDrupal6TestBase implements MigrateDumpAlter
     $this->installEntitySchema('file');
     $this->installConfig(['file']);
 
-    $dumps = array(
-      $this->getDumpDirectory() . '/Files.php',
-    );
+    $this->loadDumps(['Files.php']);
     /** @var \Drupal\migrate\Entity\MigrationInterface $migration */
     $migration = entity_load('migration', 'd6_file');
     $source = $migration->get('source');
     $source['site_path'] = 'core/modules/simpletest';
     $migration->set('source', $source);
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->executeMigration($migration);
     $this->standalone = TRUE;
   }
 
@@ -62,7 +58,7 @@ class MigrateFileTest extends MigrateDrupal6TestBase implements MigrateDumpAlter
    */
   public function testFiles() {
     /** @var \Drupal\file\FileInterface $file */
-    $file = entity_load('file', 1);
+    $file = File::load(1);
     $this->assertIdentical('Image1.png', $file->getFilename());
     $this->assertIdentical('39325', $file->getSize());
     $this->assertIdentical('public://image-1.png', $file->getFileUri());
@@ -76,11 +72,8 @@ class MigrateFileTest extends MigrateDrupal6TestBase implements MigrateDumpAlter
 
     // Test that we can re-import and also test with file_directory_path set.
     db_truncate(entity_load('migration', 'd6_file')->getIdMap()->mapTableName())->execute();
-    $migration = entity_load_unchanged('migration', 'd6_file');
-    $dumps = array(
-      $this->getDumpDirectory() . '/Variable.php',
-    );
-    $this->prepare($migration, $dumps);
+
+    $this->loadDumps(['Variable.php']);
 
     // Update the file_directory_path.
     Database::getConnection('default', 'migrate')
@@ -93,14 +86,15 @@ class MigrateFileTest extends MigrateDrupal6TestBase implements MigrateDumpAlter
       ->fields(array('value' => serialize($this->getTempFilesDirectory())))
       ->condition('name', 'file_directory_temp')
       ->execute();
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
 
-    $file = entity_load('file', 2);
+    $migration = entity_load_unchanged('migration', 'd6_file');
+    $this->executeMigration($migration);
+
+    $file = File::load(2);
     $this->assertIdentical('public://core/modules/simpletest/files/image-2.jpg', $file->getFileUri());
 
     // Ensure that a temporary file has been migrated.
-    $file = entity_load('file', 6);
+    $file = File::load(6);
     $this->assertIdentical('temporary://' . static::getUniqueFilename(), $file->getFileUri());
   }
 
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateSystemFilterTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateSystemFilterTest.php
deleted file mode 100644
index c82bcc1dd..000000000
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateSystemFilterTest.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateSystemFilterTest.
- */
-
-namespace Drupal\migrate_drupal\Tests\d6;
-
-use Drupal\migrate\MigrateMessage;
-use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade filter variables to system.*.yml.
- *
- * @group migrate_drupal
- */
-class MigrateSystemFilterTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $migration = entity_load('migration', 'd6_system_filter');
-    $dumps = array(
-      $this->getDumpDirectory() . '/Variable.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, new MigrateMessage());
-    $executable->import();
-  }
-
-  /**
-   * Tests migration of system (filter) variables to system.filter.yml.
-   */
-  public function testSystemFilter() {
-    $config = $this->config('system.filter');
-    $this->assertIdentical(array('http', 'https', 'ftp', 'news', 'nntp', 'tel', 'telnet', 'mailto', 'irc', 'ssh', 'sftp', 'webcal', 'rtsp'), $config->get('protocols'));
-  }
-
-}
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadBase.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadBase.php
index e195da1d8..b39211672 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadBase.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadBase.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\migrate_drupal\Tests\d6;
 
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
 /**
  * Base class for file/upload migration tests.
  */
@@ -90,14 +88,13 @@ abstract class MigrateUploadBase extends MigrateDrupal6TestBase {
         $node->save();
       }
     }
-    $dumps = array(
-      $this->getDumpDirectory() . '/Node.php',
-      $this->getDumpDirectory() . '/NodeRevisions.php',
-      $this->getDumpDirectory() . '/ContentTypeStory.php',
-      $this->getDumpDirectory() . '/ContentTypeTestPlanet.php',
-      $this->getDumpDirectory() . '/Upload.php',
-    );
-    $this->loadDumps($dumps);
+    $this->loadDumps([
+      'Node.php',
+      'NodeRevisions.php',
+      'ContentTypeStory.php',
+      'ContentTypeTestPlanet.php',
+      'Upload.php',
+    ]);
   }
 
 }
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadEntityDisplayTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadEntityDisplayTest.php
index 3008b9ccc..c48bbbda3 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadEntityDisplayTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadEntityDisplayTest.php
@@ -7,9 +7,6 @@
 
 namespace Drupal\migrate_drupal\Tests\d6;
 
-use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
 /**
  * Upload entity display.
  *
@@ -41,14 +38,8 @@ class MigrateUploadEntityDisplayTest extends MigrateDrupal6TestBase {
     );
     $this->prepareMigrations($id_mappings);
 
-    $migration = entity_load('migration', 'd6_upload_entity_display');
-    $dumps = array(
-      $this->getDumpDirectory() . '/NodeType.php',
-      $this->getDumpDirectory() . '/Variable.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->loadDumps(['NodeType.php', 'Variable.php']);
+    $this->executeMigration('d6_upload_entity_display');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadEntityFormDisplayTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadEntityFormDisplayTest.php
index f6d9cfc79..3555fcc62 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadEntityFormDisplayTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadEntityFormDisplayTest.php
@@ -7,9 +7,6 @@
 
 namespace Drupal\migrate_drupal\Tests\d6;
 
-use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
 /**
  * Upload form entity display.
  *
@@ -41,15 +38,8 @@ class MigrateUploadEntityFormDisplayTest extends MigrateDrupal6TestBase {
     );
     $this->prepareMigrations($id_mappings);
 
-    $migration = entity_load('migration', 'd6_upload_entity_form_display');
-    $dumps = array(
-      $this->getDumpDirectory() . '/NodeType.php',
-      $this->getDumpDirectory() . '/Variable.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
-
+    $this->loadDumps(['NodeType.php', 'Variable.php']);
+    $this->executeMigration('d6_upload_entity_form_display');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadFieldTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadFieldTest.php
index f9abe7974..f4be6e2c4 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadFieldTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadFieldTest.php
@@ -8,8 +8,6 @@
 namespace Drupal\migrate_drupal\Tests\d6;
 
 use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Uploads migration.
@@ -30,9 +28,7 @@ class MigrateUploadFieldTest extends MigrateDrupal6TestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $migration = entity_load('migration', 'd6_upload_field');
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->executeMigration('d6_upload_field');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadInstanceTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadInstanceTest.php
index d66e3d130..b1ce798f3 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadInstanceTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadInstanceTest.php
@@ -8,8 +8,6 @@
 namespace Drupal\migrate_drupal\Tests\d6;
 
 use Drupal\field\Entity\FieldConfig;
-use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upload field instance migration.
@@ -52,14 +50,8 @@ class MigrateUploadInstanceTest extends MigrateDrupal6TestBase {
       'translatable' => '0',
     ))->save();
 
-    $migration = entity_load('migration', 'd6_upload_field_instance');
-    $dumps = array(
-      $this->getDumpDirectory() . '/NodeType.php',
-      $this->getDumpDirectory() . '/Variable.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->loadDumps(['NodeType.php', 'Variable.php']);
+    $this->executeMigration('d6_upload_field_instance');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadTest.php
index 14df7173f..218fec095 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateUploadTest.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\migrate_drupal\Tests\d6;
 
-use Drupal\migrate\MigrateExecutable;
 use Drupal\node\Entity\Node;
 
 /**
@@ -22,10 +21,7 @@ class MigrateUploadTest extends MigrateUploadBase {
    */
   protected function setUp() {
     parent::setUp();
-    /** @var \Drupal\migrate\entity\Migration $migration */
-    $migration = entity_load('migration', 'd6_upload');
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->executeMigration('d6_upload');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserConfigsTest.php
index 0c9636a08..956e44485 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserConfigsTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserConfigsTest.php
@@ -8,8 +8,6 @@
 namespace Drupal\migrate_drupal\Tests\d6;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to user.*.yml.
@@ -25,17 +23,9 @@ class MigrateUserConfigsTest extends MigrateDrupal6TestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $dumps = array(
-      $this->getDumpDirectory() . '/Variable.php',
-    );
-    $migration = entity_load('migration', 'd6_user_mail');
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
-
-    $migration = entity_load('migration', 'd6_user_settings');
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->loadDumps(['Variable.php']);
+    $this->executeMigration('d6_user_mail');
+    $this->executeMigration('d6_user_settings');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserContactSettingsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserContactSettingsTest.php
index a4a0a18fe..355b43e23 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserContactSettingsTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserContactSettingsTest.php
@@ -7,10 +7,6 @@
 
 namespace Drupal\migrate_drupal\Tests\d6;
 
-use Drupal\Core\Database\Database;
-use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
 /**
  * Users contact settings migration.
  *
@@ -31,13 +27,12 @@ class MigrateUserContactSettingsTest extends MigrateDrupal6TestBase {
 
     $this->installSchema('user', array('users_data'));
 
-    $dumps = array(
-      $this->getDumpDirectory() . '/Users.php',
-      $this->getDumpDirectory() . '/ProfileValues.php',
-      $this->getDumpDirectory() . '/UsersRoles.php',
-      $this->getDumpDirectory() . '/EventTimezones.php',
-    );
-    $this->loadDumps($dumps);
+    $this->loadDumps([
+      'Users.php',
+      'ProfileValues.php',
+      'UsersRoles.php',
+      'EventTimezones.php',
+    ]);
 
     $id_mappings = array(
       'd6_user' => array(
@@ -46,13 +41,9 @@ class MigrateUserContactSettingsTest extends MigrateDrupal6TestBase {
         array(array(15), array(15)),
       ),
     );
-
     $this->prepareMigrations($id_mappings);
 
-    // Migrate users.
-    $migration = entity_load('migration', 'd6_user_contact_settings');
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->executeMigration('d6_user_contact_settings');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserPictureEntityDisplayTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserPictureEntityDisplayTest.php
index 4d88e4a75..3a9effb61 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserPictureEntityDisplayTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserPictureEntityDisplayTest.php
@@ -7,9 +7,6 @@
 
 namespace Drupal\migrate_drupal\Tests\d6;
 
-use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
 /**
  * User picture entity display.
  *
@@ -36,10 +33,7 @@ class MigrateUserPictureEntityDisplayTest extends MigrateDrupal6TestBase {
       ),
     );
     $this->prepareMigrations($id_mappings);
-
-    $migration = entity_load('migration', 'd6_user_picture_entity_display');
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->executeMigration('d6_user_picture_entity_display');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserPictureEntityFormDisplayTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserPictureEntityFormDisplayTest.php
index 9dbdd4a3f..ebbd0f9f2 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserPictureEntityFormDisplayTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserPictureEntityFormDisplayTest.php
@@ -7,9 +7,6 @@
 
 namespace Drupal\migrate_drupal\Tests\d6;
 
-use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
 /**
  * User picture entity form display.
  *
@@ -35,10 +32,7 @@ class MigrateUserPictureEntityFormDisplayTest extends MigrateDrupal6TestBase {
       ),
     );
     $this->prepareMigrations($id_mappings);
-
-    $migration = entity_load('migration', 'd6_user_picture_entity_form_display');
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->executeMigration('d6_user_picture_entity_form_display');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserPictureFieldTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserPictureFieldTest.php
index eac1c3d82..aebf590c3 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserPictureFieldTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserPictureFieldTest.php
@@ -8,8 +8,6 @@
 namespace Drupal\migrate_drupal\Tests\d6;
 
 use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * User picture field migration.
@@ -25,9 +23,7 @@ class MigrateUserPictureFieldTest extends MigrateDrupal6TestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $migration = entity_load('migration', 'd6_user_picture_field');
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->executeMigration('d6_user_picture_field');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserPictureFileTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserPictureFileTest.php
index b3d15d792..fe176266e 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserPictureFileTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserPictureFileTest.php
@@ -7,8 +7,7 @@
 
 namespace Drupal\migrate_drupal\Tests\d6;
 
-use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\file\Entity\File;
 
 /**
  * User pictures migration.
@@ -31,21 +30,19 @@ class MigrateUserPictureFileTest extends MigrateDrupal6TestBase {
     parent::setUp();
 
     $this->installEntitySchema('file');
+    $this->loadDumps([
+      'Users.php',
+      'ProfileValues.php',
+      'UsersRoles.php',
+      'EventTimezones.php',
+    ]);
 
-    $dumps = array(
-      $this->getDumpDirectory() . '/Users.php',
-      $this->getDumpDirectory() . '/ProfileValues.php',
-      $this->getDumpDirectory() . '/UsersRoles.php',
-      $this->getDumpDirectory() . '/EventTimezones.php',
-    );
     /** @var \Drupal\migrate\Entity\MigrationInterface $migration */
     $migration = entity_load('migration', 'd6_user_picture_file');
     $source = $migration->get('source');
     $source['site_path'] = 'core/modules/simpletest';
     $migration->set('source', $source);
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->executeMigration($migration);
   }
 
   /**
@@ -56,7 +53,7 @@ class MigrateUserPictureFileTest extends MigrateDrupal6TestBase {
     foreach (entity_load('migration', 'd6_user_picture_file')->getIdMap() as $destination_ids) {
       $file_ids[] = reset($destination_ids);
     }
-    $files = entity_load_multiple('file', $file_ids);
+    $files = File::loadMultiple($file_ids);
     /** @var \Drupal\file\FileInterface $file */
     $file = array_shift($files);
     $this->assertIdentical('image-test.jpg', $file->getFilename());
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserPictureInstanceTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserPictureInstanceTest.php
index e032ff02a..aac48e1b0 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserPictureInstanceTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserPictureInstanceTest.php
@@ -8,8 +8,6 @@
 namespace Drupal\migrate_drupal\Tests\d6;
 
 use Drupal\field\Entity\FieldConfig;
-use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * User picture field instance migration.
@@ -44,9 +42,7 @@ class MigrateUserPictureInstanceTest extends MigrateDrupal6TestBase {
       'translatable' => '0',
     ))->save();
 
-    $migration = entity_load('migration', 'd6_user_picture_field_instance');
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->executeMigration('d6_user_picture_field_instance');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserProfileEntityDisplayTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserProfileEntityDisplayTest.php
index 5492526c0..b38f2b7a8 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserProfileEntityDisplayTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserProfileEntityDisplayTest.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\migrate_drupal\Tests\d6;
 
-use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 use Drupal\Core\Database\Database;
 
 /**
@@ -74,15 +72,14 @@ class MigrateUserProfileEntityDisplayTest extends MigrateDrupal6TestBase {
       'type' => 'boolean',
     ))->save();
 
-    $migration = entity_load('migration', 'd6_user_profile_entity_display');
-    $dumps = array(
-      $this->getDumpDirectory() . '/ProfileFields.php',
-      $this->getDumpDirectory() . '/Users.php',
-      $this->getDumpDirectory() . '/ProfileValues.php',
-      $this->getDumpDirectory() . '/UsersRoles.php',
-      $this->getDumpDirectory() . '/EventTimezones.php',
-    );
-    $this->prepare($migration, $dumps);
+    $this->loadDumps([
+      'ProfileFields.php',
+      'Users.php',
+      'ProfileValues.php',
+      'UsersRoles.php',
+      'EventTimezones.php',
+    ]);
+
     $field_data = Database::getConnection('default', 'migrate')
       ->select('profile_fields', 'u')
       ->fields('u')
@@ -98,8 +95,8 @@ class MigrateUserProfileEntityDisplayTest extends MigrateDrupal6TestBase {
         'required' => 1,
       ))->save();
     }
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+
+    $this->executeMigration('d6_user_profile_entity_display');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserProfileEntityFormDisplayTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserProfileEntityFormDisplayTest.php
index a127ded48..d0882897f 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserProfileEntityFormDisplayTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserProfileEntityFormDisplayTest.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\migrate_drupal\Tests\d6;
 
-use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 use Drupal\Core\Database\Database;
 
 /**
@@ -69,15 +67,13 @@ class MigrateUserProfileEntityFormDisplayTest extends MigrateDrupal6TestBase {
       'type' => 'boolean',
     ))->save();
 
-    $migration = entity_load('migration', 'd6_user_profile_entity_form_display');
-    $dumps = array(
-      $this->getDumpDirectory() . '/ProfileFields.php',
-      $this->getDumpDirectory() . '/Users.php',
-      $this->getDumpDirectory() . '/ProfileValues.php',
-      $this->getDumpDirectory() . '/UsersRoles.php',
-      $this->getDumpDirectory() . '/EventTimezones.php',
-    );
-    $this->prepare($migration, $dumps);
+    $this->loadDumps([
+      'ProfileFields.php',
+      'Users.php',
+      'ProfileValues.php',
+      'UsersRoles.php',
+      'EventTimezones.php',
+    ]);
 
     $field_data = Database::getConnection('default', 'migrate')
       ->select('profile_fields', 'u')
@@ -95,8 +91,7 @@ class MigrateUserProfileEntityFormDisplayTest extends MigrateDrupal6TestBase {
       ))->save();
     }
 
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->executeMigration('d6_user_profile_entity_form_display');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserProfileFieldInstanceTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserProfileFieldInstanceTest.php
index 101ab0c00..cb834d776 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserProfileFieldInstanceTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserProfileFieldInstanceTest.php
@@ -8,8 +8,6 @@
 namespace Drupal\migrate_drupal\Tests\d6;
 
 use Drupal\field\Entity\FieldConfig;
-use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Tests the user profile field instance migration.
@@ -33,19 +31,14 @@ class MigrateUserProfileFieldInstanceTest extends MigrateDrupal6TestBase {
     );
     $this->prepareMigrations($id_mappings);
     $this->createFields();
-    /** @var \Drupal\migrate\entity\Migration $migration */
-    $migration = entity_load('migration', 'd6_user_profile_field_instance');
-    $dumps = array(
-      $this->getDumpDirectory() . '/ProfileFields.php',
-      $this->getDumpDirectory() . '/Users.php',
-      $this->getDumpDirectory() . '/ProfileValues.php',
-      $this->getDumpDirectory() . '/UsersRoles.php',
-      $this->getDumpDirectory() . '/EventTimezones.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
-
+    $this->loadDumps(array(
+      'ProfileFields.php',
+      'Users.php',
+      'ProfileValues.php',
+      'UsersRoles.php',
+      'EventTimezones.php',
+    ));
+    $this->executeMigration('d6_user_profile_field_instance');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserProfileFieldTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserProfileFieldTest.php
index 4388c220e..b331a59d8 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserProfileFieldTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserProfileFieldTest.php
@@ -8,8 +8,6 @@
 namespace Drupal\migrate_drupal\Tests\d6;
 
 use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Tests the user profile field migration.
@@ -25,17 +23,14 @@ class MigrateUserProfileFieldTest extends MigrateDrupal6TestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $migration = entity_load('migration', 'd6_user_profile_field');
-    $dumps = array(
-      $this->getDumpDirectory() . '/ProfileFields.php',
-      $this->getDumpDirectory() . '/Users.php',
-      $this->getDumpDirectory() . '/ProfileValues.php',
-      $this->getDumpDirectory() . '/UsersRoles.php',
-      $this->getDumpDirectory() . '/EventTimezones.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->loadDumps([
+      'ProfileFields.php',
+      'Users.php',
+      'ProfileValues.php',
+      'UsersRoles.php',
+      'EventTimezones.php',
+    ]);
+    $this->executeMigration('d6_user_profile_field');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserProfileValuesTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserProfileValuesTest.php
index 63fb2332b..fa4489e5a 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserProfileValuesTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserProfileValuesTest.php
@@ -9,7 +9,6 @@ namespace Drupal\migrate_drupal\Tests\d6;
 
 use Drupal\migrate\MigrateExecutable;
 use Drupal\Core\Database\Database;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 use Drupal\user\Entity\User;
 
 /**
@@ -106,15 +105,14 @@ class MigrateUserProfileValuesTest extends MigrateDrupal6TestBase {
     );
     $this->prepareMigrations($id_mappings);
 
-    // Load database dumps to provide source data.
-    $dumps = array(
-      $this->getDumpDirectory() . '/ProfileFields.php',
-      $this->getDumpDirectory() . '/Users.php',
-      $this->getDumpDirectory() . '/ProfileValues.php',
-      $this->getDumpDirectory() . '/UsersRoles.php',
-      $this->getDumpDirectory() . '/EventTimezones.php',
-    );
-    $this->loadDumps($dumps);
+    $this->loadDumps([
+      'ProfileFields.php',
+      'Users.php',
+      'ProfileValues.php',
+      'UsersRoles.php',
+      'EventTimezones.php',
+    ]);
+
     $field_data = Database::getConnection('default', 'migrate')
       ->select('profile_fields', 'u')
       ->fields('u')
@@ -140,10 +138,8 @@ class MigrateUserProfileValuesTest extends MigrateDrupal6TestBase {
       $user->save();
     }
 
-    // Migrate profile fields.
     $migration_format = entity_load('migration', 'd6_profile_values:user');
-    $executable = new MigrateExecutable($migration_format, $this);
-    $executable->import();
+    $this->executeMigration($migration_format);
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserRoleTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserRoleTest.php
index 3c62d497e..ebd2b6b38 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserRoleTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserRoleTest.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\migrate_drupal\Tests\d6;
 
-use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 use Drupal\user\Entity\Role;
 
 /**
@@ -23,7 +21,7 @@ class MigrateUserRoleTest extends MigrateDrupal6TestBase {
    *
    * @var array
    */
-  static $modules = array('filter');
+  static $modules = array('filter', 'node');
 
   /**
    * {@inheritdoc}
@@ -39,18 +37,14 @@ class MigrateUserRoleTest extends MigrateDrupal6TestBase {
     );
     $this->prepareMigrations($id_mappings);
 
-    /** @var \Drupal\migrate\entity\Migration $migration */
-    $migration = entity_load('migration', 'd6_user_role');
-    $dumps = array(
-      $this->getDumpDirectory() . '/Permission.php',
-      $this->getDumpDirectory() . '/Role.php',
-      $this->getDumpDirectory() . '/Filters.php',
-      $this->getDumpDirectory() . '/FilterFormats.php',
-      $this->getDumpDirectory() . '/Variable.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->loadDumps([
+      'Permission.php',
+      'Role.php',
+      'Filters.php',
+      'FilterFormats.php',
+      'Variable.php',
+    ]);
+    $this->executeMigration('d6_user_role');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserTest.php
index d7ebec08d..d584c3ad8 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserTest.php
@@ -10,8 +10,6 @@ namespace Drupal\migrate_drupal\Tests\d6;
 use Drupal\user\Entity\User;
 use Drupal\file\Entity\File;
 use Drupal\Core\Database\Database;
-use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 use Drupal\user\RoleInterface;
 
 /**
@@ -88,20 +86,18 @@ class MigrateUserTest extends MigrateDrupal6TestBase {
     file_put_contents($file->getFileUri(), file_get_contents('core/modules/simpletest/files/image-2.jpg'));
     $file->save();
 
-    // Load database dumps to provide source data.
-    $dumps = array(
-      $this->getDumpDirectory() . '/Filters.php',
-      $this->getDumpDirectory() . '/FilterFormats.php',
-      $this->getDumpDirectory() . '/Variable.php',
-      $this->getDumpDirectory() . '/ProfileFields.php',
-      $this->getDumpDirectory() . '/Permission.php',
-      $this->getDumpDirectory() . '/Role.php',
-      $this->getDumpDirectory() . '/Users.php',
-      $this->getDumpDirectory() . '/ProfileValues.php',
-      $this->getDumpDirectory() . '/UsersRoles.php',
-      $this->getDumpDirectory() . '/EventTimezones.php',
-    );
-    $this->loadDumps($dumps);
+    $this->loadDumps([
+      'Filters.php',
+      'FilterFormats.php',
+      'Variable.php',
+      'ProfileFields.php',
+      'Permission.php',
+      'Role.php',
+      'Users.php',
+      'ProfileValues.php',
+      'UsersRoles.php',
+      'EventTimezones.php',
+    ]);
 
     $id_mappings = array(
       'd6_user_role' => array(
@@ -125,10 +121,7 @@ class MigrateUserTest extends MigrateDrupal6TestBase {
 
     $this->prepareMigrations($id_mappings);
 
-    // Migrate users.
-    $migration = entity_load('migration', 'd6_user');
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->executeMigration('d6_user');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d7/MigrateDrupal7TestBase.php b/core/modules/migrate_drupal/src/Tests/d7/MigrateDrupal7TestBase.php
index 661db4189..95e89f179 100644
--- a/core/modules/migrate_drupal/src/Tests/d7/MigrateDrupal7TestBase.php
+++ b/core/modules/migrate_drupal/src/Tests/d7/MigrateDrupal7TestBase.php
@@ -14,6 +14,14 @@ use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
  */
 abstract class MigrateDrupal7TestBase extends MigrateDrupalTestBase {
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installMigrations('Drupal 7');
+  }
+
   /**
    * {@inheritdoc}
    */
diff --git a/core/modules/migrate_drupal/src/Tests/dependencies/MigrateDependenciesTest.php b/core/modules/migrate_drupal/src/Tests/dependencies/MigrateDependenciesTest.php
index f75a70175..81842c150 100644
--- a/core/modules/migrate_drupal/src/Tests/dependencies/MigrateDependenciesTest.php
+++ b/core/modules/migrate_drupal/src/Tests/dependencies/MigrateDependenciesTest.php
@@ -55,10 +55,7 @@ class MigrateDependenciesTest extends MigrateDrupal6TestBase {
   public function testAggregatorMigrateDependencies() {
     /** @var \Drupal\migrate\entity\Migration $migration */
     $migration = entity_load('migration', 'd6_aggregator_item');
-    $dumps = array(
-      $this->getDumpDirectory() . '/AggregatorItem.php',
-    );
-    $this->prepare($migration, $dumps);
+    $this->loadDumps(['AggregatorItem.php']);
     $executable = new MigrateExecutable($migration, $this);
     $this->startCollectingMessages();
     $executable->import();
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/TermTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/TermTest.php
deleted file mode 100644
index 957b7cd7c..000000000
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/TermTest.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\TermTest.
- */
-
-namespace Drupal\Tests\migrate_drupal\Unit\source\d6;
-
-/**
- * Tests D6 taxonomy term source plugin.
- *
- * @group migrate_drupal
- */
-class TermTest extends TermTestBase {
-
-}
diff --git a/core/modules/node/config/schema/node.source.schema.yml b/core/modules/node/config/schema/node.source.schema.yml
new file mode 100644
index 000000000..a9d88e8c6
--- /dev/null
+++ b/core/modules/node/config/schema/node.source.schema.yml
@@ -0,0 +1,42 @@
+migrate.source.d6_view_mode:
+  type: migrate_source_sql
+  label: 'Drupal 6 view mode'
+  mapping:
+    constants:
+      type: mapping
+      label: 'Constants'
+      mapping:
+        targetEntityType:
+          type: string
+          label: 'Target entity type'
+        status:
+          type: boolean
+          label: 'Status'
+
+migrate.source.d6_node_type:
+  type: migrate_source_sql
+  label: 'Drupal 6 node type'
+  mapping:
+    constants:
+      type: migrate_entity_constant
+      label: 'Constants'
+
+migrate.source.d6_node:
+  type: migrate_source_sql
+  label: 'Drupal 6 node'
+  mapping:
+    node_type:
+      # The node type can be specified both as a string ID of a node type or an
+      # array of node type IDs, so there is no way to consistently parse this.
+      type: ignore
+      label: 'Node type'
+
+migrate.source.d6_node_revision:
+  type: migrate_source_sql
+  label: 'Drupal 6 node'
+  mapping:
+    node_type:
+      # The node type can be specified both as a string ID of a node type or an
+      # array of node type IDs, so there is no way to consistently parse this.
+      type: ignore
+      label: 'Node type'
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node.yml b/core/modules/node/migration_templates/d6_node.yml
similarity index 85%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_node.yml
rename to core/modules/node/migration_templates/d6_node.yml
index 4092a25ef..947a3cf8d 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node.yml
+++ b/core/modules/node/migration_templates/d6_node.yml
@@ -53,12 +53,3 @@ migration_dependencies:
   optional:
     - d6_field_instance_widget_settings
     - d6_field_formatter_settings
-dependencies:
-  config:
-    - migrate.migration.d6_filter_format
-    - migrate.migration.d6_node_settings
-    - migrate.migration.d6_node_type
-    - migrate.migration.d6_user
-  module:
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_revision.yml b/core/modules/node/migration_templates/d6_node_revision.yml
similarity index 88%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_revision.yml
rename to core/modules/node/migration_templates/d6_node_revision.yml
index 42118b3ab..0b1a4789d 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_revision.yml
+++ b/core/modules/node/migration_templates/d6_node_revision.yml
@@ -40,9 +40,3 @@ destination:
 migration_dependencies:
   required:
     - d6_node
-dependencies:
-  config:
-    - migrate.migration.d6_node
-  module:
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_setting_promote.yml b/core/modules/node/migration_templates/d6_node_setting_promote.yml
similarity index 81%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_setting_promote.yml
rename to core/modules/node/migration_templates/d6_node_setting_promote.yml
index c7f6d24ec..8f6da3555 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_setting_promote.yml
+++ b/core/modules/node/migration_templates/d6_node_setting_promote.yml
@@ -17,9 +17,3 @@ destination:
 migration_dependencies:
   required:
     - d6_node_type
-dependencies:
-  config:
-    - migrate.migration.d6_node_type
-  module:
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_setting_status.yml b/core/modules/node/migration_templates/d6_node_setting_status.yml
similarity index 80%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_setting_status.yml
rename to core/modules/node/migration_templates/d6_node_setting_status.yml
index ec7afd6bf..5d3e41294 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_setting_status.yml
+++ b/core/modules/node/migration_templates/d6_node_setting_status.yml
@@ -17,9 +17,3 @@ destination:
 migration_dependencies:
   required:
     - d6_node_type
-dependencies:
-  config:
-    - migrate.migration.d6_node_type
-  module:
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_setting_sticky.yml b/core/modules/node/migration_templates/d6_node_setting_sticky.yml
similarity index 80%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_setting_sticky.yml
rename to core/modules/node/migration_templates/d6_node_setting_sticky.yml
index 4f1b61371..8a8f7b7cb 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_setting_sticky.yml
+++ b/core/modules/node/migration_templates/d6_node_setting_sticky.yml
@@ -17,9 +17,3 @@ destination:
 migration_dependencies:
   required:
     - d6_node_type
-dependencies:
-  config:
-    - migrate.migration.d6_node_type
-  module:
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_settings.yml b/core/modules/node/migration_templates/d6_node_settings.yml
similarity index 81%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_settings.yml
rename to core/modules/node/migration_templates/d6_node_settings.yml
index 336383a21..3e12dd6ec 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_settings.yml
+++ b/core/modules/node/migration_templates/d6_node_settings.yml
@@ -11,7 +11,3 @@ process:
 destination:
   plugin: config
   config_name: node.settings
-dependencies:
-  module:
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_type.yml b/core/modules/node/migration_templates/d6_node_type.yml
similarity index 90%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_type.yml
rename to core/modules/node/migration_templates/d6_node_type.yml
index 7bd24ac6d..009c3a0ef 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_type.yml
+++ b/core/modules/node/migration_templates/d6_node_type.yml
@@ -22,7 +22,3 @@ process:
   create_body_label: body_label
 destination:
   plugin: entity:node_type
-dependencies:
-  module:
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_view_modes.yml b/core/modules/node/migration_templates/d6_view_modes.yml
similarity index 92%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_view_modes.yml
rename to core/modules/node/migration_templates/d6_view_modes.yml
index f8bf6fd23..e2e0c8f48 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_view_modes.yml
+++ b/core/modules/node/migration_templates/d6_view_modes.yml
@@ -35,10 +35,5 @@ process:
       full: "Full"
   targetEntityType: 'constants/targetEntityType'
   status: 'constants/status'
-
 destination:
   plugin: entity:entity_view_mode
-dependencies:
-  module:
-    - migrate_drupal
-    - node
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index f7374dace..062686a04 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -508,7 +508,9 @@ function template_preprocess_node_add_list(&$variables) {
       $variables['types'][$type->id()] = array(
         'type' => $type->id(),
         'add_link' => \Drupal::l($type->label(), new Url('node.add', array('node_type' => $type->id()))),
-        'description' => Xss::filterAdmin($type->getDescription()),
+        'description' => array(
+          '#markup' => $type->getDescription(),
+        ),
       );
     }
   }
diff --git a/core/modules/node/node.services.yml b/core/modules/node/node.services.yml
index 637cdeeb9..2ff32c3e7 100644
--- a/core/modules/node/node.services.yml
+++ b/core/modules/node/node.services.yml
@@ -45,3 +45,8 @@ services:
     arguments: ['@current_user']
     tags:
       - { name: cache.context }
+  node.node_route_context:
+    class: Drupal\node\ContextProvider\NodeRouteContext
+    arguments: ['@current_route_match']
+    tags:
+      - { name: 'context_provider' }
diff --git a/core/modules/node/node.tokens.inc b/core/modules/node/node.tokens.inc
index 7f8d50a85..1bba0cc4b 100644
--- a/core/modules/node/node.tokens.inc
+++ b/core/modules/node/node.tokens.inc
@@ -6,7 +6,9 @@
  */
 
 use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Core\Datetime\Entity\DateFormat;
 use Drupal\Core\Language\LanguageInterface;
+use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\user\Entity\User;
 
 /**
@@ -83,7 +85,7 @@ function node_token_info() {
 /**
  * Implements hook_tokens().
  */
-function node_tokens($type, $tokens, array $data = array(), array $options = array()) {
+function node_tokens($type, $tokens, array $data, array $options, BubbleableMetadata $bubbleable_metadata) {
   $token_service = \Drupal::token();
 
   $url_options = array('absolute' => TRUE);
@@ -176,29 +178,34 @@ function node_tokens($type, $tokens, array $data = array(), array $options = arr
         // Default values for the chained tokens handled below.
         case 'author':
           $account = $node->getOwner() ? $node->getOwner() : User::load(0);
+          $bubbleable_metadata->addCacheableDependency($account);
           $replacements[$original] = $sanitize ? SafeMarkup::checkPlain($account->label()) : $account->label();
           break;
 
         case 'created':
+          $date_format = DateFormat::load('medium');
+          $bubbleable_metadata->addCacheableDependency($date_format);
           $replacements[$original] = format_date($node->getCreatedTime(), 'medium', '', NULL, $langcode);
           break;
 
         case 'changed':
+          $date_format = DateFormat::load('medium');
+          $bubbleable_metadata->addCacheableDependency($date_format);
           $replacements[$original] = format_date($node->getChangedTime(), 'medium', '', NULL, $langcode);
           break;
       }
     }
 
     if ($author_tokens = $token_service->findWithPrefix($tokens, 'author')) {
-      $replacements += $token_service->generate('user', $author_tokens, array('user' => $node->getOwner()), $options);
+      $replacements += $token_service->generate('user', $author_tokens, array('user' => $node->getOwner()), $options, $bubbleable_metadata);
     }
 
     if ($created_tokens = $token_service->findWithPrefix($tokens, 'created')) {
-      $replacements += $token_service->generate('date', $created_tokens, array('date' => $node->getCreatedTime()), $options);
+      $replacements += $token_service->generate('date', $created_tokens, array('date' => $node->getCreatedTime()), $options, $bubbleable_metadata);
     }
 
     if ($changed_tokens = $token_service->findWithPrefix($tokens, 'changed')) {
-      $replacements += $token_service->generate('date', $changed_tokens, array('date' => $node->getChangedTime()), $options);
+      $replacements += $token_service->generate('date', $changed_tokens, array('date' => $node->getChangedTime()), $options, $bubbleable_metadata);
     }
   }
 
diff --git a/core/modules/node/src/Cache/NodeAccessGrantsCacheContext.php b/core/modules/node/src/Cache/NodeAccessGrantsCacheContext.php
index a0249f081..767d28605 100644
--- a/core/modules/node/src/Cache/NodeAccessGrantsCacheContext.php
+++ b/core/modules/node/src/Cache/NodeAccessGrantsCacheContext.php
@@ -7,18 +7,23 @@
 
 namespace Drupal\node\Cache;
 
+use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Cache\Context\CalculatedCacheContextInterface;
-use Drupal\Core\Cache\Context\UserCacheContext;
+use Drupal\Core\Cache\Context\UserCacheContextBase;
 
 /**
  * Defines the node access view cache context service.
  *
+ * Cache context ID: 'user.node_grants' (to vary by all operations' grants).
+ * Calculated cache context ID: 'user.node_grants:%operation', e.g.
+ * 'user.node_grants:view' (to vary by the view operation's grants).
+ *
  * This allows for node access grants-sensitive caching when listing nodes.
  *
  * @see node_query_node_access_alter()
  * @ingroup node_access
  */
-class NodeAccessGrantsCacheContext extends UserCacheContext implements CalculatedCacheContextInterface {
+class NodeAccessGrantsCacheContext extends UserCacheContextBase implements CalculatedCacheContextInterface {
 
   /**
    * {@inheritdoc}
@@ -78,4 +83,24 @@ class NodeAccessGrantsCacheContext extends UserCacheContext implements Calculate
     return $operation . '.' . implode(';', $grants_context_parts);
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheableMetadata($operation = NULL) {
+    $cacheable_metadata = new CacheableMetadata();
+
+    if (!\Drupal::moduleHandler()->getImplementations('node_grants')) {
+      return $cacheable_metadata;
+    }
+
+    // The node grants may change if the user is updated. (The max-age is set to
+    // zero below, but sites may override this cache context, and change it to a
+    // non-zero value. In such cases, this cache tag is needed for correctness.)
+    $cacheable_metadata->setCacheTags(['user:' . $this->user->id()]);
+
+    // If the site is using node grants, this cache context can not be
+    // optimized.
+    return $cacheable_metadata->setCacheMaxAge(0);
+  }
+
 }
diff --git a/core/modules/block/src/EventSubscriber/NodeRouteContext.php b/core/modules/node/src/ContextProvider/NodeRouteContext.php
similarity index 64%
rename from core/modules/block/src/EventSubscriber/NodeRouteContext.php
rename to core/modules/node/src/ContextProvider/NodeRouteContext.php
index 66458c0b1..e6f5781ce 100644
--- a/core/modules/block/src/EventSubscriber/NodeRouteContext.php
+++ b/core/modules/node/src/ContextProvider/NodeRouteContext.php
@@ -2,21 +2,22 @@
 
 /**
  * @file
- * Contains \Drupal\block\EventSubscriber\NodeRouteContext.
+ * Contains \Drupal\node\ContextProvider\NodeRouteContext.
  */
 
-namespace Drupal\block\EventSubscriber;
+namespace Drupal\node\ContextProvider;
 
-use Drupal\block\Event\BlockContextEvent;
+use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Plugin\Context\Context;
 use Drupal\Core\Plugin\Context\ContextDefinition;
+use Drupal\Core\Plugin\Context\ContextProviderInterface;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\node\Entity\Node;
 
 /**
  * Sets the current node as a context on node routes.
  */
-class NodeRouteContext extends BlockContextSubscriberBase {
+class NodeRouteContext implements ContextProviderInterface {
 
   /**
    * The route match object.
@@ -38,28 +39,32 @@ class NodeRouteContext extends BlockContextSubscriberBase {
   /**
    * {@inheritdoc}
    */
-  public function onBlockActiveContext(BlockContextEvent $event) {
+  public function getRuntimeContexts(array $unqualified_context_ids) {
+    $result = [];
+    $context = new Context(new ContextDefinition('entity:node', NULL, FALSE));
     if (($route_object = $this->routeMatch->getRouteObject()) && ($route_contexts = $route_object->getOption('parameters')) && isset($route_contexts['node'])) {
-      $context = new Context(new ContextDefinition($route_contexts['node']['type']));
       if ($node = $this->routeMatch->getParameter('node')) {
         $context->setContextValue($node);
       }
-      $event->setContext('node.node', $context);
     }
     elseif ($this->routeMatch->getRouteName() == 'node.add') {
       $node_type = $this->routeMatch->getParameter('node_type');
-      $context = new Context(new ContextDefinition('entity:node'));
       $context->setContextValue(Node::create(array('type' => $node_type->id())));
-      $event->setContext('node.node', $context);
     }
+    $cacheability = new CacheableMetadata();
+    $cacheability->setCacheContexts(['route']);
+    $context->addCacheableDependency($cacheability);
+    $result['node'] = $context;
+
+    return $result;
   }
 
   /**
    * {@inheritdoc}
    */
-  public function onBlockAdministrativeContext(BlockContextEvent $event) {
+  public function getAvailableContexts() {
     $context = new Context(new ContextDefinition('entity:node'));
-    $event->setContext('node.node', $context);
+    return ['node' => $context];
   }
 
 }
diff --git a/core/modules/node/src/Controller/NodeController.php b/core/modules/node/src/Controller/NodeController.php
index 1cb43be23..3291f3377 100644
--- a/core/modules/node/src/Controller/NodeController.php
+++ b/core/modules/node/src/Controller/NodeController.php
@@ -8,7 +8,6 @@
 namespace Drupal\node\Controller;
 
 use Drupal\Component\Utility\SafeMarkup;
-use Drupal\Component\Utility\Xss;
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\Datetime\DateFormatter;
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
@@ -172,53 +171,69 @@ class NodeController extends ControllerBase implements ContainerInjectionInterfa
     $vids = $node_storage->revisionIds($node);
 
     foreach (array_reverse($vids) as $vid) {
-      if ($revision = $node_storage->loadRevision($vid)) {
-        $row = array();
+      $revision = $node_storage->loadRevision($vid);
+      $username = [
+        '#theme' => 'username',
+        '#account' => $revision->uid->entity,
+      ];
 
-        $revision_author = $revision->uid->entity;
-
-        if ($vid == $node->getRevisionId()) {
-          $username = array(
-            '#theme' => 'username',
-            '#account' => $revision_author,
-          );
-          $row[] = array('data' => $this->t('!date by !username', array('!date' => $node->link($this->dateFormatter->format($revision->revision_timestamp->value, 'short')), '!username' => drupal_render($username)))
-            . (($revision->revision_log->value != '') ? '<p class="revision-log">' . Xss::filter($revision->revision_log->value) . '</p>' : ''),
-            'class' => array('revision-current'));
-          $row[] = array('data' => SafeMarkup::placeholder($this->t('current revision')), 'class' => array('revision-current'));
-        }
-        else {
-          $username = array(
-            '#theme' => 'username',
-            '#account' => $revision_author,
-          );
-          $row[] = $this->t('!date by !username', array('!date' => $this->l($this->dateFormatter->format($revision->revision_timestamp->value, 'short'), new Url('entity.node.revision', array('node' => $node->id(), 'node_revision' => $vid))), '!username' => drupal_render($username)))
-            . (($revision->revision_log->value != '') ? '<p class="revision-log">' . Xss::filter($revision->revision_log->value) . '</p>' : '');
-
-          if ($revert_permission) {
-            $links['revert'] = array(
-              'title' => $this->t('Revert'),
-              'url' => Url::fromRoute('node.revision_revert_confirm', ['node' => $node->id(), 'node_revision' => $vid]),
-            );
-          }
-
-          if ($delete_permission) {
-            $links['delete'] = array(
-              'title' => $this->t('Delete'),
-              'url' => Url::fromRoute('node.revision_delete_confirm', ['node' => $node->id(), 'node_revision' => $vid]),
-            );
-          }
-
-          $row[] = array(
-            'data' => array(
-              '#type' => 'operations',
-              '#links' => $links,
-            ),
-          );
-        }
-
-        $rows[] = $row;
+      // Use revision link to link to revisions that are not active.
+      $date = $this->dateFormatter->format($revision->revision_timestamp->value, 'short');
+      if ($vid != $node->getRevisionId()) {
+        $link = $this->l($date, new Url('entity.node.revision', ['node' => $node->id(), 'node_revision' => $vid]));
       }
+      else {
+        $link = $node->link($date);
+      }
+
+      $row = [];
+      $column = [
+        'data' => [
+          '#type' => 'inline_template',
+          '#template' => '{% trans %}{{ date }} by {{ username }}{% endtrans %}{% if message %}<p class="revision-log">{{ message }}</p>{% endif %}',
+          '#context' => [
+            'date' => $link,
+            'username' => $this->renderer->renderPlain($username),
+            'message' => SafeMarkup::xssFilter($revision->revision_log->value),
+          ],
+        ],
+      ];
+      // @todo Simplify once https://www.drupal.org/node/2334319 lands.
+      $this->renderer->addCacheableDependency($column['data'], $username);
+      $row[] = $column;
+
+      if ($vid == $node->getRevisionId()) {
+        $row[0]['class'] = ['revision-current'];
+        $row[] = [
+          'data' => SafeMarkup::placeholder($this->t('current revision')),
+          'class' => ['revision-current'],
+        ];
+      }
+      else {
+        $links = [];
+        if ($revert_permission) {
+          $links['revert'] = [
+            'title' => $this->t('Revert'),
+            'url' => Url::fromRoute('node.revision_revert_confirm', ['node' => $node->id(), 'node_revision' => $vid]),
+          ];
+        }
+
+        if ($delete_permission) {
+          $links['delete'] = [
+            'title' => $this->t('Delete'),
+            'url' => Url::fromRoute('node.revision_delete_confirm', ['node' => $node->id(), 'node_revision' => $vid]),
+          ];
+        }
+
+        $row[] = [
+          'data' => [
+            '#type' => 'operations',
+            '#links' => $links,
+          ],
+        ];
+      }
+
+      $rows[] = $row;
     }
 
     $build['node_revisions_table'] = array(
diff --git a/core/modules/node/src/Controller/NodeViewController.php b/core/modules/node/src/Controller/NodeViewController.php
index 3e3fb6535..8a756b3b8 100644
--- a/core/modules/node/src/Controller/NodeViewController.php
+++ b/core/modules/node/src/Controller/NodeViewController.php
@@ -57,7 +57,7 @@ class NodeViewController extends EntityViewController {
    *   The page title.
    */
   public function title(EntityInterface $node) {
-    return SafeMarkup::checkPlain($this->entityManager->getTranslationFromContext($node)->label());
+    return $this->entityManager->getTranslationFromContext($node)->label();
   }
 
 }
diff --git a/core/modules/node/src/Entity/Node.php b/core/modules/node/src/Entity/Node.php
index 2f57843bf..0588ab097 100644
--- a/core/modules/node/src/Entity/Node.php
+++ b/core/modules/node/src/Entity/Node.php
@@ -53,7 +53,9 @@ use Drupal\user\UserInterface;
  *     "bundle" = "type",
  *     "label" = "title",
  *     "langcode" = "langcode",
- *     "uuid" = "uuid"
+ *     "uuid" = "uuid",
+ *     "status" = "status",
+ *     "uid" = "uid",
  *   },
  *   bundle_entity_type = "node_type",
  *   field_ui_base_route = "entity.node_type.edit_form",
@@ -72,6 +74,17 @@ class Node extends ContentEntityBase implements NodeInterface {
 
   use EntityChangedTrait;
 
+  /**
+   * Whether the node is being previewed or not.
+   *
+   * The variable is set to public as it will give a considerable performance
+   * improvement. See https://www.drupal.org/node/2498919.
+   *
+   * @var true|null
+   *   TRUE if the node is being previewed and NULL if it is not.
+   */
+  public $in_preview = NULL;
+
   /**
    * {@inheritdoc}
    */
@@ -258,7 +271,7 @@ class Node extends ContentEntityBase implements NodeInterface {
    * {@inheritdoc}
    */
   public function isPublished() {
-    return (bool) $this->get('status')->value;
+    return (bool) $this->getEntityKey('status');
   }
 
   /**
@@ -280,7 +293,7 @@ class Node extends ContentEntityBase implements NodeInterface {
    * {@inheritdoc}
    */
   public function getOwnerId() {
-    return $this->get('uid')->target_id;
+    return $this->getEntityKey('uid');
   }
 
   /**
diff --git a/core/modules/node/src/NodeAccessControlHandlerInterface.php b/core/modules/node/src/NodeAccessControlHandlerInterface.php
index b3468226b..9e7c34af6 100644
--- a/core/modules/node/src/NodeAccessControlHandlerInterface.php
+++ b/core/modules/node/src/NodeAccessControlHandlerInterface.php
@@ -32,7 +32,6 @@ interface NodeAccessControlHandlerInterface {
    */
   public function acquireGrants(NodeInterface $node);
 
-
   /**
    * Writes a list of grants to the database, deleting any previously saved ones.
    *
@@ -46,12 +45,6 @@ interface NodeAccessControlHandlerInterface {
    *
    * @param \Drupal\node\NodeInterface $node
    *   The node whose grants are being written.
-   * @param $grants
-   *   A list of grants to write. See hook_node_access_records() for the
-   *   expected structure of the grants array.
-   * @param $realm
-   *   (optional) If provided, read/write grants for that realm only. Defaults to
-   *   NULL.
    * @param $delete
    *   (optional) If false, does not delete records. This is only for optimization
    *   purposes, and assumes the caller has already performed a mass delete of
diff --git a/core/modules/node/src/NodeForm.php b/core/modules/node/src/NodeForm.php
index 33dec701f..e363dca99 100644
--- a/core/modules/node/src/NodeForm.php
+++ b/core/modules/node/src/NodeForm.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\node;
 
-use Drupal\Component\Utility\Html;
 use Drupal\Core\Entity\ContentEntityForm;
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Form\FormStateInterface;
@@ -204,9 +203,32 @@ class NodeForm extends ContentEntityForm {
 
     $form['#attached']['library'][] = 'node/form';
 
+    $form['#entity_builders']['update_status'] = [$this, 'updateStatus'];
+
     return $form;
   }
 
+  /**
+   * Entity builder updating the node status with the submitted value.
+   *
+   * @param string $entity_type_id
+   *   The entity type identifier.
+   * @param \Drupal\node\NodeInterface $node
+   *   The node updated with the submitted values.
+   * @param array $form
+   *   The complete form array.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   The current state of the form.
+   *
+   * @see \Drupal\node\NodeForm::form()
+   */
+  function updateStatus($entity_type_id, NodeInterface $node, array $form, FormStateInterface $form_state) {
+    $element = $form_state->getTriggeringElement();
+    if (isset($element['#published_status'])) {
+      $node->setPublished($element['#published_status']);
+    }
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -232,6 +254,8 @@ class NodeForm extends ContentEntityForm {
 
       // Add a "Publish" button.
       $element['publish'] = $element['submit'];
+      // If the "Publish" button is clicked, we want to update the status to "published".
+      $element['publish']['#published_status'] = TRUE;
       $element['publish']['#dropbutton'] = 'save';
       if ($node->isNew()) {
         $element['publish']['#value'] = t('Save and publish');
@@ -240,10 +264,11 @@ class NodeForm extends ContentEntityForm {
         $element['publish']['#value'] = $node->isPublished() ? t('Save and keep published') : t('Save and publish');
       }
       $element['publish']['#weight'] = 0;
-      array_unshift($element['publish']['#submit'], '::publish');
 
       // Add a "Unpublish" button.
       $element['unpublish'] = $element['submit'];
+      // If the "Unpublish" button is clicked, we want to update the status to "unpublished".
+      $element['unpublish']['#published_status'] = FALSE;
       $element['unpublish']['#dropbutton'] = 'save';
       if ($node->isNew()) {
         $element['unpublish']['#value'] = t('Save as unpublished');
@@ -252,7 +277,6 @@ class NodeForm extends ContentEntityForm {
         $element['unpublish']['#value'] = !$node->isPublished() ? t('Save and keep unpublished') : t('Save and unpublish');
       }
       $element['unpublish']['#weight'] = 10;
-      array_unshift($element['unpublish']['#submit'], '::unpublish');
 
       // If already published, the 'publish' button is primary.
       if ($node->isPublished()) {
@@ -273,7 +297,6 @@ class NodeForm extends ContentEntityForm {
       '#access' => $preview_mode != DRUPAL_DISABLED && ($node->access('create') || $node->access('update')),
       '#value' => t('Preview'),
       '#weight' => 20,
-      '#validate' => array('::validate'),
       '#submit' => array('::submitForm', '::preview'),
     );
 
@@ -327,34 +350,6 @@ class NodeForm extends ContentEntityForm {
     ));
   }
 
-  /**
-   * Form submission handler for the 'publish' action.
-   *
-   * @param $form
-   *   An associative array containing the structure of the form.
-   * @param $form_state
-   *   The current state of the form.
-   */
-  public function publish(array $form, FormStateInterface $form_state) {
-    $node = $this->entity;
-    $node->setPublished(TRUE);
-    return $node;
-  }
-
-  /**
-   * Form submission handler for the 'unpublish' action.
-   *
-   * @param $form
-   *   An associative array containing the structure of the form.
-   * @param $form_state
-   *   The current state of the form.
-   */
-  public function unpublish(array $form, FormStateInterface $form_state) {
-    $node = $this->entity;
-    $node->setPublished(FALSE);
-    return $node;
-  }
-
   /**
    * {@inheritdoc}
    */
diff --git a/core/modules/node/src/NodeStorageSchema.php b/core/modules/node/src/NodeStorageSchema.php
index 320f79730..4423a5ad9 100644
--- a/core/modules/node/src/NodeStorageSchema.php
+++ b/core/modules/node/src/NodeStorageSchema.php
@@ -22,22 +22,12 @@ class NodeStorageSchema extends SqlContentEntityStorageSchema {
   protected function getEntitySchema(ContentEntityTypeInterface $entity_type, $reset = FALSE) {
     $schema = parent::getEntitySchema($entity_type, $reset);
 
-    // Marking the respective fields as NOT NULL makes the indexes more
-    // performant.
-    $schema['node_field_data']['fields']['default_langcode']['not null'] = TRUE;
-    $schema['node_field_revision']['fields']['default_langcode']['not null'] = TRUE;
-
     $schema['node_field_data']['indexes'] += array(
-      'node__default_langcode' => array('default_langcode'),
       'node__frontpage' => array('promote', 'status', 'sticky', 'created'),
       'node__status_type' => array('status', 'type', 'nid'),
       'node__title_type' => array('title', array('type', 4)),
     );
 
-    $schema['node_field_revision']['indexes'] += array(
-      'node__default_langcode' => array('default_langcode'),
-    );
-
     return $schema;
   }
 
@@ -73,7 +63,6 @@ class NodeStorageSchema extends SqlContentEntityStorageSchema {
 
         case 'changed':
         case 'created':
-        case 'langcode':
           // @todo Revisit index definitions:
           //   https://www.drupal.org/node/2015277.
           $this->addSharedTableFieldIndex($storage_definition, $schema, TRUE);
@@ -81,14 +70,6 @@ class NodeStorageSchema extends SqlContentEntityStorageSchema {
       }
     }
 
-    if ($table_name == 'node_field_revision') {
-      switch ($field_name) {
-        case 'langcode':
-          $this->addSharedTableFieldIndex($storage_definition, $schema, TRUE);
-          break;
-      }
-    }
-
     return $schema;
   }
 
diff --git a/core/modules/node/src/NodeTranslationHandler.php b/core/modules/node/src/NodeTranslationHandler.php
index 3692c8b76..41c690953 100644
--- a/core/modules/node/src/NodeTranslationHandler.php
+++ b/core/modules/node/src/NodeTranslationHandler.php
@@ -7,8 +7,8 @@
 
 namespace Drupal\node;
 
-use Drupal\Core\Entity\EntityInterface;
 use Drupal\content_translation\ContentTranslationHandler;
+use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Form\FormStateInterface;
 
 /**
@@ -76,9 +76,8 @@ class NodeTranslationHandler extends ContentTranslationHandler {
    */
   public function entityFormEntityBuild($entity_type, EntityInterface $entity, array $form, FormStateInterface $form_state) {
     if ($form_state->hasValue('content_translation')) {
-      $form_object = $form_state->getFormObject();
       $translation = &$form_state->getValue('content_translation');
-      $translation['status'] = $form_object->getEntity()->isPublished();
+      $translation['status'] = $entity->isPublished();
       // $form['content_translation']['name'] is the equivalent field
       // for translation author uid.
       $account = $entity->uid->entity;
diff --git a/core/modules/node/src/NodeTypeForm.php b/core/modules/node/src/NodeTypeForm.php
index 6dfc669df..ff757f98b 100644
--- a/core/modules/node/src/NodeTypeForm.php
+++ b/core/modules/node/src/NodeTypeForm.php
@@ -204,8 +204,8 @@ class NodeTypeForm extends EntityForm {
   /**
    * {@inheritdoc}
    */
-  public function validate(array $form, FormStateInterface $form_state) {
-    parent::validate($form, $form_state);
+  public function validateForm(array &$form, FormStateInterface $form_state) {
+    parent::validateForm($form, $form_state);
 
     $id = trim($form_state->getValue('type'));
     // '0' is invalid, since elsewhere we check it using empty().
diff --git a/core/modules/node/src/NodeTypeListBuilder.php b/core/modules/node/src/NodeTypeListBuilder.php
index 46bec743d..89ea82502 100644
--- a/core/modules/node/src/NodeTypeListBuilder.php
+++ b/core/modules/node/src/NodeTypeListBuilder.php
@@ -10,7 +10,6 @@ namespace Drupal\node;
 use Drupal\Core\Config\Entity\ConfigEntityListBuilder;
 use Drupal\Core\Url;
 use Drupal\Core\Entity\EntityInterface;
-use Drupal\Component\Utility\Xss;
 
 /**
  * Defines a class to build a listing of node type entities.
@@ -39,7 +38,7 @@ class NodeTypeListBuilder extends ConfigEntityListBuilder {
       'data' => $this->getLabel($entity),
       'class' => array('menu-label'),
     );
-    $row['description'] = Xss::filterAdmin($entity->getDescription());
+    $row['description']['data'] = ['#markup' => $entity->getDescription()];
     return $row + parent::buildRow($entity);
   }
 
diff --git a/core/modules/node/src/Plugin/Search/NodeSearch.php b/core/modules/node/src/Plugin/Search/NodeSearch.php
index 9dc4442ca..87a3851c5 100644
--- a/core/modules/node/src/Plugin/Search/NodeSearch.php
+++ b/core/modules/node/src/Plugin/Search/NodeSearch.php
@@ -114,6 +114,11 @@ class NodeSearch extends ConfigurableSearchPluginBase implements AccessibleInter
     'term' => array('column' => 'ti.tid', 'join' => array('table' => 'taxonomy_index', 'alias' => 'ti', 'condition' => 'n.nid = ti.nid')),
   );
 
+  /**
+   * A constant for setting and checking the query string.
+   */
+  const ADVANCED_FORM = 'advanced-form';
+
   /**
    * {@inheritdoc}
    */
@@ -293,7 +298,7 @@ class NodeSearch extends ConfigurableSearchPluginBase implements AccessibleInter
     }
 
     if ($status & SearchQuery::NO_POSITIVE_KEYWORDS) {
-      drupal_set_message($this->formatPlural($this->searchSettings->get('index.minimum_word_size'), 'You must include at least one positive keyword with 1 character or more.', 'You must include at least one positive keyword with @count characters or more.'), 'warning');
+      drupal_set_message($this->formatPlural($this->searchSettings->get('index.minimum_word_size'), 'You must include at least one keyword to match in the content, and punctuation is ignored.', 'You must include at least one keyword to match in the content. Keywords must be at least @count characters, and punctuation is ignored.'), 'warning');
     }
 
     return $find;
@@ -490,38 +495,59 @@ class NodeSearch extends ConfigurableSearchPluginBase implements AccessibleInter
    * {@inheritdoc}
    */
   public function searchFormAlter(array &$form, FormStateInterface $form_state) {
+    $parameters = $this->getParameters();
+    $keys = $this->getKeywords();
+    $used_advanced = !empty($parameters[self::ADVANCED_FORM]);
+    if ($used_advanced) {
+      $f = isset($parameters['f']) ? (array) $parameters['f'] : array();
+      $defaults =  $this->parseAdvancedDefaults($f, $keys);
+    }
+    else {
+      $defaults = array('keys' => $keys);
+    }
+
+    $form['basic']['keys']['#default_value'] = $defaults['keys'];
+
     // Add advanced search keyword-related boxes.
     $form['advanced'] = array(
       '#type' => 'details',
       '#title' => t('Advanced search'),
       '#attributes' => array('class' => array('search-advanced')),
       '#access' => $this->account && $this->account->hasPermission('use advanced search'),
+      '#open' => $used_advanced,
     );
     $form['advanced']['keywords-fieldset'] = array(
       '#type' => 'fieldset',
       '#title' => t('Keywords'),
     );
+
     $form['advanced']['keywords'] = array(
       '#prefix' => '<div class="criterion">',
       '#suffix' => '</div>',
     );
+
     $form['advanced']['keywords-fieldset']['keywords']['or'] = array(
       '#type' => 'textfield',
       '#title' => t('Containing any of the words'),
       '#size' => 30,
       '#maxlength' => 255,
+      '#default_value' => isset($defaults['or']) ? $defaults['or'] : '',
     );
+
     $form['advanced']['keywords-fieldset']['keywords']['phrase'] = array(
       '#type' => 'textfield',
       '#title' => t('Containing the phrase'),
       '#size' => 30,
       '#maxlength' => 255,
+      '#default_value' => isset($defaults['phrase']) ? $defaults['phrase'] : '',
     );
+
     $form['advanced']['keywords-fieldset']['keywords']['negative'] = array(
       '#type' => 'textfield',
       '#title' => t('Containing none of the words'),
       '#size' => 30,
       '#maxlength' => 255,
+      '#default_value' => isset($defaults['negative']) ? $defaults['negative'] : '',
     );
 
     // Add node types.
@@ -536,7 +562,9 @@ class NodeSearch extends ConfigurableSearchPluginBase implements AccessibleInter
       '#prefix' => '<div class="criterion">',
       '#suffix' => '</div>',
       '#options' => $types,
+      '#default_value' => isset($defaults['type']) ? $defaults['type'] : array(),
     );
+
     $form['advanced']['submit'] = array(
       '#type' => 'submit',
       '#value' => t('Advanced search'),
@@ -563,6 +591,7 @@ class NodeSearch extends ConfigurableSearchPluginBase implements AccessibleInter
         '#prefix' => '<div class="criterion">',
         '#suffix' => '</div>',
         '#options' => $language_options,
+        '#default_value' => isset($defaults['language']) ? $defaults['language'] : array(),
       );
     }
   }
@@ -574,6 +603,7 @@ class NodeSearch extends ConfigurableSearchPluginBase implements AccessibleInter
     // Read keyword and advanced search information from the form values,
     // and put these into the GET parameters.
     $keys = trim($form_state->getValue('keys'));
+    $advanced = FALSE;
 
     // Collect extra filters.
     $filters = array();
@@ -582,6 +612,7 @@ class NodeSearch extends ConfigurableSearchPluginBase implements AccessibleInter
       // checkboxes to 0.
       foreach ($form_state->getValue('type') as $type) {
         if ($type) {
+          $advanced = TRUE;
           $filters[] = 'type:' . $type;
         }
       }
@@ -590,11 +621,13 @@ class NodeSearch extends ConfigurableSearchPluginBase implements AccessibleInter
     if ($form_state->hasValue('term') && is_array($form_state->getValue('term'))) {
       foreach ($form_state->getValue('term') as $term) {
         $filters[] = 'term:' . $term;
+        $advanced = TRUE;
       }
     }
     if ($form_state->hasValue('language') && is_array($form_state->getValue('language'))) {
       foreach ($form_state->getValue('language') as $language) {
         if ($language) {
+          $advanced = TRUE;
           $filters[] = 'language:' . $language;
         }
       }
@@ -602,15 +635,18 @@ class NodeSearch extends ConfigurableSearchPluginBase implements AccessibleInter
     if ($form_state->getValue('or') != '') {
       if (preg_match_all('/ ("[^"]+"|[^" ]+)/i', ' ' . $form_state->getValue('or'), $matches)) {
         $keys .= ' ' . implode(' OR ', $matches[1]);
+        $advanced = TRUE;
       }
     }
     if ($form_state->getValue('negative') != '') {
       if (preg_match_all('/ ("[^"]+"|[^" ]+)/i', ' ' . $form_state->getValue('negative'), $matches)) {
         $keys .= ' -' . implode(' -', $matches[1]);
+        $advanced = TRUE;
       }
     }
     if ($form_state->getValue('phrase') != '') {
       $keys .= ' "' . str_replace('"', ' ', $form_state->getValue('phrase')) . '"';
+      $advanced = TRUE;
     }
     $keys = trim($keys);
 
@@ -621,10 +657,69 @@ class NodeSearch extends ConfigurableSearchPluginBase implements AccessibleInter
     if ($filters) {
       $query['f'] = $filters;
     }
+    // Record that the person used the advanced search form, if they did.
+    if ($advanced) {
+      $query[self::ADVANCED_FORM] = '1';
+    }
 
     return $query;
   }
 
+  /**
+   * Parses the advanced search form default values.
+   *
+   * @param array $f
+   *   The 'f' query parameter set up in self::buildUrlSearchQuery(), which
+   *   contains the advanced query values.
+   * @param string $keys
+   *   The search keywords string, which contains some information from the
+   *   advanced search form.
+   *
+   * @return array
+   *   Array of default form values for the advanced search form, including
+   *   a modified 'keys' element for the bare search keywords.
+   */
+  protected function parseAdvancedDefaults($f, $keys) {
+    $defaults = array();
+
+    // Split out the advanced search parameters.
+    foreach ($f as $advanced) {
+      list($key, $value) = explode(':', $advanced, 2);
+      if (!isset($defaults[$key])) {
+        $defaults[$key] = array();
+      }
+      $defaults[$key][] = $value;
+    }
+
+    // Split out the negative, phrase, and OR parts of keywords.
+
+    // For phrases, the form only supports one phrase.
+    $matches = array();
+    $keys = ' ' . $keys . ' ';
+    if (preg_match('/ "([^"]+)" /', $keys, $matches)) {
+      $keys = str_replace($matches[0], ' ', $keys);
+      $defaults['phrase'] = $matches[1];
+    }
+
+    // Negative keywords: pull all of them out.
+    if (preg_match_all('/ -([^ ]+)/', $keys, $matches)) {
+      $keys = str_replace($matches[0], ' ', $keys);
+      $defaults['negative'] = implode(' ', $matches[1]);
+    }
+
+    // OR keywords: pull up to one set of them out of the query.
+    if (preg_match('/ [^ ]+( OR [^ ]+)+ /', $keys, $matches)) {
+      $keys = str_replace($matches[0], ' ', $keys);
+      $words = explode(' OR ', trim($matches[0]));
+      $defaults['or'] = implode(' ', $words);
+    }
+
+    // Put remaining keywords string back into keywords.
+    $defaults['keys'] = trim($keys);
+
+    return $defaults;
+  }
+
   /**
    * Gathers ranking definitions from hook_ranking().
    *
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/NodeUpdate7008.php b/core/modules/node/src/Plugin/migrate/process/d6/NodeUpdate7008.php
similarity index 83%
rename from core/modules/migrate_drupal/src/Plugin/migrate/process/d6/NodeUpdate7008.php
rename to core/modules/node/src/Plugin/migrate/process/d6/NodeUpdate7008.php
index 50917d18f..af7dd4eb6 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/NodeUpdate7008.php
+++ b/core/modules/node/src/Plugin/migrate/process/d6/NodeUpdate7008.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\NodeUpdate7008.
+ * Contains \Drupal\node\Plugin\migrate\process\d6\NodeUpdate7008.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
+namespace Drupal\node\Plugin\migrate\process\d6;
 
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\ProcessPluginBase;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Node.php b/core/modules/node/src/Plugin/migrate/source/d6/Node.php
similarity index 96%
rename from core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Node.php
rename to core/modules/node/src/Plugin/migrate/source/d6/Node.php
index d7579fde1..038c479f9 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Node.php
+++ b/core/modules/node/src/Plugin/migrate/source/d6/Node.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\Node.
+ * Contains \Drupal\node\Plugin\migrate\source\d6\Node.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+namespace Drupal\node\Plugin\migrate\source\d6;
 
 use Drupal\migrate\Row;
 use Drupal\migrate\Plugin\SourceEntityInterface;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/NodeRevision.php b/core/modules/node/src/Plugin/migrate/source/d6/NodeRevision.php
similarity index 85%
rename from core/modules/migrate_drupal/src/Plugin/migrate/source/d6/NodeRevision.php
rename to core/modules/node/src/Plugin/migrate/source/d6/NodeRevision.php
index c419586c3..8f426c0b1 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/NodeRevision.php
+++ b/core/modules/node/src/Plugin/migrate/source/d6/NodeRevision.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\NodeRevision.
+ * Contains \Drupal\node\Plugin\migrate\source\d6\NodeRevision.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+namespace Drupal\node\Plugin\migrate\source\d6;
 
 /**
  * Drupal 6 node revision source from database.
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/NodeType.php b/core/modules/node/src/Plugin/migrate/source/d6/NodeType.php
similarity index 96%
rename from core/modules/migrate_drupal/src/Plugin/migrate/source/d6/NodeType.php
rename to core/modules/node/src/Plugin/migrate/source/d6/NodeType.php
index cfab0d41a..034c934d5 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/NodeType.php
+++ b/core/modules/node/src/Plugin/migrate/source/d6/NodeType.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\NodeType.
+ * Contains \Drupal\node\Plugin\migrate\source\d6\NodeType.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+namespace Drupal\node\Plugin\migrate\source\d6;
 
 use Drupal\migrate\Row;
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/ViewMode.php b/core/modules/node/src/Plugin/migrate/source/d6/ViewMode.php
similarity index 84%
rename from core/modules/migrate_drupal/src/Plugin/migrate/source/d6/ViewMode.php
rename to core/modules/node/src/Plugin/migrate/source/d6/ViewMode.php
index ea1c505f0..bed066326 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/ViewMode.php
+++ b/core/modules/node/src/Plugin/migrate/source/d6/ViewMode.php
@@ -2,15 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\ViewMode.
+ * Contains \Drupal\node\Plugin\migrate\source\d6\ViewMode.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
-
-use Drupal\Core\Entity\EntityManagerInterface;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\migrate\Entity\MigrationInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
+namespace Drupal\node\Plugin\migrate\source\d6;
 
 /**
  * The view mode source.
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/ViewModeBase.php b/core/modules/node/src/Plugin/migrate/source/d6/ViewModeBase.php
similarity index 86%
rename from core/modules/migrate_drupal/src/Plugin/migrate/source/d6/ViewModeBase.php
rename to core/modules/node/src/Plugin/migrate/source/d6/ViewModeBase.php
index 8e0588738..9817a1b28 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/ViewModeBase.php
+++ b/core/modules/node/src/Plugin/migrate/source/d6/ViewModeBase.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\ViewModeBase.
+ * Contains \Drupal\node\Plugin\migrate\source\d6\ViewModeBase.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+namespace Drupal\node\Plugin\migrate\source\d6;
 
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 
@@ -14,7 +14,6 @@ use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
  */
 abstract class ViewModeBase extends DrupalSqlBase {
 
-
   /**
    * {@inheritdoc}
    */
diff --git a/core/modules/node/src/ProxyClass/ParamConverter/NodePreviewConverter.php b/core/modules/node/src/ProxyClass/ParamConverter/NodePreviewConverter.php
new file mode 100644
index 000000000..565424f02
--- /dev/null
+++ b/core/modules/node/src/ProxyClass/ParamConverter/NodePreviewConverter.php
@@ -0,0 +1,92 @@
+<?php
+
+/**
+ * @file
+ * Contains Drupal\node\ProxyClass\ParamConverter\NodePreviewConverter.
+ */
+
+/**
+ * This file was generated via php core/scripts/generate-proxy-class.php 'Drupal\node\ParamConverter\NodePreviewConverter' "core/modules/node/src".
+ */
+
+namespace Drupal\node\ProxyClass\ParamConverter {
+
+    /**
+     * Provides a proxy class for \Drupal\node\ParamConverter\NodePreviewConverter.
+     *
+     * @see \Drupal\Component\ProxyBuilder
+     */
+    class NodePreviewConverter implements \Drupal\Core\ParamConverter\ParamConverterInterface
+    {
+
+        use \Drupal\Core\DependencyInjection\DependencySerializationTrait;
+
+        /**
+         * The id of the original proxied service.
+         *
+         * @var string
+         */
+        protected $drupalProxyOriginalServiceId;
+
+        /**
+         * The real proxied service, after it was lazy loaded.
+         *
+         * @var \Drupal\node\ParamConverter\NodePreviewConverter
+         */
+        protected $service;
+
+        /**
+         * The service container.
+         *
+         * @var \Symfony\Component\DependencyInjection\ContainerInterface
+         */
+        protected $container;
+
+        /**
+         * Constructs a ProxyClass Drupal proxy object.
+         *
+         * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
+         *   The container.
+         * @param string $drupal_proxy_original_service_id
+         *   The service ID of the original service.
+         */
+        public function __construct(\Symfony\Component\DependencyInjection\ContainerInterface $container, $drupal_proxy_original_service_id)
+        {
+            $this->container = $container;
+            $this->drupalProxyOriginalServiceId = $drupal_proxy_original_service_id;
+        }
+
+        /**
+         * Lazy loads the real service from the container.
+         *
+         * @return object
+         *   Returns the constructed real service.
+         */
+        protected function lazyLoadItself()
+        {
+            if (!isset($this->service)) {
+                $this->service = $this->container->get($this->drupalProxyOriginalServiceId);
+            }
+
+            return $this->service;
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function convert($value, $definition, $name, array $defaults)
+        {
+            return $this->lazyLoadItself()->convert($value, $definition, $name, $defaults);
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function applies($definition, $name, \Symfony\Component\Routing\Route $route)
+        {
+            return $this->lazyLoadItself()->applies($definition, $name, $route);
+        }
+
+    }
+
+}
diff --git a/core/modules/node/src/Tests/AssertButtonsTrait.php b/core/modules/node/src/Tests/AssertButtonsTrait.php
new file mode 100644
index 000000000..96eb6c846
--- /dev/null
+++ b/core/modules/node/src/Tests/AssertButtonsTrait.php
@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\node\Tests\AssertButtonsTrait.
+ */
+
+namespace Drupal\node\Tests;
+
+/**
+ * Asserts that buttons are present on a page.
+ */
+trait AssertButtonsTrait {
+
+  /**
+   * Assert method to verify the buttons in the dropdown element.
+   *
+   * @param array $buttons
+   *   A collection of buttons to assert for on the page.
+   * @param bool $dropbutton
+   *   Whether to check if the buttons are in a dropbutton widget or not.
+   */
+  public function assertButtons($buttons, $dropbutton = TRUE) {
+
+    // Try to find a Save button.
+    $save_button = $this->xpath('//input[@type="submit"][@value="Save"]');
+
+    // Verify that the number of buttons passed as parameters is
+    // available in the dropbutton widget.
+    if ($dropbutton) {
+      $i = 0;
+      $count = count($buttons);
+
+      // Assert there is no save button.
+      $this->assertTrue(empty($save_button));
+
+      // Dropbutton elements.
+      $elements = $this->xpath('//div[@class="dropbutton-wrapper"]//input[@type="submit"]');
+      $this->assertEqual($count, count($elements));
+      foreach ($elements as $element) {
+        $value = isset($element['value']) ? (string) $element['value'] : '';
+        $this->assertEqual($buttons[$i], $value);
+        $i++;
+      }
+    }
+    else {
+      // Assert there is a save button.
+      $this->assertTrue(!empty($save_button));
+      $this->assertNoRaw('dropbutton-wrapper');
+    }
+  }
+}
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeBundleSettingsTest.php b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeBundleSettingsTest.php
similarity index 76%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateNodeBundleSettingsTest.php
rename to core/modules/node/src/Tests/Migrate/d6/MigrateNodeBundleSettingsTest.php
index 0a8d60b45..fc6e4e54b 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeBundleSettingsTest.php
+++ b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeBundleSettingsTest.php
@@ -2,18 +2,17 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateNodeBundleSettingsTest.
+ * Contains \Drupal\node\Tests\Migrate\d6\MigrateNodeBundleSettingsTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\node\Tests\Migrate\d6;
 
-use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Test migrating node settings into the base_field_bundle_override config entity.
  *
- * @group migrate_drupal
+ * @group node
  */
 class MigrateNodeBundleSettingsTest extends MigrateDrupal6TestBase {
 
@@ -58,25 +57,10 @@ class MigrateNodeBundleSettingsTest extends MigrateDrupal6TestBase {
     );
     $this->prepareMigrations($id_mappings);
 
-    // Setup the dumps.
-    $migration = entity_load('migration', 'd6_node_setting_promote');
-    $dumps = array(
-      $this->getDumpDirectory() . '/NodeType.php',
-      $this->getDumpDirectory() . '/Variable.php',
-    );
-    $this->prepare($migration, $dumps);
-
-    // Run the migrations.
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
-
-    $migration = entity_load('migration', 'd6_node_setting_status');
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
-
-    $migration = entity_load('migration', 'd6_node_setting_sticky');
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->loadDumps(['NodeType.php', 'Variable.php']);
+    $this->executeMigration('d6_node_setting_promote');
+    $this->executeMigration('d6_node_setting_status');
+    $this->executeMigration('d6_node_setting_sticky');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeConfigsTest.php b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeConfigsTest.php
similarity index 61%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateNodeConfigsTest.php
rename to core/modules/node/src/Tests/Migrate/d6/MigrateNodeConfigsTest.php
index edf8b1ac4..291c42a31 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeConfigsTest.php
+++ b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeConfigsTest.php
@@ -2,20 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateNodeConfigsTest.
+ * Contains \Drupal\node\Tests\Migrate\d6\MigrateNodeConfigsTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\node\Tests\Migrate\d6;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate\MigrateMessage;
-use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to node.settings.yml.
  *
- * @group migrate_drupal
+ * @group node
  */
 class MigrateNodeConfigsTest extends MigrateDrupal6TestBase {
 
@@ -33,13 +31,8 @@ class MigrateNodeConfigsTest extends MigrateDrupal6TestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $migration = entity_load('migration', 'd6_node_settings');
-    $dumps = array(
-      $this->getDumpDirectory() . '/Variable.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, new MigrateMessage);
-    $executable->import();
+    $this->loadDumps(['Variable.php']);
+    $this->executeMigration('d6_node_settings');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeRevisionTest.php b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeRevisionTest.php
similarity index 79%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateNodeRevisionTest.php
rename to core/modules/node/src/Tests/Migrate/d6/MigrateNodeRevisionTest.php
index 41f3850be..b10083e68 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeRevisionTest.php
+++ b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeRevisionTest.php
@@ -2,18 +2,17 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateNodeRevisionTest.
+ * Contains \Drupal\node\Tests\Migrate\d6\MigrateNodeRevisionTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\node\Tests\Migrate\d6;
 
-use Drupal\migrate\MigrateExecutable;
 use Drupal\Core\Database\Database;
 
 /**
  * Node content revisions migration.
  *
- * @group migrate_drupal
+ * @group node
  */
 class MigrateNodeRevisionTest extends MigrateNodeTestBase {
 
@@ -30,10 +29,7 @@ class MigrateNodeRevisionTest extends MigrateNodeTestBase {
     );
     $this->prepareMigrations($id_mappings);
 
-    $dumps = array(
-      $this->getDumpDirectory() . '/Users.php',
-    );
-    $this->loadDumps($dumps);
+    $this->loadDumps(['Users.php']);
 
     // Create our users for the node authors.
     $query = Database::getConnection('default', 'migrate')->query('SELECT * FROM {users} WHERE uid NOT IN (0, 1)');
@@ -43,10 +39,7 @@ class MigrateNodeRevisionTest extends MigrateNodeTestBase {
       $user->save();
     }
 
-    /** @var \Drupal\migrate\entity\Migration $migration */
-    $migration = entity_load('migration', 'd6_node_revision');
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->executeMigration('d6_node_revision');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTest.php b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeTest.php
similarity index 96%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTest.php
rename to core/modules/node/src/Tests/Migrate/d6/MigrateNodeTest.php
index 8cb932f86..2b07bfb04 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTest.php
+++ b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateNodeTest.
+ * Contains \Drupal\node\Tests\Migrate\d6\MigrateNodeTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\node\Tests\Migrate\d6;
 
 use Drupal\migrate\MigrateExecutable;
 use Drupal\Core\Database\Database;
@@ -14,7 +14,7 @@ use Drupal\node\Entity\Node;
 /**
  * Node content migration.
  *
- * @group migrate_drupal
+ * @group node
  */
 class MigrateNodeTest extends MigrateNodeTestBase {
 
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTestBase.php b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeTestBase.php
similarity index 75%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTestBase.php
rename to core/modules/node/src/Tests/Migrate/d6/MigrateNodeTestBase.php
index 4ff3ae3d1..f011a9072 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTestBase.php
+++ b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeTestBase.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateNodeTestBase.
+ * Contains \Drupal\node\Tests\Migrate\d6\MigrateNodeTestBase.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\node\Tests\Migrate\d6;
 
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 use Drupal\user\Entity\User;
 
 /**
@@ -95,21 +95,19 @@ abstract class MigrateNodeTestBase extends MigrateDrupal6TestBase {
     $node->enforceIsNew();
     $node->save();
 
-    // Load dumps.
-    $dumps = array(
-      $this->getDumpDirectory() . '/Node.php',
-      $this->getDumpDirectory() . '/NodeRevisions.php',
-      $this->getDumpDirectory() . '/ContentTypeStory.php',
-      $this->getDumpDirectory() . '/ContentTypeTestPlanet.php',
-      $this->getDumpDirectory() . '/NodeType.php',
-      $this->getDumpDirectory() . '/Variable.php',
-      $this->getDumpDirectory() . '/ContentNodeFieldInstance.php',
-      $this->getDumpDirectory() . '/ContentNodeField.php',
-      $this->getDumpDirectory() . '/ContentFieldTest.php',
-      $this->getDumpDirectory() . '/ContentFieldTestTwo.php',
-      $this->getDumpDirectory() . '/ContentFieldMultivalue.php',
-    );
-    $this->loadDumps($dumps);
+    $this->loadDumps([
+      'Node.php',
+      'NodeRevisions.php',
+      'ContentTypeStory.php',
+      'ContentTypeTestPlanet.php',
+      'NodeType.php',
+      'Variable.php',
+      'ContentNodeFieldInstance.php',
+      'ContentNodeField.php',
+      'ContentFieldTest.php',
+      'ContentFieldTestTwo.php',
+      'ContentFieldMultivalue.php',
+    ]);
   }
 
 }
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTypeTest.php b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeTypeTest.php
similarity index 85%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTypeTest.php
rename to core/modules/node/src/Tests/Migrate/d6/MigrateNodeTypeTest.php
index b79b49543..1ef267dd9 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTypeTest.php
+++ b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeTypeTest.php
@@ -2,20 +2,19 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateNodeTypeTest.
+ * Contains \Drupal\node\Tests\Migrate\d6\MigrateNodeTypeTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\node\Tests\Migrate\d6;
 
 use Drupal\field\Entity\FieldConfig;
-use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 use Drupal\node\Entity\NodeType;
 
 /**
  * Upgrade node types to node.type.*.yml.
  *
- * @group migrate_drupal
+ * @group node
  */
 class MigrateNodeTypeTest extends MigrateDrupal6TestBase {
 
@@ -33,15 +32,8 @@ class MigrateNodeTypeTest extends MigrateDrupal6TestBase {
     parent::setUp();
 
     $this->installConfig(array('node'));
-
-    $migration = entity_load('migration', 'd6_node_type');
-    $dumps = array(
-      $this->getDumpDirectory() . '/NodeType.php',
-      $this->getDumpDirectory() . '/Variable.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->loadDumps(['NodeType.php', 'Variable.php']);
+    $this->executeMigration('d6_node_type');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateViewModesTest.php b/core/modules/node/src/Tests/Migrate/d6/MigrateViewModesTest.php
similarity index 57%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateViewModesTest.php
rename to core/modules/node/src/Tests/Migrate/d6/MigrateViewModesTest.php
index 729e2adf8..aa4337f0a 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateViewModesTest.php
+++ b/core/modules/node/src/Tests/Migrate/d6/MigrateViewModesTest.php
@@ -2,19 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateViewModesTest.
+ * Contains \Drupal\node\Tests\Migrate\d6\MigrateViewModesTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\node\Tests\Migrate\d6;
 
 use Drupal\Core\Entity\Entity\EntityViewMode;
-use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Migrate view modes.
  *
- * @group migrate_drupal
+ * @group node
  */
 class MigrateViewModesTest extends MigrateDrupal6TestBase {
 
@@ -30,17 +29,14 @@ class MigrateViewModesTest extends MigrateDrupal6TestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $migration = entity_load('migration', 'd6_view_modes');
-    $dumps = array(
-      $this->getDumpDirectory() . '/ContentNodeFieldInstance.php',
-      $this->getDumpDirectory() . '/ContentNodeField.php',
-      $this->getDumpDirectory() . '/ContentFieldTest.php',
-      $this->getDumpDirectory() . '/ContentFieldTestTwo.php',
-      $this->getDumpDirectory() . '/ContentFieldMultivalue.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->loadDumps([
+      'ContentNodeFieldInstance.php',
+      'ContentNodeField.php',
+      'ContentFieldTest.php',
+      'ContentFieldTestTwo.php',
+      'ContentFieldMultivalue.php',
+    ]);
+    $this->executeMigration('d6_view_modes');
   }
 
   /**
diff --git a/core/modules/node/src/Tests/NodeBlockFunctionalTest.php b/core/modules/node/src/Tests/NodeBlockFunctionalTest.php
index 32bb69224..13a835ad3 100644
--- a/core/modules/node/src/Tests/NodeBlockFunctionalTest.php
+++ b/core/modules/node/src/Tests/NodeBlockFunctionalTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\node\Tests;
 
 use Drupal\block\Entity\Block;
+use Drupal\system\Tests\Cache\AssertPageCacheContextsAndTagsTrait;
 use Drupal\user\RoleInterface;
 
 /**
@@ -17,6 +18,8 @@ use Drupal\user\RoleInterface;
  */
 class NodeBlockFunctionalTest extends NodeTestBase {
 
+  use AssertPageCacheContextsAndTagsTrait;
+
   /**
    * An administrative user for testing.
    *
@@ -122,6 +125,8 @@ class NodeBlockFunctionalTest extends NodeTestBase {
     $this->assertText($node3->label(), 'Node found in block.');
     $this->assertText($node4->label(), 'Node found in block.');
 
+    $this->assertCacheContexts(['languages:language_content', 'languages:language_interface', 'theme', 'user']);
+
     // Enable the "Powered by Drupal" block only on article nodes.
     $edit = [
       'id' => strtolower($this->randomMachineName()),
@@ -145,12 +150,16 @@ class NodeBlockFunctionalTest extends NodeTestBase {
     $this->drupalGet('');
     $label = $block->label();
     $this->assertNoText($label, 'Block was not displayed on the front page.');
+    $this->assertCacheContexts(['languages:language_content', 'languages:language_interface', 'theme', 'user', 'route']);
     $this->drupalGet('node/add/article');
     $this->assertText($label, 'Block was displayed on the node/add/article page.');
+    $this->assertCacheContexts(['languages:language_content', 'languages:language_interface', 'theme', 'user', 'route']);
     $this->drupalGet('node/' . $node1->id());
     $this->assertText($label, 'Block was displayed on the node/N when node is of type article.');
+    $this->assertCacheContexts(['languages:language_content', 'languages:language_interface', 'theme', 'user', 'route', 'timezone']);
     $this->drupalGet('node/' . $node5->id());
     $this->assertNoText($label, 'Block was not displayed on nodes of type page.');
+    $this->assertCacheContexts(['languages:language_content', 'languages:language_interface', 'theme', 'user', 'route', 'timezone']);
 
     $this->drupalLogin($this->adminUser);
     $this->drupalGet('admin/structure/block');
diff --git a/core/modules/node/src/Tests/NodeEntityViewModeAlterTest.php b/core/modules/node/src/Tests/NodeEntityViewModeAlterTest.php
index 2d571ff0e..3fce7c7c0 100644
--- a/core/modules/node/src/Tests/NodeEntityViewModeAlterTest.php
+++ b/core/modules/node/src/Tests/NodeEntityViewModeAlterTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\node\Tests;
 
+use Drupal\Core\Cache\Cache;
+
 /**
  * Tests changing view modes for nodes.
  *
@@ -37,6 +39,7 @@ class NodeEntityViewModeAlterTest extends NodeTestBase {
 
     // Set the flag to alter the view mode and view the node.
     \Drupal::state()->set('node_test_change_view_mode', 'teaser');
+    Cache::invalidateTags(['rendered']);
     $this->drupalGet('node/' . $node->id());
 
     // Check that teaser mode is viewed.
diff --git a/core/modules/node/src/Tests/NodeFormButtonsTest.php b/core/modules/node/src/Tests/NodeFormButtonsTest.php
index 720150445..64ab29a3d 100644
--- a/core/modules/node/src/Tests/NodeFormButtonsTest.php
+++ b/core/modules/node/src/Tests/NodeFormButtonsTest.php
@@ -14,6 +14,8 @@ namespace Drupal\node\Tests;
  */
 class NodeFormButtonsTest extends NodeTestBase {
 
+  use AssertButtonsTrait;
+
   /**
    * A normal logged in user.
    *
@@ -134,42 +136,4 @@ class NodeFormButtonsTest extends NodeTestBase {
     $node_3 = $node_storage->load(3);
     $this->assertFalse($node_3->isPublished(), 'Node is unpublished');
   }
-
-  /**
-   * Assert method to verify the buttons in the dropdown element.
-   *
-   * @param array $buttons
-   *   A collection of buttons to assert for on the page.
-   * @param bool $dropbutton
-   *   Whether to check if the buttons are in a dropbutton widget or not.
-   */
-  public function assertButtons($buttons, $dropbutton = TRUE) {
-
-    // Try to find a Save button.
-    $save_button = $this->xpath('//input[@type="submit"][@value="Save"]');
-
-    // Verify that the number of buttons passed as parameters is
-    // available in the dropbutton widget.
-    if ($dropbutton) {
-      $i = 0;
-      $count = count($buttons);
-
-      // Assert there is no save button.
-      $this->assertTrue(empty($save_button));
-
-      // Dropbutton elements.
-      $elements = $this->xpath('//div[@class="dropbutton-wrapper"]//input[@type="submit"]');
-      $this->assertEqual($count, count($elements));
-      foreach ($elements as $element) {
-        $value = isset($element['value']) ? (string) $element['value'] : '';
-        $this->assertEqual($buttons[$i], $value);
-        $i++;
-      }
-    }
-    else {
-      // Assert there is a save button.
-      $this->assertTrue(!empty($save_button));
-      $this->assertNoRaw('dropbutton-wrapper');
-    }
-  }
 }
diff --git a/core/modules/node/src/Tests/NodeListBuilderTest.php b/core/modules/node/src/Tests/NodeListBuilderTest.php
index 798a0566d..2d23604b6 100644
--- a/core/modules/node/src/Tests/NodeListBuilderTest.php
+++ b/core/modules/node/src/Tests/NodeListBuilderTest.php
@@ -39,7 +39,7 @@ class NodeListBuilderTest extends KernelTestBase {
     $build = $list_builder->render();
     $this->container->get('renderer')->renderRoot($build);
 
-    $this->assertEqual(['languages:' . LanguageInterface::TYPE_INTERFACE, 'theme', 'url.query_args.pagers:0', 'user.node_grants:view'], $build['#cache']['contexts']);
+    $this->assertEqual(['languages:' . LanguageInterface::TYPE_INTERFACE, 'theme', 'url.query_args.pagers:0', 'user.node_grants:view', 'user.permissions'], $build['#cache']['contexts']);
   }
 
 }
diff --git a/core/modules/node/src/Tests/NodeRevisionsUiTest.php b/core/modules/node/src/Tests/NodeRevisionsUiTest.php
index 6527984f8..adc49bfa8 100644
--- a/core/modules/node/src/Tests/NodeRevisionsUiTest.php
+++ b/core/modules/node/src/Tests/NodeRevisionsUiTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\node\Tests;
 
+use Drupal\Core\Url;
+use Drupal\node\Entity\Node;
 use Drupal\node\Entity\NodeType;
 
 /**
@@ -16,27 +18,31 @@ use Drupal\node\Entity\NodeType;
  */
 class NodeRevisionsUiTest extends NodeTestBase {
 
+  /**
+   * @var \Drupal\user\Entity\User
+   */
+  protected $editor;
+
   /**
    * {@inheritdoc}
    */
   protected function setUp() {
     parent::setUp();
 
-    // Create and log in user.
-    $web_user = $this->drupalCreateUser(
-      array(
-        'administer nodes',
-        'edit any page content'
-      )
-    );
-
-    $this->drupalLogin($web_user);
+    // Create users.
+    $this->editor = $this->drupalCreateUser([
+      'administer nodes',
+      'edit any page content',
+      'view page revisions',
+      'access user profiles',
+    ]);
   }
 
   /**
    * Checks that unchecking 'Create new revision' works when editing a node.
    */
   function testNodeFormSaveWithoutRevision() {
+    $this->drupalLogin($this->editor);
     $node_storage = $this->container->get('entity.manager')->getStorage('node');
 
     // Set page revision setting 'create new revision'. This will mean new
@@ -73,6 +79,60 @@ class NodeRevisionsUiTest extends NodeTestBase {
     $node_storage->resetCache(array($node->id()));
     $node_revision = $node_storage->load($node->id());
     $this->assertNotEqual($node_revision->getRevisionId(), $node->getRevisionId(), "After an existing node is saved with 'Create new revision' checked, a new revision is created.");
-
   }
+
+  /**
+   * Checks HTML double escaping of revision logs.
+   */
+  public function testNodeRevisionDoubleEscapeFix() {
+    $this->drupalLogin($this->editor);
+    $nodes = [];
+
+    // Create the node.
+    $node = $this->drupalCreateNode();
+
+    $username = [
+      '#theme' => 'username',
+      '#account' => $this->editor,
+    ];
+    $editor = \Drupal::service('renderer')->renderPlain($username);
+
+    // Get original node.
+    $nodes[] = clone $node;
+
+    // Create revision with a random title and body and update variables.
+    $node->title = $this->randomMachineName();
+    $node->body = [
+      'value' => $this->randomMachineName(32),
+      'format' => filter_default_format(),
+    ];
+    $node->setNewRevision();
+    $revision_log = 'Revision <em>message</em> with markup.';
+    $node->revision_log->value = $revision_log;
+    $node->save();
+    // Make sure we get revision information.
+    $node = Node::load($node->id());
+    $nodes[] = clone $node;
+
+    $this->drupalGet('node/' . $node->id() . '/revisions');
+
+    // Assert the old revision message.
+    $date = format_date($nodes[0]->revision_timestamp->value, 'short');
+    $url = new Url('entity.node.revision', ['node' => $nodes[0]->id(), 'node_revision' => $nodes[0]->getRevisionId()]);
+    $old_revision_message = t('!date by !username', [
+      '!date' => \Drupal::l($date, $url),
+      '!username' => $editor,
+    ]);
+    $this->assertRaw($old_revision_message);
+
+    // Assert the current revision message.
+    $date = format_date($nodes[1]->revision_timestamp->value, 'short');
+    $current_revision_message = t('!date by !username', [
+      '!date' => $nodes[1]->link($date),
+      '!username' => $editor,
+    ]);
+    $current_revision_message .= '<p class="revision-log">' . $revision_log . '</p>';
+    $this->assertRaw($current_revision_message);
+  }
+
 }
diff --git a/core/modules/node/src/Tests/NodeTokenReplaceTest.php b/core/modules/node/src/Tests/NodeTokenReplaceTest.php
index f4f7d268b..9bfbdb44e 100644
--- a/core/modules/node/src/Tests/NodeTokenReplaceTest.php
+++ b/core/modules/node/src/Tests/NodeTokenReplaceTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\node\Tests;
 
+use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\system\Tests\System\TokenReplaceUnitTestBase;
 use Drupal\Component\Utility\SafeMarkup;
 
@@ -76,12 +77,35 @@ class NodeTokenReplaceTest extends TokenReplaceUnitTestBase {
     $tests['[node:created:since]'] = \Drupal::service('date.formatter')->formatTimeDiffSince($node->getCreatedTime(), array('langcode' => $this->interfaceLanguage->getId()));
     $tests['[node:changed:since]'] = \Drupal::service('date.formatter')->formatTimeDiffSince($node->getChangedTime(), array('langcode' => $this->interfaceLanguage->getId()));
 
+    $base_bubbleable_metadata = BubbleableMetadata::createFromObject($node);
+
+    $metadata_tests = [];
+    $metadata_tests['[node:nid]'] = $base_bubbleable_metadata;
+    $metadata_tests['[node:vid]'] = $base_bubbleable_metadata;
+    $metadata_tests['[node:type]'] = $base_bubbleable_metadata;
+    $metadata_tests['[node:type-name]'] = $base_bubbleable_metadata;
+    $metadata_tests['[node:title]'] = $base_bubbleable_metadata;
+    $metadata_tests['[node:body]'] = $base_bubbleable_metadata;
+    $metadata_tests['[node:summary]'] = $base_bubbleable_metadata;
+    $metadata_tests['[node:langcode]'] = $base_bubbleable_metadata;
+    $metadata_tests['[node:url]'] = $base_bubbleable_metadata;
+    $metadata_tests['[node:edit-url]'] = $base_bubbleable_metadata;
+    $bubbleable_metadata = clone $base_bubbleable_metadata;
+    $metadata_tests['[node:author]'] = $bubbleable_metadata->addCacheTags(['user:1']);
+    $metadata_tests['[node:author:uid]'] = $bubbleable_metadata;
+    $metadata_tests['[node:author:name]'] = $bubbleable_metadata;
+    $bubbleable_metadata = clone $base_bubbleable_metadata;
+    $metadata_tests['[node:created:since]'] = $bubbleable_metadata->setCacheMaxAge(0);
+    $metadata_tests['[node:changed:since]'] = $bubbleable_metadata;
+
     // Test to make sure that we generated something for each token.
     $this->assertFalse(in_array(0, array_map('strlen', $tests)), 'No empty tokens generated.');
 
     foreach ($tests as $input => $expected) {
-      $output = $this->tokenService->replace($input, array('node' => $node), array('langcode' => $this->interfaceLanguage->getId()));
+      $bubbleable_metadata = new BubbleableMetadata();
+      $output = $this->tokenService->replace($input, array('node' => $node), array('langcode' => $this->interfaceLanguage->getId()), $bubbleable_metadata);
       $this->assertEqual($output, $expected, format_string('Sanitized node token %token replaced.', array('%token' => $input)));
+      $this->assertEqual($bubbleable_metadata, $metadata_tests[$input]);
     }
 
     // Generate and test unsanitized tokens.
diff --git a/core/modules/node/src/Tests/NodeTranslationUITest.php b/core/modules/node/src/Tests/NodeTranslationUITest.php
index 608ab43e4..c39275015 100644
--- a/core/modules/node/src/Tests/NodeTranslationUITest.php
+++ b/core/modules/node/src/Tests/NodeTranslationUITest.php
@@ -12,6 +12,7 @@ use Drupal\content_translation\Tests\ContentTranslationUITestBase;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\Core\Url;
 use Drupal\node\Entity\Node;
+use Drupal\language\Entity\ConfigurableLanguage;
 
 /**
  * Tests the Node Translation UI.
@@ -20,6 +21,21 @@ use Drupal\node\Entity\Node;
  */
 class NodeTranslationUITest extends ContentTranslationUITestBase {
 
+  /**
+   * {inheritdoc}
+   */
+  protected $defaultCacheContexts = [
+    'languages:language_interface',
+    'theme',
+    'user.permissions',
+    'route.menu_active_trails:account',
+    'route.menu_active_trails:footer',
+    'route.menu_active_trails:main',
+    'route.menu_active_trails:tools',
+    'timezone',
+    'user.roles'
+  ];
+
   /**
    * Modules to enable.
    *
@@ -57,6 +73,42 @@ class NodeTranslationUITest extends ContentTranslationUITestBase {
     $this->doUninstallTest();
   }
 
+  /**
+   * Tests changing the published status on a node without fields.
+   */
+  function testPublishedStatusNoFields() {
+    // Test changing the published status of an article without fields.
+    $this->drupalLogin($this->administrator);
+    // Delete all fields.
+    $this->drupalGet('admin/structure/types/manage/article/fields');
+    $this->drupalPostForm('admin/structure/types/manage/article/fields/node.article.' . $this->fieldName . '/delete', array(), t('Delete'));
+    $this->drupalPostForm('admin/structure/types/manage/article/fields/node.article.field_tags/delete', array(), t('Delete'));
+    $this->drupalPostForm('admin/structure/types/manage/article/fields/node.article.field_image/delete', array(), t('Delete'));
+
+    // Add a node.
+    $default_langcode = $this->langcodes[0];
+    $values[$default_langcode] = array('title' => array(array('value' => $this->randomMachineName())));
+    $entity_id = $this->createEntity($values[$default_langcode], $default_langcode);
+    $entity = entity_load($this->entityTypeId, $entity_id, TRUE);
+
+    // Add a content translation.
+    $langcode = 'fr';
+    $language = ConfigurableLanguage::load($langcode);
+    $values[$langcode] = array('title' => array(array('value' => $this->randomMachineName())));
+
+    $add_url = Url::fromRoute('content_translation.translation_add_' . $entity->getEntityTypeId(), [
+      $entity->getEntityTypeId() => $entity->id(),
+      'source' => $default_langcode,
+      'target' => $langcode
+    ], array('language' => $language));
+    $this->drupalPostForm($add_url, $this->getEditValues($values, $langcode), t('Save and unpublish (this translation)'));
+
+    $entity = entity_load($this->entityTypeId, $this->entityId, TRUE);
+    $translation = $entity->getTranslation($langcode);
+    // Make sure we unpublished the node correctly.
+    $this->assertFalse($this->manager->getTranslationMetadata($translation)->isPublished(), 'The translation has been correctly unpublished.');
+  }
+
   /**
    * Overrides \Drupal\content_translation\Tests\ContentTranslationUITestBase::getTranslatorPermission().
    */
diff --git a/core/modules/node/src/Tests/Views/FrontPageTest.php b/core/modules/node/src/Tests/Views/FrontPageTest.php
index b3ab9c9c6..ba8438f23 100644
--- a/core/modules/node/src/Tests/Views/FrontPageTest.php
+++ b/core/modules/node/src/Tests/Views/FrontPageTest.php
@@ -191,7 +191,7 @@ class FrontPageTest extends ViewTestBase {
    */
   public function testCacheTagsWithCachePluginNone() {
     $this->enablePageCaching();
-    $this->assertFrontPageViewCacheTags(FALSE);
+    $this->doTestFrontPageViewCacheTags(FALSE);
   }
 
   /**
@@ -207,7 +207,7 @@ class FrontPageTest extends ViewTestBase {
     ]);
     $view->save();
 
-    $this->assertFrontPageViewCacheTags(TRUE);
+    $this->doTestFrontPageViewCacheTags(TRUE);
   }
 
   /**
@@ -227,7 +227,7 @@ class FrontPageTest extends ViewTestBase {
     ]);
     $view->save();
 
-    $this->assertFrontPageViewCacheTags(TRUE);
+    $this->doTestFrontPageViewCacheTags(TRUE);
   }
 
   /**
@@ -236,7 +236,7 @@ class FrontPageTest extends ViewTestBase {
    * @param bool $do_assert_views_caches
    *   Whether to check Views' result & output caches.
    */
-  protected function assertFrontPageViewCacheTags($do_assert_views_caches) {
+  protected function doTestFrontPageViewCacheTags($do_assert_views_caches) {
     $view = Views::getView('frontpage');
     $view->setDisplay('page_1');
 
@@ -248,24 +248,33 @@ class FrontPageTest extends ViewTestBase {
       'user.permissions',
       // Default cache contexts of the renderer.
       'theme',
-      'url.query_args.pagers:0',
+      'url.query_args',
+      // Attached feed.
+      'url.site',
     ];
 
+    $cache_context_tags = \Drupal::service('cache_contexts_manager')->convertTokensToKeys($cache_contexts)->getCacheTags();
+
     // Test before there are any nodes.
     $empty_node_listing_cache_tags = [
       'config:views.view.frontpage',
       'node_list',
     ];
+
+    $render_cache_tags = Cache::mergeTags($empty_node_listing_cache_tags, $cache_context_tags);
+    $render_cache_tags = Cache::mergeTags($render_cache_tags, ['config:system.site']);
     $this->assertViewsCacheTags(
       $view,
       $empty_node_listing_cache_tags,
       $do_assert_views_caches,
-      $empty_node_listing_cache_tags
+      $render_cache_tags
     );
+    $expected_tags = Cache::mergeTags($empty_node_listing_cache_tags, $cache_context_tags);
+    $expected_tags = Cache::mergeTags($expected_tags, ['rendered', 'config:user.role.anonymous', 'config:system.site']);
     $this->assertPageCacheContextsAndTags(
       Url::fromRoute('view.frontpage.page_1'),
       $cache_contexts,
-      Cache::mergeTags($empty_node_listing_cache_tags, ['rendered', 'config:user.role.anonymous'])
+      $expected_tags
     );
 
     // Create some nodes on the frontpage view. Add more than 10 nodes in order
@@ -307,12 +316,15 @@ class FrontPageTest extends ViewTestBase {
       'node:14',
       'node:15',
     ];
-    $first_page_output_cache_tags = Cache::mergeTags($first_page_result_cache_tags, [
-      'config:filter.format.plain_text',
-      'node_view',
-      'user_view',
-      'user:0',
-    ]);
+    $cache_context_tags = \Drupal::service('cache_contexts_manager')->convertTokensToKeys($cache_contexts)->getCacheTags();
+    $first_page_output_cache_tags = Cache::mergeTags($first_page_result_cache_tags, $cache_context_tags);
+    $first_page_output_cache_tags = Cache::mergeTags($first_page_output_cache_tags, [
+        'config:filter.format.plain_text',
+        'node_view',
+        'user_view',
+        'user:0',
+      ]
+    );
     $view->setDisplay('page_1');
     $view->setCurrentPage(0);
     $this->assertViewsCacheTags(
diff --git a/core/modules/node/tests/modules/node_test/node_test.module b/core/modules/node/tests/modules/node_test/node_test.module
index ed9af445f..7f2cd5310 100644
--- a/core/modules/node/tests/modules/node_test/node_test.module
+++ b/core/modules/node/tests/modules/node_test/node_test.module
@@ -170,6 +170,7 @@ function node_test_node_insert(NodeInterface $node) {
   // Set the node title to the node ID and save.
   if ($node->getTitle() == 'new') {
     $node->setTitle('Node '. $node->id());
+    $node->setNewRevision(FALSE);
     $node->save();
   }
 }
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeByNodeTypeTest.php b/core/modules/node/tests/src/Unit/Plugin/migrate/source/d6/NodeByNodeTypeTest.php
similarity index 93%
rename from core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeByNodeTypeTest.php
rename to core/modules/node/tests/src/Unit/Plugin/migrate/source/d6/NodeByNodeTypeTest.php
index 2370bd8d5..0f9be3143 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeByNodeTypeTest.php
+++ b/core/modules/node/tests/src/Unit/Plugin/migrate/source/d6/NodeByNodeTypeTest.php
@@ -2,21 +2,21 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\NodeByNodeTypeTest.
+ * Contains \Drupal\Tests\node\Unit\Plugin\migrate\source\d6\NodeByNodeTypeTest.
  */
 
-namespace Drupal\Tests\migrate_drupal\Unit\source\d6;
+namespace Drupal\Tests\node\Unit\Plugin\migrate\source\d6;
 
 use Drupal\Tests\migrate\Unit\MigrateSqlSourceTestCase;
 
 /**
  * Tests D6 node source plugin with 'node_type' configuration.
  *
- * @group migrate_drupal
+ * @group node
  */
 class NodeByNodeTypeTest extends MigrateSqlSourceTestCase {
 
-  const PLUGIN_CLASS = 'Drupal\migrate_drupal\Plugin\migrate\source\d6\Node';
+  const PLUGIN_CLASS = 'Drupal\node\Plugin\migrate\source\d6\Node';
 
   // The fake Migration configuration entity.
   protected $migrationConfiguration = array(
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeRevisionByNodeTypeTest.php b/core/modules/node/tests/src/Unit/Plugin/migrate/source/d6/NodeRevisionByNodeTypeTest.php
similarity index 94%
rename from core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeRevisionByNodeTypeTest.php
rename to core/modules/node/tests/src/Unit/Plugin/migrate/source/d6/NodeRevisionByNodeTypeTest.php
index e4e7acbad..f974954b6 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeRevisionByNodeTypeTest.php
+++ b/core/modules/node/tests/src/Unit/Plugin/migrate/source/d6/NodeRevisionByNodeTypeTest.php
@@ -2,21 +2,21 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\NodeRevisionByNodeTypeTest.
+ * Contains \Drupal\Tests\node\Unit\Plugin\migrate\source\d6\NodeRevisionByNodeTypeTest.
  */
 
-namespace Drupal\Tests\migrate_drupal\Unit\source\d6;
+namespace Drupal\Tests\node\Unit\Plugin\migrate\source\d6;
 
 use Drupal\Tests\migrate\Unit\MigrateSqlSourceTestCase;
 
 /**
  * Tests D6 node revision source plugin.
  *
- * @group migrate_drupal
+ * @group node
  */
 class NodeRevisionByNodeTypeTest extends MigrateSqlSourceTestCase {
 
-  const PLUGIN_CLASS = 'Drupal\migrate_drupal\Plugin\migrate\source\d6\NodeRevision';
+  const PLUGIN_CLASS = 'Drupal\node\Plugin\migrate\source\d6\NodeRevision';
 
   // The fake Migration configuration entity.
   protected $migrationConfiguration = [
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeRevisionTest.php b/core/modules/node/tests/src/Unit/Plugin/migrate/source/d6/NodeRevisionTest.php
similarity index 94%
rename from core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeRevisionTest.php
rename to core/modules/node/tests/src/Unit/Plugin/migrate/source/d6/NodeRevisionTest.php
index 4dde4b1e1..79b9983a8 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeRevisionTest.php
+++ b/core/modules/node/tests/src/Unit/Plugin/migrate/source/d6/NodeRevisionTest.php
@@ -2,21 +2,21 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\NodeRevisionTest.
+ * Contains \Drupal\Tests\node\Unit\Plugin\migrate\source\d6\NodeRevisionTest.
  */
 
-namespace Drupal\Tests\migrate_drupal\Unit\source\d6;
+namespace Drupal\Tests\node\Unit\Plugin\migrate\source\d6;
 
 use Drupal\Tests\migrate\Unit\MigrateSqlSourceTestCase;
 
 /**
  * Tests D6 node revision source plugin.
  *
- * @group migrate_drupal
+ * @group node
  */
 class NodeRevisionTest extends MigrateSqlSourceTestCase {
 
-  const PLUGIN_CLASS = 'Drupal\migrate_drupal\Plugin\migrate\source\d6\NodeRevision';
+  const PLUGIN_CLASS = 'Drupal\node\Plugin\migrate\source\d6\NodeRevision';
 
   // The fake Migration configuration entity.
   protected $migrationConfiguration = [
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeTest.php b/core/modules/node/tests/src/Unit/Plugin/migrate/source/d6/NodeTest.php
similarity index 93%
rename from core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeTest.php
rename to core/modules/node/tests/src/Unit/Plugin/migrate/source/d6/NodeTest.php
index a108f6157..4a5d7afdb 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeTest.php
+++ b/core/modules/node/tests/src/Unit/Plugin/migrate/source/d6/NodeTest.php
@@ -2,21 +2,21 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\NodeTest.
+ * Contains \Drupal\Tests\node\Unit\Plugin\migrate\source\d6\NodeTest.
  */
 
-namespace Drupal\Tests\migrate_drupal\Unit\source\d6;
+namespace Drupal\Tests\node\Unit\Plugin\migrate\source\d6;
 
 use Drupal\Tests\migrate\Unit\MigrateSqlSourceTestCase;
 
 /**
  * Tests D6 node source plugin.
  *
- * @group migrate_drupal
+ * @group node
  */
 class NodeTest extends MigrateSqlSourceTestCase {
 
-  const PLUGIN_CLASS = 'Drupal\migrate_drupal\Plugin\migrate\source\d6\Node';
+  const PLUGIN_CLASS = 'Drupal\node\Plugin\migrate\source\d6\Node';
 
   // The fake Migration configuration entity.
   protected $migrationConfiguration = array(
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeTypeTest.php b/core/modules/node/tests/src/Unit/Plugin/migrate/source/d6/NodeTypeTest.php
similarity index 90%
rename from core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeTypeTest.php
rename to core/modules/node/tests/src/Unit/Plugin/migrate/source/d6/NodeTypeTest.php
index 5d80acad4..8d545f438 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeTypeTest.php
+++ b/core/modules/node/tests/src/Unit/Plugin/migrate/source/d6/NodeTypeTest.php
@@ -2,23 +2,23 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\NodeTypeTest.
+ * Contains \Drupal\Tests\node\Unit\Plugin\migrate\source\d6\NodeTypeTest.
  */
 
-namespace Drupal\Tests\migrate_drupal\Unit\source\d6;
+namespace Drupal\Tests\node\Unit\Plugin\migrate\source\d6;
 
 use Drupal\Tests\migrate\Unit\MigrateSqlSourceTestCase;
 
 /**
  * Tests D6 node type source plugin.
  *
- * @group migrate_drupal
+ * @group node
  */
 class NodeTypeTest extends MigrateSqlSourceTestCase {
 
   // The plugin system is not working during unit testing so the source plugin
   // class needs to be manually specified.
-  const PLUGIN_CLASS = 'Drupal\migrate_drupal\Plugin\migrate\source\d6\NodeType';
+  const PLUGIN_CLASS = 'Drupal\node\Plugin\migrate\source\d6\NodeType';
 
   // The fake Migration configuration entity.
   protected $migrationConfiguration = array(
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/ViewModeTest.php b/core/modules/node/tests/src/Unit/Plugin/migrate/source/d6/ViewModeTest.php
similarity index 86%
rename from core/modules/migrate_drupal/tests/src/Unit/source/d6/ViewModeTest.php
rename to core/modules/node/tests/src/Unit/Plugin/migrate/source/d6/ViewModeTest.php
index 250549fd3..ec97faac1 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/ViewModeTest.php
+++ b/core/modules/node/tests/src/Unit/Plugin/migrate/source/d6/ViewModeTest.php
@@ -2,23 +2,23 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\ViewModeTest.
+ * Contains \Drupal\Tests\node\Unit\Plugin\migrate\source\d6\ViewModeTest.
  */
 
-namespace Drupal\Tests\migrate_drupal\Unit\source\d6;
+namespace Drupal\Tests\node\Unit\Plugin\migrate\source\d6;
 
 use Drupal\Tests\migrate\Unit\MigrateSqlSourceTestCase;
 
 /**
  * Tests D6 view mode source plugin.
  *
- * @group migrate_drupal
+ * @group node
  */
 class ViewModeTest extends MigrateSqlSourceTestCase {
 
   // The plugin system is not working during unit testing so the source plugin
   // class needs to be manually specified.
-  const PLUGIN_CLASS = 'Drupal\migrate_drupal\Plugin\migrate\source\d6\ViewMode';
+  const PLUGIN_CLASS = 'Drupal\node\Plugin\migrate\source\d6\ViewMode';
 
   // The fake Migration configuration entity.
   protected $migrationConfiguration = array(
diff --git a/core/modules/page_cache/page_cache.module b/core/modules/page_cache/page_cache.module
index bce166d7f..f4eb71b77 100644
--- a/core/modules/page_cache/page_cache.module
+++ b/core/modules/page_cache/page_cache.module
@@ -29,18 +29,3 @@ function page_cache_help($route_name, RouteMatchInterface $route_match) {
       return $output;
   }
 }
-
-/**
- * Implements hook_form_alter().
- */
-function page_cache_form_alter(&$form, FormStateInterface $form_state, $form_id) {
-  // If the page that's being built is cacheable, set the 'immutable' flag, to
-  // ensure that when the form is used, a new form build ID is generated when
-  // appropriate, to prevent information disclosure.
-  $request_policy = \Drupal::service('page_cache_request_policy');
-  $request = \Drupal::requestStack()->getCurrentRequest();
-  $request_is_cacheable = $request_policy->check($request) === RequestPolicyInterface::ALLOW;
-  if ($request_is_cacheable) {
-    $form_state->addBuildInfo('immutable', TRUE);
-  }
-}
diff --git a/core/modules/page_cache/src/Tests/PageCacheTagsIntegrationTest.php b/core/modules/page_cache/src/Tests/PageCacheTagsIntegrationTest.php
index d8dec6a99..c471cea96 100644
--- a/core/modules/page_cache/src/Tests/PageCacheTagsIntegrationTest.php
+++ b/core/modules/page_cache/src/Tests/PageCacheTagsIntegrationTest.php
@@ -71,16 +71,19 @@ class PageCacheTagsIntegrationTest extends WebTestBase {
 
     $cache_contexts = [
       'languages:' . LanguageInterface::TYPE_INTERFACE,
-      'route.menu_active_trails:account',
-      'route.menu_active_trails:footer',
-      'route.menu_active_trails:main',
-      'route.menu_active_trails:tools',
+      'route',
       'theme',
       'timezone',
       'user.permissions',
+      // The user login block access depends on whether the current user is
+      // logged in or not.
+      'user.roles:anonymous',
       // The cache contexts associated with the (in)accessible menu links are
       // bubbled.
       'user.roles:authenticated',
+      // The placed block is only visible on certain URLs through a visibility
+      // condition.
+      'url',
     ];
 
     // Full node page 1.
@@ -93,6 +96,9 @@ class PageCacheTagsIntegrationTest extends WebTestBase {
       'config:block.block.bartik_tools',
       'config:block.block.bartik_login',
       'config:block.block.bartik_footer',
+      'config:block.block.bartik_help',
+      'config:block.block.bartik_search',
+      'config:block.block.' . $block->id(),
       'config:block.block.bartik_powered',
       'config:block.block.bartik_main_menu',
       'config:block.block.bartik_account_menu',
@@ -123,6 +129,8 @@ class PageCacheTagsIntegrationTest extends WebTestBase {
       'config:block.block.bartik_content',
       'config:block.block.bartik_tools',
       'config:block.block.bartik_login',
+      'config:block.block.bartik_help',
+      'config:block.block.bartik_search',
       'config:block.block.' . $block->id(),
       'config:block.block.bartik_footer',
       'config:block.block.bartik_powered',
diff --git a/core/modules/page_cache/src/Tests/PageCacheTest.php b/core/modules/page_cache/src/Tests/PageCacheTest.php
index 244cd5b06..e97a1b4f5 100644
--- a/core/modules/page_cache/src/Tests/PageCacheTest.php
+++ b/core/modules/page_cache/src/Tests/PageCacheTest.php
@@ -67,6 +67,7 @@ class PageCacheTest extends WebTestBase {
     $cache_entry = \Drupal::cache('render')->get($cid);
     sort($cache_entry->tags);
     $expected_tags = array(
+      'config:user.role.anonymous',
       'pre_render',
       'rendered',
       'system_test_cache_tags_page',
@@ -384,17 +385,25 @@ class PageCacheTest extends WebTestBase {
     // Install the module that provides the test form.
     $this->container->get('module_installer')
       ->install(['page_cache_form_test']);
+    // Uninstall the page_cache module to verify that form is immutable
+    // regardless of the internal page cache module.
+    $this->container->get('module_installer')->uninstall(['page_cache']);
     \Drupal::service('router.builder')->rebuild();
 
     $this->drupalGet('page_cache_form_test_immutability');
 
     $this->assertText("Immutable: TRUE", "Form is immutable.");
 
-    // Uninstall the page_cache module, verify the flag is not set.
-    $this->container->get('module_installer')->uninstall(['page_cache']);
+    // The immutable flag is set unconditionally by system_form_alter(), set
+    // a flag to tell page_cache_form_test_module_implements_alter() to disable
+    // that implementation.
+    \Drupal::state()->set('page_cache_bypass_form_immutability', TRUE);
+    \Drupal::moduleHandler()->resetImplementations();
+    \Drupal::cache('render')->deleteAll();
 
     $this->drupalGet('page_cache_form_test_immutability');
 
     $this->assertText("Immutable: FALSE", "Form is not immutable,");
   }
+
 }
diff --git a/core/modules/page_cache/tests/modules/page_cache_form_test.module b/core/modules/page_cache/tests/modules/page_cache_form_test.module
index 506cf8a1c..eb76d4d64 100644
--- a/core/modules/page_cache/tests/modules/page_cache_form_test.module
+++ b/core/modules/page_cache/tests/modules/page_cache_form_test.module
@@ -11,10 +11,30 @@ use Drupal\Core\Form\FormStateInterface;
 * Implements hook_form_FORM_ID_alter().
 */
 function page_cache_form_test_form_page_cache_form_test_alter(&$form, FormStateInterface $form_state, $form_id) {
+  // This runs earlier than system_form_alter() so we fore-go the immutability
+  // check to the process callback, by which time system_form_alter() has run.
+  $form['#process'][] = 'page_cache_form_test_form_page_cache_form_test_process';
+}
+
+/**
+ * Process callback to check immutability.
+ */
+function page_cache_form_test_form_page_cache_form_test_process($form, FormStateInterface $form_state) {
   if (isset($form_state->getBuildInfo()['immutable']) && $form_state->getBuildInfo()['immutable']) {
     $form['#suffix'] = 'Immutable: TRUE';
   }
   else {
     $form['#suffix'] = 'Immutable: FALSE';
   }
+  return $form;
+}
+
+/**
+ * Implements hook_module_implements_alter().
+ */
+function page_cache_form_test_module_implements_alter(&$implementations, $hook) {
+  if ($hook === 'form_alter' && \Drupal::state()->get('page_cache_bypass_form_immutability', FALSE)) {
+    // Disable system_form_alter
+    unset($implementations['system']);
+  }
 }
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_url_alias.yml b/core/modules/path/migration_templates/d6_url_alias.yml
similarity index 88%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_url_alias.yml
rename to core/modules/path/migration_templates/d6_url_alias.yml
index 454ded854..7fcbaec03 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_url_alias.yml
+++ b/core/modules/path/migration_templates/d6_url_alias.yml
@@ -19,9 +19,5 @@ process:
       - constants/slash
       - dst
   langcode: language
-
 destination:
   plugin: url_alias
-dependencies:
-  module:
-    - migrate_drupal
diff --git a/core/modules/path/src/Plugin/Field/FieldType/PathItem.php b/core/modules/path/src/Plugin/Field/FieldType/PathItem.php
index 61f5c5f17..9815e6839 100644
--- a/core/modules/path/src/Plugin/Field/FieldType/PathItem.php
+++ b/core/modules/path/src/Plugin/Field/FieldType/PathItem.php
@@ -55,28 +55,25 @@ class PathItem extends FieldItemBase {
   /**
    * {@inheritdoc}
    */
-  public function insert() {
-    if ($this->alias) {
-      $entity = $this->getEntity();
-
-      if ($path = \Drupal::service('path.alias_storage')->save('/' . $entity->urlInfo()->getInternalPath(), $this->alias, $this->getLangcode())) {
-        $this->pid = $path['pid'];
+  public function postSave($update) {
+    if (!$update) {
+      if ($this->alias) {
+        $entity = $this->getEntity();
+        if ($path = \Drupal::service('path.alias_storage')->save('/' . $entity->urlInfo()->getInternalPath(), $this->alias, $this->getLangcode())) {
+          $this->pid = $path['pid'];
+        }
       }
     }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function update() {
-    // Delete old alias if user erased it.
-    if ($this->pid && !$this->alias) {
-      \Drupal::service('path.alias_storage')->delete(array('pid' => $this->pid));
-    }
-    // Only save a non-empty alias.
-    elseif ($this->alias) {
-      $entity = $this->getEntity();
-      \Drupal::service('path.alias_storage')->save('/' . $entity->urlInfo()->getInternalPath(), $this->alias, $this->getLangcode(), $this->pid);
+    else {
+      // Delete old alias if user erased it.
+      if ($this->pid && !$this->alias) {
+        \Drupal::service('path.alias_storage')->delete(array('pid' => $this->pid));
+      }
+      // Only save a non-empty alias.
+      elseif ($this->alias) {
+        $entity = $this->getEntity();
+        \Drupal::service('path.alias_storage')->save('/' . $entity->urlInfo()->getInternalPath(), $this->alias, $this->getLangcode(), $this->pid);
+      }
     }
   }
 
diff --git a/core/modules/migrate/src/Plugin/migrate/destination/UrlAlias.php b/core/modules/path/src/Plugin/migrate/destination/UrlAlias.php
similarity index 93%
rename from core/modules/migrate/src/Plugin/migrate/destination/UrlAlias.php
rename to core/modules/path/src/Plugin/migrate/destination/UrlAlias.php
index 63121984e..20b2c315b 100644
--- a/core/modules/migrate/src/Plugin/migrate/destination/UrlAlias.php
+++ b/core/modules/path/src/Plugin/migrate/destination/UrlAlias.php
@@ -2,14 +2,15 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\destination\UrlAlias.
+ * Contains \Drupal\path\Plugin\migrate\destination\UrlAlias.
  */
 
-namespace Drupal\migrate\Plugin\migrate\destination;
+namespace Drupal\path\Plugin\migrate\destination;
 
 use Drupal\Core\Path\AliasStorage;
 use Drupal\migrate\Entity\MigrationInterface;
 use Drupal\migrate\Row;
+use Drupal\migrate\Plugin\migrate\destination\DestinationBase;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/UrlAlias.php b/core/modules/path/src/Plugin/migrate/source/d6/UrlAlias.php
similarity index 87%
rename from core/modules/migrate_drupal/src/Plugin/migrate/source/d6/UrlAlias.php
rename to core/modules/path/src/Plugin/migrate/source/d6/UrlAlias.php
index d9b08da71..5286a6392 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/UrlAlias.php
+++ b/core/modules/path/src/Plugin/migrate/source/d6/UrlAlias.php
@@ -2,10 +2,11 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\UrlAlias.
+ * Contains \Drupal\path\Plugin\migrate\source\d6\UrlAlias.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+namespace Drupal\path\Plugin\migrate\source\d6;
+
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 
 /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUrlAliasTest.php b/core/modules/path/src/Tests/Migrate/d6/MigrateUrlAliasTest.php
similarity index 83%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateUrlAliasTest.php
rename to core/modules/path/src/Tests/Migrate/d6/MigrateUrlAliasTest.php
index 572861d91..200019c9d 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateUrlAliasTest.php
+++ b/core/modules/path/src/Tests/Migrate/d6/MigrateUrlAliasTest.php
@@ -2,23 +2,30 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateUrlAliasTest.
+ * Contains \Drupal\path\Tests\Migrate\d6\MigrateUrlAliasTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\path\Tests\Migrate\d6;
 
 use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate\Plugin\MigrateIdMapInterface;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 use Drupal\Core\Database\Database;
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Url alias migration.
  *
- * @group migrate_drupal
+ * @group path
  */
 class MigrateUrlAliasTest extends MigrateDrupal6TestBase {
 
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('path');
+
   /**
    * {@inheritdoc}
    */
@@ -26,14 +33,8 @@ class MigrateUrlAliasTest extends MigrateDrupal6TestBase {
     parent::setUp();
 
     $this->installSchema('system', ['url_alias']);
-
-    $migration = entity_load('migration', 'd6_url_alias');
-    $dumps = array(
-      $this->getDumpDirectory() . '/UrlAlias.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->loadDumps(['UrlAlias.php']);
+    $this->executeMigration('d6_url_alias');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/UrlAliasTest.php b/core/modules/path/tests/src/Unit/Migrate/d6/UrlAliasTest.php
similarity index 79%
rename from core/modules/migrate_drupal/tests/src/Unit/source/d6/UrlAliasTest.php
rename to core/modules/path/tests/src/Unit/Migrate/d6/UrlAliasTest.php
index 780ed0b98..79321ad6c 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/UrlAliasTest.php
+++ b/core/modules/path/tests/src/Unit/Migrate/d6/UrlAliasTest.php
@@ -2,21 +2,21 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\UrlAliasTest.
+ * Contains \Drupal\Tests\path\Unit\Migrate\d6\UrlAliasTest.
  */
 
-namespace Drupal\Tests\migrate_drupal\Unit\source\d6;
+namespace Drupal\Tests\path\Unit\Migrate\d6;
 
 use Drupal\Tests\migrate\Unit\MigrateSqlSourceTestCase;
 
 /**
  * Tests the D6 url alias migrations.
  *
- * @group migrate_drupal
+ * @group path
  */
 class UrlAliasTest extends MigrateSqlSourceTestCase {
 
-  const PLUGIN_CLASS = 'Drupal\migrate_drupal\Plugin\migrate\source\d6\UrlAlias';
+  const PLUGIN_CLASS = 'Drupal\path\Plugin\migrate\source\d6\UrlAlias';
 
   protected $migrationConfiguration = array(
     'id' => 'test',
diff --git a/core/modules/quickedit/js/views/AppView.js b/core/modules/quickedit/js/views/AppView.js
index 67b4764bd..cd3212f34 100644
--- a/core/modules/quickedit/js/views/AppView.js
+++ b/core/modules/quickedit/js/views/AppView.js
@@ -42,11 +42,9 @@
       this.changedFieldStates = ['changed', 'saving', 'saved', 'invalid'];
       this.readyFieldStates = ['candidate', 'highlighted'];
 
-      this.listenTo(options.entitiesCollection, {
-        // Track app state.
-        'change:state': this.appStateChange,
-        'change:isActive': this.enforceSingleActiveEntity
-      });
+      // Track app state.
+      this.listenTo(options.entitiesCollection, 'change:state', this.appStateChange);
+      this.listenTo(options.entitiesCollection, 'change:isActive', this.enforceSingleActiveEntity);
 
       // Track app state.
       this.listenTo(options.fieldsCollection, 'change:state', this.editorStateChange);
diff --git a/core/modules/quickedit/src/QuickEditController.php b/core/modules/quickedit/src/QuickEditController.php
index 383f61b81..067a73a7c 100644
--- a/core/modules/quickedit/src/QuickEditController.php
+++ b/core/modules/quickedit/src/QuickEditController.php
@@ -216,7 +216,7 @@ class QuickEditController extends ControllerBase {
       $response->addCommand(new FieldFormSavedCommand($output, $other_view_modes));
     }
     else {
-      $output = $this->renderer->renderRoot($form);
+      $output = (string) $this->renderer->renderRoot($form);
       // When working with a hidden form, we don't want its CSS/JS to be loaded.
       if ($request->request->get('nocssjs') !== 'true') {
         $response->setAttachments($form['#attached']);
@@ -228,7 +228,7 @@ class QuickEditController extends ControllerBase {
         $status_messages = array(
           '#type' => 'status_messages'
         );
-        $response->addCommand(new FieldFormValidationErrorsCommand($this->renderer->renderRoot($status_messages)));
+        $response->addCommand(new FieldFormValidationErrorsCommand((string) $this->renderer->renderRoot($status_messages)));
       }
     }
 
@@ -275,7 +275,7 @@ class QuickEditController extends ControllerBase {
       $output = $this->moduleHandler()->invoke($module, 'quickedit_render_field', $args);
     }
 
-    return $this->renderer->renderRoot($output);
+    return (string) $this->renderer->renderRoot($output);
   }
 
   /**
diff --git a/core/modules/rdf/src/Tests/FileFieldAttributesTest.php b/core/modules/rdf/src/Tests/FileFieldAttributesTest.php
index ead4c2b1b..4883d913b 100644
--- a/core/modules/rdf/src/Tests/FileFieldAttributesTest.php
+++ b/core/modules/rdf/src/Tests/FileFieldAttributesTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\rdf\Tests;
 
 use Drupal\file\Tests\FileFieldTestBase;
+use Drupal\file\Entity\File;
 
 /**
  * Tests the RDFa markup of filefields.
@@ -68,8 +69,7 @@ class FileFieldAttributesTest extends FileFieldTestBase {
 
     $node_storage->resetCache(array($nid));
     $this->node = $node_storage->load($nid);
-    $this->file = file_load($this->node->{$this->fieldName}->target_id);
-
+    $this->file = File::load($this->node->{$this->fieldName}->target_id);
   }
 
   /**
diff --git a/core/modules/rdf/src/Tests/ImageFieldAttributesTest.php b/core/modules/rdf/src/Tests/ImageFieldAttributesTest.php
index c5b482add..a36a0a8c1 100644
--- a/core/modules/rdf/src/Tests/ImageFieldAttributesTest.php
+++ b/core/modules/rdf/src/Tests/ImageFieldAttributesTest.php
@@ -10,6 +10,7 @@ namespace Drupal\rdf\Tests;
 use Drupal\image\Entity\ImageStyle;
 use Drupal\image\Tests\ImageFieldTestBase;
 use Drupal\node\Entity\Node;
+use Drupal\file\Entity\File;
 
 /**
  * Tests the RDFa markup of imagefields.
@@ -69,7 +70,7 @@ class ImageFieldAttributesTest extends ImageFieldTestBase {
     // Save a node with the image.
     $nid = $this->uploadNodeImage($image, $this->fieldName, 'article', $this->randomMachineName());
     $this->node = Node::load($nid);
-    $this->file = file_load($this->node->{$this->fieldName}->target_id);
+    $this->file = File::load($this->node->{$this->fieldName}->target_id);
   }
 
   /**
diff --git a/core/modules/responsive_image/responsive_image.links.menu.yml b/core/modules/responsive_image/responsive_image.links.menu.yml
index e361e2570..4e7ffa46e 100644
--- a/core/modules/responsive_image/responsive_image.links.menu.yml
+++ b/core/modules/responsive_image/responsive_image.links.menu.yml
@@ -1,6 +1,6 @@
 entity.responsive_image_style.collection:
   title: 'Responsive image styles'
-  description: 'Manage responsive image styles'
+  description: 'Manage responsive image styles.'
   weight: 10
   route_name: entity.responsive_image_style.collection
   parent: system.admin_config_media
diff --git a/core/modules/responsive_image/responsive_image.module b/core/modules/responsive_image/responsive_image.module
index 925fe3c7e..86b0a128d 100644
--- a/core/modules/responsive_image/responsive_image.module
+++ b/core/modules/responsive_image/responsive_image.module
@@ -5,7 +5,6 @@
  * Responsive image display formatter for image fields.
  */
 
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Routing\RouteMatchInterface;
 use \Drupal\Core\Template\Attribute;
@@ -43,30 +42,6 @@ function responsive_image_help($route_name, RouteMatchInterface $route_match) {
   }
 }
 
-/**
- * Implements hook_menu().
- */
-function responsive_image_menu() {
-  $items = array();
-
-  $items['admin/config/media/responsive-image-style'] = array(
-    'title' => 'Responsive image styles',
-    'description' => 'Manage responsive image styles',
-    'weight' => 10,
-    'route_name' => 'entity.responsive_image_style.collection',
-  );
-  $items['admin/config/media/responsive-image-style/%responsive_image_style'] = array(
-    'title' => 'Edit responsive image style',
-    'route_name' => 'entity.responsive_image_style.edit_form',
-  );
-  $items['admin/config/media/responsive-image-style/%responsive_image_style/duplicate'] = array(
-    'title' => 'Duplicate responsive image style',
-    'route_name' => 'entity.responsive_image_style.duplicate_form',
-  );
-
-  return $items;
-}
-
 /**
  * Implements hook_theme().
  */
@@ -157,8 +132,13 @@ function template_preprocess_responsive_image(&$variables) {
 
   $image = \Drupal::service('image.factory')->get($variables['uri']);
   $responsive_image_style = ResponsiveImageStyle::load($variables['responsive_image_style_id']);
-  // All breakpoints and multipliers.
-  $breakpoints = \Drupal::service('breakpoint.manager')->getBreakpointsByGroup($responsive_image_style->getBreakpointGroup());
+  // Retrieve all breakpoints and multipliers and reverse order of breakpoints.
+  // By default, breakpoints are ordered from smallest weight to largest:
+  // the smallest weight is expected to have the smallest breakpoint width,
+  // while the largest weight is expected to have the largest breakpoint
+  // width. For responsive images, we need largest breakpoint widths first, so
+  // we need to reverse the order of these breakpoints.
+  $breakpoints = array_reverse(\Drupal::service('breakpoint.manager')->getBreakpointsByGroup($responsive_image_style->getBreakpointGroup()));
   foreach ($responsive_image_style->getKeyedImageStyleMappings() as $breakpoint_id => $multipliers) {
     if (isset($breakpoints[$breakpoint_id])) {
       $variables['sources'][] = responsive_image_build_source_attributes($image, $variables, $breakpoints[$breakpoint_id], $multipliers);
@@ -352,7 +332,7 @@ function responsive_image_build_source_attributes(ImageInterface $image, array $
           // this breakpoint should be merged into one srcset and the sizes
           // attribute should be merged as well.
           if (is_null($dimensions['width'])) {
-            throw new \LogicException(SafeMarkup::format('Could not determine image width for @file using image style with ID: @image_style_name. This image style can not be used for a responsive image style mapping using the \'sizes\' attribute.', array('@file' => $image->getSource(), '@image_style_name' => $image_style_name)));
+            throw new \LogicException("Could not determine image width for '{$image->getSource()}' using image style with ID: $image_style_name. This image style can not be used for a responsive image style mapping using the 'sizes' attribute.");
           }
           // Use the image width as key so we can sort the array later on.
           // Images within a srcset should be sorted from small to large, since
diff --git a/core/modules/responsive_image/src/ResponsiveImageStyleForm.php b/core/modules/responsive_image/src/ResponsiveImageStyleForm.php
index a22742ae7..d7df1341e 100644
--- a/core/modules/responsive_image/src/ResponsiveImageStyleForm.php
+++ b/core/modules/responsive_image/src/ResponsiveImageStyleForm.php
@@ -109,7 +109,12 @@ class ResponsiveImageStyleForm extends EntityForm {
       '#required' => TRUE,
     );
 
-    $breakpoints = $this->breakpointManager->getBreakpointsByGroup($responsive_image_style->getBreakpointGroup());
+    // By default, breakpoints are ordered from smallest weight to largest:
+    // the smallest weight is expected to have the smallest breakpoint width,
+    // while the largest weight is expected to have the largest breakpoint
+    // width. For responsive images, we need largest breakpoint widths first, so
+    // we need to reverse the order of these breakpoints.
+    $breakpoints = array_reverse($this->breakpointManager->getBreakpointsByGroup($responsive_image_style->getBreakpointGroup()));
     foreach ($breakpoints as $breakpoint_id => $breakpoint) {
       foreach ($breakpoint->getMultipliers() as $multiplier) {
         $label = $multiplier . ' ' . $breakpoint->getLabel() . ' [' . $breakpoint->getMediaQuery() . ']';
@@ -142,7 +147,8 @@ class ResponsiveImageStyleForm extends EntityForm {
   /**
    * {@inheritdoc}
    */
-  public function validate(array $form, FormStateInterface $form_state) {
+  public function validateForm(array &$form, FormStateInterface $form_state) {
+    parent::validateForm($form, $form_state);
     // Only validate on edit.
     if ($form_state->hasValue('keyed_styles')) {
       // Check if another breakpoint group is selected.
diff --git a/core/modules/rest/src/Annotation/RestResource.php b/core/modules/rest/src/Annotation/RestResource.php
index e63f07dd3..28293b623 100644
--- a/core/modules/rest/src/Annotation/RestResource.php
+++ b/core/modules/rest/src/Annotation/RestResource.php
@@ -14,7 +14,7 @@ use \Drupal\Component\Annotation\Plugin;
  *
  * Plugin Namespace: Plugin\rest\resource
  *
- * For a working example, see \Drupal\rest\Plugin\rest\resource\DBLogResource
+ * For a working example, see \Drupal\dblog\Plugin\rest\resource\DBLogResource
  *
  * @see \Drupal\rest\Plugin\Type\ResourcePluginManager
  * @see \Drupal\rest\Plugin\ResourceBase
diff --git a/core/modules/rest/src/Plugin/Deriver/EntityDeriver.php b/core/modules/rest/src/Plugin/Deriver/EntityDeriver.php
index 2cfca7166..b3d408805 100644
--- a/core/modules/rest/src/Plugin/Deriver/EntityDeriver.php
+++ b/core/modules/rest/src/Plugin/Deriver/EntityDeriver.php
@@ -9,10 +9,7 @@ namespace Drupal\rest\Plugin\Deriver;
 
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
-use Drupal\Core\Routing\RouteBuilderInterface;
-use Drupal\Core\Routing\RouteProviderInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\Routing\Exception\RouteNotFoundException;
 
 /**
  * Provides a resource plugin definition for every entity type.
diff --git a/core/modules/rest/src/Plugin/rest/resource/EntityResource.php b/core/modules/rest/src/Plugin/rest/resource/EntityResource.php
index 86310863b..464fe08c0 100644
--- a/core/modules/rest/src/Plugin/rest/resource/EntityResource.php
+++ b/core/modules/rest/src/Plugin/rest/resource/EntityResource.php
@@ -11,7 +11,6 @@ use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityStorageException;
 use Drupal\rest\Plugin\ResourceBase;
 use Drupal\rest\ResourceResponse;
-use Drupal\Component\Utility\SafeMarkup;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\HttpKernel\Exception\HttpException;
@@ -98,7 +97,7 @@ class EntityResource extends ResourceBase {
     // and 'update', so the 'edit' operation is used here.
     foreach ($entity->_restSubmittedFields as $key => $field_name) {
       if (!$entity->get($field_name)->access('edit')) {
-        throw new AccessDeniedHttpException(SafeMarkup::format('Access denied on creating field @field', array('@field' => $field_name)));
+        throw new AccessDeniedHttpException("Access denied on creating field '$field_name'");
       }
     }
 
@@ -109,7 +108,10 @@ class EntityResource extends ResourceBase {
       $this->logger->notice('Created entity %type with ID %id.', array('%type' => $entity->getEntityTypeId(), '%id' => $entity->id()));
 
       // 201 Created responses have an empty body.
-      return new ResourceResponse(NULL, 201, array('Location' => $entity->url('canonical', ['absolute' => TRUE])));
+      $url = $entity->urlInfo('canonical', ['absolute' => TRUE])->toString(TRUE);
+      $response = new ResourceResponse(NULL, 201, ['Location' => $url->getGeneratedUrl()]);
+      $response->addCacheableDependency($url);
+      return $response;
     }
     catch (EntityStorageException $e) {
       throw new HttpException(500, 'Internal Server Error', $e);
@@ -152,7 +154,7 @@ class EntityResource extends ResourceBase {
       }
 
       if (!$original_entity->get($field_name)->access('edit')) {
-        throw new AccessDeniedHttpException(SafeMarkup::format('Access denied on updating field @field.', array('@field' => $field_name)));
+        throw new AccessDeniedHttpException("Access denied on updating field '$field_name'.");
       }
       $original_entity->set($field_name, $field->getValue());
     }
diff --git a/core/modules/rest/src/Plugin/views/display/RestExport.php b/core/modules/rest/src/Plugin/views/display/RestExport.php
index 247b60c35..ae5ac7e0f 100644
--- a/core/modules/rest/src/Plugin/views/display/RestExport.php
+++ b/core/modules/rest/src/Plugin/views/display/RestExport.php
@@ -10,9 +10,14 @@ namespace Drupal\rest\Plugin\views\display;
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Cache\CacheableResponse;
+use Drupal\Core\Render\RenderContext;
+use Drupal\Core\Render\RendererInterface;
+use Drupal\Core\Routing\RouteProviderInterface;
+use Drupal\Core\State\StateInterface;
 use Drupal\views\Plugin\views\display\ResponseDisplayPluginInterface;
 use Drupal\views\ViewExecutable;
 use Drupal\views\Plugin\views\display\PathPluginBase;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\Routing\RouteCollection;
 
 /**
@@ -70,6 +75,48 @@ class RestExport extends PathPluginBase implements ResponseDisplayPluginInterfac
    */
   protected $mimeType;
 
+  /**
+   * The renderer.
+   *
+   * @var \Drupal\Core\Render\RendererInterface
+   */
+  protected $renderer;
+
+  /**
+   * Constructs a RestExport object.
+   *
+   * @param array $configuration
+   *   A configuration array containing information about the plugin instance.
+   * @param string $plugin_id
+   *   The plugin_id for the plugin instance.
+   * @param mixed $plugin_definition
+   *   The plugin implementation definition.
+   * @param \Drupal\Core\Routing\RouteProviderInterface $route_provider
+   *   The route provider.
+   * @param \Drupal\Core\State\StateInterface $state
+   *   The state key value store.
+   * @param \Drupal\Core\Render\RendererInterface $renderer
+   *   The renderer.
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, RouteProviderInterface $route_provider, StateInterface $state, RendererInterface $renderer) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition, $route_provider, $state);
+
+    $this->renderer = $renderer;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $container->get('router.route_provider'),
+      $container->get('state'),
+      $container->get('renderer')
+    );
+  }
   /**
    * {@inheritdoc}
    */
@@ -263,7 +310,9 @@ class RestExport extends PathPluginBase implements ResponseDisplayPluginInterfac
    */
   public function render() {
     $build = array();
-    $build['#markup'] = $this->view->style_plugin->render();
+    $build['#markup'] = $this->renderer->executeInRenderContext(new RenderContext(), function() {
+      return $this->view->style_plugin->render();
+    });
 
     $this->view->element['#content_type'] = $this->getMimeType();
     $this->view->element['#cache_properties'][] = '#content_type';
diff --git a/core/modules/rest/src/RequestHandler.php b/core/modules/rest/src/RequestHandler.php
index b558b217d..ee4b890aa 100644
--- a/core/modules/rest/src/RequestHandler.php
+++ b/core/modules/rest/src/RequestHandler.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\rest;
 
+use Drupal\Core\Render\RenderContext;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareTrait;
@@ -103,10 +104,23 @@ class RequestHandler implements ContainerAwareInterface {
     }
 
     // Serialize the outgoing data for the response, if available.
-    $data = $response->getResponseData();
-    if ($data != NULL) {
-      $output = $serializer->serialize($data, $format);
+    if ($response instanceof ResourceResponse && $data = $response->getResponseData()) {
+      // Serialization can invoke rendering (e.g., generating URLs), but the
+      // serialization API does not provide a mechanism to collect the
+      // bubbleable metadata associated with that (e.g., language and other
+      // contexts), so instead, allow those to "leak" and collect them here in
+      // a render context.
+      // @todo Add test coverage for language negotiation contexts in
+      //   https://www.drupal.org/node/2135829.
+      $context = new RenderContext();
+      $output = $this->container->get('renderer')->executeInRenderContext($context, function() use ($serializer, $data, $format) {
+        return $serializer->serialize($data, $format);
+      });
       $response->setContent($output);
+      if (!$context->isEmpty()) {
+        $response->addCacheableDependency($context->pop());
+      }
+
       $response->headers->set('Content-Type', $request->getMimeType($format));
       // Add rest settings config's cache tags.
       $response->addCacheableDependency($this->container->get('config.factory')->get('rest.settings'));
diff --git a/core/modules/rest/src/Tests/Views/StyleSerializerTest.php b/core/modules/rest/src/Tests/Views/StyleSerializerTest.php
index 1eca0d2e8..a0f482adc 100644
--- a/core/modules/rest/src/Tests/Views/StyleSerializerTest.php
+++ b/core/modules/rest/src/Tests/Views/StyleSerializerTest.php
@@ -108,7 +108,7 @@ class StyleSerializerTest extends PluginTestBase {
     // Mock the request content type by setting it on the display handler.
     $view->display_handler->setContentType('json');
     $output = $view->preview();
-    $this->assertIdentical($actual_json, drupal_render_root($output), 'The expected JSON preview output was found.');
+    $this->assertIdentical($actual_json, (string) drupal_render_root($output), 'The expected JSON preview output was found.');
 
     // Test a 403 callback.
     $this->drupalGet('test/serialize/denied');
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_search_page.yml b/core/modules/search/migration_templates/d6_search_page.yml
similarity index 90%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_search_page.yml
rename to core/modules/search/migration_templates/d6_search_page.yml
index 6c05d1f1e..d12aca676 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_search_page.yml
+++ b/core/modules/search/migration_templates/d6_search_page.yml
@@ -23,7 +23,3 @@ process:
     plugin: d6_search_configuration_rankings
 destination:
   plugin: entity:search_page
-dependencies:
-  module:
-    - migrate_drupal
-    - search
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_search_settings.yml b/core/modules/search/migration_templates/d6_search_settings.yml
similarity index 89%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_search_settings.yml
rename to core/modules/search/migration_templates/d6_search_settings.yml
index 8e832e4ef..36f5447c8 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_search_settings.yml
+++ b/core/modules/search/migration_templates/d6_search_settings.yml
@@ -20,7 +20,3 @@ process:
 destination:
   plugin: config
   config_name: search.settings
-dependencies:
-  module:
-    - migrate_drupal
-    - search
diff --git a/core/modules/search/search.libraries.yml b/core/modules/search/search.libraries.yml
deleted file mode 100644
index 4c04600d8..000000000
--- a/core/modules/search/search.libraries.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-drupal.search.results:
-  version: VERSION
-  css:
-    theme:
-      css/search.theme.css: {}
-
-admin:
-  css:
-    theme:
-      css/search.admin.css: {}
diff --git a/core/modules/search/search.module b/core/modules/search/search.module
index b4c41266f..25d52b53f 100644
--- a/core/modules/search/search.module
+++ b/core/modules/search/search.module
@@ -8,7 +8,6 @@
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\Unicode;
-use Drupal\Component\Utility\Xss;
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Routing\RouteMatchInterface;
@@ -768,7 +767,7 @@ function search_excerpt($keys, $text, $langcode = NULL) {
   // Highlight keywords. Must be done at once to prevent conflicts ('strong'
   // and '<strong>').
   $text = trim(preg_replace('/' . $boundary . '(?:' . implode('|', $keys) . ')' . $boundary . '/iu', '<strong>\0</strong>', ' ' . $text . ' '));
-  return Xss::filter($text, ['strong']);
+  return SafeMarkup::xssFilter($text, ['strong']);
 }
 
 /**
diff --git a/core/modules/search/src/Controller/SearchController.php b/core/modules/search/src/Controller/SearchController.php
index 08983c22d..e77553185 100644
--- a/core/modules/search/src/Controller/SearchController.php
+++ b/core/modules/search/src/Controller/SearchController.php
@@ -137,8 +137,6 @@ class SearchController extends ControllerBase {
       '#type' => 'pager',
     );
 
-    $build['#attached']['library'][] = 'search/drupal.search.results';
-
     return $build;
   }
 
diff --git a/core/modules/search/src/Form/SearchPageFormBase.php b/core/modules/search/src/Form/SearchPageFormBase.php
index 95afb4ba9..c8c764100 100644
--- a/core/modules/search/src/Form/SearchPageFormBase.php
+++ b/core/modules/search/src/Form/SearchPageFormBase.php
@@ -112,6 +112,7 @@ abstract class SearchPageFormBase extends EntityForm {
       '#field_prefix' => 'search/',
       '#default_value' => $this->entity->getPath(),
       '#maxlength' => '255',
+      '#required' => TRUE,
     );
     $form['plugin'] = array(
       '#type' => 'value',
@@ -144,8 +145,8 @@ abstract class SearchPageFormBase extends EntityForm {
   /**
    * {@inheritdoc}
    */
-  public function validate(array $form, FormStateInterface $form_state) {
-    parent::validate($form, $form_state);
+  public function validateForm(array &$form, FormStateInterface $form_state) {
+    parent::validateForm($form, $form_state);
 
     // Ensure each path is unique.
     $path = $this->entityQuery->get('search_page')
diff --git a/core/modules/migrate/src/Plugin/migrate/destination/EntitySearchPage.php b/core/modules/search/src/Plugin/migrate/destination/EntitySearchPage.php
similarity index 78%
rename from core/modules/migrate/src/Plugin/migrate/destination/EntitySearchPage.php
rename to core/modules/search/src/Plugin/migrate/destination/EntitySearchPage.php
index 0e623ef88..517fe6386 100644
--- a/core/modules/migrate/src/Plugin/migrate/destination/EntitySearchPage.php
+++ b/core/modules/search/src/Plugin/migrate/destination/EntitySearchPage.php
@@ -2,12 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\destination\EntitySearchPage.
+ * Contains \Drupal\search\Plugin\migrate\destination\EntitySearchPage.
  */
 
-namespace Drupal\migrate\Plugin\migrate\destination;
+namespace Drupal\search\Plugin\migrate\destination;
 
 use Drupal\Core\Entity\EntityInterface;
+use Drupal\migrate\Plugin\migrate\destination\EntityConfigBase;
 use Drupal\migrate\Row;
 
 /**
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/SearchConfigurationRankings.php b/core/modules/search/src/Plugin/migrate/process/d6/SearchConfigurationRankings.php
similarity index 83%
rename from core/modules/migrate_drupal/src/Plugin/migrate/process/d6/SearchConfigurationRankings.php
rename to core/modules/search/src/Plugin/migrate/process/d6/SearchConfigurationRankings.php
index a78666af3..410b7abef 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/SearchConfigurationRankings.php
+++ b/core/modules/search/src/Plugin/migrate/process/d6/SearchConfigurationRankings.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\SearchConfigurationRankings.
+ * Contains \Drupal\search\Plugin\migrate\process\d6\SearchConfigurationRankings.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
+namespace Drupal\search\Plugin\migrate\process\d6;
 
 use Drupal\migrate\ProcessPluginBase;
 use Drupal\migrate\MigrateExecutableInterface;
diff --git a/core/modules/search/src/Plugin/views/filter/Search.php b/core/modules/search/src/Plugin/views/filter/Search.php
index d675a29ab..844a0b2cd 100644
--- a/core/modules/search/src/Plugin/views/filter/Search.php
+++ b/core/modules/search/src/Plugin/views/filter/Search.php
@@ -108,7 +108,7 @@ class Search extends FilterPluginBase {
     if (!$form_state->isValueEmpty($key)) {
       $this->queryParseSearchExpression($form_state->getValue($key));
       if (count($this->searchQuery->words()) == 0) {
-        $form_state->setErrorByName($key, $this->formatPlural(\Drupal::config('search.settings')->get('index.minimum_word_size'), 'You must include at least one positive keyword with 1 character or more.', 'You must include at least one positive keyword with @count characters or more.'));
+        $form_state->setErrorByName($key, $this->formatPlural(\Drupal::config('search.settings')->get('index.minimum_word_size'), 'You must include at least one keyword to match in the content, and punctuation is ignored.', 'You must include at least one keyword to match in the content. Keywords must be at least @count characters, and punctuation is ignored.'));
       }
     }
   }
diff --git a/core/modules/search/src/SearchPageListBuilder.php b/core/modules/search/src/SearchPageListBuilder.php
index 55e3f97cf..90955136d 100644
--- a/core/modules/search/src/SearchPageListBuilder.php
+++ b/core/modules/search/src/SearchPageListBuilder.php
@@ -260,11 +260,6 @@ class SearchPageListBuilder extends DraggableListBuilder implements FormInterfac
       '#attributes' => array(
         'class' => array('container-inline'),
       ),
-      '#attached' => [
-        'library' => [
-          'search/admin',
-        ],
-      ],
     );
     // In order to prevent validation errors for the parent form, this cannot be
     // required, see self::validateAddSearchPage().
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateSearchConfigsTest.php b/core/modules/search/src/Tests/Migrate/d6/MigrateSearchConfigsTest.php
similarity index 67%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateSearchConfigsTest.php
rename to core/modules/search/src/Tests/Migrate/d6/MigrateSearchConfigsTest.php
index 3e6e430be..4cb4298d6 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateSearchConfigsTest.php
+++ b/core/modules/search/src/Tests/Migrate/d6/MigrateSearchConfigsTest.php
@@ -2,20 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateSearchConfigsTest.
+ * Contains \Drupal\search\Tests\d6\Migrate\SearchConfigsTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\search\Tests\Migrate\d6;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate\MigrateMessage;
-use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to search.settings.yml.
  *
- * @group migrate_drupal
+ * @group search
  */
 class MigrateSearchConfigsTest extends MigrateDrupal6TestBase {
 
@@ -33,13 +31,8 @@ class MigrateSearchConfigsTest extends MigrateDrupal6TestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $migration = entity_load('migration', 'd6_search_settings');
-    $dumps = array(
-      $this->getDumpDirectory() . '/Variable.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, new MigrateMessage());
-    $executable->import();
+    $this->loadDumps(['Variable.php']);
+    $this->executeMigration('d6_search_settings');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateSearchPageTest.php b/core/modules/search/src/Tests/Migrate/d6/MigrateSearchPageTest.php
similarity index 79%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateSearchPageTest.php
rename to core/modules/search/src/Tests/Migrate/d6/MigrateSearchPageTest.php
index a964ca2b9..81fc6e1d7 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateSearchPageTest.php
+++ b/core/modules/search/src/Tests/Migrate/d6/MigrateSearchPageTest.php
@@ -2,19 +2,19 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateSearchPageTest.
+ * Contains \Drupal\search\Tests\Migrate\d6\MigrateSearchPageTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\search\Tests\Migrate\d6;
 
 use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 use Drupal\Core\Database\Database;
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade search rank settings to search.page.*.yml.
  *
- * @group migrate_drupal
+ * @group search
  */
 class MigrateSearchPageTest extends MigrateDrupal6TestBase {
 
@@ -30,14 +30,8 @@ class MigrateSearchPageTest extends MigrateDrupal6TestBase {
    */
   protected function setUp() {
     parent::setUp();
-    /** @var \Drupal\migrate\entity\Migration $migration */
-    $migration = entity_load('migration', 'd6_search_page');
-    $dumps = array(
-      $this->getDumpDirectory() . '/Variable.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->loadDumps(['Variable.php']);
+    $this->executeMigration('d6_search_page');
   }
 
   /**
diff --git a/core/modules/search/src/Tests/SearchAdvancedSearchFormTest.php b/core/modules/search/src/Tests/SearchAdvancedSearchFormTest.php
index 1465f5227..3650a93bf 100644
--- a/core/modules/search/src/Tests/SearchAdvancedSearchFormTest.php
+++ b/core/modules/search/src/Tests/SearchAdvancedSearchFormTest.php
@@ -40,13 +40,11 @@ class SearchAdvancedSearchFormTest extends SearchTestBase {
   }
 
   /**
-   * Test using the search form with GET and POST queries.
-   * Test using the advanced search form to limit search to nodes of type "Basic page".
+   * Tests advanced search by node type.
    */
   function testNodeType() {
+    // Verify some properties of the node that was created.
     $this->assertTrue($this->node->getType() == 'page', 'Node type is Basic page.');
-
-    // Assert that the dummy title doesn't equal the real title.
     $dummy_title = 'Lorem ipsum';
     $this->assertNotEqual($dummy_title, $this->node->label(), "Dummy title doesn't equal node title.");
 
@@ -63,11 +61,56 @@ class SearchAdvancedSearchFormTest extends SearchTestBase {
     $this->drupalPostForm('search/node', $edit, t('Advanced search'));
     $this->assertText($this->node->label(), 'Basic page node is found with POST query.');
 
-    // Advanced search type option.
+    // Search by node type.
     $this->drupalPostForm('search/node', array_merge($edit, array('type[page]' => 'page')), t('Advanced search'));
     $this->assertText($this->node->label(), 'Basic page node is found with POST query and type:page.');
 
     $this->drupalPostForm('search/node', array_merge($edit, array('type[article]' => 'article')), t('Advanced search'));
     $this->assertText('search yielded no results', 'Article node is not found with POST query and type:article.');
   }
+
+  /**
+   * Tests that after submitting the advanced search form, the form is refilled.
+   */
+  function testFormRefill() {
+    $edit = array(
+      'keys' => 'cat',
+      'or' => 'dog gerbil',
+      'phrase' => 'pets are nice',
+      'negative' => 'fish snake',
+      'type[page]' => 'page',
+    );
+    $this->drupalPostForm('search/node', $edit, t('Advanced search'));
+
+    // Test that the encoded query appears in the page title. Only test the
+    // part not including the quote, because assertText() cannot seem to find
+    // the quote marks successfully.
+    $this->assertText('Search for cat dog OR gerbil -fish -snake');
+
+    // Verify that all of the form fields are filled out.
+    foreach ($edit as $key => $value) {
+      if ($key != 'type[page]') {
+        $elements = $this->xpath('//input[@name=:name]', array(':name' => $key));
+        $this->assertTrue(isset($elements[0]) && $elements[0]['value'] == $value, "Field $key is set to $value");
+      }
+      else {
+        $elements = $this->xpath('//input[@name=:name]', array(':name' => $key));
+        $this->assertTrue(isset($elements[0]) && !empty($elements[0]['checked']), "Field $key is checked");
+      }
+    }
+
+    // Now test by submitting the or/not part of the query in the main
+    // search box, and verify that the advanced form is not filled out.
+    // (It shouldn't be filled out unless you submit values in those fields.)
+    $edit2 = array('keys' => 'cat dog OR gerbil -fish -snake');
+    $this->drupalPostForm('search/node', $edit2, t('Advanced search'));
+    $this->assertText('Search for cat dog OR gerbil -fish -snake');
+    foreach ($edit as $key => $value) {
+      if ($key != 'type[page]') {
+        $elements = $this->xpath('//input[@name=:name]', array(':name' => $key));
+        $this->assertFalse(isset($elements[0]) && $elements[0]['value'] == $value, "Field $key is not set to $value");
+      }
+    }
+  }
+
 }
diff --git a/core/modules/search/src/Tests/SearchBlockTest.php b/core/modules/search/src/Tests/SearchBlockTest.php
index bf180566e..8351878e2 100644
--- a/core/modules/search/src/Tests/SearchBlockTest.php
+++ b/core/modules/search/src/Tests/SearchBlockTest.php
@@ -36,6 +36,7 @@ class SearchBlockTest extends SearchTestBase {
 
     // Test availability of the search block in the admin "Place blocks" list.
     $this->drupalGet('admin/structure/block');
+    $this->clickLinkPartialName('Place block');
     $this->assertLinkByHref('/admin/structure/block/add/search_form_block/classy', 0,
       'Did not find the search block in block candidate list.');
 
@@ -92,16 +93,16 @@ class SearchBlockTest extends SearchTestBase {
     // Test that after entering a too-short keyword in the form, you can then
     // search again with a longer keyword. First test using the block form.
     $this->submitGetForm('node', array('keys' => $this->randomMachineName(1)), t('Search'));
-    $this->assertText('You must include at least one positive keyword', 'Keyword message is displayed when searching for short word');
+    $this->assertText('You must include at least one keyword to match in the content', 'Keyword message is displayed when searching for short word');
     $this->assertNoText(t('Please enter some keywords'), 'With short word entered, no keywords message is not displayed');
     $this->submitGetForm(NULL, array('keys' => $this->randomMachineName()), t('Search'), 'search-block-form');
-    $this->assertNoText('You must include at least one positive keyword', 'Keyword message is not displayed when searching for long word after short word search');
+    $this->assertNoText('You must include at least one keyword to match in the content', 'Keyword message is not displayed when searching for long word after short word search');
 
     // Same test again, using the search page form for the second search this
     // time.
     $this->submitGetForm('node', array('keys' => $this->randomMachineName(1)), t('Search'));
     $this->drupalPostForm(NULL, array('keys' => $this->randomMachineName()), t('Search'), array(), array(), 'search-form');
-    $this->assertNoText('You must include at least one positive keyword', 'Keyword message is not displayed when searching for long word after short word search');
+    $this->assertNoText('You must include at least one keyword to match in the content', 'Keyword message is not displayed when searching for long word after short word search');
 
   }
 
diff --git a/core/modules/search/src/Tests/SearchKeywordsConditionsTest.php b/core/modules/search/src/Tests/SearchKeywordsConditionsTest.php
index 656e0015d..7789f7acc 100644
--- a/core/modules/search/src/Tests/SearchKeywordsConditionsTest.php
+++ b/core/modules/search/src/Tests/SearchKeywordsConditionsTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\search\Tests;
 
+use Drupal\Component\Utility\SafeMarkup;
+
 /**
  * Verify the search without keywords set and extra conditions.
  *
@@ -59,6 +61,6 @@ class SearchKeywordsConditionsTest extends SearchTestBase {
     $keys = 'moving drop ' . $this->randomMachineName();
     $this->drupalGet("search/dummy_path", array('query' => array('keys' => 'bike', 'search_conditions' => $keys)));
     $this->assertText("Dummy search snippet to display.");
-    $this->assertRaw(print_r(array('keys' => 'bike', 'search_conditions' => $keys), TRUE));
+    $this->assertRaw(SafeMarkup::checkPlain(print_r(array('keys' => 'bike', 'search_conditions' => $keys), TRUE)));
   }
 }
diff --git a/core/modules/search/src/Tests/SearchNodePunctuationTest.php b/core/modules/search/src/Tests/SearchNodePunctuationTest.php
index 23e95a4ae..3c32997c4 100644
--- a/core/modules/search/src/Tests/SearchNodePunctuationTest.php
+++ b/core/modules/search/src/Tests/SearchNodePunctuationTest.php
@@ -57,11 +57,11 @@ class SearchNodePunctuationTest extends SearchTestBase {
     $edit = array('keys' => '&');
     $this->drupalPostForm('search/node', $edit, t('Search'));
     $this->assertNoRaw('<strong>&</strong>amp;');
-    $this->assertText('You must include at least one positive keyword');
+    $this->assertText('You must include at least one keyword');
 
     $edit = array('keys' => '&amp;');
     $this->drupalPostForm('search/node', $edit, t('Search'));
     $this->assertNoRaw('<strong>&</strong>amp;');
-    $this->assertText('You must include at least one positive keyword');
+    $this->assertText('You must include at least one keyword');
   }
 }
diff --git a/core/modules/search/src/Tests/SearchPageTextTest.php b/core/modules/search/src/Tests/SearchPageTextTest.php
index d973ffc5e..408848c40 100644
--- a/core/modules/search/src/Tests/SearchPageTextTest.php
+++ b/core/modules/search/src/Tests/SearchPageTextTest.php
@@ -30,6 +30,22 @@ class SearchPageTextTest extends SearchTestBase {
     $this->searchingUser = $this->drupalCreateUser(array('search content', 'access user profiles', 'use advanced search'));
   }
 
+  /**
+   * Tests for XSS in search module local task.
+   *
+   * This is a regression test for https://www.drupal.org/node/2338081
+   */
+  function testSearchLabelXSS() {
+    $this->drupalLogin($this->drupalCreateUser(array('administer search')));
+
+    $keys['label'] = '<script>alert("Dont Panic");</script>';
+    $this->drupalPostForm('admin/config/search/pages/manage/node_search', $keys, t('Save search page'));
+
+    $this->drupalLogin($this->searchingUser);
+    $this->drupalGet('search/node');
+    $this->assertEscaped($keys['label']);
+  }
+
   /**
    * Tests the failed search text, and various other text on the search page.
    */
@@ -119,10 +135,10 @@ class SearchPageTextTest extends SearchTestBase {
     // message, and that if after that you search for a longer keyword, you
     // do not still see the message.
     $this->drupalPostForm('search/node', array('keys' => $this->randomMachineName(1)), t('Search'));
-    $this->assertText('You must include at least one positive keyword', 'Keyword message is displayed when searching for short word');
+    $this->assertText('You must include at least one keyword', 'Keyword message is displayed when searching for short word');
     $this->assertNoText(t('Please enter some keywords'), 'With short word entered, no keywords message is not displayed');
     $this->drupalPostForm(NULL, array('keys' => $this->randomMachineName()), t('Search'));
-    $this->assertNoText('You must include at least one positive keyword', 'Keyword message is not displayed when searching for long word after short word search');
+    $this->assertNoText('You must include at least one keyword', 'Keyword message is not displayed when searching for long word after short word search');
 
     // Test that if you search for a URL with .. in it, you still end up at
     // the search page. See issue https://www.drupal.org/node/890058.
@@ -135,6 +151,5 @@ class SearchPageTextTest extends SearchTestBase {
     $this->drupalPostForm('search/node', array('keys' => '.something'), t('Search'));
     $this->assertResponse(200, 'Searching for .something does not lead to a 403 error');
     $this->assertText('no results', 'Searching for .something gives you a no search results page');
-
   }
 }
diff --git a/core/modules/search/tests/modules/search_extra_type/src/Plugin/Search/SearchExtraTypeSearch.php b/core/modules/search/tests/modules/search_extra_type/src/Plugin/Search/SearchExtraTypeSearch.php
index 5c9793454..75541fd72 100644
--- a/core/modules/search/tests/modules/search_extra_type/src/Plugin/Search/SearchExtraTypeSearch.php
+++ b/core/modules/search/tests/modules/search_extra_type/src/Plugin/Search/SearchExtraTypeSearch.php
@@ -64,7 +64,7 @@ class SearchExtraTypeSearch extends ConfigurableSearchPluginBase {
         'link' => Url::fromRoute('test_page_test.test_page')->toString(),
         'type' => 'Dummy result type',
         'title' => 'Dummy title',
-        'snippet' => SafeMarkup::set("Dummy search snippet to display. Keywords: {$this->keywords}\n\nConditions: " . print_r($this->searchParameters, TRUE)),
+        'snippet' => SafeMarkup::format("Dummy search snippet to display. Keywords: @keywords\n\nConditions: @search_parameters", ['@keywords' => $this->keywords, '@search_parameters' => print_r($this->searchParameters, TRUE)]),
       ),
     );
   }
diff --git a/core/modules/shortcut/shortcut.module b/core/modules/shortcut/shortcut.module
index 975a309fc..be8383980 100644
--- a/core/modules/shortcut/shortcut.module
+++ b/core/modules/shortcut/shortcut.module
@@ -313,7 +313,6 @@ function shortcut_preprocess_page(&$variables) {
       'link' => $link,
       'name' => $variables['title'],
     );
-    $query += \Drupal::destination()->getAsArray();
 
     $shortcut_set = shortcut_current_displayed_set();
 
@@ -341,6 +340,7 @@ function shortcut_preprocess_page(&$variables) {
     }
 
     if (theme_get_setting('third_party_settings.shortcut.module_link')) {
+      $query += \Drupal::destination()->getAsArray();
       $variables['title_suffix']['add_or_remove_shortcut'] = array(
         '#attached' => array(
           'library' => array(
diff --git a/core/modules/shortcut/src/Entity/Shortcut.php b/core/modules/shortcut/src/Entity/Shortcut.php
index a2179f90f..108bbc900 100644
--- a/core/modules/shortcut/src/Entity/Shortcut.php
+++ b/core/modules/shortcut/src/Entity/Shortcut.php
@@ -102,7 +102,7 @@ class Shortcut extends ContentEntityBase implements ShortcutInterface {
     // newly created shortcut is *also* added to a shortcut set, so we must
     // invalidate the associated shortcut set's cache tag.
     if (!$update) {
-      Cache::invalidateTags($this->getCacheTags());
+      Cache::invalidateTags($this->getCacheTagsToInvalidate());
     }
   }
 
@@ -178,7 +178,7 @@ class Shortcut extends ContentEntityBase implements ShortcutInterface {
   /**
    * {@inheritdoc}
    */
-  public function getCacheTags() {
+  public function getCacheTagsToInvalidate() {
     return $this->shortcut_set->entity->getCacheTags();
   }
 
diff --git a/core/modules/shortcut/src/Tests/ShortcutTranslationUITest.php b/core/modules/shortcut/src/Tests/ShortcutTranslationUITest.php
index 3fc823267..9a9113b97 100644
--- a/core/modules/shortcut/src/Tests/ShortcutTranslationUITest.php
+++ b/core/modules/shortcut/src/Tests/ShortcutTranslationUITest.php
@@ -18,6 +18,11 @@ use Drupal\Core\Language\Language;
  */
 class ShortcutTranslationUITest extends ContentTranslationUITestBase {
 
+  /**
+   * {inheritdoc}
+   */
+  protected $defaultCacheContexts = ['languages:language_interface', 'theme', 'user', 'url.site'];
+
   /**
    * Modules to enable.
    *
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_simpletest_settings.yml b/core/modules/simpletest/migration_templates/d6_simpletest_settings.yml
similarity index 90%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_simpletest_settings.yml
rename to core/modules/simpletest/migration_templates/d6_simpletest_settings.yml
index 0791f1144..d616a5996 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_simpletest_settings.yml
+++ b/core/modules/simpletest/migration_templates/d6_simpletest_settings.yml
@@ -19,7 +19,3 @@ process:
 destination:
   plugin: config
   config_name: simpletest.settings
-dependencies:
-  module:
-    - migrate_drupal
-    - simpletest
diff --git a/core/modules/simpletest/simpletest.module b/core/modules/simpletest/simpletest.module
index 254be0c9c..52243c8ce 100644
--- a/core/modules/simpletest/simpletest.module
+++ b/core/modules/simpletest/simpletest.module
@@ -487,41 +487,47 @@ function simpletest_classloader_register() {
 }
 
 /**
- * Generates test file.
+ * Generates a test file.
  *
  * @param string $filename
- *   The name of the file, including the path.
+ *   The name of the file, including the path. The suffix '.txt' is appended to
+ *   the supplied file name and the file is put into the public:// files
+ *   directory.
  * @param int $width
  *   The number of characters on one line.
  * @param int $lines
  *   The number of lines in the file.
  * @param string $type
- *   (optional) The type, for example: "text", "binary", or "binary-text".
+ *   (optional) The type, one of:
+ *   - text: The generated file contains random ASCII characters.
+ *   - binary: The generated file contains random characters whose codes are in
+ *     the range of 0 to 31.
+ *   - binary-text: The generated file contains random sequence of '0' and '1'
+ *     values.
  *
  * @return string
  *   The name of the file, including the path.
  */
 function simpletest_generate_file($filename, $width, $lines, $type = 'binary-text') {
-  $size = $width * $lines - $lines;
-
-  // Generate random text
   $text = '';
-  for ($i = 0; $i < $size; $i++) {
-    switch ($type) {
-      case 'text':
-        $text .= chr(rand(32, 126));
-        break;
-      case 'binary':
-        $text .= chr(rand(0, 31));
-        break;
-      case 'binary-text':
-      default:
-        $text .= rand(0, 1);
-        break;
+    for ($i = 0; $i < $lines; $i++) {
+      // Generate $width - 1 characters to leave space for the "\n" character.
+      for ($j = 0; $j < $width - 1; $j++) {
+        switch ($type) {
+          case 'text':
+            $text .= chr(rand(32, 126));
+            break;
+          case 'binary':
+            $text .= chr(rand(0, 31));
+            break;
+          case 'binary-text':
+          default:
+            $text .= rand(0, 1);
+            break;
+        }
+      }
+      $text .= "\n";
     }
-  }
-  // Add \n for symmetrical file.
-  $text = wordwrap($text, $width - 1, "\n", TRUE) . "\n";
 
   // Create filename.
   file_put_contents('public://' . $filename . '.txt', $text);
diff --git a/core/modules/simpletest/src/AssertContentTrait.php b/core/modules/simpletest/src/AssertContentTrait.php
index b043ea947..1918d4245 100644
--- a/core/modules/simpletest/src/AssertContentTrait.php
+++ b/core/modules/simpletest/src/AssertContentTrait.php
@@ -10,6 +10,7 @@ namespace Drupal\simpletest;
 use Drupal\Component\Serialization\Json;
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Utility\Xss;
+use Drupal\Core\Render\RenderContext;
 use Symfony\Component\CssSelector\CssSelector;
 
 /**
@@ -397,7 +398,7 @@ trait AssertContentTrait {
     if (!$message) {
       $message = SafeMarkup::format('Raw "@raw" found', array('@raw' => $raw));
     }
-    return $this->assert(strpos($this->getRawContent(), $raw) !== FALSE, $message, $group);
+    return $this->assert(strpos($this->getRawContent(), (string) $raw) !== FALSE, $message, $group);
   }
 
   /**
@@ -424,7 +425,7 @@ trait AssertContentTrait {
     if (!$message) {
       $message = SafeMarkup::format('Raw "@raw" not found', array('@raw' => $raw));
     }
-    return $this->assert(strpos($this->getRawContent(), $raw) === FALSE, $message, $group);
+    return $this->assert(strpos($this->getRawContent(), (string) $raw) === FALSE, $message, $group);
   }
 
   /**
@@ -808,7 +809,12 @@ trait AssertContentTrait {
    *   TRUE on pass, FALSE on fail.
    */
   protected function assertThemeOutput($callback, array $variables = array(), $expected = '', $message = '', $group = 'Other') {
-    $output = \Drupal::theme()->render($callback, $variables);
+    /** @var \Drupal\Core\Render\RendererInterface $renderer */
+    $renderer = \Drupal::service('renderer');
+
+    $output = $renderer->executeInRenderContext(new RenderContext(), function() use ($callback, $variables) {
+      return \Drupal::theme()->render($callback, $variables);
+    });
     $this->verbose(
       '<hr />' . 'Result:' . '<pre>' . SafeMarkup::checkPlain(var_export($output, TRUE)) . '</pre>'
       . '<hr />' . 'Expected:' . '<pre>' . SafeMarkup::checkPlain(var_export($expected, TRUE)) . '</pre>'
diff --git a/core/modules/simpletest/src/BrowserTestBase.php b/core/modules/simpletest/src/BrowserTestBase.php
index cd77a9879..b37a681d0 100644
--- a/core/modules/simpletest/src/BrowserTestBase.php
+++ b/core/modules/simpletest/src/BrowserTestBase.php
@@ -950,7 +950,7 @@ abstract class BrowserTestBase extends \PHPUnit_Framework_TestCase {
     // Reset/rebuild all data structures after enabling the modules, primarily
     // to synchronize all data structures and caches between the test runner and
     // the child site.
-    // Affects e.g. file_get_stream_wrappers().
+    // Affects e.g. StreamWrapperManagerInterface::getWrappers().
     // @see \Drupal\Core\DrupalKernel::bootCode()
     // @todo Test-specific setUp() methods may set up further fixtures; find a
     //   way to execute this after setUp() is done, or to eliminate it entirely.
diff --git a/core/modules/simpletest/src/Form/SimpletestResultsForm.php b/core/modules/simpletest/src/Form/SimpletestResultsForm.php
index ea3447e15..49c086cdd 100644
--- a/core/modules/simpletest/src/Form/SimpletestResultsForm.php
+++ b/core/modules/simpletest/src/Form/SimpletestResultsForm.php
@@ -313,7 +313,7 @@ class SimpletestResultsForm extends FormBase {
       $rows = array();
       foreach ($assertions as $assertion) {
         $row = array();
-        $row[] = SafeMarkup::checkAdminXss($assertion->message);
+        $row[] = ['data' => ['#markup' => $assertion->message]];
         $row[] = $assertion->message_group;
         $row[] = \Drupal::service('file_system')->basename(($assertion->file));
         $row[] = $assertion->line;
diff --git a/core/modules/simpletest/src/Form/SimpletestTestForm.php b/core/modules/simpletest/src/Form/SimpletestTestForm.php
index f6d03673f..aadc4a9fc 100644
--- a/core/modules/simpletest/src/Form/SimpletestTestForm.php
+++ b/core/modules/simpletest/src/Form/SimpletestTestForm.php
@@ -127,8 +127,8 @@ class SimpletestTestForm extends FormBase {
       '#suffix' => '<a href="#" class="simpletest-collapse">(' . $this->t('Collapse') . ')</a>',
     );
     $form['tests']['#attached']['drupalSettings']['simpleTest']['images'] = [
-      $this->renderer->renderPlain($image_collapsed),
-      $this->renderer->renderPlain($image_extended),
+      (string) $this->renderer->renderPlain($image_collapsed),
+      (string) $this->renderer->renderPlain($image_extended),
     ];
 
     // Generate the list of tests arranged by group.
diff --git a/core/modules/simpletest/src/KernelTestBase.php b/core/modules/simpletest/src/KernelTestBase.php
index 481b03106..ba8622b08 100644
--- a/core/modules/simpletest/src/KernelTestBase.php
+++ b/core/modules/simpletest/src/KernelTestBase.php
@@ -381,9 +381,7 @@ EOD;
   protected function installConfig(array $modules) {
     foreach ($modules as $module) {
       if (!$this->container->get('module_handler')->moduleExists($module)) {
-        throw new \RuntimeException(format_string("'@module' module is not enabled.", array(
-          '@module' => $module,
-        )));
+        throw new \RuntimeException("'$module' module is not enabled");
       }
       \Drupal::service('config.installer')->installDefaultConfig('module', $module);
     }
@@ -411,18 +409,13 @@ EOD;
     // behavior and non-reproducible test failures, we only allow the schema of
     // explicitly loaded/enabled modules to be installed.
     if (!$this->container->get('module_handler')->moduleExists($module)) {
-      throw new \RuntimeException(format_string("'@module' module is not enabled.", array(
-        '@module' => $module,
-      )));
+      throw new \RuntimeException("'$module' module is not enabled");
     }
     $tables = (array) $tables;
     foreach ($tables as $table) {
       $schema = drupal_get_module_schema($module, $table);
       if (empty($schema)) {
-        throw new \RuntimeException(format_string("Unknown '@table' table schema in '@module' module.", array(
-          '@module' => $module,
-          '@table' => $table,
-        )));
+        throw new \RuntimeException("Unknown '$table' table schema in '$module' module.");
       }
       $this->container->get('database')->schema()->createTable($table, $schema);
     }
diff --git a/core/modules/simpletest/src/TestBase.php b/core/modules/simpletest/src/TestBase.php
index fded92d84..4104b4b85 100644
--- a/core/modules/simpletest/src/TestBase.php
+++ b/core/modules/simpletest/src/TestBase.php
@@ -1423,9 +1423,9 @@ abstract class TestBase {
    * Do not use this method when special characters are not possible (e.g., in
    * machine or file names that have already been validated); instead, use
    * \Drupal\simpletest\TestBase::randomMachineName(). If $length is greater
-   * than 2 the random string will include at least one ampersand ('&')
-   * character to ensure coverage for special characters and avoid the
-   * introduction of random test failures.
+   * than 3 the random string will include at least one ampersand ('&') and
+   * at least one greater than ('>') character to ensure coverage for special
+   * characters and avoid the introduction of random test failures.
    *
    * @param int $length
    *   Length of random string to generate.
@@ -1436,7 +1436,7 @@ abstract class TestBase {
    * @see \Drupal\Component\Utility\Random::string()
    */
   public function randomString($length = 8) {
-    if ($length < 3) {
+    if ($length < 4) {
       return $this->getRandomGenerator()->string($length, TRUE, array($this, 'randomStringValidate'));
     }
 
@@ -1444,9 +1444,10 @@ abstract class TestBase {
     // returned string contains a character that needs to be escaped in HTML by
     // injecting an ampersand into it.
     $replacement_pos = floor($length / 2);
-    // Remove 1 from the length to account for the ampersand character.
-    $string = $this->getRandomGenerator()->string($length - 1, TRUE, array($this, 'randomStringValidate'));
-    return substr_replace($string, '&', $replacement_pos, 0);
+    // Remove 2 from the length to account for the ampersand and greater than
+    // characters.
+    $string = $this->getRandomGenerator()->string($length - 2, TRUE, array($this, 'randomStringValidate'));
+    return substr_replace($string, '>&', $replacement_pos, 0);
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateSimpletestConfigsTest.php b/core/modules/simpletest/src/Tests/Migrate/d6/MigrateSimpletestConfigsTest.php
similarity index 71%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateSimpletestConfigsTest.php
rename to core/modules/simpletest/src/Tests/Migrate/d6/MigrateSimpletestConfigsTest.php
index 6ad86e853..c44578d7e 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateSimpletestConfigsTest.php
+++ b/core/modules/simpletest/src/Tests/Migrate/d6/MigrateSimpletestConfigsTest.php
@@ -2,20 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateSimpletestConfigsTest.
+ * Contains \Drupal\simpletest\Tests\Migrate\d6\MigrateSimpletestConfigsTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\simpletest\Tests\Migrate\d6;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate\MigrateMessage;
-use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to simpletest.settings.yml.
  *
- * @group migrate_drupal
+ * @group simpletest
  */
 class MigrateSimpletestConfigsTest extends MigrateDrupal6TestBase {
 
@@ -35,14 +33,8 @@ class MigrateSimpletestConfigsTest extends MigrateDrupal6TestBase {
     parent::setUp();
 
     $this->installConfig(['simpletest']);
-
-    $migration = entity_load('migration', 'd6_simpletest_settings');
-    $dumps = array(
-      $this->getDumpDirectory() . '/Variable.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, new MigrateMessage());
-    $executable->import();
+    $this->loadDumps(['Variable.php']);
+    $this->executeMigration('d6_simpletest_settings');
   }
 
   /**
diff --git a/core/modules/simpletest/src/Tests/SimpleTestBrowserTest.php b/core/modules/simpletest/src/Tests/SimpleTestBrowserTest.php
index 956d67755..574da77d9 100644
--- a/core/modules/simpletest/src/Tests/SimpleTestBrowserTest.php
+++ b/core/modules/simpletest/src/Tests/SimpleTestBrowserTest.php
@@ -124,6 +124,8 @@ class SimpleTestBrowserTest extends WebTestBase {
    * Tests that PHPUnit and KernelTestBase tests work through the UI.
    */
   public function testTestingThroughUI() {
+    $this->drupalGet('admin/config/development/testing');
+    $this->assertTrue(strpos($this->drupalSettings['simpleTest']['images'][0], 'core/misc/menu-collapsed.png') > 0, 'drupalSettings contains a link to core/misc/menu-collapsed.png.');
     // We can not test WebTestBase tests here since they require a valid .htkey
     // to be created. However this scenario is covered by the testception of
     // \Drupal\simpletest\Tests\SimpleTestTest.
diff --git a/core/modules/simpletest/src/Tests/SimpleTestTest.php b/core/modules/simpletest/src/Tests/SimpleTestTest.php
index e4df90879..1f978453c 100644
--- a/core/modules/simpletest/src/Tests/SimpleTestTest.php
+++ b/core/modules/simpletest/src/Tests/SimpleTestTest.php
@@ -157,7 +157,7 @@ EOD;
     // request. This allows the stub test to make requests. The event does not
     // fire here and drupal_generate_test_ua() can not generate a key for a
     // test in a test since the prefix has changed.
-    // @see \Drupal\Core\Test\EventSubscriber\HttpRequestSubscriber::onBeforeSendRequest()
+    // @see \Drupal\Core\Test\HttpClientMiddleware\TestHttpClientMiddleware::onBeforeSendRequest()
     // @see drupal_generate_test_ua();
     $key_file = DRUPAL_ROOT . '/sites/simpletest/' . substr($this->databasePrefix, 10) . '/.htkey';
     $private_key = Crypt::randomBytesBase64(55);
diff --git a/core/modules/simpletest/src/WebTestBase.php b/core/modules/simpletest/src/WebTestBase.php
index a0062844d..cc3b27006 100644
--- a/core/modules/simpletest/src/WebTestBase.php
+++ b/core/modules/simpletest/src/WebTestBase.php
@@ -32,6 +32,7 @@ use Drupal\Core\Url;
 use Drupal\node\Entity\NodeType;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
+use Zend\Diactoros\Uri;
 
 /**
  * Test case for typical Drupal tests.
@@ -457,16 +458,37 @@ abstract class WebTestBase extends TestBase {
   }
 
   /**
-   * Gets a list files that can be used in tests.
+   * Gets a list of files that can be used in tests.
+   *
+   * The first time this method is called, it will call
+   * simpletest_generate_file() to generate binary and ASCII text files in the
+   * public:// directory. It will also copy all files in
+   * core/modules/simpletest/files to public://. These contain image, SQL, PHP,
+   * JavaScript, and HTML files.
+   *
+   * All filenames are prefixed with their type and have appropriate extensions:
+   * - text-*.txt
+   * - binary-*.txt
+   * - html-*.html and html-*.txt
+   * - image-*.png, image-*.jpg, and image-*.gif
+   * - javascript-*.txt and javascript-*.script
+   * - php-*.txt and php-*.php
+   * - sql-*.txt and sql-*.sql
+   *
+   * Any subsequent calls will not generate any new files, or copy the files
+   * over again. However, if a test class adds a new file to public:// that
+   * is prefixed with one of the above types, it will get returned as well, even
+   * on subsequent calls.
    *
    * @param $type
    *   File type, possible values: 'binary', 'html', 'image', 'javascript',
    *   'php', 'sql', 'text'.
    * @param $size
-   *   File size in bytes to match. Please check the tests/files folder.
+   *   (optional) File size in bytes to match. Defaults to NULL, which will not
+   *   filter the returned list by size.
    *
    * @return
-   *   List of files that match filter.
+   *   List of files in public:// that match the filter(s).
    */
   protected function drupalGetTestFiles($type, $size = NULL) {
     if (empty($this->generatedTestFiles)) {
@@ -477,11 +499,11 @@ abstract class WebTestBase extends TestBase {
         simpletest_generate_file('binary-' . $count++, 64, $line, 'binary');
       }
 
-      // Generate text test files.
+      // Generate ASCII text test files.
       $lines = array(16, 256, 1024, 2048, 20480);
       $count = 0;
       foreach ($lines as $line) {
-        simpletest_generate_file('text-' . $count++, 64, $line);
+        simpletest_generate_file('text-' . $count++, 64, $line, 'text');
       }
 
       // Copy other test files from simpletest.
@@ -1533,7 +1555,15 @@ abstract class WebTestBase extends TestBase {
     if (!isset($options['query'][MainContentViewSubscriber::WRAPPER_FORMAT])) {
       $options['query'][MainContentViewSubscriber::WRAPPER_FORMAT] = 'drupal_ajax';
     }
-    return Json::decode($this->drupalGet($path, $options, $headers));
+    return Json::decode($this->drupalGetXHR($path, $options, $headers));
+  }
+
+  /**
+   * Requests a Drupal path as if it is a XMLHttpRequest.
+   */
+  protected function drupalGetXHR($path, array $options = array(), array $headers = array()) {
+    $headers[] = 'X-Requested-With: XMLHttpRequest';
+    return $this->drupalGet($path, $options, $headers);
   }
 
   /**
@@ -1591,17 +1621,14 @@ abstract class WebTestBase extends TestBase {
    *
    *   This function can also be called to emulate an Ajax submission. In this
    *   case, this value needs to be an array with the following keys:
-   *   - path: A path to submit the form values to for Ajax-specific processing,
-   *     which is likely different than the $path parameter used for retrieving
-   *     the initial form. Defaults to 'system/ajax'.
-   *   - triggering_element: If the value for the 'path' key is 'system/ajax' or
-   *     another generic Ajax processing path, this needs to be set to the name
-   *     of the element. If the name doesn't identify the element uniquely, then
-   *     this should instead be an array with a single key/value pair,
-   *     corresponding to the element name and value. The callback for the
-   *     generic Ajax processing path uses this to find the #ajax information
-   *     for the element, including which specific callback to use for
-   *     processing the request.
+   *   - path: A path to submit the form values to for Ajax-specific processing.
+   *   - triggering_element: If the value for the 'path' key is a generic Ajax
+   *     processing path, this needs to be set to the name of the element. If
+   *     the name doesn't identify the element uniquely, then this should
+   *     instead be an array with a single key/value pair, corresponding to the
+   *     element name and value. The \Drupal\Core\Form\FormAjaxResponseBuilder
+   *     uses this to find the #ajax information for the element, including
+   *     which specific callback to use for processing the request.
    *
    *   This can also be set to NULL in order to emulate an Internet Explorer
    *   submission of a form with a single text field, and pressing ENTER in that
@@ -1649,7 +1676,10 @@ abstract class WebTestBase extends TestBase {
         $submit_matches = $this->handleForm($post, $edit, $upload, $ajax ? NULL : $submit, $form);
         $action = isset($form['action']) ? $this->getAbsoluteUrl((string) $form['action']) : $this->getUrl();
         if ($ajax) {
-          $action = $this->getAbsoluteUrl(!empty($submit['path']) ? $submit['path'] : 'system/ajax');
+          if (empty($submit['path'])) {
+            throw new \Exception('No #ajax path specified.');
+          }
+          $action = $this->getAbsoluteUrl($submit['path']);
           // Ajax callbacks verify the triggering element if necessary, so while
           // we may eventually want extra code that verifies it in the
           // handleForm() function, it's not currently a requirement.
@@ -1661,16 +1691,20 @@ abstract class WebTestBase extends TestBase {
           $post_array = $post;
           if ($upload) {
             foreach ($upload as $key => $file) {
-              $file = drupal_realpath($file);
-              if ($file && is_file($file)) {
-                // Use the new CurlFile class for file uploads when using PHP
-                // 5.5.
-                if (class_exists('CurlFile')) {
-                  $post[$key] = curl_file_create($file);
+              if (is_array($file) && count($file)) {
+                // There seems to be no way via php's API to cURL to upload
+                // several files with the same post field name. However, Drupal
+                // still sees array-index syntax in a similar way.
+                for ($i = 0; $i < count($file); $i++) {
+                  $postfield = str_replace('[]', '', $key) . '[' . $i . ']';
+                  $file_path = $this->container->get('file_system')->realpath($file[$i]);
+                  $post[$postfield] = curl_file_create($file_path);
                 }
-                else {
-                  // @todo: Drop support for this when PHP 5.5 is required.
-                  $post[$key] = '@' . $file;
+              }
+              else {
+                $file = $this->container->get('file_system')->realpath($file);
+                if ($file && is_file($file)) {
+                  $post[$key] = curl_file_create($file);
                 }
               }
             }
@@ -1735,8 +1769,7 @@ abstract class WebTestBase extends TestBase {
    *   and the value is the button label. i.e.) array('op' => t('Refresh')).
    * @param $ajax_path
    *   (optional) Override the path set by the Ajax settings of the triggering
-   *   element. In the absence of both the triggering element's Ajax path and
-   *   $ajax_path 'system/ajax' will be used.
+   *   element.
    * @param $options
    *   (optional) Options to be forwarded to the url generator.
    * @param $headers
@@ -1807,7 +1840,7 @@ abstract class WebTestBase extends TestBase {
     $extra_post = '&' . $this->serializePostValues($extra_post);
 
     // Unless a particular path is specified, use the one specified by the
-    // Ajax settings, or else 'system/ajax'.
+    // Ajax settings.
     if (!isset($ajax_path)) {
       if (isset($ajax_settings['url'])) {
         // In order to allow to set for example the wrapper envelope query
@@ -1824,10 +1857,12 @@ abstract class WebTestBase extends TestBase {
           $parsed_url['path']
         );
       }
-      else {
-        $ajax_path = 'system/ajax';
-      }
     }
+
+    if (empty($ajax_path)) {
+      throw new \Exception('No #ajax path specified.');
+    }
+
     $ajax_path = $this->container->get('unrouted_url_assembler')->assemble('base://' . $ajax_path, $options);
 
     // Submit the POST request.
@@ -2324,7 +2359,7 @@ abstract class WebTestBase extends TestBase {
   }
 
   /**
-   * Follows a link by name.
+   * Follows a link by complete name.
    *
    * Will click the first link found with this link text by default, or a later
    * one if an index is given. Match is case sensitive with normalized space.
@@ -2332,17 +2367,54 @@ abstract class WebTestBase extends TestBase {
    *
    * If the link is discovered and clicked, the test passes. Fail otherwise.
    *
-   * @param $label
+   * @param string $label
    *   Text between the anchor tags.
-   * @param $index
+   * @param int $index
    *   Link position counting from zero.
    *
-   * @return
+   * @return string|bool
    *   Page contents on success, or FALSE on failure.
    */
   protected function clickLink($label, $index = 0) {
+    return $this->clickLinkHelper($label, $index, '//a[normalize-space()=:label]');
+  }
+
+  /**
+   * Follows a link by partial name.
+   *
+   *
+   * If the link is discovered and clicked, the test passes. Fail otherwise.
+   *
+   * @param string $label
+   *   Text between the anchor tags, uses starts-with().
+   * @param int $index
+   *   Link position counting from zero.
+   *
+   * @return string|bool
+   *   Page contents on success, or FALSE on failure.
+   *
+   * @see ::clickLink()
+   */
+  protected function clickLinkPartialName($label, $index = 0) {
+    return $this->clickLinkHelper($label, $index, '//a[starts-with(normalize-space(), :label)]');
+  }
+
+  /**
+   * Provides a helper for ::clickLink() and ::clickLinkPartialName().
+   *
+   * @param string $label
+   *   Text between the anchor tags, uses starts-with().
+   * @param int $index
+   *   Link position counting from zero.
+   * @param string $pattern
+   *   A pattern to use for the XPath.
+   *
+   * @return bool|string
+   *   Page contents on success, or FALSE on failure.
+   */
+  protected function clickLinkHelper($label, $index, $pattern) {
     $url_before = $this->getUrl();
-    $urls = $this->xpath('//a[normalize-space()=:label]', array(':label' => $label));
+    $urls = $this->xpath($pattern, array(':label' => $label));
     if (isset($urls[$index])) {
       $url_target = $this->getAbsoluteUrl($urls[$index]['href']);
       $this->pass(SafeMarkup::format('Clicked link %label (@url_target) from @url_before', array('%label' => $label, '@url_target' => $url_target, '@url_before' => $url_before)), 'Browser');
@@ -2355,16 +2427,35 @@ abstract class WebTestBase extends TestBase {
   /**
    * Takes a path and returns an absolute path.
    *
-   * @param $path
+   * This method is implemented in the way that browsers work, see
+   * https://url.spec.whatwg.org/#relative-state for more information about the
+   * possible cases.
+   *
+   * @param string $path
    *   A path from the internal browser content.
    *
-   * @return
+   * @return string
    *   The $path with $base_url prepended, if necessary.
    */
   protected function getAbsoluteUrl($path) {
     global $base_url, $base_path;
 
     $parts = parse_url($path);
+
+    // In case the $path has a host, it is already an absolute URL and we are
+    // done.
+    if (!empty($parts['host'])) {
+      return $path;
+    }
+
+    // In case the $path contains just a query, we turn it into an absolute URL
+    // with the same scheme, host and path, see
+    // https://url.spec.whatwg.org/#relative-state.
+    if (array_keys($parts) === ['query']) {
+      $current_uri = new Uri($this->getUrl());
+      return (string) $current_uri->withQuery($parts['query']);
+    }
+
     if (empty($parts['host'])) {
       // Ensure that we have a string (and no xpath object).
       $path = (string) $path;
@@ -2822,6 +2913,17 @@ abstract class WebTestBase extends TestBase {
     $this->assertTrue(in_array($expected_cache_context, $cache_contexts), "'" . $expected_cache_context . "' is present in the X-Drupal-Cache-Contexts header.");
   }
 
+  /**
+   * Asserts that a cache context was not present in the last response.
+   *
+   * @param string $not_expected_cache_context
+   *   The expected cache context.
+   */
+  protected function assertNoCacheContext($not_expected_cache_context) {
+    $cache_contexts = explode(' ', $this->drupalGetHeader('X-Drupal-Cache-Contexts'));
+    $this->assertFalse(in_array($not_expected_cache_context, $cache_contexts), "'" . $not_expected_cache_context . "' is not present in the X-Drupal-Cache-Contexts header.");
+  }
+
   /**
    * Asserts whether an expected cache tag was present in the last response.
    *
diff --git a/core/modules/simpletest/tests/src/Unit/TestBaseTest.php b/core/modules/simpletest/tests/src/Unit/TestBaseTest.php
index 6fa9c551b..f4a005f1c 100644
--- a/core/modules/simpletest/tests/src/Unit/TestBaseTest.php
+++ b/core/modules/simpletest/tests/src/Unit/TestBaseTest.php
@@ -115,10 +115,11 @@ class TestBaseTest extends UnitTestCase {
     $mock_test_base = $this->getMockForAbstractClass('Drupal\simpletest\TestBase');
     $string = $mock_test_base->randomString($length);
     $this->assertEquals($length, strlen($string));
-    // randomString() should always include an ampersand ('&') if $length is
-    // greater than 2.
-    if ($length > 2) {
+    // randomString() should always include an ampersand ('&')  and a
+    // greater than ('>') if $length is greater than 3.
+    if ($length > 3) {
       $this->assertContains('&', $string);
+      $this->assertContains('>', $string);
     }
   }
 
diff --git a/core/modules/simpletest/tests/src/Unit/WebTestBaseTest.php b/core/modules/simpletest/tests/src/Unit/WebTestBaseTest.php
index 27598d480..f86b85e3c 100644
--- a/core/modules/simpletest/tests/src/Unit/WebTestBaseTest.php
+++ b/core/modules/simpletest/tests/src/Unit/WebTestBaseTest.php
@@ -198,4 +198,41 @@ class WebTestBaseTest extends UnitTestCase {
     $this->assertSame($expected, $clicklink_method->invoke($web_test, $label, $index));
   }
 
+  /**
+   * @dataProvider providerTestGetAbsoluteUrl
+   */
+  public function testGetAbsoluteUrl($href, $expected_absolute_path) {
+    $web_test = $this->getMockBuilder('Drupal\simpletest\WebTestBase')
+      ->disableOriginalConstructor()
+      ->setMethods(['getUrl'])
+      ->getMock();
+
+    $web_test->expects($this->any())
+      ->method('getUrl')
+      ->willReturn('http://example.com/drupal/current-path?foo=baz');
+
+    $GLOBALS['base_url'] = 'http://example.com';
+    $GLOBALS['base_path'] = 'drupal';
+
+    $get_absolute_url_method = new \ReflectionMethod($web_test, 'getAbsoluteUrl');
+    $get_absolute_url_method->setAccessible(TRUE);
+
+    $this->assertSame($expected_absolute_path, $get_absolute_url_method->invoke($web_test, $href));
+  }
+
+  /**
+   * Provides test data for testGetAbsoluteUrl.
+   *
+   * @return array
+   */
+  public function providerTestGetAbsoluteUrl() {
+    $data = [];
+    $data['host'] = ['http://example.com/drupal/test-example', 'http://example.com/drupal/test-example'];
+    $data['path'] = ['/drupal/test-example', 'http://example.com/drupal/test-example'];
+    $data['path-with-query'] = ['/drupal/test-example?foo=bar', 'http://example.com/drupal/test-example?foo=bar'];
+    $data['just-query'] = ['?foo=bar', 'http://example.com/drupal/current-path?foo=bar'];
+
+    return $data;
+  }
+
 }
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_statistics_settings.yml b/core/modules/statistics/migration_templates/d6_statistics_settings.yml
similarity index 88%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_statistics_settings.yml
rename to core/modules/statistics/migration_templates/d6_statistics_settings.yml
index b223e3664..a8820db2e 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_statistics_settings.yml
+++ b/core/modules/statistics/migration_templates/d6_statistics_settings.yml
@@ -15,7 +15,3 @@ process:
 destination:
   plugin: config
   config_name: statistics.settings
-dependencies:
-  module:
-    - migrate_drupal
-    - statistics
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateStatisticsConfigsTest.php b/core/modules/statistics/src/Tests/Migrate/d6/MigrateStatisticsConfigsTest.php
similarity index 66%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateStatisticsConfigsTest.php
rename to core/modules/statistics/src/Tests/Migrate/d6/MigrateStatisticsConfigsTest.php
index d9b024650..ea0be9d46 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateStatisticsConfigsTest.php
+++ b/core/modules/statistics/src/Tests/Migrate/d6/MigrateStatisticsConfigsTest.php
@@ -2,20 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateStatisticsConfigsTest.
+ * Contains \Drupal\statistics\Tests\Migrate\d6\MigrateStatisticsConfigsTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\statistics\Tests\Migrate\d6;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate\MigrateMessage;
-use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to statistics.settings.yml.
  *
- * @group migrate_drupal
+ * @group statistics
  */
 class MigrateStatisticsConfigsTest extends MigrateDrupal6TestBase {
 
@@ -33,13 +31,8 @@ class MigrateStatisticsConfigsTest extends MigrateDrupal6TestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $migration = entity_load('migration', 'd6_statistics_settings');
-    $dumps = array(
-      $this->getDumpDirectory() . '/Variable.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, new MigrateMessage());
-    $executable->import();
+    $this->loadDumps(['Variable.php']);
+    $this->executeMigration('d6_statistics_settings');
   }
 
   /**
diff --git a/core/modules/statistics/src/Tests/StatisticsAdminTest.php b/core/modules/statistics/src/Tests/StatisticsAdminTest.php
index 476b2ff16..7c4f58345 100644
--- a/core/modules/statistics/src/Tests/StatisticsAdminTest.php
+++ b/core/modules/statistics/src/Tests/StatisticsAdminTest.php
@@ -40,7 +40,7 @@ class StatisticsAdminTest extends WebTestBase {
   /**
    * The Guzzle HTTP client.
    *
-   * @var \GuzzleHttp\ClientInterface;
+   * @var \GuzzleHttp\Client;
    */
   protected $client;
 
@@ -54,8 +54,8 @@ class StatisticsAdminTest extends WebTestBase {
     $this->privilegedUser = $this->drupalCreateUser(array('administer statistics', 'view post access counter', 'create page content'));
     $this->drupalLogin($this->privilegedUser);
     $this->testNode = $this->drupalCreateNode(array('type' => 'page', 'uid' => $this->privilegedUser->id()));
-    $this->client = \Drupal::httpClient();
-    $this->client->setDefaultOption('config/curl', array(CURLOPT_TIMEOUT => 10));
+    $this->client = \Drupal::service('http_client_factory')
+      ->fromOptions(['config/curl' => [CURLOPT_TIMEOUT => 10]]);
   }
 
   /**
@@ -78,16 +78,16 @@ class StatisticsAdminTest extends WebTestBase {
     $post = array('nid' => $nid);
     global $base_url;
     $stats_path = $base_url . '/' . drupal_get_path('module', 'statistics'). '/statistics.php';
-    $this->client->post($stats_path, array('body' => $post));
+    $this->client->post($stats_path, array('form_params' => $post));
 
     // Hit the node again (the counter is incremented after the hit, so
     // "1 view" will actually be shown when the node is hit the second time).
     $this->drupalGet('node/' . $this->testNode->id());
-    $this->client->post($stats_path, array('body' => $post));
+    $this->client->post($stats_path, array('form_params' => $post));
     $this->assertText('1 view', 'Node is viewed once.');
 
     $this->drupalGet('node/' . $this->testNode->id());
-    $this->client->post($stats_path, array('body' => $post));
+    $this->client->post($stats_path, array('form_params' => $post));
     $this->assertText('2 views', 'Node is viewed 2 times.');
   }
 
@@ -103,7 +103,7 @@ class StatisticsAdminTest extends WebTestBase {
     $post = array('nid' => $nid);
     global $base_url;
     $stats_path = $base_url . '/' . drupal_get_path('module', 'statistics'). '/statistics.php';
-    $this->client->post($stats_path, array('body' => $post));
+    $this->client->post($stats_path, array('form_params' => $post));
 
     $result = db_select('node_counter', 'n')
       ->fields('n', array('nid'))
@@ -137,9 +137,9 @@ class StatisticsAdminTest extends WebTestBase {
     $post = array('nid' => $nid);
     global $base_url;
     $stats_path = $base_url . '/' . drupal_get_path('module', 'statistics'). '/statistics.php';
-    $this->client->post($stats_path, array('body' => $post));
+    $this->client->post($stats_path, array('form_params' => $post));
     $this->drupalGet('node/' . $this->testNode->id());
-    $this->client->post($stats_path, array('body' => $post));
+    $this->client->post($stats_path, array('form_params' => $post));
     $this->assertText('1 view', 'Node is viewed once.');
 
     // statistics_cron() will subtract
diff --git a/core/modules/statistics/src/Tests/StatisticsLoggingTest.php b/core/modules/statistics/src/Tests/StatisticsLoggingTest.php
index 02dcfbcb0..1b83a25ee 100644
--- a/core/modules/statistics/src/Tests/StatisticsLoggingTest.php
+++ b/core/modules/statistics/src/Tests/StatisticsLoggingTest.php
@@ -36,7 +36,7 @@ class StatisticsLoggingTest extends WebTestBase {
   /**
    * The Guzzle HTTP client.
    *
-   * @var \GuzzleHttp\ClientInterface;
+   * @var \GuzzleHttp\Client;
    */
   protected $client;
 
@@ -61,8 +61,8 @@ class StatisticsLoggingTest extends WebTestBase {
     // Clear the logs.
     db_truncate('node_counter');
 
-    $this->client = \Drupal::httpClient();
-    $this->client->setDefaultOption('config/curl', array(CURLOPT_TIMEOUT => 10));
+    $this->client = \Drupal::service('http_client_factory')
+      ->fromOptions(['config/curl' => [CURLOPT_TIMEOUT => 10]]);
   }
 
   /**
@@ -94,7 +94,7 @@ class StatisticsLoggingTest extends WebTestBase {
     // Manually call statistics.php to simulate ajax data collection behavior.
     $nid = $this->node->id();
     $post = array('nid' => $nid);
-    $this->client->post($stats_path, array('body' => $post));
+    $this->client->post($stats_path, array('form_params' => $post));
     $node_counter = statistics_get($this->node->id());
     $this->assertIdentical($node_counter['totalcount'], '1');
   }
diff --git a/core/modules/statistics/src/Tests/StatisticsReportsTest.php b/core/modules/statistics/src/Tests/StatisticsReportsTest.php
index 50e5f5e3e..f2a79ff61 100644
--- a/core/modules/statistics/src/Tests/StatisticsReportsTest.php
+++ b/core/modules/statistics/src/Tests/StatisticsReportsTest.php
@@ -30,8 +30,8 @@ class StatisticsReportsTest extends StatisticsTestBase {
     $headers = array('Content-Type' => 'application/x-www-form-urlencoded');
     global $base_url;
     $stats_path = $base_url . '/' . drupal_get_path('module', 'statistics'). '/statistics.php';
-    $client = \Drupal::httpClient();
-    $client->setDefaultOption('config/curl', array(CURLOPT_TIMEOUT => 10));
+    $client = \Drupal::service('http_client_factory')
+      ->fromOptions(['config/curl' => [CURLOPT_TIMEOUT => 10]]);
     $client->post($stats_path, array('headers' => $headers, 'body' => $post));
 
     // Configure and save the block.
diff --git a/core/modules/statistics/src/Tests/StatisticsTokenReplaceTest.php b/core/modules/statistics/src/Tests/StatisticsTokenReplaceTest.php
index 9534c8a28..792c40ab2 100644
--- a/core/modules/statistics/src/Tests/StatisticsTokenReplaceTest.php
+++ b/core/modules/statistics/src/Tests/StatisticsTokenReplaceTest.php
@@ -33,8 +33,8 @@ class StatisticsTokenReplaceTest extends StatisticsTestBase {
     $headers = array('Content-Type' => 'application/x-www-form-urlencoded');
     global $base_url;
     $stats_path = $base_url . '/' . drupal_get_path('module', 'statistics'). '/statistics.php';
-    $client = \Drupal::httpClient();
-    $client->setDefaultOption('config/curl', array(CURLOPT_TIMEOUT => 10));
+    $client = \Drupal::service('http_client_factory')
+      ->fromOptions(['config/curl' => [CURLOPT_TIMEOUT => 10]]);
     $client->post($stats_path, array('headers' => $headers, 'body' => $post));
     $statistics = statistics_get($node->id());
 
diff --git a/core/modules/statistics/src/Tests/Views/IntegrationTest.php b/core/modules/statistics/src/Tests/Views/IntegrationTest.php
index d83a38773..0b8b8c8d8 100644
--- a/core/modules/statistics/src/Tests/Views/IntegrationTest.php
+++ b/core/modules/statistics/src/Tests/Views/IntegrationTest.php
@@ -76,9 +76,8 @@ class IntegrationTest extends ViewTestBase {
     // @see \Drupal\statistics\Tests\StatisticsLoggingTest::testLogging().
     global $base_url;
     $stats_path = $base_url . '/' . drupal_get_path('module', 'statistics'). '/statistics.php';
-    $client = \Drupal::httpClient();
-    $client->setDefaultOption('config/curl', array(CURLOPT_TIMEOUT => 10));
-    $client->post($stats_path, array('body' => array('nid' => $this->node->id())));
+    $client = \Drupal::service('http_client_factory')->fromOptions(['config/curl', array(CURLOPT_TIMEOUT => 10)]);
+    $client->post($stats_path, array('form_params' => array('nid' => $this->node->id())));
     $this->drupalGet('test_statistics_integration');
 
     $expected = statistics_get($this->node->id());
diff --git a/core/modules/statistics/statistics.tokens.inc b/core/modules/statistics/statistics.tokens.inc
index d2be86c20..e9d8ded43 100644
--- a/core/modules/statistics/statistics.tokens.inc
+++ b/core/modules/statistics/statistics.tokens.inc
@@ -5,6 +5,8 @@
  * Builds placeholder replacement tokens for node visitor statistics.
  */
 
+use Drupal\Core\Render\BubbleableMetadata;
+
 /**
  * Implements hook_token_info().
  */
@@ -31,7 +33,7 @@ function statistics_token_info() {
 /**
  * Implements hook_tokens().
  */
-function statistics_tokens($type, $tokens, array $data = array(), array $options = array()) {
+function statistics_tokens($type, $tokens, array $data, array $options, BubbleableMetadata $bubbleable_metadata) {
   $token_service = \Drupal::token();
 
   $replacements = array();
@@ -56,7 +58,7 @@ function statistics_tokens($type, $tokens, array $data = array(), array $options
 
     if ($created_tokens = $token_service->findWithPrefix($tokens, 'last-view')) {
       $statistics = statistics_get($node->id());
-      $replacements += $token_service->generate('date', $created_tokens, array('date' => $statistics['timestamp']), $options);
+      $replacements += $token_service->generate('date', $created_tokens, array('date' => $statistics['timestamp']), $options, $bubbleable_metadata);
     }
   }
 
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_syslog_settings.yml b/core/modules/syslog/migration_templates/d6_syslog_settings.yml
similarity index 83%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_syslog_settings.yml
rename to core/modules/syslog/migration_templates/d6_syslog_settings.yml
index e96285620..4c9fd4969 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_syslog_settings.yml
+++ b/core/modules/syslog/migration_templates/d6_syslog_settings.yml
@@ -13,7 +13,3 @@ process:
 destination:
   plugin: config
   config_name: syslog.settings
-dependencies:
-  module:
-    - migrate_drupal
-    - syslog
diff --git a/core/modules/syslog/migration_templates/d7_syslog_settings.yml b/core/modules/syslog/migration_templates/d7_syslog_settings.yml
new file mode 100644
index 000000000..e99b78e78
--- /dev/null
+++ b/core/modules/syslog/migration_templates/d7_syslog_settings.yml
@@ -0,0 +1,17 @@
+id: d7_syslog_settings
+label: Drupal 7 syslog configuration
+migration_tags:
+  - Drupal 7
+source:
+  plugin: variable
+  variables:
+    - syslog_facility
+    - syslog_format
+    - syslog_identity
+process:
+  facility: syslog_facility
+  format: syslog_format
+  identity: syslog_identity
+destination:
+  plugin: config
+  config_name: syslog.settings
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateSyslogConfigsTest.php b/core/modules/syslog/src/Tests/Migrate/d6/MigrateSyslogConfigsTest.php
similarity index 66%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateSyslogConfigsTest.php
rename to core/modules/syslog/src/Tests/Migrate/d6/MigrateSyslogConfigsTest.php
index 1b6fd4018..19d9505d7 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateSyslogConfigsTest.php
+++ b/core/modules/syslog/src/Tests/Migrate/d6/MigrateSyslogConfigsTest.php
@@ -2,19 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateSyslogConfigsTest.
+ * Contains \Drupal\syslog\Tests\Migrate\d6\MigrateSyslogConfigsTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\syslog\Tests\Migrate\d6;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to syslog.settings.yml.
  *
- * @group migrate_drupal
+ * @group syslog
  */
 class MigrateSyslogConfigsTest extends MigrateDrupal6TestBase {
 
@@ -32,13 +31,8 @@ class MigrateSyslogConfigsTest extends MigrateDrupal6TestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $migration = entity_load('migration', 'd6_syslog_settings');
-    $dumps = array(
-      $this->getDumpDirectory() . '/Variable.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->loadDumps(['Variable.php']);
+    $this->executeMigration('d6_syslog_settings');
   }
 
   /**
diff --git a/core/modules/syslog/src/Tests/Migrate/d7/MigrateSyslogConfigsTest.php b/core/modules/syslog/src/Tests/Migrate/d7/MigrateSyslogConfigsTest.php
new file mode 100644
index 000000000..234a52f91
--- /dev/null
+++ b/core/modules/syslog/src/Tests/Migrate/d7/MigrateSyslogConfigsTest.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\syslog\Tests\Migrate\d7\MigrateSyslogConfigsTest.
+ */
+
+namespace Drupal\syslog\Tests\Migrate\d7;
+
+use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
+
+/**
+ * Upgrade variables to syslog.settings.yml.
+ *
+ * @group syslog
+ */
+class MigrateSyslogConfigsTest extends MigrateDrupal7TestBase {
+
+  use SchemaCheckTestTrait;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['syslog'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(static::$modules);
+    $this->loadDumps(['Variable.php']);
+    $this->executeMigration('d7_syslog_settings');
+  }
+
+  /**
+   * Tests migration of syslog variables to syslog.settings.yml.
+   */
+  public function testSyslogSettings() {
+    $config = $this->config('syslog.settings');
+    // 8 == LOG_USER
+    $this->assertIdentical('8', $config->get('facility'));
+    $this->assertIdentical('!base_url|!timestamp|!type|!ip|!request_uri|!referer|!uid|!link|!message', $config->get('format'));
+    $this->assertIdentical('drupal', $config->get('identity'));
+  }
+
+}
diff --git a/core/modules/system/config/install/system.filter.yml b/core/modules/system/config/install/system.filter.yml
deleted file mode 100644
index 12ce55a4e..000000000
--- a/core/modules/system/config/install/system.filter.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-protocols:
-  - http
-  - https
-  - ftp
-  - news
-  - nntp
-  - tel
-  - telnet
-  - mailto
-  - irc
-  - ssh
-  - sftp
-  - webcal
-  - rtsp
diff --git a/core/modules/system/config/schema/system.schema.yml b/core/modules/system/config/schema/system.schema.yml
index 7cde50d5a..12b0e6c17 100644
--- a/core/modules/system/config/schema/system.schema.yml
+++ b/core/modules/system/config/schema/system.schema.yml
@@ -126,17 +126,6 @@ system.diff:
           type: integer
           label: 'Number of trailing lines in a diff'
 
-system.filter:
-  type: config_object
-  label: 'Filter settings'
-  mapping:
-    protocols:
-      type: sequence
-      label: 'Allowed protocols'
-      sequence:
-        type: string
-        label: 'Protocol'
-
 system.logging:
   type: config_object
   label: 'Logging settings'
diff --git a/core/modules/system/css/system.theme.css b/core/modules/system/css/system.theme.css
index fa7a75bce..3a8bddbf6 100644
--- a/core/modules/system/css/system.theme.css
+++ b/core/modules/system/css/system.theme.css
@@ -114,7 +114,7 @@ abbr.ajax-changed {
 }
 
 /* Inline error messages. */
-.form-error-message:before {
+.form-item--error-message:before {
   content: '';
   display: inline-block;
   height: 14px;
@@ -164,6 +164,19 @@ abbr.ajax-changed {
   padding: 1px 20px 1px 0;
 }
 
+/**
+ * Feed Icon.
+ * Markup generated by feed-icon.html.twig.
+ */
+.feed-icon {
+  background: url(../../../misc/feed.png) no-repeat;
+  overflow: hidden;
+  text-indent: -9999px;
+  display: block;
+  width: 16px;
+  height: 16px;
+}
+
 /**
  * Markup generated by pager.html.twig.
  */
diff --git a/core/modules/system/js/system.modules.js b/core/modules/system/js/system.modules.js
index 49a98796a..f9c08e476 100644
--- a/core/modules/system/js/system.modules.js
+++ b/core/modules/system/js/system.modules.js
@@ -3,7 +3,7 @@
  * Module page behaviors.
  */
 
-(function ($, Drupal) {
+(function ($, Drupal, debounce) {
 
   "use strict";
 
@@ -15,7 +15,7 @@
    *
    * Text search input: input.table-filter-text
    * Target table:      input.table-filter-text[data-table]
-   * Source text:       .table-filter-text-source
+   * Source text:       .table-filter-text-source, .module-name, .module-description
    *
    * @type {Drupal~behavior}
    */
@@ -30,17 +30,19 @@
 
       function hidePackageDetails(index, element) {
         var $packDetails = $(element);
-        var $visibleRows = $packDetails.find('table:not(.sticky-header)').find('tbody tr:visible');
+        var $visibleRows = $packDetails.find('tbody tr:visible');
         $packDetails.toggle($visibleRows.length > 0);
       }
 
       function filterModuleList(e) {
-        var query = $(e.target).val().toLowerCase();
+        var query = $(e.target).val();
+        // Case insensitive expression to find query at the beginning of a word.
+        var re = new RegExp('\\b' + query, 'i');
 
         function showModuleRow(index, row) {
           var $row = $(row);
-          var $sources = $row.find('.table-filter-text-source');
-          var textMatch = $sources.text().toLowerCase().indexOf(query) !== -1;
+          var $sources = $row.find('.table-filter-text-source, .module-name, .module-description');
+          var textMatch = $sources.text().search(re) !== -1;
           $row.closest('tr').toggle(textMatch);
         }
         // Search over all rows and packages.
@@ -59,6 +61,13 @@
           // Hide the package <details> if they don't have any visible rows.
           // Note that we first show() all <details> to be able to use ':visible'.
           $details.attr('open', true).each(hidePackageDetails);
+
+          Drupal.announce(
+            Drupal.t(
+              '!modules modules are available in the modified list.',
+              {'!modules': $rowsAndDetails.find('tbody tr:visible').length}
+            )
+          );
         }
         else if (searching) {
           searching = false;
@@ -71,14 +80,24 @@
         }
       }
 
+      function preventEnterKey(event) {
+        if (event.which === 13) {
+          event.preventDefault();
+          event.stopPropagation();
+        }
+      }
+
       if ($table.length) {
         $rowsAndDetails = $table.find('tr, details');
         $rows = $table.find('tbody tr');
         $details = $rowsAndDetails.filter('.package-listing');
 
-        $input.on('keyup', filterModuleList);
+        $input.on({
+          keyup: debounce(filterModuleList, 200),
+          keydown: preventEnterKey
+        });
       }
     }
   };
 
-}(jQuery, Drupal));
+}(jQuery, Drupal, Drupal.debounce));
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_date_formats.yml b/core/modules/system/migration_templates/d6_date_formats.yml
similarity index 90%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_date_formats.yml
rename to core/modules/system/migration_templates/d6_date_formats.yml
index 44448e671..c7f342220 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_date_formats.yml
+++ b/core/modules/system/migration_templates/d6_date_formats.yml
@@ -19,6 +19,3 @@ process:
   pattern: value
 destination:
   plugin: entity:date_format
-dependencies:
-  module:
-    - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_menu.yml b/core/modules/system/migration_templates/d6_menu.yml
similarity index 76%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_menu.yml
rename to core/modules/system/migration_templates/d6_menu.yml
index 4def0bf37..0d353c22e 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_menu.yml
+++ b/core/modules/system/migration_templates/d6_menu.yml
@@ -10,7 +10,3 @@ process:
   description: description
 destination:
   plugin: entity:menu
-dependencies:
-  module:
-    - migrate_drupal
-    - system
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_cron.yml b/core/modules/system/migration_templates/d6_system_cron.yml
similarity index 86%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_cron.yml
rename to core/modules/system/migration_templates/d6_system_cron.yml
index 47be1354f..01970a900 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_cron.yml
+++ b/core/modules/system/migration_templates/d6_system_cron.yml
@@ -14,7 +14,3 @@ process:
 destination:
   plugin: config
   config_name: system.cron
-dependencies:
-  module:
-    - migrate_drupal
-    - system
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_file.yml b/core/modules/system/migration_templates/d6_system_file.yml
similarity index 87%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_file.yml
rename to core/modules/system/migration_templates/d6_system_file.yml
index 925b5a9fe..1405ff5a2 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_file.yml
+++ b/core/modules/system/migration_templates/d6_system_file.yml
@@ -18,7 +18,3 @@ process:
 destination:
   plugin: config
   config_name: system.file
-dependencies:
-  module:
-    - migrate_drupal
-    - system
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_image.yml b/core/modules/system/migration_templates/d6_system_image.yml
similarity index 80%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_image.yml
rename to core/modules/system/migration_templates/d6_system_image.yml
index 9581291e8..f19d516ac 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_image.yml
+++ b/core/modules/system/migration_templates/d6_system_image.yml
@@ -11,7 +11,3 @@ process:
 destination:
   plugin: config
   config_name: system.image
-dependencies:
-  module:
-    - migrate_drupal
-    - system
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_image_gd.yml b/core/modules/system/migration_templates/d6_system_image_gd.yml
similarity index 82%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_image_gd.yml
rename to core/modules/system/migration_templates/d6_system_image_gd.yml
index 583ca5bea..52b90520a 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_image_gd.yml
+++ b/core/modules/system/migration_templates/d6_system_image_gd.yml
@@ -11,7 +11,3 @@ process:
 destination:
   plugin: config
   config_name: system.image.gd
-dependencies:
-  module:
-    - migrate_drupal
-    - system
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_logging.yml b/core/modules/system/migration_templates/d6_system_logging.yml
similarity index 86%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_logging.yml
rename to core/modules/system/migration_templates/d6_system_logging.yml
index b75bc7e97..bca03ec08 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_logging.yml
+++ b/core/modules/system/migration_templates/d6_system_logging.yml
@@ -19,7 +19,3 @@ process:
 destination:
   plugin: config
   config_name: system.logging
-dependencies:
-  module:
-    - migrate_drupal
-    - system
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_maintenance.yml b/core/modules/system/migration_templates/d6_system_maintenance.yml
similarity index 82%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_maintenance.yml
rename to core/modules/system/migration_templates/d6_system_maintenance.yml
index 0d93cd13f..b902551ac 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_maintenance.yml
+++ b/core/modules/system/migration_templates/d6_system_maintenance.yml
@@ -11,7 +11,3 @@ process:
 destination:
   plugin: config
   config_name: system.maintenance
-dependencies:
-  module:
-    - migrate_drupal
-    - system
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_performance.yml b/core/modules/system/migration_templates/d6_system_performance.yml
similarity index 88%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_performance.yml
rename to core/modules/system/migration_templates/d6_system_performance.yml
index a10edfd27..edff8115e 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_performance.yml
+++ b/core/modules/system/migration_templates/d6_system_performance.yml
@@ -18,7 +18,3 @@ process:
 destination:
   plugin: config
   config_name: system.performance
-dependencies:
-  module:
-    - migrate_drupal
-    - system
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_rss.yml b/core/modules/system/migration_templates/d6_system_rss.yml
similarity index 84%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_rss.yml
rename to core/modules/system/migration_templates/d6_system_rss.yml
index 7f5d3d4a6..7d5fd146d 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_rss.yml
+++ b/core/modules/system/migration_templates/d6_system_rss.yml
@@ -13,7 +13,3 @@ process:
 destination:
   plugin: config
   config_name: system.rss
-dependencies:
-  module:
-    - migrate_drupal
-    - system
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_site.yml b/core/modules/system/migration_templates/d6_system_site.yml
similarity index 93%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_site.yml
rename to core/modules/system/migration_templates/d6_system_site.yml
index 78bb7ab82..04b99ceeb 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_site.yml
+++ b/core/modules/system/migration_templates/d6_system_site.yml
@@ -39,7 +39,3 @@ process:
 destination:
   plugin: config
   config_name: system.site
-dependencies:
-  module:
-    - migrate_drupal
-    - system
diff --git a/core/modules/system/src/Controller/DbUpdateController.php b/core/modules/system/src/Controller/DbUpdateController.php
index d207a42ab..f6b122776 100644
--- a/core/modules/system/src/Controller/DbUpdateController.php
+++ b/core/modules/system/src/Controller/DbUpdateController.php
@@ -220,7 +220,7 @@ class DbUpdateController extends ControllerBase {
 
     $info[] = $this->t("<strong>Back up your code</strong>. Hint: when backing up module code, do not leave that backup in the 'modules' or 'sites/*/modules' directories as this may confuse Drupal's auto-discovery mechanism.");
     $info[] = $this->t('Put your site into <a href="@url">maintenance mode</a>.', array(
-      '@url' => $this->url('system.site_maintenance_mode'),
+      '@url' => Url::fromRoute('system.site_maintenance_mode')->toString(TRUE)->getGeneratedUrl(),
     ));
     $info[] = $this->t('<strong>Back up your database</strong>. This process will change your database values and in case of emergency you may need to revert to a backup.');
     $info[] = $this->t('Install your new files in the appropriate location, as described in the handbook.');
@@ -388,7 +388,7 @@ class DbUpdateController extends ControllerBase {
     $dblog_exists = $this->moduleHandler->moduleExists('dblog');
     if ($dblog_exists && $this->account->hasPermission('access site reports')) {
       $log_message = $this->t('All errors have been <a href="@url">logged</a>.', array(
-        '@url' => $this->url('dblog.overview'),
+        '@url' => Url::fromRoute('dblog.overview')->toString(TRUE)->getGeneratedUrl(),
       ));
     }
     else {
@@ -396,7 +396,7 @@ class DbUpdateController extends ControllerBase {
     }
 
     if (!empty($_SESSION['update_success'])) {
-      $message = '<p>' . $this->t('Updates were attempted. If you see no failures below, you may proceed happily back to your <a href="@url">site</a>. Otherwise, you may need to update your database manually.', array('@url' => $this->url('<front>'))) . ' ' . $log_message . '</p>';
+      $message = '<p>' . $this->t('Updates were attempted. If you see no failures below, you may proceed happily back to your <a href="@url">site</a>. Otherwise, you may need to update your database manually.', array('@url' => Url::fromRoute('<front>')->toString(TRUE)->getGeneratedUrl())) . ' ' . $log_message . '</p>';
     }
     else {
       $last = reset($_SESSION['updates_remaining']);
@@ -497,7 +497,7 @@ class DbUpdateController extends ControllerBase {
    */
   public function requirements($severity, array $requirements) {
     $options = $severity == REQUIREMENT_WARNING ? array('continue' => 1) : array();
-    $try_again_url = $this->url('system.db_update', $options);
+    $try_again_url = Url::fromRoute('system.db_update', $options)->toString(TRUE)->getGeneratedUrl();
 
     $build['status_report'] = array(
       '#theme' => 'status_report',
@@ -556,13 +556,6 @@ class DbUpdateController extends ControllerBase {
 
     $operations = array();
 
-    // First of all perform entity definition updates, which will update
-    // storage schema if needed, so that module update functions work with
-    // the correct entity schema.
-    if ($this->entityDefinitionUpdateManager->needsUpdates()) {
-      $operations[] = array('update_entity_definitions', array('system', '0 - Update entity definitions'));
-    }
-
     // Resolve any update dependencies to determine the actual updates that will
     // be run and the order they will be run in.
     $start = $this->getModuleUpdates();
@@ -578,7 +571,7 @@ class DbUpdateController extends ControllerBase {
     }
 
     // Determine updates to be performed.
-    foreach ($updates as $update) {
+    foreach ($updates as $function => $update) {
       if ($update['allowed']) {
         // Set the installed version of each module so updates will start at the
         // correct place. (The updates are already sorted, so we can simply base
@@ -587,11 +580,20 @@ class DbUpdateController extends ControllerBase {
           drupal_set_installed_schema_version($update['module'], $update['number'] - 1);
           unset($start[$update['module']]);
         }
-        // Add this update function to the batch.
-        $function = $update['module'] . '_update_' . $update['number'];
         $operations[] = array('update_do_one', array($update['module'], $update['number'], $dependency_map[$function]));
       }
     }
+
+    // Lastly, perform entity definition updates, which will update storage
+    // schema if needed. If module update functions need to work with specific
+    // entity schema they should call the entity update service for the specific
+    // update themselves.
+    // @see \Drupal\Core\Entity\EntityDefinitionUpdateManagerInterface::applyEntityUpdate()
+    // @see \Drupal\Core\Entity\EntityDefinitionUpdateManagerInterface::applyFieldUpdate()
+    if ($this->entityDefinitionUpdateManager->needsUpdates()) {
+      $operations[] = array('update_entity_definitions', array());
+    }
+
     $batch['operations'] = $operations;
     $batch += array(
       'title' => $this->t('Updating'),
diff --git a/core/modules/system/src/Controller/FormAjaxController.php b/core/modules/system/src/Controller/FormAjaxController.php
deleted file mode 100644
index 084847a81..000000000
--- a/core/modules/system/src/Controller/FormAjaxController.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Controller\FormAjaxController.
- */
-
-namespace Drupal\system\Controller;
-
-use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
-use Drupal\Core\Form\FormAjaxResponseBuilderInterface;
-use Drupal\Core\Form\FormState;
-use Drupal\Core\Form\FormBuilderInterface;
-use Drupal\Core\Render\MainContent\MainContentRendererInterface;
-use Drupal\Core\Render\RendererInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\system\FileAjaxForm;
-use Psr\Log\LoggerInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
-
-/**
- * Defines a controller to respond to form Ajax requests.
- */
-class FormAjaxController implements ContainerInjectionInterface {
-
-  /**
-   * A logger instance.
-   *
-   * @var \Psr\Log\LoggerInterface
-   */
-  protected $logger;
-
-  /**
-   * The form builder.
-   *
-   * @var \Drupal\Core\Form\FormBuilderInterface|\Drupal\Core\Form\FormCacheInterface
-   */
-  protected $formBuilder;
-
-  /**
-   * The renderer.
-   *
-   * @var \Drupal\Core\Render\RendererInterface
-   */
-  protected $renderer;
-
-  /**
-   * The main content to AJAX Response renderer.
-   *
-   * @var \Drupal\Core\Render\MainContent\MainContentRendererInterface
-   */
-  protected $ajaxRenderer;
-
-  /**
-   * The current route match.
-   *
-   * @var \Drupal\Core\Routing\RouteMatchInterface
-   */
-  protected $routeMatch;
-
-  /**
-   * The form AJAX response builder.
-   *
-   * @var \Drupal\Core\Form\FormAjaxResponseBuilderInterface
-   */
-  protected $formAjaxResponseBuilder;
-
-  /**
-   * Constructs a FormAjaxController object.
-   *
-   * @param \Psr\Log\LoggerInterface $logger
-   *   A logger instance.
-   * @param \Drupal\Core\Form\FormBuilderInterface $form_builder
-   *   The form builder.
-   * @param \Drupal\Core\Render\RendererInterface $renderer
-   *   The renderer.
-   * @param \Drupal\Core\Render\MainContent\MainContentRendererInterface $ajax_renderer
-   *   The main content to AJAX Response renderer.
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
-   *   The current route match.
-   * @param \Drupal\Core\Form\FormAjaxResponseBuilderInterface $form_ajax_response_builder
-   *   The form AJAX response builder.
-   */
-  public function __construct(LoggerInterface $logger, FormBuilderInterface $form_builder, RendererInterface $renderer, MainContentRendererInterface $ajax_renderer, RouteMatchInterface $route_match, FormAjaxResponseBuilderInterface $form_ajax_response_builder) {
-    $this->logger = $logger;
-    $this->formBuilder = $form_builder;
-    $this->renderer = $renderer;
-    $this->ajaxRenderer = $ajax_renderer;
-    $this->routeMatch = $route_match;
-    $this->formAjaxResponseBuilder = $form_ajax_response_builder;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('logger.factory')->get('ajax'),
-      $container->get('form_builder'),
-      $container->get('renderer'),
-      $container->get('main_content_renderer.ajax'),
-      $container->get('current_route_match'),
-      $container->get('form_ajax_response_builder')
-    );
-  }
-
-  /**
-   * Processes an Ajax form submission.
-   *
-   * @param \Symfony\Component\HttpFoundation\Request $request
-   *   The current request object.
-   *
-   * @return mixed
-   *   Whatever is returned by the triggering element's #ajax['callback']
-   *   function. One of:
-   *   - A render array containing the new or updated content to return to the
-   *     browser. This is commonly an element within the rebuilt form.
-   *   - A \Drupal\Core\Ajax\AjaxResponse object containing commands for the
-   *     browser to process.
-   *
-   * @throws \Symfony\Component\HttpKernel\Exception\HttpExceptionInterface
-   */
-  public function content(Request $request) {
-    $ajax_form = $this->getForm($request);
-    $form = $ajax_form->getForm();
-    $form_state = $ajax_form->getFormState();
-    $commands = $ajax_form->getCommands();
-
-    $this->formBuilder->processForm($form['#form_id'], $form, $form_state);
-
-    return $this->formAjaxResponseBuilder->buildResponse($request, $form, $form_state, $commands);
-  }
-
-  /**
-   * Gets a form submitted via #ajax during an Ajax callback.
-   *
-   * This will load a form from the form cache used during Ajax operations. It
-   * pulls the form info from the request body.
-   *
-   * @param \Symfony\Component\HttpFoundation\Request $request
-   *   The current request object.
-   *
-   * @return \Drupal\system\FileAjaxForm
-   *   A wrapper object containing the $form, $form_state, $form_id,
-   *   $form_build_id and an initial list of Ajax $commands.
-   *
-   * @throws \Symfony\Component\HttpKernel\Exception\HttpExceptionInterface
-   */
-  protected function getForm(Request $request) {
-    $form_state = new FormState();
-    $form_build_id = $request->request->get('form_build_id');
-
-    // Get the form from the cache.
-    $form = $this->formBuilder->getCache($form_build_id, $form_state);
-    if (!$form) {
-      // If $form cannot be loaded from the cache, the form_build_id must be
-      // invalid, which means that someone performed a POST request onto
-      // system/ajax without actually viewing the concerned form in the browser.
-      // This is likely a hacking attempt as it never happens under normal
-      // circumstances.
-      $this->logger->warning('Invalid form POST data.');
-      throw new BadRequestHttpException();
-    }
-
-    // Since some of the submit handlers are run, redirects need to be disabled.
-    $form_state->disableRedirect();
-
-    // When a form is rebuilt after Ajax processing, its #build_id and #action
-    // should not change.
-    // @see \Drupal\Core\Form\FormBuilderInterface::rebuildForm()
-    $form_state->addRebuildInfo('copy', [
-      '#build_id' => TRUE,
-      '#action' => TRUE,
-    ]);
-
-    // The form needs to be processed; prepare for that by setting a few
-    // internal variables.
-    $form_state->setUserInput($request->request->all());
-    $form_id = $form['#form_id'];
-
-    return new FileAjaxForm($form, $form_state, $form_id, $form['#build_id'], []);
-  }
-
-}
diff --git a/core/modules/system/src/Controller/SystemController.php b/core/modules/system/src/Controller/SystemController.php
index 20ea39e40..6bae39764 100644
--- a/core/modules/system/src/Controller/SystemController.php
+++ b/core/modules/system/src/Controller/SystemController.php
@@ -241,9 +241,10 @@ class SystemController extends ControllerBase {
 
       if (empty($theme->status)) {
         // Ensure this theme is compatible with this version of core.
+        $theme->incompatible_core = !isset($theme->info['core']) || ($theme->info['core'] != \DRUPAL::CORE_COMPATIBILITY);
         // Require the 'content' region to make sure the main page
         // content has a common place in all themes.
-        $theme->incompatible_core = !isset($theme->info['core']) || ($theme->info['core'] != \DRUPAL::CORE_COMPATIBILITY) || !isset($theme->info['regions']['content']);
+        $theme->incompatible_region = !isset($theme->info['regions']['content']);
         $theme->incompatible_php = version_compare(phpversion(), $theme->info['php']) < 0;
         // Confirmed that the base theme is available.
         $theme->incompatible_base = isset($theme->info['base theme']) && !isset($themes[$theme->info['base theme']]);
diff --git a/core/modules/system/src/DateFormatListBuilder.php b/core/modules/system/src/DateFormatListBuilder.php
index ba7511bcf..29b201cd6 100644
--- a/core/modules/system/src/DateFormatListBuilder.php
+++ b/core/modules/system/src/DateFormatListBuilder.php
@@ -59,7 +59,6 @@ class DateFormatListBuilder extends ConfigEntityListBuilder {
    * {@inheritdoc}
    */
   public function buildHeader() {
-    $header['id'] = t('Machine name');
     $header['label'] = t('Name');
     $header['pattern'] = t('Pattern');
     return $header + parent::buildHeader();
@@ -69,12 +68,6 @@ class DateFormatListBuilder extends ConfigEntityListBuilder {
    * {@inheritdoc}
    */
   public function buildRow(EntityInterface $entity) {
-    if ($entity->isLocked()) {
-      $row['id'] =  $this->t('@entity_id (locked)', array('@entity_id' => $entity->id()));
-    }
-    else {
-      $row['id'] = $entity->id();
-    }
     $row['label'] = $this->getLabel($entity);
     $row['pattern'] = $this->dateFormatter->format(REQUEST_TIME, $entity->id());
     return $row + parent::buildRow($entity);
diff --git a/core/modules/system/src/Form/DateFormatFormBase.php b/core/modules/system/src/Form/DateFormatFormBase.php
index aeaa12a7b..b8d0e1788 100644
--- a/core/modules/system/src/Form/DateFormatFormBase.php
+++ b/core/modules/system/src/Form/DateFormatFormBase.php
@@ -126,8 +126,8 @@ abstract class DateFormatFormBase extends EntityForm {
   /**
    * {@inheritdoc}
    */
-  public function validate(array $form, FormStateInterface $form_state) {
-    parent::validate($form, $form_state);
+  public function validateForm(array &$form, FormStateInterface $form_state) {
+    parent::validateForm($form, $form_state);
 
     // The machine name field should already check to see if the requested
     // machine name is available. Regardless of machine_name or human readable
diff --git a/core/modules/system/src/Form/ModulesListConfirmForm.php b/core/modules/system/src/Form/ModulesListConfirmForm.php
index 5449b4108..dea5207a6 100644
--- a/core/modules/system/src/Form/ModulesListConfirmForm.php
+++ b/core/modules/system/src/Form/ModulesListConfirmForm.php
@@ -150,16 +150,13 @@ class ModulesListConfirmForm extends ConfirmFormBase {
     $account = $this->currentUser()->id();
     $this->keyValueExpirable->delete($account);
 
-    // Gets list of modules prior to install process.
-    $before = $this->moduleHandler->getModuleList();
-
-    // Install the given modules.
     if (!empty($this->modules['install'])) {
       // Don't catch the exception that this can throw for missing dependencies:
       // the form doesn't allow modules with unmet dependencies, so the only way
       // this can happen is if the filesystem changed between form display and
       // submit, in which case the user has bigger problems.
       try {
+        // Install the given modules.
         $this->moduleInstaller->install(array_keys($this->modules['install']));
       }
       catch (PreExistingConfigException $e) {
@@ -184,12 +181,12 @@ class ModulesListConfirmForm extends ConfirmFormBase {
         );
         return;
       }
-    }
 
-    // Gets module list after install process, flushes caches and displays a
-    // message if there are changes.
-    if ($before != $this->moduleHandler->getModuleList()) {
-      drupal_set_message($this->t('The configuration options have been saved.'));
+      $module_names = array_values($this->modules['install']);
+      drupal_set_message($this->formatPlural(count($module_names), 'Module %name has been enabled.', '@count modules have been enabled: %names.', array(
+        '%name' => $module_names[0],
+        '%names' => implode(', ', $module_names),
+      )));
     }
 
     $form_state->setRedirectUrl($this->getCancelUrl());
diff --git a/core/modules/system/src/Form/ModulesListForm.php b/core/modules/system/src/Form/ModulesListForm.php
index 173fcc721..289928f4d 100644
--- a/core/modules/system/src/Form/ModulesListForm.php
+++ b/core/modules/system/src/Form/ModulesListForm.php
@@ -24,6 +24,7 @@ use Drupal\Core\Render\Element;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Routing\RouteProviderInterface;
 use Drupal\Core\Session\AccountInterface;
+use Drupal\user\PermissionHandlerInterface;
 use Drupal\Core\Url;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
@@ -94,6 +95,13 @@ class ModulesListForm extends FormBase {
    */
   protected $moduleInstaller;
 
+  /**
+   * The permission handler.
+   *
+   * @var \Drupal\user\PermissionHandlerInterface
+   */
+  protected $permissionHandler;
+
   /**
    * {@inheritdoc}
    */
@@ -107,7 +115,8 @@ class ModulesListForm extends FormBase {
       $container->get('current_route_match'),
       $container->get('title_resolver'),
       $container->get('router.route_provider'),
-      $container->get('plugin.manager.menu.link')
+      $container->get('plugin.manager.menu.link'),
+      $container->get('user.permissions')
     );
   }
 
@@ -132,8 +141,10 @@ class ModulesListForm extends FormBase {
    *   The route provider.
    * @param \Drupal\Core\Menu\MenuLinkManagerInterface $menu_link_manager
    *   The menu link manager.
+   * @param \Drupal\user\PermissionHandlerInterface $permission_handler
+   *   The permission handler.
    */
-  public function __construct(ModuleHandlerInterface $module_handler, ModuleInstallerInterface $module_installer, KeyValueStoreExpirableInterface $key_value_expirable, AccessManagerInterface $access_manager, AccountInterface $current_user, RouteMatchInterface $route_match, TitleResolverInterface $title_resolver, RouteProviderInterface $route_provider, MenuLinkManagerInterface $menu_link_manager) {
+  public function __construct(ModuleHandlerInterface $module_handler, ModuleInstallerInterface $module_installer, KeyValueStoreExpirableInterface $key_value_expirable, AccessManagerInterface $access_manager, AccountInterface $current_user, RouteMatchInterface $route_match, TitleResolverInterface $title_resolver, RouteProviderInterface $route_provider, MenuLinkManagerInterface $menu_link_manager, PermissionHandlerInterface $permission_handler) {
     $this->moduleHandler = $module_handler;
     $this->moduleInstaller = $module_installer;
     $this->keyValueExpirable = $key_value_expirable;
@@ -143,6 +154,7 @@ class ModulesListForm extends FormBase {
     $this->titleResolver = $title_resolver;
     $this->routeProvider = $route_provider;
     $this->menuLinkManager = $menu_link_manager;
+    $this->permissionHandler = $permission_handler;
   }
 
   /**
@@ -171,14 +183,15 @@ class ModulesListForm extends FormBase {
 
     $form['filters']['text'] = array(
       '#type' => 'search',
-      '#title' => $this->t('Search'),
+      '#title' => $this->t('Filter modules'),
+      '#title_display' => 'invisible',
       '#size' => 30,
-      '#placeholder' => $this->t('Enter module name'),
+      '#placeholder' => $this->t('Filter by name or description'),
+      '#description' => $this->t('Enter a part of the module name or description'),
       '#attributes' => array(
         'class' => array('table-filter-text'),
         'data-table' => '#system-modules',
         'autocomplete' => 'off',
-        'title' => $this->t('Enter a part of the module name or description to filter by.'),
       ),
     );
 
@@ -226,7 +239,7 @@ class ModulesListForm extends FormBase {
     $form['actions'] = array('#type' => 'actions');
     $form['actions']['submit'] = array(
       '#type' => 'submit',
-      '#value' => $this->t('Save configuration'),
+      '#value' => $this->t('Install'),
       '#button_type' => 'primary',
     );
 
@@ -270,7 +283,7 @@ class ModulesListForm extends FormBase {
 
     // Generate link for module's permission, if the user has access to it.
     $row['links']['permissions'] = array();
-    if ($module->status && \Drupal::currentUser()->hasPermission('administer permissions') && in_array($module->getName(), $this->moduleHandler->getImplementations('permission'))) {
+    if ($module->status && $this->currentUser->hasPermission('administer permissions') && $this->permissionHandler->moduleProvidesPermissions($module->getName())) {
       $row['links']['permissions'] = array(
         '#type' => 'link',
         '#title' => $this->t('Permissions'),
@@ -503,13 +516,15 @@ class ModulesListForm extends FormBase {
       return;
     }
 
-    // Gets list of modules prior to install process.
-    $before = $this->moduleHandler->getModuleList();
-
-    // There seem to be no dependencies that would need approval.
+    // Install the given modules.
     if (!empty($modules['install'])) {
       try {
         $this->moduleInstaller->install(array_keys($modules['install']));
+        $module_names = array_values($modules['install']);
+        drupal_set_message($this->formatPlural(count($module_names), 'Module %name has been enabled.', '@count modules have been enabled: %names.', array(
+          '%name' => $module_names[0],
+          '%names' => implode(', ', $module_names),
+        )));
       }
       catch (PreExistingConfigException $e) {
         $config_objects = $e->flattenConfigObjects($e->getConfigObjects());
@@ -534,12 +549,6 @@ class ModulesListForm extends FormBase {
         return;
       }
     }
-
-    // Gets module list after install process, flushes caches and displays a
-    // message if there are changes.
-    if ($before != $this->moduleHandler->getModuleList()) {
-      drupal_set_message(t('The configuration options have been saved.'));
-    }
   }
 
 }
diff --git a/core/modules/system/src/Form/ModulesUninstallForm.php b/core/modules/system/src/Form/ModulesUninstallForm.php
index f72fa4330..c59b14606 100644
--- a/core/modules/system/src/Form/ModulesUninstallForm.php
+++ b/core/modules/system/src/Form/ModulesUninstallForm.php
@@ -84,7 +84,7 @@ class ModulesUninstallForm extends FormBase {
     // Get a list of all available modules.
     $modules = system_rebuild_module_data();
     $uninstallable = array_filter($modules, function ($module) use ($modules) {
-      return empty($modules[$module->getName()]->info['required']) && drupal_get_installed_schema_version($module->getName()) > SCHEMA_UNINSTALLED;
+      return empty($modules[$module->getName()]->info['required']) && $module->status;
     });
 
     // Include system.admin.inc so we can use the sort callbacks.
@@ -99,14 +99,15 @@ class ModulesUninstallForm extends FormBase {
 
     $form['filters']['text'] = array(
       '#type' => 'search',
-      '#title' => $this->t('Search'),
+      '#title' => $this->t('Filter modules'),
+      '#title_display' => 'invisible',
       '#size' => 30,
-      '#placeholder' => $this->t('Enter module name'),
+      '#placeholder' => $this->t('Filter by name or description'),
+      '#description' => $this->t('Enter a part of the module name or description'),
       '#attributes' => array(
         'class' => array('table-filter-text'),
         'data-table' => '#system-modules-uninstall',
         'autocomplete' => 'off',
-        'title' => $this->t('Enter a part of the module name or description to filter by.'),
       ),
     );
 
diff --git a/core/modules/system/src/MachineNameController.php b/core/modules/system/src/MachineNameController.php
index 51085cda1..a09e832da 100644
--- a/core/modules/system/src/MachineNameController.php
+++ b/core/modules/system/src/MachineNameController.php
@@ -67,7 +67,9 @@ class MachineNameController implements ContainerInjectionInterface {
       $transliterated = Unicode::strtolower($transliterated);
     }
     if(isset($replace_pattern) && isset($replace)) {
-      $transliterated = preg_replace('@' . $replace_pattern . '@', $replace, $transliterated);
+      // Quote the pattern delimiter and remove null characters to avoid the e
+      // or other modifiers being injected.
+      $transliterated = preg_replace('@' . strtr($replace_pattern, ['@' => '\@', chr(0) => '']) . '@', $replace, $transliterated);
     }
     return new JsonResponse($transliterated);
   }
diff --git a/core/modules/system/src/Plugin/Block/SystemBrandingBlock.php b/core/modules/system/src/Plugin/Block/SystemBrandingBlock.php
index c5ebaa5f9..16b0368ee 100644
--- a/core/modules/system/src/Plugin/Block/SystemBrandingBlock.php
+++ b/core/modules/system/src/Plugin/Block/SystemBrandingBlock.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\system\Plugin\Block;
 
+use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Block\BlockBase;
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Config\ConfigFactoryInterface;
@@ -173,7 +174,7 @@ class SystemBrandingBlock extends BlockBase implements ContainerFactoryPluginInt
     );
 
     $build['site_slogan'] = array(
-      '#markup' => Xss::filterAdmin($site_config->get('slogan')),
+      '#markup' => $site_config->get('slogan'),
       '#access' => $this->configuration['use_site_slogan'],
     );
 
diff --git a/core/modules/system/src/Plugin/Condition/CurrentThemeCondition.php b/core/modules/system/src/Plugin/Condition/CurrentThemeCondition.php
index 50eb37334..3b82d48c0 100644
--- a/core/modules/system/src/Plugin/Condition/CurrentThemeCondition.php
+++ b/core/modules/system/src/Plugin/Condition/CurrentThemeCondition.php
@@ -123,4 +123,13 @@ class CurrentThemeCondition extends ConditionPluginBase implements ContainerFact
     return $this->t('The current theme is @theme', array('@theme' => $this->configuration['theme']));
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheContexts() {
+    $contexts = parent::getCacheContexts();
+    $contexts[] = 'theme';
+    return $contexts;
+  }
+
 }
diff --git a/core/modules/system/src/Plugin/Condition/RequestPath.php b/core/modules/system/src/Plugin/Condition/RequestPath.php
index 876656cae..64331bef8 100644
--- a/core/modules/system/src/Plugin/Condition/RequestPath.php
+++ b/core/modules/system/src/Plugin/Condition/RequestPath.php
@@ -112,8 +112,8 @@ class RequestPath extends ConditionPluginBase implements ContainerFactoryPluginI
       '#title' => $this->t('Pages'),
       '#default_value' => $this->configuration['pages'],
       '#description' => $this->t("Specify pages by using their paths. Enter one path per line. The '*' character is a wildcard. Example paths are %user for the current user's page and %user-wildcard for every user page. %front is the front page.", array(
-        '%user' => 'user',
-        '%user-wildcard' => 'user/*',
+        '%user' => '/user',
+        '%user-wildcard' => '/user/*',
         '%front' => '<front>',
       )),
     );
@@ -159,4 +159,15 @@ class RequestPath extends ConditionPluginBase implements ContainerFactoryPluginI
     return $this->pathMatcher->matchPath($path_alias, $pages) || (($path != $path_alias) && $this->pathMatcher->matchPath($path, $pages));
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheContexts() {
+    $contexts = parent::getCacheContexts();
+    // @todo Add a url.path cache context in
+    //   https://www.drupal.org/node/2521978.
+    $contexts[] = 'url';
+    return $contexts;
+  }
+
 }
diff --git a/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php b/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php
index d16330f62..8738500ef 100644
--- a/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php
+++ b/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php
@@ -9,8 +9,12 @@ namespace Drupal\system\Plugin\ImageToolkit;
 
 use Drupal\Component\Utility\Color;
 use Drupal\Component\Utility\Unicode;
+use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\ImageToolkit\ImageToolkitBase;
+use Drupal\Core\ImageToolkit\ImageToolkitOperationManagerInterface;
+use Drupal\Core\StreamWrapper\StreamWrapperManagerInterface;
+use Psr\Log\LoggerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Drupal\Core\StreamWrapper\StreamWrapperInterface;
 
@@ -53,6 +57,36 @@ class GDToolkit extends ImageToolkitBase {
    */
   protected $preLoadInfo = NULL;
 
+  /**
+   * The StreamWrapper manager.
+   *
+   * @var \Drupal\Core\StreamWrapper\StreamWrapperManagerInterface
+   */
+  protected $streamWrapperManager;
+
+  /**
+   * Constructs a TestToolkit object.
+   *
+   * @param array $configuration
+   *   A configuration array containing information about the plugin instance.
+   * @param string $plugin_id
+   *   The plugin_id for the plugin instance.
+   * @param array $plugin_definition
+   *   The plugin implementation definition.
+   * @param \Drupal\Core\ImageToolkit\ImageToolkitOperationManagerInterface $operation_manager
+   *   The toolkit operation manager.
+   * @param \Psr\Log\LoggerInterface $logger
+   *   A logger instance.
+   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
+   *   The config factory.
+   * @param \Drupal\Core\StreamWrapper\StreamWrapperManagerInterface $stream_wrapper_manager
+   *   The StreamWrapper manager.
+   */
+  public function __construct(array $configuration, $plugin_id, array $plugin_definition, ImageToolkitOperationManagerInterface $operation_manager, LoggerInterface $logger, ConfigFactoryInterface $config_factory, StreamWrapperManagerInterface $stream_wrapper_manager) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition, $operation_manager, $logger, $config_factory);
+    $this->streamWrapperManager = $stream_wrapper_manager;
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -63,7 +97,8 @@ class GDToolkit extends ImageToolkitBase {
       $plugin_definition,
       $container->get('image.toolkit.operation.manager'),
       $container->get('logger.channel.image'),
-      $container->get('config.factory')
+      $container->get('config.factory'),
+      $container->get('stream_wrapper_manager')
     );
   }
 
@@ -172,7 +207,7 @@ class GDToolkit extends ImageToolkitBase {
     // Work around lack of stream wrapper support in imagejpeg() and imagepng().
     if ($scheme && file_stream_wrapper_valid_scheme($scheme)) {
       // If destination is not local, save image to temporary local file.
-      $local_wrappers = file_get_stream_wrappers(StreamWrapperInterface::LOCAL);
+      $local_wrappers = $this->streamWrapperManager->getWrappers(StreamWrapperInterface::LOCAL);
       if (!isset($local_wrappers[$scheme])) {
         $permanent_destination = $destination;
         $destination = drupal_tempnam('temporary://', 'gd_');
diff --git a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Convert.php b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Convert.php
index 93b93608d..a90587148 100644
--- a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Convert.php
+++ b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Convert.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\system\Plugin\ImageToolkit\Operation\gd;
 
-use Drupal\Component\Utility\SafeMarkup;
-
 /**
  * Defines GD2 convert operation.
  *
@@ -38,7 +36,7 @@ class Convert extends GDImageToolkitOperationBase {
    */
   protected function validateArguments(array $arguments) {
     if (!in_array($arguments['extension'], $this->getToolkit()->getSupportedExtensions())) {
-      throw new \InvalidArgumentException(SafeMarkup::format("Invalid extension (@value) specified for the image 'convert' operation", array('@value' => $arguments['extension'])));
+      throw new \InvalidArgumentException("Invalid extension ({$arguments['extension']}) specified for the image 'convert' operation");
     }
     return $arguments;
   }
diff --git a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/CreateNew.php b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/CreateNew.php
index 00fecad63..2b556f738 100644
--- a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/CreateNew.php
+++ b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/CreateNew.php
@@ -8,7 +8,6 @@
 namespace Drupal\system\Plugin\ImageToolkit\Operation\gd;
 
 use Drupal\Component\Utility\Color;
-use Drupal\Component\Utility\SafeMarkup;
 
 /**
  * Defines GD2 create_new image operation.
@@ -53,7 +52,7 @@ class CreateNew extends GDImageToolkitOperationBase {
   protected function validateArguments(array $arguments) {
     // Assure extension is supported.
     if (!in_array($arguments['extension'], $this->getToolkit()->getSupportedExtensions())) {
-      throw new \InvalidArgumentException(SafeMarkup::format("Invalid extension (@value) specified for the image 'convert' operation", array('@value' => $arguments['extension'])));
+      throw new \InvalidArgumentException("Invalid extension ('{$arguments['extension']}') specified for the image 'convert' operation");
     }
 
     // Assure integers for width and height.
@@ -62,15 +61,15 @@ class CreateNew extends GDImageToolkitOperationBase {
 
     // Fail when width or height are 0 or negative.
     if ($arguments['width'] <= 0) {
-      throw new \InvalidArgumentException(SafeMarkup::format("Invalid width (@value) specified for the image 'create_new' operation", array('@value' => $arguments['width'])));
+      throw new \InvalidArgumentException("Invalid width ('{$arguments['width']}') specified for the image 'create_new' operation");
     }
     if ($arguments['height'] <= 0) {
-      throw new \InvalidArgumentException(SafeMarkup::format("Invalid height (@value) specified for the image 'create_new' operation", array('@value' => $arguments['height'])));
+      throw new \InvalidArgumentException("Invalid height ({$arguments['height']}) specified for the image 'create_new' operation");
     }
 
     // Assure transparent color is a valid hex string.
     if ($arguments['transparent_color'] && !Color::validateHex($arguments['transparent_color'])) {
-      throw new \InvalidArgumentException(SafeMarkup::format("Invalid transparent color (@value) specified for the image 'create_new' operation", array('@value' => $arguments['transparent_color'])));
+      throw new \InvalidArgumentException("Invalid transparent color ({$arguments['transparent_color']}) specified for the image 'create_new' operation");
     }
 
     return $arguments;
diff --git a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Crop.php b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Crop.php
index 21d59f47d..aed4a2699 100644
--- a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Crop.php
+++ b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Crop.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\system\Plugin\ImageToolkit\Operation\gd;
 
-use Drupal\Component\Utility\SafeMarkup;
-
 /**
  * Defines GD2 Crop operation.
  *
@@ -67,10 +65,10 @@ class Crop extends GDImageToolkitOperationBase {
 
     // Fail when width or height are 0 or negative.
     if ($arguments['width'] <= 0) {
-      throw new \InvalidArgumentException(SafeMarkup::format("Invalid width (@value) specified for the image 'crop' operation", array('@value' => $arguments['width'])));
+      throw new \InvalidArgumentException("Invalid width ('{$arguments['width']}') specified for the image 'crop' operation");
     }
     if ($arguments['height'] <= 0) {
-      throw new \InvalidArgumentException(SafeMarkup::format("Invalid height (@value) specified for the image 'crop' operation", array('@value' => $arguments['height'])));
+      throw new \InvalidArgumentException("Invalid height ('{$arguments['height']}') specified for the image 'crop' operation");
     }
 
     return $arguments;
diff --git a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Resize.php b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Resize.php
index be72427e4..2e4494cc7 100644
--- a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Resize.php
+++ b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Resize.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\system\Plugin\ImageToolkit\Operation\gd;
 
-use Drupal\Component\Utility\SafeMarkup;
-
 /**
  * Defines GD2 resize operation.
  *
@@ -46,10 +44,10 @@ class Resize extends GDImageToolkitOperationBase {
 
     // Fail when width or height are 0 or negative.
     if ($arguments['width'] <= 0) {
-      throw new \InvalidArgumentException(SafeMarkup::format("Invalid width (@value) specified for the image 'resize' operation", array('@value' => $arguments['width'])));
+      throw new \InvalidArgumentException("Invalid width ('{$arguments['width']}') specified for the image 'resize' operation");
     }
     if ($arguments['height'] <= 0) {
-      throw new \InvalidArgumentException(SafeMarkup::format("Invalid height (@value) specified for the image 'resize' operation", array('@value' => $arguments['height'])));
+      throw new \InvalidArgumentException("Invalid height ('{$arguments['height']}') specified for the image 'resize' operation");
     }
 
     return $arguments;
diff --git a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Scale.php b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Scale.php
index 875ce2326..c47887804 100644
--- a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Scale.php
+++ b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/Scale.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\system\Plugin\ImageToolkit\Operation\gd;
 
-use Drupal\Component\Utility\SafeMarkup;
-
 /**
  * Defines GD2 Scale operation.
  *
@@ -73,10 +71,10 @@ class Scale extends Resize {
 
     // Fail when width or height are 0 or negative.
     if ($arguments['width'] <= 0) {
-      throw new \InvalidArgumentException(SafeMarkup::format("Invalid width (@value) specified for the image 'scale' operation", array('@value' => $arguments['width'])));
+      throw new \InvalidArgumentException("Invalid width ('{$arguments['width']}') specified for the image 'scale' operation");
     }
     if ($arguments['height'] <= 0) {
-      throw new \InvalidArgumentException(SafeMarkup::format("Invalid height (@value) specified for the image 'scale' operation", array('@value' => $arguments['height'])));
+      throw new \InvalidArgumentException("Invalid height ('{$arguments['height']}') specified for the image 'scale' operation");
     }
 
     return $arguments;
diff --git a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/ScaleAndCrop.php b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/ScaleAndCrop.php
index 7d465b8d6..0e09bd421 100644
--- a/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/ScaleAndCrop.php
+++ b/core/modules/system/src/Plugin/ImageToolkit/Operation/gd/ScaleAndCrop.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\system\Plugin\ImageToolkit\Operation\gd;
 
-use Drupal\Component\Utility\SafeMarkup;
-
 /**
  * Defines GD2 Scale and crop operation.
  *
@@ -54,10 +52,10 @@ class ScaleAndCrop extends GDImageToolkitOperationBase {
 
     // Fail when width or height are 0 or negative.
     if ($arguments['width'] <= 0) {
-      throw new \InvalidArgumentException(SafeMarkup::format("Invalid width (@value) specified for the image 'scale_and_crop' operation", array('@value' => $arguments['width'])));
+      throw new \InvalidArgumentException("Invalid width ('{$arguments['width']}') specified for the image 'scale_and_crop' operation");
     }
     if ($arguments['height'] <= 0) {
-      throw new \InvalidArgumentException(SafeMarkup::format("Invalid height (@value) specified for the image 'scale_and_crop' operation", array('@value' => $arguments['height'])));
+      throw new \InvalidArgumentException("Invalid height ('{$arguments['height']}') specified for the image 'scale_and_crop' operation");
     }
 
     return $arguments;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/SystemUpdate7000.php b/core/modules/system/src/Plugin/migrate/process/d6/SystemUpdate7000.php
similarity index 92%
rename from core/modules/migrate_drupal/src/Plugin/migrate/process/d6/SystemUpdate7000.php
rename to core/modules/system/src/Plugin/migrate/process/d6/SystemUpdate7000.php
index 8e78c8484..037e31558 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/SystemUpdate7000.php
+++ b/core/modules/system/src/Plugin/migrate/process/d6/SystemUpdate7000.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\SystemUpdate7000.
+ * Contains \Drupal\system\Plugin\migrate\process\d6\SystemUpdate7000.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
+namespace Drupal\system\Plugin\migrate\process\d6;
 
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\ProcessPluginBase;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Menu.php b/core/modules/system/src/Plugin/migrate/source/d6/Menu.php
similarity index 87%
rename from core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Menu.php
rename to core/modules/system/src/Plugin/migrate/source/d6/Menu.php
index b280b0fc9..65aa8762a 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Menu.php
+++ b/core/modules/system/src/Plugin/migrate/source/d6/Menu.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\Menu.
+ * Contains \Drupal\system\Plugin\migrate\source\d6\Menu.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+namespace Drupal\system\Plugin\migrate\source\d6;
 
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 
diff --git a/core/modules/system/src/SystemManager.php b/core/modules/system/src/SystemManager.php
index 33d6de522..cc86c036c 100644
--- a/core/modules/system/src/SystemManager.php
+++ b/core/modules/system/src/SystemManager.php
@@ -95,7 +95,7 @@ class SystemManager {
   /**
    * Checks for requirement severity.
    *
-   * @return boolean
+   * @return bool
    *   Returns the status of the system.
    */
   public function checkRequirements() {
diff --git a/core/modules/system/src/Tests/Ajax/AjaxFormCacheTest.php b/core/modules/system/src/Tests/Ajax/AjaxFormCacheTest.php
index f151c33a7..4ebeed661 100644
--- a/core/modules/system/src/Tests/Ajax/AjaxFormCacheTest.php
+++ b/core/modules/system/src/Tests/Ajax/AjaxFormCacheTest.php
@@ -37,15 +37,6 @@ class AjaxFormCacheTest extends AjaxTestBase {
 
     // The number of cache entries should not have changed.
     $this->assertEqual(0, count($key_value_expirable->getAll()));
-
-    // Visit a form that is explicitly cached, 3 times.
-    $cached_form_url = Url::fromRoute('ajax_forms_test.cached_form');
-    $this->drupalGet($cached_form_url);
-    $this->drupalGet($cached_form_url);
-    $this->drupalGet($cached_form_url);
-
-    // The number of cache entries should be exactly 3.
-    $this->assertEqual(3, count($key_value_expirable->getAll()));
   }
 
   /**
diff --git a/core/modules/system/src/Tests/Ajax/AjaxFormPageCacheTest.php b/core/modules/system/src/Tests/Ajax/AjaxFormPageCacheTest.php
index 03727b699..41132638b 100644
--- a/core/modules/system/src/Tests/Ajax/AjaxFormPageCacheTest.php
+++ b/core/modules/system/src/Tests/Ajax/AjaxFormPageCacheTest.php
@@ -35,7 +35,7 @@ class AjaxFormPageCacheTest extends AjaxTestBase {
   }
 
   /**
-   * Create a simple form, then POST to system/ajax to change to it.
+   * Create a simple form, then submit the form via AJAX to change to it.
    */
   public function testSimpleAJAXFormValue() {
    $this->drupalGet('ajax_forms_test_get_form');
diff --git a/core/modules/system/src/Tests/Ajax/DialogTest.php b/core/modules/system/src/Tests/Ajax/DialogTest.php
index 83a102b27..333cc6a04 100644
--- a/core/modules/system/src/Tests/Ajax/DialogTest.php
+++ b/core/modules/system/src/Tests/Ajax/DialogTest.php
@@ -94,6 +94,10 @@ class DialogTest extends AjaxTestBase {
     $this->drupalGet('ajax-test/dialog-contents');
     $this->assertRaw($dialog_contents, 'Non-JS modal dialog page present.');
 
+    // Check that requesting a modal dialog with XMLHttpRequest goes to a page.
+    $this->drupalGetXHR('ajax-test/dialog-contents');
+    $this->assertRaw($dialog_contents, 'Modal dialog page on XMLHttpRequest present.');
+
     // Emulate going to the JS version of the page and check the JSON response.
     $ajax_result = $this->drupalGetAjax('ajax-test/dialog-contents', array('query' => array(MainContentViewSubscriber::WRAPPER_FORMAT => 'drupal_modal')));
     $this->assertEqual($modal_expected_response, $ajax_result[3], 'Modal dialog JSON response matches.');
diff --git a/core/modules/system/src/Tests/Bootstrap/ErrorContainer.php b/core/modules/system/src/Tests/Bootstrap/ErrorContainer.php
new file mode 100644
index 000000000..888296547
--- /dev/null
+++ b/core/modules/system/src/Tests/Bootstrap/ErrorContainer.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\system\Tests\Bootstrap\ErrorContainer.
+ */
+
+namespace Drupal\system\Tests\Bootstrap;
+
+use Drupal\Core\DependencyInjection\Container;
+
+/**
+ * Container base class which triggers an error.
+ */
+class ErrorContainer extends Container {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE) {
+    if ($id === 'http_kernel') {
+      // Enforce a recoverable error.
+      $callable = function(ErrorContainer $container) {
+      };
+      $callable(1);
+    }
+    else {
+      return parent::get($id, $invalidBehavior);
+    }
+  }
+
+}
diff --git a/core/modules/system/src/Tests/Bootstrap/ExceptionContainer.php b/core/modules/system/src/Tests/Bootstrap/ExceptionContainer.php
new file mode 100644
index 000000000..8fb50c982
--- /dev/null
+++ b/core/modules/system/src/Tests/Bootstrap/ExceptionContainer.php
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\system\Tests\Bootstrap\ExceptionContainer.
+ */
+
+namespace Drupal\system\Tests\Bootstrap;
+
+use Drupal\Core\DependencyInjection\Container;
+
+/**
+ * Base container which throws an exception.
+ */
+class ExceptionContainer extends Container {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE) {
+    if ($id === 'http_kernel') {
+      throw new \Exception('Thrown exception during Container::get');
+    }
+    else {
+      return parent::get($id, $invalidBehavior);
+    }
+  }
+
+}
diff --git a/core/modules/system/src/Tests/Cache/AssertPageCacheContextsAndTagsTrait.php b/core/modules/system/src/Tests/Cache/AssertPageCacheContextsAndTagsTrait.php
index 44aeda629..ff914f3bf 100644
--- a/core/modules/system/src/Tests/Cache/AssertPageCacheContextsAndTagsTrait.php
+++ b/core/modules/system/src/Tests/Cache/AssertPageCacheContextsAndTagsTrait.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\system\Tests\Cache;
 
+use Drupal\Core\Cache\Cache;
 use Drupal\Core\Url;
 
 /**
@@ -89,8 +90,8 @@ trait AssertPageCacheContextsAndTagsTrait {
    */
   protected function debugCacheTags(array $actual_tags, array $expected_tags) {
     if ($actual_tags !== $expected_tags) {
-      debug('Missing cache tags: ' . implode(',', array_diff($expected_tags, $actual_tags)));
-      debug('Unwanted cache tags: ' . implode(',', array_diff($actual_tags, $expected_tags)));
+      debug('Unwanted cache tags in response: ' . implode(',', array_diff($actual_tags, $expected_tags)));
+      debug('Missing cache tags in response: ' . implode(',', array_diff($expected_tags, $actual_tags)));
     }
   }
 
@@ -99,8 +100,14 @@ trait AssertPageCacheContextsAndTagsTrait {
    *
    * @param string[] $expected_tags
    *   The expected tags.
+   * @param bool $include_default_tags
+   *   (optional) Whether the default cache tags should be included.
    */
-  protected function assertCacheTags(array $expected_tags) {
+  protected function assertCacheTags(array $expected_tags, $include_default_tags = TRUE) {
+    // The anonymous role cache tag is only added if the user is anonymous.
+    if ($include_default_tags && \Drupal::currentUser()->isAnonymous()) {
+      $expected_tags = Cache::mergeTags($expected_tags, ['config:user.role.anonymous']);
+    }
     $actual_tags = $this->getCacheHeaderValues('X-Drupal-Cache-Tags');
     sort($expected_tags);
     sort($actual_tags);
@@ -115,18 +122,30 @@ trait AssertPageCacheContextsAndTagsTrait {
    *   The expected cache contexts.
    * @param string $message
    *   (optional) A verbose message to output.
+   * @param bool $include_default_contexts
+   *   (optional) Whether the default contexts should automatically be included.
    *
    * @return
    *   TRUE if the assertion succeeded, FALSE otherwise.
    */
-  protected function assertCacheContexts(array $expected_contexts, $message = NULL) {
+  protected function assertCacheContexts(array $expected_contexts, $message = NULL, $include_default_contexts = TRUE) {
+    if ($include_default_contexts) {
+      $default_contexts = ['languages:language_interface', 'theme'];
+      // Add the user.permission context to the list of default contexts except
+      // when user is already there.
+      if (!in_array('user', $expected_contexts)) {
+        $default_contexts[] = 'user.permissions';
+      }
+      $expected_contexts = Cache::mergeContexts($expected_contexts, $default_contexts);
+    }
+
     $actual_contexts = $this->getCacheHeaderValues('X-Drupal-Cache-Contexts');
     sort($expected_contexts);
     sort($actual_contexts);
     $return = $this->assertIdentical($actual_contexts, $expected_contexts, $message);
     if (!$return) {
-      debug('Missing cache contexts: ' . implode(',', array_diff($actual_contexts, $expected_contexts)));
-      debug('Unwanted cache contexts: ' . implode(',', array_diff($expected_contexts, $actual_contexts)));
+      debug('Unwanted cache contexts in response: ' . implode(',', array_diff($actual_contexts, $expected_contexts)));
+      debug('Missing cache contexts in response: ' . implode(',', array_diff($expected_contexts, $actual_contexts)));
     }
     return $return;
   }
diff --git a/core/modules/system/src/Tests/Cache/CacheContextOptimizationTest.php b/core/modules/system/src/Tests/Cache/CacheContextOptimizationTest.php
new file mode 100644
index 000000000..e9914eea1
--- /dev/null
+++ b/core/modules/system/src/Tests/Cache/CacheContextOptimizationTest.php
@@ -0,0 +1,124 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\system\Tests\Cache\CacheContextOptimizationTest.
+ */
+
+namespace Drupal\system\Tests\Cache;
+
+use Drupal\simpletest\KernelTestBase;
+use Drupal\simpletest\UserCreationTrait;
+use Drupal\user\Entity\Role;
+
+/**
+ * Tests the cache context optimization.
+ *
+ * @group Render
+ */
+class CacheContextOptimizationTest extends KernelTestBase {
+
+  use UserCreationTrait;
+
+  /**
+   * Modules to enable.
+   *
+   * @var string[]
+   */
+  public static $modules = ['user', 'system'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('user');
+    $this->installConfig(['user']);
+    $this->installSchema('system', ['sequences']);
+  }
+
+  /**
+   * Ensures that 'user.permissions' cache context is able to define cache tags.
+   */
+  public function testUserPermissionCacheContextOptimization() {
+    $user1 = $this->createUser();
+    $this->assertEqual($user1->id(), 1);
+
+    $authenticated_user = $this->createUser(['administer permissions']);
+    $role = $authenticated_user->getRoles()[1];
+
+    $test_element = [
+      '#cache' => [
+        'keys' => ['test'],
+        'contexts' => ['user', 'user.permissions'],
+      ],
+    ];
+    \Drupal::service('account_switcher')->switchTo($authenticated_user);
+    $element = $test_element;
+    $element['#markup'] = 'content for authenticated users';
+    $output = \Drupal::service('renderer')->renderRoot($element);
+    $this->assertEqual($output, 'content for authenticated users');
+
+    // Verify that the render caching is working so that other tests can be
+    // trusted.
+    $element = $test_element;
+    $element['#markup'] = 'this should not be visible';
+    $output = \Drupal::service('renderer')->renderRoot($element);
+    $this->assertEqual($output, 'content for authenticated users');
+
+    // Even though the cache contexts have been optimized to only include 'user'
+    // cache context, the element should have been changed because
+    // 'user.permissions' cache context defined a cache tags for permission
+    // changes, which should have bubbled up for the element when it was
+    // optimized away.
+    Role::load($role)
+      ->revokePermission('administer permissions')
+      ->save();
+    $element = $test_element;
+    $element['#markup'] = 'this should be visible';
+    $output = \Drupal::service('renderer')->renderRoot($element);
+    $this->assertEqual($output, 'this should be visible');
+  }
+
+  /**
+   * Ensures that 'user.roles' still works when it is optimized away.
+   */
+  public function testUserRolesCacheContextOptimization() {
+    $root_user = $this->createUser();
+    $this->assertEqual($root_user->id(), 1);
+
+    $authenticated_user = $this->createUser(['administer permissions']);
+    $role = $authenticated_user->getRoles()[1];
+
+    $test_element = [
+      '#cache' => [
+        'keys' => ['test'],
+        'contexts' => ['user', 'user.roles'],
+      ],
+    ];
+    \Drupal::service('account_switcher')->switchTo($authenticated_user);
+    $element = $test_element;
+    $element['#markup'] = 'content for authenticated users';
+    $output = \Drupal::service('renderer')->renderRoot($element);
+    $this->assertEqual($output, 'content for authenticated users');
+
+    // Verify that the render caching is working so that other tests can be
+    // trusted.
+    $element = $test_element;
+    $element['#markup'] = 'this should not be visible';
+    $output = \Drupal::service('renderer')->renderRoot($element);
+    $this->assertEqual($output, 'content for authenticated users');
+
+    // Even though the cache contexts have been optimized to only include 'user'
+    // cache context, the element should have been changed because 'user.roles'
+    // cache context defined a cache tag for user entity changes, which should
+    // have bubbled up for the element when it was optimized away.
+    $authenticated_user->removeRole($role);
+    $authenticated_user->save();
+    $element = $test_element;
+    $element['#markup'] = 'this should be visible';
+    $output = \Drupal::service('renderer')->renderRoot($element);
+    $this->assertEqual($output, 'this should be visible');
+  }
+
+}
diff --git a/core/modules/system/src/Tests/Common/AddFeedTest.php b/core/modules/system/src/Tests/Common/AddFeedTest.php
index 963416399..a83f41bdd 100644
--- a/core/modules/system/src/Tests/Common/AddFeedTest.php
+++ b/core/modules/system/src/Tests/Common/AddFeedTest.php
@@ -91,7 +91,6 @@ class AddFeedTest extends WebTestBase {
       '#title' => '<>&"\'',
     );
     $text = \Drupal::service('renderer')->renderRoot($variables);
-    preg_match('/title="(.*?)"/', $text, $matches);
-    $this->assertEqual($matches[1], 'Subscribe to &amp;&quot;&#039;', 'feed_icon template escapes reserved HTML characters.');
+    $this->assertEqual(trim(strip_tags($text)), 'Subscribe to &lt;&gt;&amp;&quot;&#039;', 'feed_icon template escapes reserved HTML characters.');
   }
 }
diff --git a/core/modules/system/src/Tests/Common/AttachedAssetsTest.php b/core/modules/system/src/Tests/Common/AttachedAssetsTest.php
index ca8dbc6d0..52e393398 100644
--- a/core/modules/system/src/Tests/Common/AttachedAssetsTest.php
+++ b/core/modules/system/src/Tests/Common/AttachedAssetsTest.php
@@ -215,7 +215,6 @@ class AttachedAssetsTest extends KernelTestBase {
 
     // Test whether the settings for core/drupalSettings are available.
     $this->assertTrue(isset($parsed_settings['path']['baseUrl']), 'drupalSettings.path.baseUrl is present.');
-    $this->assertTrue(isset($parsed_settings['path']['scriptPath']), 'drupalSettings.path.scriptPath is present.');
     $this->assertIdentical($parsed_settings['path']['pathPrefix'], 'yarhar', 'drupalSettings.path.pathPrefix is present and has the correct (overridden) value.');
     $this->assertIdentical($parsed_settings['path']['currentPath'], '', 'drupalSettings.path.currentPath is present and has the correct value.');
     $this->assertIdentical($parsed_settings['path']['currentPathIsAdmin'], FALSE, 'drupalSettings.path.currentPathIsAdmin is present and has the correct value.');
@@ -287,8 +286,9 @@ class AttachedAssetsTest extends KernelTestBase {
 
     $js = $this->assetResolver->getJsAssets($assets, FALSE)[1];
     $js_render_array = \Drupal::service('asset.js.collection_renderer')->render($js);
+
     $rendered_js = $this->renderer->renderPlain($js_render_array);
-    $this->assertTrue(strpos($rendered_js, 'core/assets/vendor/backbone/backbone-min.js?v=1.1.2') > 0 && strpos($rendered_js, 'core/assets/vendor/domready/ready.min.js?v=1.0.8') > 0 , 'JavaScript version identifiers correctly appended to URLs');
+    $this->assertTrue(strpos($rendered_js, 'core/assets/vendor/backbone/backbone-min.js?v=1.2.1') > 0 && strpos($rendered_js, 'core/assets/vendor/domready/ready.min.js?v=1.0.8') > 0 , 'JavaScript version identifiers correctly appended to URLs');
   }
 
   /**
diff --git a/core/modules/system/src/Tests/Common/EarlyRenderingControllerTest.php b/core/modules/system/src/Tests/Common/EarlyRenderingControllerTest.php
new file mode 100644
index 000000000..b3b363ad9
--- /dev/null
+++ b/core/modules/system/src/Tests/Common/EarlyRenderingControllerTest.php
@@ -0,0 +1,116 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\system\Tests\Common\EarlyRenderingControllerTest.
+ */
+
+namespace Drupal\system\Tests\Common;
+
+use Drupal\Core\Render\Element;
+use Drupal\Core\Url;
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Verifies that bubbleable metadata of early rendering is not lost.
+ *
+ * @group Common
+ */
+class EarlyRenderingControllerTest extends WebTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $dumpHeaders = TRUE;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['system', 'early_rendering_controller_test'];
+
+  /**
+   * Tests theme preprocess functions being able to attach assets.
+   */
+  function testEarlyRendering() {
+    // Render array: non-early & early.
+    $this->drupalGet(Url::fromRoute('early_rendering_controller_test.render_array'));
+    $this->assertResponse(200);
+    $this->assertRaw('Hello world!');
+    $this->assertCacheTag('foo');
+    $this->drupalGet(Url::fromRoute('early_rendering_controller_test.render_array.early'));
+    $this->assertResponse(200);
+    $this->assertRaw('Hello world!');
+    $this->assertCacheTag('foo');
+
+    // AjaxResponse: non-early & early.
+    // @todo Add cache tags assertion when AjaxResponse is made cacheable in
+    //   https://www.drupal.org/node/956186.
+    $this->drupalGet(Url::fromRoute('early_rendering_controller_test.ajax_response'));
+    $this->assertResponse(200);
+    $this->assertRaw('Hello world!');
+    $this->drupalGet(Url::fromRoute('early_rendering_controller_test.ajax_response.early'));
+    $this->assertResponse(200);
+    $this->assertRaw('Hello world!');
+
+    // Basic Response object: non-early & early.
+    $this->drupalGet(Url::fromRoute('early_rendering_controller_test.response'));
+    $this->assertResponse(200);
+    $this->assertRaw('Hello world!');
+    $this->assertNoCacheTag('foo');
+    $this->drupalGet(Url::fromRoute('early_rendering_controller_test.response.early'));
+    $this->assertResponse(200);
+    $this->assertRaw('Hello world!');
+    $this->assertNoCacheTag('foo');
+
+    // Response object with attachments: non-early & early.
+    $this->drupalGet(Url::fromRoute('early_rendering_controller_test.response-with-attachments'));
+    $this->assertResponse(200);
+    $this->assertRaw('Hello world!');
+    $this->assertNoCacheTag('foo');
+    $this->drupalGet(Url::fromRoute('early_rendering_controller_test.response-with-attachments.early'));
+    $this->assertResponse(500);
+    $this->assertRaw('The controller result claims to be providing relevant cache metadata, but leaked metadata was detected. Please ensure you are not rendering content too early. Returned object class: Drupal\early_rendering_controller_test\AttachmentsTestResponse.');
+
+    // Cacheable Response object: non-early & early.
+    $this->drupalGet(Url::fromRoute('early_rendering_controller_test.cacheable-response'));
+    $this->assertResponse(200);
+    $this->assertRaw('Hello world!');
+    $this->assertNoCacheTag('foo');
+    $this->drupalGet(Url::fromRoute('early_rendering_controller_test.cacheable-response.early'));
+    $this->assertResponse(500);
+    $this->assertRaw('The controller result claims to be providing relevant cache metadata, but leaked metadata was detected. Please ensure you are not rendering content too early. Returned object class: Drupal\early_rendering_controller_test\CacheableTestResponse.');
+
+    // Basic domain object: non-early & early.
+    $this->drupalGet(Url::fromRoute('early_rendering_controller_test.domain-object'));
+    $this->assertResponse(200);
+    $this->assertRaw('TestDomainObject');
+    $this->assertNoCacheTag('foo');
+    $this->drupalGet(Url::fromRoute('early_rendering_controller_test.domain-object.early'));
+    $this->assertResponse(200);
+    $this->assertRaw('TestDomainObject');
+    $this->assertNoCacheTag('foo');
+
+    // Basic domain object with attachments: non-early & early.
+    $this->drupalGet(Url::fromRoute('early_rendering_controller_test.domain-object-with-attachments'));
+    $this->assertResponse(200);
+    $this->assertRaw('AttachmentsTestDomainObject');
+    $this->assertNoCacheTag('foo');
+    $this->drupalGet(Url::fromRoute('early_rendering_controller_test.domain-object-with-attachments.early'));
+    $this->assertResponse(500);
+    $this->assertRaw('The controller result claims to be providing relevant cache metadata, but leaked metadata was detected. Please ensure you are not rendering content too early. Returned object class: Drupal\early_rendering_controller_test\AttachmentsTestDomainObject.');
+
+    // Cacheable Response object: non-early & early.
+    $this->drupalGet(Url::fromRoute('early_rendering_controller_test.cacheable-domain-object'));
+    $this->assertResponse(200);
+    $this->assertRaw('CacheableTestDomainObject');
+    $this->assertNoCacheTag('foo');
+    $this->drupalGet(Url::fromRoute('early_rendering_controller_test.cacheable-domain-object.early'));
+    $this->assertResponse(500);
+    $this->assertRaw('The controller result claims to be providing relevant cache metadata, but leaked metadata was detected. Please ensure you are not rendering content too early. Returned object class: Drupal\early_rendering_controller_test\CacheableTestDomainObject.');
+
+    // The exceptions are expected. Do not interpret them as a test failure.
+    // Not using File API; a potential error must trigger a PHP warning.
+    unlink(\Drupal::root() . '/' . $this->siteDirectory . '/error.log');
+  }
+
+}
diff --git a/core/modules/system/src/Tests/Common/NoJavaScriptAnonymousTest.php b/core/modules/system/src/Tests/Common/NoJavaScriptAnonymousTest.php
index e84d79389..a3fcf9a3c 100644
--- a/core/modules/system/src/Tests/Common/NoJavaScriptAnonymousTest.php
+++ b/core/modules/system/src/Tests/Common/NoJavaScriptAnonymousTest.php
@@ -57,7 +57,8 @@ class NoJavaScriptAnonymousTest extends WebTestBase {
    */
   protected function assertNoJavaScriptExceptHtml5Shiv() {
     // Ensure drupalSettings is not set.
-    $this->assertNoRaw('var drupalSettings = {', 'drupalSettings is not set.');
+    $settings = $this->getDrupalSettings();
+    $this->assertTrue(empty($settings), 'drupalSettings is not set.');
 
     // Ensure the HTML5 shiv exists.
     $this->assertRaw('html5shiv/html5shiv.min.js', 'HTML5 shiv JavaScript exists.');
diff --git a/core/modules/system/src/Tests/Common/RenderElementTypesTest.php b/core/modules/system/src/Tests/Common/RenderElementTypesTest.php
index d7c42cd10..9c250fca7 100644
--- a/core/modules/system/src/Tests/Common/RenderElementTypesTest.php
+++ b/core/modules/system/src/Tests/Common/RenderElementTypesTest.php
@@ -43,7 +43,7 @@ class RenderElementTypesTest extends KernelTestBase {
    *   Assertion message.
    */
   protected function assertElements(array $elements, $expected_html, $message) {
-    $actual_html = \Drupal::service('renderer')->renderRoot($elements);
+    $actual_html = (string) \Drupal::service('renderer')->renderRoot($elements);
 
     $out = '<table><tr>';
     $out .= '<td valign="top"><pre>' . SafeMarkup::checkPlain($expected_html) . '</pre></td>';
diff --git a/core/modules/system/src/Tests/Common/UrlTest.php b/core/modules/system/src/Tests/Common/UrlTest.php
index 74d9129b4..e5971391b 100644
--- a/core/modules/system/src/Tests/Common/UrlTest.php
+++ b/core/modules/system/src/Tests/Common/UrlTest.php
@@ -10,6 +10,7 @@ namespace Drupal\system\Tests\Common;
 use Drupal\Component\Utility\UrlHelper;
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Language\Language;
+use Drupal\Core\Render\RenderContext;
 use Drupal\Core\Url;
 use Drupal\simpletest\WebTestBase;
 
@@ -43,21 +44,21 @@ class UrlTest extends WebTestBase {
   }
 
   /**
-   * Tests that #type=link bubbles outbound route/path processors' cacheability.
+   * Tests that #type=link bubbles outbound route/path processors' metadata.
    */
-  function testLinkCacheability() {
+  function testLinkBubbleableMetadata() {
     $cases = [
-      ['Regular link', 'internal:/user', [], ['contexts' => [], 'tags' => [], 'max-age' => Cache::PERMANENT]],
-      ['Regular link, absolute', 'internal:/user', ['absolute' => TRUE], ['contexts' => ['url.site'], 'tags' => [], 'max-age' => Cache::PERMANENT]],
-      ['Route processor link', 'route:system.run_cron', [], ['contexts' => [], 'tags' => [], 'max-age' => 0]],
-      ['Route processor link, absolute', 'route:system.run_cron', ['absolute' => TRUE], ['contexts' => ['url.site'], 'tags' => [], 'max-age' => 0]],
-      ['Path processor link', 'internal:/user/1', [], ['contexts' => [], 'tags' => ['user:1'], 'max-age' => Cache::PERMANENT]],
-      ['Path processor link, absolute', 'internal:/user/1', ['absolute' => TRUE], ['contexts' => ['url.site'], 'tags' => ['user:1'], 'max-age' => Cache::PERMANENT]],
+      ['Regular link', 'internal:/user', [], ['contexts' => [], 'tags' => [], 'max-age' => Cache::PERMANENT], []],
+      ['Regular link, absolute', 'internal:/user', ['absolute' => TRUE], ['contexts' => ['url.site'], 'tags' => [], 'max-age' => Cache::PERMANENT], []],
+      ['Route processor link', 'route:system.run_cron', [], ['contexts' => ['session'], 'tags' => [], 'max-age' => Cache::PERMANENT], ['placeholders' => []]],
+      ['Route processor link, absolute', 'route:system.run_cron', ['absolute' => TRUE], ['contexts' => ['url.site', 'session'], 'tags' => [], 'max-age' => Cache::PERMANENT], ['placeholders' => []]],
+      ['Path processor link', 'internal:/user/1', [], ['contexts' => [], 'tags' => ['user:1'], 'max-age' => Cache::PERMANENT], []],
+      ['Path processor link, absolute', 'internal:/user/1', ['absolute' => TRUE], ['contexts' => ['url.site'], 'tags' => ['user:1'], 'max-age' => Cache::PERMANENT], []],
     ];
 
     foreach ($cases as $case) {
-      list($title, $uri, $options, $expected_cacheability) = $case;
-      $expected_cacheability['contexts'] = Cache::mergeContexts($expected_cacheability['contexts'], ['languages:language_interface', 'theme']);
+      list($title, $uri, $options, $expected_cacheability, $expected_attachments) = $case;
+      $expected_cacheability['contexts'] = Cache::mergeContexts($expected_cacheability['contexts'], ['languages:language_interface', 'theme', 'user.permissions']);
       $link = [
         '#type' => 'link',
         '#title' => $title,
@@ -67,6 +68,7 @@ class UrlTest extends WebTestBase {
       \Drupal::service('renderer')->renderRoot($link);
       $this->pass($title);
       $this->assertEqual($expected_cacheability, $link['#cache']);
+      $this->assertEqual($expected_attachments, $link['#attached']);
     }
   }
 
@@ -168,9 +170,11 @@ class UrlTest extends WebTestBase {
     $l = \Drupal::l('foo', Url::fromUri('https://www.drupal.org'));
 
     // Test a renderable array passed to _l().
-    $renderable_text = array('#markup' => 'foo');
-    $l_renderable_text = \Drupal::l($renderable_text, Url::fromUri('https://www.drupal.org'));
-    $this->assertEqual($l_renderable_text, $l);
+    $renderer->executeInRenderContext(new RenderContext(), function() use ($renderer, $l) {
+      $renderable_text = array('#markup' => 'foo');
+      $l_renderable_text = \Drupal::l($renderable_text, Url::fromUri('https://www.drupal.org'));
+      $this->assertEqual($l_renderable_text, $l);
+    });
 
     // Test a themed link with plain text 'text'.
     $type_link_plain_array = array(
diff --git a/core/modules/system/src/Tests/Database/ConnectionTest.php b/core/modules/system/src/Tests/Database/ConnectionTest.php
index 160746155..961a92b7c 100644
--- a/core/modules/system/src/Tests/Database/ConnectionTest.php
+++ b/core/modules/system/src/Tests/Database/ConnectionTest.php
@@ -138,4 +138,23 @@ class ConnectionTest extends DatabaseTestBase {
     }
   }
 
+  /**
+   * Test the escapeTable(), escapeField() and escapeAlias() methods with all possible reserved words in PostgreSQL.
+   */
+  public function testPostgresqlReservedWords() {
+    if (Database::getConnection()->databaseType() !== 'pgsql') {
+      return;
+    }
+
+    $db = Database::getConnection('default', 'default');
+    $stmt = $db->query("SELECT word FROM pg_get_keywords() WHERE catcode IN ('R', 'T')");
+    $stmt->execute();
+    foreach ($stmt->fetchAllAssoc('word') as $word => $row) {
+      $expected = '"' . $word . '"';
+      $this->assertIdentical($db->escapeTable($word), $expected, format_string('The reserved word %word was correctly escaped when used as a table name.', array('%word' => $word)));
+      $this->assertIdentical($db->escapeField($word), $expected, format_string('The reserved word %word was correctly escaped when used as a column name.', array('%word' => $word)));
+      $this->assertIdentical($db->escapeAlias($word), $expected, format_string('The reserved word %word was correctly escaped when used as an alias.', array('%word' => $word)));
+    }
+  }
+
 }
diff --git a/core/modules/system/src/Tests/Database/DatabaseTestBase.php b/core/modules/system/src/Tests/Database/DatabaseTestBase.php
index ebef8b863..dd674b6d4 100644
--- a/core/modules/system/src/Tests/Database/DatabaseTestBase.php
+++ b/core/modules/system/src/Tests/Database/DatabaseTestBase.php
@@ -30,6 +30,7 @@ abstract class DatabaseTestBase extends KernelTestBase {
       'test_task',
       'test_null',
       'test_serialized',
+      'test_special_columns',
     ));
     self::addSampleData();
   }
@@ -138,5 +139,12 @@ abstract class DatabaseTestBase extends KernelTestBase {
         'priority' => 3,
       ))
       ->execute();
+
+    db_insert('test_special_columns')
+      ->fields(array(
+        'id' => 1,
+        'offset' => 'Offset value 1',
+      ))
+      ->execute();
   }
 }
diff --git a/core/modules/system/src/Tests/Database/DeleteTruncateTest.php b/core/modules/system/src/Tests/Database/DeleteTruncateTest.php
index 431a01e93..56f53cb08 100644
--- a/core/modules/system/src/Tests/Database/DeleteTruncateTest.php
+++ b/core/modules/system/src/Tests/Database/DeleteTruncateTest.php
@@ -70,4 +70,19 @@ class DeleteTruncateTest extends DatabaseTestBase {
     $num_records_after = db_query("SELECT COUNT(*) FROM {test}")->fetchField();
     $this->assertEqual(0, $num_records_after, 'Truncate really deletes everything.');
   }
+
+  /**
+   * Confirms that we can delete a single special column name record successfully.
+   */
+  function testSpecialColumnDelete() {
+    $num_records_before = db_query('SELECT COUNT(*) FROM {test_special_columns}')->fetchField();
+
+    $num_deleted = db_delete('test_special_columns')
+      ->condition('id', 1)
+      ->execute();
+    $this->assertIdentical($num_deleted, 1, 'Deleted 1 special column record.');
+
+    $num_records_after = db_query('SELECT COUNT(*) FROM {test_special_columns}')->fetchField();
+    $this->assertEqual($num_records_before, $num_records_after + $num_deleted, 'Deletion adds up.');
+  }
 }
diff --git a/core/modules/system/src/Tests/Database/InsertTest.php b/core/modules/system/src/Tests/Database/InsertTest.php
index 7bf5fad93..4b2e1e464 100644
--- a/core/modules/system/src/Tests/Database/InsertTest.php
+++ b/core/modules/system/src/Tests/Database/InsertTest.php
@@ -182,4 +182,17 @@ class InsertTest extends DatabaseTestBase {
     $this->assertIdentical($saved_age, '30', 'Can retrieve after inserting.');
   }
 
+  /**
+   * Tests that we can INSERT INTO a special named column.
+   */
+  function testSpecialColumnInsert() {
+    $id = db_insert('test_special_columns')
+      ->fields(array(
+        'id' => 2,
+        'offset' => 'Offset value 2',
+      ))
+      ->execute();
+    $saved_value = db_query('SELECT "offset" FROM {test_special_columns} WHERE id = :id', array(':id' => 2))->fetchField();
+    $this->assertIdentical($saved_value, 'Offset value 2', 'Can retrieve special column name value after inserting.');
+  }
 }
diff --git a/core/modules/system/src/Tests/Database/LargeQueryTest.php b/core/modules/system/src/Tests/Database/LargeQueryTest.php
new file mode 100644
index 000000000..eed80048c
--- /dev/null
+++ b/core/modules/system/src/Tests/Database/LargeQueryTest.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * @file
+ * Definition of Drupal\system\Tests\Database\LargeQueryTest.
+ */
+
+namespace Drupal\system\Tests\Database;
+
+use Drupal\Component\Utility\Environment;
+use Drupal\Core\Database\Database;
+use Drupal\Core\Database\DatabaseException;
+
+/**
+ * Tests handling of large queries.
+ *
+ * @group Database
+ */
+class LargeQueryTest extends DatabaseTestBase {
+
+  /**
+   * Tests truncation of messages when max_allowed_packet exception occurs.
+   */
+  function testMaxAllowedPacketQueryTruncating() {
+    // This test only makes sense if we are running on a MySQL database.
+    // Test if we are.
+    $database = Database::getConnectionInfo('default');
+    if ($database['default']['driver'] == 'mysql') {
+      // The max_allowed_packet value is configured per database instance.
+      // Retrieve the max_allowed_packet value from the current instance and
+      // check if PHP is configured with sufficient allowed memory to be able
+      // to generate a query larger than max_allowed_packet.
+      $max_allowed_packet = db_query('SELECT @@global.max_allowed_packet')->fetchField();
+      if (Environment::checkMemoryLimit($max_allowed_packet + (16 * 1024 * 1024))) {
+        $long_name = str_repeat('a', $max_allowed_packet + 1);
+        try {
+          db_query('SELECT name FROM {test} WHERE name = :name', array(':name' => $long_name));
+          $this->fail("An exception should be thrown for queries larger than 'max_allowed_packet'");
+        } catch (DatabaseException $e) {
+          // Close and re-open the connection. Otherwise we will run into error
+          // 2006 "MySQL server had gone away" afterwards.
+          Database::closeConnection();
+          Database::getConnection();
+          $this->assertEqual($e->getPrevious()->errorInfo[1], 1153, "Got a packet bigger than 'max_allowed_packet' bytes exception thrown.");
+          // Use strlen() to count the bytes exactly, not the unicode chars.
+          $this->assertTrue(strlen($e->getMessage()) <= $max_allowed_packet, "'max_allowed_packet' exception message truncated.");
+        }
+      }
+      else {
+        $this->verbose('The configured max_allowed_packet exceeds the php memory limit. Therefore the test is skipped.');
+      }
+    }
+    else {
+      $this->verbose('The test requires MySQL. Therefore the test is skipped.');
+    }
+  }
+
+}
diff --git a/core/modules/system/src/Tests/Database/UpdateTest.php b/core/modules/system/src/Tests/Database/UpdateTest.php
index 53663eebc..3d7f47dde 100644
--- a/core/modules/system/src/Tests/Database/UpdateTest.php
+++ b/core/modules/system/src/Tests/Database/UpdateTest.php
@@ -145,4 +145,18 @@ class UpdateTest extends DatabaseTestBase {
     $saved_name= db_query('SELECT name FROM {test} WHERE id = :id', array(':id' => 42))->fetchField();
     $this->assertIdentical($saved_name, 'John', 'Updated primary key successfully.');
   }
+
+  /**
+   * Confirm that we can update values in a column with special name.
+   */
+  function testSpecialColumnUpdate() {
+    $num_updated = db_update('test_special_columns')
+      ->fields(array('offset' => 'New offset value'))
+      ->condition('id', 1)
+      ->execute();
+    $this->assertIdentical($num_updated, 1, 'Updated 1 special column record.');
+
+    $saved_value = db_query('SELECT "offset" FROM {test_special_columns} WHERE id = :id', array(':id' => 1))->fetchField();
+    $this->assertIdentical($saved_value, 'New offset value', 'Updated special column name value successfully.');
+  }
 }
diff --git a/core/modules/system/src/Tests/DrupalKernel/ContainerRebuildWebTest.php b/core/modules/system/src/Tests/DrupalKernel/ContainerRebuildWebTest.php
index 734328d64..36ed68f60 100644
--- a/core/modules/system/src/Tests/DrupalKernel/ContainerRebuildWebTest.php
+++ b/core/modules/system/src/Tests/DrupalKernel/ContainerRebuildWebTest.php
@@ -35,4 +35,26 @@ class ContainerRebuildWebTest extends WebTestBase {
     $this->assertHeader('container_rebuild_indicator', 'new-identifier');
   }
 
+  /**
+   * Tests container invalidation.
+   */
+  public function testContainerInvalidation() {
+
+    // Ensure that parameter is not set.
+    $this->drupalGet('<front>');
+    $this->assertHeader('container_rebuild_test_parameter', FALSE);
+
+    // Ensure that after setting the parameter, without a container rebuild the
+    // parameter is still not set.
+    $this->writeSettings(['settings' => ['container_rebuild_test_parameter' => (object) ['value' => 'rebuild_me_please', 'required' => TRUE]]]);
+
+    $this->drupalGet('<front>');
+    $this->assertHeader('container_rebuild_test_parameter', FALSE);
+
+    // Ensure that after container invalidation the parameter is set.
+    \Drupal::service('kernel')->invalidateContainer();
+    $this->drupalGet('<front>');
+    $this->assertHeader('container_rebuild_test_parameter', 'rebuild_me_please');
+  }
+
 }
diff --git a/core/modules/system/src/Tests/Entity/ContentEntityCloneTest.php b/core/modules/system/src/Tests/Entity/ContentEntityCloneTest.php
new file mode 100644
index 000000000..77d160398
--- /dev/null
+++ b/core/modules/system/src/Tests/Entity/ContentEntityCloneTest.php
@@ -0,0 +1,70 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\system\Tests\Entity\ContentEntityCloneTest.
+ */
+
+namespace Drupal\system\Tests\Entity;
+
+use Drupal\entity_test\Entity\EntityTestMul;
+use Drupal\language\Entity\ConfigurableLanguage;
+
+/**
+ * Tests proper cloning of content entities.
+ *
+ * @group Entity
+ */
+class ContentEntityCloneTest extends EntityUnitTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['language', 'entity_test'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    // Enable an additional language.
+    ConfigurableLanguage::createFromLangcode('de')->save();
+
+    $this->installEntitySchema('entity_test_mul');
+  }
+
+  /**
+   * Tests if entity references on fields are still correct after cloning.
+   */
+  public function testFieldEntityReferenceAfterClone() {
+    $user = $this->createUser();
+
+    // Create a test entity.
+    $entity = EntityTestMul::create([
+      'name' => $this->randomString(),
+      'user_id' => $user->id(),
+      'language' => 'en',
+    ]);
+
+    $clone = clone $entity->addTranslation('de');
+
+    $this->assertEqual($entity->getTranslationLanguages(), $clone->getTranslationLanguages(), 'The entity and its clone have the same translation languages.');
+
+    $default_langcode = $entity->getUntranslated()->language()->getId();
+    foreach (array_keys($clone->getTranslationLanguages()) as $langcode) {
+      $translation = $clone->getTranslation($langcode);
+      foreach ($translation->getFields() as $field_name => $field) {
+        if ($field->getFieldDefinition()->isTranslatable()) {
+          $args = ['%field_name' => $field_name, '%langcode' => $langcode];
+          $this->assertEqual($langcode, $field->getEntity()->language()->getId(), format_string('Translatable field %field_name on translation %langcode has correct entity reference in translation %langcode after cloning.', $args));
+        }
+        else {
+          $args = ['%field_name' => $field_name, '%langcode' => $langcode, '%default_langcode' => $default_langcode];
+          $this->assertEqual($default_langcode, $field->getEntity()->language()->getId(), format_string('Non translatable field %field_name on translation %langcode has correct entity reference in the default translation %default_langcode after cloning.', $args));
+        }
+      }
+    }
+  }
+
+}
diff --git a/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php b/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php
index 0b365cbab..5c3aacf78 100644
--- a/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php
+++ b/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php
@@ -132,6 +132,8 @@ abstract class EntityCacheTagsTestBase extends PageCacheTagsTestBase {
   /**
    * Returns the access cache contexts for the tested entity.
    *
+   * Only list cache contexts that aren't part of the required cache contexts.
+   *
    * @param \Drupal\Core\Entity\EntityInterface $entity
    *   The entity to be tested, as created by createEntity().
    *
@@ -141,12 +143,14 @@ abstract class EntityCacheTagsTestBase extends PageCacheTagsTestBase {
    * @see \Drupal\Core\Entity\EntityAccessControlHandlerInterface
    */
   protected function getAccessCacheContextsForEntity(EntityInterface $entity) {
-    return ['user.permissions'];
+    return [];
   }
 
   /**
    * Returns the additional (non-standard) cache contexts for the tested entity.
    *
+   * Only list cache contexts that aren't part of the required cache contexts.
+   *
    * @param \Drupal\Core\Entity\EntityInterface $entity
    *   The entity to be tested, as created by createEntity().
    *
@@ -331,16 +335,18 @@ abstract class EntityCacheTagsTestBase extends PageCacheTagsTestBase {
     $nonempty_entity_listing_url = Url::fromRoute('entity.entity_test.collection_labels_alphabetically', ['entity_type_id' => $entity_type]);
 
     // The default cache contexts for rendered entities.
-    $default_cache_contexts = ['languages:' . LanguageInterface::TYPE_INTERFACE, 'theme'];
+    $default_cache_contexts = ['languages:' . LanguageInterface::TYPE_INTERFACE, 'theme', 'user.permissions'];
     $entity_cache_contexts = $default_cache_contexts;
 
     // Cache tags present on every rendered page.
-    $page_cache_tags = Cache::mergeTags(
-      ['rendered'],
-      // If the block module is used, the Block page display variant is used,
-      // which adds the block config entity type's list cache tags.
-      \Drupal::moduleHandler()->moduleExists('block') ? ['config:block_list']: []
-    );
+    // 'user.permissions' is a required cache context, and responses that vary
+    // by this cache context when requested by anonymous users automatically
+    // also get this cache tag, to ensure correct invalidation.
+    $page_cache_tags = Cache::mergeTags(['rendered'], ['config:user.role.anonymous']);
+    // If the block module is used, the Block page display variant is used,
+    // which adds the block config entity type's list cache tags.
+    $page_cache_tags = Cache::mergeTags($page_cache_tags, \Drupal::moduleHandler()->moduleExists('block') ? ['config:block_list']: []);
+
     $page_cache_tags_referencing_entity = in_array('user.permissions', $this->getAccessCacheContextsForEntity($this->referencingEntity)) ? ['config:user.role.anonymous'] : [];
 
     $view_cache_tag = array();
@@ -349,47 +355,50 @@ abstract class EntityCacheTagsTestBase extends PageCacheTagsTestBase {
         ->getCacheTags();
     }
 
+    $context_metadata = \Drupal::service('cache_contexts_manager')->convertTokensToKeys($entity_cache_contexts);
+    $cache_context_tags = $context_metadata->getCacheTags();
+
     // Generate the cache tags for the (non) referencing entities.
-    $referencing_entity_cache_tags = Cache::mergeTags(
-      $this->referencingEntity->getCacheTags(),
-      \Drupal::entityManager()->getViewBuilder('entity_test')->getCacheTags(),
-      // Includes the main entity's cache tags, since this entity references it.
-      $this->entity->getCacheTags(),
-      $this->getAdditionalCacheTagsForEntity($this->entity),
-      $view_cache_tag,
-      ['rendered']
-    );
-    $non_referencing_entity_cache_tags = Cache::mergeTags(
-      $this->nonReferencingEntity->getCacheTags(),
-      \Drupal::entityManager()->getViewBuilder('entity_test')->getCacheTags(),
-      ['rendered']
-    );
+    $referencing_entity_cache_tags = Cache::mergeTags($this->referencingEntity->getCacheTags(), \Drupal::entityManager()->getViewBuilder('entity_test')->getCacheTags());
+    // Includes the main entity's cache tags, since this entity references it.
+    $referencing_entity_cache_tags = Cache::mergeTags($referencing_entity_cache_tags, $this->entity->getCacheTags());
+    $referencing_entity_cache_tags = Cache::mergeTags($referencing_entity_cache_tags, $this->getAdditionalCacheTagsForEntity($this->entity));
+    $referencing_entity_cache_tags = Cache::mergeTags($referencing_entity_cache_tags, $view_cache_tag);
+    $referencing_entity_cache_tags = Cache::mergeTags($referencing_entity_cache_tags, $cache_context_tags);
+    $referencing_entity_cache_tags = Cache::mergeTags($referencing_entity_cache_tags, ['rendered']);
+
+    $non_referencing_entity_cache_tags = Cache::mergeTags($this->nonReferencingEntity->getCacheTags(), \Drupal::entityManager()->getViewBuilder('entity_test')->getCacheTags());
+    $non_referencing_entity_cache_tags = Cache::mergeTags($non_referencing_entity_cache_tags, ['rendered']);
 
     // Generate the cache tags for all two possible entity listing paths.
     // 1. list cache tag only (listing query has no match)
     // 2. list cache tag plus entity cache tag (listing query has a match)
-    $empty_entity_listing_cache_tags = Cache::mergeTags(
-      $this->entity->getEntityType()->getListCacheTags(),
-      $page_cache_tags
-    );
-    $nonempty_entity_listing_cache_tags = Cache::mergeTags(
-      $this->entity->getEntityType()->getListCacheTags(),
-      $this->entity->getCacheTags(),
-      $this->getAdditionalCacheTagsForEntityListing($this->entity),
-      $page_cache_tags
-    );
+    $empty_entity_listing_cache_tags = Cache::mergeTags($this->entity->getEntityType()->getListCacheTags(), $page_cache_tags);
+
+    $nonempty_entity_listing_cache_tags = Cache::mergeTags($this->entity->getEntityType()->getListCacheTags(), $this->entity->getCacheTags());
+    $nonempty_entity_listing_cache_tags = Cache::mergeTags($nonempty_entity_listing_cache_tags, $this->getAdditionalCacheTagsForEntityListing($this->entity));
+    $nonempty_entity_listing_cache_tags = Cache::mergeTags($nonempty_entity_listing_cache_tags, $page_cache_tags);
 
     $this->pass("Test referencing entity.", 'Debug');
     $this->verifyPageCache($referencing_entity_url, 'MISS');
+
     // Verify a cache hit, but also the presence of the correct cache tags.
-    $this->verifyPageCache($referencing_entity_url, 'HIT', Cache::mergeTags($referencing_entity_cache_tags, $page_cache_tags, $page_cache_tags_referencing_entity));
+    $expected_tags = Cache::mergeTags($referencing_entity_cache_tags, $page_cache_tags);
+    $expected_tags = Cache::mergeTags($expected_tags, $page_cache_tags_referencing_entity);
+    $this->verifyPageCache($referencing_entity_url, 'HIT', $expected_tags);
+
     // Also verify the existence of an entity render cache entry.
     $cache_keys = ['entity_view', 'entity_test', $this->referencingEntity->id(), 'full'];
     $cid = $this->createCacheId($cache_keys, $entity_cache_contexts);
     $access_cache_contexts = $this->getAccessCacheContextsForEntity($this->entity);
+    $additional_cache_contexts = $this->getAdditionalCacheContextsForEntity($this->referencingEntity);
     $redirected_cid = NULL;
-    if (count($access_cache_contexts)) {
-      $redirected_cid = $this->createCacheId($cache_keys, Cache::mergeContexts($entity_cache_contexts, $this->getAdditionalCacheContextsForEntity($this->referencingEntity), $access_cache_contexts));
+    if (count($access_cache_contexts) || count($additional_cache_contexts)) {
+      $cache_contexts = Cache::mergeContexts($entity_cache_contexts, $additional_cache_contexts);
+      $cache_contexts = Cache::mergeContexts($cache_contexts, $access_cache_contexts);
+      $redirected_cid = $this->createCacheId($cache_keys, $cache_contexts);
+      $context_metadata = \Drupal::service('cache_contexts_manager')->convertTokensToKeys($cache_contexts);
+      $referencing_entity_cache_tags = Cache::mergeTags($referencing_entity_cache_tags, $context_metadata->getCacheTags());
     }
     $this->verifyRenderCache($cid, $referencing_entity_cache_tags, $redirected_cid);
 
@@ -406,9 +415,11 @@ abstract class EntityCacheTagsTestBase extends PageCacheTagsTestBase {
     $this->pass("Test listing of referencing entities.", 'Debug');
     // Prime the page cache for the listing of referencing entities.
     $this->verifyPageCache($listing_url, 'MISS');
-    // Verify a cache hit, but also the presence of the correct cache tags.
-    $this->verifyPageCache($listing_url, 'HIT', Cache::mergeTags($referencing_entity_cache_tags, $page_cache_tags, $page_cache_tags_referencing_entity));
 
+    // Verify a cache hit, but also the presence of the correct cache tags.
+    $expected_tags = Cache::mergeTags($referencing_entity_cache_tags, $page_cache_tags);
+    $expected_tags = Cache::mergeTags($expected_tags, $page_cache_tags_referencing_entity);
+    $this->verifyPageCache($listing_url, 'HIT', $expected_tags);
 
     $this->pass("Test empty listing.", 'Debug');
     // Prime the page cache for the empty listing.
@@ -571,7 +582,7 @@ abstract class EntityCacheTagsTestBase extends PageCacheTagsTestBase {
     // a cache miss for every route except the ones for the non-referencing
     // entity and the empty entity listing.
     $this->pass("Test invalidation of referenced entity's cache tag.", 'Debug');
-    Cache::invalidateTags($this->entity->getCacheTags());
+    Cache::invalidateTags($this->entity->getCacheTagsToInvalidate());
     $this->verifyPageCache($referencing_entity_url, 'MISS');
     $this->verifyPageCache($listing_url, 'MISS');
     $this->verifyPageCache($nonempty_entity_listing_url, 'MISS');
@@ -627,15 +638,16 @@ abstract class EntityCacheTagsTestBase extends PageCacheTagsTestBase {
     $this->verifyPageCache($non_referencing_entity_url, 'HIT');
 
     // Verify cache hits.
-    $referencing_entity_cache_tags = Cache::mergeTags(
-      $this->referencingEntity->getCacheTags(),
-      \Drupal::entityManager()->getViewBuilder('entity_test')->getCacheTags(),
-      ['rendered']
-    );
+    $referencing_entity_cache_tags = Cache::mergeTags($this->referencingEntity->getCacheTags(), \Drupal::entityManager()->getViewBuilder('entity_test')->getCacheTags());
+    $referencing_entity_cache_tags = Cache::mergeTags($referencing_entity_cache_tags, ['rendered']);
+
+    $nonempty_entity_listing_cache_tags = Cache::mergeTags($this->entity->getEntityType()->getListCacheTags(), $this->getAdditionalCacheTagsForEntityListing());
+    $nonempty_entity_listing_cache_tags = Cache::mergeTags($nonempty_entity_listing_cache_tags, $page_cache_tags);
+
     $this->verifyPageCache($referencing_entity_url, 'HIT', Cache::mergeTags($referencing_entity_cache_tags, $page_cache_tags));
     $this->verifyPageCache($listing_url, 'HIT', $page_cache_tags);
     $this->verifyPageCache($empty_entity_listing_url, 'HIT', $empty_entity_listing_cache_tags);
-    $this->verifyPageCache($nonempty_entity_listing_url, 'HIT', Cache::mergeTags($this->entity->getEntityType()->getListCacheTags(), $this->getAdditionalCacheTagsForEntityListing(), $page_cache_tags));
+    $this->verifyPageCache($nonempty_entity_listing_url, 'HIT', $nonempty_entity_listing_cache_tags);
   }
 
   /**
@@ -653,7 +665,7 @@ abstract class EntityCacheTagsTestBase extends PageCacheTagsTestBase {
     $cid_parts = $keys;
 
     $contexts = \Drupal::service('cache_contexts_manager')->convertTokensToKeys($contexts);
-    $cid_parts = array_merge($cid_parts, $contexts);
+    $cid_parts = array_merge($cid_parts, $contexts->getKeys());
 
     return implode(':', $cid_parts);
   }
diff --git a/core/modules/system/src/Tests/Entity/EntityCrudHookTest.php b/core/modules/system/src/Tests/Entity/EntityCrudHookTest.php
index b7d996feb..2885d471b 100644
--- a/core/modules/system/src/Tests/Entity/EntityCrudHookTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityCrudHookTest.php
@@ -17,6 +17,7 @@ use Drupal\taxonomy\Entity\Term;
 use Drupal\node\Entity\Node;
 use Drupal\taxonomy\Entity\Vocabulary;
 use Drupal\user\Entity\User;
+use Drupal\file\Entity\File;
 
 /**
  * Tests the invocation of hooks when creating, inserting, loading, updating or
@@ -257,7 +258,7 @@ class EntityCrudHookTest extends EntityUnitTestBase {
     ));
 
     $GLOBALS['entity_crud_hook_test'] = array();
-    $file = file_load($file->id());
+    $file = File::load($file->id());
 
     $this->assertHookMessageOrder(array(
       'entity_crud_hook_test_entity_load called for type file',
diff --git a/core/modules/system/src/Tests/Entity/EntityDefinitionUpdateTest.php b/core/modules/system/src/Tests/Entity/EntityDefinitionUpdateTest.php
index 6d9408e83..03cb2366e 100644
--- a/core/modules/system/src/Tests/Entity/EntityDefinitionUpdateTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityDefinitionUpdateTest.php
@@ -9,6 +9,7 @@ namespace Drupal\system\Tests\Entity;
 
 use Drupal\Core\Database\DatabaseExceptionWrapper;
 use Drupal\Core\Database\IntegrityConstraintViolationException;
+use Drupal\Core\Entity\EntityDefinitionUpdateManagerInterface;
 use Drupal\Core\Entity\EntityStorageException;
 use Drupal\Core\Entity\EntityTypeEvents;
 use Drupal\Core\Entity\Exception\FieldStorageDefinitionUpdateForbiddenException;
@@ -604,4 +605,25 @@ class EntityDefinitionUpdateTest extends EntityUnitTestBase {
     }
   }
 
+  /**
+   * Tests ::applyEntityUpdate() and ::applyFieldUpdate().
+   */
+  public function testSingleActionCalls() {
+    // Ensure that the methods return FALSE when called with bogus information.
+    $this->assertFalse($this->entityDefinitionUpdateManager->applyEntityUpdate(EntityDefinitionUpdateManagerInterface::DEFINITION_CREATED, 'foo'), 'Calling applyEntityUpdate() with a non-existent entity returns FALSE.');
+    $this->assertFalse($this->entityDefinitionUpdateManager->applyFieldUpdate(EntityDefinitionUpdateManagerInterface::DEFINITION_CREATED, 'foo', 'bar'), 'Calling applyFieldUpdate() with a non-existent entity returns FALSE.');
+    $this->assertFalse($this->entityDefinitionUpdateManager->applyFieldUpdate(EntityDefinitionUpdateManagerInterface::DEFINITION_CREATED, 'entity_test_update', 'bar'), 'Calling applyFieldUpdate() with a non-existent field returns FALSE.');
+    $this->assertFalse($this->entityDefinitionUpdateManager->applyEntityUpdate(EntityDefinitionUpdateManagerInterface::DEFINITION_CREATED, 'entity_test_update'), 'Calling applyEntityUpdate() with an $op that is not applicable to the entity type returns FALSE.');
+    $this->assertFalse($this->entityDefinitionUpdateManager->applyFieldUpdate(EntityDefinitionUpdateManagerInterface::DEFINITION_DELETED, 'entity_test_update', 'new_base_field'), 'Calling applyFieldUpdate() with an $op that is not applicable to the field returns FALSE.');
+
+    // Create a new base field.
+    $this->addRevisionableBaseField();
+    $this->assertTrue($this->entityDefinitionUpdateManager->applyFieldUpdate(EntityDefinitionUpdateManagerInterface::DEFINITION_CREATED, 'entity_test_update', 'new_base_field'), 'Calling applyFieldUpdate() correctly returns TRUE.');
+    $this->assertTrue($this->database->schema()->fieldExists('entity_test_update', 'new_base_field'), "New field 'new_base_field' has been created on the 'entity_test_update' table.");
+    // Make the entity type revisionable.
+    $this->updateEntityTypeToRevisionable();
+    $this->assertTrue($this->entityDefinitionUpdateManager->applyEntityUpdate(EntityDefinitionUpdateManagerInterface::DEFINITION_UPDATED, 'entity_test_update'), 'Calling applyEntityUpdate() correctly returns TRUE.');
+    $this->assertTrue($this->database->schema()->tableExists('entity_test_update_revision'), "The 'entity_test_update_revision' table has been created.");
+  }
+
 }
diff --git a/core/modules/system/src/Tests/Entity/EntityFormTest.php b/core/modules/system/src/Tests/Entity/EntityFormTest.php
index f268dd751..ffa5cca84 100644
--- a/core/modules/system/src/Tests/Entity/EntityFormTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityFormTest.php
@@ -149,4 +149,25 @@ class EntityFormTest extends WebTestBase {
     $entities = $entity_storage->loadByProperties(array('name' => $name));
     return $entities ? current($entities) : NULL;
   }
+
+  /**
+   * Checks that validation handlers works as expected.
+   */
+  public function testValidationHandlers() {
+    /** @var \Drupal\Core\State\StateInterface $state */
+    $state = $this->container->get('state');
+
+    // Check that from-level validation handlers can be defined and can alter
+    // the form array.
+    $state->set('entity_test.form.validate.test', 'form-level');
+    $this->drupalPostForm('entity_test/add', [], 'Save');
+    $this->assertTrue($state->get('entity_test.form.validate.result'), 'Form-level validation handlers behave correctly.');
+
+    // Check that defining a button-level validation handler causes an exception
+    // to be thrown.
+    $state->set('entity_test.form.validate.test', 'button-level');
+    $this->drupalPostForm('entity_test/add', [], 'Save');
+    $this->assertEqual($state->get('entity_test.form.save.exception'), 'Drupal\Core\Entity\EntityStorageException: Entity validation was skipped.', 'Button-level validation handlers behave correctly.');
+  }
+
 }
diff --git a/core/modules/system/src/Tests/Entity/EntityListBuilderTest.php b/core/modules/system/src/Tests/Entity/EntityListBuilderTest.php
index 485e72c20..e32b689ba 100644
--- a/core/modules/system/src/Tests/Entity/EntityListBuilderTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityListBuilderTest.php
@@ -67,7 +67,7 @@ class EntityListBuilderTest extends WebTestBase {
     $build = $list_builder->render();
     $this->container->get('renderer')->renderRoot($build);
 
-    $this->assertEqual(['entity_test_view_grants', 'languages:' . LanguageInterface::TYPE_INTERFACE, 'theme', 'url.query_args.pagers:0'], $build['#cache']['contexts']);
+    $this->assertEqual(['entity_test_view_grants', 'languages:' . LanguageInterface::TYPE_INTERFACE, 'theme', 'url.query_args.pagers:0', 'user.permissions'], $build['#cache']['contexts']);
   }
 
 }
diff --git a/core/modules/system/src/Tests/Entity/EntityQueryTest.php b/core/modules/system/src/Tests/Entity/EntityQueryTest.php
index 44b87335b..e5d738ff9 100644
--- a/core/modules/system/src/Tests/Entity/EntityQueryTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityQueryTest.php
@@ -40,6 +40,13 @@ class EntityQueryTest extends EntityUnitTestBase {
    */
   protected $factory;
 
+  /**
+   * A list of bundle machine names created for this test.
+   *
+   * @var string[]
+   */
+  protected $bundles;
+
   /**
    * Field name for the greetings field.
    *
@@ -133,6 +140,7 @@ class EntityQueryTest extends EntityUnitTestBase {
       }
       $entity->save();
     }
+    $this->bundles = $bundles;
     $this->figures = $figures;
     $this->greetings = $greetings;
     $this->factory = \Drupal::service('entity.query');
@@ -210,6 +218,26 @@ class EntityQueryTest extends EntityUnitTestBase {
     // Unit 0 and unit 1, so bits 0 1.
     $this->assertResult(3, 7, 11, 15);
 
+    // Do the same test but with IN operator.
+    $query = $this->factory->get('entity_test_mulrev');
+    $group_blue = $query->andConditionGroup()->condition("$figures.color", array('blue'), 'IN');
+    $group_red = $query->andConditionGroup()->condition("$figures.color", array('red'), 'IN');
+    $query
+      ->condition($group_blue)
+      ->condition($group_red)
+      ->sort('id')
+      ->execute();
+    // Unit 0 and unit 1, so bits 0 1.
+    $this->assertResult(3, 7, 11, 15);
+
+    // An entity might have either red or blue figure.
+    $this->queryResults = $this->factory->get('entity_test_mulrev')
+      ->condition("$figures.color", array('blue', 'red'), 'IN')
+      ->sort('id')
+      ->execute();
+    // Bit 0 or 1 is on.
+    $this->assertResult(1, 2, 3, 5, 6, 7, 9, 10, 11, 13, 14, 15);
+
     $this->queryResults = $this->factory->get('entity_test_mulrev')
       ->exists("$figures.color")
       ->notExists("$greetings.value")
@@ -460,6 +488,34 @@ class EntityQueryTest extends EntityUnitTestBase {
      $this->assertFalse($count);
   }
 
+  /**
+   * Tests that nested condition groups work as expected.
+   */
+  public function testNestedConditionGroups() {
+    // Query for all entities of the first bundle that have either a red
+    // triangle as a figure or the Turkish greeting as a greeting.
+    $query = $this->factory->get('entity_test_mulrev');
+
+    $first_and = $query->andConditionGroup()
+      ->condition($this->figures . '.color', 'red')
+      ->condition($this->figures . '.shape', 'triangle');
+    $second_and = $query->andConditionGroup()
+      ->condition($this->greetings . '.value', 'merhaba')
+      ->condition($this->greetings . '.format', 'format-tr');
+
+    $or = $query->orConditionGroup()
+      ->condition($first_and)
+      ->condition($second_and);
+
+    $this->queryResults = $query
+      ->condition($or)
+      ->condition('type', reset($this->bundles))
+      ->sort('id')
+      ->execute();
+
+    $this->assertResult(6, 14);
+  }
+
   protected function assertResult() {
     $assert = array();
     $expected = func_get_args();
@@ -613,6 +669,38 @@ class EntityQueryTest extends EntityUnitTestBase {
     )->execute();
     $this->assertIdentical(count($result), 1, 'Case sensitive, exact match.');
 
+    // Check the case insensitive field, IN operator.
+    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
+      'field_ci', array($fixtures[0]['lowercase'] . $fixtures[1]['lowercase']), 'IN'
+    )->execute();
+    $this->assertIdentical(count($result), 1, 'Case insensitive, lowercase');
+
+    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
+      'field_ci', array($fixtures[0]['uppercase'] . $fixtures[1]['uppercase']), 'IN'
+    )->execute();
+    $this->assertIdentical(count($result), 1, 'Case insensitive, uppercase');
+
+    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
+      'field_ci', array($fixtures[0]['uppercase'] . $fixtures[1]['lowercase']), 'IN'
+    )->execute();
+    $this->assertIdentical(count($result), 1, 'Case insensitive, mixed');
+
+    // Check the case sensitive field, IN operator.
+    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
+      'field_cs', array($fixtures[0]['lowercase'] . $fixtures[1]['lowercase']), 'IN'
+    )->execute();
+    $this->assertIdentical(count($result), 0, 'Case sensitive, lowercase');
+
+    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
+      'field_cs', array($fixtures[0]['uppercase'] . $fixtures[1]['uppercase']), 'IN'
+    )->execute();
+    $this->assertIdentical(count($result), 0, 'Case sensitive, uppercase');
+
+    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
+      'field_cs', array($fixtures[0]['uppercase'] . $fixtures[1]['lowercase']), 'IN'
+    )->execute();
+    $this->assertIdentical(count($result), 1, 'Case sensitive, mixed');
+
     // Check the case insensitive field, STARTS_WITH operator.
     $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
       'field_ci', $fixtures[0]['lowercase'], 'STARTS_WITH'
@@ -762,4 +850,20 @@ class EntityQueryTest extends EntityUnitTestBase {
     $this->assertEqual($result, [16 => '14']);
   }
 
+  /**
+   * Test against SQL inject of condition field. This covers a
+   * database driver's EntityQuery\Condition class.
+   */
+  public function testInjectionInCondition() {
+    try {
+      $this->queryResults = $this->factory->get('entity_test_mulrev')
+        ->condition('1 ; -- ', array(0, 1), 'IN')
+        ->sort('id')
+        ->execute();
+      $this->fail('SQL Injection attempt in Entity Query condition in operator should result in an exception.');
+    }
+    catch (\Exception $e) {
+      $this->pass('SQL Injection attempt in Entity Query condition in operator should result in an exception.');
+    }
+  }
 }
diff --git a/core/modules/system/src/Tests/Entity/EntityTranslationTest.php b/core/modules/system/src/Tests/Entity/EntityTranslationTest.php
index 11ec5898c..21ff39284 100644
--- a/core/modules/system/src/Tests/Entity/EntityTranslationTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityTranslationTest.php
@@ -612,10 +612,10 @@ class EntityTranslationTest extends EntityLanguageTestBase {
     // Get an view builder.
     $controller = $this->entityManager->getViewBuilder($entity_type);
     $entity2_build = $controller->view($entity2);
-    $entity2_output = $renderer->renderRoot($entity2_build);
+    $entity2_output = (string) $renderer->renderRoot($entity2_build);
     $translation = $this->entityManager->getTranslationFromContext($entity2, $default_langcode);
     $translation_build = $controller->view($translation);
-    $translation_output = $renderer->renderRoot($translation_build);
+    $translation_output = (string) $renderer->renderRoot($translation_build);
     $this->assertIdentical($entity2_output, $translation_output, 'When the entity has no translation no fallback is applied.');
 
     // Checks that entity translations are rendered properly.
@@ -769,4 +769,33 @@ class EntityTranslationTest extends EntityLanguageTestBase {
     }
   }
 
+  /**
+   * Tests if entity references are correct after adding a new translation.
+   */
+  public function testFieldEntityReference() {
+    $entity_type = 'entity_test_mul';
+    $controller = $this->entityManager->getStorage($entity_type);
+    /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
+    $entity = $controller->create();
+
+    foreach ($this->langcodes as $langcode) {
+      $entity->addTranslation($langcode);
+    }
+
+    $default_langcode = $entity->getUntranslated()->language()->getId();
+    foreach (array_keys($entity->getTranslationLanguages()) as $langcode) {
+      $translation = $entity->getTranslation($langcode);
+      foreach ($translation->getFields() as $field_name => $field) {
+        if ($field->getFieldDefinition()->isTranslatable()) {
+          $args = ['%field_name' => $field_name, '%langcode' => $langcode];
+          $this->assertEqual($langcode, $field->getEntity()->language()->getId(), format_string('Translatable field %field_name on translation %langcode has correct entity reference in translation %langcode.', $args));
+        }
+        else {
+          $args = ['%field_name' => $field_name, '%langcode' => $langcode, '%default_langcode' => $default_langcode];
+          $this->assertEqual($default_langcode, $field->getEntity()->language()->getId(), format_string('Non translatable field %field_name on translation %langcode has correct entity reference in the default translation %default_langcode.', $args));
+        }
+      }
+    }
+  }
+
 }
diff --git a/core/modules/system/src/Tests/Entity/EntityValidationTest.php b/core/modules/system/src/Tests/Entity/EntityValidationTest.php
index 4df83b12a..aa85fa7b3 100644
--- a/core/modules/system/src/Tests/Entity/EntityValidationTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityValidationTest.php
@@ -85,7 +85,14 @@ class EntityValidationTest extends EntityUnitTestBase {
    */
   public function testValidation() {
     // Ensure that the constraint manager is marked as cached cleared.
-    $plugin_cache_clearer = \Drupal::service('plugin.cache_clearer');
+
+    // Use the protected property on the cache_clearer first to check whether
+    // the constraint manager is added there.
+
+    // Ensure that the proxy class is initialized, which has the necessary
+    // method calls attached.
+    \Drupal::service('plugin.cache_clearer');
+    $plugin_cache_clearer = \Drupal::service('drupal.proxy_original_service.plugin.cache_clearer');
     $get_cached_discoveries = function () {
       return $this->cachedDiscoveries;
     };
diff --git a/core/modules/system/src/Tests/Entity/EntityViewBuilderTest.php b/core/modules/system/src/Tests/Entity/EntityViewBuilderTest.php
index a7aa63df1..169af5f2f 100644
--- a/core/modules/system/src/Tests/Entity/EntityViewBuilderTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityViewBuilderTest.php
@@ -65,7 +65,7 @@ class EntityViewBuilderTest extends EntityUnitTestBase {
     // Get a fully built entity view render array.
     $entity_test->save();
     $build = $this->container->get('entity.manager')->getViewBuilder('entity_test')->view($entity_test, 'full');
-    $cid_parts = array_merge($build['#cache']['keys'], $cache_contexts_manager->convertTokensToKeys(['languages:' . LanguageInterface::TYPE_INTERFACE, 'theme']));
+    $cid_parts = array_merge($build['#cache']['keys'], $cache_contexts_manager->convertTokensToKeys(['languages:' . LanguageInterface::TYPE_INTERFACE, 'theme', 'user.permissions'])->getKeys());
     $cid = implode(':', $cid_parts);
     $bin = $build['#cache']['bin'];
 
@@ -117,7 +117,7 @@ class EntityViewBuilderTest extends EntityUnitTestBase {
 
     // Get a fully built entity view render array for the referenced entity.
     $build = $this->container->get('entity.manager')->getViewBuilder('entity_test')->view($entity_test_reference, 'full');
-    $cid_parts = array_merge($build['#cache']['keys'], $cache_contexts_manager->convertTokensToKeys(['languages:' . LanguageInterface::TYPE_INTERFACE, 'theme']));
+    $cid_parts = array_merge($build['#cache']['keys'], $cache_contexts_manager->convertTokensToKeys(['languages:' . LanguageInterface::TYPE_INTERFACE, 'theme', 'user.permissions'])->getKeys());
     $cid_reference = implode(':', $cid_parts);
     $bin_reference = $build['#cache']['bin'];
 
@@ -136,7 +136,7 @@ class EntityViewBuilderTest extends EntityUnitTestBase {
 
     // Get a fully built entity view render array.
     $build = $this->container->get('entity.manager')->getViewBuilder('entity_test')->view($entity_test, 'full');
-    $cid_parts = array_merge($build['#cache']['keys'], $cache_contexts_manager->convertTokensToKeys(['languages:' . LanguageInterface::TYPE_INTERFACE, 'theme']));
+    $cid_parts = array_merge($build['#cache']['keys'], $cache_contexts_manager->convertTokensToKeys(['languages:' . LanguageInterface::TYPE_INTERFACE, 'theme', 'user.permissions'])->getKeys());
     $cid = implode(':', $cid_parts);
     $bin = $build['#cache']['bin'];
 
diff --git a/core/modules/system/src/Tests/Entity/EntityViewControllerTest.php b/core/modules/system/src/Tests/Entity/EntityViewControllerTest.php
index aa2d800c8..362f269bb 100644
--- a/core/modules/system/src/Tests/Entity/EntityViewControllerTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityViewControllerTest.php
@@ -34,9 +34,7 @@ class EntityViewControllerTest extends WebTestBase {
     parent::setUp();
     // Create some dummy entity_test entities.
     for ($i = 0; $i < 2; $i++) {
-      $random_label = $this->randomMachineName();
-      $data = array('bundle' => 'entity_test', 'name' => $random_label);
-      $entity_test = $this->container->get('entity.manager')->getStorage('entity_test')->create($data);
+      $entity_test = $this->createTestEntity('entity_test');
       $entity_test->save();
       $this->entities[] = $entity_test;
     }
@@ -116,4 +114,31 @@ class EntityViewControllerTest extends WebTestBase {
     $this->assertTrue($xpath, 'The field item attributes from both modules have been found in the rendered output of the field.');
   }
 
+  /**
+   * Tests that a view builder can successfully override the view builder.
+   */
+  public function testEntityViewControllerViewBuilder() {
+    $entity_test = $this->createTestEntity('entity_test_view_builder');
+    $entity_test->save();
+    $this->drupalGet('entity_test_view_builder/' . $entity_test->id());
+    $this->assertText($entity_test->label());
+  }
+
+  /**
+   * Creates an entity for testing.
+   *
+   * @param string $entity_type
+   *   The entity type.
+   *
+   * @return \Drupal\Core\Entity\EntityInterface
+   *   The created entity.
+   */
+  protected function createTestEntity($entity_type) {
+    $data = array(
+      'bundle' => $entity_type,
+      'name' => $this->randomMachineName(),
+    );
+    return $this->container->get('entity.manager')->getStorage($entity_type)->create($data);
+  }
+
 }
diff --git a/core/modules/system/src/Tests/Entity/EntityWithUriCacheTagsTestBase.php b/core/modules/system/src/Tests/Entity/EntityWithUriCacheTagsTestBase.php
index 0b6f4301e..d5aa9dcfb 100644
--- a/core/modules/system/src/Tests/Entity/EntityWithUriCacheTagsTestBase.php
+++ b/core/modules/system/src/Tests/Entity/EntityWithUriCacheTagsTestBase.php
@@ -32,7 +32,7 @@ abstract class EntityWithUriCacheTagsTestBase extends EntityCacheTagsTestBase {
     $view_mode = $this->selectViewMode($entity_type);
 
     // The default cache contexts for rendered entities.
-    $entity_cache_contexts = ['languages:' . LanguageInterface::TYPE_INTERFACE, 'theme'];
+    $entity_cache_contexts = ['languages:' . LanguageInterface::TYPE_INTERFACE, 'theme', 'user.permissions'];
 
     // Generate the standardized entity cache tags.
     $cache_tag = $this->entity->getCacheTags();
@@ -56,7 +56,9 @@ abstract class EntityWithUriCacheTagsTestBase extends EntityCacheTagsTestBase {
       if (count($additional_cache_contexts)) {
         $redirected_cid = $this->createCacheId($cache_keys, Cache::mergeContexts($entity_cache_contexts, $additional_cache_contexts));
       }
-      $expected_cache_tags = Cache::mergeTags($cache_tag, $view_cache_tag, $this->getAdditionalCacheTagsForEntity($this->entity), array($render_cache_tag));
+      $expected_cache_tags = Cache::mergeTags($cache_tag, $view_cache_tag);
+      $expected_cache_tags = Cache::mergeTags($expected_cache_tags, $this->getAdditionalCacheTagsForEntity($this->entity));
+      $expected_cache_tags = Cache::mergeTags($expected_cache_tags, array($render_cache_tag));
       $this->verifyRenderCache($cid, $expected_cache_tags, $redirected_cid);
     }
 
@@ -121,7 +123,7 @@ abstract class EntityWithUriCacheTagsTestBase extends EntityCacheTagsTestBase {
     // Verify that after invalidating the entity's cache tag directly, there is
     // a cache miss.
     $this->pass("Test invalidation of entity's cache tag.", 'Debug');
-    Cache::invalidateTags($this->entity->getCacheTags());
+    Cache::invalidateTags($this->entity->getCacheTagsToInvalidate());
     $this->verifyPageCache($entity_url, 'MISS');
 
     // Verify a cache hit.
diff --git a/core/modules/system/src/Tests/Entity/FieldWidgetConstraintValidatorTest.php b/core/modules/system/src/Tests/Entity/FieldWidgetConstraintValidatorTest.php
index 426ac5b43..4f223e353 100644
--- a/core/modules/system/src/Tests/Entity/FieldWidgetConstraintValidatorTest.php
+++ b/core/modules/system/src/Tests/Entity/FieldWidgetConstraintValidatorTest.php
@@ -89,8 +89,12 @@ class FieldWidgetConstraintValidatorTest extends KernelTestBase {
     \Drupal::formBuilder()->processForm('field_test_entity_form', $form, $form_state);
 
     // Validate the field constraint.
-    $form_state->getFormObject()->setEntity($entity)->setFormDisplay($display, $form_state);
-    $form_state->getFormObject()->validate($form, $form_state);
+    /** @var \Drupal\Core\Entity\ContentEntityFormInterface $form_object */
+    $form_object = $form_state->getFormObject();
+    $form_object
+      ->setEntity($entity)
+      ->setFormDisplay($display, $form_state)
+      ->validateForm($form, $form_state);
 
     return $form_state->getErrors();
   }
diff --git a/core/modules/system/src/Tests/Entity/Update/SqlContentEntityStorageSchemaIndexTest.php b/core/modules/system/src/Tests/Entity/Update/SqlContentEntityStorageSchemaIndexTest.php
new file mode 100644
index 000000000..0e613f1bf
--- /dev/null
+++ b/core/modules/system/src/Tests/Entity/Update/SqlContentEntityStorageSchemaIndexTest.php
@@ -0,0 +1,82 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\system\Tests\Entity\Update\SqlContentEntityStorageSchemaIndexTest.
+ */
+
+namespace Drupal\system\Tests\Entity\Update;
+
+use Drupal\system\Tests\Update\UpdatePathTestBase;
+
+/**
+ * Tests that a newly-added index is properly created during database updates.
+ *
+ * @group Entity
+ */
+class SqlContentEntityStorageSchemaIndexTest extends UpdatePathTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $modules = ['update_order_test'];
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setUp() {
+    $this->databaseDumpFiles = [
+      __DIR__ . '/../../../../tests/fixtures/update/drupal-8.bare.standard.php.gz',
+    ];
+    parent::setUp();
+  }
+
+  /**
+   * Tests entity and field schema database updates and execution order.
+   */
+  public function testIndex() {
+    // Enable the hook implementations in the update_order_test module.
+    \Drupal::state()->set('update_order_test', TRUE);
+
+    // The initial Drupal 8 database dump before any updates does not include
+    // the entity ID in the entity field data table indices that were added in
+    // https://www.drupal.org/node/2261669.
+    $this->assertTrue(db_index_exists('node_field_data', 'node__default_langcode'), 'Index node__default_langcode exists prior to running updates.');
+    $this->assertFalse(db_index_exists('node_field_data', 'node__id__default_langcode__langcode'), 'Index node__id__default_langcode__langcode does not exist prior to running updates.');
+    $this->assertFalse(db_index_exists('users_field_data', 'user__id__default_langcode__langcode'), 'Index users__id__default_langcode__langcode does not exist prior to running updates.');
+
+    // Running database updates should automatically update the entity schemata
+    // to add the indices from https://www.drupal.org/node/2261669.
+    $this->runUpdates();
+    $this->assertFalse(db_index_exists('node_field_data', 'node__default_langcode'), 'Index node__default_langcode properly removed.');
+    $this->assertTrue(db_index_exists('node_field_data', 'node__id__default_langcode__langcode'), 'Index node__id__default_langcode__langcode properly created on the node_field_data table.');
+    $this->assertTrue(db_index_exists('users_field_data', 'user__id__default_langcode__langcode'), 'Index users__id__default_langcode__langcode properly created on the user_field_data table.');
+
+    // Ensure that hook_update_N() implementations were in the expected order
+    // relative to the entity and field updates. The expected order is:
+    // 1. Initial Drupal 8.0.0-beta12 installation with no indices.
+    // 2. update_order_test_update_8001() is invoked.
+    // 3. update_order_test_update_8002() is invoked.
+    // 4. update_order_test_update_8002() explicitly applies the updates for
+    //    the update_order_test_field storage. See update_order_test.module.
+    // 5. update_order_test_update_8002() explicitly applies the updates for
+    //    the node entity type indices listed above.
+    // 6. The remaining entity schema updates are applied automatically after
+    //    all update hook implementations have run, which applies the user
+    //    index update.
+   $this->assertTrue(\Drupal::state()->get('update_order_test_update_8001', FALSE), 'Index node__default_langcode still existed during update_order_test_update_8001(), indicating that it ran before the entity type updates.');
+
+    // Node updates were run during update_order_test_update_8002().
+    $this->assertFalse(\Drupal::state()->get('update_order_test_update_8002_node__default_langcode', TRUE), 'The node__default_langcode index was removed during update_order_test_update_8002().');
+    $this->assertTrue(\Drupal::state()->get('update_order_test_update_8002_node__id__default_langcode__langcode', FALSE), 'The node__id__default_langcode__langcode index was created during update_order_test_update_8002().');
+
+    // Ensure that the base field created by update_order_test_update_8002() is
+    // created when we expect.
+    $this->assertFalse(\Drupal::state()->get('update_order_test_update_8002_update_order_test_before', TRUE), 'The update_order_test field was not been created on Node before update_order_test_update_8002().');
+    $this->assertTrue(\Drupal::state()->get('update_order_test_update_8002_update_order_test_after', FALSE), 'The update_order_test field was created on Node by update_order_test_update_8002().');
+
+    // User update were not run during update_order_test_update_8002().
+    $this->assertFalse(\Drupal::state()->get('update_order_test_update_8002_user__id__default_langcode__langcode', TRUE));
+  }
+
+}
diff --git a/core/modules/system/src/Tests/Extension/ModuleHandlerTest.php b/core/modules/system/src/Tests/Extension/ModuleHandlerTest.php
index a9fa3b28d..743594952 100644
--- a/core/modules/system/src/Tests/Extension/ModuleHandlerTest.php
+++ b/core/modules/system/src/Tests/Extension/ModuleHandlerTest.php
@@ -297,14 +297,14 @@ class ModuleHandlerTest extends KernelTestBase {
   public function testModuleStreamWrappers() {
     // file_test.module provides (among others) a 'dummy' stream wrapper.
     // Verify that it is not registered yet to prevent false positives.
-    $stream_wrappers = file_get_stream_wrappers();
+    $stream_wrappers = \Drupal::service('stream_wrapper_manager')->getWrappers();
     $this->assertFalse(isset($stream_wrappers['dummy']));
     $this->moduleInstaller()->install(['file_test']);
     // Verify that the stream wrapper is available even without calling
-    // file_get_stream_wrappers() again. If the stream wrapper is not available
-    // file_exists() will raise a notice.
+    // \Drupal::service('stream_wrapper_manager')->getWrappers() again.
+    // If the stream wrapper is not available file_exists() will raise a notice.
     file_exists('dummy://');
-    $stream_wrappers = file_get_stream_wrappers();
+    $stream_wrappers = \Drupal::service('stream_wrapper_manager')->getWrappers();
     $this->assertTrue(isset($stream_wrappers['dummy']));
   }
 
diff --git a/core/modules/system/src/Tests/Field/FieldItemTest.php b/core/modules/system/src/Tests/Field/FieldItemTest.php
new file mode 100644
index 000000000..85f7736fc
--- /dev/null
+++ b/core/modules/system/src/Tests/Field/FieldItemTest.php
@@ -0,0 +1,110 @@
+<?php
+
+/**
+ * @file
+ * Contains Drupal\system\Tests\Field\FieldItemTest.
+ */
+
+namespace Drupal\system\Tests\Field;
+
+use Drupal\Component\Utility\Unicode;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\entity_test\Entity\EntityTestMulRev;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\system\Tests\Entity\EntityUnitTestBase;
+
+/**
+ * Test field item methods.
+ *
+ * @group Field
+ */
+class FieldItemTest extends EntityUnitTestBase {
+
+  /**
+   * @var string
+   */
+  protected $fieldName;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->container->get('state')->set('entity_test.field_test_item', TRUE);
+    $this->entityManager->clearCachedDefinitions();
+
+    $entity_type_id = 'entity_test_mulrev';
+    $this->installEntitySchema($entity_type_id);
+
+    $this->fieldName = Unicode::strtolower($this->randomMachineName());
+
+    /** @var \Drupal\field\Entity\FieldStorageConfig $field_storage */
+    FieldStorageConfig::create([
+      'field_name' => $this->fieldName,
+      'type' => 'field_test',
+      'entity_type' => $entity_type_id,
+      'cardinality' => 1,
+    ])->save();
+
+    FieldConfig::create([
+      'entity_type' => $entity_type_id,
+      'field_name' => $this->fieldName,
+      'bundle' => $entity_type_id,
+      'label' => 'Test field',
+    ])->save();
+
+    $this->entityManager->clearCachedDefinitions();
+    $definitions = $this->entityManager->getFieldStorageDefinitions($entity_type_id);
+    $this->assertTrue(!empty($definitions[$this->fieldName]));
+  }
+
+  /**
+   * Tests the field item save workflow.
+   */
+  public function testSaveWorkflow() {
+    $entity = EntityTestMulRev::create([
+      'name' => $this->randomString(),
+      'field_test_item' => $this->randomString(),
+      $this->fieldName => $this->randomString(),
+    ]);
+
+    // Save a new entity and verify that the initial field value is overwritten
+    // with a value containing the entity id, which implies a resave. Check that
+    // the entity data structure and the stored values match.
+    $this->assertSavedFieldItemValue($entity, "field_test:{$this->fieldName}:1:1");
+
+    // Update the entity and verify that the field value is overwritten on
+    // presave if it is not resaved.
+    $this->assertSavedFieldItemValue($entity, 'overwritten');
+
+    // Flag the field value as needing to be resaved and verify it actually is.
+    $entity->field_test_item->value = $entity->{$this->fieldName}->value = 'resave';
+    $this->assertSavedFieldItemValue($entity, "field_test:{$this->fieldName}:1:3");
+  }
+
+  /**
+   * Checks that the saved field item value matches the expected one.
+   *
+   * @param \Drupal\entity_test\Entity\EntityTest $entity
+   *   The test entity.
+   * @param $expected_value
+   *   The expected field item value.
+   *
+   * @return bool
+   *   TRUE if the item value matches expectations, FALSE otherwise.
+   */
+  protected function assertSavedFieldItemValue(EntityTest $entity, $expected_value) {
+    $entity->setNewRevision(TRUE);
+    $entity->save();
+    $base_field_expected_value = str_replace($this->fieldName, 'field_test_item', $expected_value);
+    $result = $this->assertEqual($entity->field_test_item->value, $base_field_expected_value);
+    $result = $result && $this->assertEqual($entity->{$this->fieldName}->value, $expected_value);
+    $entity = $this->reloadEntity($entity);
+    $result = $result && $this->assertEqual($entity->field_test_item->value, $base_field_expected_value);
+    $result = $result && $this->assertEqual($entity->{$this->fieldName}->value, $expected_value);
+    return $result;
+  }
+
+}
diff --git a/core/modules/system/src/Tests/File/ReadOnlyStreamWrapperTest.php b/core/modules/system/src/Tests/File/ReadOnlyStreamWrapperTest.php
index df9a1ea42..4e43d3ef0 100644
--- a/core/modules/system/src/Tests/File/ReadOnlyStreamWrapperTest.php
+++ b/core/modules/system/src/Tests/File/ReadOnlyStreamWrapperTest.php
@@ -40,7 +40,7 @@ class ReadOnlyStreamWrapperTest extends FileTestBase {
 
     // Generate a read-only stream wrapper instance
     $uri = $this->scheme . '://' . $filename;
-    file_stream_wrapper_get_instance_by_scheme($this->scheme);
+    \Drupal::service('stream_wrapper_manager')->getViaScheme($this->scheme);
 
     // Attempt to open a file in read/write mode
     $handle = @fopen($uri, 'r+');
diff --git a/core/modules/system/src/Tests/File/StreamWrapperTest.php b/core/modules/system/src/Tests/File/StreamWrapperTest.php
index 770a40f91..343cd83cf 100644
--- a/core/modules/system/src/Tests/File/StreamWrapperTest.php
+++ b/core/modules/system/src/Tests/File/StreamWrapperTest.php
@@ -56,32 +56,32 @@ class StreamWrapperTest extends FileTestBase {
    */
   function testGetClassName() {
     // Check the dummy scheme.
-    $this->assertEqual($this->classname, file_stream_wrapper_get_class($this->scheme), 'Got correct class name for dummy scheme.');
+    $this->assertEqual($this->classname, \Drupal::service('stream_wrapper_manager')->getClass($this->scheme), 'Got correct class name for dummy scheme.');
     // Check core's scheme.
-    $this->assertEqual('Drupal\Core\StreamWrapper\PublicStream', file_stream_wrapper_get_class('public'), 'Got correct class name for public scheme.');
+    $this->assertEqual('Drupal\Core\StreamWrapper\PublicStream', \Drupal::service('stream_wrapper_manager')->getClass('public'), 'Got correct class name for public scheme.');
   }
 
   /**
-   * Test the file_stream_wrapper_get_instance_by_scheme() function.
+   * Test the getViaScheme() method.
    */
   function testGetInstanceByScheme() {
-    $instance = file_stream_wrapper_get_instance_by_scheme($this->scheme);
+    $instance = \Drupal::service('stream_wrapper_manager')->getViaScheme($this->scheme);
     $this->assertEqual($this->classname, get_class($instance), 'Got correct class type for dummy scheme.');
 
-    $instance = file_stream_wrapper_get_instance_by_scheme('public');
+    $instance = \Drupal::service('stream_wrapper_manager')->getViaScheme('public');
     $this->assertEqual('Drupal\Core\StreamWrapper\PublicStream', get_class($instance), 'Got correct class type for public scheme.');
   }
 
   /**
-   * Test the URI and target functions.
+   * Test the getViaUri() and getViaScheme() methods and target functions.
    */
   function testUriFunctions() {
     $config = $this->config('system.file');
 
-    $instance = file_stream_wrapper_get_instance_by_uri($this->scheme . '://foo');
+    $instance = \Drupal::service('stream_wrapper_manager')->getViaUri($this->scheme . '://foo');
     $this->assertEqual($this->classname, get_class($instance), 'Got correct class type for dummy URI.');
 
-    $instance = file_stream_wrapper_get_instance_by_uri('public://foo');
+    $instance = \Drupal::service('stream_wrapper_manager')->getViaUri('public://foo');
     $this->assertEqual('Drupal\Core\StreamWrapper\PublicStream', get_class($instance), 'Got correct class type for public URI.');
 
     // Test file_uri_target().
@@ -94,8 +94,8 @@ class StreamWrapperTest extends FileTestBase {
     // Test file_build_uri() and
     // Drupal\Core\StreamWrapper\LocalStream::getDirectoryPath().
     $this->assertEqual(file_build_uri('foo/bar.txt'), 'public://foo/bar.txt', 'Expected scheme was added.');
-    $this->assertEqual(file_stream_wrapper_get_instance_by_scheme('public')->getDirectoryPath(), PublicStream::basePath(), 'Expected default directory path was returned.');
-    $this->assertEqual(file_stream_wrapper_get_instance_by_scheme('temporary')->getDirectoryPath(), $config->get('path.temporary'), 'Expected temporary directory path was returned.');
+    $this->assertEqual(\Drupal::service('stream_wrapper_manager')->getViaScheme('public')->getDirectoryPath(), PublicStream::basePath(), 'Expected default directory path was returned.');
+    $this->assertEqual(\Drupal::service('stream_wrapper_manager')->getViaScheme('temporary')->getDirectoryPath(), $config->get('path.temporary'), 'Expected temporary directory path was returned.');
     $config->set('default_scheme', 'private')->save();
     $this->assertEqual(file_build_uri('foo/bar.txt'), 'private://foo/bar.txt', 'Got a valid URI from foo/bar.txt.');
 
diff --git a/core/modules/system/src/Tests/File/UrlRewritingTest.php b/core/modules/system/src/Tests/File/UrlRewritingTest.php
index 0df69cc88..748e86d2d 100644
--- a/core/modules/system/src/Tests/File/UrlRewritingTest.php
+++ b/core/modules/system/src/Tests/File/UrlRewritingTest.php
@@ -80,7 +80,7 @@ class UrlRewritingTest extends FileTestBase {
     \Drupal::state()->set('file_test.hook_file_url_alter', 'cdn');
     $uri = $this->createUri();
     $url = file_create_url($uri);
-    $public_directory_path = file_stream_wrapper_get_instance_by_scheme('public')->getDirectoryPath();
+    $public_directory_path = \Drupal::service('stream_wrapper_manager')->getViaScheme('public')->getDirectoryPath();
     $this->assertEqual(FILE_URL_TEST_CDN_2 . '/' . $public_directory_path . '/' . drupal_basename($uri), $url, 'Correctly generated a CDN URL for a created file.');
 
     // Test alteration of file URLs to use root-relative URLs.
@@ -116,7 +116,7 @@ class UrlRewritingTest extends FileTestBase {
     // Managed file.
     $uri = $this->createUri();
     $url = file_create_url($uri);
-    $public_directory_path = file_stream_wrapper_get_instance_by_scheme('public')->getDirectoryPath();
+    $public_directory_path = \Drupal::service('stream_wrapper_manager')->getViaScheme('public')->getDirectoryPath();
     $this->assertIdentical(base_path() . $public_directory_path . '/' . rawurlencode(drupal_basename($uri)), file_url_transform_relative($url));
   }
 
diff --git a/core/modules/system/src/Tests/Form/ElementTest.php b/core/modules/system/src/Tests/Form/ElementTest.php
index d7085dd62..6555a4f06 100644
--- a/core/modules/system/src/Tests/Form/ElementTest.php
+++ b/core/modules/system/src/Tests/Form/ElementTest.php
@@ -151,6 +151,9 @@ class ElementTest extends WebTestBase {
     $this->drupalLogin($user);
     $this->drupalGet('form-test/autocomplete');
 
+    // Make sure that the autocomplete library is added.
+    $this->assertRaw('core/misc/autocomplete.js');
+
     $result = $this->xpath('//input[@id="edit-autocomplete-1" and contains(@data-autocomplete-path, "form-test/autocomplete-1")]');
     $this->assertEqual(count($result), 1, 'Ensure that the user does have access to the autocompletion');
     $result = $this->xpath('//input[@id="edit-autocomplete-2" and contains(@data-autocomplete-path, "form-test/autocomplete-2/value")]');
diff --git a/core/modules/system/src/Tests/Form/ExternalFormUrlTest.php b/core/modules/system/src/Tests/Form/ExternalFormUrlTest.php
new file mode 100644
index 000000000..f179ec938
--- /dev/null
+++ b/core/modules/system/src/Tests/Form/ExternalFormUrlTest.php
@@ -0,0 +1,108 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\system\Tests\Form\ExternalFormUrlTest.
+ */
+
+namespace Drupal\system\Tests\Form;
+
+use Drupal\Core\Form\FormInterface;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\simpletest\KernelTestBase;
+use Drupal\user\Entity\User;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * Ensures that form actions can't be tricked into sending to external URLs.
+ *
+ * @group system
+ */
+class ExternalFormUrlTest extends KernelTestBase implements FormInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['user', 'system'];
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'external_form_url_test';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state) {
+    $form['something'] = [
+      '#type' => 'textfield',
+      '#title' => 'What do you think?',
+    ];
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function validateForm(array &$form, FormStateInterface $form_state) {}
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) {}
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installSchema('system', ['key_value_expire', 'sequences']);
+    $this->installEntitySchema('user');
+
+    $test_user = User::create([
+      'name' => 'foobar',
+      'mail' => 'foobar@example.com',
+    ]);
+    $test_user->save();
+    \Drupal::service('current_user')->setAccount($test_user);
+
+  }
+
+  /**
+   * Tests form behaviour.
+   */
+  public function testActionUrlBehavior() {
+    // Create a new request which has a request uri with multiple leading
+    // slashes and make it the master request.
+    $request_stack = \Drupal::service('request_stack');
+    $original_request = $request_stack->pop();
+    $request = Request::create($original_request->getSchemeAndHttpHost() . '//example.org');
+    $request_stack->push($request);
+
+    $form = \Drupal::formBuilder()->getForm($this);
+    $markup = \Drupal::service('renderer')->renderRoot($form);
+
+    $this->setRawContent($markup);
+    $elements = $this->xpath('//form/@action');
+    $action = (string) $elements[0];
+    $this->assertEqual($original_request->getSchemeAndHttpHost() . '//example.org', $action);
+
+    // Create a new request which has a request uri with a single leading slash
+    // and make it the master request.
+    $request_stack = \Drupal::service('request_stack');
+    $original_request = $request_stack->pop();
+    $request = Request::create($original_request->getSchemeAndHttpHost() . '/example.org');
+    $request_stack->push($request);
+
+    $form = \Drupal::formBuilder()->getForm($this);
+    $markup = \Drupal::service('renderer')->renderRoot($form);
+
+    $this->setRawContent($markup);
+    $elements = $this->xpath('//form/@action');
+    $action = (string) $elements[0];
+    $this->assertEqual('/example.org', $action);
+  }
+
+}
diff --git a/core/modules/system/src/Tests/Form/FormStoragePageCacheTest.php b/core/modules/system/src/Tests/Form/FormStoragePageCacheTest.php
index 5fa8c34be..5cad67fd0 100644
--- a/core/modules/system/src/Tests/Form/FormStoragePageCacheTest.php
+++ b/core/modules/system/src/Tests/Form/FormStoragePageCacheTest.php
@@ -53,7 +53,7 @@ class FormStoragePageCacheTest extends WebTestBase {
     // Trigger validation error by submitting an empty title.
     $edit = ['title' => ''];
     $this->drupalPostForm(NULL, $edit, 'Save');
-    $this->assertText($build_id_initial, 'Old build id on the page');
+    $this->assertText('No old build id', 'No old build id on the page');
     $build_id_first_validation = $this->getFormBuildId();
     $this->assertNotEqual($build_id_initial, $build_id_first_validation, 'Build id changes when form validation fails');
 
@@ -74,7 +74,7 @@ class FormStoragePageCacheTest extends WebTestBase {
     // Trigger validation error by submitting an empty title.
     $edit = ['title' => ''];
     $this->drupalPostForm(NULL, $edit, 'Save');
-    $this->assertText($build_id_initial, 'Old build id is initial build id');
+    $this->assertText('No old build id', 'No old build id on the page');
     $build_id_from_cache_first_validation = $this->getFormBuildId();
     $this->assertNotEqual($build_id_initial, $build_id_from_cache_first_validation, 'Build id changes when form validation fails');
     $this->assertNotEqual($build_id_first_validation, $build_id_from_cache_first_validation, 'Build id from first user is not reused');
@@ -96,10 +96,15 @@ class FormStoragePageCacheTest extends WebTestBase {
     $this->assertText('No old build id', 'No old build id on the page');
     $build_id_initial = $this->getFormBuildId();
 
-    // Trigger rebuild, should regenerate build id.
+    // Trigger rebuild, should regenerate build id. When a submit handler
+    // triggers a rebuild, the form is built twice in the same POST request,
+    // and during the second build, there is an old build ID, but because the
+    // form is not cached during the initial GET request, it is different from
+    // that initial build ID.
     $edit = ['title' => 'something'];
     $this->drupalPostForm(NULL, $edit, 'Rebuild');
-    $this->assertText($build_id_initial, 'Initial build id as old build id on the page');
+    $this->assertNoText('No old build id', 'There is no old build id on the page.');
+    $this->assertNoText($build_id_initial, 'The old build id is not the initial build id.');
     $build_id_first_rebuild = $this->getFormBuildId();
     $this->assertNotEqual($build_id_initial, $build_id_first_rebuild, 'Build id changes on first rebuild.');
 
diff --git a/core/modules/system/src/Tests/Form/FormTest.php b/core/modules/system/src/Tests/Form/FormTest.php
index c5e7fe76a..e556b2059 100644
--- a/core/modules/system/src/Tests/Form/FormTest.php
+++ b/core/modules/system/src/Tests/Form/FormTest.php
@@ -188,7 +188,7 @@ class FormTest extends WebTestBase {
     }
 
     // Check the page for error messages.
-    $errors = $this->xpath('//div[contains(@class, "form-error-message")]//strong');
+    $errors = $this->xpath('//div[contains(@class, "form-item--error-message")]//strong');
     foreach ($errors as $error) {
       $expected_key = array_search($error[0], $expected);
       // If the error message is not one of the expected messages, fail.
diff --git a/core/modules/system/src/Tests/Form/ModulesListFormWebTest.php b/core/modules/system/src/Tests/Form/ModulesListFormWebTest.php
index f0945ed99..489f6ffda 100644
--- a/core/modules/system/src/Tests/Form/ModulesListFormWebTest.php
+++ b/core/modules/system/src/Tests/Form/ModulesListFormWebTest.php
@@ -19,7 +19,7 @@ class ModulesListFormWebTest extends WebTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = array('system_test');
+  public static $modules = array('system_test', 'help');
 
   /**
    * {@inheritdoc}
@@ -33,11 +33,22 @@ class ModulesListFormWebTest extends WebTestBase {
    * Tests the module list form.
    */
   public function testModuleListForm() {
-    $this->drupalLogin($this->drupalCreateUser(array('administer modules')));
+    $this->drupalLogin(
+      $this->drupalCreateUser(
+        array('administer modules', 'administer permissions')
+      )
+    );
     $this->drupalGet('admin/modules');
     $this->assertResponse('200');
 
     // Check that system_test's configure link was rendered correctly.
     $this->assertFieldByXPath("//a[contains(@href, '/system-test/configure/bar') and @title='Bar.bar']");
+
+    // Check that system_test's permissions link was rendered correctly.
+    $this->assertFieldByXPath("//a[contains(@href, '/admin/people/permissions#module-system_test') and @title='Configure permissions']");
+
+    // Check that system_test's help link was rendered correctly.
+    $this->assertFieldByXPath("//a[contains(@href, '/admin/help/system_test') and @title='Help']");
   }
+
 }
diff --git a/core/modules/system/src/Tests/Form/StorageTest.php b/core/modules/system/src/Tests/Form/StorageTest.php
index 8f3873a7f..831ba2557 100644
--- a/core/modules/system/src/Tests/Form/StorageTest.php
+++ b/core/modules/system/src/Tests/Form/StorageTest.php
@@ -73,16 +73,19 @@ class StorageTest extends WebTestBase {
 
     // Use form rebuilding triggered by a submit button.
     $this->drupalPostForm(NULL, $edit, 'Continue submit');
+    // The first one is for the building of the form.
     $this->assertText('Form constructions: 2');
+    // The second one is for the rebuilding of the form.
+    $this->assertText('Form constructions: 3');
 
     // Reset the form to the values of the storage, using a form rebuild
     // triggered by button of type button.
     $this->drupalPostForm(NULL, array('title' => 'changed'), 'Reset');
     $this->assertFieldByName('title', 'new', 'Values have been reset.');
-    $this->assertText('Form constructions: 3');
+    $this->assertText('Form constructions: 4');
 
     $this->drupalPostForm(NULL, $edit, 'Save');
-    $this->assertText('Form constructions: 3');
+    $this->assertText('Form constructions: 4');
     $this->assertText('Title: new', 'The form storage has stored the values.');
   }
 
@@ -129,55 +132,6 @@ class StorageTest extends WebTestBase {
     $this->assertText("The thing has been changed.", 'The altered form storage value was updated in cache and taken over.');
   }
 
-  /**
-   * Tests a form using form state without using 'storage' to pass data from the
-   * constructor to a submit handler. The data has to persist even when caching
-   * gets activated, what may happen when a modules alter the form and adds
-   * #ajax properties.
-   */
-  function testFormStatePersist() {
-    // Test the form one time with caching activated and one time without.
-    $run_options = array(
-      array(),
-      array('query' => array('cache' => 1)),
-    );
-    foreach ($run_options as $options) {
-      $this->drupalPostForm('form-test/state-persist', array(), t('Submit'), $options);
-      // The submit handler outputs the value in $form_state, assert it's there.
-      $this->assertText('State persisted.');
-
-      // Test it again, but first trigger a validation error, then test.
-      $this->drupalPostForm('form-test/state-persist', array('title' => ''), t('Submit'), $options);
-      $this->assertText(t('!name field is required.', array('!name' => 'title')));
-      // Submit the form again triggering no validation error.
-      $this->drupalPostForm(NULL, array('title' => 'foo'), t('Submit'), $options);
-      $this->assertText('State persisted.');
-
-      // Now post to the rebuilt form and verify it's still there afterwards.
-      $this->drupalPostForm(NULL, array('title' => 'bar'), t('Submit'), $options);
-      $this->assertText('State persisted.');
-    }
-  }
-
-  /**
-   * Verify that the form build-id remains the same when validation errors
-   * occur on a mutable form.
-   */
-  public function testMutableForm() {
-    // Request the form with 'cache' query parameter to enable form caching.
-    $this->drupalGet('form_test/form-storage', ['query' => ['cache' => 1]]);
-    $buildIdFields = $this->xpath('//input[@name="form_build_id"]');
-    $this->assertEqual(count($buildIdFields), 1, 'One form build id field on the page');
-    $buildId = (string) $buildIdFields[0]['value'];
-
-    // Trigger validation error by submitting an empty title.
-    $edit = ['title' => ''];
-    $this->drupalPostForm(NULL, $edit, 'Continue submit');
-
-    // Verify that the build-id did not change.
-    $this->assertFieldByName('form_build_id', $buildId, 'Build id remains the same when form validation fails');
-  }
-
   /**
    * Verifies that form build-id is regenerated when loading an immutable form
    * from the cache.
diff --git a/core/modules/system/src/Tests/Form/ValidationTest.php b/core/modules/system/src/Tests/Form/ValidationTest.php
index 7fd60e7f8..31db834cc 100644
--- a/core/modules/system/src/Tests/Form/ValidationTest.php
+++ b/core/modules/system/src/Tests/Form/ValidationTest.php
@@ -276,7 +276,7 @@ class ValidationTest extends WebTestBase {
    *   - key: The key used for the form element.
    */
   protected function assertErrorMessages($messages) {
-    $element = $this->xpath('//div[@class = "form-error-message"]/strong');
+    $element = $this->xpath('//div[@class = "form-item--error-message"]/strong');
     $this->assertIdentical(count($messages), count($element));
 
     $error_links = [];
diff --git a/core/modules/system/src/Tests/Installer/InstallerTranslationMultipleLanguageTest.php b/core/modules/system/src/Tests/Installer/InstallerTranslationMultipleLanguageTest.php
index 53538b142..3a0852b33 100644
--- a/core/modules/system/src/Tests/Installer/InstallerTranslationMultipleLanguageTest.php
+++ b/core/modules/system/src/Tests/Installer/InstallerTranslationMultipleLanguageTest.php
@@ -125,7 +125,7 @@ ENDPO;
         'modules[Core][views][enable]' => TRUE,
         'modules[Core][filter][enable]' => TRUE,
       );
-      $this->drupalPostForm('admin/modules', $edit, t('Save configuration'));
+      $this->drupalPostForm('admin/modules', $edit, t('Install'));
 
       // Verify the strings from the translation are still as expected.
       $this->verifyImportedStringsTranslated();
diff --git a/core/modules/system/src/Tests/Installer/InstallerTranslationTest.php b/core/modules/system/src/Tests/Installer/InstallerTranslationTest.php
index 7f3a66ffe..b0e6597fe 100644
--- a/core/modules/system/src/Tests/Installer/InstallerTranslationTest.php
+++ b/core/modules/system/src/Tests/Installer/InstallerTranslationTest.php
@@ -57,6 +57,8 @@ class InstallerTranslationTest extends InstallerTestBase {
     $this->assertText('German');
     $this->assertNoText('English');
 
+    // The current container still has the english as current language, rebuild.
+    $this->rebuildContainer();
     /** @var \Drupal\user\Entity\User $account */
     $account = User::load(0);
     $this->assertEqual($account->language()->getId(), 'en', 'Anonymous user is English.');
@@ -66,7 +68,7 @@ class InstallerTranslationTest extends InstallerTestBase {
     $this->assertEqual($account->language()->getId(), 'de', 'New user is German.');
 
     // Ensure that we can enable basic_auth on a non-english site.
-    $this->drupalPostForm('admin/modules', array('modules[Web services][basic_auth][enable]' => TRUE), t('Save configuration'));
+    $this->drupalPostForm('admin/modules', array('modules[Web services][basic_auth][enable]' => TRUE), t('Install'));
     $this->assertResponse(200);
 
     // Assert that the theme CSS was added to the page.
diff --git a/core/modules/system/src/Tests/Menu/LocalActionTest.php b/core/modules/system/src/Tests/Menu/LocalActionTest.php
index c049198fc..468cbbb06 100644
--- a/core/modules/system/src/Tests/Menu/LocalActionTest.php
+++ b/core/modules/system/src/Tests/Menu/LocalActionTest.php
@@ -30,6 +30,8 @@ class LocalActionTest extends WebTestBase {
     // Ensure that both menu and route based actions are shown.
     $this->assertLocalAction([
       [Url::fromRoute('menu_test.local_action4'), 'My dynamic-title action'],
+      [Url::fromRoute('menu_test.local_action4'), htmlspecialchars("<script>alert('Welcome to the jungle!')</script>", ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8')],
+      [Url::fromRoute('menu_test.local_action4'), htmlspecialchars("<script>alert('Welcome to the derived jungle!')</script>", ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8')],
       [Url::fromRoute('menu_test.local_action2'), 'My hook_menu action'],
       [Url::fromRoute('menu_test.local_action3'), 'My YAML discovery action'],
       [Url::fromRoute('menu_test.local_action5'), 'Title override'],
@@ -50,7 +52,11 @@ class LocalActionTest extends WebTestBase {
     foreach ($actions as $action) {
       /** @var \Drupal\Core\Url $url */
       list($url, $title) = $action;
-      $this->assertEqual((string) $elements[$index], $title);
+      // SimpleXML gives us the unescaped text, not the actual escaped markup,
+      // so use a pattern instead to check the raw content.
+      // This behaviour is a bug in libxml, see
+      // https://bugs.php.net/bug.php?id=49437.
+      $this->assertPattern('@<a [^>]*class="[^"]*button-action[^"]*"[^>]*>' . preg_quote($title, '@') . '</@');
       $this->assertEqual($elements[$index]['href'], $url->toString());
       $index++;
     }
diff --git a/core/modules/system/src/Tests/Menu/LocalTasksTest.php b/core/modules/system/src/Tests/Menu/LocalTasksTest.php
index b7824ef14..cb6b529fb 100644
--- a/core/modules/system/src/Tests/Menu/LocalTasksTest.php
+++ b/core/modules/system/src/Tests/Menu/LocalTasksTest.php
@@ -47,18 +47,54 @@ class LocalTasksTest extends WebTestBase {
     }
   }
 
+  /**
+   * Ensures that some local task appears.
+   *
+   * @param string $title
+   *   The expected title.
+   *
+   * @return bool
+   *   TRUE if the local task exists on the page.
+   */
+  protected function assertLocalTaskAppers($title) {
+    // SimpleXML gives us the unescaped text, not the actual escaped markup,
+    // so use a pattern instead to check the raw content.
+    // This behaviour is a bug in libxml, see
+    // https://bugs.php.net/bug.php?id=49437.
+    return $this->assertPattern('@<a [^>]*>' . preg_quote($title, '@') . '</a>@');
+  }
+
   /**
    * Tests the plugin based local tasks.
    */
   public function testPluginLocalTask() {
+    // Verify local tasks defined in the hook.
+    $this->drupalGet(Url::fromRoute('menu_test.tasks_default'));
+    $this->assertLocalTasks([
+      ['menu_test.tasks_default', []],
+      ['menu_test.router_test1', ['bar' => 'unsafe']],
+      ['menu_test.router_test1', ['bar' => '1']],
+      ['menu_test.router_test2', ['bar' => '2']],
+    ]);
+
+    // Verify that script tags are escaped on output.
+    $title = htmlspecialchars("Task 1 <script>alert('Welcome to the jungle!')</script>", ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
+    $this->assertLocalTaskAppers($title);
+    $title = htmlspecialchars("<script>alert('Welcome to the derived jungle!')</script>", ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
+    $this->assertLocalTaskAppers($title);
+
     // Verify that local tasks appear as defined in the router.
     $this->drupalGet(Url::fromRoute('menu_test.local_task_test_tasks_view'));
     $this->assertLocalTasks([
       ['menu_test.local_task_test_tasks_view', []],
       ['menu_test.local_task_test_tasks_edit', []],
       ['menu_test.local_task_test_tasks_settings', []],
+      ['menu_test.local_task_test_tasks_settings_dynamic', []],
     ]);
 
+    $title = htmlspecialchars("<script>alert('Welcome to the jungle!')</script>", ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
+    $this->assertLocalTaskAppers($title);
+
     // Ensure the view tab is active.
     $result = $this->xpath('//ul[contains(@class, "tabs")]//li[contains(@class, "active")]/a');
     $this->assertEqual(1, count($result), 'There is just a single active tab.');
diff --git a/core/modules/system/src/Tests/Menu/MenuLinkSecurityTest.php b/core/modules/system/src/Tests/Menu/MenuLinkSecurityTest.php
new file mode 100644
index 000000000..245b0c819
--- /dev/null
+++ b/core/modules/system/src/Tests/Menu/MenuLinkSecurityTest.php
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\system\Tests\Menu\MenuLinkSecurityTest.
+ */
+
+namespace Drupal\system\Tests\Menu;
+
+use Drupal\menu_link_content\Entity\MenuLinkContent;
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Ensures that menu links don't cause XSS issues.
+ *
+ * @group Menu
+ */
+class MenuLinkSecurityTest extends WebTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['menu_link_content', 'block', 'menu_test'];
+
+  /**
+   * Ensures that a menu link does not cause an XSS issue.
+   */
+  public function testMenuLink() {
+    $menu_link_content = MenuLinkContent::create([
+      'title' => '<script>alert("Wild animals")</script>',
+      'menu_name' => 'tools',
+      'link' => ['uri' => 'route:<front>'],
+    ]);
+    $menu_link_content->save();
+
+    $this->drupalPlaceBlock('system_menu_block:tools');
+
+    $this->drupalGet('<front>');
+    $this->assertNoRaw('<script>alert("Wild animals")</script>');
+    $this->assertNoRaw('<script>alert("Even more wild animals")</script>');
+    $this->assertEscaped('<script>alert("Wild animals")</script>');
+    $this->assertEscaped('<script>alert("Even more wild animals")</script>');
+  }
+
+}
diff --git a/core/modules/system/src/Tests/Menu/MenuRouterTest.php b/core/modules/system/src/Tests/Menu/MenuRouterTest.php
index ef78c7b71..7fd809d12 100644
--- a/core/modules/system/src/Tests/Menu/MenuRouterTest.php
+++ b/core/modules/system/src/Tests/Menu/MenuRouterTest.php
@@ -72,6 +72,8 @@ class MenuRouterTest extends WebTestBase {
     // Confirm local task links are displayed.
     $this->assertLink('Local task A');
     $this->assertLink('Local task B');
+    $this->assertNoLink('Local task C');
+    $this->assertEscaped("<script>alert('Welcome to the jungle!')</script>", ENT_QUOTES, 'UTF-8');
     // Confirm correct local task href.
     $this->assertLinkByHref(Url::fromRoute('menu_test.router_test1', ['bar' => $machine_name])->toString());
     $this->assertLinkByHref(Url::fromRoute('menu_test.router_test2', ['bar' => $machine_name])->toString());
diff --git a/core/modules/system/src/Tests/Menu/MenuTreeStorageTest.php b/core/modules/system/src/Tests/Menu/MenuTreeStorageTest.php
index 1df405049..57f1f2a0f 100644
--- a/core/modules/system/src/Tests/Menu/MenuTreeStorageTest.php
+++ b/core/modules/system/src/Tests/Menu/MenuTreeStorageTest.php
@@ -354,7 +354,6 @@ class MenuTreeStorageTest extends KernelTestBase {
       'menu_name' => $menu_name,
       'route_name' => $route_name,
       'route_parameters' => $route_parameters,
-      'title_arguments' => array(),
       'title' => 'test',
       'parent' => $parent,
       'options' => array(),
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateDateFormatTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateDateFormatTest.php
similarity index 75%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateDateFormatTest.php
rename to core/modules/system/src/Tests/Migrate/d6/MigrateDateFormatTest.php
index 48465d999..c1d5c8f87 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateDateFormatTest.php
+++ b/core/modules/system/src/Tests/Migrate/d6/MigrateDateFormatTest.php
@@ -2,21 +2,19 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateDateFormatTest.
+ * Contains \Drupal\system\Tests\Migrate\d6\MigrateDateFormatTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\system\Tests\Migrate\d6;
 
-use Drupal\Core\Datetime\DrupalDateTime;
-use Drupal\migrate\MigrateMessage;
 use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 use Drupal\Core\Database\Database;
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade date formats to core.date_format.*.yml.
  *
- * @group migrate_drupal
+ * @group system
  */
 class MigrateDateFormatTest extends MigrateDrupal6TestBase {
 
@@ -25,14 +23,8 @@ class MigrateDateFormatTest extends MigrateDrupal6TestBase {
    */
   protected function setUp() {
     parent::setUp();
-    /** @var \Drupal\migrate\entity\Migration $migration */
-    $migration = entity_load('migration', 'd6_date_formats');
-    $dumps = array(
-      $this->getDumpDirectory() . '/Variable.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, new MigrateMessage());
-    $executable->import();
+    $this->loadDumps(['Variable.php']);
+    $this->executeMigration('d6_date_formats');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateMenuTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateMenuTest.php
similarity index 79%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateMenuTest.php
rename to core/modules/system/src/Tests/Migrate/d6/MigrateMenuTest.php
index e45199234..279e2b7f5 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateMenuTest.php
+++ b/core/modules/system/src/Tests/Migrate/d6/MigrateMenuTest.php
@@ -2,21 +2,20 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateMenuTest.
+ * Contains \Drupal\system\Tests\Migrate\d6\MigrateMenuTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\system\Tests\Migrate\d6;
 
 use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate\MigrateMessage;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 use Drupal\Core\Database\Database;
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 use Drupal\system\Entity\Menu;
 
 /**
  * Upgrade menus to system.menu.*.yml.
  *
- * @group migrate_drupal
+ * @group system
  */
 class MigrateMenuTest extends MigrateDrupal6TestBase {
 
@@ -25,13 +24,8 @@ class MigrateMenuTest extends MigrateDrupal6TestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $migration = entity_load('migration', 'd6_menu');
-    $dumps = array(
-      $this->getDumpDirectory() . '/MenuCustom.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->loadDumps(['MenuCustom.php']);
+    $this->executeMigration('d6_menu');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateSystemCronTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemCronTest.php
similarity index 56%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateSystemCronTest.php
rename to core/modules/system/src/Tests/Migrate/d6/MigrateSystemCronTest.php
index 5bebe8f02..c39f11e1e 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateSystemCronTest.php
+++ b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemCronTest.php
@@ -2,19 +2,17 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateSystemCronTest.
+ * Contains \Drupal\system\Tests\Migrate\d6\MigrateSystemCronTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\system\Tests\Migrate\d6;
 
-use Drupal\migrate\MigrateMessage;
-use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade cron variable to system.*.yml.
  *
- * @group migrate_drupal
+ * @group system
  */
 class MigrateSystemCronTest extends MigrateDrupal6TestBase {
 
@@ -23,13 +21,8 @@ class MigrateSystemCronTest extends MigrateDrupal6TestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $migration = entity_load('migration', 'd6_system_cron');
-    $dumps = array(
-      $this->getDumpDirectory() . '/Variable.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, new MigrateMessage());
-    $executable->import();
+    $this->loadDumps(['Variable.php']);
+    $this->executeMigration('d6_system_cron');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateSystemFileTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemFileTest.php
similarity index 56%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateSystemFileTest.php
rename to core/modules/system/src/Tests/Migrate/d6/MigrateSystemFileTest.php
index 5b70f279b..9a9ff2a56 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateSystemFileTest.php
+++ b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemFileTest.php
@@ -2,19 +2,17 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateSystemFileTest.
+ * Contains \Drupal\system\Tests\Migrate\d6\MigrateSystemFileTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\system\Tests\Migrate\d6;
 
-use Drupal\migrate\MigrateMessage;
-use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to system.*.yml.
  *
- * @group migrate_drupal
+ * @group system
  */
 class MigrateSystemFileTest extends MigrateDrupal6TestBase {
 
@@ -23,13 +21,8 @@ class MigrateSystemFileTest extends MigrateDrupal6TestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $migration = entity_load('migration', 'd6_system_file');
-    $dumps = array(
-      $this->getDumpDirectory() . '/Variable.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, new MigrateMessage());
-    $executable->import();
+    $this->loadDumps(['Variable.php']);
+    $this->executeMigration('d6_system_file');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateSystemImageGdTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemImageGdTest.php
similarity index 52%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateSystemImageGdTest.php
rename to core/modules/system/src/Tests/Migrate/d6/MigrateSystemImageGdTest.php
index 377a21c7f..cdf9eaee0 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateSystemImageGdTest.php
+++ b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemImageGdTest.php
@@ -2,19 +2,17 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateSystemImageGdTest.
+ * Contains \Drupal\system\Tests\Migrate\d6\MigrateSystemImageGdTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\system\Tests\Migrate\d6;
 
-use Drupal\migrate\MigrateMessage;
-use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade image gd variables to system.*.yml.
  *
- * @group migrate_drupal
+ * @group system
  */
 class MigrateSystemImageGdTest extends MigrateDrupal6TestBase {
 
@@ -23,13 +21,8 @@ class MigrateSystemImageGdTest extends MigrateDrupal6TestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $migration = entity_load('migration', 'd6_system_image_gd');
-    $dumps = array(
-      $this->getDumpDirectory() . '/Variable.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, new MigrateMessage());
-    $executable->import();
+    $this->loadDumps(['Variable.php']);
+    $this->executeMigration('d6_system_image_gd');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateSystemImageTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemImageTest.php
similarity index 52%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateSystemImageTest.php
rename to core/modules/system/src/Tests/Migrate/d6/MigrateSystemImageTest.php
index 656fb9fc3..e91e7cbc7 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateSystemImageTest.php
+++ b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemImageTest.php
@@ -2,19 +2,17 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateSystemImageTest.
+ * Contains \Drupal\system\Tests\Migrate\d6\MigrateSystemImageTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\system\Tests\Migrate\d6;
 
-use Drupal\migrate\MigrateMessage;
-use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade image variables to system.*.yml.
  *
- * @group migrate_drupal
+ * @group system
  */
 class MigrateSystemImageTest extends MigrateDrupal6TestBase {
 
@@ -23,13 +21,8 @@ class MigrateSystemImageTest extends MigrateDrupal6TestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $migration = entity_load('migration', 'd6_system_image');
-    $dumps = array(
-      $this->getDumpDirectory() . '/Variable.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, new MigrateMessage());
-    $executable->import();
+    $this->loadDumps(['Variable.php']);
+    $this->executeMigration('d6_system_image');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateSystemLoggingTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemLoggingTest.php
similarity index 62%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateSystemLoggingTest.php
rename to core/modules/system/src/Tests/Migrate/d6/MigrateSystemLoggingTest.php
index d3bd5e4a3..963f58bb0 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateSystemLoggingTest.php
+++ b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemLoggingTest.php
@@ -2,19 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateSystemLoggingTest.
+ * Contains \Drupal\system\Tests\Migrate\d6\MigrateSystemLoggingTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\system\Tests\Migrate\d6;
 
-use Drupal\migrate\MigrateExecutable;
 use Drupal\config\Tests\SchemaCheckTestTrait;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade error_level variable to system.logging.yml.
  *
- * @group migrate_drupal
+ * @group system
  */
 class MigrateSystemLoggingTest extends MigrateDrupal6TestBase {
 
@@ -25,13 +24,8 @@ class MigrateSystemLoggingTest extends MigrateDrupal6TestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $migration = entity_load('migration', 'd6_system_logging');
-    $dumps = array(
-      $this->getDumpDirectory() . '/Variable.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->loadDumps(['Variable.php']);
+    $this->executeMigration('d6_system_logging');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateSystemMaintenanceTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemMaintenanceTest.php
similarity index 57%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateSystemMaintenanceTest.php
rename to core/modules/system/src/Tests/Migrate/d6/MigrateSystemMaintenanceTest.php
index ca0954cd4..581be5e59 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateSystemMaintenanceTest.php
+++ b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemMaintenanceTest.php
@@ -2,19 +2,17 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateSystemMaintenanceTest.
+ * Contains \Drupal\system\Tests\Migrate\d6\MigrateSystemMaintenanceTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\system\Tests\Migrate\d6;
 
-use Drupal\migrate\MigrateMessage;
-use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade maintenance variables to system.*.yml.
  *
- * @group migrate_drupal
+ * @group system
  */
 class MigrateSystemMaintenanceTest extends MigrateDrupal6TestBase {
 
@@ -23,13 +21,8 @@ class MigrateSystemMaintenanceTest extends MigrateDrupal6TestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $migration = entity_load('migration', 'd6_system_maintenance');
-    $dumps = array(
-      $this->getDumpDirectory() . '/Variable.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, new MigrateMessage());
-    $executable->import();
+    $this->loadDumps(['Variable.php']);
+    $this->executeMigration('d6_system_maintenance');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateSystemPerformanceTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemPerformanceTest.php
similarity index 59%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateSystemPerformanceTest.php
rename to core/modules/system/src/Tests/Migrate/d6/MigrateSystemPerformanceTest.php
index 2f137202a..54e72fa77 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateSystemPerformanceTest.php
+++ b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemPerformanceTest.php
@@ -2,19 +2,17 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateSystemPerformanceTest.
+ * Contains \Drupal\system\Tests\Migrate\d6\MigrateSystemPerformanceTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\system\Tests\Migrate\d6;
 
-use Drupal\migrate\MigrateMessage;
-use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade performance variables to system.*.yml.
  *
- * @group migrate_drupal
+ * @group system
  */
 class MigrateSystemPerformanceTest extends MigrateDrupal6TestBase {
 
@@ -23,13 +21,8 @@ class MigrateSystemPerformanceTest extends MigrateDrupal6TestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $migration = entity_load('migration', 'd6_system_performance');
-    $dumps = array(
-      $this->getDumpDirectory() . '/Variable.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, new MigrateMessage());
-    $executable->import();
+    $this->loadDumps(['Variable.php']);
+    $this->executeMigration('d6_system_performance');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateSystemRssTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemRssTest.php
similarity index 54%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateSystemRssTest.php
rename to core/modules/system/src/Tests/Migrate/d6/MigrateSystemRssTest.php
index b89815c9b..6295a5698 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateSystemRssTest.php
+++ b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemRssTest.php
@@ -2,19 +2,17 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateSystemRssTest.
+ * Contains \Drupal\system\Tests\Migrate\d6\MigrateSystemRssTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\system\Tests\Migrate\d6;
 
-use Drupal\migrate\MigrateMessage;
-use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade rss variable to system.*.yml.
  *
- * @group migrate_drupal
+ * @group system
  */
 class MigrateSystemRssTest extends MigrateDrupal6TestBase {
 
@@ -23,13 +21,8 @@ class MigrateSystemRssTest extends MigrateDrupal6TestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $migration = entity_load('migration', 'd6_system_rss');
-    $dumps = array(
-      $this->getDumpDirectory() . '/Variable.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, new MigrateMessage());
-    $executable->import();
+    $this->loadDumps(['Variable.php']);
+    $this->executeMigration('d6_system_rss');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateSystemSiteTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemSiteTest.php
similarity index 65%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateSystemSiteTest.php
rename to core/modules/system/src/Tests/Migrate/d6/MigrateSystemSiteTest.php
index d543c202b..75910631f 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateSystemSiteTest.php
+++ b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemSiteTest.php
@@ -2,19 +2,17 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateSystemSiteTest.
+ * Contains \Drupal\system\Tests\Migrate\d6\MigrateSystemSiteTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\system\Tests\Migrate\d6;
 
-use Drupal\migrate\MigrateMessage;
-use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade site variables to system.*.yml.
  *
- * @group migrate_drupal
+ * @group system
  */
 class MigrateSystemSiteTest extends MigrateDrupal6TestBase {
 
@@ -23,13 +21,8 @@ class MigrateSystemSiteTest extends MigrateDrupal6TestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $migration = entity_load('migration', 'd6_system_site');
-    $dumps = array(
-      $this->getDumpDirectory() . '/Variable.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, new MigrateMessage());
-    $executable->import();
+    $this->loadDumps(['Variable.php']);
+    $this->executeMigration('d6_system_site');
   }
 
   /**
diff --git a/core/modules/system/src/Tests/Module/DependencyTest.php b/core/modules/system/src/Tests/Module/DependencyTest.php
index 13a722d71..e9162a815 100644
--- a/core/modules/system/src/Tests/Module/DependencyTest.php
+++ b/core/modules/system/src/Tests/Module/DependencyTest.php
@@ -21,12 +21,12 @@ class DependencyTest extends ModuleTestBase {
     $edit = array(
       'modules[Core][filter][enable]' => TRUE,
     );
-    $this->drupalPostForm('admin/modules', $edit, t('Save configuration'));
+    $this->drupalPostForm('admin/modules', $edit, t('Install'));
     // Enable module with project namespace to ensure nothing breaks.
     $edit = array(
       'modules[Testing][system_project_namespace_test][enable]' => TRUE,
     );
-    $this->drupalPostForm('admin/modules', $edit, t('Save configuration'));
+    $this->drupalPostForm('admin/modules', $edit, t('Install'));
     $this->assertModules(array('system_project_namespace_test'), TRUE);
   }
 
@@ -37,7 +37,7 @@ class DependencyTest extends ModuleTestBase {
     // Attempt to enable Content Translation without Language enabled.
     $edit = array();
     $edit['modules[Multilingual][content_translation][enable]'] = 'content_translation';
-    $this->drupalPostForm('admin/modules', $edit, t('Save configuration'));
+    $this->drupalPostForm('admin/modules', $edit, t('Install'));
     $this->assertText(t('Some required modules must be enabled'), 'Dependency required.');
 
     $this->assertModules(array('content_translation', 'language'), FALSE);
@@ -46,8 +46,7 @@ class DependencyTest extends ModuleTestBase {
     $this->assertTableCount('language', FALSE);
 
     $this->drupalPostForm(NULL, NULL, t('Continue'));
-    $this->assertText(t('The configuration options have been saved.'), 'Modules status has been updated.');
-
+    $this->assertText(t('2 modules have been enabled: Content Translation, Language.'), 'Modules status has been updated.');
     $this->assertModules(array('content_translation', 'language'), TRUE);
 
     // Assert that the language YAML files were created.
@@ -109,7 +108,7 @@ class DependencyTest extends ModuleTestBase {
     $edit = array();
     $edit['modules[Testing][requirements1_test][enable]'] = 'requirements1_test';
     $edit['modules[Testing][requirements2_test][enable]'] = 'requirements2_test';
-    $this->drupalPostForm('admin/modules', $edit, t('Save configuration'));
+    $this->drupalPostForm('admin/modules', $edit, t('Install'));
 
     // Makes sure the modules were NOT installed.
     $this->assertText(t('Requirements 1 Test failed requirements'), 'Modules status has been updated.');
@@ -140,7 +139,7 @@ class DependencyTest extends ModuleTestBase {
     // is correct.
     $edit = array();
     $edit['modules[Core][color][enable]'] = 'color';
-    $this->drupalPostForm('admin/modules', $edit, t('Save configuration'));
+    $this->drupalPostForm('admin/modules', $edit, t('Install'));
     $this->assertModules(array('color'), FALSE);
     // Note that dependencies are sorted alphabetically in the confirmation
     // message.
@@ -148,7 +147,7 @@ class DependencyTest extends ModuleTestBase {
 
     $edit['modules[Core][config][enable]'] = 'config';
     $edit['modules[Core][help][enable]'] = 'help';
-    $this->drupalPostForm('admin/modules', $edit, t('Save configuration'));
+    $this->drupalPostForm('admin/modules', $edit, t('Install'));
     $this->assertModules(array('color', 'config', 'help'), TRUE);
 
     // Check the actual order which is saved by module_test_modules_enabled().
@@ -162,7 +161,7 @@ class DependencyTest extends ModuleTestBase {
   function testUninstallDependents() {
     // Enable the forum module.
     $edit = array('modules[Core][forum][enable]' => 'forum');
-    $this->drupalPostForm('admin/modules', $edit, t('Save configuration'));
+    $this->drupalPostForm('admin/modules', $edit, t('Install'));
     $this->drupalPostForm(NULL, array(), t('Continue'));
     $this->assertModules(array('forum'), TRUE);
 
diff --git a/core/modules/system/src/Tests/Module/HookRequirementsTest.php b/core/modules/system/src/Tests/Module/HookRequirementsTest.php
index ad8796057..83fdce963 100644
--- a/core/modules/system/src/Tests/Module/HookRequirementsTest.php
+++ b/core/modules/system/src/Tests/Module/HookRequirementsTest.php
@@ -22,7 +22,7 @@ class HookRequirementsTest extends ModuleTestBase {
     // Attempt to install the requirements1_test module.
     $edit = array();
     $edit['modules[Testing][requirements1_test][enable]'] = 'requirements1_test';
-    $this->drupalPostForm('admin/modules', $edit, t('Save configuration'));
+    $this->drupalPostForm('admin/modules', $edit, t('Install'));
 
     // Makes sure the module was NOT installed.
     $this->assertText(t('Requirements 1 Test failed requirements'), 'Modules status has been updated.');
diff --git a/core/modules/system/src/Tests/Module/InstallUninstallTest.php b/core/modules/system/src/Tests/Module/InstallUninstallTest.php
index b26cb7cbc..2295b75fc 100644
--- a/core/modules/system/src/Tests/Module/InstallUninstallTest.php
+++ b/core/modules/system/src/Tests/Module/InstallUninstallTest.php
@@ -77,7 +77,7 @@ class InstallUninstallTest extends ModuleTestBase {
       $edit = array();
       $package = $module->info['package'];
       $edit["modules[$package][$name][enable]"] = TRUE;
-      $this->drupalPostForm('admin/modules', $edit, t('Save configuration'));
+      $this->drupalPostForm('admin/modules', $edit, t('Install'));
 
       // Handle the case where modules were installed along with this one and
       // where we therefore hit a confirmation screen.
@@ -85,7 +85,16 @@ class InstallUninstallTest extends ModuleTestBase {
         $this->drupalPostForm(NULL, array(), t('Continue'));
       }
 
-      $this->assertText(t('The configuration options have been saved.'), 'Modules status has been updated.');
+      // List the module display names to check the confirmation message.
+      $module_names = array();
+      foreach ($modules_to_install as $module_to_install) {
+        $module_names[] = $all_modules[$module_to_install]->info['name'];
+      }
+      $expected_text = \Drupal::translation()->formatPlural(count($module_names), 'Module @name has been enabled.', '@count modules have been enabled: @names.', array(
+        '@name' => $module_names[0],
+        '@names' => implode(', ', $module_names),
+      ));
+      $this->assertText($expected_text, 'Modules status has been updated.');
 
       // Check that hook_modules_installed() was invoked with the expected list
       // of modules, that each module's database tables now exist, and that
@@ -138,8 +147,8 @@ class InstallUninstallTest extends ModuleTestBase {
     foreach ($all_modules as $name => $module) {
       $edit['modules[' . $module->info['package'] . '][' . $name . '][enable]'] = TRUE;
     }
-    $this->drupalPostForm('admin/modules', $edit, t('Save configuration'));
-    $this->assertText(t('The configuration options have been saved.'), 'Modules status has been updated.');
+    $this->drupalPostForm('admin/modules', $edit, t('Install'));
+    $this->assertText(t('@count modules have been enabled: ', array('@count' => count($all_modules))), 'Modules status has been updated.');
   }
 
   /**
diff --git a/core/modules/system/src/Tests/Module/UninstallTest.php b/core/modules/system/src/Tests/Module/UninstallTest.php
index f060986fd..4f5e1939b 100644
--- a/core/modules/system/src/Tests/Module/UninstallTest.php
+++ b/core/modules/system/src/Tests/Module/UninstallTest.php
@@ -9,6 +9,7 @@ namespace Drupal\system\Tests\Module;
 
 use Drupal\Core\Cache\Cache;
 use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Core\Entity\EntityMalformedException;
 use Drupal\simpletest\WebTestBase;
 
 /**
@@ -56,6 +57,10 @@ class UninstallTest extends WebTestBase {
     $this->drupalGet('admin/modules/uninstall');
     $this->assertTitle(t('Uninstall') . ' | Drupal');
 
+    // Be sure labels are rendered properly.
+    // @see regression https://www.drupal.org/node/2512106
+    $this->assertRaw('<label for="edit-uninstall-node" class="module-name table-filter-text-source">Node</label>');
+
     $this->assertText(\Drupal::translation()->translate('The following reason prevents Node from being uninstalled:'));
     $this->assertText(\Drupal::translation()->translate('There is content for the entity type: Content'));
     // Delete the node to allow node to be uninstalled.
@@ -117,4 +122,31 @@ class UninstallTest extends WebTestBase {
     $this->assertUrl('admin/modules/uninstall');
     $this->assertTitle(t('Uninstall') . ' | Drupal');
   }
+
+  /**
+   * Tests that a module which fails to install can still be uninstalled.
+   */
+  public function testFailedInstallStatus() {
+    $account = $this->drupalCreateUser(array('administer modules'));
+    $this->drupalLogin($account);
+
+    $message = 'Exception thrown when installing module_installer_config_test with an invalid configuration file.';
+    try {
+      $this->container->get('module_installer')->install(array('module_installer_config_test'));
+      $this->fail($message);
+    } catch (EntityMalformedException $e) {
+      $this->pass($message);
+    }
+
+    // Even though the module failed to install properly, its configuration
+    // status is "enabled" and should still be available to uninstall.
+    $this->drupalGet('admin/modules/uninstall');
+    $this->assertText('Module installer config test');
+    $edit['uninstall[module_installer_config_test]'] = TRUE;
+    $this->drupalPostForm('admin/modules/uninstall', $edit, t('Uninstall'));
+    $this->drupalPostForm(NULL, NULL, t('Uninstall'));
+    $this->assertText(t('The selected modules have been uninstalled.'));
+    $this->assertNoText('Module installer config test');
+  }
+
 }
diff --git a/core/modules/system/src/Tests/Pager/PagerTest.php b/core/modules/system/src/Tests/Pager/PagerTest.php
index 87730fff5..133c90cb2 100644
--- a/core/modules/system/src/Tests/Pager/PagerTest.php
+++ b/core/modules/system/src/Tests/Pager/PagerTest.php
@@ -65,7 +65,7 @@ class PagerTest extends WebTestBase {
     $elements = $this->xpath('//li[contains(@class, :class)]/a', array(':class' => 'pager__item--last'));
     preg_match('@page=(\d+)@', $elements[0]['href'], $matches);
     $current_page = (int) $matches[1];
-    $this->drupalGet($GLOBALS['base_root'] . $elements[0]['href'], array('external' => TRUE));
+    $this->drupalGet($GLOBALS['base_root'] . parse_url($this->getUrl())['path'] . $elements[0]['href'], array('external' => TRUE));
     $this->assertPagerItems($current_page);
   }
 
@@ -76,19 +76,23 @@ class PagerTest extends WebTestBase {
     // First page.
     $this->drupalGet('pager-test/query-parameters');
     $this->assertText(t('Pager calls: 0'), 'Initial call to pager shows 0 calls.');
-    $this->assertText('pager.0.0');
+    $this->assertText('[url.query_args.pagers:0]=0.0');
+    $this->assertCacheContext('url.query_args');
 
     // Go to last page, the count of pager calls need to go to 1.
     $elements = $this->xpath('//li[contains(@class, :class)]/a', array(':class' => 'pager__item--last'));
-    $this->drupalGet($GLOBALS['base_root'] . $elements[0]['href'], array('external' => TRUE));
+    $this->drupalGet($this->getAbsoluteUrl($elements[0]['href']));
     $this->assertText(t('Pager calls: 1'), 'First link call to pager shows 1 calls.');
-    $this->assertText('pager.0.60');
+    $this->assertText('[url.query_args.pagers:0]=0.60');
+    $this->assertCacheContext('url.query_args');
 
     // Go back to first page, the count of pager calls need to go to 2.
     $elements = $this->xpath('//li[contains(@class, :class)]/a', array(':class' => 'pager__item--first'));
-    $this->drupalGet($GLOBALS['base_root'] . $elements[0]['href'], array('external' => TRUE));
+    $this->drupalGet($this->getAbsoluteUrl($elements[0]['href']));
+    $this->drupalGet($GLOBALS['base_root'] . parse_url($this->getUrl())['path'] . $elements[0]['href'], array('external' => TRUE));
     $this->assertText(t('Pager calls: 2'), 'Second link call to pager shows 2 calls.');
-    $this->assertText('pager.0.0');
+    $this->assertText('[url.query_args.pagers:0]=0.0');
+    $this->assertCacheContext('url.query_args');
   }
 
   /**
diff --git a/core/modules/system/src/Tests/Plugin/ContextPluginTest.php b/core/modules/system/src/Tests/Plugin/ContextPluginTest.php
index 5b04cd524..350868960 100644
--- a/core/modules/system/src/Tests/Plugin/ContextPluginTest.php
+++ b/core/modules/system/src/Tests/Plugin/ContextPluginTest.php
@@ -57,7 +57,7 @@ class ContextPluginTest extends KernelTestBase {
       $plugin->getContextValue('user');
     }
     catch(ContextException $e) {
-      $this->assertIdentical("The entity:user context is required and not present.", $e->getMessage(), 'Requesting a non-set value of a required context should throw a context exception.');
+      $this->assertIdentical("The 'entity:user' context is required and not present.", $e->getMessage(), 'Requesting a non-set value of a required context should throw a context exception.');
     }
 
     // Try to pass the wrong class type as a context value.
diff --git a/core/modules/system/src/Tests/Queue/QueueSerializationTest.php b/core/modules/system/src/Tests/Queue/QueueSerializationTest.php
index 9108ac228..638b3f58c 100644
--- a/core/modules/system/src/Tests/Queue/QueueSerializationTest.php
+++ b/core/modules/system/src/Tests/Queue/QueueSerializationTest.php
@@ -97,6 +97,7 @@ class QueueSerializationTest extends KernelTestBase implements FormInterface {
    */
   public function testQueueSerialization() {
     $form_state = new FormState();
+    $form_state->setRequestMethod('POST');
     $form_state->setCached();
     $form_builder = $this->container->get('form_builder');
     $form_id = $form_builder->getFormId($this, $form_state);
diff --git a/core/modules/system/src/Tests/Render/DisplayVariantTest.php b/core/modules/system/src/Tests/Render/DisplayVariantTest.php
new file mode 100644
index 000000000..432aacf92
--- /dev/null
+++ b/core/modules/system/src/Tests/Render/DisplayVariantTest.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\system\Tests\Render\DisplayVariantTest.
+ */
+
+namespace Drupal\system\Tests\Render;
+
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Tests selecting a display variant.
+ *
+ * @group Render
+ */
+class DisplayVariantTest extends WebTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('display_variant_test');
+
+  /**
+   * Tests selecting the variant and passing configuration.
+   */
+  function testPageDisplayVariantSelectionEvent() {
+    // Tests that our display variant was selected, and that its configuration
+    // was passed correctly. If the configuration wasn't passed, we'd get an
+    // error page here.
+    $this->drupalGet('<front>');
+    $this->assertRaw('A very important, required value.');
+  }
+
+}
diff --git a/core/modules/system/src/Tests/Render/UrlBubbleableMetadataBubblingTest.php b/core/modules/system/src/Tests/Render/UrlBubbleableMetadataBubblingTest.php
new file mode 100644
index 000000000..2ae068ea8
--- /dev/null
+++ b/core/modules/system/src/Tests/Render/UrlBubbleableMetadataBubblingTest.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\system\Tests\Render\UrlBubbleableMetadataBubblingTest.
+ */
+
+namespace Drupal\system\Tests\Render;
+
+use Drupal\Core\Url;
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Tests that URL bubbleable metadata is correctly bubbled.
+ *
+ * @group Render
+ */
+class UrlBubbleableMetadataBubblingTest extends WebTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['cache_test'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->dumpHeaders = TRUE;
+  }
+
+  /**
+   * Tests that URL bubbleable metadata is correctly bubbled.
+   */
+  public function testUrlBubbleableMetadataBubbling() {
+    // Test that regular URLs bubble up bubbleable metadata when converted to
+    // string.
+    $url = Url::fromRoute('cache_test.url_bubbling');
+    $this->drupalGet($url);
+    $this->assertCacheContext('url.site');
+    $this->assertRaw($url->setAbsolute()->toString());
+  }
+
+}
diff --git a/core/modules/system/src/Tests/RouteProcessor/RouteNoneTest.php b/core/modules/system/src/Tests/RouteProcessor/RouteNoneTest.php
index c46eb9c17..551e4d8d6 100644
--- a/core/modules/system/src/Tests/RouteProcessor/RouteNoneTest.php
+++ b/core/modules/system/src/Tests/RouteProcessor/RouteNoneTest.php
@@ -8,8 +8,8 @@
 namespace Drupal\system\Tests\RouteProcessor;
 
 use Drupal\Core\Cache\Cache;
-use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\GeneratedUrl;
+use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\simpletest\KernelTestBase;
 use Symfony\Cmf\Component\Routing\RouteObjectInterface;
 use Symfony\Component\HttpFoundation\Request;
@@ -52,7 +52,7 @@ class RouteNoneTest extends KernelTestBase {
    * Tests the output process.
    */
   public function testProcessOutbound() {
-    $expected_cacheability = (new CacheableMetadata())->setCacheMaxAge(Cache::PERMANENT);
+    $expected_cacheability = (new BubbleableMetadata())->setCacheMaxAge(Cache::PERMANENT);
 
     $request_stack = \Drupal::requestStack();
     /** @var \Symfony\Component\Routing\RequestContext $request_context */
diff --git a/core/modules/system/src/Tests/RouteProcessor/RouteProcessorCurrentIntegrationTest.php b/core/modules/system/src/Tests/RouteProcessor/RouteProcessorCurrentIntegrationTest.php
index 4297ed1ab..bc341a636 100644
--- a/core/modules/system/src/Tests/RouteProcessor/RouteProcessorCurrentIntegrationTest.php
+++ b/core/modules/system/src/Tests/RouteProcessor/RouteProcessorCurrentIntegrationTest.php
@@ -8,8 +8,8 @@
 namespace Drupal\system\Tests\RouteProcessor;
 
 use Drupal\Core\Cache\Cache;
-use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\GeneratedUrl;
+use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\simpletest\KernelTestBase;
 use Symfony\Cmf\Component\Routing\RouteObjectInterface;
 use Symfony\Component\HttpFoundation\Request;
@@ -51,7 +51,7 @@ class RouteProcessorCurrentIntegrationTest extends KernelTestBase {
    * Tests the output process.
    */
   public function testProcessOutbound() {
-    $expected_cacheability = (new CacheableMetadata())
+    $expected_cacheability = (new BubbleableMetadata())
       ->addCacheContexts(['route'])
       ->setCacheMaxAge(Cache::PERMANENT);
 
@@ -133,7 +133,7 @@ class RouteProcessorCurrentIntegrationTest extends KernelTestBase {
     // In case we have no routing, the current route should point to the front,
     // and the cacheability does not depend on the 'route' cache context, since
     // no route was involved at all: this is fallback behavior.
-    $url = GeneratedUrl::createFromObject((new CacheableMetadata())->setCacheMaxAge(Cache::PERMANENT))->setGeneratedUrl('/');
+    $url = GeneratedUrl::createFromObject((new BubbleableMetadata())->setCacheMaxAge(Cache::PERMANENT))->setGeneratedUrl('/');
     $this->assertEqual($url, $this->urlGenerator->generateFromRoute('<current>', [], [], TRUE));
   }
 
diff --git a/core/modules/system/src/Tests/Routing/ExceptionHandlingTest.php b/core/modules/system/src/Tests/Routing/ExceptionHandlingTest.php
index ee3c76308..1b22d5cd1 100644
--- a/core/modules/system/src/Tests/Routing/ExceptionHandlingTest.php
+++ b/core/modules/system/src/Tests/Routing/ExceptionHandlingTest.php
@@ -120,4 +120,28 @@ class ExceptionHandlingTest extends KernelTestBase {
     $this->assertTrue(strpos($response->getContent(), '<script>alert(\'xss\')</script>') === FALSE);
   }
 
+  /**
+   * Tests exception message escaping.
+   */
+  public function testExceptionEscaping() {
+    // Enable verbose error logging.
+    $this->config('system.logging')->set('error_level', ERROR_REPORTING_DISPLAY_VERBOSE)->save();
+
+    // Using SafeMarkup::format().
+    $request = Request::create('/router_test/test24');
+    $request->setFormat('html', ['text/html']);
+
+    /** @var \Symfony\Component\HttpKernel\HttpKernelInterface $kernel */
+    $kernel = \Drupal::getContainer()->get('http_kernel');
+    $response = $kernel->handle($request)->prepare($request);
+    $this->assertEqual($response->getStatusCode(), Response::HTTP_INTERNAL_SERVER_ERROR);
+    $this->assertEqual($response->headers->get('Content-type'), 'text/html; charset=UTF-8');
+
+    // Test message is properly escaped, and that the unescaped string is not
+    // output at all.
+    $this->setRawContent($response->getContent());
+    $this->assertRaw(SafeMarkup::checkPlain('Escaped content: <p> <br> <h3>'));
+    $this->assertNoRaw('<p> <br> <h3>');
+  }
+
 }
diff --git a/core/modules/system/src/Tests/Routing/RouterTest.php b/core/modules/system/src/Tests/Routing/RouterTest.php
index 209336c2c..207049f2a 100644
--- a/core/modules/system/src/Tests/Routing/RouterTest.php
+++ b/core/modules/system/src/Tests/Routing/RouterTest.php
@@ -10,6 +10,7 @@ namespace Drupal\system\Tests\Routing;
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\simpletest\WebTestBase;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Exception\RouteNotFoundException;
 
 /**
@@ -30,7 +31,7 @@ class RouterTest extends WebTestBase {
    * Confirms that our FinishResponseSubscriber logic works properly.
    */
   public function testFinishResponseSubscriber() {
-    $renderer_required_cache_contexts = ['languages:' . LanguageInterface::TYPE_INTERFACE, 'theme'];
+    $renderer_required_cache_contexts = ['languages:' . LanguageInterface::TYPE_INTERFACE, 'theme', 'user.permissions'];
 
     // Confirm that the router can get to a controller.
     $this->drupalGet('router_test/test1');
@@ -40,14 +41,14 @@ class RouterTest extends WebTestBase {
     $this->assertEqual($headers['x-ua-compatible'], 'IE=edge');
     $this->assertEqual($headers['content-language'], 'en');
     $this->assertEqual($headers['x-content-type-options'], 'nosniff');
-
+    $this->assertEqual($headers['x-frame-options'], 'SAMEORIGIN');
 
     $this->drupalGet('router_test/test2');
     $this->assertRaw('test2', 'The correct string was returned because the route was successful.');
     // Check expected headers from FinishResponseSubscriber.
     $headers = $this->drupalGetHeaders();
     $this->assertEqual($headers['x-drupal-cache-contexts'], implode(' ', $renderer_required_cache_contexts));
-    $this->assertEqual($headers['x-drupal-cache-tags'], 'rendered');
+    $this->assertEqual($headers['x-drupal-cache-tags'], 'config:user.role.anonymous rendered');
     // Confirm that the page wrapping is being added, so we're not getting a
     // raw body returned.
     $this->assertRaw('</html>', 'Page markup was found.');
@@ -62,12 +63,12 @@ class RouterTest extends WebTestBase {
     $this->drupalGet('router_test/test18');
     $headers = $this->drupalGetHeaders();
     $this->assertEqual($headers['x-drupal-cache-contexts'], implode(' ', Cache::mergeContexts($renderer_required_cache_contexts, ['url'])));
-    $this->assertEqual($headers['x-drupal-cache-tags'], 'foo rendered');
+    $this->assertEqual($headers['x-drupal-cache-tags'], 'config:user.role.anonymous foo rendered');
     // 2. controller result: render array, per-role cacheable route access.
     $this->drupalGet('router_test/test19');
     $headers = $this->drupalGetHeaders();
     $this->assertEqual($headers['x-drupal-cache-contexts'], implode(' ', Cache::mergeContexts($renderer_required_cache_contexts, ['url', 'user.roles'])));
-    $this->assertEqual($headers['x-drupal-cache-tags'], 'foo rendered');
+    $this->assertEqual($headers['x-drupal-cache-tags'], 'config:user.role.anonymous foo rendered');
     // 3. controller result: Response object, globally cacheable route access.
     $this->drupalGet('router_test/test1');
     $headers = $this->drupalGetHeaders();
@@ -198,6 +199,15 @@ class RouterTest extends WebTestBase {
     $this->assertText('Route not matched.');
   }
 
+  /**
+   * Tests that a PSR-7 response works.
+   */
+  public function testRouterResponsePsr7() {
+    $this->drupalGet('/router_test/test23');
+    $this->assertResponse(200);
+    $this->assertText('test23');
+  }
+
   /**
    * Tests the user account on the DIC.
    */
@@ -248,4 +258,23 @@ class RouterTest extends WebTestBase {
     $route = \Drupal::service('router.route_provider')->getRouteByName('router_test.1');
     $this->assertNotNull($route, 'Route exists after module installation');
   }
+
+  /**
+   * Ensure that multiple leading slashes are redirected.
+   */
+  public function testLeadingSlashes() {
+    $request = $this->container->get('request_stack')->getCurrentRequest();
+    $url = $request->getUriForPath('//router_test/test1');
+    $this->drupalGet($url);
+    $this->assertEqual(1, $this->redirectCount, $url . " redirected to " . $this->url);
+    $this->assertUrl($request->getUriForPath('/router_test/test1'));
+
+    // It should not matter how many leading slashes are used and query strings
+    // should be preserved.
+    $url = $request->getUriForPath('/////////////////////////////////////////////////router_test/test1') . '?qs=test';
+    $this->drupalGet($url);
+    $this->assertEqual(1, $this->redirectCount, $url . " redirected to " . $this->url);
+    $this->assertUrl($request->getUriForPath('/router_test/test1') . '?qs=test');
+  }
+
 }
diff --git a/core/modules/system/src/Tests/Session/SessionTest.php b/core/modules/system/src/Tests/Session/SessionTest.php
index c9eb3ee9e..c194c793b 100644
--- a/core/modules/system/src/Tests/Session/SessionTest.php
+++ b/core/modules/system/src/Tests/Session/SessionTest.php
@@ -290,7 +290,7 @@ class SessionTest extends WebTestBase {
     $this->loggedInUser = FALSE;
 
     // Change cookie file for user.
-    $this->cookieFile = file_stream_wrapper_get_instance_by_scheme('temporary')->getDirectoryPath() . '/cookie.' . $uid . '.txt';
+    $this->cookieFile = \Drupal::service('stream_wrapper_manager')->getViaScheme('temporary')->getDirectoryPath() . '/cookie.' . $uid . '.txt';
     $this->additionalCurlOptions[CURLOPT_COOKIEFILE] = $this->cookieFile;
     $this->additionalCurlOptions[CURLOPT_COOKIESESSION] = TRUE;
     $this->drupalGet('session-test/get');
diff --git a/core/modules/system/src/Tests/System/DateFormatsLockedTest.php b/core/modules/system/src/Tests/System/DateFormatsLockedTest.php
index 13b70625f..fbe069024 100644
--- a/core/modules/system/src/Tests/System/DateFormatsLockedTest.php
+++ b/core/modules/system/src/Tests/System/DateFormatsLockedTest.php
@@ -28,7 +28,7 @@ class DateFormatsLockedTest extends WebTestBase {
     $this->drupalGet('admin/config/regional/date-time');
     $this->assertLinkByHref('admin/config/regional/date-time/formats/manage/short');
     $this->assertNoLinkByHref('admin/config/regional/date-time/formats/manage/html_date');
-    $this->assertText('fallback (locked)');
+    $this->assertText('Fallback date format');
     $this->assertNoText('short (locked)');
 
     // Locked date formats are not editable.
diff --git a/core/modules/system/src/Tests/System/DateTimeTest.php b/core/modules/system/src/Tests/System/DateTimeTest.php
index 9f0b0ac75..88868e995 100644
--- a/core/modules/system/src/Tests/System/DateTimeTest.php
+++ b/core/modules/system/src/Tests/System/DateTimeTest.php
@@ -88,7 +88,7 @@ class DateTimeTest extends WebTestBase {
     $this->drupalPostForm('admin/config/regional/date-time/formats/add', $edit, t('Add format'));
     $this->assertUrl(\Drupal::url('entity.date_format.collection', [], ['absolute' => TRUE]), [], 'Correct page redirection.');
     $this->assertText(t('Custom date format added.'), 'Date format added confirmation message appears.');
-    $this->assertText($date_format_id, 'Custom date format appears in the date format list.');
+    $this->assertText($name, 'Custom date format appears in the date format list.');
     $this->assertText(t('Delete'), 'Delete link for custom date format appears.');
 
     // Edit the custom date format and re-save without editing the format.
diff --git a/core/modules/system/src/Tests/System/ErrorHandlerTest.php b/core/modules/system/src/Tests/System/ErrorHandlerTest.php
index e985f2838..8164f36aa 100644
--- a/core/modules/system/src/Tests/System/ErrorHandlerTest.php
+++ b/core/modules/system/src/Tests/System/ErrorHandlerTest.php
@@ -52,8 +52,8 @@ class ErrorHandlerTest extends WebTestBase {
       '!message' => 'Argument 1 passed to Drupal\error_test\Controller\ErrorTestController::Drupal\error_test\Controller\{closure}() must be of the type array, string given, called in ' . \Drupal::root() . '/core/modules/system/tests/modules/error_test/src/Controller/ErrorTestController.php on line 66 and defined',
     );
     if (version_compare(PHP_VERSION, '7.0.0-dev') >= 0)  {
-      // In PHP 7, instead of a recoverable fatal error we get a TypeException.
-      $fatal_error['%type'] = 'TypeException';
+      // In PHP 7, instead of a recoverable fatal error we get a TypeError.
+      $fatal_error['%type'] = 'TypeError';
       // The error message also changes in PHP 7.
       $fatal_error['!message'] = 'Argument 1 passed to Drupal\error_test\Controller\ErrorTestController::Drupal\error_test\Controller\{closure}() must be of the type array, string given, called in ' . \Drupal::root() . '/core/modules/system/tests/modules/error_test/src/Controller/ErrorTestController.php on line 66';
     }
@@ -76,9 +76,9 @@ class ErrorHandlerTest extends WebTestBase {
 
     // Remove the recoverable fatal error from the assertions, it's wanted here.
     // Ensure that we just remove this one recoverable fatal error (in PHP 7 this
-    // is a TypeException).
+    // is a TypeError).
     foreach ($this->assertions as $key => $assertion) {
-      if (in_array($assertion['message_group'], ['Recoverable fatal error', 'TypeException']) && strpos($assertion['message'], 'Argument 1 passed to Drupal\error_test\Controller\ErrorTestController::Drupal\error_test\Controller\{closure}() must be of the type array, string given, called in') !== FALSE) {
+      if (in_array($assertion['message_group'], ['Recoverable fatal error', 'TypeError']) && strpos($assertion['message'], 'Argument 1 passed to Drupal\error_test\Controller\ErrorTestController::Drupal\error_test\Controller\{closure}() must be of the type array, string given, called in') !== FALSE) {
         unset($this->assertions[$key]);
         $this->deleteAssert($assertion['message_id']);
       }
diff --git a/core/modules/system/src/Tests/System/MainContentFallbackTest.php b/core/modules/system/src/Tests/System/MainContentFallbackTest.php
index 56a7e8553..963bb76ef 100644
--- a/core/modules/system/src/Tests/System/MainContentFallbackTest.php
+++ b/core/modules/system/src/Tests/System/MainContentFallbackTest.php
@@ -70,8 +70,8 @@ class MainContentFallbackTest extends WebTestBase {
     $this->drupalLogin($this->adminUser);
     $edit = array();
     $edit['modules[Core][block][enable]'] = 'block';
-    $this->drupalPostForm('admin/modules', $edit, t('Save configuration'));
-    $this->assertText(t('The configuration options have been saved.'), 'Modules status has been updated.');
+    $this->drupalPostForm('admin/modules', $edit, t('Install'));
+    $this->assertText(t('Module Block has been enabled.'), 'Modules status has been updated.');
     $this->rebuildContainer();
     $this->assertTrue(\Drupal::moduleHandler()->moduleExists('block'), 'Block module re-enabled.');
   }
diff --git a/core/modules/system/src/Tests/System/PageTitleTest.php b/core/modules/system/src/Tests/System/PageTitleTest.php
index 1fef0a486..6d56a6fa1 100644
--- a/core/modules/system/src/Tests/System/PageTitleTest.php
+++ b/core/modules/system/src/Tests/System/PageTitleTest.php
@@ -55,6 +55,7 @@ class PageTitleTest extends WebTestBase {
 
     $node = $this->drupalGetNodeByTitle($edit['title[0][value]']);
     $this->assertNotNull($node, 'Node created and found in database');
+    $this->assertText(SafeMarkup::checkPlain($edit['title[0][value]']), 'Check to make sure tags in the node title are converted.');
     $this->drupalGet("node/" . $node->id());
     $this->assertText(SafeMarkup::checkPlain($edit['title[0][value]']), 'Check to make sure tags in the node title are converted.');
   }
@@ -137,6 +138,24 @@ class PageTitleTest extends WebTestBase {
     $this->assertTitle('Dynamic title | Drupal');
     $result = $this->xpath('//h1');
     $this->assertEqual('Dynamic title', (string) $result[0]);
+
+    // Ensure that titles are cacheable and are escaped normally if the
+    // controller does not escape them.
+    $this->drupalGet('test-page-cached-controller');
+    $this->assertTitle('Cached title | Drupal');
+    $this->assertRaw(SafeMarkup::checkPlain('<span>Cached title</span>') . '</h1>');
+    $this->drupalGet('test-page-cached-controller');
+    $this->assertTitle('Cached title | Drupal');
+    $this->assertRaw(SafeMarkup::checkPlain('<span>Cached title</span>') . '</h1>');
+
+    // Ensure that titles are cacheable and are escaped normally if the
+    // controller escapes them use SafeMarkup::checkPlain().
+    $this->drupalGet('test-page-cached-controller-safe');
+    $this->assertTitle('<span>Cached title</span> | Drupal');
+    $this->assertRaw(SafeMarkup::checkPlain('<span>Cached title</span>') . '</h1>');
+    $this->drupalGet('test-page-cached-controller-safe');
+    $this->assertTitle('<span>Cached title</span> | Drupal');
+    $this->assertRaw(SafeMarkup::checkPlain('<span>Cached title</span>') . '</h1>');
   }
 
 }
diff --git a/core/modules/system/src/Tests/System/ThemeTest.php b/core/modules/system/src/Tests/System/ThemeTest.php
index 3c36ae430..7c8527588 100644
--- a/core/modules/system/src/Tests/System/ThemeTest.php
+++ b/core/modules/system/src/Tests/System/ThemeTest.php
@@ -273,6 +273,10 @@ class ThemeTest extends WebTestBase {
     $this->drupalGet('admin/appearance');
     $this->assertText(t('This theme requires the base theme @base_theme to operate correctly.', array('@base_theme' => 'not_real_test_basetheme')));
     $this->assertText(t('This theme requires the theme engine @theme_engine to operate correctly.', array('@theme_engine' => 'not_real_engine')));
+    // Check for the error text of a theme with the wrong core version.
+    $this->assertText("This theme is not compatible with Drupal 8.x. Check that the .info.yml file contains the correct 'core' value.");
+    // Check for the error text of a theme without a content region.
+    $this->assertText("This theme is missing a 'content' region.");
   }
 
   /**
@@ -334,4 +338,28 @@ class ThemeTest extends WebTestBase {
     $this->clickLink(t('Uninstall'));
     $this->assertRaw('The <em class="placeholder">Classy</em> theme has been uninstalled');
   }
+
+  /**
+   * Tests installing a theme and setting it as default.
+   */
+  function testInstallAndSetAsDefault() {
+    $this->drupalGet('admin/appearance');
+    // Bartik is uninstalled in the test profile and has the second "Install and
+    // set as default" link.
+    $this->clickLink(t('Install and set as default'), 1);
+    // Test the confirmation message.
+    $this->assertText('Bartik is now the default theme.');
+    // Make sure Bartik is now set as the default theme in config.
+    $this->assertEqual($this->config('system.theme')->get('default'), 'bartik');
+
+    // This checks for a regression. See https://www.drupal.org/node/2498691.
+    $this->assertNoText('The bartik theme was not found.');
+
+    $themes = \Drupal::service('theme_handler')->rebuildThemeData();
+    $version = $themes['bartik']->info['version'];
+
+    // Confirm Bartik is indicated as the default theme.
+    $this->assertTextPattern('/Bartik ' . preg_quote($version) . '\s{2,}\(default theme\)/');
+  }
+
 }
diff --git a/core/modules/system/src/Tests/System/TokenReplaceUnitTest.php b/core/modules/system/src/Tests/System/TokenReplaceUnitTest.php
index f98c3735f..b8f31e765 100644
--- a/core/modules/system/src/Tests/System/TokenReplaceUnitTest.php
+++ b/core/modules/system/src/Tests/System/TokenReplaceUnitTest.php
@@ -9,6 +9,7 @@ namespace Drupal\system\Tests\System;
 
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Utility\Xss;
+use Drupal\Core\Render\BubbleableMetadata;
 
 /**
  * Generates text using placeholders for dummy content to check token
@@ -111,12 +112,25 @@ class TokenReplaceUnitTest extends TokenReplaceUnitTestBase {
     $tests['[site:url-brief]'] = preg_replace(array('!^https?://!', '!/$!'), '', \Drupal::url('<front>', [], $url_options));
     $tests['[site:login-url]'] = \Drupal::url('user.page', [], $url_options);
 
+    $base_bubbleable_metadata = new BubbleableMetadata();
+
+    $metadata_tests = [];
+    $metadata_tests['[site:name]'] = BubbleableMetadata::createFromObject(\Drupal::config('system.site'));
+    $metadata_tests['[site:slogan]'] = BubbleableMetadata::createFromObject(\Drupal::config('system.site'));
+    $metadata_tests['[site:mail]'] = BubbleableMetadata::createFromObject(\Drupal::config('system.site'));
+    $bubbleable_metadata = clone $base_bubbleable_metadata;
+    $metadata_tests['[site:url]'] = $bubbleable_metadata->addCacheContexts(['url.site']);
+    $metadata_tests['[site:url-brief]'] = $bubbleable_metadata;
+    $metadata_tests['[site:login-url]'] = $bubbleable_metadata;
+
     // Test to make sure that we generated something for each token.
     $this->assertFalse(in_array(0, array_map('strlen', $tests)), 'No empty tokens generated.');
 
     foreach ($tests as $input => $expected) {
-      $output = $this->tokenService->replace($input, array(), array('langcode' => $this->interfaceLanguage->getId()));
+      $bubbleable_metadata = new BubbleableMetadata();
+      $output = $this->tokenService->replace($input, array(), array('langcode' => $this->interfaceLanguage->getId()), $bubbleable_metadata);
       $this->assertEqual($output, $expected, format_string('Sanitized system site information token %token replaced.', array('%token' => $input)));
+      $this->assertEqual($bubbleable_metadata, $metadata_tests[$input]);
     }
 
     // Generate and test unsanitized tokens.
@@ -124,7 +138,7 @@ class TokenReplaceUnitTest extends TokenReplaceUnitTestBase {
     $tests['[site:slogan]'] = $config->get('slogan');
 
     foreach ($tests as $input => $expected) {
-      $output = $this->tokenService->replace($input, array(), array('langcode' => $this->interfaceLanguage->getId(), 'sanitize' => FALSE));
+      $output = $this->tokenService->replace($input, array(), array('langcode' => $this->interfaceLanguage->getId(), 'sanitize' => FALSE), $bubbleable_metadata);
       $this->assertEqual($output, $expected, format_string('Unsanitized system site information token %token replaced.', array('%token' => $input)));
     }
 
@@ -133,10 +147,10 @@ class TokenReplaceUnitTest extends TokenReplaceUnitTestBase {
     // flag is being passed properly through the call stack and being handled
     // correctly by a 'known' token, [site:slogan].
     $raw_tokens = array('slogan' => '[site:slogan]');
-    $generated = $this->tokenService->generate('site', $raw_tokens);
+    $generated = $this->tokenService->generate('site', $raw_tokens, [], [], $bubbleable_metadata);
     $this->assertEqual($generated['[site:slogan]'], $safe_slogan, 'Token sanitized.');
 
-    $generated = $this->tokenService->generate('site', $raw_tokens, array(), array('sanitize' => FALSE));
+    $generated = $this->tokenService->generate('site', $raw_tokens, array(), array('sanitize' => FALSE), $bubbleable_metadata);
     $this->assertEqual($generated['[site:slogan]'], $slogan, 'Unsanitized token generated properly.');
   }
 
diff --git a/core/modules/system/src/Tests/System/TokenReplaceWebTest.php b/core/modules/system/src/Tests/System/TokenReplaceWebTest.php
new file mode 100644
index 000000000..7e9d60fe8
--- /dev/null
+++ b/core/modules/system/src/Tests/System/TokenReplaceWebTest.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\system\Tests\System\TokenReplaceWebTest.
+ */
+
+namespace Drupal\system\Tests\System;
+
+use Drupal\simpletest\WebTestBase;
+use Drupal\system\Tests\Cache\AssertPageCacheContextsAndTagsTrait;
+
+/**
+ * Tests the token system integration.
+ *
+ * @group system
+ */
+class TokenReplaceWebTest extends WebTestBase {
+
+  use AssertPageCacheContextsAndTagsTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['token_test', 'filter', 'node'];
+
+  /**
+   * Tests a token replacement on an actual website.
+   */
+  public function testTokens() {
+    $node = $this->drupalCreateNode();
+    $account = $this->drupalCreateUser();
+    $this->drupalLogin($account);
+
+    $this->drupalGet('token-test/' . $node->id());
+    $this->assertText("Tokens: {$node->id()} {$account->id()}");
+    $this->assertCacheTags(['node:1', 'rendered', 'user:2']);
+    $this->assertCacheContexts(['languages:language_interface', 'theme', 'user']);
+
+    $this->drupalGet('token-test-without-bubleable-metadata/' . $node->id());
+    $this->assertText("Tokens: {$node->id()} {$account->id()}");
+    $this->assertCacheTags(['node:1', 'rendered', 'user:2']);
+    $this->assertCacheContexts(['languages:language_interface', 'theme', 'user']);
+  }
+
+}
diff --git a/core/modules/system/src/Tests/System/UncaughtExceptionTest.php b/core/modules/system/src/Tests/System/UncaughtExceptionTest.php
new file mode 100644
index 000000000..14b8bcab8
--- /dev/null
+++ b/core/modules/system/src/Tests/System/UncaughtExceptionTest.php
@@ -0,0 +1,199 @@
+<?php
+/**
+ * @file
+ * Contains \Drupal\system\Tests\System\UncaughtExceptionTest
+ */
+
+namespace Drupal\system\Tests\System;
+
+
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Tests kernel panic when things are really messed up.
+ *
+ * @group system
+ */
+class UncaughtExceptionTest extends WebTestBase {
+
+  /**
+   * Exceptions thrown by site under test that contain this text are ignored.
+   *
+   * @var string
+   */
+  protected $expectedExceptionMessage;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('error_service_test');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $settings_filename = $this->siteDirectory . '/settings.php';
+    chmod($settings_filename, 0777);
+    $settings_php = file_get_contents($settings_filename);
+    $settings_php .= "\ninclude_once 'core/modules/system/src/Tests/Bootstrap/ErrorContainer.php';\n";
+    $settings_php .= "\ninclude_once 'core/modules/system/src/Tests/Bootstrap/ExceptionContainer.php';\n";
+    file_put_contents($settings_filename, $settings_php);
+
+    $settings = [];
+    $settings['config']['system.logging']['error_level'] = (object) [
+      'value' => ERROR_REPORTING_DISPLAY_VERBOSE,
+      'required' => TRUE,
+    ];
+    $this->writeSettings($settings);
+  }
+
+  /**
+   * Tests uncaught exception handling when system is in a bad state.
+   */
+  public function testUncaughtException() {
+    $this->expectedExceptionMessage = 'Oh oh, bananas in the instruments.';
+    \Drupal::state()->set('error_service_test.break_bare_html_renderer', TRUE);
+
+    $this->config('system.logging')
+      ->set('error_level', ERROR_REPORTING_HIDE)
+      ->save();
+    $settings = [];
+    $settings['config']['system.logging']['error_level'] = (object) [
+      'value' => ERROR_REPORTING_HIDE,
+      'required' => TRUE,
+    ];
+    $this->writeSettings($settings);
+
+    $this->drupalGet('');
+    $this->assertResponse(500);
+    $this->assertText('The website encountered an unexpected error. Please try again later.');
+    $this->assertNoText($this->expectedExceptionMessage);
+
+    $this->config('system.logging')
+      ->set('error_level', ERROR_REPORTING_DISPLAY_ALL)
+      ->save();
+    $settings = [];
+    $settings['config']['system.logging']['error_level'] = (object) [
+      'value' => ERROR_REPORTING_DISPLAY_ALL,
+      'required' => TRUE,
+    ];
+    $this->writeSettings($settings);
+
+    $this->drupalGet('');
+    $this->assertResponse(500);
+    $this->assertText('The website encountered an unexpected error. Please try again later.');
+    $this->assertText($this->expectedExceptionMessage);
+  }
+
+  /**
+   * Tests a missing dependency on a service.
+   */
+  public function testMissingDependency() {
+    $this->expectedExceptionMessage = 'Argument 1 passed to Drupal\error_service_test\LonelyMonkeyClass::__construct() must be an instance of Drupal\Core\Database\Connection, non';
+    $this->drupalGet('broken-service-class');
+
+    $this->assertRaw('The website encountered an unexpected error.');
+    $this->assertRaw($this->expectedExceptionMessage);
+  }
+
+  /**
+   * Tests a container which has an error.
+   */
+  public function testErrorContainer() {
+    $settings = [];
+    $settings['settings']['container_base_class'] = (object) [
+      'value' => '\Drupal\system\Tests\Bootstrap\ErrorContainer',
+      'required' => TRUE,
+    ];
+    $this->writeSettings($settings);
+
+    // Need to rebuild the container, so the dumped container can be tested
+    // and not the container builder.
+    \Drupal::service('kernel')->rebuildContainer();
+
+    // Ensure that we don't use the now broken generated container on the test
+    // process.
+    \Drupal::setContainer($this->container);
+
+    $this->expectedExceptionMessage = 'Argument 1 passed to Drupal\system\Tests\Bootstrap\ErrorContainer::Drupal\system\Tests\Bootstrap\{closur';
+    $this->drupalGet('');
+
+    $this->assertRaw($this->expectedExceptionMessage);
+  }
+
+  /**
+   * Tests a container which has an exception really early.
+   */
+  public function testExceptionContainer() {
+    $settings = [];
+    $settings['settings']['container_base_class'] = (object) [
+      'value' => '\Drupal\system\Tests\Bootstrap\ExceptionContainer',
+      'required' => TRUE,
+    ];
+    $this->writeSettings($settings);
+
+    // Need to rebuild the container, so the dumped container can be tested
+    // and not the container builder.
+    \Drupal::service('kernel')->rebuildContainer();
+
+    // Ensure that we don't use the now broken generated container on the test
+    // process.
+    \Drupal::setContainer($this->container);
+
+    $this->expectedExceptionMessage = 'Thrown exception during Container::get';
+    $this->drupalGet('');
+
+
+    $this->assertRaw('The website encountered an unexpected error');
+    $this->assertRaw($this->expectedExceptionMessage);
+  }
+
+  /**
+   * Tests the case when the database connection is gone.
+   */
+  public function testLostDatabaseConnection() {
+    $incorrect_username = $this->randomMachineName(16);
+    switch ($this->container->get('database')->driver()) {
+      case 'pgsql':
+      case 'mysql':
+        $this->expectedExceptionMessage = $incorrect_username;
+        break;
+      default:
+        // We can not carry out this test.
+        $this->pass('Unable to run \Drupal\system\Tests\System\UncaughtExceptionTest::testLostDatabaseConnection for this database type.');
+        return;
+    }
+
+    // We simulate a broken database connection by rewrite settings.php to no
+    // longer have the proper data.
+    $settings['databases']['default']['default']['username'] = (object) array(
+      'value' => $incorrect_username,
+      'required' => TRUE,
+    );
+    $settings['databases']['default']['default']['passowrd'] = (object) array(
+      'value' => $this->randomMachineName(16),
+      'required' => TRUE,
+    );
+
+    $this->writeSettings($settings);
+
+    $this->drupalGet('');
+    $this->assertRaw('PDOException');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function error($message = '', $group = 'Other', array $caller = NULL) {
+    if (!empty($this->expectedExceptionMessage) && strpos($message, $this->expectedExceptionMessage) !== FALSE) {
+      // We're expecting this error.
+      return FALSE;
+    }
+    return parent::error($message, $group, $caller);
+  }
+
+}
diff --git a/core/modules/system/src/Tests/Theme/EngineTwigTest.php b/core/modules/system/src/Tests/Theme/EngineTwigTest.php
index 86b49e89d..59af0147a 100644
--- a/core/modules/system/src/Tests/Theme/EngineTwigTest.php
+++ b/core/modules/system/src/Tests/Theme/EngineTwigTest.php
@@ -85,6 +85,7 @@ class EngineTwigTest extends WebTestBase {
       'link via the linkgenerator: ' . $link_generator->generate('register', new Url('user.register', [], ['absolute' => TRUE, 'attributes' => ['foo' => 'bar']])),
       'link via the linkgenerator: ' . $link_generator->generate('register', new Url('user.register', [], ['attributes' => ['foo' => 'bar', 'id' => 'kitten']])),
       'link via the linkgenerator: ' . $link_generator->generate('register', new Url('user.register', [], ['attributes' => ['id' => 'kitten']])),
+      'link via the linkgenerator: ' . $link_generator->generate('register', new Url('user.register', [], ['attributes' => ['class' => ['llama', 'kitten', 'panda']]])),
     ];
 
     // Verify that link() has the ability to bubble cacheability metadata:
diff --git a/core/modules/system/src/Tests/Theme/ThemeInfoTest.php b/core/modules/system/src/Tests/Theme/ThemeInfoTest.php
index 0b38ea782..27eee3b7e 100644
--- a/core/modules/system/src/Tests/Theme/ThemeInfoTest.php
+++ b/core/modules/system/src/Tests/Theme/ThemeInfoTest.php
@@ -94,13 +94,13 @@ class ThemeInfoTest extends WebTestBase {
     $active_theme = $this->themeManager->getActiveTheme();
     // Make sure we are not testing the wrong theme.
     $this->assertEqual('test_theme', $active_theme->getName());
-    $this->assertEqual(['classy/base', 'test_theme/global-styling'], $active_theme->getLibraries());
+    $this->assertEqual(['classy/base', 'core/normalize', 'test_theme/global-styling'], $active_theme->getLibraries());
 
     // @see theme_test_system_info_alter()
     $this->state->set('theme_test.modify_info_files', TRUE);
     drupal_flush_all_caches();
     $active_theme = $this->themeManager->getActiveTheme();
-    $this->assertEqual(['classy/base', 'test_theme/global-styling', 'core/backbone'], $active_theme->getLibraries());
+    $this->assertEqual(['classy/base', 'core/normalize', 'test_theme/global-styling', 'core/backbone'], $active_theme->getLibraries());
   }
 
 }
diff --git a/core/modules/system/src/Tests/Theme/ThemeTokenTest.php b/core/modules/system/src/Tests/Theme/ThemeTokenTest.php
new file mode 100644
index 000000000..3c04aa22b
--- /dev/null
+++ b/core/modules/system/src/Tests/Theme/ThemeTokenTest.php
@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\system\Tests\Theme\ThemeTokenTest.
+ */
+
+namespace Drupal\system\Tests\Theme;
+
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Tests the generation of 'theme_token' key in Drupal settings.
+ *
+ * @group Theme
+ */
+class ThemeTokenTest extends WebTestBase {
+
+  /**
+   * We want to visit the 'admin/structure/block' page.
+   *
+   * @var array
+   */
+  static public $modules = ['block'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $account = $this->drupalCreateUser(['administer blocks', 'view the administration theme']);
+    $this->drupalLogin($account);
+  }
+
+  /**
+   * Tests if the 'theme_token' key of 'ajaxPageState' is computed.
+   */
+  public function testThemeToken() {
+    // Visit the block administrative page with default theme. We use that page
+    // because 'misc/ajax.js' is loaded there and we can test the token
+    // generation.
+    $this->drupalGet('admin/structure/block');
+    $settings = $this->getDrupalSettings();
+    $this->assertNull($settings['ajaxPageState']['theme_token']);
+
+    // Install 'seven' and configure it as administrative theme.
+    $this->container->get('theme_installer')->install(['seven']);
+    $this->config('system.theme')->set('admin', 'seven')->save();
+
+    // Revisit the page. This time the page is displayed using the 'seven' theme
+    // and that is different from the default theme ('classy').
+    $this->drupalGet('admin/structure/block');
+    $settings = $this->getDrupalSettings();
+    $this->assertNotNull($settings['ajaxPageState']['theme_token']);
+    // The CSRF token is a 43 length string.
+    $this->assertTrue(is_string($settings['ajaxPageState']['theme_token']));
+    $this->assertEqual(strlen($settings['ajaxPageState']['theme_token']), 43);
+  }
+
+}
diff --git a/core/modules/system/src/Tests/Theme/TwigEnvironmentTest.php b/core/modules/system/src/Tests/Theme/TwigEnvironmentTest.php
index b5450df92..235db35d7 100644
--- a/core/modules/system/src/Tests/Theme/TwigEnvironmentTest.php
+++ b/core/modules/system/src/Tests/Theme/TwigEnvironmentTest.php
@@ -41,10 +41,10 @@ class TwigEnvironmentTest extends KernelTestBase {
     $unsafe_string = '<script>alert(\'Danger! High voltage!\');</script>';
     $element['test'] = array(
       '#type' => 'inline_template',
-      '#template' => 'test-with-context {{ unsafe_content }}',
+      '#template' => 'test-with-context <label>{{ unsafe_content }}</label>',
       '#context' => array('unsafe_content' => $unsafe_string),
     );
-    $this->assertEqual($renderer->renderRoot($element), 'test-with-context ' . SafeMarkup::checkPlain($unsafe_string));
+    $this->assertEqual($renderer->renderRoot($element), 'test-with-context <label>' . SafeMarkup::checkPlain($unsafe_string) . '</label>');
 
     // Enable twig_auto_reload and twig_debug.
     $settings = Settings::getAll();
diff --git a/core/modules/system/src/Tests/Update/MenuTreeSerializationTitleTest.php b/core/modules/system/src/Tests/Update/MenuTreeSerializationTitleTest.php
new file mode 100644
index 000000000..2439b1c39
--- /dev/null
+++ b/core/modules/system/src/Tests/Update/MenuTreeSerializationTitleTest.php
@@ -0,0 +1,68 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\system\Tests\Update\MenuTreeSerializationTitleTest.
+ */
+
+namespace Drupal\system\Tests\Update;
+
+use Drupal\Core\StringTranslation\TranslationWrapper;
+
+/**
+ * Tests system_update_8001().
+ *
+ * @group Update
+ */
+class MenuTreeSerializationTitleTest extends UpdatePathTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setUp() {
+    $this->databaseDumpFiles = [
+      __DIR__ . '/../../../tests/fixtures/update/drupal-8.bare.standard.php.gz',
+    ];
+    parent::setUp();
+  }
+
+  /**
+   * Ensures that the system_update_8001() runs as expected.
+   */
+  public function testUpdate() {
+    $this->runUpdates();
+
+    // Ensure that some fields got dropped.
+    $database = \Drupal::database();
+    $schema = $database->schema();
+
+    if (!$schema->tableExists('menu_tree')) {
+      return;
+    }
+
+    $this->assertFalse($schema->fieldExists('menu_tree', 'title_arguments'));
+    $this->assertFalse($schema->fieldExists('menu_tree', 'title_contexts'));
+
+    // Ensure that all titles and description values can be unserialized.
+    $select = $database->select('menu_tree');
+    $result = $select->fields('menu_tree', ['id', 'title', 'description'])
+      ->execute()
+      ->fetchAllAssoc('id');
+
+    // The test coverage relies upon the fact that unserialize() would emit a
+    // warning if the value is not a valid serialized value.
+    foreach ($result as $link) {
+      $title = unserialize($link->title);
+      $description = unserialize($link->description);
+      // Verify that all the links from system module have a been updated with
+      // a TranslationWrapper as title and description due to the rebuild.
+      if (strpos($link->id, 'system.') === 0) {
+        $this->assertTrue($title instanceof TranslationWrapper, get_class($title));
+        if ($description) {
+          $this->assertTrue($description instanceof TranslationWrapper, get_class($description));
+        }
+      }
+    }
+  }
+
+}
diff --git a/core/modules/system/src/Tests/Update/UpdatePathTestBase.php b/core/modules/system/src/Tests/Update/UpdatePathTestBase.php
index fb365f0ba..a9e0ad2d2 100644
--- a/core/modules/system/src/Tests/Update/UpdatePathTestBase.php
+++ b/core/modules/system/src/Tests/Update/UpdatePathTestBase.php
@@ -185,7 +185,13 @@ abstract class UpdatePathTestBase extends WebTestBase {
       $this->fail('Missing zlib requirement for upgrade tests.');
       return FALSE;
     }
-    $this->drupalLogin($this->rootUser);
+    // The site might be broken at the time so logging in using the UI might
+    // not work, so we use the API itself.
+    drupal_rewrite_settings(['settings' => ['update_free_access' => (object) [
+      'value' => TRUE,
+      'required' => TRUE,
+    ]]]);
+
     $this->drupalGet($this->updateUrl);
     $this->clickLink(t('Continue'));
 
@@ -193,4 +199,21 @@ abstract class UpdatePathTestBase extends WebTestBase {
     $this->clickLink(t('Apply pending updates'));
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function rebuildAll() {
+    parent::rebuildAll();
+
+    // Remove the notices we get due to the menu link rebuild prior to running
+    // the system updates for the schema change.
+    foreach ($this->assertions as $key => $assertion) {
+      if ($assertion['message_group'] == 'Notice' && basename($assertion['file']) == 'MenuTreeStorage.php' && strpos($assertion['message'], 'unserialize(): Error at offset 0') !== FALSE) {
+        unset($this->assertions[$key]);
+        $this->deleteAssert($assertion['message_id']);
+        $this->results['#exception']--;
+      }
+    }
+  }
+
 }
diff --git a/core/modules/system/system.admin.inc b/core/modules/system/system.admin.inc
index 276e3936b..b07605fc0 100644
--- a/core/modules/system/system.admin.inc
+++ b/core/modules/system/system.admin.inc
@@ -58,7 +58,7 @@ function template_preprocess_admin_block_content(&$variables) {
     foreach ($variables['content'] as $key => $item) {
       $variables['content'][$key]['link'] = \Drupal::l($item['title'], $item['url']);
       if (!$variables['compact'] && isset($item['description'])) {
-        $variables['content'][$key]['description'] = Xss::filterAdmin($item['description']);
+        $variables['content'][$key]['description'] = ['#markup' => $item['description']];
       }
       else {
         $variables['content'][$key]['description'] = FALSE;
@@ -259,7 +259,7 @@ function theme_system_modules_details($variables) {
     }
     $details = array(
       '#type' => 'details',
-      '#title' => SafeMarkup::set('<span class="text"> ' . drupal_render($module['description']) . '</span>'),
+      '#title' => SafeMarkup::set('<span class="text module-description">' . drupal_render($module['description']) . '</span>'),
       '#attributes' => array('id' => $module['enable']['#id'] . '-description'),
       '#description' => $description,
     );
@@ -332,7 +332,7 @@ function theme_system_modules_uninstall($variables) {
       array(
         'data' => array(
           '#type' => 'inline_template',
-          '#template' => '{{ module_description }} {% if disabled_header is not empty %} <div class="admin-requirements">{{ disabled_header }}{{ disabled_reasons }}</div> {% endif %}',
+          '#template' => '<span class="text module-description">{{ module_description }}</span>{% if disabled_header is not empty %}<div class="admin-requirements">{{ disabled_header }}{{ disabled_reasons }}</div>{% endif %}',
           '#context' => array(
             'module_description' => drupal_render($form['modules'][$module]['description']),
             'disabled_header' => $disabled_header,
@@ -420,7 +420,10 @@ function template_preprocess_system_themes_page(&$variables) {
       // Make sure to provide feedback on compatibility.
       $current_theme['incompatible'] = '';
       if (!empty($theme->incompatible_core)) {
-        $current_theme['incompatible'] = t('This version is not compatible with Drupal !core_version and should be replaced.', array('!core_version' => \Drupal::CORE_COMPATIBILITY));
+        $current_theme['incompatible'] = t("This theme is not compatible with Drupal @core_version. Check that the .info.yml file contains the correct 'core' value.", ['@core_version' => \Drupal::CORE_COMPATIBILITY]);
+      }
+      elseif (!empty($theme->incompatible_region)) {
+        $current_theme['incompatible'] = t("This theme is missing a 'content' region.");
       }
       elseif (!empty($theme->incompatible_php)) {
         if (substr_count($theme->info['php'], '.') < 2) {
diff --git a/core/modules/system/system.install b/core/modules/system/system.install
index a0849b11d..042c8f29c 100644
--- a/core/modules/system/system.install
+++ b/core/modules/system/system.install
@@ -22,6 +22,7 @@ use Symfony\Component\HttpFoundation\Request;
  * Implements hook_requirements().
  */
 function system_requirements($phase) {
+  global $install_state;
   $requirements = array();
 
   // Report Drupal version
@@ -58,6 +59,80 @@ function system_requirements($phase) {
     'value' => $software,
   );
 
+  // Tests clean URL support.
+  if ($phase == 'install' && $install_state['interactive'] && !isset($_GET['rewrite']) && strpos($software, 'Apache') !== FALSE) {
+    // If the Apache rewrite module is not enabled, Apache version must be >=
+    // 2.2.16 because of the FallbackResource directive in the root .htaccess
+    // file. Since the Apache version reported by the server is dependent on the
+    // ServerTokens setting in httpd.conf, we may not be able to determine if a
+    // given config is valid. Thus we are unable to use version_compare() as we
+    // need have three possible outcomes: the version of Apache is greater than
+    // 2.2.16, is less than 2.2.16, or cannot be determined accurately. In the
+    // first case, we encourage the use of mod_rewrite; in the second case, we
+    // raise an error regarding the minimum Apache version; in the third case,
+    // we raise a warning that the current version of Apache may not be
+    // supported.
+    $rewrite_warning = FALSE;
+    $rewrite_error = FALSE;
+    $apache_version_string = 'Apache';
+
+    // Determine the Apache version number: major, minor and revision.
+    if (preg_match('/Apache\/(\d+)\.?(\d+)?\.?(\d+)?/', $software, $matches)) {
+      $apache_version_string = $matches[0];
+
+      // Major version number
+      if ($matches[1] < 2) {
+        $rewrite_error = TRUE;
+      }
+      else if ($matches[1] == 2) {
+        if (!isset($matches[2])) {
+          $rewrite_warning = TRUE;
+        }
+        else if ($matches[2] < 2) {
+          $rewrite_error = TRUE;
+        }
+        else if ($matches[2] == 2) {
+          if (!isset($matches[3])) {
+            $rewrite_warning = TRUE;
+          }
+          else if ($matches[3] < 16) {
+            $rewrite_error = TRUE;
+          }
+        }
+      }
+    }
+    else {
+      $rewrite_warning = TRUE;
+    }
+
+    if ($rewrite_warning) {
+      $requirements['apache_version'] = array (
+        'title' => t('Apache version'),
+        'value' => $apache_version_string,
+        'severity' => REQUIREMENT_WARNING,
+        'description' => t('Due to the settings for ServerTokens in httpd.conf, it is impossible to accurately determine the version of Apache running on this server. The reported value is @reported, to run Drupal without mod_rewrite, a minimum version of 2.2.16 is needed.', array('@reported' => $apache_version_string)),
+      );
+    }
+
+    if ($rewrite_error) {
+      $requirements['Apache version'] = array (
+        'title' => t('Apache version'),
+        'value' => $apache_version_string,
+        'severity' => REQUIREMENT_ERROR,
+        'description' => t('The minimum version of Apache needed to run Drupal without mod_rewrite enabled is 2.2.16. See the <a href="@link">enabling clean URLs</a> page for more information on mod_rewrite.', array('@link' => 'http://drupal.org/node/15365')),
+      );
+    }
+
+    if (!$rewrite_error && !$rewrite_warning) {
+      $requirements['rewrite_module'] = array (
+        'title' => t('Clean URLs'),
+        'value' => t('Disabled'),
+        'severity' => REQUIREMENT_WARNING,
+        'description' => t('Your server is capable of using clean URLs, but it is not enabled. Using clean URLs gives an improved user experience and is recommended. <a href="@link">Enable clean URLs</a>', array('@link' => 'http://drupal.org/node/15365')),
+      );
+    }
+  }
+
   // Test PHP version and show link to phpinfo() if it's available
   $phpversion = $phpversion_label = phpversion();
   if (function_exists('phpinfo')) {
@@ -618,26 +693,6 @@ function system_requirements($phase) {
     }
   }
 
-  // Ensure that if upgrading from 7 to 8 we have no disabled modules.
-  if ($phase == 'update' && db_table_exists('system')) {
-    $modules = db_query('SELECT name, info FROM {system} WHERE type = :module AND status = 0 AND schema_version <> :schema_uninstalled', array(
-      ':module' => 'module',
-      ':schema_uninstalled' => SCHEMA_UNINSTALLED,
-    ))->fetchAllKeyed(0, 1);
-    array_walk($modules, function (&$value, $key) {
-      $info = unserialize($value);
-      $value = $info['name'];
-    });
-    if (!empty($modules)) {
-      $requirements['disabled_modules'] = array(
-        'severity' => REQUIREMENT_ERROR,
-        'title' => t('Disabled modules'),
-        'value' => \Drupal::translation()->formatPlural(count($modules), 'The %modules module is disabled.', 'The following modules are disabled: %modules', array('%modules' => implode(', ', $modules))),
-        'description' => t('Drupal 8 no longer supports disabled modules. Please either enable or uninstall them before upgrading.'),
-      );
-    }
-  }
-
   // See if trusted hostnames have been configured, and warn the user if they
   // are not set.
   if ($phase == 'runtime') {
@@ -1085,3 +1140,66 @@ function system_schema() {
 
   return $schema;
 }
+
+/**
+ * Change two fields on the default menu link storage to be serialized data.
+ */
+function system_update_8001(&$sandbox = NULL) {
+  $database = \Drupal::database();
+  $schema = $database->schema();
+  if ($schema->tableExists('menu_tree')) {
+
+    if (!isset($sandbox['current'])) {
+      $spec = array(
+        'description' => 'The title for the link. May be a serialized TranslationWrapper.',
+        'type' => 'blob',
+        'size' => 'big',
+        'not null' => FALSE,
+        'serialize' => TRUE,
+      );
+      $schema->changeField('menu_tree', 'title', 'title', $spec);
+      $spec = array(
+        'description' => 'The description of this link - used for admin pages and title attribute.',
+        'type' => 'blob',
+        'size' => 'big',
+        'not null' => FALSE,
+        'serialize' => TRUE,
+      );
+      $schema->changeField('menu_tree', 'description', 'description', $spec);
+
+      $sandbox['current'] = 0;
+      $sandbox['max'] = $database->query('SELECT COUNT(mlid) FROM {menu_tree}')
+        ->fetchField();
+    }
+
+    $menu_links = $database->queryRange('SELECT mlid, title, description FROM {menu_tree} ORDER BY mlid ASC', $sandbox['current'], $sandbox['current'] + 50)
+      ->fetchAllAssoc('mlid');
+
+    foreach ($menu_links as $menu_link) {
+      $menu_link = (array) $menu_link;
+      // Convert title and description to serialized strings.
+      $menu_link['title'] = serialize($menu_link['title']);
+      $menu_link['description'] = serialize($menu_link['description']);
+
+      $database->update('menu_tree')
+        ->fields($menu_link)
+        ->condition('mlid', $menu_link['mlid'])
+        ->execute();
+
+      $sandbox['current']++;
+    }
+
+    $sandbox['#finished'] = empty($sandbox['max']) ? 1 : ($sandbox['current'] / $sandbox['max']);
+
+    if ($sandbox['#finished'] >= 1) {
+      // Drop unnecessary fields from {menu_tree}.
+      $schema->dropField('menu_tree', 'title_arguments');
+      $schema->dropField('menu_tree', 'title_context');
+    }
+    return t('Menu links converted');
+  }
+  else {
+    return t('Menu link conversion skipped, because the {menu_tree} table did not exist yet.');
+  }
+}
+
diff --git a/core/modules/system/system.libraries.yml b/core/modules/system/system.libraries.yml
index b440e157f..a511bd2dd 100644
--- a/core/modules/system/system.libraries.yml
+++ b/core/modules/system/system.libraries.yml
@@ -6,8 +6,6 @@ base:
       css/system.module.css: { every_page: true, weight: -10, }
     theme:
       css/system.theme.css: { every_page: true, weight: -10 }
-  dependencies:
-    - core/normalize
 
 admin:
   version: VERSION
@@ -43,6 +41,7 @@ drupal.system.modules:
   dependencies:
     - core/jquery
     - core/drupal
+    - core/drupal.debounce
     - core/jquery.once
 
 diff:
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index 96f0083cc..027ba8bd2 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -12,6 +12,7 @@ use Drupal\Core\Extension\Extension;
 use Drupal\Core\Extension\ExtensionDiscovery;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\KeyValueStore\KeyValueDatabaseExpirableFactory;
+use Drupal\Core\PageCache\RequestPolicyInterface;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\Core\Menu\MenuTreeParameters;
@@ -124,7 +125,7 @@ function system_help($route_name, RouteMatchInterface $route_match) {
         }
       }
       else {
-        $output .= '<p>' . t('Regularly review available updates to maintain a secure and current site. Always run the <a href="!update-php">update script</a> each time a module is updated. Enable the Update Manager module to update and install modules and themes.', array('!update-php' => \Drupal::url('system.db_update'))) . '</p>';
+        $output .= '<p>' . t('Regularly review available updates to maintain a secure and current site. Always run the <a href="!update-php">update script</a> each time a module is updated. Enable the <a href="!update-manager">Update Manager module</a> to update and install modules and themes.', array('!update-php' => \Drupal::url('system.db_update'), '!update-manager' => \Drupal::url('system.modules_list', [], ['fragment' => 'module-update']))) . '</p>';
       }
       return $output;
 
@@ -519,7 +520,6 @@ function system_filetransfer_info() {
  */
 function system_page_attachments(array &$page) {
   // Ensure the same CSS is loaded in template_preprocess_maintenance_page().
-  $page['#attached']['library'][] = 'core/normalize';
   $page['#attached']['library'][] = 'system/base';
   if (\Drupal::service('router.admin_context')->isAdminRoute()) {
     $page['#attached']['library'][] = 'system/admin';
@@ -648,21 +648,20 @@ function system_js_settings_build(&$settings, AttachedAssetsInterface $assets) {
  * as well as theme_token ajax state.
  */
 function system_js_settings_alter(&$settings, AttachedAssetsInterface $assets) {
-  // url() generates the script and prefix using hook_url_outbound_alter().
-  // Instead of running the hook_url_outbound_alter() again here, extract
-  // them from url().
-  // @todo Make this less hacky: https://www.drupal.org/node/1547376.
   $request = \Drupal::request();
-  $scriptPath = $request->getScriptName();
-
-  $pathPrefix = '';
   $current_query = $request->query->all();
-  Url::fromRoute('<front>', [], array('script' => &$scriptPath, 'prefix' => &$pathPrefix))->toString();
+
+  // Let output path processors set a prefix.
+  /** @var \Drupal\Core\PathProcessor\OutboundPathProcessorInterface $path_processor */
+  $path_processor = \Drupal::service('path_processor_manager');
+  $options = ['prefix' => ''];
+  $path_processor->processOutbound('/', $options);
+  $pathPrefix = $options['prefix'];
+
   $current_path = \Drupal::routeMatch()->getRouteName() ? Url::fromRouteMatch(\Drupal::routeMatch())->getInternalPath() : '';
   $current_path_is_admin = \Drupal::service('router.admin_context')->isAdminRoute();
   $path_settings = [
     'baseUrl' => $request->getBaseUrl() . '/',
-    'scriptPath' => $scriptPath,
     'pathPrefix' => $pathPrefix,
     'currentPath' => $current_path,
     'currentPathIsAdmin' => $current_path_is_admin,
@@ -689,12 +688,41 @@ function system_js_settings_alter(&$settings, AttachedAssetsInterface $assets) {
   $library_dependency_resolver = \Drupal::service('library.dependency_resolver');
   if (isset($settings['ajaxPageState']) || in_array('core/drupal.ajax', $library_dependency_resolver->getLibrariesWithDependencies($assets->getAlreadyLoadedLibraries()))) {
     if (!defined('MAINTENANCE_MODE')) {
-      $settings['ajaxPageState']['theme_token'] = \Drupal::csrfToken()
-        ->get(\Drupal::theme()->getActiveTheme()->getName());
+      // The theme token is only validated when the theme requested is not the
+      // default, so don't generate it unless necessary.
+      // @see \Drupal\Core\Theme\AjaxBasePageNegotiator::determineActiveTheme()
+      $active_theme_key = \Drupal::theme()->getActiveTheme()->getName();
+      if ($active_theme_key !== \Drupal::service('theme_handler')->getDefault()) {
+        $settings['ajaxPageState']['theme_token'] = \Drupal::csrfToken()
+          ->get($active_theme_key);
+      }
     }
   }
 }
 
+/**
+ * Implements hook_form_alter().
+ */
+function system_form_alter(&$form, FormStateInterface $form_state) {
+  // If the page that's being built is cacheable, set the 'immutable' flag, to
+  // ensure that when the form is used, a new form build ID is generated when
+  // appropriate, to prevent information disclosure.
+
+  // Note: This code just wants to know whether cache response headers are set,
+  // not whether page_cache module will be active.
+  // \Drupal\Core\EventSubscriber\FinishResponseSubscriber::onRespond will
+  // send those headers, in case $request_policy->check($request) succeeds. In
+  // that case we need to ensure that the immutable flag is sot, so future POST
+  // request won't take over the form state of another user.
+  /** @var \Drupal\Core\PageCache\RequestPolicyInterface $request_policy */
+  $request_policy = \Drupal::service('page_cache_request_policy');
+  $request = \Drupal::requestStack()->getCurrentRequest();
+  $request_is_cacheable = $request_policy->check($request) === RequestPolicyInterface::ALLOW;
+  if ($request_is_cacheable) {
+    $form_state->addBuildInfo('immutable', TRUE);
+  }
+}
+
 /**
  * Implements hook_form_FORM_ID_alter().
  */
@@ -778,7 +806,7 @@ function system_preprocess_block(&$variables) {
       }
       $variables['site_slogan'] = '';
       if ($variables['content']['site_slogan']['#access'] && $variables['content']['site_slogan']['#markup']) {
-        $variables['site_slogan'] = $variables['content']['site_slogan']['#markup'];
+        $variables['site_slogan']['#markup'] = $variables['content']['site_slogan']['#markup'];
       }
       break;
 
@@ -1339,9 +1367,9 @@ function system_retrieve_file($url, $destination = NULL, $managed = FALSE, $repl
     }
   }
   try {
-    $data = \Drupal::httpClient()
+    $data = (string) \Drupal::httpClient()
       ->get($url)
-      ->getBody(TRUE);
+      ->getBody();
     $local = $managed ? file_save_data($data, $path, $replace) : file_unmanaged_save_data($data, $path, $replace);
   }
   catch (RequestException $exception) {
diff --git a/core/modules/system/system.permissions.yml b/core/modules/system/system.permissions.yml
index 44bb5effd..726c295ff 100644
--- a/core/modules/system/system.permissions.yml
+++ b/core/modules/system/system.permissions.yml
@@ -22,3 +22,5 @@ link to any page:
   title: 'Link to any page'
   restrict access: true
   description: 'This allows to bypass access checking when linking to internal paths.'
+administer menu:
+  title: 'Administer menus and menu items'
diff --git a/core/modules/system/system.routing.yml b/core/modules/system/system.routing.yml
index 12e7d9acc..a656ab3aa 100644
--- a/core/modules/system/system.routing.yml
+++ b/core/modules/system/system.routing.yml
@@ -1,12 +1,3 @@
-system.ajax:
-  path: '/system/ajax'
-  defaults:
-    _controller: '\Drupal\system\Controller\FormAjaxController::content'
-  options:
-    _theme: ajax_base_page
-  requirements:
-    _access: 'TRUE'
-
 system.401:
   path: '/system/401'
   defaults:
@@ -394,7 +385,7 @@ system.theme_settings_theme:
 '<none>':
   path: ''
   options:
-    _only_fragment: TRUE
+    _no_path: TRUE
   requirements:
     _access: 'TRUE'
 
@@ -463,6 +454,8 @@ system.db_update:
     _title: 'Drupal database update'
     _controller: '\Drupal\system\Controller\DbUpdateController::handle'
     op: 'info'
+  options:
+    _maintenance_access: TRUE
   requirements:
     _access_system_update: 'TRUE'
 
diff --git a/core/modules/system/system.tokens.inc b/core/modules/system/system.tokens.inc
index 20d5ec179..4c0e107af 100644
--- a/core/modules/system/system.tokens.inc
+++ b/core/modules/system/system.tokens.inc
@@ -9,6 +9,8 @@
 
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Utility\Xss;
+use Drupal\Core\Datetime\Entity\DateFormat;
+use Drupal\Core\Render\BubbleableMetadata;
 
 /**
  * Implements hook_token_info().
@@ -87,7 +89,7 @@ function system_token_info() {
 /**
  * Implements hook_tokens().
  */
-function system_tokens($type, $tokens, array $data = array(), array $options = array()) {
+function system_tokens($type, $tokens, array $data, array $options, BubbleableMetadata $bubbleable_metadata) {
   $token_service = \Drupal::token();
 
   $url_options = array('absolute' => TRUE);
@@ -106,29 +108,44 @@ function system_tokens($type, $tokens, array $data = array(), array $options = a
     foreach ($tokens as $name => $original) {
       switch ($name) {
         case 'name':
-          $site_name = \Drupal::config('system.site')->get('name');
+          $config = \Drupal::config('system.site');
+          $bubbleable_metadata->addCacheableDependency($config);
+          $site_name = $config->get('name');
           $replacements[$original] = $sanitize ? SafeMarkup::checkPlain($site_name) : $site_name;
           break;
 
         case 'slogan':
-          $slogan = \Drupal::config('system.site')->get('slogan');
+          $config = \Drupal::config('system.site');
+          $bubbleable_metadata->addCacheableDependency($config);
+          $slogan = $config->get('slogan');
           $replacements[$original] = $sanitize ? Xss::filterAdmin($slogan) : $slogan;
           break;
 
         case 'mail':
-          $replacements[$original] = \Drupal::config('system.site')->get('mail');
+          $config = \Drupal::config('system.site');
+          $bubbleable_metadata->addCacheableDependency($config);
+          $replacements[$original] = $config->get('mail');
           break;
 
         case 'url':
-          $replacements[$original] = \Drupal::url('<front>', array(), $url_options);
+          /** @var \Drupal\Core\GeneratedUrl $result */
+          $result = \Drupal::url('<front>', array(), $url_options, TRUE);
+          $bubbleable_metadata->addCacheableDependency($result);
+          $replacements[$original] = $result->getGeneratedUrl();
           break;
 
         case 'url-brief':
-          $replacements[$original] = preg_replace(array('!^https?://!', '!/$!'), '', \Drupal::url('<front>', array(), $url_options));
+          /** @var \Drupal\Core\GeneratedUrl $result */
+          $result = \Drupal::url('<front>', array(), $url_options, TRUE);
+          $bubbleable_metadata->addCacheableDependency($result);
+          $replacements[$original] = preg_replace(array('!^https?://!', '!/$!'), '', $result->getGeneratedUrl());
           break;
 
         case 'login-url':
-          $replacements[$original] = \Drupal::url('user.page', [], $url_options);
+          /** @var \Drupal\Core\GeneratedUrl $result */
+          $result = \Drupal::url('user.page', [], $url_options, TRUE);
+          $bubbleable_metadata->addCacheableDependency($result);
+          $replacements[$original] = $result->getGeneratedUrl();
           break;
       }
     }
@@ -137,6 +154,9 @@ function system_tokens($type, $tokens, array $data = array(), array $options = a
   elseif ($type == 'date') {
     if (empty($data['date'])) {
       $date = REQUEST_TIME;
+      // We depend on the current request time, so the tokens are not cacheable
+      // at all.
+      $bubbleable_metadata->setCacheMaxAge(0);
     }
     else {
       $date = $data['date'];
@@ -145,19 +165,26 @@ function system_tokens($type, $tokens, array $data = array(), array $options = a
     foreach ($tokens as $name => $original) {
       switch ($name) {
         case 'short':
+          $date_format = DateFormat::load('short');
+          $bubbleable_metadata->addCacheableDependency($date_format);
           $replacements[$original] = format_date($date, 'short', '', NULL, $langcode);
           break;
 
         case 'medium':
+          $date_format = DateFormat::load('medium');
+          $bubbleable_metadata->addCacheableDependency($date_format);
           $replacements[$original] = format_date($date, 'medium', '', NULL, $langcode);
           break;
 
         case 'long':
+          $date_format = DateFormat::load('long');
+          $bubbleable_metadata->addCacheableDependency($date_format);
           $replacements[$original] = format_date($date, 'long', '', NULL, $langcode);
           break;
 
         case 'since':
           $replacements[$original] = \Drupal::service('date.formatter')->formatTimeDiffSince($date, array('langcode' => $langcode));
+          $bubbleable_metadata->setCacheMaxAge(0);
           break;
 
         case 'raw':
diff --git a/core/modules/system/templates/feed-icon.html.twig b/core/modules/system/templates/feed-icon.html.twig
index dab9734b7..9b321e0d6 100644
--- a/core/modules/system/templates/feed-icon.html.twig
+++ b/core/modules/system/templates/feed-icon.html.twig
@@ -5,14 +5,13 @@
  *
  * Available variables:
  * - url: An internal system path or a fully qualified external URL of the feed.
- * - icon: The rendered HTML (<img> tag) for the feed icon image.
  * - attributes: Remaining HTML attributes for the feed link.
  *   - title: A descriptive title of the feed link.
  *   - class: HTML classes to be applied to the feed link.
  *
- * @see template_preprocess_feed_icon()
- *
  * @ingroup themeable
  */
 #}
-<a href="{{ url }}"{{ attributes.addClass('feed-icon')|without('href') }}>{{ icon }}</a>
+<a href="{{ url }}"{{ attributes.addClass('feed-icon') }}>
+  {{ 'Subscribe to @title'|t({'@title': title}) }}
+</a>
diff --git a/core/modules/system/templates/form-element.html.twig b/core/modules/system/templates/form-element.html.twig
index b1ca6e9ef..9292fd7e3 100644
--- a/core/modules/system/templates/form-element.html.twig
+++ b/core/modules/system/templates/form-element.html.twig
@@ -53,7 +53,7 @@
     'form-item-' ~ name|clean_class,
     title_display not in ['after', 'before'] ? 'form-no-label',
     disabled == 'disabled' ? 'form-disabled',
-    errors ? 'form-error',
+    errors ? 'form-item--error',
   ]
 %}
 {%
@@ -82,7 +82,7 @@
     {{ label }}
   {% endif %}
   {% if errors %}
-    <div class="form-error-message">
+    <div class="form-item--error-message">
       {{ errors }}
     </div>
   {% endif %}
diff --git a/core/modules/system/templates/links.html.twig b/core/modules/system/templates/links.html.twig
index 21ab95d63..86713b522 100644
--- a/core/modules/system/templates/links.html.twig
+++ b/core/modules/system/templates/links.html.twig
@@ -11,8 +11,6 @@
  *   - href: The link URL. If omitted, the 'title' is shown as a plain text
  *     item in the links list. If 'href' is supplied, the entire link is passed
  *     to l() as its $options parameter.
- *   - html: (optional) Whether or not 'title' is HTML. If set, the title will
- *     not be passed through \Drupal\Component\Utility\SafeMarkup::checkPlain().
  *   - attributes: (optional) HTML attributes for the anchor, or for the <span>
  *     tag if no 'href' is supplied.
  *   - link_key: The link CSS class.
diff --git a/core/modules/system/templates/select.html.twig b/core/modules/system/templates/select.html.twig
index 21f32ac3c..fb7226e77 100644
--- a/core/modules/system/templates/select.html.twig
+++ b/core/modules/system/templates/select.html.twig
@@ -12,4 +12,18 @@
  * @ingroup themeable
  */
 #}
-<select{{ attributes }}>{{ options }}</select>
+{% spaceless %}
+  <select{{ attributes }}>
+    {% for option in options %}
+      {% if option.type == 'optgroup' %}
+        <optgroup label="{{ option.label }}">
+          {% for sub_option in option.options %}
+            <option value="{{ sub_option.value }}"{{ sub_option.selected ? ' selected="selected"' }}>{{ sub_option.label }}</option>
+          {% endfor %}
+        </optgroup>
+      {% elseif option.type == 'option' %}
+        <option value="{{ option.value }}"{{ option.selected ? ' selected="selected"' }}>{{ option.label }}</option>
+      {% endif %}
+    {% endfor %}
+  </select>
+{% endspaceless %}
diff --git a/core/modules/system/templates/status-report.html.twig b/core/modules/system/templates/status-report.html.twig
index 5ad0c4314..6cdfaa8d1 100644
--- a/core/modules/system/templates/status-report.html.twig
+++ b/core/modules/system/templates/status-report.html.twig
@@ -25,10 +25,8 @@
   </thead>
   <tbody>
   {% for requirement in requirements %}
-    {% if requirement.severity_status in ['warning', 'error'] %}
+    {% if requirement.severity_status %}
       <tr class="system-status-report__entry color-{{ requirement.severity_status }}">
-    {% else %}
-      <tr class="system-status-report__entry">
     {% endif %}
         <td class="system-status-report__status-icon system-status-report__status-icon--{{ requirement.severity_status }}">
           <div title="{{ requirement.severity_title }}">
diff --git a/core/modules/system/tests/fixtures/update/block.block.secondtestfor2354889.yml b/core/modules/system/tests/fixtures/update/block.block.secondtestfor2354889.yml
new file mode 100644
index 000000000..1a8a9046f
--- /dev/null
+++ b/core/modules/system/tests/fixtures/update/block.block.secondtestfor2354889.yml
@@ -0,0 +1,23 @@
+uuid: C499B41D-035E-432E-9462-36410C43C49F
+langcode: en
+status: true
+dependencies:
+  module:
+    - search
+  theme:
+    - bartik
+id: secondtestfor2354889
+theme: bartik
+region: sidebar_first
+weight: -6
+provider: null
+plugin: search_form_block
+settings:
+  id: search_form_block
+  label: Search
+  provider: search
+  label_display: visible
+  cache:
+    max_age: -1
+  status: true
+visibility: {  }
diff --git a/core/modules/system/tests/fixtures/update/block.block.testfor2354889.yml b/core/modules/system/tests/fixtures/update/block.block.testfor2354889.yml
new file mode 100644
index 000000000..d2ac964da
--- /dev/null
+++ b/core/modules/system/tests/fixtures/update/block.block.testfor2354889.yml
@@ -0,0 +1,51 @@
+uuid: 9d204071-a923-4707-8200-c298a540fb0c
+langcode: en
+status: true
+dependencies:
+  content:
+    - 'block_content:basic:c1895145-893e-460b-a24e-78cd2cefbb1f'
+  module:
+    - block_content
+    - node
+    - user
+  theme:
+    - bartik
+id: testfor2354889
+theme: bartik
+region: content
+weight: -6
+provider: null
+plugin: 'block_content:c1895145-893e-460b-a24e-78cd2cefbb1f'
+settings:
+  id: 'block_content:c1895145-893e-460b-a24e-78cd2cefbb1f'
+  label: 'Test for 2354889'
+  provider: block_content
+  label_display: visible
+  cache:
+    max_age: -1
+  status: true
+  info: ''
+  view_mode: full
+visibility:
+  node_type:
+    id: node_type
+    bundles:
+      page: page
+    negate: false
+    context_mapping:
+      node: node.node
+  user_role:
+    id: user_role
+    roles:
+      authenticated: authenticated
+    negate: false
+    context_mapping:
+      user: user.current_user
+  language:
+    id: language
+    langcodes:
+      en: en
+      de: de
+    negate: false
+    context_mapping:
+      language: language.language_interface
diff --git a/core/modules/system/tests/fixtures/update/block.block.thirdtestfor2354889.yml b/core/modules/system/tests/fixtures/update/block.block.thirdtestfor2354889.yml
new file mode 100644
index 000000000..472e1317e
--- /dev/null
+++ b/core/modules/system/tests/fixtures/update/block.block.thirdtestfor2354889.yml
@@ -0,0 +1,30 @@
+uuid: 4558907D-2918-48FE-B56F-8A007B5FBDD5
+langcode: en
+status: true
+dependencies:
+  module:
+    - user
+  theme:
+    - bartik
+id: thirdtestfor2354889
+theme: bartik
+region: sidebar_first
+weight: -6
+provider: null
+plugin: user_login_block
+settings:
+  id: user_login_block
+  label: 'User login'
+  provider: user
+  label_display: visible
+  cache:
+    max_age: -1
+  status: true
+visibility:
+  node_type:
+    id: node_type
+    bundles:
+      page: page
+    negate: false
+    context_mapping:
+      baloney: baloney.spam
diff --git a/core/modules/system/tests/fixtures/update/drupal-8.block-context-manager-2354889.php b/core/modules/system/tests/fixtures/update/drupal-8.block-context-manager-2354889.php
new file mode 100644
index 000000000..23b67e55a
--- /dev/null
+++ b/core/modules/system/tests/fixtures/update/drupal-8.block-context-manager-2354889.php
@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * @file
+ * Contains database additions to drupal-8.bare.standard.php.gz for testing the
+ * upgrade path of https://www.drupal.org/node/2354889.
+ */
+
+use Drupal\Core\Database\Database;
+
+$connection = Database::getConnection();
+
+// A custom block with visibility settings.
+$block_configs[] = \Drupal\Component\Serialization\Yaml::decode(file_get_contents(__DIR__ . '/block.block.testfor2354889.yml'));
+
+// A custom block without any visibility settings.
+$block_configs[] = \Drupal\Component\Serialization\Yaml::decode(file_get_contents(__DIR__ . '/block.block.secondtestfor2354889.yml'));
+
+// A custom block with visibility settings that contain a non-existing context
+// mapping.
+$block_configs[] = \Drupal\Component\Serialization\Yaml::decode(file_get_contents(__DIR__ . '/block.block.thirdtestfor2354889.yml'));
+
+foreach ($block_configs as $block_config) {
+  $connection->insert('config')
+    ->fields(array(
+      'collection',
+      'name',
+      'data',
+    ))
+    ->values(array(
+      'collection' => '',
+      'name' => 'block.block.' . $block_config['id'],
+      'data' => serialize($block_config),
+    ))
+    ->execute();
+}
+
+// Update the config entity query "index".
+$existing_blocks = $connection->select('key_value')
+  ->fields('key_value', ['value'])
+  ->condition('collection', 'config.entity.key_store.block')
+  ->condition('name', 'theme:bartik')
+  ->execute()
+  ->fetchField();
+$existing_blocks = unserialize($existing_blocks);
+
+$connection->update('key_value')
+  ->fields([
+    'value' => serialize(array_merge($existing_blocks, ['block.block.testfor2354889', 'block.block.secondtestfor2354889', 'block.block.thirdtestfor2354889']))
+  ])
+  ->condition('collection', 'config.entity.key_store.block')
+  ->condition('name', 'theme:bartik')
+  ->execute();
diff --git a/core/modules/system/tests/modules/accept_header_routing_test/src/Routing/AcceptHeaderMatcher.php b/core/modules/system/tests/modules/accept_header_routing_test/src/Routing/AcceptHeaderMatcher.php
index 0f52fba23..649b04fc8 100644
--- a/core/modules/system/tests/modules/accept_header_routing_test/src/Routing/AcceptHeaderMatcher.php
+++ b/core/modules/system/tests/modules/accept_header_routing_test/src/Routing/AcceptHeaderMatcher.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\accept_header_routing_test\Routing;
 
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Routing\RouteFilterInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\NotAcceptableHttpException;
@@ -62,7 +61,7 @@ class AcceptHeaderMatcher implements RouteFilterInterface {
     // We do not throw a
     // \Symfony\Component\Routing\Exception\ResourceNotFoundException here
     // because we don't want to return a 404 status code, but rather a 406.
-    throw new NotAcceptableHttpException(SafeMarkup::format('No route found for the specified formats @formats.', array('@formats' => implode(' ', $acceptable_mime_types))));
+    throw new NotAcceptableHttpException('No route found for the specified formats ' . implode(' ', $acceptable_mime_types));
   }
 
   /**
diff --git a/core/modules/system/tests/modules/ajax_forms_test/ajax_forms_test.routing.yml b/core/modules/system/tests/modules/ajax_forms_test/ajax_forms_test.routing.yml
index 3caf5bae2..ccca279b6 100644
--- a/core/modules/system/tests/modules/ajax_forms_test/ajax_forms_test.routing.yml
+++ b/core/modules/system/tests/modules/ajax_forms_test/ajax_forms_test.routing.yml
@@ -30,10 +30,3 @@ ajax_forms_test.lazy_load_form:
   requirements:
     _access: 'TRUE'
 
-ajax_forms_test.cached_form:
-  path: '/ajax_forms_test_cached_form'
-  defaults:
-    _title: 'AJAX forms cached form test'
-    _form: '\Drupal\ajax_forms_test\Form\AjaxFormsTestCachedForm'
-  requirements:
-    _access: 'TRUE'
diff --git a/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestCachedForm.php b/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestCachedForm.php
deleted file mode 100644
index 3b227832b..000000000
--- a/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestCachedForm.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\ajax_forms_test\Form\AjaxFormsTestCachedForm.
- */
-
-namespace Drupal\ajax_forms_test\Form;
-
-use Drupal\Core\Form\FormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
-
-/**
- * Provides an AJAX form that will be cached.
- */
-class AjaxFormsTestCachedForm extends FormBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'ajax_form_cache_test_form';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['test1'] = [
-      '#type' => 'select',
-      '#title' => $this->t('Test 1'),
-      '#options' => [
-        'option1' => $this->t('Option 1'),
-        'option2' => $this->t('Option 2'),
-      ],
-      '#ajax' => [
-        'url' => Url::fromRoute('system.ajax'),
-      ],
-    ];
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-  }
-
-}
diff --git a/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestSimpleForm.php b/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestSimpleForm.php
index 225664de7..2fcfd1f33 100644
--- a/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestSimpleForm.php
+++ b/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestSimpleForm.php
@@ -57,7 +57,7 @@ class AjaxFormsTestSimpleForm extends FormBase {
     );
 
     // This is for testing invalid callbacks that should return a 500 error in
-    // \Drupal\system\FormAjaxController::content().
+    // \Drupal\Core\Form\FormAjaxResponseBuilderInterface::buildResponse().
     $invalid_callbacks = array(
       'null' => NULL,
       'empty' => '',
diff --git a/core/modules/system/tests/modules/cache_test/cache_test.routing.yml b/core/modules/system/tests/modules/cache_test/cache_test.routing.yml
new file mode 100644
index 000000000..fb87d3ded
--- /dev/null
+++ b/core/modules/system/tests/modules/cache_test/cache_test.routing.yml
@@ -0,0 +1,6 @@
+cache_test.url_bubbling:
+  path: '/cache-test/url-bubbling'
+  defaults:
+    _controller: '\Drupal\cache_test\Controller\CacheTestController::urlBubbling'
+  requirements:
+    _access: 'TRUE'
diff --git a/core/modules/system/tests/modules/cache_test/src/Controller/CacheTestController.php b/core/modules/system/tests/modules/cache_test/src/Controller/CacheTestController.php
new file mode 100644
index 000000000..78c29b3ed
--- /dev/null
+++ b/core/modules/system/tests/modules/cache_test/src/Controller/CacheTestController.php
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\cache_test\Controller\CacheTestController.
+ */
+
+namespace Drupal\cache_test\Controller;
+
+use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Core\Render\HtmlResponse;
+use Drupal\Core\Url;
+
+/**
+ * Controller routines for cache_test routes.
+ */
+class CacheTestController {
+
+  /**
+   * Early renders a URL to test bubbleable metadata bubbling.
+   */
+  public function urlBubbling() {
+    $url = Url::fromRoute('<current>')->setAbsolute();
+    return [
+      '#markup' => SafeMarkup::format('This URL is early-rendered: !url. Yet, its bubbleable metadata should be bubbled.', ['!url' => $url->toString()])
+    ];
+  }
+
+}
diff --git a/core/modules/system/tests/modules/condition_test/src/Plugin/Condition/OptionalContextCondition.php b/core/modules/system/tests/modules/condition_test/src/Plugin/Condition/OptionalContextCondition.php
new file mode 100644
index 000000000..88c7d4117
--- /dev/null
+++ b/core/modules/system/tests/modules/condition_test/src/Plugin/Condition/OptionalContextCondition.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\condition_test\Plugin\Condition\OptionalContextCondition.
+ */
+
+namespace Drupal\condition_test\Plugin\Condition;
+
+use Drupal\Core\Condition\ConditionPluginBase;
+
+/**
+ * Provides a condition with an optional node context.
+ *
+ * The context type entity:node is used since that would allow to also use this
+ * for web tests with the node route context.
+ *
+ * @Condition(
+ *   id = "condition_test_optional_context",
+ *   label = @Translation("Optional context"),
+ *   context = {
+ *     "node" = @ContextDefinition("entity:node", label = @Translation("Node"), required = FALSE),
+ *   }
+ * )
+ */
+class OptionalContextCondition extends ConditionPluginBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function evaluate() {
+    // Grant access if no context value is given.
+    return !$this->getContextValue('node');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function summary() {
+    return $this->t('Context with optional context.');
+  }
+
+}
diff --git a/core/modules/system/tests/modules/condition_test/src/Tests/OptionalContextConditionTest.php b/core/modules/system/tests/modules/condition_test/src/Tests/OptionalContextConditionTest.php
new file mode 100644
index 000000000..f455905b2
--- /dev/null
+++ b/core/modules/system/tests/modules/condition_test/src/Tests/OptionalContextConditionTest.php
@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\condition_test\Tests\OptionalContextConditionTest.
+ */
+
+namespace Drupal\condition_test\Tests;
+
+use Drupal\Core\Plugin\Context\Context;
+use Drupal\Core\Plugin\Context\ContextDefinition;
+use Drupal\node\Entity\Node;
+use Drupal\simpletest\KernelTestBase;
+
+/**
+ * Tests a condition with optional context.
+ *
+ * @group condition_test
+ */
+class OptionalContextConditionTest extends KernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['system', 'user', 'condition_test', 'node'];
+
+  /**
+   * Tests with both contexts mapped to the same user.
+   */
+  protected function testContextMissing() {
+    /** @var \Drupal\Core\Condition\ConditionPluginBase $condition */
+    $condition = \Drupal::service('plugin.manager.condition')
+      ->createInstance('condition_test_optional_context')
+      ->setContextMapping([
+        'node' => 'node',
+      ]);
+    \Drupal::service('context.handler')->applyContextMapping($condition, []);
+    $this->assertTrue($condition->execute());
+  }
+
+  /**
+   * Tests with both contexts mapped to the same user.
+   */
+  protected function testContextNoValue() {
+    /** @var \Drupal\Core\Condition\ConditionPluginBase $condition */
+    $condition = \Drupal::service('plugin.manager.condition')
+      ->createInstance('condition_test_optional_context')
+      ->setContextMapping([
+        'node' => 'node',
+      ]);
+    $definition = new ContextDefinition('entity:node');
+    $contexts['node'] = (new Context($definition));
+    \Drupal::service('context.handler')->applyContextMapping($condition, $contexts);
+    $this->assertTrue($condition->execute());
+  }
+
+  /**
+   * Tests with both contexts mapped to the same user.
+   */
+  protected function testContextAvailable() {
+    /** @var \Drupal\Core\Condition\ConditionPluginBase $condition */
+    $condition = \Drupal::service('plugin.manager.condition')
+      ->createInstance('condition_test_optional_context')
+      ->setContextMapping([
+        'node' => 'node',
+      ]);
+    $definition = new ContextDefinition('entity:node');
+    $node = Node::create(['type' => 'example']);
+    $contexts['node'] = (new Context($definition))->setContextValue($node);
+    \Drupal::service('context.handler')->applyContextMapping($condition, $contexts);
+    $this->assertFalse($condition->execute());
+  }
+
+}
diff --git a/core/modules/system/tests/modules/conneg_test/conneg_test.info.yml b/core/modules/system/tests/modules/conneg_test/conneg_test.info.yml
index 07f4600b5..256ddf43f 100644
--- a/core/modules/system/tests/modules/conneg_test/conneg_test.info.yml
+++ b/core/modules/system/tests/modules/conneg_test/conneg_test.info.yml
@@ -1,6 +1,6 @@
 name: Content negotiation test
 type: module
 description: 'Support testing content negotiation variations.'
-package: Core
+package: Testing
 version: VERSION
 core: 8.x
diff --git a/core/modules/system/tests/modules/database_test/database_test.install b/core/modules/system/tests/modules/database_test/database_test.install
index cfd72d5fe..3f77a7561 100644
--- a/core/modules/system/tests/modules/database_test/database_test.install
+++ b/core/modules/system/tests/modules/database_test/database_test.install
@@ -274,5 +274,21 @@ function database_test_schema() {
     'primary key' => array('name', 'age'),
   );
 
+  $schema['test_special_columns'] = array(
+    'description' => 'A simple test table with special column names.',
+    'fields' => array(
+      'id' => array(
+        'description' => 'Simple unique ID.',
+        'type' => 'int',
+        'not null' => TRUE,
+      ),
+      'offset' => array(
+        'description' => 'A column with preserved name.',
+        'type' => 'text',
+      ),
+    ),
+    'primary key' => array('id'),
+  );
+
   return $schema;
 }
diff --git a/core/modules/system/tests/modules/display_variant_test/display_variant_test.info.yml b/core/modules/system/tests/modules/display_variant_test/display_variant_test.info.yml
new file mode 100644
index 000000000..53e543c3a
--- /dev/null
+++ b/core/modules/system/tests/modules/display_variant_test/display_variant_test.info.yml
@@ -0,0 +1,6 @@
+name: 'Display variant tests'
+type: module
+description: 'Support module for testing display variants.'
+package: Testing
+version: VERSION
+core: 8.x
diff --git a/core/modules/system/tests/modules/display_variant_test/display_variant_test.services.yml b/core/modules/system/tests/modules/display_variant_test/display_variant_test.services.yml
new file mode 100644
index 000000000..654a0cf7e
--- /dev/null
+++ b/core/modules/system/tests/modules/display_variant_test/display_variant_test.services.yml
@@ -0,0 +1,5 @@
+services:
+  display_variant_test.page_display_variant_subscriber:
+    class: Drupal\display_variant_test\EventSubscriber\TestPageDisplayVariantSubscriber
+    tags:
+      - { name: 'event_subscriber', priority: 1000 }
diff --git a/core/modules/system/tests/modules/display_variant_test/src/EventSubscriber/TestPageDisplayVariantSubscriber.php b/core/modules/system/tests/modules/display_variant_test/src/EventSubscriber/TestPageDisplayVariantSubscriber.php
new file mode 100644
index 000000000..b8154c781
--- /dev/null
+++ b/core/modules/system/tests/modules/display_variant_test/src/EventSubscriber/TestPageDisplayVariantSubscriber.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\display_variant_test\EventSubscriber\TestPageDisplayVariantSubscriber.
+ */
+
+namespace Drupal\display_variant_test\EventSubscriber;
+
+use Drupal\Core\Render\PageDisplayVariantSelectionEvent;
+use Drupal\Core\Render\RenderEvents;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * Selects the test page display variant.
+ */
+class TestPageDisplayVariantSubscriber implements EventSubscriberInterface {
+
+  /**
+   * Selects the page display variant.
+   *
+   * @param \Drupal\Core\Render\PageDisplayVariantSelectionEvent $event
+   *   The event to process.
+   */
+  public function onSelectPageDisplayVariant(PageDisplayVariantSelectionEvent $event) {
+    $event->setPluginId('display_variant_test');
+    $event->setPluginConfiguration(['required_configuration' => 'A very important, required value.']);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  static function getSubscribedEvents() {
+    $events[RenderEvents::SELECT_PAGE_DISPLAY_VARIANT][] = array('onSelectPageDisplayVariant');
+    return $events;
+  }
+
+}
diff --git a/core/modules/system/tests/modules/display_variant_test/src/Plugin/DisplayVariant/TestDisplayVariant.php b/core/modules/system/tests/modules/display_variant_test/src/Plugin/DisplayVariant/TestDisplayVariant.php
new file mode 100644
index 000000000..205727205
--- /dev/null
+++ b/core/modules/system/tests/modules/display_variant_test/src/Plugin/DisplayVariant/TestDisplayVariant.php
@@ -0,0 +1,54 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\display_variant_test\Plugin\DisplayVariant\TestDisplayVariant.
+ */
+
+namespace Drupal\display_variant_test\Plugin\DisplayVariant;
+
+use Drupal\Core\Display\VariantBase;
+use Drupal\Core\Display\PageVariantInterface;
+
+/**
+ * Provides a display variant that requires configuration.
+ *
+ * @DisplayVariant(
+ *   id = "display_variant_test",
+ *   admin_label = @Translation("Test display variant")
+ * )
+ */
+class TestDisplayVariant extends VariantBase implements PageVariantInterface {
+
+  /**
+   * The render array representing the main page content.
+   *
+   * @var array
+   */
+  protected $mainContent = [];
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setMainContent(array $main_content) {
+    $this->mainContent = $main_content;
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function build() {
+    $config = $this->getConfiguration();
+    if (empty($config['required_configuration'])) {
+      throw new \Exception('Required configuration is missing!');
+    }
+
+    $build = [];
+    $build['content']['default'] = [
+      '#markup' => $config['required_configuration'],
+    ];
+    return $build;
+  }
+
+}
diff --git a/core/modules/system/tests/modules/early_rendering_controller_test/early_rendering_controller_test.info.yml b/core/modules/system/tests/modules/early_rendering_controller_test/early_rendering_controller_test.info.yml
new file mode 100644
index 000000000..44ab45247
--- /dev/null
+++ b/core/modules/system/tests/modules/early_rendering_controller_test/early_rendering_controller_test.info.yml
@@ -0,0 +1,6 @@
+name: 'Early rendering controller test'
+type: module
+description: 'Support module for EarlyRenderingControllerTest.'
+package: Testing
+version: VERSION
+core: 8.x
diff --git a/core/modules/system/tests/modules/early_rendering_controller_test/early_rendering_controller_test.routing.yml b/core/modules/system/tests/modules/early_rendering_controller_test/early_rendering_controller_test.routing.yml
new file mode 100644
index 000000000..b71fd822b
--- /dev/null
+++ b/core/modules/system/tests/modules/early_rendering_controller_test/early_rendering_controller_test.routing.yml
@@ -0,0 +1,111 @@
+# Controller returning a render array.
+early_rendering_controller_test.render_array:
+  path: '/early-rendering-controller-test/render-array'
+  defaults:
+    _controller: '\Drupal\early_rendering_controller_test\EarlyRenderingTestController::renderArray'
+  requirements:
+    _access: 'TRUE'
+early_rendering_controller_test.render_array.early:
+  path: '/early-rendering-controller-test/render-array/early'
+  defaults:
+    _controller: '\Drupal\early_rendering_controller_test\EarlyRenderingTestController::renderArrayEarly'
+  requirements:
+    _access: 'TRUE'
+
+# Controller returning an AjaxResponse.
+early_rendering_controller_test.ajax_response:
+  path: '/early-rendering-controller-test/ajax-response'
+  defaults:
+    _controller: '\Drupal\early_rendering_controller_test\EarlyRenderingTestController::ajaxResponse'
+  requirements:
+    _access: 'TRUE'
+early_rendering_controller_test.ajax_response.early:
+  path: '/early-rendering-controller-test/ajax-response/early'
+  defaults:
+    _controller: '\Drupal\early_rendering_controller_test\EarlyRenderingTestController::ajaxResponseEarly'
+  requirements:
+    _access: 'TRUE'
+
+# Controller returning a basic Response object.
+early_rendering_controller_test.response:
+  path: '/early-rendering-controller-test/response'
+  defaults:
+    _controller: '\Drupal\early_rendering_controller_test\EarlyRenderingTestController::response'
+  requirements:
+    _access: 'TRUE'
+early_rendering_controller_test.response.early:
+  path: '/early-rendering-controller-test/response/early'
+  defaults:
+    _controller: '\Drupal\early_rendering_controller_test\EarlyRenderingTestController::responseEarly'
+  requirements:
+    _access: 'TRUE'
+
+# Controller returning a Response object with attachments.
+early_rendering_controller_test.response-with-attachments:
+  path: '/early-rendering-controller-test/response-with-attachments'
+  defaults:
+    _controller: '\Drupal\early_rendering_controller_test\EarlyRenderingTestController::responseWithAttachments'
+  requirements:
+    _access: 'TRUE'
+early_rendering_controller_test.response-with-attachments.early:
+  path: '/early-rendering-controller-test/response-with-attachments/early'
+  defaults:
+    _controller: '\Drupal\early_rendering_controller_test\EarlyRenderingTestController::responseWithAttachmentsEarly'
+  requirements:
+    _access: 'TRUE'
+
+# Controller returning a cacheable Response object.
+early_rendering_controller_test.cacheable-response:
+  path: '/early-rendering-controller-test/cacheable-response'
+  defaults:
+    _controller: '\Drupal\early_rendering_controller_test\EarlyRenderingTestController::cacheableResponse'
+  requirements:
+    _access: 'TRUE'
+early_rendering_controller_test.cacheable-response.early:
+  path: '/early-rendering-controller-test/cacheable-response/early'
+  defaults:
+    _controller: '\Drupal\early_rendering_controller_test\EarlyRenderingTestController::cacheableResponseEarly'
+  requirements:
+    _access: 'TRUE'
+
+# Controller returning a basic domain object.
+early_rendering_controller_test.domain-object:
+  path: '/early-rendering-controller-test/domain-object'
+  defaults:
+    _controller: '\Drupal\early_rendering_controller_test\EarlyRenderingTestController::domainObject'
+  requirements:
+    _access: 'TRUE'
+early_rendering_controller_test.domain-object.early:
+  path: '/early-rendering-controller-test/domain-object/early'
+  defaults:
+    _controller: '\Drupal\early_rendering_controller_test\EarlyRenderingTestController::domainObjectEarly'
+  requirements:
+    _access: 'TRUE'
+
+# Controller returning a domain object with attachments.
+early_rendering_controller_test.domain-object-with-attachments:
+  path: '/early-rendering-controller-test/domain-object-with-attachments'
+  defaults:
+    _controller: '\Drupal\early_rendering_controller_test\EarlyRenderingTestController::domainObjectWithAttachments'
+  requirements:
+    _access: 'TRUE'
+early_rendering_controller_test.domain-object-with-attachments.early:
+  path: '/early-rendering-controller-test/domain-object-with-attachments/early'
+  defaults:
+    _controller: '\Drupal\early_rendering_controller_test\EarlyRenderingTestController::domainObjectWithAttachmentsEarly'
+  requirements:
+    _access: 'TRUE'
+
+# Controller returning a cacheable domain object.
+early_rendering_controller_test.cacheable-domain-object:
+  path: '/early-rendering-controller-test/cacheable-domain-object'
+  defaults:
+    _controller: '\Drupal\early_rendering_controller_test\EarlyRenderingTestController::cacheableDomainObject'
+  requirements:
+    _access: 'TRUE'
+early_rendering_controller_test.cacheable-domain-object.early:
+  path: '/early-rendering-controller-test/cacheable-domain-object/early'
+  defaults:
+    _controller: '\Drupal\early_rendering_controller_test\EarlyRenderingTestController::cacheableDomainObjectEarly'
+  requirements:
+    _access: 'TRUE'
diff --git a/core/modules/system/tests/modules/early_rendering_controller_test/early_rendering_controller_test.services.yml b/core/modules/system/tests/modules/early_rendering_controller_test/early_rendering_controller_test.services.yml
new file mode 100644
index 000000000..8c62f1aa1
--- /dev/null
+++ b/core/modules/system/tests/modules/early_rendering_controller_test/early_rendering_controller_test.services.yml
@@ -0,0 +1,5 @@
+services:
+  test_domain_object.view_subscriber:
+    class: Drupal\early_rendering_controller_test\TestDomainObjectViewSubscriber
+    tags:
+      - { name: event_subscriber }
diff --git a/core/modules/system/tests/modules/early_rendering_controller_test/src/AttachmentsTestDomainObject.php b/core/modules/system/tests/modules/early_rendering_controller_test/src/AttachmentsTestDomainObject.php
new file mode 100644
index 000000000..e6b6a4f94
--- /dev/null
+++ b/core/modules/system/tests/modules/early_rendering_controller_test/src/AttachmentsTestDomainObject.php
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\early_rendering_controller_test\AttachmentsTestDomainObject.
+ */
+
+namespace Drupal\early_rendering_controller_test;
+
+use Drupal\Core\Render\AttachmentsInterface;
+use Drupal\Core\Render\AttachmentsTrait;
+
+class AttachmentsTestDomainObject extends TestDomainObject implements AttachmentsInterface {
+
+  use AttachmentsTrait;
+
+}
diff --git a/core/modules/system/tests/modules/early_rendering_controller_test/src/AttachmentsTestResponse.php b/core/modules/system/tests/modules/early_rendering_controller_test/src/AttachmentsTestResponse.php
new file mode 100644
index 000000000..2b81f025c
--- /dev/null
+++ b/core/modules/system/tests/modules/early_rendering_controller_test/src/AttachmentsTestResponse.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\early_rendering_controller_test\AttachmentsTestResponse.
+ */
+
+namespace Drupal\early_rendering_controller_test;
+
+use Drupal\Core\Render\AttachmentsInterface;
+use Drupal\Core\Render\AttachmentsTrait;
+use Symfony\Component\HttpFoundation\Response;
+
+class AttachmentsTestResponse extends Response implements AttachmentsInterface {
+
+  use AttachmentsTrait;
+
+}
diff --git a/core/modules/system/tests/modules/early_rendering_controller_test/src/CacheableTestDomainObject.php b/core/modules/system/tests/modules/early_rendering_controller_test/src/CacheableTestDomainObject.php
new file mode 100644
index 000000000..4df64e261
--- /dev/null
+++ b/core/modules/system/tests/modules/early_rendering_controller_test/src/CacheableTestDomainObject.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\early_rendering_controller_test\AttachmentsTestDomainObject.
+ */
+
+namespace Drupal\early_rendering_controller_test;
+
+use Drupal\Core\Cache\CacheableDependencyInterface;
+
+class CacheableTestDomainObject extends TestDomainObject implements CacheableDependencyInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheContexts() {
+    return [];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheTags() {
+    return [];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheMaxAge() {
+    return 0;
+  }
+
+}
diff --git a/core/modules/system/tests/modules/early_rendering_controller_test/src/CacheableTestResponse.php b/core/modules/system/tests/modules/early_rendering_controller_test/src/CacheableTestResponse.php
new file mode 100644
index 000000000..06bf3cc37
--- /dev/null
+++ b/core/modules/system/tests/modules/early_rendering_controller_test/src/CacheableTestResponse.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\early_rendering_controller_test\CacheableTestResponse.
+ */
+
+namespace Drupal\early_rendering_controller_test;
+
+use Drupal\Core\Cache\CacheableResponseInterface;
+use Drupal\Core\Cache\CacheableResponseTrait;
+use Symfony\Component\HttpFoundation\Response;
+
+class CacheableTestResponse extends Response implements CacheableResponseInterface {
+
+  use CacheableResponseTrait;
+
+}
diff --git a/core/modules/system/tests/modules/early_rendering_controller_test/src/EarlyRenderingTestController.php b/core/modules/system/tests/modules/early_rendering_controller_test/src/EarlyRenderingTestController.php
new file mode 100644
index 000000000..d560f94a3
--- /dev/null
+++ b/core/modules/system/tests/modules/early_rendering_controller_test/src/EarlyRenderingTestController.php
@@ -0,0 +1,150 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\early_rendering_controller_test\EarlyRenderingTestController.
+ */
+
+namespace Drupal\early_rendering_controller_test;
+
+use Drupal\Core\Ajax\AjaxResponse;
+use Drupal\Core\Ajax\InsertCommand;
+use Drupal\Core\Controller\ControllerBase;
+use Drupal\Core\Render\RendererInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\HttpFoundation\Response;
+
+/**
+ * Controller routines for early_rendering_test routes.
+ *
+ * The methods on this controller each correspond to a route for this module,
+ * each of which exist solely for test cases in EarlyRenderingControllerTest;
+ * see that test for documentation.
+ *
+ * @see core/modules/early_rendering_controller_test/early_rendering_controller_test.routing.yml
+ * @see \Drupal\system\Tests\Common\EarlyRenderingControllerTest::testEarlyRendering()
+ */
+class EarlyRenderingTestController extends ControllerBase {
+
+  /**
+   * The renderer.
+   *
+   * @var \Drupal\Core\Render\RendererInterface
+   */
+  protected $renderer;
+
+  /**
+   * Constructs a EarlyRenderingTestController.
+   *
+   * @param \Drupal\Core\Render\RendererInterface $renderer
+   */
+  public function __construct(RendererInterface $renderer) {
+    $this->renderer = $renderer;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static(
+      $container->get('renderer')
+    );
+  }
+
+  protected function earlyRenderContent() {
+    return [
+      '#markup' => 'Hello world!',
+      '#cache' => [
+        'tags' => [
+          'foo',
+        ],
+      ],
+    ];
+  }
+
+  public function renderArray() {
+    return [
+      '#pre_render' => [function () {
+        $elements = $this->earlyRenderContent();
+        return $elements;
+      }],
+    ];
+  }
+
+  public function renderArrayEarly() {
+    $render_array = $this->earlyRenderContent();
+    return [
+      '#markup' => $this->renderer->render($render_array),
+    ];
+  }
+
+  public function ajaxResponse() {
+    $response = new AjaxResponse();
+    $response->addCommand(new InsertCommand(NULL, $this->renderArray()));
+    return $response;
+  }
+
+  public function ajaxResponseEarly() {
+    $response = new AjaxResponse();
+    $response->addCommand(new InsertCommand(NULL, $this->renderArrayEarly()));
+    return $response;
+  }
+
+  public function response() {
+    return new Response('Hello world!');
+  }
+
+  public function responseEarly() {
+    $render_array = $this->earlyRenderContent();
+    return new Response($this->renderer->render($render_array));
+  }
+
+  public function responseWithAttachments() {
+    return new AttachmentsTestResponse('Hello world!');
+  }
+
+  public function responseWithAttachmentsEarly() {
+    $render_array = $this->earlyRenderContent();
+    return new AttachmentsTestResponse($this->renderer->render($render_array));
+  }
+
+  public function cacheableResponse() {
+    return new CacheableTestResponse('Hello world!');
+  }
+
+  public function cacheableResponseEarly() {
+    $render_array = $this->earlyRenderContent();
+    return new CacheableTestResponse($this->renderer->render($render_array));
+  }
+
+  public function domainObject() {
+    return new TestDomainObject();
+  }
+
+  public function domainObjectEarly() {
+    $render_array = $this->earlyRenderContent();
+    $this->renderer->render($render_array);
+    return new TestDomainObject();
+  }
+
+  public function domainObjectWithAttachments() {
+    return new AttachmentsTestDomainObject();
+  }
+
+  public function domainObjectWithAttachmentsEarly() {
+    $render_array = $this->earlyRenderContent();
+    $this->renderer->render($render_array);
+    return new AttachmentsTestDomainObject();
+  }
+
+  public function cacheableDomainObject() {
+    return new CacheableTestDomainObject();
+  }
+
+  public function cacheableDomainObjectEarly() {
+    $render_array = $this->earlyRenderContent();
+    $this->renderer->render($render_array);
+    return new CacheableTestDomainObject();
+  }
+
+}
diff --git a/core/modules/system/tests/modules/early_rendering_controller_test/src/TestDomainObject.php b/core/modules/system/tests/modules/early_rendering_controller_test/src/TestDomainObject.php
new file mode 100644
index 000000000..b2f8f8be2
--- /dev/null
+++ b/core/modules/system/tests/modules/early_rendering_controller_test/src/TestDomainObject.php
@@ -0,0 +1,10 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\early_rendering_controller_test\TestDomainObject.
+ */
+
+namespace Drupal\early_rendering_controller_test;
+
+class TestDomainObject { }
diff --git a/core/modules/system/tests/modules/early_rendering_controller_test/src/TestDomainObjectViewSubscriber.php b/core/modules/system/tests/modules/early_rendering_controller_test/src/TestDomainObjectViewSubscriber.php
new file mode 100644
index 000000000..9c68c3ea1
--- /dev/null
+++ b/core/modules/system/tests/modules/early_rendering_controller_test/src/TestDomainObjectViewSubscriber.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\early_rendering_controller_test\TestDomainObjectViewSubscriber.
+ */
+
+namespace Drupal\early_rendering_controller_test;
+
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent;
+use Symfony\Component\HttpKernel\KernelEvents;
+
+/**
+ * View subscriber for turning TestDomainObject objects into Response objects.
+ */
+class TestDomainObjectViewSubscriber implements EventSubscriberInterface {
+
+  /**
+   * Sets a response given a TestDomainObject instance.
+   *
+   * @param \Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent $event
+   *   The event to process.
+   */
+  public function onViewTestDomainObject(GetResponseForControllerResultEvent $event) {
+    $result = $event->getControllerResult();
+
+    if ($result instanceof TestDomainObject) {
+      if ($result instanceof AttachmentsTestDomainObject) {
+        $event->setResponse(new AttachmentsTestResponse('AttachmentsTestDomainObject'));
+      }
+      elseif ($result instanceof CacheableTestDomainObject) {
+        $event->setResponse(new CacheableTestResponse('CacheableTestDomainObject'));
+      }
+      else {
+        $event->setResponse(new Response('TestDomainObject'));
+      }
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  static function getSubscribedEvents() {
+    $events[KernelEvents::VIEW][] = ['onViewTestDomainObject'];
+
+    return $events;
+  }
+
+}
diff --git a/core/modules/system/tests/modules/entity_test/entity_test.module b/core/modules/system/tests/modules/entity_test/entity_test.module
index dd44c1f18..1e7fa2b1f 100644
--- a/core/modules/system/tests/modules/entity_test/entity_test.module
+++ b/core/modules/system/tests/modules/entity_test/entity_test.module
@@ -9,6 +9,7 @@ use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\FieldableEntityInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\Field\BaseFieldDefinition;
 use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Field\FieldItemListInterface;
 use Drupal\Core\Form\FormStateInterface;
@@ -97,6 +98,23 @@ function entity_test_entity_type_alter(array &$entity_types) {
   }
 }
 
+/**
+ * Implements hook_entity_base_field_info().
+ */
+function entity_test_entity_base_field_info(EntityTypeInterface $entity_type) {
+  $fields = [];
+
+  if ($entity_type->id() == 'entity_test_mulrev' && \Drupal::state()->get('entity_test.field_test_item')) {
+    $fields['field_test_item'] = BaseFieldDefinition::create('field_test')
+      ->setLabel(t('Field test'))
+      ->setDescription(t('A field test.'))
+      ->setRevisionable(TRUE)
+      ->setTranslatable(TRUE);
+  }
+
+  return $fields;
+}
+
 /**
  * Implements hook_entity_base_field_info_alter().
  */
@@ -257,6 +275,37 @@ function entity_test_entity_extra_field_info() {
   return $extra;
 }
 
+/**
+ * Implements hook_form_BASE_FORM_ID_alter().
+ */
+function entity_test_form_entity_test_form_alter(&$form) {
+  switch (\Drupal::state()->get('entity_test.form.validate.test')) {
+    case 'form-level':
+      $form['#validate'][] = 'entity_test_form_entity_test_form_validate';
+      $form['#validate'][] = 'entity_test_form_entity_test_form_validate_check';
+      break;
+
+    case 'button-level':
+      $form['actions']['submit']['#validate'][] = 'entity_test_form_entity_test_form_validate';
+  }
+}
+
+/**
+ * Validation handler for the entity_test entity form.
+ */
+function entity_test_form_entity_test_form_validate(array &$form, FormStateInterface $form_state) {
+  $form['#entity_test_form_validate'] = TRUE;
+}
+
+/**
+ * Validation handler for the entity_test entity form.
+ */
+function entity_test_form_entity_test_form_validate_check(array &$form, FormStateInterface $form_state) {
+  if (!empty($form['#entity_test_form_validate'])) {
+    \Drupal::state()->set('entity_test.form.validate.result', TRUE);
+  }
+}
+
 /**
  * Implements hook_form_BASE_FORM_ID_alter().
  */
diff --git a/core/modules/system/tests/modules/entity_test/entity_test.routing.yml b/core/modules/system/tests/modules/entity_test/entity_test.routing.yml
index ebe557947..630f7158c 100644
--- a/core/modules/system/tests/modules/entity_test/entity_test.routing.yml
+++ b/core/modules/system/tests/modules/entity_test/entity_test.routing.yml
@@ -76,5 +76,12 @@ entity.user_role.test_operation:
   requirements:
     _access: 'TRUE'
 
+entity.entity_test_view_builder.canonical:
+  path: '/entity_test_view_builder/{entity_test_view_builder}'
+  defaults:
+    _entity_view: 'entity_test_view_builder'
+  requirements:
+    _access: 'TRUE'
+
 route_callbacks:
   - '\Drupal\entity_test\Routing\EntityTestRoutes::routes'
diff --git a/core/modules/system/tests/modules/entity_test/src/Cache/EntityTestViewGrantsCacheContext.php b/core/modules/system/tests/modules/entity_test/src/Cache/EntityTestViewGrantsCacheContext.php
index 1bc28f11c..9d49470fd 100644
--- a/core/modules/system/tests/modules/entity_test/src/Cache/EntityTestViewGrantsCacheContext.php
+++ b/core/modules/system/tests/modules/entity_test/src/Cache/EntityTestViewGrantsCacheContext.php
@@ -7,11 +7,14 @@
 
 namespace Drupal\entity_test\Cache;
 
+use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Cache\Context\CacheContextInterface;
 
 /**
  * Defines the entity_test view grants cache context service.
  *
+ * Cache context ID: 'entity_test_view_grants'.
+ *
  * @see \Drupal\node\Cache\NodeAccessViewGrantsCacheContext
  */
 class EntityTestViewGrantsCacheContext implements CacheContextInterface {
@@ -32,4 +35,11 @@ class EntityTestViewGrantsCacheContext implements CacheContextInterface {
     return '299792458';
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheableMetadata() {
+    return new CacheableMetadata();
+  }
+
 }
diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestViewBuilder.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestViewBuilder.php
new file mode 100644
index 000000000..bc83cebae
--- /dev/null
+++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestViewBuilder.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\entity_test\Entity\EntityTestViewBuilder.
+ */
+
+namespace Drupal\entity_test\Entity;
+
+/**
+ * Test entity class for testing a view builder.
+ *
+ * @ContentEntityType(
+ *   id = "entity_test_view_builder",
+ *   label = @Translation("Entity Test view builder"),
+ *   handlers = {
+ *     "access" = "Drupal\entity_test\EntityTestAccessControlHandler",
+ *     "view_builder" = "Drupal\entity_test\EntityTestViewBuilderOverriddenView",
+ *   },
+ *   base_table = "entity_test",
+ *   render_cache = FALSE,
+ *   entity_keys = {
+ *     "id" = "id",
+ *     "label" = "name",
+ *     "bundle" = "type"
+ *   }
+ * )
+ */
+class EntityTestViewBuilder extends EntityTest {
+
+}
diff --git a/core/modules/system/tests/modules/entity_test/src/EntityTestForm.php b/core/modules/system/tests/modules/entity_test/src/EntityTestForm.php
index fb3c486da..59e798b5b 100644
--- a/core/modules/system/tests/modules/entity_test/src/EntityTestForm.php
+++ b/core/modules/system/tests/modules/entity_test/src/EntityTestForm.php
@@ -51,35 +51,40 @@ class EntityTestForm extends ContentEntityForm {
    * {@inheritdoc}
    */
   public function save(array $form, FormStateInterface $form_state) {
-    $entity = $this->entity;
+    try {
+      $entity = $this->entity;
 
-    // Save as a new revision if requested to do so.
-    if (!$form_state->isValueEmpty('revision')) {
-      $entity->setNewRevision();
-    }
+      // Save as a new revision if requested to do so.
+      if (!$form_state->isValueEmpty('revision')) {
+        $entity->setNewRevision();
+      }
 
-    $is_new = $entity->isNew();
-    $entity->save();
+      $is_new = $entity->isNew();
+      $entity->save();
 
-    if ($is_new) {
-     $message = t('%entity_type @id has been created.', array('@id' => $entity->id(), '%entity_type' => $entity->getEntityTypeId()));
-    }
-    else {
-      $message = t('%entity_type @id has been updated.', array('@id' => $entity->id(), '%entity_type' => $entity->getEntityTypeId()));
-    }
-    drupal_set_message($message);
+      if ($is_new) {
+        $message = t('%entity_type @id has been created.', array('@id' => $entity->id(), '%entity_type' => $entity->getEntityTypeId()));
+      }
+      else {
+        $message = t('%entity_type @id has been updated.', array('@id' => $entity->id(), '%entity_type' => $entity->getEntityTypeId()));
+      }
+      drupal_set_message($message);
 
-    if ($entity->id()) {
-      $entity_type = $entity->getEntityTypeId();
-      $form_state->setRedirect(
-        "entity.$entity_type.edit_form",
-        array($entity_type => $entity->id())
-      );
+      if ($entity->id()) {
+        $entity_type = $entity->getEntityTypeId();
+        $form_state->setRedirect(
+          "entity.$entity_type.edit_form",
+          array($entity_type => $entity->id())
+        );
+      }
+      else {
+        // Error on save.
+        drupal_set_message(t('The entity could not be saved.'), 'error');
+        $form_state->setRebuild();
+      }
     }
-    else {
-      // Error on save.
-      drupal_set_message(t('The entity could not be saved.'), 'error');
-      $form_state->setRebuild();
+    catch (\Exception $e) {
+      \Drupal::state()->set('entity_test.form.save.exception', get_class($e) . ': ' . $e->getMessage());
     }
   }
 
diff --git a/core/modules/system/tests/modules/entity_test/src/EntityTestViewBuilderOverriddenView.php b/core/modules/system/tests/modules/entity_test/src/EntityTestViewBuilderOverriddenView.php
new file mode 100644
index 000000000..f4b719f68
--- /dev/null
+++ b/core/modules/system/tests/modules/entity_test/src/EntityTestViewBuilderOverriddenView.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\entity_test\EntityTestViewBuilderOverriddenView.
+ */
+
+namespace Drupal\entity_test;
+
+use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Core\Entity\EntityInterface;
+
+/**
+ * Provides a view builder that overrides ::view() and ::viewMultiple().
+ */
+class EntityTestViewBuilderOverriddenView extends EntityTestViewBuilder {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function view(EntityInterface $entity, $view_mode = 'full', $langcode = NULL) {
+    $build = [];
+    $build[$entity->id()]['#markup'] = SafeMarkup::checkPlain($entity->label());
+    return $build;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function viewMultiple(array $entities = [], $view_mode = 'full', $langcode = NULL) {
+    $build = [];
+    foreach ($entities as $key => $entity) {
+      $build[$key] = $this->view($entity, $view_mode, $langcode);
+    }
+    return $build;
+  }
+
+}
diff --git a/core/modules/system/tests/modules/entity_test/src/Plugin/Field/FieldType/FieldTestItem.php b/core/modules/system/tests/modules/entity_test/src/Plugin/Field/FieldType/FieldTestItem.php
new file mode 100644
index 000000000..582ea9416
--- /dev/null
+++ b/core/modules/system/tests/modules/entity_test/src/Plugin/Field/FieldType/FieldTestItem.php
@@ -0,0 +1,118 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\entity_test\Plugin\Field\FieldType\FieldTestItem.
+ */
+
+namespace Drupal\entity_test\Plugin\Field\FieldType;
+
+use Drupal\Core\Field\FieldItemBase;
+use Drupal\Core\Field\FieldStorageDefinitionInterface;
+use Drupal\Core\StringTranslation\TranslationWrapper;
+use Drupal\Core\TypedData\DataDefinition;
+use Drupal\Core\TypedData\DataDefinitionInterface;
+use Drupal\Core\TypedData\TypedDataInterface;
+
+
+/**
+ * Defines the 'field_test' entity field type.
+ *
+ * @FieldType(
+ *   id = "field_test",
+ *   label = @Translation("Test field item"),
+ *   description = @Translation("A field containing a plain string value."),
+ *   category = @Translation("Field"),
+ * )
+ */
+class FieldTestItem extends FieldItemBase {
+
+  /**
+   * Counts how many times all items of this type are saved.
+   *
+   * @var int
+   */
+  protected static $counter = [];
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function propertyDefinitions(FieldStorageDefinitionInterface $field_definition) {
+    // This is called very early by the user entity roles field. Prevent
+    // early t() calls by using the TranslationWrapper.
+    $properties['value'] = DataDefinition::create('string')
+      ->setLabel(new TranslationWrapper('Test value'))
+      ->setRequired(TRUE);
+
+    return $properties;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function schema(FieldStorageDefinitionInterface $field_definition) {
+    return array(
+      'columns' => array(
+        'value' => array(
+          'type' => 'varchar',
+          'length' => 255,
+        ),
+      ),
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function __construct(DataDefinitionInterface $definition, $name = NULL, TypedDataInterface $parent = NULL) {
+    parent::__construct($definition, $name, $parent);
+
+    $name = $this->getFieldDefinition()->getName();
+    static::$counter[$name] = 0;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function preSave() {
+    $name = $this->getFieldDefinition()->getName();
+    static::$counter[$name]++;
+
+    // Overwrite the field value unless it is going to be overridden, in which
+    // case its final value will already be different from the current one.
+    if (!$this->getEntity()->isNew() && !$this->mustResave()) {
+      $this->setValue('overwritten');
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function postSave($update) {
+    // Determine whether the field value should be rewritten to the storage. We
+    // always rewrite on create as we need to store a value including the entity
+    // id.
+    $resave = !$update || $this->mustResave();
+
+    if ($resave) {
+      $entity = $this->getEntity();
+      $definition = $this->getFieldDefinition();
+      $name = $definition->getName();
+      $value = 'field_test:' . $name . ':' . $entity->id() . ':' . static::$counter[$name];
+      $this->setValue($value);
+    }
+
+    return $resave;
+  }
+
+  /**
+   * Checks whether the field item value should be resaved.
+   *
+   * @return bool
+   *   TRUE if the item should be resaved, FALSE otherwise.
+   */
+  protected function mustResave() {
+    return $this->getValue()['value'] == 'resave';
+  }
+
+}
diff --git a/core/modules/system/tests/modules/entity_test_operation/entity_test_operation.info.yml b/core/modules/system/tests/modules/entity_test_operation/entity_test_operation.info.yml
new file mode 100644
index 000000000..eb905d4f6
--- /dev/null
+++ b/core/modules/system/tests/modules/entity_test_operation/entity_test_operation.info.yml
@@ -0,0 +1,6 @@
+name: 'Entity Operation Test'
+type: module
+description: 'Provides a test operation to entities.'
+package: Testing
+version: VERSION
+core: 8.x
diff --git a/core/modules/system/tests/modules/entity_test_operation/entity_test_operation.module b/core/modules/system/tests/modules/entity_test_operation/entity_test_operation.module
new file mode 100644
index 000000000..bdea7ba2a
--- /dev/null
+++ b/core/modules/system/tests/modules/entity_test_operation/entity_test_operation.module
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * @file
+ * Contains hook implementations for Entity Operation Test Module.
+ */
+
+use Drupal\Core\Url;
+
+/**
+ * Implements hook_entity_operation().
+ */
+function entity_test_operation_entity_operation(\Drupal\Core\Entity\EntityInterface $entity) {
+  return [
+    'test' => [
+      'title' => t('Front page'),
+      'url' => Url::fromRoute('<front>'),
+      'weight' => 0,
+    ],
+  ];
+}
diff --git a/core/modules/system/tests/modules/error_service_test/error_service_test.info.yml b/core/modules/system/tests/modules/error_service_test/error_service_test.info.yml
new file mode 100644
index 000000000..6a5f99c40
--- /dev/null
+++ b/core/modules/system/tests/modules/error_service_test/error_service_test.info.yml
@@ -0,0 +1,6 @@
+name: 'Error service test'
+type: module
+description: 'Support module for causing bedlam in container rebuilds.'
+package: Testing
+version: VERSION
+core: 8.x
diff --git a/core/modules/system/tests/modules/error_service_test/error_service_test.routing.yml b/core/modules/system/tests/modules/error_service_test/error_service_test.routing.yml
new file mode 100644
index 000000000..36777e4e0
--- /dev/null
+++ b/core/modules/system/tests/modules/error_service_test/error_service_test.routing.yml
@@ -0,0 +1,6 @@
+error_service_test.broken_class:
+  path: broken-service-class
+  defaults:
+    _controller: \Drupal\error_service_test\Controller\LonelyMonkeyController::testBrokenClass
+  requirements:
+    _access: 'TRUE'
diff --git a/core/modules/system/tests/modules/error_service_test/error_service_test.services.yml b/core/modules/system/tests/modules/error_service_test/error_service_test.services.yml
new file mode 100644
index 000000000..6ae466977
--- /dev/null
+++ b/core/modules/system/tests/modules/error_service_test/error_service_test.services.yml
@@ -0,0 +1,8 @@
+services:
+  http_middleware.monkeys:
+    class: Drupal\error_service_test\MonkeysInTheControlRoom
+    tags:
+      - { name: http_middleware, priority: 400 }
+  # Set up a service with a missing class dependency.
+  broken_class_with_missing_dependency:
+    class: Drupal\error_service_test\LonelyMonkeyClass
diff --git a/core/modules/system/tests/modules/error_service_test/src/Controller/LonelyMonkeyController.php b/core/modules/system/tests/modules/error_service_test/src/Controller/LonelyMonkeyController.php
new file mode 100644
index 000000000..ce6ed3a18
--- /dev/null
+++ b/core/modules/system/tests/modules/error_service_test/src/Controller/LonelyMonkeyController.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\error_service_test\Controller\LonelyMonkeyController.
+ */
+
+namespace Drupal\error_service_test\Controller;
+
+use Drupal\Core\Controller\ControllerBase;
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
+use Drupal\error_service_test\LonelyMonkeyClass;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Provides a controller which calls out to a service with missing dependencies.
+ */
+class LonelyMonkeyController extends ControllerBase implements ContainerInjectionInterface {
+
+  public function __construct(LonelyMonkeyClass $class) {
+    $this->class = $class;
+  }
+
+  public function testBrokenClass() {
+    return [
+      '#markup' => $this->t('This should be broken.'),
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static($container->get('broken_class_with_missing_dependency'));
+  }
+
+}
diff --git a/core/modules/system/tests/modules/error_service_test/src/ErrorServiceTestServiceProvider.php b/core/modules/system/tests/modules/error_service_test/src/ErrorServiceTestServiceProvider.php
new file mode 100644
index 000000000..4a4aaafcb
--- /dev/null
+++ b/core/modules/system/tests/modules/error_service_test/src/ErrorServiceTestServiceProvider.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\error_service_test\ErrorServiceTestServiceProvider.
+ */
+
+namespace Drupal\error_service_test;
+
+use Drupal\Core\DependencyInjection\ContainerBuilder;
+use Drupal\Core\DependencyInjection\ServiceModifierInterface;
+
+class ErrorServiceTestServiceProvider implements ServiceModifierInterface {
+
+  /**
+   * The in-situ container builder.
+   *
+   * @var \Drupal\Core\DependencyInjection\ContainerBuilder
+   */
+  public static $containerBuilder;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function alter(ContainerBuilder $container) {
+    static::$containerBuilder = $container;
+  }
+}
diff --git a/core/modules/system/tests/modules/error_service_test/src/LonelyMonkeyClass.php b/core/modules/system/tests/modules/error_service_test/src/LonelyMonkeyClass.php
new file mode 100644
index 000000000..47dc5d8d2
--- /dev/null
+++ b/core/modules/system/tests/modules/error_service_test/src/LonelyMonkeyClass.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\error_service_test\LonelyMonkeyClass.
+ */
+
+namespace Drupal\error_service_test;
+
+use Drupal\Core\Database\Connection;
+
+/**
+ * A class with a single dependency.
+ */
+class LonelyMonkeyClass {
+
+  public function __construct(Connection $connection) {
+    $this->connection = $connection;
+  }
+
+}
diff --git a/core/modules/system/tests/modules/error_service_test/src/MonkeysInTheControlRoom.php b/core/modules/system/tests/modules/error_service_test/src/MonkeysInTheControlRoom.php
new file mode 100644
index 000000000..03b2b69cd
--- /dev/null
+++ b/core/modules/system/tests/modules/error_service_test/src/MonkeysInTheControlRoom.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * @file
+ * Contains \Drupal\error_service_test\MonkeysInTheControlRoom.
+ */
+
+namespace Drupal\error_service_test;
+
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+
+/**
+ * A http middleware designed to cause bedlam.
+ *
+ * @see error_service_test.services.yml
+ */
+class MonkeysInTheControlRoom implements HttpKernelInterface {
+
+  /**
+   * The app kernel.
+   *
+   * @var \Symfony\Component\HttpKernel\HttpKernelInterface
+   */
+  protected $app;
+
+  /**
+   * MonkeysInTheControlRoom constructor.
+   *
+   * @param \Symfony\Component\HttpKernel\HttpKernelInterface $app
+   *   The wrapper HTTP kernel.
+   */
+  public function __construct(HttpKernelInterface $app) {
+    $this->app = $app;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function handle(Request $request, $type = self::MASTER_REQUEST, $catch = TRUE) {
+    if (\Drupal::state()->get('error_service_test.break_bare_html_renderer')) {
+      // Let the bedlam begin.
+      // 1) Force a container rebuild.
+      /** @var \Drupal\Core\DrupalKernelInterface $kernel */
+      $kernel = \Drupal::service('kernel');
+      $kernel->rebuildContainer();
+      // 2) Fetch the in-situ container builder.
+      $container = ErrorServiceTestServiceProvider::$containerBuilder;
+      // Ensure the compiler pass worked.
+      if (!$container) {
+        throw new \Exception('Oh oh, monkeys stole the ServiceProvider.');
+      }
+      // Stop the theme manager from being found - and triggering error
+      // maintenance mode.
+      $container->removeDefinition('theme.manager');
+      // Mash. Mash. Mash.
+      \Drupal::setContainer($container);
+      throw new \Exception('Oh oh, bananas in the instruments.');
+    }
+
+    return $this->app->handle($request, $type, $catch);
+  }
+
+}
diff --git a/core/modules/system/tests/modules/form_test/form_test.module b/core/modules/system/tests/modules/form_test/form_test.module
index d2979457c..2a970a22c 100644
--- a/core/modules/system/tests/modules/form_test/form_test.module
+++ b/core/modules/system/tests/modules/form_test/form_test.module
@@ -75,19 +75,6 @@ function _form_test_tableselect_get_data() {
   return array($header, $options);
 }
 
-/**
- * Implements hook_form_FORM_ID_alter().
- *
- * @see form_test_state_persist()
- */
-function form_test_form_form_test_state_persist_alter(&$form, FormStateInterface $form_state) {
-  // Simulate a form alter implementation inserting form elements that enable
-  // caching of the form, e.g. elements having #ajax.
-  if (\Drupal::request()->get('cache')) {
-    $form_state->setCached();
-  }
-}
-
 /**
  * Implements hook_form_FORM_ID_alter() for the registration form.
  */
diff --git a/core/modules/system/tests/modules/form_test/src/Form/FormTestStorageForm.php b/core/modules/system/tests/modules/form_test/src/Form/FormTestStorageForm.php
index 9510ef4f7..7f6255772 100644
--- a/core/modules/system/tests/modules/form_test/src/Form/FormTestStorageForm.php
+++ b/core/modules/system/tests/modules/form_test/src/Form/FormTestStorageForm.php
@@ -82,17 +82,33 @@ class FormTestStorageForm extends FormBase {
       '#value' => 'Save',
     );
 
-    if (\Drupal::request()->get('cache')) {
+    // @todo Remove this in https://www.drupal.org/node/2524408, because form
+    //   cache immutability is no longer necessary, because we no longer cache
+    //   forms during safe HTTP methods. In the meantime, because
+    //   Drupal\system\Tests\Form still has test coverage for a poisoned form
+    //   cache following a GET request, trick $form_state into caching the form
+    //   to keep that test working until we either remove it or change it in
+    //   that issue.
+    if ($this->getRequest()->get('immutable')) {
+      $form_state->addBuildInfo('immutable', TRUE);
+      if ($this->getRequest()->get('cache') && $this->getRequest()->isMethodSafe()) {
+        $form_state->setRequestMethod('FAKE');
+        $form_state->setCached();
+      }
+    }
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function validateForm(array &$form, FormStateInterface $form_state) {
+    if ($this->getRequest()->get('cache')) {
       // Manually activate caching, so we can test that the storage keeps working
       // when it's enabled.
       $form_state->setCached();
     }
-
-    if ($this->getRequest()->get('immutable')) {
-      $form_state->addBuildInfo('immutable', TRUE);
-    }
-
-    return $form;
   }
 
   /**
@@ -105,7 +121,7 @@ class FormTestStorageForm extends FormBase {
     // This presumes that another submitted form value triggers a validation error
     // elsewhere in the form. Form API should still update the cached form storage
     // though.
-    if (\Drupal::request()->get('cache') && $form_state->getValue('value') == 'change_title') {
+    if ($this->getRequest()->get('cache') && $form_state->getValue('value') == 'change_title') {
       $form_state->set(['thing', 'changed'], TRUE);
     }
   }
diff --git a/core/modules/system/tests/modules/form_test/src/Form/FormTestStoragePageCacheForm.php b/core/modules/system/tests/modules/form_test/src/Form/FormTestStoragePageCacheForm.php
index e8eef2272..9f3ab5aeb 100644
--- a/core/modules/system/tests/modules/form_test/src/Form/FormTestStoragePageCacheForm.php
+++ b/core/modules/system/tests/modules/form_test/src/Form/FormTestStoragePageCacheForm.php
@@ -48,7 +48,6 @@ class FormTestStoragePageCacheForm extends FormBase {
     );
 
     $form['#after_build'] = array(array($this, 'form_test_storage_page_cache_old_build_id'));
-    $form_state->setCached();
 
     return $form;
   }
@@ -70,6 +69,17 @@ class FormTestStoragePageCacheForm extends FormBase {
     $form_state->setRebuild();
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function validateForm(array &$form, FormStateInterface $form_state) {
+    // Test using form cache when re-displaying a form due to validation
+    // errors.
+    if ($form_state->hasAnyErrors()) {
+      $form_state->setCached();
+    }
+  }
+
   /**
    * {@inheritdoc}
    */
diff --git a/core/modules/system/tests/modules/form_test/src/Form/FormTestValidateForm.php b/core/modules/system/tests/modules/form_test/src/Form/FormTestValidateForm.php
index e403887ee..100e4f85f 100644
--- a/core/modules/system/tests/modules/form_test/src/Form/FormTestValidateForm.php
+++ b/core/modules/system/tests/modules/form_test/src/Form/FormTestValidateForm.php
@@ -49,10 +49,6 @@ class FormTestValidateForm extends FormBase {
       '#value' => 'Save',
     );
 
-    // To simplify this test, enable form caching and use form storage to
-    // remember our alteration.
-    $form_state->setCached();
-
     return $form;
   }
 
@@ -70,6 +66,10 @@ class FormTestValidateForm extends FormBase {
 
       // Trigger a form validation error to see our changes.
       $form_state->setErrorByName('');
+
+      // To simplify this test, enable form caching and use form storage to
+      // remember our alteration.
+      $form_state->setCached();
     }
   }
 
diff --git a/core/modules/system/tests/modules/menu_test/menu_test.links.action.yml b/core/modules/system/tests/modules/menu_test/menu_test.links.action.yml
index 24c92a2c0..c7529900c 100644
--- a/core/modules/system/tests/modules/menu_test/menu_test.links.action.yml
+++ b/core/modules/system/tests/modules/menu_test/menu_test.links.action.yml
@@ -26,6 +26,22 @@ menu_test.local_action4:
   appears_on:
     - menu_test.local_action1
 
+menu_test.local_action_derivative:
+  route_name: menu_test.local_action4
+  weight: -20
+  deriver: Drupal\menu_test\Plugin\Derivative\LocalActionTest
+  class: Drupal\Core\Menu\LocalActionDefault
+  appears_on:
+    - menu_test.local_action1
+
+menu_test.local_action6:
+  route_name: menu_test.local_action4
+  title: 'Dynamic local action with user input'
+  weight: -15
+  class: '\Drupal\menu_test\Plugin\Menu\LocalAction\TestLocalAction5'
+  appears_on:
+    - menu_test.local_action1
+
 menu_test.hidden_menu_add:
   route_name: menu_test.hidden_menu_add
   title: 'Add menu'
diff --git a/core/modules/system/tests/modules/menu_test/menu_test.links.contextual.yml b/core/modules/system/tests/modules/menu_test/menu_test.links.contextual.yml
index b2d8e47e0..9a8d8adca 100644
--- a/core/modules/system/tests/modules/menu_test/menu_test.links.contextual.yml
+++ b/core/modules/system/tests/modules/menu_test/menu_test.links.contextual.yml
@@ -1,12 +1,13 @@
-menu_test.hidden_manage:
-  title: 'List links'
+menu_test.contextual_hidden_manage:
+  title: 'List links - contextual'
   group: menu_test_menu
-  route_name: menu_test.hidden_manage
+  route_name: menu_test.contextual_hidden_manage
+  class: '\Drupal\menu_test\Plugin\Menu\ContextualLink\TestContextualLink'
 
-menu_test.hidden_manage_edit:
-  title: 'Edit menu'
+menu_test.contextual_hidden_manage_edit:
+  title: 'Edit menu - contextual'
   group: menu_test_menu
-  route_name: menu_test.hidden_manage_edit
+  route_name: menu_test.contextual_hidden_manage_edit
 
 menu_test.hidden_block_configure:
   title: 'Configure block'
diff --git a/core/modules/system/tests/modules/menu_test/menu_test.links.menu.yml b/core/modules/system/tests/modules/menu_test/menu_test.links.menu.yml
index 914fbd5e1..613bc9211 100644
--- a/core/modules/system/tests/modules/menu_test/menu_test.links.menu.yml
+++ b/core/modules/system/tests/modules/menu_test/menu_test.links.menu.yml
@@ -79,3 +79,7 @@ menu_test.child:
   title: 'Test menu_name child'
   route_name: menu_test.menu_name_test
   parent: menu_test.parent
+
+menu_test.unsafe:
+  route_name: menu_test.menu_name_test
+  deriver: '\Drupal\menu_test\Plugin\Derivative\MenuLinkTestWithUnsafeTitle'
diff --git a/core/modules/system/tests/modules/menu_test/menu_test.links.task.yml b/core/modules/system/tests/modules/menu_test/menu_test.links.task.yml
index c8cd284ee..cda0f5a73 100644
--- a/core/modules/system/tests/modules/menu_test/menu_test.links.task.yml
+++ b/core/modules/system/tests/modules/menu_test/menu_test.links.task.yml
@@ -10,6 +10,10 @@ menu_test.local_task_test_tasks_settings:
   route_name: menu_test.local_task_test_tasks_settings
   title: Settings
   base_route: menu_test.local_task_test_tasks_view
+menu_test.local_task_test_tasks_settings_dynamic:
+  route_name: menu_test.local_task_test_tasks_settings_dynamic
+  base_route: menu_test.local_task_test_tasks_view
+  class: \Drupal\menu_test\Plugin\Menu\LocalTask\TestTaskWithUserInput
 menu_test.local_task_test_tasks_settings_sub1:
   route_name: menu_test.local_task_test_tasks_settings_sub1
   title: sub1
@@ -53,6 +57,11 @@ menu_test.tasks_default_tab:
   route_name: menu_test.tasks_default
   title: 'View'
   base_route: menu_test.tasks_default
+menu_test.tasks_default_derived:
+  route_name: menu_test.router_test1
+  title: 'Derived'
+  base_route: menu_test.tasks_default
+  deriver: '\Drupal\menu_test\Plugin\Derivative\LocalTaskTestWithUnsafeTitle'
 
 menu_test.tasks_tasks_tab:
   route_name: menu_test.tasks_tasks
@@ -82,3 +91,8 @@ menu_test.router_test3:
   route_name: menu_test.router_test3
   title: 'Local task C'
   base_route: menu_test.router_test1
+
+menu_test.router_test4:
+  route_name: menu_test.router_test4
+  base_route: menu_test.router_test1
+  class: \Drupal\menu_test\Plugin\Menu\LocalTask\TestTaskWithUserInput
diff --git a/core/modules/system/tests/modules/menu_test/menu_test.module b/core/modules/system/tests/modules/menu_test/menu_test.module
index ec916cb23..429b3573c 100644
--- a/core/modules/system/tests/modules/menu_test/menu_test.module
+++ b/core/modules/system/tests/modules/menu_test/menu_test.module
@@ -5,6 +5,8 @@
  * Module that implements various hooks for menu tests.
  */
 
+use Drupal\Core\Url;
+
 /**
  * Implements hook_menu_links_discovered_alter().
  */
@@ -26,20 +28,14 @@ function menu_test_menu_links_discovered_alter(&$links) {
 
 /**
  * Implements hook_menu_local_tasks().
- *
- * If the menu_test.settings configuration 'tasks.add' has been set, adds
- * several local tasks to menu-test/tasks.
  */
 function menu_test_menu_local_tasks(&$data, $route_name) {
-  if (!\Drupal::config('menu_test.settings')->get('tasks.add')) {
-    return;
-  }
-  if (in_array($route_name, array('menu_test.tasks_default', 'menu_test.tasks_empty', 'menu_test.tasks_tasks'))) {
+  if (in_array($route_name, array('menu_test.tasks_default'))) {
     $data['tabs'][0]['foo'] = array(
       '#theme' => 'menu_local_task',
       '#link' => array(
-        'title' => 'Task 1',
-        'href' => 'task/foo',
+        'title' => "Task 1 <script>alert('Welcome to the jungle!')</script>",
+        'url' => Url::fromRoute('menu_test.router_test1', array('bar' => '1')),
       ),
       '#weight' => 10,
     );
@@ -47,7 +43,7 @@ function menu_test_menu_local_tasks(&$data, $route_name) {
       '#theme' => 'menu_local_task',
       '#link' => array(
         'title' => 'Task 2',
-        'href' => 'task/bar',
+        'url' => Url::fromRoute('menu_test.router_test2', array('bar' => '2')),
       ),
       '#weight' => 20,
     );
diff --git a/core/modules/system/tests/modules/menu_test/menu_test.routing.yml b/core/modules/system/tests/modules/menu_test/menu_test.routing.yml
index 33a337b6d..b69d72259 100644
--- a/core/modules/system/tests/modules/menu_test/menu_test.routing.yml
+++ b/core/modules/system/tests/modules/menu_test/menu_test.routing.yml
@@ -67,6 +67,13 @@ menu_test.router_test3:
   requirements:
     _access: 'FALSE'
 
+menu_test.router_test4:
+  path: '/foo/{bar}/d'
+  defaults:
+    _controller: '\Drupal\menu_test\TestControllers::test2'
+  requirements:
+    _access: 'TRUE'
+
 menu_test.local_action1:
   path: '/menu-test-local-action'
   defaults:
@@ -102,6 +109,27 @@ menu_test.local_action5:
   requirements:
     _access: 'TRUE'
 
+menu_test.contextual_test:
+  path: '/menu-test-contextual/default'
+  defaults:
+    _controller: '\Drupal\menu_test\TestControllers::testContextual'
+  requirements:
+    _access: 'TRUE'
+
+menu_test.contextual_hidden_manage:
+  path: '/menu-test-contextual/{bar}'
+  defaults:
+    _controller: '\Drupal\menu_test\TestControllers::test1'
+  requirements:
+    _access: 'TRUE'
+
+menu_test.contextual_hidden_manage_edit:
+  path: '/menu-test-contextual/{bar}/edit'
+  defaults:
+    _controller: '\Drupal\menu_test\TestControllers::test2'
+  requirements:
+    _access: 'TRUE'
+
 menu_test.local_task_test_tasks:
   path: '/menu-local-task-test/tasks'
   defaults:
@@ -109,6 +137,13 @@ menu_test.local_task_test_tasks:
   requirements:
     _access: 'TRUE'
 
+menu_test.tasks_default:
+  path: '/menu-local-task-test/default'
+  defaults:
+    _controller: '\Drupal\menu_test\TestControllers::test1'
+  requirements:
+    _access: 'TRUE'
+
 menu_test.local_task_test_tasks_tasks:
   path: '/menu-local-task-test/tasks/tasks'
   defaults:
@@ -137,6 +172,13 @@ menu_test.local_task_test_tasks_settings:
   requirements:
     _access: 'TRUE'
 
+menu_test.local_task_test_tasks_settings_dynamic:
+  path: '/menu-local-task-test/tasks/settings-dynamic'
+  defaults:
+    _controller: '\Drupal\menu_test\TestControllers::test1'
+  requirements:
+    _access: 'TRUE'
+
 menu_test.local_task_test_tasks_settings_sub1:
   path: '/menu-local-task-test/tasks/settings/sub1'
   defaults:
diff --git a/core/modules/system/tests/modules/menu_test/src/Plugin/Derivative/LocalActionTest.php b/core/modules/system/tests/modules/menu_test/src/Plugin/Derivative/LocalActionTest.php
new file mode 100644
index 000000000..729519a50
--- /dev/null
+++ b/core/modules/system/tests/modules/menu_test/src/Plugin/Derivative/LocalActionTest.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\menu_test\Plugin\Derivative\LocalActionTest.
+ */
+
+namespace Drupal\menu_test\Plugin\Derivative;
+
+use Drupal\Component\Plugin\Derivative\DeriverBase;
+
+/**
+ * Test derivative to check local action title escaping.
+ *
+ * @see \Drupal\system\Tests\Menu\LocalActionTest
+ */
+class LocalActionTest extends DeriverBase {
+
+  /**
+   * @inheritDoc
+   */
+  public function getDerivativeDefinitions($base_plugin_definition) {
+    $this->derivatives['example'] = $base_plugin_definition + [
+      'title' => "<script>alert('Welcome to the derived jungle!')</script>",
+    ];
+
+    return $this->derivatives;
+  }
+
+}
diff --git a/core/modules/system/tests/modules/menu_test/src/Plugin/Derivative/LocalTaskTestWithUnsafeTitle.php b/core/modules/system/tests/modules/menu_test/src/Plugin/Derivative/LocalTaskTestWithUnsafeTitle.php
new file mode 100644
index 000000000..af6ff917e
--- /dev/null
+++ b/core/modules/system/tests/modules/menu_test/src/Plugin/Derivative/LocalTaskTestWithUnsafeTitle.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\menu_test\Plugin\Derivative\LocalTaskTestWithUnsafeTitle.
+ */
+
+namespace Drupal\menu_test\Plugin\Derivative;
+
+use Drupal\Component\Plugin\Derivative\DeriverBase;
+
+/**
+ * Test derivative to check local task title escaping.
+ *
+ * @see \Drupal\system\Tests\Menu\LocalTasksTest
+ */
+class LocalTaskTestWithUnsafeTitle extends DeriverBase {
+
+  /**
+   * @inheritDoc
+   */
+  public function getDerivativeDefinitions($base_plugin_definition) {
+    $this->derivatives['unsafe'] = [
+      'title' => "<script>alert('Welcome to the derived jungle!')</script>",
+      'route_parameters' => ['bar' => 'unsafe'],
+    ] + $base_plugin_definition;
+
+    return $this->derivatives;
+  }
+
+}
diff --git a/core/modules/system/tests/modules/menu_test/src/Plugin/Derivative/MenuLinkTestWithUnsafeTitle.php b/core/modules/system/tests/modules/menu_test/src/Plugin/Derivative/MenuLinkTestWithUnsafeTitle.php
new file mode 100644
index 000000000..8ddd86ac5
--- /dev/null
+++ b/core/modules/system/tests/modules/menu_test/src/Plugin/Derivative/MenuLinkTestWithUnsafeTitle.php
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\menu_test\Plugin\Derivative\MenuLinkTestWithUnsafeTitle.
+ */
+
+namespace Drupal\menu_test\Plugin\Derivative;
+
+use Drupal\Component\Plugin\Derivative\DeriverBase;
+
+/**
+ * Test derivative with an unsafe string.
+ */
+class MenuLinkTestWithUnsafeTitle extends DeriverBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getDerivativeDefinitions($base_plugin_definition) {
+    $this->derivatives['unsafe'] = [
+        'title' => '<script>alert("Even more wild animals")</script>',
+        'menu_name' => 'tools',
+      ] + $base_plugin_definition;
+
+    return $this->derivatives;
+  }
+
+}
diff --git a/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/ContextualLink/TestContextualLink.php b/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/ContextualLink/TestContextualLink.php
new file mode 100644
index 000000000..fde09e207
--- /dev/null
+++ b/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/ContextualLink/TestContextualLink.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\menu_test\Plugin\Menu\ContextualLink\TestContextualLink.
+ */
+
+namespace Drupal\menu_test\Plugin\Menu\ContextualLink;
+
+use Drupal\Core\Menu\ContextualLinkDefault;
+
+/**
+ * Defines a contextual link plugin with a dynamic title from user input.
+ */
+class TestContextualLink extends ContextualLinkDefault {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getTitle() {
+    return "<script>alert('Welcome to the jungle!')</script>";
+  }
+
+}
diff --git a/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalAction/TestLocalAction4.php b/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalAction/TestLocalAction4.php
index 3f9a44e1c..a40af0cbd 100644
--- a/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalAction/TestLocalAction4.php
+++ b/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalAction/TestLocalAction4.php
@@ -8,12 +8,15 @@
 namespace Drupal\menu_test\Plugin\Menu\LocalAction;
 
 use Drupal\Core\Menu\LocalActionDefault;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
 
 /**
  * Defines a local action plugin with a dynamic title.
  */
 class TestLocalAction4 extends LocalActionDefault {
 
+  use StringTranslationTrait;
+
   /**
    * {@inheritdoc}
    */
diff --git a/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalAction/TestLocalAction5.php b/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalAction/TestLocalAction5.php
new file mode 100644
index 000000000..c39f1d461
--- /dev/null
+++ b/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalAction/TestLocalAction5.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\menu_test\Plugin\Menu\LocalAction\TestLocalAction5.
+ */
+
+namespace Drupal\menu_test\Plugin\Menu\LocalAction;
+
+use Drupal\Core\Menu\LocalActionDefault;
+
+/**
+ * Defines a local action plugin with a dynamic title from user input.
+ */
+class TestLocalAction5 extends LocalActionDefault {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getTitle() {
+    return "<script>alert('Welcome to the jungle!')</script>";
+  }
+
+}
diff --git a/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalTask/TestTaskWithUserInput.php b/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalTask/TestTaskWithUserInput.php
new file mode 100644
index 000000000..6ef610220
--- /dev/null
+++ b/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalTask/TestTaskWithUserInput.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\menu_test\Plugin\Menu\LocalTask\TestTaskWithUserInput.
+ */
+
+namespace Drupal\menu_test\Plugin\Menu\LocalTask;
+
+use Drupal\Core\Menu\LocalTaskDefault;
+use Symfony\Component\HttpFoundation\Request;
+
+class TestTaskWithUserInput extends LocalTaskDefault {
+
+  /**
+   * @inheritDoc
+   */
+  public function getTitle(Request $request = NULL) {
+    return "<script>alert('Welcome to the jungle!')</script>";
+  }
+
+}
diff --git a/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalTask/TestTasksSettingsSub1.php b/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalTask/TestTasksSettingsSub1.php
index ee5d59499..67f0427aa 100644
--- a/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalTask/TestTasksSettingsSub1.php
+++ b/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalTask/TestTasksSettingsSub1.php
@@ -8,9 +8,12 @@
 namespace Drupal\menu_test\Plugin\Menu\LocalTask;
 
 use Drupal\Core\Menu\LocalTaskDefault;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
 
 class TestTasksSettingsSub1 extends LocalTaskDefault {
 
+  use StringTranslationTrait;
+
   /**
    * {@inheritdoc}
    */
diff --git a/core/modules/system/tests/modules/menu_test/src/TestControllers.php b/core/modules/system/tests/modules/menu_test/src/TestControllers.php
index 836415c90..f3ff8d2a3 100644
--- a/core/modules/system/tests/modules/menu_test/src/TestControllers.php
+++ b/core/modules/system/tests/modules/menu_test/src/TestControllers.php
@@ -61,4 +61,20 @@ class TestControllers {
     }
   }
 
+  /**
+   * Prints out test data with contextual links.
+   */
+  public function testContextual() {
+    return [
+      '#markup' => 'testContextual',
+      'stuff' => [
+        '#type' => 'contextual_links',
+        '#contextual_links' => [
+          'menu_test_menu' => [
+            'route_parameters' => ['bar' => 1],
+          ]
+        ]
+      ]
+    ];
+  }
 }
diff --git a/core/modules/system/tests/modules/module_installer_config_test/config/install/module_installer_config_test.type.missing_id.yml b/core/modules/system/tests/modules/module_installer_config_test/config/install/module_installer_config_test.type.missing_id.yml
new file mode 100644
index 000000000..4628b97d0
--- /dev/null
+++ b/core/modules/system/tests/modules/module_installer_config_test/config/install/module_installer_config_test.type.missing_id.yml
@@ -0,0 +1,3 @@
+# This entity is intentionally missing an 'id' key. During installation, an
+# EntityMalformedException should be thrown about the missing key.
+name: 'This entity does not have an ID'
diff --git a/core/modules/system/tests/modules/module_installer_config_test/config/schema/module_installer_config_test.schema.yml b/core/modules/system/tests/modules/module_installer_config_test/config/schema/module_installer_config_test.schema.yml
new file mode 100644
index 000000000..cb39936d7
--- /dev/null
+++ b/core/modules/system/tests/modules/module_installer_config_test/config/schema/module_installer_config_test.schema.yml
@@ -0,0 +1,10 @@
+module_installer_config_test.type.*:
+  type: config_entity
+  label: 'Test entity type'
+  mapping:
+    id:
+      type: string
+    name:
+      type: label
+      label: 'Name'
+
diff --git a/core/modules/system/tests/modules/module_installer_config_test/module_installer_config_test.info.yml b/core/modules/system/tests/modules/module_installer_config_test/module_installer_config_test.info.yml
new file mode 100644
index 000000000..78f3d88e0
--- /dev/null
+++ b/core/modules/system/tests/modules/module_installer_config_test/module_installer_config_test.info.yml
@@ -0,0 +1,7 @@
+name: 'Module installer config test'
+description: 'Support module for tests that require a failed module install.'
+type: module
+package: Testing
+core: 8.x
+version: VERSION
+
diff --git a/core/modules/system/tests/modules/module_installer_config_test/src/Entity/TestConfigType.php b/core/modules/system/tests/modules/module_installer_config_test/src/Entity/TestConfigType.php
new file mode 100644
index 000000000..cddb92eda
--- /dev/null
+++ b/core/modules/system/tests/modules/module_installer_config_test/src/Entity/TestConfigType.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\module_installer_config_test\Entity\TestConfigType.
+ */
+
+namespace Drupal\module_installer_config_test\Entity;
+
+use Drupal\Core\Config\Entity\ConfigEntityBase;
+
+/**
+ * Defines a configuration-based entity type used for testing.
+ *
+ * @ConfigEntityType(
+ *   id = "test_config_type",
+ *   label = @Translation("Test entity type"),
+ *   handlers = {
+ *     "list_builder" = "Drupal\Core\Entity\EntityListBuilder"
+ *   },
+ *   admin_permission = "administer modules",
+ *   config_prefix = "type",
+ *   entity_keys = {
+ *     "id" = "id",
+ *     "label" = "name"
+ *   }
+ * )
+ */
+class TestConfigType extends ConfigEntityBase {
+}
diff --git a/core/modules/system/tests/modules/pager_test/src/Controller/PagerTestController.php b/core/modules/system/tests/modules/pager_test/src/Controller/PagerTestController.php
index 004603f24..7f03636b2 100644
--- a/core/modules/system/tests/modules/pager_test/src/Controller/PagerTestController.php
+++ b/core/modules/system/tests/modules/pager_test/src/Controller/PagerTestController.php
@@ -69,7 +69,7 @@ class PagerTestController extends ControllerBase {
    * #pre_render callback for #type => pager that shows the pager cache context.
    */
   public static function showPagerCacheContext(array $pager) {
-    drupal_set_message(\Drupal::service('cache_contexts_manager')->convertTokensToKeys(['url.query_args.pagers:' . $pager['#element']])[0]);
+    drupal_set_message(\Drupal::service('cache_contexts_manager')->convertTokensToKeys(['url.query_args.pagers:' . $pager['#element']])->getKeys()[0]);
     return $pager;
   }
 
diff --git a/core/modules/system/tests/modules/router_test_directory/router_test.routing.yml b/core/modules/system/tests/modules/router_test_directory/router_test.routing.yml
index 5debfc219..e0c91ddec 100644
--- a/core/modules/system/tests/modules/router_test_directory/router_test.routing.yml
+++ b/core/modules/system/tests/modules/router_test_directory/router_test.routing.yml
@@ -141,6 +141,20 @@ router_test.22:
   requirements:
     _role: 'anonymous'
 
+router_test.23:
+  path: '/router_test/test23'
+  defaults:
+    _controller: '\Drupal\router_test\TestControllers::test23'
+  requirements:
+    _access: 'TRUE'
+
+router_test.24:
+  path: '/router_test/test24'
+  defaults:
+    _controller: '\Drupal\router_test\TestControllers::test24'
+  requirements:
+    _access: 'TRUE'
+
 router_test.hierarchy_parent:
   path: '/menu-test/parent'
   defaults:
diff --git a/core/modules/system/tests/modules/router_test_directory/src/TestControllers.php b/core/modules/system/tests/modules/router_test_directory/src/TestControllers.php
index 614c9a850..40fad0b0f 100644
--- a/core/modules/system/tests/modules/router_test_directory/src/TestControllers.php
+++ b/core/modules/system/tests/modules/router_test_directory/src/TestControllers.php
@@ -12,6 +12,8 @@ use Drupal\Core\ParamConverter\ParamNotConvertedException;
 use Drupal\user\UserInterface;
 use Symfony\Cmf\Component\Routing\RouteObjectInterface;
 use Symfony\Component\HttpFoundation\Response;
+use Zend\Diactoros\Response\HtmlResponse;
+
 
 /**
  * Controller routines for testing the routing system.
@@ -74,14 +76,7 @@ class TestControllers {
    * This can be used to test if the generated backtrace is properly escaped.
    */
   public function test10() {
-    // Remove the exception logger from the event dispatcher. We are going to
-    // throw an exception to check if it is properly escaped when rendered as a
-    // backtrace. The exception logger does a call to error_log() which is not
-    // handled by the Simpletest error handler and would cause a test failure.
-    $event_dispatcher = \Drupal::service('event_dispatcher');
-    $exception_logger = \Drupal::service('exception.logger');
-    $event_dispatcher->removeSubscriber($exception_logger);
-
+    $this->removeExceptionLogger();
     $this->throwException('<script>alert(\'xss\')</script>');
   }
 
@@ -102,6 +97,15 @@ class TestControllers {
     return new CacheableResponse('test21');
   }
 
+  public function test23() {
+    return new HtmlResponse('test23');
+  }
+
+  public function test24() {
+    $this->removeExceptionLogger();
+    throw new \Exception('Escaped content: <p> <br> <h3>');
+  }
+
   /**
    * Throws an exception.
    *
@@ -115,4 +119,14 @@ class TestControllers {
     throw new \Exception($message);
   }
 
+  protected function removeExceptionLogger() {
+    // Remove the exception logger from the event dispatcher. We are going to
+    // throw an exception to check if it is properly escaped when rendered as a
+    // backtrace. The exception logger does a call to error_log() which is not
+    // handled by the Simpletest error handler and would cause a test failure.
+    $event_dispatcher = \Drupal::service('event_dispatcher');
+    $exception_logger = \Drupal::service('exception.logger');
+    $event_dispatcher->removeSubscriber($exception_logger);
+  }
+
 }
diff --git a/core/modules/system/tests/modules/service_provider_test/src/ServiceProviderTestServiceProvider.php b/core/modules/system/tests/modules/service_provider_test/src/ServiceProviderTestServiceProvider.php
index 9e2188394..700c2ce39 100644
--- a/core/modules/system/tests/modules/service_provider_test/src/ServiceProviderTestServiceProvider.php
+++ b/core/modules/system/tests/modules/service_provider_test/src/ServiceProviderTestServiceProvider.php
@@ -26,5 +26,9 @@ class ServiceProviderTestServiceProvider implements ServiceModifierInterface {
     if ($indicator = Settings::get('deployment_identifier')) {
       $container->setParameter('container_rebuild_indicator', $indicator);
     }
+
+    if ($parameter = Settings::get('container_rebuild_test_parameter')) {
+      $container->setParameter('container_rebuild_test_parameter', $parameter);
+    }
   }
 }
diff --git a/core/modules/system/tests/modules/service_provider_test/src/TestClass.php b/core/modules/system/tests/modules/service_provider_test/src/TestClass.php
index cbbe773ea..bec97d230 100644
--- a/core/modules/system/tests/modules/service_provider_test/src/TestClass.php
+++ b/core/modules/system/tests/modules/service_provider_test/src/TestClass.php
@@ -51,6 +51,9 @@ class TestClass implements EventSubscriberInterface, DestructableInterface, Cont
     if ($this->container->hasParameter('container_rebuild_indicator')) {
       $event->getResponse()->headers->set('container_rebuild_indicator', $this->container->getParameter('container_rebuild_indicator'));
     }
+    if ($this->container->hasParameter('container_rebuild_test_parameter')) {
+      $event->getResponse()->headers->set('container_rebuild_test_parameter', $this->container->getParameter('container_rebuild_test_parameter'));
+    }
   }
 
   /**
diff --git a/core/modules/system/tests/modules/session_test/session_test.routing.yml b/core/modules/system/tests/modules/session_test/session_test.routing.yml
index b2ef74f8b..84978c947 100644
--- a/core/modules/system/tests/modules/session_test/session_test.routing.yml
+++ b/core/modules/system/tests/modules/session_test/session_test.routing.yml
@@ -3,6 +3,8 @@ session_test.get:
   defaults:
     _title: 'Session value'
     _controller: '\Drupal\session_test\Controller\SessionTestController::get'
+  options:
+    no_cache: TRUE
   requirements:
     _access: 'TRUE'
 session_test.get_from_session_object:
@@ -10,6 +12,8 @@ session_test.get_from_session_object:
   defaults:
     _title: 'Session value'
     _controller: '\Drupal\session_test\Controller\SessionTestController::getFromSessionObject'
+  options:
+    no_cache: TRUE
   requirements:
     _access: 'TRUE'
 session_test.id:
@@ -17,6 +21,8 @@ session_test.id:
   defaults:
     _title: 'Session ID'
     _controller: '\Drupal\session_test\Controller\SessionTestController::getId'
+  options:
+    no_cache: TRUE
   requirements:
     _access: 'TRUE'
 
@@ -34,6 +40,7 @@ session_test.set:
     _title: 'Set session value'
     _controller: '\Drupal\session_test\Controller\SessionTestController::set'
   options:
+    no_cache: TRUE
     converters:
       test_value: '\s+'
   requirements:
@@ -45,6 +52,7 @@ session_test.no_set:
     _title: 'Set session value but do not save session'
     _controller: '\Drupal\session_test\Controller\SessionTestController::noSet'
   options:
+    no_cache: TRUE
     converters:
       test_value: '\s+'
   requirements:
@@ -96,6 +104,7 @@ session_test.get_session_basic_auth:
     _title: 'Get session information using basic authentication'
     _controller: '\Drupal\session_test\Controller\SessionTestController::getSession'
   options:
+    no_cache: TRUE
     _auth: ['basic_auth']
   requirements:
     _permission: 'administer site configuration'
@@ -105,6 +114,8 @@ session_test.get_session_no_auth:
   defaults:
     _title: 'Get session information'
     _controller: '\Drupal\session_test\Controller\SessionTestController::getSession'
+  options:
+    no_cache: TRUE
   requirements:
     _access: 'TRUE'
 
@@ -114,6 +125,7 @@ session_test.set_session:
     _title: 'Set a session value using basic authentication'
     _controller: '\Drupal\session_test\Controller\SessionTestController::setSession'
   options:
+    no_cache: TRUE
     _auth: ['basic_auth']
     converters:
       test_value: '\s+'
diff --git a/core/modules/system/tests/modules/session_test/src/Controller/SessionTestController.php b/core/modules/system/tests/modules/session_test/src/Controller/SessionTestController.php
index 510b36f99..4e4954fbd 100644
--- a/core/modules/system/tests/modules/session_test/src/Controller/SessionTestController.php
+++ b/core/modules/system/tests/modules/session_test/src/Controller/SessionTestController.php
@@ -75,7 +75,7 @@ class SessionTestController extends ControllerBase {
    *   A notification message with session ID.
    */
   public function getIdFromCookie(Request $request) {
-    return ['#markup' => 'session_id:' . $request->cookies->get(session_name()) . "\n"];
+    return ['#markup' => 'session_id:' . $request->cookies->get(session_name()) . "\n", '#cache' => ['contexts' => ['cookies:' . session_name()]]];
   }
 
   /**
diff --git a/core/modules/system/tests/modules/system_test/src/system_test.permissions.yml b/core/modules/system/tests/modules/system_test/src/system_test.permissions.yml
deleted file mode 100644
index 936226c43..000000000
--- a/core/modules/system/tests/modules/system_test/src/system_test.permissions.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-pet llamas:
-  title: 'Pet llamas'
-  description: 'Petting of llamas.'
diff --git a/core/modules/system/tests/modules/system_test/system_test.module b/core/modules/system/tests/modules/system_test/system_test.module
index fb1538d60..eef351689 100644
--- a/core/modules/system/tests/modules/system_test/system_test.module
+++ b/core/modules/system/tests/modules/system_test/system_test.module
@@ -1,6 +1,20 @@
 <?php
 
 use Drupal\Core\Extension\Extension;
+use Drupal\Core\Routing\RouteMatchInterface;
+
+/**
+ * Implements hook_help().
+ */
+function system_test_help($route_name, RouteMatchInterface $route_match) {
+  switch ($route_name) {
+    case 'help.page.system_test':
+      $output = '';
+      $output .= '<h3>' . t('Test Help Page') . '</h3>';
+      $output .= '<p>' . t('This is a test help page for the system_test module for the purpose of testing if the "Help" link displays properly.') . '</p>';
+      return $output;
+  }
+}
 
 /**
  * Implements hook_modules_installed().
diff --git a/core/modules/system/tests/modules/system_test/system_test.permissions.yml b/core/modules/system/tests/modules/system_test/system_test.permissions.yml
new file mode 100644
index 000000000..8faa5789e
--- /dev/null
+++ b/core/modules/system/tests/modules/system_test/system_test.permissions.yml
@@ -0,0 +1,2 @@
+system test:
+  title: 'Administer system test'
diff --git a/core/modules/system/tests/modules/test_page_test/src/Controller/Test.php b/core/modules/system/tests/modules/test_page_test/src/Controller/Test.php
index 9c56ae2b3..b0d4136b3 100644
--- a/core/modules/system/tests/modules/test_page_test/src/Controller/Test.php
+++ b/core/modules/system/tests/modules/test_page_test/src/Controller/Test.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\test_page_test\Controller;
 
+use Drupal\Component\Utility\SafeMarkup;
+
 /**
  * Defines a test controller for page titles.
  */
@@ -49,6 +51,26 @@ class Test {
     return 'Dynamic title';
   }
 
+  /**
+   * Defines a controller with a cached render array.
+   *
+   * @param bool $mark_safe
+   *   Whether or not to mark the title as safe use SafeMarkup::checkPlain.
+   *
+   * @return array
+   *   A render array
+   */
+  public function controllerWithCache($mark_safe = FALSE) {
+    $build = [];
+    $build['#title'] = '<span>Cached title</span>';
+    if ($mark_safe) {
+      $build['#title'] = SafeMarkup::checkPlain($build['#title']);
+    }
+    $build['#cache']['keys'] = ['test_controller', 'with_title', $mark_safe];
+
+    return $build;
+  }
+
   /**
    * Returns a generic page render array for title tests.
    *
diff --git a/core/modules/system/tests/modules/test_page_test/test_page_test.routing.yml b/core/modules/system/tests/modules/test_page_test/test_page_test.routing.yml
index e54d84553..5330be824 100644
--- a/core/modules/system/tests/modules/test_page_test/test_page_test.routing.yml
+++ b/core/modules/system/tests/modules/test_page_test/test_page_test.routing.yml
@@ -21,6 +21,21 @@ test_page_test.static_title:
   requirements:
     _access: 'TRUE'
 
+test_page_test.cached_controller:
+  path: '/test-page-cached-controller'
+  defaults:
+    _controller: '\Drupal\test_page_test\Controller\Test::controllerWithCache'
+  requirements:
+    _access: 'TRUE'
+
+test_page_test.cached_controller.safe:
+  path: '/test-page-cached-controller-safe'
+  defaults:
+    _controller: '\Drupal\test_page_test\Controller\Test::controllerWithCache'
+    mark_safe: true
+  requirements:
+    _access: 'TRUE'
+
 test_page_test.dynamic_title:
   path: '/test-page-dynamic-title'
   defaults:
diff --git a/core/modules/system/tests/modules/token_test/src/Controller/TestController.php b/core/modules/system/tests/modules/token_test/src/Controller/TestController.php
new file mode 100644
index 000000000..76469af71
--- /dev/null
+++ b/core/modules/system/tests/modules/token_test/src/Controller/TestController.php
@@ -0,0 +1,86 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\token_test\Controller\TestController.
+ */
+
+namespace Drupal\token_test\Controller;
+
+
+use Drupal\Core\Controller\ControllerBase;
+use Drupal\Core\Render\BubbleableMetadata;
+use Drupal\Core\Utility\Token;
+use Drupal\node\NodeInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Provides a test controller for token replacement.
+ */
+class TestController extends ControllerBase {
+
+  /**
+   * The token replacement system.
+   *
+   * @var \Drupal\Core\Utility\Token
+   */
+  protected $token;
+
+  /**
+   * Constructs a new TestController instance.
+   *
+   * @param \Drupal\Core\Utility\Token $token
+   *   The token replacement system.
+   */
+  public function __construct(Token $token) {
+    $this->token = $token;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static($container->get('token'));
+  }
+
+  /**
+   * Provides a token replacement with a node as well as the current user.
+   *
+   * This controller passes an explicit bubbleable metadata object to
+   * $this->token->replace(), and applies the collected metadata to the render
+   * array being built.
+   *
+   * @param \Drupal\node\NodeInterface $node
+   *   The node.
+   *
+   * @return array
+   *   The render array.
+   */
+  public function tokenReplace(NodeInterface $node) {
+    $bubbleable_metadata = new BubbleableMetadata();
+    $build['#markup'] = $this->token->replace('Tokens: [node:nid] [current-user:uid]', ['node' => $node], [], $bubbleable_metadata);
+    $bubbleable_metadata->applyTo($build);
+
+    return $build;
+  }
+
+  /**
+   * Provides a token replacement with a node as well as the current user.
+   *
+   * This controller is for testing the token service's fallback behavior of
+   * applying collected metadata to the currently active render context when an
+   * explicit bubbleable metadata object isn't passed in.
+   *
+   * @param \Drupal\node\NodeInterface $node
+   *   The node.
+   *
+   * @return array
+   *   The render array.
+   */
+  public function tokenReplaceWithoutPassedBubbleableMetadata(NodeInterface $node) {
+    $build['#markup'] = $this->token->replace('Tokens: [node:nid] [current-user:uid]', ['node' => $node], []);
+
+    return $build;
+  }
+
+}
diff --git a/core/modules/system/tests/modules/token_test/token_test.info.yml b/core/modules/system/tests/modules/token_test/token_test.info.yml
new file mode 100644
index 000000000..e243f95d1
--- /dev/null
+++ b/core/modules/system/tests/modules/token_test/token_test.info.yml
@@ -0,0 +1,8 @@
+name: Token test
+type: module
+core: 8.x
+package: Testing
+version: VERSION
+dependencies:
+ - user
+ - node
diff --git a/core/modules/system/tests/modules/token_test/token_test.routing.yml b/core/modules/system/tests/modules/token_test/token_test.routing.yml
new file mode 100644
index 000000000..5fc239ad4
--- /dev/null
+++ b/core/modules/system/tests/modules/token_test/token_test.routing.yml
@@ -0,0 +1,12 @@
+token_test.test:
+  path: token-test/{node}
+  defaults:
+    _controller: Drupal\token_test\Controller\TestController::tokenReplace
+  requirements:
+    _access: 'TRUE'
+token_test.test_without_bubbleable_metadata:
+  path: token-test-without-bubleable-metadata/{node}
+  defaults:
+    _controller: Drupal\token_test\Controller\TestController::tokenReplaceWithoutPassedBubbleableMetadata
+  requirements:
+    _access: 'TRUE'
diff --git a/core/modules/system/tests/modules/twig_theme_test/src/TwigThemeTestController.php b/core/modules/system/tests/modules/twig_theme_test/src/TwigThemeTestController.php
index d49ebba43..dce85a38b 100644
--- a/core/modules/system/tests/modules/twig_theme_test/src/TwigThemeTestController.php
+++ b/core/modules/system/tests/modules/twig_theme_test/src/TwigThemeTestController.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\twig_theme_test;
 
+use Drupal\Core\Template\Attribute;
 use Drupal\Core\Url;
 
 /**
@@ -53,11 +54,14 @@ class TwigThemeTestController {
    * Renders for testing link_generator functions in a Twig template.
    */
   public function linkGeneratorRender() {
-    return array(
+    return [
       '#theme' => 'twig_theme_test_link_generator',
       '#test_url' => new Url('user.register', [], ['absolute' => TRUE]),
       '#test_url_attribute' => new Url('user.register', [], ['attributes' => ['foo' => 'bar']]),
-    );
+      // Explicitly creating an Attribute object to avoid false positives when
+      // testing Attribute object merging with the twig link() function.
+      '#attributes' => new Attribute(['class' => ['llama', 'kitten', 'panda']]),
+    ];
   }
 
   /**
diff --git a/core/modules/system/tests/modules/twig_theme_test/templates/twig_theme_test.link_generator.html.twig b/core/modules/system/tests/modules/twig_theme_test/templates/twig_theme_test.link_generator.html.twig
index 3fb846fa3..8925705be 100644
--- a/core/modules/system/tests/modules/twig_theme_test/templates/twig_theme_test.link_generator.html.twig
+++ b/core/modules/system/tests/modules/twig_theme_test/templates/twig_theme_test.link_generator.html.twig
@@ -2,3 +2,4 @@
 <div>link via the linkgenerator: {{ link('register', test_url, {'foo': 'bar'}) }}</div>
 <div>link via the linkgenerator: {{ link('register', test_url_attribute, {'id': 'kitten'}) }}</div>
 <div>link via the linkgenerator: {{ link('register', 'route:user.register', {'id': 'kitten'}) }}</div>
+<div>link via the linkgenerator: {{ link('register', 'route:user.register', attributes) }}</div>
diff --git a/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module b/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module
index d5e098ce0..52c0ef48c 100644
--- a/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module
+++ b/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module
@@ -43,7 +43,11 @@ function twig_theme_test_theme($existing, $type, $theme, $path) {
     'template' => 'twig_theme_test.url_generator',
   );
   $items['twig_theme_test_link_generator'] = array(
-    'variables' => array('test_url' => NULL, 'test_url_attribute' => NULL),
+    'variables' => [
+      'test_url' => NULL,
+      'test_url_attribute' => NULL,
+      'attributes' => [],
+    ],
     'template' => 'twig_theme_test.link_generator',
   );
   $items['twig_theme_test_url_to_string'] = array(
diff --git a/core/modules/system/tests/modules/update_order_test/update_order_test.info.yml b/core/modules/system/tests/modules/update_order_test/update_order_test.info.yml
new file mode 100644
index 000000000..22aa1795d
--- /dev/null
+++ b/core/modules/system/tests/modules/update_order_test/update_order_test.info.yml
@@ -0,0 +1,6 @@
+name: 'Update order test'
+type: module
+description: 'Support module for update testing.'
+package: Testing
+version: VERSION
+core: 8.x
diff --git a/core/modules/system/tests/modules/update_order_test/update_order_test.install b/core/modules/system/tests/modules/update_order_test/update_order_test.install
new file mode 100644
index 000000000..b35c6f42d
--- /dev/null
+++ b/core/modules/system/tests/modules/update_order_test/update_order_test.install
@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * @file
+ * Update hooks for the update_order_test module.
+ */
+
+use Drupal\Core\Entity\EntityDefinitionUpdateManagerInterface;
+
+/**
+ * Only declare the update hooks once the test is running.
+ *
+ * @see \Drupal\system\Tests\Entity\Update\SqlContentEntityStorageSchemaIndexTest
+ */
+if (\Drupal::state()->get('update_order_test', FALSE)) {
+
+  /**
+   * Runs before entity schema updates.
+   */
+  function update_order_test_update_8001() {
+    // Store whether the node__default_langcode index exists when this hook is
+    // invoked.
+    \Drupal::state()->set('update_order_test_update_8001', db_index_exists('node_field_data', 'node__default_langcode'));
+  }
+
+  /**
+   * Runs before entity schema updates.
+   */
+  function update_order_test_update_8002() {
+    // Check and store whether the update_order_test field exists when this
+    // hook is first invoked.
+    \Drupal::state()->set('update_order_test_update_8002_update_order_test_before', db_field_exists('node_field_data', 'update_order_test'));
+
+    // Attempt to apply the update for the update_order_test field and then
+    // check and store again whether it exists.
+    if (\Drupal::service('entity.definition_update_manager')->applyFieldUpdate(EntityDefinitionUpdateManagerInterface::DEFINITION_CREATED, 'node', 'update_order_test')) {
+      \Drupal::state()->set('update_order_test_update_8002_update_order_test_after', db_field_exists('node_field_data', 'update_order_test'));
+    }
+
+    // Attempt to apply all node entity type updates.
+    if (\Drupal::service('entity.definition_update_manager')->applyEntityUpdate(EntityDefinitionUpdateManagerInterface::DEFINITION_UPDATED, 'node')) {
+      // Node updates have now run. Check and store whether the updated node
+      // indices now exist.
+      \Drupal::state()->set('update_order_test_update_8002_node__default_langcode', db_index_exists('node_field_data', 'node__default_langcode'));
+      \Drupal::state()->set('update_order_test_update_8002_node__id__default_langcode__langcode', db_index_exists('node_field_data', 'node__id__default_langcode__langcode'));
+
+      // User updates have not yet run. Check and store whether the updated
+      // user indices now exist.
+      \Drupal::state()->set('update_order_test_update_8002_user__id__default_langcode__langcode', db_index_exists('users_field_data', 'user__id__default_langcode__langcode'));
+    }
+  }
+
+}
diff --git a/core/modules/system/tests/modules/update_order_test/update_order_test.module b/core/modules/system/tests/modules/update_order_test/update_order_test.module
new file mode 100644
index 000000000..4a56cbc19
--- /dev/null
+++ b/core/modules/system/tests/modules/update_order_test/update_order_test.module
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * @file
+ * Hooks for the update_order_test module.
+ */
+
+use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\Field\BaseFieldDefinition;
+
+/**
+ * Only declare the new entity base field once the test is running.
+ */
+if (\Drupal::state()->get('update_order_test', FALSE)) {
+
+  /**
+   * Implements hook_entity_base_field_info().
+   */
+  function update_order_test_entity_base_field_info(EntityTypeInterface $entity_type) {
+    if ($entity_type->id() === 'node') {
+      $fields['update_order_test'] = BaseFieldDefinition::create('integer')
+        ->setLabel(t('Update order test'));
+      return $fields;
+    }
+  }
+
+}
diff --git a/core/modules/system/tests/modules/url_alter_test/src/PathProcessorTest.php b/core/modules/system/tests/modules/url_alter_test/src/PathProcessorTest.php
index e30c1ca45..c17dcd5c6 100644
--- a/core/modules/system/tests/modules/url_alter_test/src/PathProcessorTest.php
+++ b/core/modules/system/tests/modules/url_alter_test/src/PathProcessorTest.php
@@ -7,9 +7,9 @@
 
 namespace Drupal\url_alter_test;
 
-use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\PathProcessor\InboundPathProcessorInterface;
 use Drupal\Core\PathProcessor\OutboundPathProcessorInterface;
+use Drupal\Core\Render\BubbleableMetadata;
 use Symfony\Component\HttpFoundation\Request;
 use Drupal\user\Entity\User;
 
@@ -44,14 +44,14 @@ class PathProcessorTest implements InboundPathProcessorInterface, OutboundPathPr
   /**
    * Implements Drupal\Core\PathProcessor\OutboundPathProcessorInterface::processOutbound().
    */
-  public function processOutbound($path, &$options = array(), Request $request = NULL, CacheableMetadata $cacheable_metadata = NULL) {
+  public function processOutbound($path, &$options = array(), Request $request = NULL, BubbleableMetadata $bubbleable_metadata = NULL) {
     // Rewrite user/uid to user/username.
     if (preg_match('!^/user/([0-9]+)(/.*)?!', $path, $matches)) {
       if ($account = User::load($matches[1])) {
         $matches += array(2 => '');
         $path = '/user/' . $account->getUsername() . $matches[2];
-        if ($cacheable_metadata) {
-          $cacheable_metadata->addCacheTags($account->getCacheTags());
+        if ($bubbleable_metadata) {
+          $bubbleable_metadata->addCacheTags($account->getCacheTags());
         }
       }
     }
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/MenuTest.php b/core/modules/system/tests/src/Unit/Migrate/source/d6/MenuTest.php
similarity index 86%
rename from core/modules/migrate_drupal/tests/src/Unit/source/d6/MenuTest.php
rename to core/modules/system/tests/src/Unit/Migrate/source/d6/MenuTest.php
index 4ec45b43e..f4eb56730 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/MenuTest.php
+++ b/core/modules/system/tests/src/Unit/Migrate/source/d6/MenuTest.php
@@ -2,23 +2,23 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\MenuTest.
+ * Contains \Drupal\Tests\system\Unit\Migrate\source\d6\MenuTest.
  */
 
-namespace Drupal\Tests\migrate_drupal\Unit\source\d6;
+namespace Drupal\Tests\system\Unit\Migrate\source\d6;
 
 use Drupal\Tests\migrate\Unit\MigrateSqlSourceTestCase;
 
 /**
  * Tests D6 menu source plugin.
  *
- * @group migrate_drupal
+ * @group system
  */
 class MenuTest extends MigrateSqlSourceTestCase {
 
   // The plugin system is not working during unit testing so the source plugin
   // class needs to be manually specified.
-  const PLUGIN_CLASS = 'Drupal\migrate_drupal\Plugin\migrate\source\d6\Menu';
+  const PLUGIN_CLASS = 'Drupal\system\Plugin\migrate\source\d6\Menu';
 
   // The fake Migration configuration entity.
   protected $migrationConfiguration = array(
diff --git a/core/modules/system/tests/src/Unit/Transliteration/MachineNameControllerTest.php b/core/modules/system/tests/src/Unit/Transliteration/MachineNameControllerTest.php
index 82d68d9fb..7c823eb14 100644
--- a/core/modules/system/tests/src/Unit/Transliteration/MachineNameControllerTest.php
+++ b/core/modules/system/tests/src/Unit/Transliteration/MachineNameControllerTest.php
@@ -50,6 +50,13 @@ class MachineNameControllerTest extends UnitTestCase {
       array(array('text' => 'Bob', 'langcode' => 'en', 'replace' => 'Alice', 'replace_pattern' => 'Tom'), '"Bob"'),
       array(array('text' => 'Äwesome', 'langcode' => 'en', 'lowercase' => TRUE), '"awesome"'),
       array(array('text' => 'Äwesome', 'langcode' => 'de', 'lowercase' => TRUE), '"aewesome"'),
+      // Tests special characters replacement in the input text.
+      array(array('text' => 'B?!"@\/-ob@e', 'langcode' => 'en', 'lowercase' => TRUE, 'replace' => '_', 'replace_pattern' => '[^a-z0-9_.]+'), '"b_ob_e"'),
+      // Tests @ character in the replace_pattern regex.
+      array(array('text' => 'Bob@e\0', 'langcode' => 'en', 'lowercase' => TRUE, 'replace' => '_', 'replace_pattern' => '[^a-z0-9_.@]+'), '"bob@e_0"'),
+      // Tests null byte in the replace_pattern regex.
+      array(array('text' => 'Bob', 'langcode' => 'en', 'lowercase' => TRUE, 'replace' => 'fail()', 'replace_pattern' => ".*@e\0"), '"bob"'),
+      array(array('text' => 'Bob@e', 'langcode' => 'en', 'lowercase' => TRUE, 'replace' => 'fail()', 'replace_pattern' => ".*@e\0"), '"fail()"'),
     );
   }
 
diff --git a/core/modules/system/tests/themes/test_invalid_core/test_invalid_core.info.yml b/core/modules/system/tests/themes/test_invalid_core/test_invalid_core.info.yml
new file mode 100644
index 000000000..5c369a64e
--- /dev/null
+++ b/core/modules/system/tests/themes/test_invalid_core/test_invalid_core.info.yml
@@ -0,0 +1,5 @@
+name: 'Theme test with invalid core version'
+type: theme
+description: 'Test theme which has an invalid core version.'
+version: VERSION
+core: 7.x
diff --git a/core/modules/system/tests/themes/test_invalid_region/test_invalid_region.info.yml b/core/modules/system/tests/themes/test_invalid_region/test_invalid_region.info.yml
new file mode 100644
index 000000000..6fef32a21
--- /dev/null
+++ b/core/modules/system/tests/themes/test_invalid_region/test_invalid_region.info.yml
@@ -0,0 +1,8 @@
+name: 'Theme test with missing content region'
+type: theme
+description: 'Test theme which has a non-existent content region.'
+version: VERSION
+core: 8.x
+
+regions:
+  - foo: Foo
diff --git a/core/modules/taxonomy/config/schema/taxonomy.source.schema.yml b/core/modules/taxonomy/config/schema/taxonomy.source.schema.yml
new file mode 100644
index 000000000..39f81fddc
--- /dev/null
+++ b/core/modules/taxonomy/config/schema/taxonomy.source.schema.yml
@@ -0,0 +1,25 @@
+# Schema for the migration source plugins.
+
+migrate.source.d6_taxonomy_vocabulary:
+  type: migrate_source_sql
+  label: 'Drupal 6 field instance form display'
+  mapping:
+    constants:
+      type: migrate_entity_constant
+      label: 'Constants'
+
+migrate.source.d6_taxonomy_vocabulary_per_type:
+  type: migrate_source_sql
+  label: 'Drupal 6 field instance form display'
+  mapping:
+    constants:
+      type: migrate_entity_constant
+      label: 'Constants'
+
+migrate.source.d6_taxonomy_vocabulary_per_type:
+  type: migrate_source_sql
+  label: 'Drupal 6 field instance form display'
+  mapping:
+    constants:
+      type: migrate_entity_constant
+      label: 'Constants'
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_taxonomy_settings.yml b/core/modules/taxonomy/migration_templates/d6_taxonomy_settings.yml
similarity index 86%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_taxonomy_settings.yml
rename to core/modules/taxonomy/migration_templates/d6_taxonomy_settings.yml
index 094e9d792..3fe9e1fd9 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_taxonomy_settings.yml
+++ b/core/modules/taxonomy/migration_templates/d6_taxonomy_settings.yml
@@ -13,7 +13,3 @@ process:
 destination:
   plugin: config
   config_name: taxonomy.settings
-dependencies:
-  module:
-    - migrate_drupal
-    - taxonomy
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_taxonomy_term.yml b/core/modules/taxonomy/migration_templates/d6_taxonomy_term.yml
similarity index 82%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_taxonomy_term.yml
rename to core/modules/taxonomy/migration_templates/d6_taxonomy_term.yml
index c70d3c807..546f95fbe 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_taxonomy_term.yml
+++ b/core/modules/taxonomy/migration_templates/d6_taxonomy_term.yml
@@ -27,9 +27,3 @@ destination:
 migration_dependencies:
   required:
     - d6_taxonomy_vocabulary
-dependencies:
-  config:
-    - migrate.migration.d6_taxonomy_vocabulary
-  module:
-    - migrate_drupal
-    - taxonomy
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_taxonomy_vocabulary.yml b/core/modules/taxonomy/migration_templates/d6_taxonomy_vocabulary.yml
similarity index 88%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_taxonomy_vocabulary.yml
rename to core/modules/taxonomy/migration_templates/d6_taxonomy_vocabulary.yml
index 1a9cb9c90..414d2cb4f 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_taxonomy_vocabulary.yml
+++ b/core/modules/taxonomy/migration_templates/d6_taxonomy_vocabulary.yml
@@ -21,7 +21,3 @@ process:
   weight: weight
 destination:
   plugin: entity:taxonomy_vocabulary
-dependencies:
-  module:
-    - migrate_drupal
-    - taxonomy
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_term_node.yml b/core/modules/taxonomy/migration_templates/d6_term_node.yml
similarity index 66%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_term_node.yml
rename to core/modules/taxonomy/migration_templates/d6_term_node.yml
index 6d0befe85..4eaf93572 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_term_node.yml
+++ b/core/modules/taxonomy/migration_templates/d6_term_node.yml
@@ -20,11 +20,3 @@ migration_dependencies:
     - d6_vocabulary_entity_display
     - d6_vocabulary_entity_form_display
     - d6_node
-dependencies:
-  config:
-    - migrate.migration.d6_node
-    - migrate.migration.d6_vocabulary_entity_display
-    - migrate.migration.d6_vocabulary_entity_form_display
-  module:
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_term_node_revision.yml b/core/modules/taxonomy/migration_templates/d6_term_node_revision.yml
similarity index 75%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_term_node_revision.yml
rename to core/modules/taxonomy/migration_templates/d6_term_node_revision.yml
index 919373835..319d00059 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_term_node_revision.yml
+++ b/core/modules/taxonomy/migration_templates/d6_term_node_revision.yml
@@ -20,10 +20,3 @@ migration_dependencies:
   required:
     - d6_term_node
     - d6_node_revision
-dependencies:
-  config:
-    - migrate.migration.d6_node_revision
-    - migrate.migration.d6_term_node
-  module:
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_entity_display.yml b/core/modules/taxonomy/migration_templates/d6_vocabulary_entity_display.yml
similarity index 84%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_entity_display.yml
rename to core/modules/taxonomy/migration_templates/d6_vocabulary_entity_display.yml
index 5c0c9c200..9295acd92 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_entity_display.yml
+++ b/core/modules/taxonomy/migration_templates/d6_vocabulary_entity_display.yml
@@ -26,9 +26,3 @@ destination:
 migration_dependencies:
   required:
     - d6_vocabulary_field_instance
-dependencies:
-  config:
-    - migrate.migration.d6_vocabulary_field_instance
-  module:
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_entity_form_display.yml b/core/modules/taxonomy/migration_templates/d6_vocabulary_entity_form_display.yml
similarity index 84%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_entity_form_display.yml
rename to core/modules/taxonomy/migration_templates/d6_vocabulary_entity_form_display.yml
index 91b540a79..3dbc95ba3 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_entity_form_display.yml
+++ b/core/modules/taxonomy/migration_templates/d6_vocabulary_entity_form_display.yml
@@ -24,9 +24,3 @@ destination:
 migration_dependencies:
   required:
     - d6_vocabulary_field_instance
-dependencies:
-  config:
-    - migrate.migration.d6_vocabulary_field_instance
-  module:
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_field.yml b/core/modules/taxonomy/migration_templates/d6_vocabulary_field.yml
similarity index 81%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_field.yml
rename to core/modules/taxonomy/migration_templates/d6_vocabulary_field.yml
index e11864f6a..c2c8cf81d 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_field.yml
+++ b/core/modules/taxonomy/migration_templates/d6_vocabulary_field.yml
@@ -23,11 +23,3 @@ destination:
 migration_dependencies:
   required:
     - d6_taxonomy_vocabulary
-dependencies:
-  config:
-    - migrate.migration.d6_taxonomy_vocabulary
-  module:
-    - entity_reference
-    - field
-    - migrate_drupal
-    - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_field_instance.yml b/core/modules/taxonomy/migration_templates/d6_vocabulary_field_instance.yml
similarity index 85%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_field_instance.yml
rename to core/modules/taxonomy/migration_templates/d6_vocabulary_field_instance.yml
index 166155fe0..4c2c7ac34 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_field_instance.yml
+++ b/core/modules/taxonomy/migration_templates/d6_vocabulary_field_instance.yml
@@ -22,11 +22,5 @@ destination:
   plugin: entity:field_config
 migration_dependencies:
   required:
+    - d6_node_type
     - d6_vocabulary_field
-dependencies:
-  config:
-    - migrate.migration.d6_vocabulary_field
-  module:
-    - field
-    - migrate_drupal
-    - node
diff --git a/core/modules/taxonomy/src/Controller/TaxonomyController.php b/core/modules/taxonomy/src/Controller/TaxonomyController.php
index e24eb6f94..2e3567885 100644
--- a/core/modules/taxonomy/src/Controller/TaxonomyController.php
+++ b/core/modules/taxonomy/src/Controller/TaxonomyController.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\taxonomy\Controller;
 
+use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Utility\Xss;
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\taxonomy\TermInterface;
@@ -54,7 +55,7 @@ class TaxonomyController extends ControllerBase {
    *   The term label.
    */
   public function vocabularyTitle(VocabularyInterface $taxonomy_vocabulary) {
-    return Xss::filter($taxonomy_vocabulary->label());
+    return SafeMarkup::xssFilter($taxonomy_vocabulary->label());
   }
 
   /**
@@ -67,7 +68,7 @@ class TaxonomyController extends ControllerBase {
    *   The term label.
    */
   public function termTitle(TermInterface $taxonomy_term) {
-    return Xss::filter($taxonomy_term->getName());
+    return SafeMarkup::xssFilter($taxonomy_term->getName());
   }
 
 }
diff --git a/core/modules/migrate/src/Plugin/migrate/destination/EntityTaxonomyTerm.php b/core/modules/taxonomy/src/Plugin/migrate/destination/EntityTaxonomyTerm.php
similarity index 72%
rename from core/modules/migrate/src/Plugin/migrate/destination/EntityTaxonomyTerm.php
rename to core/modules/taxonomy/src/Plugin/migrate/destination/EntityTaxonomyTerm.php
index 9fe20ed3f..0a28f5ba7 100644
--- a/core/modules/migrate/src/Plugin/migrate/destination/EntityTaxonomyTerm.php
+++ b/core/modules/taxonomy/src/Plugin/migrate/destination/EntityTaxonomyTerm.php
@@ -2,12 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\migrate\Plugin\migrate\destination\EntityTaxonomyTerm.
+ * Contains \Drupal\taxonomy\Plugin\migrate\destination\EntityTaxonomyTerm.
  */
 
-namespace Drupal\migrate\Plugin\migrate\destination;
+namespace Drupal\taxonomy\Plugin\migrate\destination;
 
 use Drupal\migrate\Row;
+use Drupal\migrate\Plugin\migrate\destination\EntityContentBase;
 
 /**
  * @MigrateDestination(
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/load/d6/LoadTermNode.php b/core/modules/taxonomy/src/Plugin/migrate/load/d6/LoadTermNode.php
similarity index 94%
rename from core/modules/migrate_drupal/src/Plugin/migrate/load/d6/LoadTermNode.php
rename to core/modules/taxonomy/src/Plugin/migrate/load/d6/LoadTermNode.php
index 1a7e61a21..cbdee318c 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/load/d6/LoadTermNode.php
+++ b/core/modules/taxonomy/src/Plugin/migrate/load/d6/LoadTermNode.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\load\d6\LoadTermNode.
+ * Contains \Drupal\taxonomy\Plugin\migrate\load\d6\LoadTermNode.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\load\d6;
+namespace Drupal\taxonomy\Plugin\migrate\load\d6;
 
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\migrate\Entity\MigrationInterface;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Term.php b/core/modules/taxonomy/src/Plugin/migrate/source/d6/Term.php
similarity index 93%
rename from core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Term.php
rename to core/modules/taxonomy/src/Plugin/migrate/source/d6/Term.php
index 8d64d39fd..841faca09 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Term.php
+++ b/core/modules/taxonomy/src/Plugin/migrate/source/d6/Term.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\Term.
+ * Contains \Drupal\taxonomy\Plugin\migrate\source\d6\Term.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+namespace Drupal\taxonomy\Plugin\migrate\source\d6;
 
 use Drupal\migrate\Row;
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/TermNode.php b/core/modules/taxonomy/src/Plugin/migrate/source/d6/TermNode.php
similarity index 94%
rename from core/modules/migrate_drupal/src/Plugin/migrate/source/d6/TermNode.php
rename to core/modules/taxonomy/src/Plugin/migrate/source/d6/TermNode.php
index 1ddf0146b..4629bb325 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/TermNode.php
+++ b/core/modules/taxonomy/src/Plugin/migrate/source/d6/TermNode.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\TermNode.
+ * Contains \Drupal\taxonomy\Plugin\migrate\source\d6\TermNode.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+namespace Drupal\taxonomy\Plugin\migrate\source\d6;
 
 use Drupal\migrate\Plugin\SourceEntityInterface;
 use Drupal\migrate\Row;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/TermNodeRevision.php b/core/modules/taxonomy/src/Plugin/migrate/source/d6/TermNodeRevision.php
similarity index 69%
rename from core/modules/migrate_drupal/src/Plugin/migrate/source/d6/TermNodeRevision.php
rename to core/modules/taxonomy/src/Plugin/migrate/source/d6/TermNodeRevision.php
index 99acd0ead..40438a12c 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/TermNodeRevision.php
+++ b/core/modules/taxonomy/src/Plugin/migrate/source/d6/TermNodeRevision.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\TermNodeRevision.
+ * Contains \Drupal\taxonomy\Plugin\migrate\source\d6\TermNodeRevision.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+namespace Drupal\taxonomy\Plugin\migrate\source\d6;
 
 /**
  * Source returning tids from the term_node table for the non-current revision.
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Vocabulary.php b/core/modules/taxonomy/src/Plugin/migrate/source/d6/Vocabulary.php
similarity index 85%
rename from core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Vocabulary.php
rename to core/modules/taxonomy/src/Plugin/migrate/source/d6/Vocabulary.php
index 9e51196a5..2ed3c0033 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Vocabulary.php
+++ b/core/modules/taxonomy/src/Plugin/migrate/source/d6/Vocabulary.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\Vocabulary.
+ * Contains \Drupal\taxonomy\Plugin\migrate\source\d6\Vocabulary.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+namespace Drupal\taxonomy\Plugin\migrate\source\d6;
 
 use Drupal\migrate\Row;
 
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/VocabularyBase.php b/core/modules/taxonomy/src/Plugin/migrate/source/d6/VocabularyBase.php
similarity index 93%
rename from core/modules/migrate_drupal/src/Plugin/migrate/source/d6/VocabularyBase.php
rename to core/modules/taxonomy/src/Plugin/migrate/source/d6/VocabularyBase.php
index e5f11590f..ce132d0ef 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/VocabularyBase.php
+++ b/core/modules/taxonomy/src/Plugin/migrate/source/d6/VocabularyBase.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\VocabularyBase.
+ * Contains \Drupal\taxonomy\Plugin\migrate\source\d6\VocabularyBase.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+namespace Drupal\taxonomy\Plugin\migrate\source\d6;
 
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/VocabularyPerType.php b/core/modules/taxonomy/src/Plugin/migrate/source/d6/VocabularyPerType.php
similarity index 83%
rename from core/modules/migrate_drupal/src/Plugin/migrate/source/d6/VocabularyPerType.php
rename to core/modules/taxonomy/src/Plugin/migrate/source/d6/VocabularyPerType.php
index 46f3d2d55..3f0083db9 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/VocabularyPerType.php
+++ b/core/modules/taxonomy/src/Plugin/migrate/source/d6/VocabularyPerType.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\VocabularyPerType.
+ * Contains \Drupal\taxonomy\Plugin\migrate\source\d6\VocabularyPerType.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+namespace Drupal\taxonomy\Plugin\migrate\source\d6;
 
 /**
  * Gets all the vocabularies based on the node types that have Taxonomy enabled.
diff --git a/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php b/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php
index 691d56a48..7adaa167c 100644
--- a/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php
+++ b/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php
@@ -276,6 +276,12 @@ class TaxonomyIndexTid extends ManyToOne {
     if (empty($this->options['exposed'])) {
       return TRUE;
     }
+    // We need to know the operator, which is normally set in
+    // \Drupal\views\Plugin\views\filter\FilterPluginBase::acceptExposedInput(),
+    // before we actually call the parent version of ourselves.
+    if (!empty($this->options['expose']['use_operator']) && !empty($this->options['expose']['operator_id']) && isset($input[$this->options['expose']['operator_id']])) {
+      $this->operator = $input[$this->options['expose']['operator_id']];
+    }
 
     // If view is an attachment and is inheriting exposed filters, then assume
     // exposed input has already been validated
@@ -283,6 +289,12 @@ class TaxonomyIndexTid extends ManyToOne {
       $this->validated_exposed_input = (array) $this->view->exposed_raw_input[$this->options['expose']['identifier']];
     }
 
+    // If we're checking for EMPTY or NOT, we don't need any input, and we can
+    // say that our input conditions are met by just having the right operator.
+    if ($this->operator == 'empty' || $this->operator == 'not empty') {
+      return TRUE;
+    }
+
     // If it's non-required and there's no value don't bother filtering.
     if (!$this->options['expose']['required'] && empty($this->validated_exposed_input)) {
       return FALSE;
diff --git a/core/modules/taxonomy/src/TermForm.php b/core/modules/taxonomy/src/TermForm.php
index a0d1279f0..9da099364 100644
--- a/core/modules/taxonomy/src/TermForm.php
+++ b/core/modules/taxonomy/src/TermForm.php
@@ -96,8 +96,8 @@ class TermForm extends ContentEntityForm {
   /**
    * {@inheritdoc}
    */
-  public function validate(array $form, FormStateInterface $form_state) {
-    parent::validate($form, $form_state);
+  public function validateForm(array &$form, FormStateInterface $form_state) {
+    parent::validateForm($form, $form_state);
 
     // Ensure numeric values.
     if ($form_state->hasValue('weight') && !is_numeric($form_state->getValue('weight'))) {
diff --git a/core/modules/taxonomy/src/TermStorage.php b/core/modules/taxonomy/src/TermStorage.php
index 56349b754..8cc5be862 100644
--- a/core/modules/taxonomy/src/TermStorage.php
+++ b/core/modules/taxonomy/src/TermStorage.php
@@ -318,23 +318,24 @@ class TermStorage extends SqlContentEntityStorage implements TermStorageInterfac
   /**
    * {@inheritdoc}
    */
-  public function getNodeTerms($nids, $vocabs = array(), $langcode = NULL) {
+  public function getNodeTerms(array $nids, array $vocabs = array(), $langcode = NULL) {
     $query = db_select('taxonomy_term_field_data', 'td');
     $query->innerJoin('taxonomy_index', 'tn', 'td.tid = tn.tid');
     $query->fields('td', array('tid'));
     $query->addField('tn', 'nid', 'node_nid');
     $query->orderby('td.weight');
     $query->orderby('td.name');
-    $query->condition('tn.nid', $nids);
+    $query->condition('tn.nid', $nids, 'IN');
     $query->addTag('term_access');
     if (!empty($vocabs)) {
-      $query->condition('td.vid', $vocabs);
+      $query->condition('td.vid', $vocabs, 'IN');
     }
     if (!empty($langcode)) {
       $query->condition('td.langcode', $langcode);
     }
 
     $results = array();
+    $all_tids = array();
     foreach ($query->execute() as $term_record) {
       $results[$term_record->node_nid][] = $term_record->tid;
       $all_tids[] = $term_record->tid;
@@ -344,7 +345,7 @@ class TermStorage extends SqlContentEntityStorage implements TermStorageInterfac
     $terms = array();
     foreach ($results as $nid => $tids) {
       foreach ($tids as $tid) {
-        $terms[$nid][$tid] = $all_terms[$term_record->tid];
+        $terms[$nid][$tid] = $all_terms[$tid];
       }
     }
     return $terms;
diff --git a/core/modules/taxonomy/src/TermStorageInterface.php b/core/modules/taxonomy/src/TermStorageInterface.php
index f60d7a267..a002f9c5b 100644
--- a/core/modules/taxonomy/src/TermStorageInterface.php
+++ b/core/modules/taxonomy/src/TermStorageInterface.php
@@ -121,6 +121,6 @@ interface TermStorageInterface extends EntityStorageInterface {
    * @return array
    *   An array of nids and the term entities they were tagged with.
    */
-  public function getNodeTerms($nids, $vocabs = array(), $langcode = NULL);
+  public function getNodeTerms(array $nids, array $vocabs = array(), $langcode = NULL);
 
 }
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateTaxonomyConfigsTest.php b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyConfigsTest.php
similarity index 66%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateTaxonomyConfigsTest.php
rename to core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyConfigsTest.php
index 11de9e8b9..08b12a9ae 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateTaxonomyConfigsTest.php
+++ b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyConfigsTest.php
@@ -2,19 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateTaxonomyConfigsTest.
+ * Contains \Drupal\taxonomy\Tests\Migrate\d6\MigrateTaxonomyConfigsTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\taxonomy\Tests\Migrate\d6;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to taxonomy.settings.yml.
  *
- * @group migrate_drupal
+ * @group taxonomy
  */
 class MigrateTaxonomyConfigsTest extends MigrateDrupal6TestBase {
 
@@ -32,13 +31,8 @@ class MigrateTaxonomyConfigsTest extends MigrateDrupal6TestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $migration = entity_load('migration', 'd6_taxonomy_settings');
-    $dumps = array(
-      $this->getDumpDirectory() . '/Variable.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->loadDumps(['Variable.php']);
+    $this->executeMigration('d6_taxonomy_settings');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateTaxonomyTermTest.php b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyTermTest.php
similarity index 79%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateTaxonomyTermTest.php
rename to core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyTermTest.php
index 4e5dcc32a..8cf75609c 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateTaxonomyTermTest.php
+++ b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyTermTest.php
@@ -2,19 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateTaxonomyTermTest.
+ * Contains \Drupal\taxonomy\Tests\Migrate\d6\MigrateTaxonomyTermTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\taxonomy\Tests\Migrate\d6;
 
-use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 use Drupal\taxonomy\Entity\Term;
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade taxonomy terms.
  *
- * @group migrate_drupal
+ * @group taxonomy
  */
 class MigrateTaxonomyTermTest extends MigrateDrupal6TestBase {
 
@@ -34,17 +33,13 @@ class MigrateTaxonomyTermTest extends MigrateDrupal6TestBase {
         array(array(2), array('vocabulary_2_i_1_')),
         array(array(3), array('vocabulary_3_i_2_')),
     )));
-    /** @var \Drupal\migrate\entity\Migration $migration */
-    $migration = entity_load('migration', 'd6_taxonomy_term');
-    $dumps = array(
-      $this->getDumpDirectory() . '/TermData.php',
-      $this->getDumpDirectory() . '/TermHierarchy.php',
-      $this->getDumpDirectory() . '/Vocabulary.php',
-      $this->getDumpDirectory() . '/VocabularyNodeTypes.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->loadDumps([
+      'TermData.php',
+      'TermHierarchy.php',
+      'Vocabulary.php',
+      'VocabularyNodeTypes.php',
+    ]);
+    $this->executeMigration('d6_taxonomy_term');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateTaxonomyVocabularyTest.php b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyVocabularyTest.php
similarity index 75%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateTaxonomyVocabularyTest.php
rename to core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyVocabularyTest.php
index ba36183b8..e19923815 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateTaxonomyVocabularyTest.php
+++ b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyVocabularyTest.php
@@ -2,19 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateTaxonomyVocabularyTest.
+ * Contains \Drupal\taxonomy\Tests\Migrate\d6\MigrateTaxonomyVocabularyTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\taxonomy\Tests\Migrate\d6;
 
-use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 use Drupal\taxonomy\Entity\Vocabulary;
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Migrate taxonomy vocabularies to taxonomy.vocabulary.*.yml.
  *
- * @group migrate_drupal
+ * @group taxonomy
  */
 class MigrateTaxonomyVocabularyTest extends MigrateDrupal6TestBase {
 
@@ -30,14 +29,8 @@ class MigrateTaxonomyVocabularyTest extends MigrateDrupal6TestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $migration = entity_load('migration', 'd6_taxonomy_vocabulary');
-    $dumps = array(
-      $this->getDumpDirectory() . '/Vocabulary.php',
-      $this->getDumpDirectory() . '/VocabularyNodeTypes.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->loadDumps(['Vocabulary.php', 'VocabularyNodeTypes.php']);
+    $this->executeMigration('d6_taxonomy_vocabulary');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateTermNodeRevisionTest.php b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTermNodeRevisionTest.php
similarity index 89%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateTermNodeRevisionTest.php
rename to core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTermNodeRevisionTest.php
index ddb1a23d4..60e8e10e8 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateTermNodeRevisionTest.php
+++ b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTermNodeRevisionTest.php
@@ -2,17 +2,17 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateTermNodeRevisionTest.
+ * Contains \Drupal\taxonomy\Tests\Migrate\d6\MigrateTermNodeRevisionTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\taxonomy\Tests\Migrate\d6;
 
 use Drupal\migrate\MigrateExecutable;
 
 /**
  * Upgrade taxonomy term node associations.
  *
- * @group migrate_drupal
+ * @group taxonomy
  */
 class MigrateTermNodeRevisionTest extends MigrateTermNodeTestBase {
 
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateTermNodeTest.php b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTermNodeTest.php
similarity index 90%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateTermNodeTest.php
rename to core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTermNodeTest.php
index d68e455dd..2173c5920 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateTermNodeTest.php
+++ b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTermNodeTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateTermNodeTest.
+ * Contains \Drupal\taxonomy\Tests\Migrate\d6\MigrateTermNodeTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\taxonomy\Tests\Migrate\d6;
 
 use Drupal\migrate\MigrateExecutable;
 use Drupal\node\Entity\Node;
@@ -13,7 +13,7 @@ use Drupal\node\Entity\Node;
 /**
  * Upgrade taxonomy term node associations.
  *
- * @group migrate_drupal
+ * @group taxonomy
  */
 class MigrateTermNodeTest extends MigrateTermNodeTestBase {
 
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateTermNodeTestBase.php b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTermNodeTestBase.php
similarity index 77%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateTermNodeTestBase.php
rename to core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTermNodeTestBase.php
index ac087b911..c54377b25 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateTermNodeTestBase.php
+++ b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTermNodeTestBase.php
@@ -2,13 +2,14 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateTermNodeTestBase.
+ * Contains \Drupal\taxonomy\Tests\Migrate\d6\MigrateTermNodeTestBase.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\taxonomy\Tests\Migrate\d6;
 
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\entity_reference\Tests\EntityReferenceTestTrait;
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Base class for Taxonomy/Node migration tests.
@@ -81,18 +82,17 @@ abstract class MigrateTermNodeTestBase extends MigrateDrupal6TestBase {
         $node->save();
       }
     }
-    $dumps = array(
-      $this->getDumpDirectory() . '/Node.php',
-      $this->getDumpDirectory() . '/NodeRevisions.php',
-      $this->getDumpDirectory() . '/ContentTypeStory.php',
-      $this->getDumpDirectory() . '/ContentTypeTestPlanet.php',
-      $this->getDumpDirectory() . '/TermNode.php',
-      $this->getDumpDirectory() . '/TermHierarchy.php',
-      $this->getDumpDirectory() . '/TermData.php',
-      $this->getDumpDirectory() . '/Vocabulary.php',
-      $this->getDumpDirectory() . '/VocabularyNodeTypes.php',
-    );
-    $this->loadDumps($dumps);
+    $this->loadDumps([
+      'Node.php',
+      'NodeRevisions.php',
+      'ContentTypeStory.php',
+      'ContentTypeTestPlanet.php',
+      'TermNode.php',
+      'TermHierarchy.php',
+      'TermData.php',
+      'Vocabulary.php',
+      'VocabularyNodeTypes.php',
+    ]);
   }
 
 }
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateVocabularyEntityDisplayTest.php b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyEntityDisplayTest.php
similarity index 81%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateVocabularyEntityDisplayTest.php
rename to core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyEntityDisplayTest.php
index 46cb5c288..5c266e6b0 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateVocabularyEntityDisplayTest.php
+++ b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyEntityDisplayTest.php
@@ -2,18 +2,17 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateVocabularyEntityDisplayTest.
+ * Contains \Drupal\taxonomy\Tests\Migrate\d6\MigrateVocabularyEntityDisplayTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\taxonomy\Tests\Migrate\d6;
 
-use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Vocabulary entity display migration.
  *
- * @group migrate_drupal
+ * @group taxonomy
  */
 class MigrateVocabularyEntityDisplayTest extends MigrateDrupal6TestBase {
 
@@ -71,14 +70,8 @@ class MigrateVocabularyEntityDisplayTest extends MigrateDrupal6TestBase {
     );
     $this->prepareMigrations($id_mappings);
 
-    $migration = entity_load('migration', 'd6_vocabulary_entity_display');
-    $dumps = array(
-      $this->getDumpDirectory() . '/Vocabulary.php',
-      $this->getDumpDirectory() . '/VocabularyNodeTypes.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->loadDumps(['Vocabulary.php', 'VocabularyNodeTypes.php']);
+    $this->executeMigration('d6_vocabulary_entity_display');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateVocabularyEntityFormDisplayTest.php b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyEntityFormDisplayTest.php
similarity index 80%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateVocabularyEntityFormDisplayTest.php
rename to core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyEntityFormDisplayTest.php
index 7a07405ea..169143800 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateVocabularyEntityFormDisplayTest.php
+++ b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyEntityFormDisplayTest.php
@@ -2,18 +2,17 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateVocabularyEntityFormDisplayTest.
+ * Contains \Drupal\taxonomy\Tests\Migrate\d6\MigrateVocabularyEntityFormDisplayTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\taxonomy\Tests\Migrate\d6;
 
-use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Vocabulary entity form display migration.
  *
- * @group migrate_drupal
+ * @group taxonomy
  */
 class MigrateVocabularyEntityFormDisplayTest extends MigrateDrupal6TestBase {
 
@@ -71,15 +70,8 @@ class MigrateVocabularyEntityFormDisplayTest extends MigrateDrupal6TestBase {
     );
     $this->prepareMigrations($id_mappings);
 
-    $migration = entity_load('migration', 'd6_vocabulary_entity_form_display');
-    $dumps = array(
-      $this->getDumpDirectory() . '/Vocabulary.php',
-      $this->getDumpDirectory() . '/VocabularyNodeTypes.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
-
+    $this->loadDumps(['Vocabulary.php', 'VocabularyNodeTypes.php']);
+    $this->executeMigration('d6_vocabulary_entity_form_display');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateVocabularyFieldInstanceTest.php b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyFieldInstanceTest.php
similarity index 84%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateVocabularyFieldInstanceTest.php
rename to core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyFieldInstanceTest.php
index 52e60c1f6..0154063f0 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateVocabularyFieldInstanceTest.php
+++ b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyFieldInstanceTest.php
@@ -2,20 +2,19 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateVocabularyFieldInstanceTest.
+ * Contains \Drupal\taxonomy\Tests\Migrate\d6\MigrateVocabularyFieldInstanceTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\taxonomy\Tests\Migrate\d6;
 
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\field\Entity\FieldConfig;
-use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Vocabulary field instance migration.
  *
- * @group migrate_drupal
+ * @group taxonomy
  */
 class MigrateVocabularyFieldInstanceTest extends MigrateDrupal6TestBase {
 
@@ -38,6 +37,11 @@ class MigrateVocabularyFieldInstanceTest extends MigrateDrupal6TestBase {
 
     // Add some id mappings for the dependant migrations.
     $id_mappings = array(
+      'd6_node_type' => array(
+        array(array('article'), array('article')),
+        array(array('page'), array('page')),
+        array(array('story'), array('story')),
+      ),
       'd6_taxonomy_vocabulary' => array(
         array(array(4), array('tags')),
       ),
@@ -64,14 +68,8 @@ class MigrateVocabularyFieldInstanceTest extends MigrateDrupal6TestBase {
       ),
     ))->save();
 
-    $migration = entity_load('migration', 'd6_vocabulary_field_instance');
-    $dumps = array(
-      $this->getDumpDirectory() . '/Vocabulary.php',
-      $this->getDumpDirectory() . '/VocabularyNodeTypes.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->loadDumps(['Vocabulary.php', 'VocabularyNodeTypes.php']);
+    $this->executeMigration('d6_vocabulary_field_instance');
   }
 
   /**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateVocabularyFieldTest.php b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyFieldTest.php
similarity index 75%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateVocabularyFieldTest.php
rename to core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyFieldTest.php
index 7ac3455e0..9859d5991 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateVocabularyFieldTest.php
+++ b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyFieldTest.php
@@ -2,19 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateVocabularyFieldTest.
+ * Contains \Drupal\taxonomy\Tests\Migrate\d6\MigrateVocabularyFieldTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\taxonomy\Tests\Migrate\d6;
 
 use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Vocabulary field migration.
  *
- * @group migrate_drupal
+ * @group taxonomy
  */
 class MigrateVocabularyFieldTest extends MigrateDrupal6TestBase {
 
@@ -45,14 +44,8 @@ class MigrateVocabularyFieldTest extends MigrateDrupal6TestBase {
       'vid' => 'test_vocab',
     ))->save();
 
-    $migration = entity_load('migration', 'd6_vocabulary_field');
-    $dumps = array(
-      $this->getDumpDirectory() . '/Vocabulary.php',
-      $this->getDumpDirectory() . '/VocabularyNodeTypes.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->loadDumps(['Vocabulary.php', 'VocabularyNodeTypes.php']);
+    $this->executeMigration('d6_vocabulary_field');
   }
 
   /**
diff --git a/core/modules/taxonomy/src/Tests/TaxonomyImageTest.php b/core/modules/taxonomy/src/Tests/TaxonomyImageTest.php
index fba0f1519..550c5f537 100644
--- a/core/modules/taxonomy/src/Tests/TaxonomyImageTest.php
+++ b/core/modules/taxonomy/src/Tests/TaxonomyImageTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\taxonomy\Tests;
 
 use Drupal\user\RoleInterface;
+use Drupal\file\Entity\File;
 
 /**
  * Tests access checks of private image fields.
@@ -86,7 +87,7 @@ class TaxonomyImageTest extends TaxonomyTestBase {
     // Create a user that should have access to the file and one that doesn't.
     $access_user = $this->drupalCreateUser(array('access content'));
     $no_access_user = $this->drupalCreateUser();
-    $image = file_load($term->field_test->target_id);
+    $image = File::load($term->field_test->target_id);
     $this->drupalLogin($access_user);
     $this->drupalGet(file_create_url($image->getFileUri()));
     $this->assertResponse(200, 'Private image on term is accessible with right permission');
diff --git a/core/modules/taxonomy/src/Tests/TaxonomyTranslationTestTrait.php b/core/modules/taxonomy/src/Tests/TaxonomyTranslationTestTrait.php
index 61e45bd69..4b828cfb2 100644
--- a/core/modules/taxonomy/src/Tests/TaxonomyTranslationTestTrait.php
+++ b/core/modules/taxonomy/src/Tests/TaxonomyTranslationTestTrait.php
@@ -78,8 +78,12 @@ trait TaxonomyTranslationTestTrait {
 
   /**
    * Adds term reference field for the article content type.
+   *
+   * @param bool $translatable
+   *   (optional) If TRUE, create a translatable term reference field. Defaults
+   *   to FALSE.
    */
-  protected function setUpTermReferenceField() {
+  protected function setUpTermReferenceField($translatable = FALSE) {
     $handler_settings = array(
       'target_bundles' => array(
         $this->vocabulary->id() => $this->vocabulary->id(),
@@ -88,7 +92,7 @@ trait TaxonomyTranslationTestTrait {
     );
     $this->createEntityReferenceField('node', 'article', $this->termFieldName, NULL, 'taxonomy_term', 'default', $handler_settings, FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
     $field_storage = FieldStorageConfig::loadByName('node', $this->termFieldName);
-    $field_storage->setTranslatable(FALSE);
+    $field_storage->setTranslatable($translatable);
     $field_storage->save();
 
     entity_get_form_display('node', 'article', 'default')
diff --git a/core/modules/taxonomy/src/Tests/TermTranslationFieldViewTest.php b/core/modules/taxonomy/src/Tests/TermTranslationFieldViewTest.php
index 9474d11c5..e9d2afe27 100644
--- a/core/modules/taxonomy/src/Tests/TermTranslationFieldViewTest.php
+++ b/core/modules/taxonomy/src/Tests/TermTranslationFieldViewTest.php
@@ -50,7 +50,7 @@ class TermTranslationFieldViewTest extends TaxonomyTestBase {
     $this->vocabulary = $this->createVocabulary();
     $this->enableTranslation();
     $this->setUpTerm();
-    $this->setUpTermReferenceField();
+    $this->setUpTermReferenceField(TRUE);
     $this->setUpNode();
   }
 
@@ -85,7 +85,7 @@ class TermTranslationFieldViewTest extends TaxonomyTestBase {
       'langcode' => $this->baseLangcode,
     ));
     $node->save();
-    $node->addTranslation($this->translateToLangcode, array());
+    $node->addTranslation($this->translateToLangcode, $node->toArray());
     $node->save();
     $this->node = $node;
   }
diff --git a/core/modules/taxonomy/src/Tests/TokenReplaceTest.php b/core/modules/taxonomy/src/Tests/TokenReplaceTest.php
index 105120185..ff7c8eff4 100644
--- a/core/modules/taxonomy/src/Tests/TokenReplaceTest.php
+++ b/core/modules/taxonomy/src/Tests/TokenReplaceTest.php
@@ -10,6 +10,7 @@ namespace Drupal\taxonomy\Tests;
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Utility\Xss;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
+use Drupal\Core\Render\BubbleableMetadata;
 
 /**
  * Generates text using placeholders for dummy content to check taxonomy token
@@ -91,10 +92,26 @@ class TokenReplaceTest extends TaxonomyTestBase {
     $tests['[term:node-count]'] = 0;
     $tests['[term:parent:name]'] = '[term:parent:name]';
     $tests['[term:vocabulary:name]'] = SafeMarkup::checkPlain($this->vocabulary->label());
+    $tests['[term:vocabulary]'] = SafeMarkup::checkPlain($this->vocabulary->label());
+
+    $base_bubbleable_metadata = BubbleableMetadata::createFromObject($term1);
+
+    $metadata_tests = array();
+    $metadata_tests['[term:tid]'] = $base_bubbleable_metadata;
+    $metadata_tests['[term:name]'] = $base_bubbleable_metadata;
+    $metadata_tests['[term:description]'] = $base_bubbleable_metadata;
+    $metadata_tests['[term:url]'] = $base_bubbleable_metadata;
+    $metadata_tests['[term:node-count]'] = $base_bubbleable_metadata;
+    $metadata_tests['[term:parent:name]'] = $base_bubbleable_metadata;
+    $bubbleable_metadata = clone $base_bubbleable_metadata;
+    $metadata_tests['[term:vocabulary:name]'] = $bubbleable_metadata->addCacheTags($this->vocabulary->getCacheTags());
+    $metadata_tests['[term:vocabulary]'] = $bubbleable_metadata->addCacheTags($this->vocabulary->getCacheTags());
 
     foreach ($tests as $input => $expected) {
-      $output = $token_service->replace($input, array('term' => $term1), array('langcode' => $language_interface->getId()));
+      $bubbleable_metadata = new BubbleableMetadata();
+      $output = $token_service->replace($input, array('term' => $term1), array('langcode' => $language_interface->getId()), $bubbleable_metadata);
       $this->assertEqual($output, $expected, format_string('Sanitized taxonomy term token %token replaced.', array('%token' => $input)));
+      $this->assertEqual($bubbleable_metadata, $metadata_tests[$input]);
     }
 
     // Generate and test sanitized tokens for term2.
diff --git a/core/modules/taxonomy/src/Tests/Views/TaxonomyFieldAllTermsTest.php b/core/modules/taxonomy/src/Tests/Views/TaxonomyFieldAllTermsTest.php
new file mode 100644
index 000000000..f1ca0dd29
--- /dev/null
+++ b/core/modules/taxonomy/src/Tests/Views/TaxonomyFieldAllTermsTest.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\taxonomy\Tests\Views\TaxonomyFieldAllTerms.
+ */
+
+namespace Drupal\taxonomy\Tests\Views;
+
+use Drupal\views\Views;
+
+/**
+ * Tests the "All terms" taxonomy term field handler.
+ *
+ * @group taxonomy
+ */
+class TaxonomyFieldAllTermsTest extends TaxonomyTestBase {
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('taxonomy_all_terms_test');
+
+  function testViewsHandlerAllTermsField() {
+    $view = Views::getView('taxonomy_all_terms_test');
+    $this->executeView($view);
+    $this->drupalGet('taxonomy_all_terms_test');
+
+    $actual = $this->xpath('//a[@href="' . $this->term1->url() . '"]');
+    $this->assertEqual(count($actual), 2, 'Correct number of taxonomy term1 links');
+    $this->assertEqual($actual[0]->__toString(), $this->term1->label());
+    $this->assertEqual($actual[1]->__toString(), $this->term1->label());
+
+    $actual = $this->xpath('//a[@href="' . $this->term2->url() . '"]');
+    $this->assertEqual(count($actual), 2, 'Correct number of taxonomy term2 links');
+    $this->assertEqual($actual[0]->__toString(), $this->term2->label());
+    $this->assertEqual($actual[1]->__toString(), $this->term2->label());
+  }
+
+}
diff --git a/core/modules/taxonomy/src/Tests/Views/TaxonomyFieldTidTest.php b/core/modules/taxonomy/src/Tests/Views/TaxonomyFieldTidTest.php
index 028904920..f02968bff 100644
--- a/core/modules/taxonomy/src/Tests/Views/TaxonomyFieldTidTest.php
+++ b/core/modules/taxonomy/src/Tests/Views/TaxonomyFieldTidTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\taxonomy\Tests\Views;
 
+use Drupal\Core\Render\RenderContext;
 use Drupal\views\Views;
 
 /**
@@ -24,10 +25,15 @@ class TaxonomyFieldTidTest extends TaxonomyTestBase {
   public static $testViews = array('test_taxonomy_tid_field');
 
   function testViewsHandlerTidField() {
+    /** @var \Drupal\Core\Render\RendererInterface $renderer */
+    $renderer = \Drupal::service('renderer');
+
     $view = Views::getView('test_taxonomy_tid_field');
     $this->executeView($view);
 
-    $actual = $view->field['name']->advancedRender($view->result[0]);
+    $actual = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
     $expected = \Drupal::l($this->term1->label(), $this->term1->urlInfo());
 
     $this->assertEqual($expected, $actual);
diff --git a/core/modules/taxonomy/src/Tests/Views/TaxonomyIndexTidUiTest.php b/core/modules/taxonomy/src/Tests/Views/TaxonomyIndexTidUiTest.php
index 2ccfa773c..4ea9e3240 100644
--- a/core/modules/taxonomy/src/Tests/Views/TaxonomyIndexTidUiTest.php
+++ b/core/modules/taxonomy/src/Tests/Views/TaxonomyIndexTidUiTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\taxonomy\Tests\Views;
 
+use Drupal\Core\Field\FieldStorageDefinitionInterface;
+use Drupal\entity_reference\Tests\EntityReferenceTestTrait;
 use Drupal\taxonomy\Entity\Term;
 use Drupal\taxonomy\Entity\Vocabulary;
 use Drupal\views\Tests\ViewTestData;
@@ -20,6 +22,8 @@ use Drupal\views_ui\Tests\UITestBase;
  */
 class TaxonomyIndexTidUiTest extends UITestBase {
 
+  use EntityReferenceTestTrait;
+
   /**
    * Views used by this test.
    *
@@ -32,7 +36,7 @@ class TaxonomyIndexTidUiTest extends UITestBase {
    *
    * @var array
    */
-  public static $modules = array('node', 'taxonomy', 'taxonomy_test_views');
+  public static $modules = array('node', 'taxonomy', 'taxonomy_test_views', 'entity_reference');
 
   /**
    * A nested array of \Drupal\taxonomy\TermInterface objects.
@@ -120,4 +124,72 @@ class TaxonomyIndexTidUiTest extends UITestBase {
     $this->assertIdentical($expected, $view->calculateDependencies());
   }
 
+  /**
+   * Tests exposed taxonomy filters.
+   */
+  public function testExposedFilter() {
+    $node_type = $this->drupalCreateContentType(['type' => 'page']);
+
+    // Create the tag field itself.
+    $field_name = 'taxonomy_tags';
+    $this->createEntityReferenceField('node', $node_type->id(), $field_name, NULL, 'taxonomy_term');
+
+    // Create 4 nodes: 1 without a term, 2 with the same term, and 1 with a
+    // different term.
+    $node1 = $this->drupalCreateNode();
+    $node2 = $this->drupalCreateNode([
+      $field_name => [['target_id' => $this->terms[1][0]->id()]],
+    ]);
+    $node3 = $this->drupalCreateNode([
+      $field_name => [['target_id' => $this->terms[1][0]->id()]],
+    ]);
+    $node4 = $this->drupalCreateNode([
+      $field_name => [['target_id' => $this->terms[2][0]->id()]],
+    ]);
+
+    // Only the nodes with the selected term should be shown.
+    $this->drupalGet('test-filter-taxonomy-index-tid');
+    $xpath = $this->xpath('//div[@class="view-content"]//a');
+    $this->assertIdentical(2, count($xpath));
+    $xpath = $this->xpath('//div[@class="view-content"]//a[@href=:href]', [':href' => $node2->url()]);
+    $this->assertIdentical(1, count($xpath));
+    $xpath = $this->xpath('//div[@class="view-content"]//a[@href=:href]', [':href' => $node3->url()]);
+    $this->assertIdentical(1, count($xpath));
+
+    // Expose the filter.
+    $this->drupalPostForm('admin/structure/views/nojs/handler/test_filter_taxonomy_index_tid/default/filter/tid', [], 'Expose filter');
+    // Set the operator to 'empty' and remove the default term ID.
+    $this->drupalPostForm(NULL, [
+      'options[operator]' => 'empty',
+      'options[value][]' => [],
+    ], 'Apply');
+    // Save the view.
+    $this->drupalPostForm(NULL, [], 'Save');
+
+    // After switching to 'empty' operator, the node without a term should be
+    // shown.
+    $this->drupalGet('test-filter-taxonomy-index-tid');
+    $xpath = $this->xpath('//div[@class="view-content"]//a');
+    $this->assertIdentical(1, count($xpath));
+    $xpath = $this->xpath('//div[@class="view-content"]//a[@href=:href]', [':href' => $node1->url()]);
+    $this->assertIdentical(1, count($xpath));
+
+    // Set the operator to 'not empty'.
+    $this->drupalPostForm('admin/structure/views/nojs/handler/test_filter_taxonomy_index_tid/default/filter/tid', ['options[operator]' => 'not empty'], 'Apply');
+    // Save the view.
+    $this->drupalPostForm(NULL, [], 'Save');
+
+    // After switching to 'not empty' operator, all nodes with terms should be
+    // shown.
+    $this->drupalGet('test-filter-taxonomy-index-tid');
+    $xpath = $this->xpath('//div[@class="view-content"]//a');
+    $this->assertIdentical(3, count($xpath));
+    $xpath = $this->xpath('//div[@class="view-content"]//a[@href=:href]', [':href' => $node2->url()]);
+    $this->assertIdentical(1, count($xpath));
+    $xpath = $this->xpath('//div[@class="view-content"]//a[@href=:href]', [':href' => $node3->url()]);
+    $this->assertIdentical(1, count($xpath));
+    $xpath = $this->xpath('//div[@class="view-content"]//a[@href=:href]', [':href' => $node4->url()]);
+    $this->assertIdentical(1, count($xpath));
+  }
+
 }
diff --git a/core/modules/taxonomy/taxonomy.tokens.inc b/core/modules/taxonomy/taxonomy.tokens.inc
index f5ba24ebd..824116ccc 100644
--- a/core/modules/taxonomy/taxonomy.tokens.inc
+++ b/core/modules/taxonomy/taxonomy.tokens.inc
@@ -7,6 +7,7 @@
 
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Utility\Xss;
+use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\taxonomy\Entity\Vocabulary;
 
 /**
@@ -92,7 +93,7 @@ function taxonomy_token_info() {
 /**
  * Implements hook_tokens().
  */
-function taxonomy_tokens($type, $tokens, array $data = array(), array $options = array()) {
+function taxonomy_tokens($type, $tokens, array $data, array $options, BubbleableMetadata $bubbleable_metadata) {
   $token_service = \Drupal::token();
 
   $replacements = array();
@@ -129,12 +130,14 @@ function taxonomy_tokens($type, $tokens, array $data = array(), array $options =
 
         case 'vocabulary':
           $vocabulary = Vocabulary::load($term->bundle());
+          $bubbleable_metadata->addCacheableDependency($vocabulary);
           $replacements[$original] = SafeMarkup::checkPlain($vocabulary->label());
           break;
 
         case 'parent':
           if ($parents = $taxonomy_storage->loadParents($term->id())) {
             $parent = array_pop($parents);
+            $bubbleable_metadata->addCacheableDependency($parent);
             $replacements[$original] = SafeMarkup::checkPlain($parent->getName());
           }
           break;
@@ -143,12 +146,12 @@ function taxonomy_tokens($type, $tokens, array $data = array(), array $options =
 
     if ($vocabulary_tokens = $token_service->findWithPrefix($tokens, 'vocabulary')) {
       $vocabulary = Vocabulary::load($term->bundle());
-      $replacements += $token_service->generate('vocabulary', $vocabulary_tokens, array('vocabulary' => $vocabulary), $options);
+      $replacements += $token_service->generate('vocabulary', $vocabulary_tokens, array('vocabulary' => $vocabulary), $options, $bubbleable_metadata);
     }
 
     if (($vocabulary_tokens = $token_service->findWithPrefix($tokens, 'parent')) && $parents = $taxonomy_storage->loadParents($term->id())) {
       $parent = array_pop($parents);
-      $replacements += $token_service->generate('term', $vocabulary_tokens, array('term' => $parent), $options);
+      $replacements += $token_service->generate('term', $vocabulary_tokens, array('term' => $parent), $options, $bubbleable_metadata);
     }
   }
 
diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.taxonomy_all_terms_test.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.taxonomy_all_terms_test.yml
new file mode 100644
index 000000000..7e2673c2c
--- /dev/null
+++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.taxonomy_all_terms_test.yml
@@ -0,0 +1,183 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - node
+    - taxonomy
+    - user
+id: taxonomy_all_terms_test
+label: taxonomy_all_terms_test
+module: views
+description: ''
+tag: ''
+base_table: node_field_data
+base_field: nid
+core: 8.x
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: 0
+    display_options:
+      access:
+        type: perm
+        options:
+          perm: 'access content'
+      cache:
+        type: tag
+        options: {  }
+      query:
+        type: views_query
+        options:
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_comment: ''
+          query_tags: {  }
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      pager:
+        type: full
+        options:
+          items_per_page: 10
+          offset: 0
+          id: 0
+          total_pages: null
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+          tags:
+            previous: '‹ previous'
+            next: 'next ›'
+            first: '« first'
+            last: 'last »'
+          quantity: 9
+      style:
+        type: default
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          uses_fields: false
+      row:
+        type: fields
+        options:
+          inline: {  }
+          separator: ''
+          hide_empty: false
+          default_field_elements: true
+      fields:
+        term_node_tid:
+          id: term_node_tid
+          table: node_field_data
+          field: term_node_tid
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          type: separator
+          separator: ', '
+          link_to_taxonomy: true
+          limit: false
+          vids:
+            tags: '0'
+          entity_type: node
+          plugin_id: taxonomy_index_tid
+      filters: {  }
+      sorts:
+        nid:
+          id: nid
+          table: node
+          field: nid
+          relationship: none
+          group_type: group
+          admin_label: ''
+          order: ASC
+          exposed: false
+          expose:
+            label: ''
+          entity_type: node
+          entity_field: nid
+          plugin_id: standard
+      header: {  }
+      footer: {  }
+      empty: {  }
+      relationships: {  }
+      arguments: {  }
+      display_extenders: {  }
+    cache_metadata:
+      contexts:
+        - 'languages:language_interface'
+        - 'url.query_args.pagers:0'
+        - 'user.node_grants:view'
+        - user.permissions
+      cacheable: false
+  page_1:
+    display_plugin: page
+    id: page_1
+    display_title: Page
+    position: 1
+    display_options:
+      display_extenders: {  }
+      path: taxonomy_all_terms_test
+    cache_metadata:
+      contexts:
+        - 'languages:language_interface'
+        - 'url.query_args.pagers:0'
+        - 'user.node_grants:view'
+        - user.permissions
+      cacheable: false
diff --git a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_filter_taxonomy_index_tid.yml b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_filter_taxonomy_index_tid.yml
index 32a5a8b01..2960a7a15 100644
--- a/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_filter_taxonomy_index_tid.yml
+++ b/core/modules/taxonomy/tests/modules/taxonomy_test_views/test_views/views.view.test_filter_taxonomy_index_tid.yml
@@ -176,3 +176,11 @@ display:
       empty: {  }
       relationships: {  }
       arguments: {  }
+  page_1:
+    display_plugin: page
+    id: page_1
+    display_title: Page
+    position: 2
+    display_options:
+      display_extenders: {  }
+      path: test-filter-taxonomy-index-tid
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/TermSourceWithVocabularyFilterTest.php b/core/modules/taxonomy/tests/src/Unit/Migrate/d6/TermSourceWithVocabularyFilterTest.php
similarity index 66%
rename from core/modules/migrate_drupal/tests/src/Unit/source/d6/TermSourceWithVocabularyFilterTest.php
rename to core/modules/taxonomy/tests/src/Unit/Migrate/d6/TermSourceWithVocabularyFilterTest.php
index f209b0de0..38a026f66 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/TermSourceWithVocabularyFilterTest.php
+++ b/core/modules/taxonomy/tests/src/Unit/Migrate/d6/TermSourceWithVocabularyFilterTest.php
@@ -2,15 +2,15 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\TermSourceWithVocabularyFilterTest.
+ * Contains \Drupal\Tests\taxonomy\Unit\Migrate\d6\TermSourceWithVocabularyFilterTest.
  */
 
-namespace Drupal\Tests\migrate_drupal\Unit\source\d6;
+namespace Drupal\Tests\taxonomy\Unit\Migrate\d6;
 
 /**
  * Tests the Drupal 6 taxonomy term source with vocabulary filter.
  *
- * @group migrate_drupal
+ * @group taxonomy
  */
 class TermSourceWithVocabularyFilterTest extends TermTestBase {
 
@@ -23,5 +23,8 @@ class TermSourceWithVocabularyFilterTest extends TermTestBase {
     $this->expectedResults = array_values(array_filter($this->expectedResults, function($result) {
       return $result['vid'] == 5;
     }));
+    // We know there are two rows with vid == 5.
+    $this->expectedCount = 2;
   }
+
 }
diff --git a/core/modules/taxonomy/tests/src/Unit/Migrate/d6/TermTest.php b/core/modules/taxonomy/tests/src/Unit/Migrate/d6/TermTest.php
new file mode 100644
index 000000000..22a83129a
--- /dev/null
+++ b/core/modules/taxonomy/tests/src/Unit/Migrate/d6/TermTest.php
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\taxonomy\Unit\Migrate\d6\TermTest.
+ */
+
+namespace Drupal\Tests\taxonomy\Unit\Migrate\d6;
+
+/**
+ * Tests D6 taxonomy term source plugin.
+ *
+ * @group taxonomy
+ */
+class TermTest extends TermTestBase {
+
+}
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/TermTestBase.php b/core/modules/taxonomy/tests/src/Unit/Migrate/d6/TermTestBase.php
similarity index 90%
rename from core/modules/migrate_drupal/tests/src/Unit/source/d6/TermTestBase.php
rename to core/modules/taxonomy/tests/src/Unit/Migrate/d6/TermTestBase.php
index ba8129c10..834dc95e1 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/TermTestBase.php
+++ b/core/modules/taxonomy/tests/src/Unit/Migrate/d6/TermTestBase.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\TermTestBase.
+ * Contains \Drupal\Tests\taxonomy\Unit\Migrate\d6\TermTestBase.
  */
 
-namespace Drupal\Tests\migrate_drupal\Unit\source\d6;
+namespace Drupal\Tests\taxonomy\Unit\Migrate\d6;
 
 use Drupal\Tests\migrate\Unit\MigrateSqlSourceTestCase;
 
@@ -14,7 +14,7 @@ use Drupal\Tests\migrate\Unit\MigrateSqlSourceTestCase;
  */
 abstract class TermTestBase extends MigrateSqlSourceTestCase {
 
-  const PLUGIN_CLASS = 'Drupal\migrate_drupal\Plugin\migrate\source\d6\Term';
+  const PLUGIN_CLASS = 'Drupal\taxonomy\Plugin\migrate\source\d6\Term';
 
   protected $migrationConfiguration = array(
     'id' => 'test',
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/VocabularyTest.php b/core/modules/taxonomy/tests/src/Unit/Migrate/d6/VocabularyTest.php
similarity index 87%
rename from core/modules/migrate_drupal/tests/src/Unit/source/d6/VocabularyTest.php
rename to core/modules/taxonomy/tests/src/Unit/Migrate/d6/VocabularyTest.php
index 2c0d5e67c..53ea00487 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/VocabularyTest.php
+++ b/core/modules/taxonomy/tests/src/Unit/Migrate/d6/VocabularyTest.php
@@ -2,21 +2,21 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\VocabularyTest.
+ * Contains \Drupal\Tests\taxonomy\Unit\Migrate\d6\VocabularyTest.
  */
 
-namespace Drupal\Tests\migrate_drupal\Unit\source\d6;
+namespace Drupal\Tests\taxonomy\Unit\Migrate\d6;
 
 use Drupal\Tests\migrate\Unit\MigrateSqlSourceTestCase;
 
 /**
  * Tests D6 vocabulary source plugin.
  *
- * @group migrate_drupal
+ * @group taxonomy
  */
 class VocabularyTest extends MigrateSqlSourceTestCase {
 
-  const PLUGIN_CLASS = 'Drupal\migrate_drupal\Plugin\migrate\source\d6\Vocabulary';
+  const PLUGIN_CLASS = 'Drupal\taxonomy\Plugin\migrate\source\d6\Vocabulary';
 
   // The fake Migration configuration entity.
   protected $migrationConfiguration = [
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_text_settings.yml b/core/modules/text/migration_templates/d6_text_settings.yml
similarity index 82%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_text_settings.yml
rename to core/modules/text/migration_templates/d6_text_settings.yml
index 56d3303aa..8f6fff30b 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_text_settings.yml
+++ b/core/modules/text/migration_templates/d6_text_settings.yml
@@ -11,7 +11,3 @@ process:
 destination:
   plugin: config
   config_name: text.settings
-dependencies:
-  module:
-    - migrate_drupal
-    - text
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateTextConfigsTest.php b/core/modules/text/src/Tests/Migrate/d6/MigrateTextConfigsTest.php
similarity index 64%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateTextConfigsTest.php
rename to core/modules/text/src/Tests/Migrate/d6/MigrateTextConfigsTest.php
index 915f7dc43..929d72dde 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateTextConfigsTest.php
+++ b/core/modules/text/src/Tests/Migrate/d6/MigrateTextConfigsTest.php
@@ -2,19 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateTextConfigsTest.
+ * Contains \Drupal\text\Tests\Migrate\d6\MigrateTextConfigsTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\text\Tests\Migrate\d6;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to text.settings.yml.
  *
- * @group migrate_drupal
+ * @group text
  */
 class MigrateTextConfigsTest extends MigrateDrupal6TestBase {
 
@@ -32,13 +31,8 @@ class MigrateTextConfigsTest extends MigrateDrupal6TestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $migration = entity_load('migration', 'd6_text_settings');
-    $dumps = array(
-      $this->getDumpDirectory() . '/Variable.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->loadDumps(['Variable.php']);
+    $this->executeMigration('d6_text_settings');
   }
 
   /**
diff --git a/core/modules/toolbar/js/toolbar.js b/core/modules/toolbar/js/toolbar.js
index cd44b7f20..ed4068c10 100644
--- a/core/modules/toolbar/js/toolbar.js
+++ b/core/modules/toolbar/js/toolbar.js
@@ -79,7 +79,8 @@
         // asynchronously.
         Drupal.toolbar.setSubtrees.done(function (subtrees) {
           menuModel.set('subtrees', subtrees);
-          localStorage.setItem('Drupal.toolbar.subtrees', JSON.stringify(subtrees));
+          var theme = drupalSettings.ajaxPageState.theme;
+          localStorage.setItem('Drupal.toolbar.subtrees.' + theme, JSON.stringify(subtrees));
           // Indicate on the toolbarModel that subtrees are now loaded.
           model.set('areSubtreesLoaded', true);
         });
@@ -233,4 +234,15 @@
       '</div></div>';
   };
 
+  /**
+   * Ajax command to set the toolbar subtrees.
+   *
+   * @param {Drupal.Ajax} ajax
+   * @param {object} response
+   * @param {number} [status]
+   */
+  Drupal.AjaxCommands.prototype.setToolbarSubtrees = function (ajax, response, status) {
+    Drupal.toolbar.setSubtrees.resolve(response.subtrees);
+  };
+
 }(jQuery, Drupal, drupalSettings));
diff --git a/core/modules/toolbar/js/views/ToolbarVisualView.js b/core/modules/toolbar/js/views/ToolbarVisualView.js
index 3459404bb..456e60278 100644
--- a/core/modules/toolbar/js/views/ToolbarVisualView.js
+++ b/core/modules/toolbar/js/views/ToolbarVisualView.js
@@ -249,7 +249,8 @@
     },
 
     /**
-     * Calls the endpoint URI that will return rendered subtrees with JSONP.
+     * Calls the endpoint URI that builds an AJAX command with the rendered
+     * subtrees.
      *
      * The rendered admin menu subtrees HTML is cached on the client in
      * localStorage until the cache of the admin menu subtrees on the server-
@@ -267,10 +268,10 @@
       //   (3) The orientation of the tray is vertical.
       if (!this.model.get('areSubtreesLoaded') && typeof $activeTab.data('drupal-subtrees') !== 'undefined' && orientation === 'vertical') {
         var subtreesHash = drupalSettings.toolbar.subtreesHash;
-        var langcode = drupalSettings.toolbar.langcode;
-        var endpoint = Drupal.url('toolbar/subtrees/' + subtreesHash + '/' + langcode);
-        var cachedSubtreesHash = localStorage.getItem('Drupal.toolbar.subtreesHash');
-        var cachedSubtrees = JSON.parse(localStorage.getItem('Drupal.toolbar.subtrees'));
+        var theme = drupalSettings.ajaxPageState.theme;
+        var endpoint = Drupal.url('toolbar/subtrees/' + subtreesHash);
+        var cachedSubtreesHash = localStorage.getItem('Drupal.toolbar.subtreesHash.' + theme);
+        var cachedSubtrees = JSON.parse(localStorage.getItem('Drupal.toolbar.subtrees.' + theme));
         var isVertical = this.model.get('orientation') === 'vertical';
         // If we have the subtrees in localStorage and the subtree hash has not
         // changed, then use the cached data.
@@ -281,13 +282,13 @@
         // toolbar is vertical.
         else if (isVertical) {
           // Remove the cached menu information.
-          localStorage.removeItem('Drupal.toolbar.subtreesHash');
-          localStorage.removeItem('Drupal.toolbar.subtrees');
-          // The response from the server will call the resolve method of the
+          localStorage.removeItem('Drupal.toolbar.subtreesHash.' + theme);
+          localStorage.removeItem('Drupal.toolbar.subtrees.' + theme);
+          // The AJAX response's command will trigger the resolve method of the
           // Drupal.toolbar.setSubtrees Promise.
-          $.ajax(endpoint);
+          Drupal.ajax({url: endpoint}).execute();
           // Cache the hash for the subtrees locally.
-          localStorage.setItem('Drupal.toolbar.subtreesHash', subtreesHash);
+          localStorage.setItem('Drupal.toolbar.subtreesHash.' + theme, subtreesHash);
         }
       }
     }
diff --git a/core/modules/toolbar/src/Ajax/SetSubtreesCommand.php b/core/modules/toolbar/src/Ajax/SetSubtreesCommand.php
new file mode 100644
index 000000000..d9015d81c
--- /dev/null
+++ b/core/modules/toolbar/src/Ajax/SetSubtreesCommand.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\toolbar\Ajax\SetSubtreesCommand.
+ */
+
+namespace Drupal\toolbar\Ajax;
+
+use Drupal\Core\Ajax\CommandInterface;
+
+/**
+ * Defines an AJAX command that sets the toolbar subtrees.
+ */
+class SetSubtreesCommand implements CommandInterface {
+
+  /**
+   * The toolbar subtrees.
+   *
+   * @var array
+   */
+  protected $subtrees;
+
+  /**
+   * Constructs a SetSubtreesCommand object.
+   *
+   * @param array $subtrees
+   *   The toolbar subtrees that will be set.
+   */
+  public function __construct($subtrees) {
+    $this->subtrees = $subtrees;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function render() {
+    return [
+      'command' => 'setToolbarSubtrees',
+      'subtrees' => array_map('strval', $this->subtrees),
+    ];
+  }
+
+}
diff --git a/core/modules/toolbar/src/Controller/ToolbarController.php b/core/modules/toolbar/src/Controller/ToolbarController.php
index 5a8842ab7..a158deeb2 100644
--- a/core/modules/toolbar/src/Controller/ToolbarController.php
+++ b/core/modules/toolbar/src/Controller/ToolbarController.php
@@ -8,8 +8,9 @@
 namespace Drupal\toolbar\Controller;
 
 use Drupal\Core\Access\AccessResult;
+use Drupal\Core\Ajax\AjaxResponse;
 use Drupal\Core\Controller\ControllerBase;
-use Symfony\Component\HttpFoundation\JsonResponse;
+use Drupal\toolbar\Ajax\SetSubtreesCommand;
 
 /**
  * Defines a controller for the toolbar module.
@@ -17,14 +18,14 @@ use Symfony\Component\HttpFoundation\JsonResponse;
 class ToolbarController extends ControllerBase {
 
   /**
-   * Returns the rendered subtree of each top-level toolbar link.
+   * Returns an AJAX response to render the toolbar subtrees.
    *
-   * @return \Symfony\Component\HttpFoundation\JsonResponse
+   * @return \Drupal\Core\Ajax\AjaxResponse
    */
-  public function subtreesJsonp() {
-    $subtrees = toolbar_get_rendered_subtrees();
-    $response = new JsonResponse($subtrees);
-    $response->setCallback('Drupal.toolbar.setSubtrees.resolve');
+  public function subtreesAjax() {
+    list($subtrees, $cacheability) = toolbar_get_rendered_subtrees();
+    $response = new AjaxResponse();
+    $response->addCommand(new SetSubtreesCommand($subtrees));
 
     // The Expires HTTP header is the heart of the client-side HTTP caching. The
     // additional server-side page cache only takes effect when the client
@@ -46,14 +47,12 @@ class ToolbarController extends ControllerBase {
    *
    * @param string $hash
    *   The hash of the toolbar subtrees.
-   * @param string $langcode
-   *   The langcode of the requested site, NULL if none given.
    *
    * @return \Drupal\Core\Access\AccessResultInterface
    *   The access result.
    */
-  public function checkSubTreeAccess($hash, $langcode) {
-    return AccessResult::allowedIf($this->currentUser()->hasPermission('access toolbar') && $hash == _toolbar_get_subtrees_hash($langcode))->cachePerPermissions();
+  public function checkSubTreeAccess($hash) {
+    return AccessResult::allowedIf($this->currentUser()->hasPermission('access toolbar') && $hash == _toolbar_get_subtrees_hash()[0])->cachePerPermissions();
   }
 
 }
diff --git a/core/modules/toolbar/src/Tests/ToolbarAdminMenuTest.php b/core/modules/toolbar/src/Tests/ToolbarAdminMenuTest.php
index 0f8ad4975..3139b5da7 100644
--- a/core/modules/toolbar/src/Tests/ToolbarAdminMenuTest.php
+++ b/core/modules/toolbar/src/Tests/ToolbarAdminMenuTest.php
@@ -9,6 +9,7 @@ namespace Drupal\toolbar\Tests;
 
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Language\LanguageInterface;
+use Drupal\Core\Url;
 use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\simpletest\WebTestBase;
 use Drupal\user\RoleInterface;
@@ -118,7 +119,7 @@ class ToolbarAdminMenuTest extends WebTestBase {
     // Enable a module.
     $edit = array();
     $edit['modules[Core][taxonomy][enable]'] = TRUE;
-    $this->drupalPostForm('admin/modules', $edit, t('Save configuration'));
+    $this->drupalPostForm('admin/modules', $edit, t('Install'));
     $this->rebuildContainer();
 
     // Assert that the subtrees hash has been altered because the subtrees
@@ -209,98 +210,11 @@ class ToolbarAdminMenuTest extends WebTestBase {
     $this->assertEqual($admin_user_2_hash, $new_subtree_hash, 'The user-specific subtree menu hash has not been updated.');
   }
 
-  /**
-   * Tests that all toolbar cache entries for a user are cleared with a cache
-   * tag for that user, i.e. cache entries for all languages for that user.
-   */
-  function testCacheClearByCacheTag() {
-    // Test that the toolbar admin menu subtrees cache is invalidated for a user
-    // across multiple languages.
-    $this->drupalLogin($this->adminUser);
-    $toolbarCache = $this->container->get('cache.toolbar');
-    $admin_user_id = $this->adminUser->id();
-    $admin_user_2_id = $this->adminUser2->id();
-
-    // Assert that a cache tag in the toolbar cache under the key "user" exists
-    // for adminUser against the language "en".
-    $cache = $toolbarCache->get('toolbar_' . $admin_user_id . ':' . 'en');
-    $this->assertEqual(in_array('user:' . $admin_user_id, $cache->tags), 'A cache tag in the toolbar cache under the key "user" exists for admin_user against the language "en".');
-
-    // Assert that no toolbar cache exists for adminUser against the
-    // language "fr".
-    $cache = $toolbarCache->get('toolbar_' . $admin_user_id . ':' . 'fr');
-    $this->assertFalse($cache, 'No toolbar cache exists for admin_user against the language "fr".');
-
-    // Install a second language.
-    $edit = array(
-      'predefined_langcode' => 'fr',
-    );
-    $this->drupalPostForm('admin/config/regional/language/add', $edit, 'Add language');
-
-    // Request a page in 'fr' to update the cache.
-    $this->drupalGet('fr/test-page');
-    $this->assertResponse(200);
-
-    // Assert that a cache tag in the toolbar cache under the key "user" exists
-    // for adminUser against the language "fr".
-    $cache = $toolbarCache->get('toolbar_' . $admin_user_id . ':' . 'fr');
-    $this->assertEqual(in_array('user:' . $admin_user_id, $cache->tags), 'A cache tag in the toolbar cache under the key "user" exists for admin_user against the language "fr".');
-
-    // Log in the adminUser2 user. We will use this user as a control to
-    // verify that clearing a cache tag for adminUser does not clear the cache
-    // for adminUser2.
-    $this->drupalLogin($this->adminUser2);
-
-    // Request a page in 'en' to create the cache.
-    $this->drupalGet('test-page');
-    $this->assertResponse(200);
-    // Assert that a cache tag in the toolbar cache under the key "user" exists
-    // for adminUser2 against the language "en".
-    $cache = $toolbarCache->get('toolbar_' . $admin_user_2_id . ':' . 'en');
-    $this->assertEqual(in_array('user:' . $admin_user_2_id, $cache->tags), 'A cache tag in the toolbar cache under the key "user" exists for admin_user_2 against the language "en".');
-
-    // Request a page in 'fr' to create the cache.
-    $this->drupalGet('fr/test-page');
-    $this->assertResponse(200);
-    // Assert that a cache tag in the toolbar cache under the key "user" exists
-    // for adminUser against the language "fr".
-    $cache = $toolbarCache->get('toolbar_' . $admin_user_2_id . ':' . 'fr');
-    $this->assertEqual(in_array('user:' . $admin_user_2_id, $cache->tags), 'A cache tag in the toolbar cache under the key "user" exists for admin_user_2 against the language "fr".');
-
-    // Log in the admin user and clear the caches for this user using a tag.
-    $this->drupalLogin($this->adminUser);
-    Cache::invalidateTags(array('user:' . $admin_user_id));
-
-    // Assert that no toolbar cache exists for adminUser against the
-    // language "en".
-    $cache = $toolbarCache->get($admin_user_id . ':' . 'en');
-    $this->assertFalse($cache, 'No toolbar cache exists for admin_user against the language "en".');
-
-    // Assert that no toolbar cache exists for adminUser against the
-    // language "fr".
-    $cache = $toolbarCache->get($admin_user_id . ':' . 'fr');
-    $this->assertFalse($cache, 'No toolbar cache exists for admin_user against the language "fr".');
-
-    // Log in adminUser2 and verify that this user's caches still exist.
-    $this->drupalLogin($this->adminUser2);
-
-    // Assert that a cache tag in the toolbar cache under the key "user" exists
-    // for adminUser2 against the language "en".
-    $cache = $toolbarCache->get('toolbar_' . $admin_user_2_id . ':' . 'en');
-    $this->assertEqual(in_array('user:' . $admin_user_2_id, $cache->tags), 'A cache tag in the toolbar cache under the key "user" exists for admin_user_2 against the language "en".');
-
-    // Assert that a cache tag in the toolbar cache under the key "user" exists
-    // for adminUser2 against the language "fr".
-    $cache = $toolbarCache->get('toolbar_' . $admin_user_2_id . ':' . 'fr');
-    $this->assertEqual(in_array('user:' . $admin_user_2_id, $cache->tags), 'A cache tag in the toolbar cache under the key "user" exists for admin_user_2 against the language "fr".');
-  }
-
   /**
    * Tests that changes to a user account by another user clears the changed
    * account's toolbar cached, not the user's who took the action.
    */
   function testNonCurrentUserAccountUpdates() {
-    $toolbarCache = $this->container->get('cache.toolbar');
     $admin_user_id = $this->adminUser->id();
     $admin_user_2_id = $this->adminUser2->id();
     $this->hash = $this->getSubtreesHash();
@@ -337,9 +251,7 @@ class ToolbarAdminMenuTest extends WebTestBase {
    * Tests that toolbar cache is cleared when string translations are made.
    */
   function testLocaleTranslationSubtreesHashCacheClear() {
-    $toolbarCache = $this->container->get('cache.toolbar');
     $admin_user = $this->adminUser;
-    $admin_user_id = $this->adminUser->id();
     // User to translate and delete string.
     $translate_user = $this->drupalCreateUser(array('translate interface', 'access administration pages'));
 
@@ -373,11 +285,6 @@ class ToolbarAdminMenuTest extends WebTestBase {
     $this->drupalGet($langcode . '/test-page');
     $this->assertResponse(200);
 
-    // Assert that a cache tag in the toolbar cache under the key "user" exists
-    // for adminUser against the language "xx".
-    $cache = $toolbarCache->get('toolbar_' . $admin_user_id . ':' . $langcode);
-    $this->assertEqual(in_array('user:' . $admin_user_id, $cache->tags), 'A cache tag in the toolbar cache under the key "user" exists for admin_user against the language "xx".');
-
     // Get a baseline hash for the admin menu subtrees before translating one
     // of the menu link items.
     $original_subtree_hash = $this->getSubtreesHash();
@@ -425,7 +332,7 @@ class ToolbarAdminMenuTest extends WebTestBase {
   }
 
   /**
-   * Tests that the 'toolbar/subtrees/{hash}' is reachable.
+   * Tests that the 'toolbar/subtrees/{hash}' is reachable and correct.
    */
   function testSubtreesJsonRequest() {
     $admin_user = $this->adminUser;
@@ -433,30 +340,10 @@ class ToolbarAdminMenuTest extends WebTestBase {
     // Request a new page to refresh the drupalSettings object.
     $subtrees_hash = $this->getSubtreesHash();
 
-    $this->drupalGetJSON('toolbar/subtrees/' . $subtrees_hash);
-    $this->assertResponse('200');
-
-    // Test that the subtrees hash changes with a different language code and
-    // that JSON is returned when a language code is specified.
-    // Create a new language with the langcode 'xx'.
-    $langcode = 'xx';
-    // The English name for the language. This will be translated.
-    $name = $this->randomMachineName(16);
-    $edit = array(
-      'predefined_langcode' => 'custom',
-      'langcode' => $langcode,
-      'label' => $name,
-      'direction' => LanguageInterface::DIRECTION_LTR,
-    );
-    $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
-
-    // Get a page with the new language langcode in the URL.
-    $this->drupalGet('xx/test-page');
-    // Request a new page to refresh the drupalSettings object.
-    $subtrees_hash = $this->getSubtreesHash();
-
-    $this->drupalGetJSON('toolbar/subtrees/' . $subtrees_hash . '/' . $langcode);
+    $ajax_result = $this->drupalGetAjax('toolbar/subtrees/' . $subtrees_hash);
     $this->assertResponse('200');
+    $this->assertEqual($ajax_result[0]['command'], 'setToolbarSubtrees', 'Subtrees response uses the correct command.');
+    $this->assertEqual(array_keys($ajax_result[0]['subtrees']), ['system-admin_content', 'system-admin_structure', 'system-themes_page', 'system-modules_list', 'system-admin_config', 'entity-user-collection', 'front'], 'Correct subtrees returned.');
   }
 
   /**
@@ -493,6 +380,26 @@ class ToolbarAdminMenuTest extends WebTestBase {
     $this->assertTrue($back_link);
   }
 
+  /**
+   * Tests that external links added to the menu appear in the toolbar.
+   */
+  public function testExternalLink() {
+    $edit = [
+      'title[0][value]' => 'External URL',
+      'link[0][uri]' => 'http://example.org',
+      'menu_parent' => 'admin:system.admin',
+    ];
+    $this->drupalPostForm('admin/structure/menu/manage/admin/add', $edit, 'Save');
+
+    // Assert that the new menu link is shown on the menu link listing.
+    $this->drupalGet('admin/structure/menu/manage/admin');
+    $this->assertText('External URL');
+
+    // Assert that the new menu link is shown in the toolbar on a regular page.
+    $this->drupalGet(Url::fromRoute('<front>'));
+    $this->assertText('External URL');
+  }
+
   /**
    * Get the hash value from the admin menu subtrees route path.
    *
diff --git a/core/modules/toolbar/toolbar.breakpoints.yml b/core/modules/toolbar/toolbar.breakpoints.yml
index df9f61b5c..a68784a80 100644
--- a/core/modules/toolbar/toolbar.breakpoints.yml
+++ b/core/modules/toolbar/toolbar.breakpoints.yml
@@ -1,7 +1,7 @@
 toolbar.narrow:
   label: narrow
   mediaQuery: 'only screen and (min-width: 16.5em)'
-  weight: 2
+  weight: 0
   multipliers:
     - 1x
 toolbar.standard:
@@ -13,6 +13,6 @@ toolbar.standard:
 toolbar.wide:
   label: wide
   mediaQuery: 'only screen and (min-width: 61em)'
-  weight: 0
+  weight: 2
   multipliers:
     - 1x
diff --git a/core/modules/toolbar/toolbar.libraries.yml b/core/modules/toolbar/toolbar.libraries.yml
index df3f66046..dcef0841b 100644
--- a/core/modules/toolbar/toolbar.libraries.yml
+++ b/core/modules/toolbar/toolbar.libraries.yml
@@ -22,6 +22,7 @@ toolbar:
     - core/jquery
     - core/drupal
     - core/drupalSettings
+    - core/drupal.ajax
     - core/drupal.announce
     - core/backbone
     - core/matchmedia
diff --git a/core/modules/toolbar/toolbar.module b/core/modules/toolbar/toolbar.module
index af992d164..d837b176a 100644
--- a/core/modules/toolbar/toolbar.module
+++ b/core/modules/toolbar/toolbar.module
@@ -6,6 +6,7 @@
  */
 
 use Drupal\Core\Cache\Cache;
+use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Menu\MenuTreeParameters;
 use Drupal\Core\Render\Element;
 use Drupal\Core\Routing\RouteMatchInterface;
@@ -13,7 +14,6 @@ use Drupal\Core\Template\Attribute;
 use Drupal\Component\Datetime\DateTimePlus;
 use Drupal\Component\Utility\Crypt;
 use Drupal\Component\Utility\SafeMarkup;
-use Drupal\user\Entity\Role;
 use Drupal\Core\Url;
 
 /**
@@ -158,10 +158,9 @@ function toolbar_toolbar() {
   // toolbar_subtrees route. We provide the JavaScript requesting that JSONP
   // script here with the hash parameter that is needed for that route.
   // @see toolbar_subtrees_jsonp()
-  $langcode = \Drupal::languageManager()->getCurrentLanguage()->getId();
+  list($hash, $hash_cacheability) = _toolbar_get_subtrees_hash();
   $subtrees_attached['drupalSettings']['toolbar'] = [
-    'subtreesHash' => _toolbar_get_subtrees_hash($langcode),
-    'langcode' => $langcode,
+    'subtreesHash' => $hash,
   ];
 
   // The administration element has a link that is themed to correspond to
@@ -198,6 +197,7 @@ function toolbar_toolbar() {
     ),
     '#weight' => -15,
   );
+  $hash_cacheability->applyTo($items['administration']);
 
   return $items;
 }
@@ -215,10 +215,13 @@ function toolbar_toolbar() {
  */
 function toolbar_prerender_toolbar_administration_tray(array $element) {
   $menu_tree = \Drupal::service('toolbar.menu_tree');
-  // Render the top-level administration menu links.
+  // Load the administrative menu. The first level is the "Administration" link.
+  // In order to load the children of that link, start and end on the second
+  // level.
   $parameters = new MenuTreeParameters();
-  $parameters->setRoot('system.admin')->excludeRoot()->setTopLevelOnly()->onlyEnabledLinks();
-  $tree = $menu_tree->load(NULL, $parameters);
+  $parameters->setMinDepth(2)->setMaxDepth(2)->onlyEnabledLinks();
+  // @todo Make the menu configurable in https://www.drupal.org/node/1869638.
+  $tree = $menu_tree->load('admin', $parameters);
   $manipulators = array(
     array('callable' => 'menu.default_tree_manipulators:checkAccess'),
     array('callable' => 'menu.default_tree_manipulators:generateIndexAndSort'),
@@ -248,7 +251,7 @@ function toolbar_menu_navigation_links(array $tree) {
     // and behaviors to the menu links.
     $link = $element->link;
     $url = $link->getUrlObject();
-    if ($url->isExternal()) {
+    if (!$url->isRouted()) {
       // This is an unusual case, so just get a distinct, safe string.
       $id = substr(Crypt::hashBase64($url->getUri()), 0, 16);
     }
@@ -269,12 +272,38 @@ function toolbar_menu_navigation_links(array $tree) {
 
 /**
  * Returns the rendered subtree of each top-level toolbar link.
+ *
+ * @return array
+ *   An array with the following key-value pairs:
+ *   - 'subtrees': the rendered subtrees
+ *   - 'cacheability: the associated cacheability.
  */
 function toolbar_get_rendered_subtrees() {
+  $data = [
+    '#pre_render' => ['_toolbar_do_get_rendered_subtrees'],
+    '#cache' => [
+      'keys' => [
+        'toolbar_rendered_subtrees',
+      ],
+    ],
+    '#cache_properties' => ['#subtrees'],
+  ];
+  \Drupal::service('renderer')->renderPlain($data);
+  return [$data['#subtrees'], CacheableMetadata::createFromRenderArray($data)];
+}
+
+/**
+ * #pre_render callback for toolbar_get_rendered_subtrees().
+ */
+function _toolbar_do_get_rendered_subtrees(array $data) {
   $menu_tree = \Drupal::service('toolbar.menu_tree');
+  // Load the administration menu. The first level is the "Administration" link.
+  // In order to load the children of that link and the subsequent two levels,
+  // start at the second level and end at the fourth.
   $parameters = new MenuTreeParameters();
-  $parameters->setRoot('system.admin')->excludeRoot()->setMaxDepth(3)->onlyEnabledLinks();
-  $tree = $menu_tree->load(NULL, $parameters);
+  $parameters->setMinDepth(2)->setMaxDepth(4)->onlyEnabledLinks();
+  // @todo Make the menu configurable in https://www.drupal.org/node/1869638.
+  $tree = $menu_tree->load('admin', $parameters);
   $manipulators = array(
     array('callable' => 'menu.default_tree_manipulators:checkAccess'),
     array('callable' => 'menu.default_tree_manipulators:generateIndexAndSort'),
@@ -282,65 +311,42 @@ function toolbar_get_rendered_subtrees() {
   );
   $tree = $menu_tree->transform($tree, $manipulators);
   $subtrees = array();
+  // Calculated the combined cacheability of all subtrees.
+  $cacheability = new CacheableMetadata();
   foreach ($tree as $element) {
     /** @var \Drupal\Core\Menu\MenuLinkInterface $link */
     $link = $element->link;
     if ($element->subtree) {
       $subtree = $menu_tree->build($element->subtree);
       $output = \Drupal::service('renderer')->renderPlain($subtree);
+      $cacheability = $cacheability->merge(CacheableMetadata::createFromRenderArray($subtree));
     }
     else {
       $output = '';
     }
     // Many routes have dots as route name, while some special ones like <front>
     // have <> characters in them.
-    $id = str_replace(array('.', '<', '>'), array('-', '', '' ), $link->getUrlObject()->getRouteName());
+    $url = $link->getUrlObject();
+    $id = str_replace(array('.', '<', '>'), array('-', '', '' ), $url->isRouted() ? $url->getRouteName() : $url->getUri());
 
     $subtrees[$id] = $output;
   }
-  return $subtrees;
+
+  // Store the subtrees, along with the cacheability metadata.
+  $cacheability->applyTo($data);
+  $data['#subtrees'] = $subtrees;
+
+  return $data;
 }
 
 /**
  * Returns the hash of the per-user rendered toolbar subtrees.
  *
- * @param string $langcode
- *   The langcode of the current request.
- *
  * @return string
  *   The hash of the admin_menu subtrees.
  */
-function _toolbar_get_subtrees_hash($langcode) {
-  $uid = \Drupal::currentUser()->id();
-  $cid = _toolbar_get_user_cid($uid, $langcode);
-  if ($cache = \Drupal::cache('toolbar')->get($cid)) {
-    $hash = $cache->data;
-  }
-  else {
-    $subtrees = toolbar_get_rendered_subtrees();
-    $hash = Crypt::hashBase64(serialize($subtrees));
-    // Cache using a tag 'user' so that we can invalidate all user-specific
-    // caches later, based on the user's ID regardless of language.
-    // Clear the cache when the 'locale' tag is deleted. This ensures a fresh
-    // subtrees rendering when string translations are made.
-    $role_list_cache_tags = \Drupal::entityManager()->getDefinition('user_role')->getListCacheTags();
-    \Drupal::cache('toolbar')->set($cid, $hash, Cache::PERMANENT, Cache::mergeTags(array('user:' . $uid, 'locale', 'config:system.menu.admin'), $role_list_cache_tags));
-  }
-  return $hash;
+function _toolbar_get_subtrees_hash() {
+  list($subtrees, $cacheability) = toolbar_get_rendered_subtrees();
+  $hash = Crypt::hashBase64(serialize($subtrees));
+  return [$hash, $cacheability];
 }
-
-/**
- * Returns a cache ID from the user and language IDs.
- *
- * @param int $uid
- *   A user ID.
- * @param string $langcode
- *   The langcode of the current request.
- *
- * @return string
- *   A unique cache ID for the user.
- */
-function _toolbar_get_user_cid($uid, $langcode) {
-  return 'toolbar_' . $uid . ':' . $langcode;
-}
-
diff --git a/core/modules/toolbar/toolbar.routing.yml b/core/modules/toolbar/toolbar.routing.yml
index 4cb014e53..0f9dcf8ac 100644
--- a/core/modules/toolbar/toolbar.routing.yml
+++ b/core/modules/toolbar/toolbar.routing.yml
@@ -1,7 +1,8 @@
 toolbar.subtrees:
-  path: '/toolbar/subtrees/{hash}/{langcode}'
+  path: '/toolbar/subtrees/{hash}'
   defaults:
-    _controller: '\Drupal\toolbar\Controller\ToolbarController::subtreesJsonp'
-    langcode: null
+    _controller: '\Drupal\toolbar\Controller\ToolbarController::subtreesAjax'
+  options:
+    _theme: ajax_base_page
   requirements:
     _custom_access: '\Drupal\toolbar\Controller\ToolbarController::checkSubTreeAccess'
diff --git a/core/modules/tour/src/Tests/TourCacheTagsTest.php b/core/modules/tour/src/Tests/TourCacheTagsTest.php
index 1c4c32345..8d2814ff9 100644
--- a/core/modules/tour/src/Tests/TourCacheTagsTest.php
+++ b/core/modules/tour/src/Tests/TourCacheTagsTest.php
@@ -52,6 +52,7 @@ class TourCacheTagsTest extends PageCacheTagsTestBase {
     // Verify a cache hit, but also the presence of the correct cache tags.
     $expected_tags = [
       'config:tour.tour.tour-test',
+      'config:user.role.anonymous',
       'rendered',
     ];
     $this->verifyPageCache($url, 'HIT', $expected_tags);
@@ -71,6 +72,7 @@ class TourCacheTagsTest extends PageCacheTagsTestBase {
 
     // Verify a cache hit.
     $expected_tags = [
+      'config:user.role.anonymous',
       'rendered',
     ];
     $this->verifyPageCache($url, 'HIT', $expected_tags);
diff --git a/core/modules/tracker/js/tracker-history.js b/core/modules/tracker/js/tracker-history.js
new file mode 100644
index 000000000..fa6af55b8
--- /dev/null
+++ b/core/modules/tracker/js/tracker-history.js
@@ -0,0 +1,122 @@
+/**
+ * Attaches behaviors for the Tracker module's History module integration.
+ *
+ * May only be loaded for authenticated users, with the History module enabled.
+ */
+(function ($, Drupal, window) {
+
+  "use strict";
+
+  /**
+   * Render "new" and "updated" node indicators, as well as "X new" replies links.
+   */
+  Drupal.behaviors.trackerHistory = {
+    attach: function (context) {
+      // Find all "new" comment indicator placeholders newer than 30 days ago that
+      // have not already been read after their last comment timestamp.
+      var nodeIDs = [];
+      var $nodeNewPlaceholders = $(context)
+        .find('[data-history-node-timestamp]')
+        .once('history')
+        .filter(function () {
+          var nodeTimestamp = parseInt(this.getAttribute('data-history-node-timestamp'), 10);
+          var nodeID = this.getAttribute('data-history-node-id');
+          if (Drupal.history.needsServerCheck(nodeID, nodeTimestamp)) {
+            nodeIDs.push(nodeID);
+            return true;
+          }
+          else {
+            return false;
+          }
+        });
+
+      // Find all "new" comment indicator placeholders newer than 30 days ago that
+      // have not already been read after their last comment timestamp.
+      var $newRepliesPlaceholders = $(context)
+        .find('[data-history-node-last-comment-timestamp]')
+        .once('history')
+        .filter(function () {
+          var lastCommentTimestamp = parseInt(this.getAttribute('data-history-node-last-comment-timestamp'), 10);
+          var nodeTimestamp = parseInt(this.previousSibling.previousSibling.getAttribute('data-history-node-timestamp'), 10);
+          // Discard placeholders that have zero comments.
+          if (lastCommentTimestamp === nodeTimestamp) {
+            return false;
+          }
+          var nodeID = this.previousSibling.previousSibling.getAttribute('data-history-node-id');
+          if (Drupal.history.needsServerCheck(nodeID, lastCommentTimestamp)) {
+            if (nodeIDs.indexOf(nodeID) === -1) {
+              nodeIDs.push(nodeID);
+            }
+            return true;
+          }
+          else {
+            return false;
+          }
+        });
+
+      if ($nodeNewPlaceholders.length === 0 && $newRepliesPlaceholders.length === 0) {
+        return;
+      }
+
+      // Fetch the node read timestamps from the server.
+      Drupal.history.fetchTimestamps(nodeIDs, function () {
+        processNodeNewIndicators($nodeNewPlaceholders);
+        processNewRepliesIndicators($newRepliesPlaceholders);
+      });
+    }
+  };
+
+  function processNodeNewIndicators($placeholders) {
+    var newNodeString = Drupal.t('new');
+    var updatedNodeString = Drupal.t('updated');
+
+    $placeholders.each(function (index, placeholder) {
+      var timestamp = parseInt(placeholder.getAttribute('data-history-node-timestamp'), 10);
+      var nodeID = placeholder.getAttribute('data-history-node-id');
+      var lastViewTimestamp = Drupal.history.getLastRead(nodeID);
+
+      if (timestamp > lastViewTimestamp) {
+        var message = (lastViewTimestamp === 0) ? newNodeString : updatedNodeString;
+        $(placeholder).append('<span class="marker">' + message + '</span>');
+      }
+    });
+  }
+
+  function processNewRepliesIndicators($placeholders) {
+    // Figure out which placeholders need the "x new" replies links.
+    var placeholdersToUpdate = {};
+    $placeholders.each(function (index, placeholder) {
+      var timestamp = parseInt(placeholder.getAttribute('data-history-node-last-comment-timestamp'), 10);
+      var nodeID = placeholder.previousSibling.previousSibling.getAttribute('data-history-node-id');
+      var lastViewTimestamp = Drupal.history.getLastRead(nodeID);
+
+      // Queue this placeholder's "X new" replies link to be downloaded from the
+      // server.
+      if (timestamp > lastViewTimestamp) {
+        placeholdersToUpdate[nodeID] = placeholder;
+      }
+    });
+
+    // Perform an AJAX request to retrieve node view timestamps.
+    var nodeIDs = Object.keys(placeholdersToUpdate);
+    if (nodeIDs.length === 0) {
+      return;
+    }
+    $.ajax({
+      url: Drupal.url('comments/render_new_comments_node_links'),
+      type: 'POST',
+      data: {'node_ids[]': nodeIDs},
+      dataType: 'json',
+      success: function (results) {
+        for (var nodeID in results) {
+          if (results.hasOwnProperty(nodeID) && placeholdersToUpdate.hasOwnProperty(nodeID)) {
+            var url = results[nodeID].first_new_comment_link;
+            var text = Drupal.formatPlural(results[nodeID].new_comment_count, '1 new', '@count new');
+            $(placeholdersToUpdate[nodeID]).append('<br /><a href="' + url + '">' + text + '</a>');
+          }
+        }
+      }
+    });
+  }
+
+})(jQuery, Drupal, window);
diff --git a/core/modules/tracker/src/Tests/TrackerTest.php b/core/modules/tracker/src/Tests/TrackerTest.php
index 391355564..c57f1c98d 100644
--- a/core/modules/tracker/src/Tests/TrackerTest.php
+++ b/core/modules/tracker/src/Tests/TrackerTest.php
@@ -10,7 +10,9 @@ namespace Drupal\tracker\Tests;
 use Drupal\comment\CommentInterface;
 use Drupal\comment\Tests\CommentTestTrait;
 use Drupal\Core\Cache\Cache;
+use Drupal\Core\Session\AccountInterface;
 use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\node\Entity\Node;
 use Drupal\simpletest\WebTestBase;
 use Drupal\system\Tests\Cache\AssertPageCacheContextsAndTagsTrait;
 
@@ -54,6 +56,10 @@ class TrackerTest extends WebTestBase {
     $this->user = $this->drupalCreateUser($permissions);
     $this->otherUser = $this->drupalCreateUser($permissions);
     $this->addDefaultCommentField('node', 'page');
+    user_role_grant_permissions(AccountInterface::ANONYMOUS_ROLE, array(
+      'access content',
+      'access user profiles',
+    ));
   }
 
   /**
@@ -79,7 +85,9 @@ class TrackerTest extends WebTestBase {
     // Assert cache contexts, specifically the pager and node access contexts.
     $this->assertCacheContexts(['languages:language_interface', 'theme', 'url.query_args.pagers:0', 'user.node_grants:view', 'user.permissions']);
     // Assert cache tags for the visible node and node list cache tag.
-    $this->assertCacheTags(Cache::mergeTags($published->getCacheTags(), $published->getOwner()->getCacheTags(), ['node_list', 'rendered']));
+    $expected_tags = Cache::mergeTags($published->getCacheTags(), $published->getOwner()->getCacheTags());
+    $expected_tags = Cache::mergeTags($expected_tags, ['node_list', 'rendered']);
+    $this->assertCacheTags($expected_tags);
 
     // Delete a node and ensure it no longer appears on the tracker.
     $published->delete();
@@ -140,19 +148,17 @@ class TrackerTest extends WebTestBase {
     $this->assertNoText($other_published_no_comment->label(), "Another user's nodes do not show up in the user's tracker listing.");
     $this->assertText($other_published_my_comment->label(), "Nodes that the user has commented on appear in the user's tracker listing.");
 
-    // Assert cache contexts; the node grant context is not directly visible due
-    // to it being implied by the user context.
-    $this->assertCacheContexts(['languages:language_interface', 'theme', 'url.query_args.pagers:0', 'user']);
+    // Assert cache contexts.
+    $this->assertCacheContexts(['languages:language_interface', 'theme', 'url.query_args.pagers:0', 'user', 'user.node_grants:view']);
     // Assert cache tags for the visible nodes (including owners) and node list
     // cache tag.
-    $tags = Cache::mergeTags(
-      $my_published->getCacheTags(),
-      $my_published->getOwner()->getCacheTags(),
-      $other_published_my_comment->getCacheTags(),
-      $other_published_my_comment->getOwner()->getCacheTags(),
-      ['node_list', 'rendered']
-    );
-    $this->assertCacheTags($tags);
+    $expected_tags = Cache::mergeTags($my_published->getCacheTags(), $my_published->getOwner()->getCacheTags());
+    $expected_tags = Cache::mergeTags($expected_tags, $other_published_my_comment->getCacheTags());
+    $expected_tags = Cache::mergeTags($expected_tags, $other_published_my_comment->getOwner()->getCacheTags());
+    $expected_tags = Cache::mergeTags($expected_tags, ['node_list', 'rendered']);
+
+    $this->assertCacheTags($expected_tags);
+    $this->assertCacheContexts(['languages:language_interface', 'theme', 'url.query_args.pagers:0', 'user', 'user.node_grants:view']);
 
     $this->assertLink($my_published->label());
     $this->assertNoLink($unpublished->label());
@@ -169,97 +175,54 @@ class TrackerTest extends WebTestBase {
   }
 
   /**
-   * Tests for the presence of the "new" flag for nodes.
+   * Tests the metadata for the "new"/"updated" indicators.
    */
-  function testTrackerNewNodes() {
+  function testTrackerHistoryMetadata() {
     $this->drupalLogin($this->user);
 
+    // Create a page node.
     $edit = array(
       'title' => $this->randomMachineName(8),
     );
-
     $node = $this->drupalCreateNode($edit);
-    $title = $edit['title'];
+
+    // Verify that the history metadata is present.
     $this->drupalGet('activity');
-    $this->assertPattern('/' . $title . '.*new/', 'New nodes are flagged as such in the activity listing.');
+    $this->assertHistoryMetadata($node->id(), $node->getChangedTime(), $node->getChangedTime());
+    $this->drupalGet('activity/' . $this->user->id());
+    $this->assertHistoryMetadata($node->id(), $node->getChangedTime(), $node->getChangedTime());
+    $this->drupalGet('user/' . $this->user->id() . '/activity');
+    $this->assertHistoryMetadata($node->id(), $node->getChangedTime(), $node->getChangedTime());
 
-    $this->drupalGet('node/' . $node->id());
-    // Simulate the JavaScript on the node page to mark the node as read.
-    // @todo Get rid of curlExec() once https://www.drupal.org/node/2074037
-    //   lands.
-    $this->curlExec(array(
-      CURLOPT_URL => \Drupal::url('history.read_node', ['node' => $node->id()], array('absolute' => TRUE)),
-      CURLOPT_HTTPHEADER => array(
-        'Accept: application/json',
-      ),
-    ));
-    $this->drupalGet('activity');
-    $this->assertNoPattern('/' . $title . '.*new/', 'Visited nodes are not flagged as new.');
-
-    $this->drupalLogin($this->otherUser);
-    $this->drupalGet('activity');
-    $this->assertPattern('/' . $title . '.*new/', 'For another user, new nodes are flagged as such in the tracker listing.');
-
-    $this->drupalGet('node/' . $node->id());
-    // Simulate the JavaScript on the node page to mark the node as read.
-    // @todo Get rid of curlExec() once https://www.drupal.org/node/2074037
-    //   lands.
-    $this->curlExec(array(
-      CURLOPT_URL => \Drupal::url('history.read_node', ['node' => $node->id()], array('absolute' => TRUE)),
-      CURLOPT_HTTPHEADER => array(
-        'Accept: application/json',
-      ),
-    ));
-    $this->drupalGet('activity');
-    $this->assertNoPattern('/' . $title . '.*new/', 'For another user, visited nodes are not flagged as new.');
-  }
-
-  /**
-   * Tests for comment counters on the tracker listing.
-   */
-  function testTrackerNewComments() {
-    $this->drupalLogin($this->user);
-
-    $node = $this->drupalCreateNode(array(
-      'title' => $this->randomMachineName(8),
-    ));
-
-    // Add a comment to the page.
+    // Add a comment to the page, make sure it is created after the node by
+    // sleeping for one second, to ensure the last comment timestamp is
+    // different from before.
     $comment = array(
       'subject[0][value]' => $this->randomMachineName(),
       'comment_body[0][value]' => $this->randomMachineName(20),
     );
-    $this->drupalPostForm('comment/reply/node/' . $node->id() . '/comment', $comment, t('Save'));
-    // The new comment is automatically viewed by the current user. Simulate the
-    // JavaScript that does this.
-    // @todo Get rid of curlExec() once https://www.drupal.org/node/2074037
-    //   lands.
-    $this->curlExec(array(
-      CURLOPT_URL => \Drupal::url('history.read_node', ['node' => $node->id()], array('absolute' => TRUE)),
-      CURLOPT_HTTPHEADER => array(
-        'Accept: application/json',
-      ),
-    ));
-
-    $this->drupalLogin($this->otherUser);
-    $this->drupalGet('activity');
-    $this->assertText('1 new', 'New comments are counted on the tracker listing pages.');
-    $this->drupalGet('node/' . $node->id());
-
-    // Add another comment as otherUser.
-    $comment = array(
-      'subject[0][value]' => $this->randomMachineName(),
-      'comment_body[0][value]' => $this->randomMachineName(20),
-    );
-    // If the comment is posted in the same second as the last one then Drupal
-    // can't tell the difference, so we wait one second here.
     sleep(1);
-    $this->drupalPostForm('comment/reply/node/' . $node->id(). '/comment', $comment, t('Save'));
+    $this->drupalPostForm('comment/reply/node/' . $node->id() . '/comment', $comment, t('Save'));
+    // Reload the node so that comment.module's hook_node_load()
+    // implementation can set $node->last_comment_timestamp for the freshly
+    // posted comment.
+    $node = Node::load($node->id());
 
-    $this->drupalLogin($this->user);
+    // Verify that the history metadata is updated.
     $this->drupalGet('activity');
-    $this->assertText('1 new', 'New comments are counted on the tracker listing pages.');
-    $this->assertLink(t('1 new'));
+    $this->assertHistoryMetadata($node->id(), $node->getChangedTime(), $node->get('comment')->last_comment_timestamp);
+    $this->drupalGet('activity/' . $this->user->id());
+    $this->assertHistoryMetadata($node->id(), $node->getChangedTime(), $node->get('comment')->last_comment_timestamp);
+    $this->drupalGet('user/' . $this->user->id() . '/activity');
+    $this->assertHistoryMetadata($node->id(), $node->getChangedTime(), $node->get('comment')->last_comment_timestamp);
+
+    // Log out, now verify that the metadata is still there, but the library is
+    // not.
+    $this->drupalLogout();
+    $this->drupalGet('activity');
+    $this->assertHistoryMetadata($node->id(), $node->getChangedTime(), $node->get('comment')->last_comment_timestamp, FALSE);
+    $this->drupalGet('user/' . $this->user->id() . '/activity');
+    $this->assertHistoryMetadata($node->id(), $node->getChangedTime(), $node->get('comment')->last_comment_timestamp, FALSE);
   }
 
   /**
@@ -371,8 +334,6 @@ class TrackerTest extends WebTestBase {
     foreach ($nodes as $i => $node) {
       $this->assertText($node->label(), format_string('Node @i is displayed on the tracker listing pages.', array('@i' => $i)));
     }
-    $this->assertText('1 new', 'One new comment is counted on the tracker listing pages.');
-    $this->assertText('updated', 'Node is listed as updated');
 
     // Fetch the site-wide tracker.
     $this->drupalGet('activity');
@@ -381,7 +342,6 @@ class TrackerTest extends WebTestBase {
     foreach ($nodes as $i => $node) {
       $this->assertText($node->label(), format_string('Node @i is displayed on the tracker listing pages.', array('@i' => $i)));
     }
-    $this->assertText('1 new', 'New comment is counted on the tracker listing pages.');
   }
 
   /**
@@ -411,4 +371,32 @@ class TrackerTest extends WebTestBase {
     $this->drupalGet('activity');
     $this->assertText(t('No content available.'), 'A node is displayed on the tracker listing pages.');
   }
+
+  /**
+   * Passes if the appropriate history metadata exists.
+   *
+   * Verify the data-history-node-id, data-history-node-timestamp and
+   * data-history-node-last-comment-timestamp attributes, which are used by the
+   * drupal.tracker-history library to add the appropriate "new" and "updated"
+   * indicators, as well as the "x new" replies link to the tracker.
+   * We do this in JavaScript to prevent breaking the render cache.
+   *
+   * @param $node_id
+   *   A node ID, that must exist as a data-history-node-id attribute
+   * @param $node_timestamp
+   *   A node timestamp, that must exist as a data-history-node-timestamp
+   *   attribute.
+   * @param $node_last_comment_timestamp
+   *   A node's last comment timestamp, that must exist as a
+   *   data-history-node-last-comment-timestamp attribute.
+   * @param bool $library_is_present
+   *   Whether the drupal.tracker-history library should be present or not.
+   */
+  function assertHistoryMetadata($node_id, $node_timestamp, $node_last_comment_timestamp, $library_is_present = TRUE) {
+    $settings = $this->getDrupalSettings();
+    $this->assertIdentical($library_is_present, isset($settings['ajaxPageState']) && in_array('tracker/history', explode(',', $settings['ajaxPageState']['libraries'])), 'drupal.tracker-history library is present.');
+    $this->assertIdentical(1, count($this->xpath('//table/tbody/tr/td[@data-history-node-id="' . $node_id . '" and @data-history-node-timestamp="' . $node_timestamp . '"]')), 'Tracker table cell contains the data-history-node-id and data-history-node-timestamp attributes for the node.');
+    $this->assertIdentical(1, count($this->xpath('//table/tbody/tr/td[@data-history-node-last-comment-timestamp="' . $node_last_comment_timestamp . '"]')), 'Tracker table cell contains the data-history-node-last-comment-timestamp attribute for the node.');
+  }
+
 }
diff --git a/core/modules/tracker/tracker.libraries.yml b/core/modules/tracker/tracker.libraries.yml
new file mode 100644
index 000000000..11c103c99
--- /dev/null
+++ b/core/modules/tracker/tracker.libraries.yml
@@ -0,0 +1,8 @@
+history:
+  version: VERSION
+  js:
+    js/tracker-history.js: {}
+  dependencies:
+    - core/jquery
+    - core/drupal
+    - history/api
diff --git a/core/modules/tracker/tracker.module b/core/modules/tracker/tracker.module
index fdd61f492..fbd4d9a1a 100644
--- a/core/modules/tracker/tracker.module
+++ b/core/modules/tracker/tracker.module
@@ -138,7 +138,7 @@ function tracker_cron() {
  * @param int $account
  *   The account ID to check.
  *
- * @return boolean
+ * @return bool
  *   TRUE if a user is accessing tracking info for their own account and
  *   has permission to access the content.
  *
diff --git a/core/modules/tracker/tracker.pages.inc b/core/modules/tracker/tracker.pages.inc
index 84a33664a..3be396684 100644
--- a/core/modules/tracker/tracker.pages.inc
+++ b/core/modules/tracker/tracker.pages.inc
@@ -63,6 +63,13 @@ function tracker_page($account = NULL) {
       else {
         $nodes[$nid]->comment_count += $statistics->comment_count;
       }
+      // Make the last comment timestamp reflect the latest comment.
+      if (!isset($nodes[$nid]->last_comment_timestamp)) {
+        $nodes[$nid]->last_comment_timestamp = $statistics->last_comment_timestamp;
+      }
+      else {
+        $nodes[$nid]->last_comment_timestamp = max($nodes[$nid]->last_comment_timestamp, $statistics->last_comment_timestamp);
+      }
     }
 
     // Display the data.
@@ -75,25 +82,8 @@ function tracker_page($account = NULL) {
       $comments = 0;
       if ($node->comment_count) {
         $comments = $node->comment_count;
-
-        if ($new = \Drupal::service('comment.manager')->getCountNewComments($node)) {
-          $comments = array(
-            '#type' => 'link',
-            '#url' => $node->urlInfo(),
-            '#title' => \Drupal::translation()->formatPlural($new, '1 new', '@count new'),
-            '#options' => array(
-              'fragment' => 'new',
-            ),
-            '#prefix' => $node->comment_count . '<br />',
-          );
-        }
       }
 
-      $mark_build = array(
-        '#theme' => 'mark',
-        '#status' => node_mark($node->id(), $node->getChangedTime()),
-      );
-
       $row = array(
         'type' => SafeMarkup::checkPlain(node_get_type_label($node)),
         'title' => array(
@@ -101,8 +91,9 @@ function tracker_page($account = NULL) {
             '#type' => 'link',
             '#url' => $node->urlInfo(),
             '#title' => $node->getTitle(),
-            '#suffix' => ' ' . drupal_render($mark_build),
           ),
+          'data-history-node-id' => $node->id(),
+          'data-history-node-timestamp' => $node->getChangedTime(),
         ),
         'author' => array(
           'data' => array(
@@ -113,6 +104,7 @@ function tracker_page($account = NULL) {
         'comments' => array(
           'class' => array('comments'),
           'data' => $comments,
+          'data-history-node-last-comment-timestamp' => $node->last_comment_timestamp,
         ),
         'last updated' => array(
           'data' => t('!time ago', array(
@@ -148,5 +140,9 @@ function tracker_page($account = NULL) {
   $page['#cache']['tags'] = $cache_tags;
   $page['#cache']['contexts'][] = 'user.node_grants:view';
 
+  if (Drupal::moduleHandler()->moduleExists('history') && \Drupal::currentUser()->isAuthenticated()) {
+    $page['#attached']['library'][] = 'tracker/history';
+  }
+
   return $page;
 }
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_update_settings.yml b/core/modules/update/migration_templates/d6_update_settings.yml
similarity index 90%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_update_settings.yml
rename to core/modules/update/migration_templates/d6_update_settings.yml
index 8a61e51cc..4e873502e 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_update_settings.yml
+++ b/core/modules/update/migration_templates/d6_update_settings.yml
@@ -19,7 +19,3 @@ process:
 destination:
   plugin: config
   config_name: update.settings
-dependencies:
-  module:
-    - migrate_drupal
-    - update
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUpdateConfigsTest.php b/core/modules/update/src/Tests/Migrate/d6/MigrateUpdateConfigsTest.php
similarity index 72%
rename from core/modules/migrate_drupal/src/Tests/d6/MigrateUpdateConfigsTest.php
rename to core/modules/update/src/Tests/Migrate/d6/MigrateUpdateConfigsTest.php
index ae9809dd7..9cea4fc50 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateUpdateConfigsTest.php
+++ b/core/modules/update/src/Tests/Migrate/d6/MigrateUpdateConfigsTest.php
@@ -2,19 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateUpdateConfigsTest.
+ * Contains \Drupal\update\Tests\Migrate\d6\MigrateUpdateConfigsTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\update\Tests\Migrate\d6;
 
 use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate\MigrateExecutable;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade variables to update.settings.yml.
  *
- * @group migrate_drupal
+ * @group update
  */
 class MigrateUpdateConfigsTest extends MigrateDrupal6TestBase {
 
@@ -32,13 +31,8 @@ class MigrateUpdateConfigsTest extends MigrateDrupal6TestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $migration = entity_load('migration', 'd6_update_settings');
-    $dumps = array(
-      $this->getDumpDirectory() . '/Variable.php',
-    );
-    $this->prepare($migration, $dumps);
-    $executable = new MigrateExecutable($migration, $this);
-    $executable->import();
+    $this->loadDumps(['Variable.php']);
+    $this->executeMigration('d6_update_settings');
   }
 
   /**
diff --git a/core/modules/update/tests/src/Unit/UpdateFetcherTest.php b/core/modules/update/tests/src/Unit/UpdateFetcherTest.php
index f80d59d9f..292f3f807 100644
--- a/core/modules/update/tests/src/Unit/UpdateFetcherTest.php
+++ b/core/modules/update/tests/src/Unit/UpdateFetcherTest.php
@@ -33,9 +33,7 @@ class UpdateFetcherTest extends UnitTestCase {
    */
   protected function setUp() {
     $config_factory = $this->getConfigFactoryStub(array('update.settings' => array('fetch_url' => 'http://www.example.com')));
-    $http_client_mock = $this->getMockBuilder('Drupal\Core\Http\Client')
-      ->disableOriginalConstructor()
-      ->getMock();
+    $http_client_mock = $this->getMock('\GuzzleHttp\ClientInterface');
     $this->updateFetcher = new UpdateFetcher($config_factory, $http_client_mock);
   }
 
diff --git a/core/modules/block/src/EventSubscriber/CurrentUserContext.php b/core/modules/user/src/ContextProvider/CurrentUserContext.php
similarity index 66%
rename from core/modules/block/src/EventSubscriber/CurrentUserContext.php
rename to core/modules/user/src/ContextProvider/CurrentUserContext.php
index dcf95c900..1a0f26cb4 100644
--- a/core/modules/block/src/EventSubscriber/CurrentUserContext.php
+++ b/core/modules/user/src/ContextProvider/CurrentUserContext.php
@@ -2,22 +2,23 @@
 
 /**
  * @file
- * Contains \Drupal\block\EventSubscriber\CurrentUserContext.
+ * Contains \Drupal\user\ContextProvider\CurrentUserContext.
  */
 
-namespace Drupal\block\EventSubscriber;
+namespace Drupal\user\ContextProvider;
 
-use Drupal\block\Event\BlockContextEvent;
+use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Plugin\Context\Context;
 use Drupal\Core\Plugin\Context\ContextDefinition;
+use Drupal\Core\Plugin\Context\ContextProviderInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 
 /**
  * Sets the current user as a context.
  */
-class CurrentUserContext extends BlockContextSubscriberBase {
+class CurrentUserContext implements ContextProviderInterface {
 
   use StringTranslationTrait;
 
@@ -51,19 +52,27 @@ class CurrentUserContext extends BlockContextSubscriberBase {
   /**
    * {@inheritdoc}
    */
-  public function onBlockActiveContext(BlockContextEvent $event) {
+  public function getRuntimeContexts(array $unqualified_context_ids) {
     $current_user = $this->userStorage->load($this->account->id());
 
     $context = new Context(new ContextDefinition('entity:user', $this->t('Current user')));
     $context->setContextValue($current_user);
-    $event->setContext('user.current_user', $context);
+    $cacheability = new CacheableMetadata();
+    $cacheability->setCacheContexts(['user']);
+    $context->addCacheableDependency($cacheability);
+
+    $result = [
+      'current_user' => $context,
+    ];
+
+    return $result;
   }
 
   /**
    * {@inheritdoc}
    */
-  public function onBlockAdministrativeContext(BlockContextEvent $event) {
-    $this->onBlockActiveContext($event);
+  public function getAvailableContexts() {
+    return $this->getRuntimeContexts([]);
   }
 
 }
diff --git a/core/modules/user/src/Controller/UserController.php b/core/modules/user/src/Controller/UserController.php
index dc669b258..a52372dcd 100644
--- a/core/modules/user/src/Controller/UserController.php
+++ b/core/modules/user/src/Controller/UserController.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\user\Controller;
 
+use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Utility\Xss;
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\Datetime\DateFormatter;
@@ -123,7 +124,7 @@ class UserController extends ControllerBase {
         drupal_set_message($this->t('You have tried to use a one-time login link that has expired. Please request a new one using the form below.'), 'error');
         return $this->redirect('user.pass');
       }
-      elseif ($user->isAuthenticated() && ($timestamp >= $user->getLastLoginTime()) && ($timestamp <= $current) && ($hash === user_pass_rehash($user->getPassword(), $timestamp, $user->getLastLoginTime(), $user->id()))) {
+      elseif ($user->isAuthenticated() && ($timestamp >= $user->getLastLoginTime()) && ($timestamp <= $current) && ($hash === user_pass_rehash($user, $timestamp))) {
         $expiration_date = $user->getLastLoginTime() ? $this->dateFormatter->format($timestamp + $timeout) : NULL;
         return $this->formBuilder()->getForm('Drupal\user\Form\UserPasswordResetForm', $user, $expiration_date, $timestamp, $hash);
       }
@@ -161,7 +162,7 @@ class UserController extends ControllerBase {
    *   The user account name.
    */
   public function userTitle(UserInterface $user = NULL) {
-    return $user ? Xss::filter($user->getUsername()) : '';
+    return $user ? SafeMarkup::xssFilter($user->getUsername()) : '';
   }
 
   /**
@@ -197,7 +198,7 @@ class UserController extends ControllerBase {
     $account_data = $this->userData->get('user', $user->id());
     if (isset($account_data['cancel_method']) && !empty($timestamp) && !empty($hashed_pass)) {
       // Validate expiration and hashed password/login.
-      if ($timestamp <= $current && $current - $timestamp < $timeout && $user->id() && $timestamp >= $user->getLastLoginTime() && $hashed_pass == user_pass_rehash($user->getPassword(), $timestamp, $user->getLastLoginTime(), $user->id())) {
+      if ($timestamp <= $current && $current - $timestamp < $timeout && $user->id() && $timestamp >= $user->getLastLoginTime() && $hashed_pass == user_pass_rehash($user, $timestamp)) {
         $edit = array(
           'user_cancel_notify' => isset($account_data['cancel_notify']) ? $account_data['cancel_notify'] : $this->config('user.settings')->get('notify.status_canceled'),
         );
diff --git a/core/modules/user/src/Plugin/Block/UserLoginBlock.php b/core/modules/user/src/Plugin/Block/UserLoginBlock.php
index 564870e41..e694577a9 100644
--- a/core/modules/user/src/Plugin/Block/UserLoginBlock.php
+++ b/core/modules/user/src/Plugin/Block/UserLoginBlock.php
@@ -79,7 +79,7 @@ class UserLoginBlock extends BlockBase implements ContainerFactoryPluginInterfac
     $route_name = $this->routeMatch->getRouteName();
     if ($account->isAnonymous() && !in_array($route_name, array('user.register', 'user.login', 'user.logout'))) {
       return AccessResult::allowed()
-        ->addCacheContexts(['route', 'user.roles:anonymous']);
+        ->addCacheContexts(['route.name', 'user.roles:anonymous']);
     }
     return AccessResult::forbidden();
   }
diff --git a/core/modules/user/src/Plugin/Condition/UserRole.php b/core/modules/user/src/Plugin/Condition/UserRole.php
index b64a28fa7..3316cbc7b 100644
--- a/core/modules/user/src/Plugin/Condition/UserRole.php
+++ b/core/modules/user/src/Plugin/Condition/UserRole.php
@@ -87,4 +87,17 @@ class UserRole extends ConditionPluginBase {
     return (bool) array_intersect($this->configuration['roles'], $user->getRoles());
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheContexts() {
+    // Optimize cache context, if a user cache context is provided, only use
+    // user.roles, since that's the only part this condition cares about.
+    $contexts = [];
+    foreach (parent::getCacheContexts() as $context) {
+      $contexts[] = $context == 'user' ? 'user.roles' : $context;
+    }
+    return $contexts;
+  }
+
 }
diff --git a/core/modules/user/src/Plugin/views/argument/RolesRid.php b/core/modules/user/src/Plugin/views/argument/RolesRid.php
index 75fff0cdf..7fd209dbe 100644
--- a/core/modules/user/src/Plugin/views/argument/RolesRid.php
+++ b/core/modules/user/src/Plugin/views/argument/RolesRid.php
@@ -50,7 +50,7 @@ class RolesRid extends ManyToOne {
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return parent::create($container, $configuration, $plugin_id, $plugin_definition, $container->get('entity.manager'));
+    return new static($configuration, $plugin_id, $plugin_definition, $container->get('entity.manager'));
   }
 
   /**
diff --git a/core/modules/user/src/PrivateTempStore.php b/core/modules/user/src/PrivateTempStore.php
index 090aad43a..3b5fe4abc 100644
--- a/core/modules/user/src/PrivateTempStore.php
+++ b/core/modules/user/src/PrivateTempStore.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\user;
 
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface;
 use Drupal\Core\Lock\LockBackendInterface;
 use Drupal\Core\Session\AccountProxyInterface;
@@ -122,10 +121,7 @@ class PrivateTempStore {
     if (!$this->lockBackend->acquire($key)) {
       $this->lockBackend->wait($key);
       if (!$this->lockBackend->acquire($key)) {
-        throw new TempStoreException(SafeMarkup::format("Couldn't acquire lock to update item %key in %collection temporary storage.", array(
-          '%key' => $key,
-          '%collection' => $this->storage->getCollectionName(),
-        )));
+        throw new TempStoreException("Couldn't acquire lock to update item '$key' in '{$this->storage->getCollectionName()}' temporary storage.");
       }
     }
 
@@ -180,10 +176,7 @@ class PrivateTempStore {
     if (!$this->lockBackend->acquire($key)) {
       $this->lockBackend->wait($key);
       if (!$this->lockBackend->acquire($key)) {
-        throw new TempStoreException(SafeMarkup::format("Couldn't acquire lock to delete item %key from %collection temporary storage.", array(
-          '%key' => $key,
-          '%collection' => $this->storage->getCollectionName(),
-        )));
+        throw new TempStoreException("Couldn't acquire lock to delete item '$key' from '{$this->storage->getCollectionName()}' temporary storage.");
       }
     }
     $this->storage->delete($key);
diff --git a/core/modules/user/src/RoleInterface.php b/core/modules/user/src/RoleInterface.php
index 0820db422..0d692b892 100644
--- a/core/modules/user/src/RoleInterface.php
+++ b/core/modules/user/src/RoleInterface.php
@@ -78,9 +78,9 @@ interface RoleInterface extends ConfigEntityInterface {
    * Sets the role to be an admin role.
    *
    * @param bool $is_admin
-   *   TRUE, if the role should be an admin role.
+   *   TRUE if the role should be an admin role.
    *
-   * return $this
+   * @return $this
    */
   public function setIsAdmin($is_admin);
 
diff --git a/core/modules/user/src/SharedTempStore.php b/core/modules/user/src/SharedTempStore.php
index 0fa9ba44c..0a70b7fbf 100644
--- a/core/modules/user/src/SharedTempStore.php
+++ b/core/modules/user/src/SharedTempStore.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\user;
 
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface;
 use Drupal\Core\Lock\LockBackendInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
@@ -196,10 +195,7 @@ class SharedTempStore {
     if (!$this->lockBackend->acquire($key)) {
       $this->lockBackend->wait($key);
       if (!$this->lockBackend->acquire($key)) {
-        throw new TempStoreException(SafeMarkup::format("Couldn't acquire lock to update item %key in %collection temporary storage.", array(
-          '%key' => $key,
-          '%collection' => $this->storage->getCollectionName(),
-        )));
+        throw new TempStoreException("Couldn't acquire lock to update item '$key' in '{$this->storage->getCollectionName()}' temporary storage.");
       }
     }
 
@@ -242,10 +238,7 @@ class SharedTempStore {
     if (!$this->lockBackend->acquire($key)) {
       $this->lockBackend->wait($key);
       if (!$this->lockBackend->acquire($key)) {
-        throw new TempStoreException(SafeMarkup::format("Couldn't acquire lock to delete item %key from %collection temporary storage.", array(
-          '%key' => $key,
-          '%collection' => $this->storage->getCollectionName(),
-        )));
+        throw new TempStoreException("Couldn't acquire lock to delete item '$key' from {$this->storage->getCollectionName()} temporary storage.");
       }
     }
     $this->storage->delete($key);
diff --git a/core/modules/user/src/Tests/UserCancelTest.php b/core/modules/user/src/Tests/UserCancelTest.php
index a6a161bb8..535701340 100644
--- a/core/modules/user/src/Tests/UserCancelTest.php
+++ b/core/modules/user/src/Tests/UserCancelTest.php
@@ -59,7 +59,7 @@ class UserCancelTest extends WebTestBase {
 
     // Attempt bogus account cancellation request confirmation.
     $timestamp = $account->getLastLoginTime();
-    $this->drupalGet("user/" . $account->id() . "/cancel/confirm/$timestamp/" . user_pass_rehash($account->getPassword(), $timestamp, $account->getLastLoginTime(), $account->id()));
+    $this->drupalGet("user/" . $account->id() . "/cancel/confirm/$timestamp/" . user_pass_rehash($account, $timestamp));
     $this->assertResponse(403, 'Bogus cancelling request rejected.');
     $user_storage->resetCache(array($account->id()));
     $account = $user_storage->load($account->id());
@@ -165,7 +165,7 @@ class UserCancelTest extends WebTestBase {
 
     // Attempt bogus account cancellation request confirmation.
     $bogus_timestamp = $timestamp + 60;
-    $this->drupalGet("user/" . $account->id() . "/cancel/confirm/$bogus_timestamp/" . user_pass_rehash($account->getPassword(), $bogus_timestamp, $account->getLastLoginTime(), $account->id()));
+    $this->drupalGet("user/" . $account->id() . "/cancel/confirm/$bogus_timestamp/" . user_pass_rehash($account, $bogus_timestamp));
     $this->assertText(t('You have tried to use an account cancellation link that has expired. Please request a new one using the form below.'), 'Bogus cancelling request rejected.');
     $user_storage->resetCache(array($account->id()));
     $account = $user_storage->load($account->id());
@@ -173,7 +173,7 @@ class UserCancelTest extends WebTestBase {
 
     // Attempt expired account cancellation request confirmation.
     $bogus_timestamp = $timestamp - 86400 - 60;
-    $this->drupalGet("user/" . $account->id() . "/cancel/confirm/$bogus_timestamp/" . user_pass_rehash($account->getPassword(), $bogus_timestamp, $account->getLastLoginTime(), $account->id()));
+    $this->drupalGet("user/" . $account->id() . "/cancel/confirm/$bogus_timestamp/" . user_pass_rehash($account, $bogus_timestamp));
     $this->assertText(t('You have tried to use an account cancellation link that has expired. Please request a new one using the form below.'), 'Expired cancel account request rejected.');
     $user_storage->resetCache(array($account->id()));
     $account = $user_storage->load($account->id());
@@ -214,7 +214,7 @@ class UserCancelTest extends WebTestBase {
     $this->assertText(t('A confirmation request to cancel your account has been sent to your email address.'), 'Account cancellation request mailed message displayed.');
 
     // Confirm account cancellation request.
-    $this->drupalGet("user/" . $account->id() . "/cancel/confirm/$timestamp/" . user_pass_rehash($account->getPassword(), $timestamp, $account->getLastLoginTime(), $account->id()));
+    $this->drupalGet("user/" . $account->id() . "/cancel/confirm/$timestamp/" . user_pass_rehash($account, $timestamp));
     $user_storage->resetCache(array($account->id()));
     $account = $user_storage->load($account->id());
     $this->assertTrue($account->isBlocked(), 'User has been blocked.');
@@ -272,7 +272,7 @@ class UserCancelTest extends WebTestBase {
     $this->assertText(t('A confirmation request to cancel your account has been sent to your email address.'), 'Account cancellation request mailed message displayed.');
 
     // Confirm account cancellation request.
-    $this->drupalGet("user/" . $account->id() . "/cancel/confirm/$timestamp/" . user_pass_rehash($account->getPassword(), $timestamp, $account->getLastLoginTime(), $account->id()));
+    $this->drupalGet("user/" . $account->id() . "/cancel/confirm/$timestamp/" . user_pass_rehash($account, $timestamp));
     $user_storage->resetCache(array($account->id()));
     $account = $user_storage->load($account->id());
     $this->assertTrue($account->isBlocked(), 'User has been blocked.');
@@ -348,7 +348,7 @@ class UserCancelTest extends WebTestBase {
     $this->assertText(t('A confirmation request to cancel your account has been sent to your email address.'), 'Account cancellation request mailed message displayed.');
 
     // Confirm account cancellation request.
-    $this->drupalGet("user/" . $account->id() . "/cancel/confirm/$timestamp/" . user_pass_rehash($account->getPassword(), $timestamp, $account->getLastLoginTime(), $account->id()));
+    $this->drupalGet("user/" . $account->id() . "/cancel/confirm/$timestamp/" . user_pass_rehash($account, $timestamp));
     $user_storage->resetCache(array($account->id()));
     $this->assertFalse($user_storage->load($account->id()), 'User is not found in the database.');
 
@@ -427,7 +427,7 @@ class UserCancelTest extends WebTestBase {
     $this->assertText(t('A confirmation request to cancel your account has been sent to your email address.'), 'Account cancellation request mailed message displayed.');
 
     // Confirm account cancellation request.
-    $this->drupalGet("user/" . $account->id() . "/cancel/confirm/$timestamp/" . user_pass_rehash($account->getPassword(), $timestamp, $account->getLastLoginTime(), $account->id()));
+    $this->drupalGet("user/" . $account->id() . "/cancel/confirm/$timestamp/" . user_pass_rehash($account, $timestamp));
     $user_storage->resetCache(array($account->id()));
     $this->assertFalse($user_storage->load($account->id()), 'User is not found in the database.');
 
diff --git a/core/modules/user/src/Tests/UserPasswordResetTest.php b/core/modules/user/src/Tests/UserPasswordResetTest.php
index 32339189f..f5bd131ec 100644
--- a/core/modules/user/src/Tests/UserPasswordResetTest.php
+++ b/core/modules/user/src/Tests/UserPasswordResetTest.php
@@ -144,14 +144,14 @@ class UserPasswordResetTest extends PageCacheTagsTestBase {
     $timeout = $this->config('user.settings')->get('password_reset_timeout');
     $bogus_timestamp = REQUEST_TIME - $timeout - 60;
     $_uid = $this->account->id();
-    $this->drupalGet("user/reset/$_uid/$bogus_timestamp/" . user_pass_rehash($this->account->getPassword(), $bogus_timestamp, $this->account->getLastLoginTime(), $this->account->id()));
+    $this->drupalGet("user/reset/$_uid/$bogus_timestamp/" . user_pass_rehash($this->account, $bogus_timestamp));
     $this->assertText(t('You have tried to use a one-time login link that has expired. Please request a new one using the form below.'), 'Expired password reset request rejected.');
 
     // Create a user, block the account, and verify that a login link is denied.
     $timestamp = REQUEST_TIME - 1;
     $blocked_account = $this->drupalCreateUser()->block();
     $blocked_account->save();
-    $this->drupalGet("user/reset/" . $blocked_account->id() . "/$timestamp/" . user_pass_rehash($blocked_account->getPassword(), $timestamp, $blocked_account->getLastLoginTime(), $this->account->id()));
+    $this->drupalGet("user/reset/" . $blocked_account->id() . "/$timestamp/" . user_pass_rehash($blocked_account, $timestamp));
     $this->assertResponse(403);
 
     // Verify a blocked user can not request a new password.
@@ -162,6 +162,16 @@ class UserPasswordResetTest extends PageCacheTagsTestBase {
     $this->drupalPostForm(NULL, $edit, t('Submit'));
     $this->assertRaw(t('%name is blocked or has not been activated yet.', array('%name' => $blocked_account->getUsername())), 'Notified user blocked accounts can not request a new password');
     $this->assertTrue(count($this->drupalGetMails(array('id' => 'user_password_reset'))) === $before, 'No email was sent when requesting password reset for a blocked account');
+
+    // Verify a password reset link is invalidated when the user's email address changes.
+    $this->drupalGet('user/password');
+    $edit = array('name' => $this->account->getUsername());
+    $this->drupalPostForm(NULL, $edit, t('Submit'));
+    $old_email_reset_link = $this->getResetURL();
+    $this->account->setEmail("1" . $this->account->getEmail());
+    $this->account->save();
+    $this->drupalGet($old_email_reset_link);
+    $this->assertText(t('You have tried to use a one-time login link that has either been used or is no longer valid. Please request a new one using the form below.'), 'One-time link is no longer valid.');
   }
 
   /**
diff --git a/core/modules/user/src/Tests/UserPictureTest.php b/core/modules/user/src/Tests/UserPictureTest.php
index efadce578..4f046ab54 100644
--- a/core/modules/user/src/Tests/UserPictureTest.php
+++ b/core/modules/user/src/Tests/UserPictureTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\user\Tests;
 
 use Drupal\simpletest\WebTestBase;
+use Drupal\file\Entity\File;
 
 /**
  * Tests user picture functionality.
@@ -75,7 +76,7 @@ class UserPictureTest extends WebTestBase {
     \Drupal::service('cron')->run();
 
     // Verify that the image has been deleted.
-    $this->assertFalse(file_load($file->id(), TRUE), 'File was removed from the database.');
+    $this->assertFalse(File::load($file->id()), 'File was removed from the database.');
     // Clear out PHP's file stat cache so we see the current value.
     clearstatcache(TRUE, $file->getFileUri());
     $this->assertFalse(is_file($file->getFileUri()), 'File was removed from the file system.');
@@ -133,6 +134,6 @@ class UserPictureTest extends WebTestBase {
     $user_storage = $this->container->get('entity.manager')->getStorage('user');
     $user_storage->resetCache(array($this->webUser->id()));
     $account = $user_storage->load($this->webUser->id());
-    return file_load($account->user_picture->target_id, TRUE);
+    return File::load($account->user_picture->target_id);
   }
 }
diff --git a/core/modules/user/src/Tests/UserRegistrationTest.php b/core/modules/user/src/Tests/UserRegistrationTest.php
index 1ee1bfc13..1e16bc727 100644
--- a/core/modules/user/src/Tests/UserRegistrationTest.php
+++ b/core/modules/user/src/Tests/UserRegistrationTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\user\Tests;
 
 use Drupal\Core\Entity\Entity\EntityFormDisplay;
+use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
@@ -264,6 +265,24 @@ class UserRegistrationTest extends WebTestBase {
     $this->assertEqual($new_user->init->value, $mail, 'Correct init field.');
   }
 
+  /**
+   * Tests username and email field constraints on user registration.
+   *
+   * @see \Drupal\user\Plugin\Validation\Constraint\UserNameUnique
+   * @see \Drupal\user\Plugin\Validation\Constraint\UserMailUnique
+   */
+  public function testUniqueFields() {
+    $account = $this->drupalCreateUser();
+
+    $edit = ['mail' => 'test@example.com', 'name' => $account->getUsername()];
+    $this->drupalPostForm('user/register', $edit, t('Create new account'));
+    $this->assertRaw(SafeMarkup::format('The username %value is already taken.', ['%value' => $account->getUsername()]));
+
+    $edit = ['mail' => $account->getEmail(), 'name' => $this->randomString()];
+    $this->drupalPostForm('user/register', $edit, t('Create new account'));
+    $this->assertRaw(SafeMarkup::format('The email address %value is already taken.', ['%value' => $account->getEmail()]));
+  }
+
   /**
    * Tests Field API fields on user registration forms.
    */
diff --git a/core/modules/user/src/Tests/UserTokenReplaceTest.php b/core/modules/user/src/Tests/UserTokenReplaceTest.php
index b2dfe6da6..508275cd7 100644
--- a/core/modules/user/src/Tests/UserTokenReplaceTest.php
+++ b/core/modules/user/src/Tests/UserTokenReplaceTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\user\Tests;
 
 use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\simpletest\WebTestBase;
 use Drupal\user\Entity\User;
@@ -66,15 +67,58 @@ class UserTokenReplaceTest extends WebTestBase {
     $tests['[user:created:short]'] = format_date($account->getCreatedTime(), 'short', '', NULL, $language_interface->getId());
     $tests['[current-user:name]'] = SafeMarkup::checkPlain(user_format_name($global_account));
 
+    $base_bubbleable_metadata = BubbleableMetadata::createFromObject($account);
+    $metadata_tests = [];
+    $metadata_tests['[user:uid]'] = $base_bubbleable_metadata;
+    $metadata_tests['[user:name]'] = $base_bubbleable_metadata;
+    $metadata_tests['[user:mail]'] = $base_bubbleable_metadata;
+    $metadata_tests['[user:url]'] = $base_bubbleable_metadata;
+    $metadata_tests['[user:edit-url]'] = $base_bubbleable_metadata;
+    $bubbleable_metadata = clone $base_bubbleable_metadata;
+    // This test runs with the Language module enabled, which means config is
+    // overridden by LanguageConfigFactoryOverride (to provide translations of
+    // config). This causes the interface language cache context to be added for
+    // config entities. The four next tokens use DateFormat Config entities, and
+    // therefore have the interface language cache context.
+    $bubbleable_metadata->addCacheContexts(['languages:language_interface']);
+    $metadata_tests['[user:last-login]'] = $bubbleable_metadata->addCacheTags(['rendered']);
+    $metadata_tests['[user:last-login:short]'] = $bubbleable_metadata;
+    $metadata_tests['[user:created]'] = $bubbleable_metadata;
+    $metadata_tests['[user:created:short]'] = $bubbleable_metadata;
+    $metadata_tests['[current-user:name]'] = $base_bubbleable_metadata->merge(BubbleableMetadata::createFromObject($global_account)->addCacheContexts(['user']));
+
     // Test to make sure that we generated something for each token.
     $this->assertFalse(in_array(0, array_map('strlen', $tests)), 'No empty tokens generated.');
 
     foreach ($tests as $input => $expected) {
-      $output = $token_service->replace($input, array('user' => $account), array('langcode' => $language_interface->getId()));
+      $bubbleable_metadata = new BubbleableMetadata();
+      $output = $token_service->replace($input, array('user' => $account), array('langcode' => $language_interface->getId()), $bubbleable_metadata);
       $this->assertEqual($output, $expected, format_string('Sanitized user token %token replaced.', array('%token' => $input)));
+      $this->assertEqual($bubbleable_metadata, $metadata_tests[$input]);
+    }
+
+    // Generate tokens for the anonymous user.
+    $anonymous_user = User::load(0);
+    $tests = [];
+    $tests['[user:uid]'] = t('not yet assigned');
+    $tests['[user:name]'] = SafeMarkup::checkPlain(user_format_name($anonymous_user));
+
+    $base_bubbleable_metadata = BubbleableMetadata::createFromObject($anonymous_user);
+    $metadata_tests = [];
+    $metadata_tests['[user:uid]'] = $base_bubbleable_metadata;
+    $bubbleable_metadata = clone $base_bubbleable_metadata;
+    $bubbleable_metadata->addCacheableDependency(\Drupal::config('user.settings'));
+    $metadata_tests['[user:name]'] = $bubbleable_metadata;
+
+    foreach ($tests as $input => $expected) {
+      $bubbleable_metadata = new BubbleableMetadata();
+      $output = $token_service->replace($input, array('user' => $anonymous_user), array('langcode' => $language_interface->getId()), $bubbleable_metadata);
+      $this->assertEqual($output, $expected, format_string('Sanitized user token %token replaced.', array('%token' => $input)));
+      $this->assertEqual($bubbleable_metadata, $metadata_tests[$input]);
     }
 
     // Generate and test unsanitized tokens.
+    $tests = [];
     $tests['[user:name]'] = user_format_name($account);
     $tests['[user:mail]'] = $account->getEmail();
     $tests['[current-user:name]'] = user_format_name($global_account);
diff --git a/core/modules/user/src/Tests/Views/HandlerFieldUserNameTest.php b/core/modules/user/src/Tests/Views/HandlerFieldUserNameTest.php
index c2c0c9366..5db1e3e2a 100644
--- a/core/modules/user/src/Tests/Views/HandlerFieldUserNameTest.php
+++ b/core/modules/user/src/Tests/Views/HandlerFieldUserNameTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\user\Tests\Views;
 
+use Drupal\Core\Render\RenderContext;
 use Drupal\views\Views;
 
 /**
@@ -25,6 +26,9 @@ class HandlerFieldUserNameTest extends UserTestBase {
   public static $testViews = array('test_views_handler_field_user_name');
 
   public function testUserName() {
+    /** @var \Drupal\Core\Render\RendererInterface $renderer */
+    $renderer = \Drupal::service('renderer');
+
     $this->drupalLogin($this->drupalCreateUser(array('access user profiles')));
 
     // Set defaults.
@@ -37,13 +41,17 @@ class HandlerFieldUserNameTest extends UserTestBase {
     $this->executeView($view);
 
     $anon_name = $this->config('user.settings')->get('anonymous');
-    $render = $view->field['name']->advancedRender($view->result[0]);
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
     $this->assertTrue(strpos($render, $anon_name) !== FALSE, 'For user 0 it should use the default anonymous name by default.');
 
     $username = $this->randomMachineName();
     $view->result[0]->_entity->setUsername($username);
     $view->result[0]->_entity->uid->value = 1;
-    $render = $view->field['name']->advancedRender($view->result[0]);
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
     $this->assertTrue(strpos($render, $username) !== FALSE, 'If link to user is checked the username should be part of the output.');
     $this->assertTrue(strpos($render, 'user/1') !== FALSE, 'If link to user is checked the link to the user should appear as well.');
 
@@ -52,7 +60,9 @@ class HandlerFieldUserNameTest extends UserTestBase {
     $username = $this->randomMachineName();
     $view->result[0]->_entity->setUsername($username);
     $view->result[0]->_entity->uid->value = 1;
-    $render = $view->field['name']->advancedRender($view->result[0]);
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
     $this->assertIdentical($render, $username, 'If the user is not linked the username should be printed out for a normal user.');
 
   }
@@ -61,13 +71,18 @@ class HandlerFieldUserNameTest extends UserTestBase {
    * Tests that the field handler works when no additional fields are added.
    */
   public function testNoAdditionalFields() {
+    /** @var \Drupal\Core\Render\RendererInterface $renderer */
+    $renderer = \Drupal::service('renderer');
+
     $view = Views::getView('test_views_handler_field_user_name');
     $this->executeView($view);
 
     $username = $this->randomMachineName();
     $view->result[0]->_entity->setUsername($username);
     $view->result[0]->_entity->uid->value = 1;
-    $render = $view->field['name']->advancedRender($view->result[0]);
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
     $this->assertTrue(strpos($render, $username) !== FALSE, 'If link to user is checked the username should be part of the output.');
   }
 
diff --git a/core/modules/user/src/UserAccessControlHandler.php b/core/modules/user/src/UserAccessControlHandler.php
index 4b29b4e4f..47bb7ced8 100644
--- a/core/modules/user/src/UserAccessControlHandler.php
+++ b/core/modules/user/src/UserAccessControlHandler.php
@@ -80,8 +80,11 @@ class UserAccessControlHandler extends EntityAccessControlHandler {
     $is_own_account = $items ? $items->getEntity()->id() == $account->id() : FALSE;
     switch ($field_definition->getName()) {
       case 'name':
-        // Allow view access to anyone with access to the entity.
-        if ($operation == 'view') {
+        // Allow view access to anyone with access to the entity. Anonymous
+        // users should be able to access the username field during the
+        // registration process, otherwise the username and email constraints
+        // are not checked.
+        if ($operation == 'view' || ($items && $account->isAnonymous() && $items->getEntity()->isAnonymous())) {
           return AccessResult::allowed()->cachePerPermissions();
         }
         // Allow edit access for the own user name if the permission is
diff --git a/core/modules/user/src/UserStorage.php b/core/modules/user/src/UserStorage.php
index 590950d0a..d6a42f4fa 100644
--- a/core/modules/user/src/UserStorage.php
+++ b/core/modules/user/src/UserStorage.php
@@ -9,7 +9,7 @@ namespace Drupal\user;
 
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Cache\CacheBackendInterface;
-use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Entity\Sql\SqlContentEntityStorage;
@@ -72,14 +72,14 @@ class UserStorage extends SqlContentEntityStorage implements UserStorageInterfac
   /**
    * {@inheritdoc}
    */
-  public function save(EntityInterface $entity) {
+  protected function doSaveFieldItems(ContentEntityInterface $entity, array $names = []) {
     // The anonymous user account is saved with the fixed user ID of 0.
     // Therefore we need to check for NULL explicitly.
     if ($entity->id() === NULL) {
       $entity->uid->value = $this->database->nextId($this->database->query('SELECT MAX(uid) FROM {users}')->fetchField());
       $entity->enforceIsNew();
     }
-    return parent::save($entity);
+    return parent::doSaveFieldItems($entity, $names);
   }
 
   /**
diff --git a/core/modules/user/templates/user.html.twig b/core/modules/user/templates/user.html.twig
index 45c4ea0ac..9075ab1bd 100644
--- a/core/modules/user/templates/user.html.twig
+++ b/core/modules/user/templates/user.html.twig
@@ -8,14 +8,8 @@
  *
  * Available variables:
  * - content: A list of content items. Use 'content' to print all content, or
- *   print a subset such as 'content.field_example'.
- * - Field variables: For each field attached to the user a corresponding
- *   variable is defined; e.g., account.field_example has a variable
- *   'field_example' defined. When needing to access a field's raw values,
- *   developers/themers are strongly encouraged to use these variables.
- *   Otherwise they will have to explicitly specify the desired field language,
- *   e.g. account.field_example.en, thus overriding any language negotiation
- *   rule that was previously applied.
+ *   print a subset such as 'content.field_example'. Fields attached to a user
+ *   such as 'user_picture' are available as 'content.user_picture'.
  * - attributes: HTML attributes for the container element.
  * - user: A Drupal User entity.
  *
diff --git a/core/modules/user/tests/src/Unit/PermissionHandlerTest.php b/core/modules/user/tests/src/Unit/PermissionHandlerTest.php
index 118084677..5ac0f1be1 100644
--- a/core/modules/user/tests/src/Unit/PermissionHandlerTest.php
+++ b/core/modules/user/tests/src/Unit/PermissionHandlerTest.php
@@ -168,35 +168,41 @@ class PermissionHandlerTest extends UnitTestCase {
       ->method('getModuleDirectories')
       ->willReturn([
         'module_a' => vfsStream::url('modules/module_a'),
+        'module_b' => vfsStream::url('modules/module_b'),
+        'module_c' => vfsStream::url('modules/module_c'),
       ]);
+    $this->moduleHandler->expects($this->exactly(3))
+      ->method('getName')
+      ->will($this->returnValueMap([
+        ['module_a', 'Module a'],
+        ['module_b', 'Module b'],
+        ['module_c', 'A Module'],
+      ]));
 
     $url = vfsStream::url('modules');
     mkdir($url . '/module_a');
     file_put_contents($url . '/module_a/module_a.permissions.yml',
-"access_module_a2: single_description
-access_module_a1: single_description"
+"access_module_a2: single_description2
+access_module_a1: single_description1"
+    );
+    mkdir($url . '/module_b');
+    file_put_contents($url . '/module_b/module_b.permissions.yml',
+      "access_module_a3: single_description"
+    );
+    mkdir($url . '/module_c');
+    file_put_contents($url . '/module_c/module_c.permissions.yml',
+      "access_module_a4: single_description"
     );
-    $modules = ['module_a'];
-    $extensions = [
-      'module_a' => $this->mockModuleExtension('module_a', 'Module a'),
-    ];
-    $this->moduleHandler->expects($this->any())
-      ->method('getImplementations')
-      ->with('permission')
-      ->willReturn([]);
 
-    $this->moduleHandler->expects($this->any())
+    $modules = ['module_a', 'module_b', 'module_c'];
+    $this->moduleHandler->expects($this->once())
       ->method('getModuleList')
       ->willReturn(array_flip($modules));
 
-    $this->permissionHandler = new TestPermissionHandler($this->moduleHandler, $this->stringTranslation, $this->controllerResolver);
-
-    // Setup system_rebuild_module_data().
-    $this->permissionHandler->setSystemRebuildModuleData($extensions);
-
-    $actual_permissions = $this->permissionHandler->getPermissions();
-
-    $this->assertEquals(['access_module_a1', 'access_module_a2'], array_keys($actual_permissions));
+    $permissionHandler = new TestPermissionHandler($this->moduleHandler, $this->stringTranslation, $this->controllerResolver);
+    $actual_permissions = $permissionHandler->getPermissions();
+    $this->assertEquals(['access_module_a4', 'access_module_a1', 'access_module_a2', 'access_module_a3'],
+      array_keys($actual_permissions));
   }
 
   /**
diff --git a/core/modules/user/tests/themes/user_test_theme/user.html.twig b/core/modules/user/tests/themes/user_test_theme/user.html.twig
index 715a79e56..415b7a570 100644
--- a/core/modules/user/tests/themes/user_test_theme/user.html.twig
+++ b/core/modules/user/tests/themes/user_test_theme/user.html.twig
@@ -8,14 +8,8 @@
  *
  * Available variables:
  * - content: A list of content items. Use 'content' to print all content, or
- *   print a subset such as 'content.field_example'.
- * - Field variables: For each field attached to the user a corresponding
- *   variable is defined; e.g., account.field_example has a variable
- *   'field_example' defined. When needing to access a field's raw values,
- *   developers/themers are strongly encouraged to use these variables.
- *   Otherwise they will have to explicitly specify the desired field language,
- *   e.g. account.field_example.en, thus overriding any language negotiation
- *   rule that was previously applied.
+ *   print a subset such as 'content.field_example'. Fields attached to a user
+ *   such as 'user_picture' are available as 'content.user_picture'.
  * - attributes: HTML attributes for the container element.
  * - user: A Drupal User entity.
  *
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index cfbfdcd47..5f990ca3c 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -417,12 +417,6 @@ function user_format_name(AccountInterface $account) {
 function user_template_preprocess_default_variables_alter(&$variables) {
   $user = \Drupal::currentUser();
 
-  // If this function is called from the installer after Drupal has been
-  // installed then $user will not be set.
-  if (!is_object($user)) {
-    return;
-  }
-
   $variables['user'] = clone $user;
   // Remove password and session IDs, $form_state, since themes should not need nor see them.
   unset($variables['user']->pass, $variables['user']->sid, $variables['user']->ssid);
@@ -574,7 +568,7 @@ function user_pass_reset_url($account, $options = array()) {
     array(
       'uid' => $account->id(),
       'timestamp' => $timestamp,
-      'hash' => user_pass_rehash($account->getPassword(), $timestamp, $account->getLastLoginTime(), $account->id()),
+      'hash' => user_pass_rehash($account, $timestamp),
     ),
     array(
       'absolute' => TRUE,
@@ -587,11 +581,7 @@ function user_pass_reset_url($account, $options = array()) {
  * Generates a URL to confirm an account cancellation request.
  *
  * @param \Drupal\user\UserInterface $account
- *   The user account object, which must contain at least the following
- *   properties:
- *   - uid: The user ID number.
- *   - pass: The hashed user password string.
- *   - login: The UNIX timestamp of the user's last login.
+ *   The user account object.
  * @param array $options
  *   (optional) A keyed array of settings. Supported options are:
  *   - langcode: A language code to be used when generating locale-sensitive
@@ -604,14 +594,14 @@ function user_pass_reset_url($account, $options = array()) {
  * @see user_mail_tokens()
  * @see \Drupal\user\Controller\UserController::confirmCancel()
  */
-function user_cancel_url($account, $options = array()) {
+function user_cancel_url(UserInterface $account, $options = array()) {
   $timestamp = REQUEST_TIME;
   $langcode = isset($options['langcode']) ? $options['langcode'] : $account->getPreferredLangcode();
   $url_options = array('absolute' => TRUE, 'language' => \Drupal::languageManager()->getLanguage($langcode));
   return \Drupal::url('user.cancel_confirm', [
     'user' => $account->id(),
     'timestamp' => $timestamp,
-    'hashed_pass' => user_pass_rehash($account->getPassword(), $timestamp, $account->getLastLoginTime(), $account->id())
+    'hashed_pass' => user_pass_rehash($account, $timestamp)
   ], $url_options);
 }
 
@@ -621,26 +611,26 @@ function user_cancel_url($account, $options = array()) {
  * This hash is normally used to build a unique and secure URL that is sent to
  * the user by email for purposes such as resetting the user's password. In
  * order to validate the URL, the same hash can be generated again, from the
- * same information, and compared to the hash value from the URL. The URL
- * normally contains both the time stamp and the numeric user ID. The login
- * timestamp and hashed password are retrieved from the database as necessary.
+ * same information, and compared to the hash value from the URL. The hash
+ * contains the time stamp, the user's last login time, the numeric user ID,
+ * and the user's email address.
  * For a usage example, see user_cancel_url() and
  * \Drupal\user\Controller\UserController::confirmCancel().
  *
- * @param string $password
- *   The hashed user account password value.
+ * @param \Drupal\user\UserInterface $account
+ *   An object containing the user account.
  * @param int $timestamp
  *   A UNIX timestamp, typically REQUEST_TIME.
- * @param int $login
- *   The UNIX timestamp of the user's last login.
- * @param int $uid
- *   The user ID.
  *
  * @return string
  *   A string that is safe for use in URLs and SQL statements.
  */
-function user_pass_rehash($password, $timestamp, $login, $uid) {
-  return Crypt::hmacBase64($timestamp . $login . $uid, Settings::getHashSalt() . $password);
+function user_pass_rehash(UserInterface $account, $timestamp) {
+  $data = $timestamp;
+  $data .= $account->getLastLoginTime();
+  $data .= $account->id();
+  $data .= $account->getEmail();
+  return Crypt::hmacBase64($data, Settings::getHashSalt() . $account->getPassword());
 }
 
 /**
diff --git a/core/modules/user/user.services.yml b/core/modules/user/user.services.yml
index be4e67953..c273cb344 100644
--- a/core/modules/user/user.services.yml
+++ b/core/modules/user/user.services.yml
@@ -61,6 +61,11 @@ services:
   user.permissions:
     class: Drupal\user\PermissionHandler
     arguments: ['@module_handler', '@string_translation', '@controller_resolver']
+  user.current_user_context:
+    class: Drupal\user\ContextProvider\CurrentUserContext
+    arguments: ['@current_user', '@entity.manager']
+    tags:
+      - { name: 'context_provider' }
 
 parameters:
   user.tempstore.expire: 604800
diff --git a/core/modules/user/user.tokens.inc b/core/modules/user/user.tokens.inc
index 0439015e5..582c1cd26 100644
--- a/core/modules/user/user.tokens.inc
+++ b/core/modules/user/user.tokens.inc
@@ -6,6 +6,8 @@
  */
 
 use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Core\Datetime\Entity\DateFormat;
+use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\user\Entity\User;
 
 /**
@@ -64,7 +66,7 @@ function user_token_info() {
 /**
  * Implements hook_tokens().
  */
-function user_tokens($type, $tokens, array $data = array(), array $options = array()) {
+function user_tokens($type, $tokens, array $data, array $options, BubbleableMetadata $bubbleable_metadata) {
 
   $token_service = \Drupal::token();
   $url_options = array('absolute' => TRUE);
@@ -80,6 +82,7 @@ function user_tokens($type, $tokens, array $data = array(), array $options = arr
   $replacements = array();
 
   if ($type == 'user' && !empty($data['user'])) {
+    /** @var \Drupal\user\UserInterface $account */
     $account = $data['user'];
     foreach ($tokens as $name => $original) {
       switch ($name) {
@@ -91,6 +94,9 @@ function user_tokens($type, $tokens, array $data = array(), array $options = arr
 
         case 'name':
           $name = user_format_name($account);
+          if ($account->isAnonymous()) {
+            $bubbleable_metadata->addCacheableDependency(\Drupal::config('user.settings'));
+          }
           $replacements[$original] = $sanitize ? SafeMarkup::checkPlain($name) : $name;
           break;
 
@@ -108,10 +114,14 @@ function user_tokens($type, $tokens, array $data = array(), array $options = arr
 
         // These tokens are default variations on the chained tokens handled below.
         case 'last-login':
+          $date_format = DateFormat::load('medium');
+          $bubbleable_metadata->addCacheableDependency($date_format);
           $replacements[$original] = $account->getLastLoginTime() ? format_date($account->getLastLoginTime(), 'medium', '', NULL, $langcode) : t('never');
           break;
 
         case 'created':
+          $date_format = DateFormat::load('medium');
+          $bubbleable_metadata->addCacheableDependency($date_format);
           // In the case of user_presave the created date may not yet be set.
           $replacements[$original] = $account->getCreatedTime() ? format_date($account->getCreatedTime(), 'medium', '', NULL, $langcode) : t('not yet created');
           break;
@@ -119,17 +129,18 @@ function user_tokens($type, $tokens, array $data = array(), array $options = arr
     }
 
     if ($login_tokens = $token_service->findWithPrefix($tokens, 'last-login')) {
-      $replacements += $token_service->generate('date', $login_tokens, array('date' => $account->getLastLoginTime()), $options);
+      $replacements += $token_service->generate('date', $login_tokens, array('date' => $account->getLastLoginTime()), $options, $bubbleable_metadata);
     }
 
     if ($registered_tokens = $token_service->findWithPrefix($tokens, 'created')) {
-      $replacements += $token_service->generate('date', $registered_tokens, array('date' => $account->getCreatedTime()), $options);
+      $replacements += $token_service->generate('date', $registered_tokens, array('date' => $account->getCreatedTime()), $options, $bubbleable_metadata);
     }
   }
 
   if ($type == 'current-user') {
     $account = User::load(\Drupal::currentUser()->id());
-    $replacements += $token_service->generate('user', $tokens, array('user' => $account), $options);
+    $bubbleable_metadata->addCacheContexts(['user']);
+    $replacements += $token_service->generate('user', $tokens, array('user' => $account), $options, $bubbleable_metadata);
   }
 
   return $replacements;
diff --git a/core/modules/views/config/schema/views.field.schema.yml b/core/modules/views/config/schema/views.field.schema.yml
index 1c884fba8..58d4c0d44 100644
--- a/core/modules/views/config/schema/views.field.schema.yml
+++ b/core/modules/views/config/schema/views.field.schema.yml
@@ -117,8 +117,8 @@ views.field.numeric:
       type: boolean
       label: 'Format plural'
     format_plural_string:
-      type: label
-      label: 'Singular and one or more plurals'
+      type: plural_label
+      label: 'Plural variants'
     prefix:
       type: label
       label: 'Prefix'
diff --git a/core/modules/views/js/ajax_view.js b/core/modules/views/js/ajax_view.js
index 1b9f1189c..edfba50c0 100644
--- a/core/modules/views/js/ajax_view.js
+++ b/core/modules/views/js/ajax_view.js
@@ -108,14 +108,15 @@
    * @method
    */
   Drupal.views.ajaxView.prototype.attachExposedFormAjax = function () {
-    var button = $('input[type=submit], input[type=image]', this.$exposed_form);
-    button = button[0];
-
-    var self_settings = $.extend({}, this.element_settings, {
-      base: $(button).attr('id'),
-      element: button
+    var that = this;
+    this.exposedFormAjax = [];
+    $('input[type=submit], input[type=image]', this.$exposed_form).each(function (index) {
+      var self_settings = $.extend({}, that.element_settings, {
+        base: $(this).attr('id'),
+        element: this
+      });
+      that.exposedFormAjax[index] = Drupal.ajax(self_settings);
     });
-    this.exposedFormAjax = Drupal.ajax(self_settings);
   };
 
   /**
diff --git a/core/modules/views/src/Controller/ViewAjaxController.php b/core/modules/views/src/Controller/ViewAjaxController.php
index 83a203be0..01e69ef05 100644
--- a/core/modules/views/src/Controller/ViewAjaxController.php
+++ b/core/modules/views/src/Controller/ViewAjaxController.php
@@ -14,6 +14,8 @@ use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\EventSubscriber\AjaxResponseSubscriber;
 use Drupal\Core\Path\CurrentPathStack;
+use Drupal\Core\Render\BubbleableMetadata;
+use Drupal\Core\Render\RenderContext;
 use Drupal\Core\Render\RendererInterface;
 use Drupal\Core\Routing\RedirectDestinationInterface;
 use Drupal\views\Ajax\ScrollTopCommand;
@@ -174,9 +176,18 @@ class ViewAjaxController implements ContainerInjectionInterface {
         // Reuse the same DOM id so it matches that in drupalSettings.
         $view->dom_id = $dom_id;
 
-        if ($preview = $view->preview($display_id, $args)) {
-          $response->addCommand(new ReplaceCommand(".js-view-dom-id-$dom_id", $preview));
+        $context = new RenderContext();
+        $preview = $this->renderer->executeInRenderContext($context, function() use ($view, $display_id, $args) {
+          return $view->preview($display_id, $args);
+        });
+        if (!$context->isEmpty()) {
+          $bubbleable_metadata = $context->pop();
+          BubbleableMetadata::createFromRenderArray($preview)
+            ->merge($bubbleable_metadata)
+            ->applyTo($preview);
         }
+        $response->addCommand(new ReplaceCommand(".js-view-dom-id-$dom_id", $preview));
+
         return $response;
       }
       else {
diff --git a/core/modules/views/src/Entity/Render/EntityFieldRenderer.php b/core/modules/views/src/Entity/Render/EntityFieldRenderer.php
index b00a5726d..66d4fcf1d 100644
--- a/core/modules/views/src/Entity/Render/EntityFieldRenderer.php
+++ b/core/modules/views/src/Entity/Render/EntityFieldRenderer.php
@@ -138,13 +138,18 @@ class EntityFieldRenderer extends RendererBase {
         $build = $this->build[$row->index][$field_id];
         unset($this->build[$row->index][$field_id]);
       }
-      else {
+      elseif (isset($this->build[$row->index])) {
         // In the uncommon case where a field gets rendered several times
         // (typically through direct Views API calls), the pre-computed render
         // array was removed by the unset() above. We have to manually rebuild
         // the render array for the row.
         $build = $this->buildFields([$row])[$row->index][$field_id];
       }
+      else {
+        // In case the relationship is optional, there might not be any fields
+        // to render for this row.
+        $build = [];
+      }
     }
     else {
       // Same logic as above, in the case where we are being called for a whole
@@ -199,8 +204,9 @@ class EntityFieldRenderer extends RendererBase {
       $entities_by_bundles = [];
       $field = $this->view->field[current($field_ids)];
       foreach ($values as $result_row) {
-        $entity = $field->getEntity($result_row);
-        $entities_by_bundles[$entity->bundle()][$result_row->index] = $this->getEntityTranslation($entity, $result_row);
+        if ($entity = $field->getEntity($result_row)) {
+          $entities_by_bundles[$entity->bundle()][$result_row->index] = $this->getEntityTranslation($entity, $result_row);
+        }
       }
 
       // Determine unique sets of fields that can be processed by the same
diff --git a/core/modules/views/src/Plugin/Block/ViewsBlock.php b/core/modules/views/src/Plugin/Block/ViewsBlock.php
index 8762c327c..97db7c95e 100644
--- a/core/modules/views/src/Plugin/Block/ViewsBlock.php
+++ b/core/modules/views/src/Plugin/Block/ViewsBlock.php
@@ -7,8 +7,9 @@
 
 namespace Drupal\views\Plugin\Block;
 
-use Drupal\Core\Config\Entity\Query\Query;
+use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Utility\Xss;
+use Drupal\Core\Config\Entity\Query\Query;
 use Drupal\Core\Form\FormStateInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -32,7 +33,8 @@ class ViewsBlock extends ViewsBlockBase {
     if ($output = $this->view->buildRenderable($this->displayID, [], FALSE)) {
       // Override the label to the dynamic title configured in the view.
       if (empty($this->configuration['views_label']) && $this->view->getTitle()) {
-        $output['#title'] = Xss::filterAdmin($this->view->getTitle());
+        // @todo https://www.drupal.org/node/2527360 remove call to SafeMarkup.
+        $output['#title'] = SafeMarkup::xssFilter($this->view->getTitle(), Xss::getAdminTagList());
       }
 
       // Before returning the block output, convert it to a renderable array
diff --git a/core/modules/views/src/Plugin/Derivative/ViewsMenuLink.php b/core/modules/views/src/Plugin/Derivative/ViewsMenuLink.php
index 27bf9ccef..1f9c68028 100644
--- a/core/modules/views/src/Plugin/Derivative/ViewsMenuLink.php
+++ b/core/modules/views/src/Plugin/Derivative/ViewsMenuLink.php
@@ -9,6 +9,7 @@ namespace Drupal\views\Plugin\Derivative;
 
 use Drupal\Component\Plugin\Derivative\DeriverBase;
 use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
+use Drupal\views\Plugin\views\display\DisplayMenuInterface;
 use Drupal\views\Views;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -57,8 +58,10 @@ class ViewsMenuLink extends DeriverBase implements ContainerDeriverInterface {
       list($view_id, $display_id) = $data;
       /** @var \Drupal\views\ViewExecutable $executable */
       $executable = $this->viewStorage->load($view_id)->getExecutable();
+      $executable->initDisplay();
+      $display = $executable->displayHandlers->get($display_id);
 
-      if ($result = $executable->getMenuLinks($display_id)) {
+      if (($display instanceof DisplayMenuInterface) && ($result = $display->getMenuLinks())) {
         foreach ($result as $link_id => $link) {
           $links[$link_id] = $link + $base_plugin_definition;
         }
diff --git a/core/modules/views/src/Plugin/views/HandlerBase.php b/core/modules/views/src/Plugin/views/HandlerBase.php
index 82a4a92fa..f2e5604d4 100644
--- a/core/modules/views/src/Plugin/views/HandlerBase.php
+++ b/core/modules/views/src/Plugin/views/HandlerBase.php
@@ -721,7 +721,7 @@ abstract class HandlerBase extends PluginBase implements ViewsHandlerInterface {
       return $views_data['table']['entity type'];
     }
     else {
-      throw new \Exception(SafeMarkup::format('No entity type for field @field on view @view', array('@field' => $this->options['id'], '@view' => $this->view->storage->id())));
+      throw new \Exception("No entity type for field {$this->options['id']} on view {$this->view->storage->id()}");
     }
   }
 
diff --git a/core/modules/views/src/Plugin/views/PluginBase.php b/core/modules/views/src/Plugin/views/PluginBase.php
index 8c1e31f48..e56dcae7c 100644
--- a/core/modules/views/src/Plugin/views/PluginBase.php
+++ b/core/modules/views/src/Plugin/views/PluginBase.php
@@ -9,6 +9,7 @@ namespace Drupal\views\Plugin\views;
 
 use Drupal\Component\Plugin\DependentPluginInterface;
 use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Component\Utility\Xss;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
@@ -333,23 +334,27 @@ abstract class PluginBase extends ComponentPluginBase implements ContainerFactor
   }
 
   /**
-   * Replaces Views' tokens in a given string. It is the responsibility of the
-   * calling function to ensure $text and $token replacements are sanitized.
+   * Replaces Views' tokens in a given string. The resulting string will be
+   * sanitized with Xss::filterAdmin.
    *
    * This used to be a simple strtr() scattered throughout the code. Some Views
    * tokens, such as arguments (e.g.: %1 or !1), still use the old format so we
    * handle those as well as the new Twig-based tokens (e.g.: {{ field_name }})
    *
    * @param $text
-   *   String with possible tokens.
+   *   Unsanitized string with possible tokens.
    * @param $tokens
    *   Array of token => replacement_value items.
    *
    * @return String
    */
   protected function viewsTokenReplace($text, $tokens) {
+    if (!strlen($text)) {
+      // No need to run filterAdmin on an empty string.
+      return '';
+    }
     if (empty($tokens)) {
-      return $text;
+      return Xss::filterAdmin($text);
     }
 
     // Separate Twig tokens from other tokens (e.g.: contextual filter tokens in
@@ -370,14 +375,22 @@ abstract class PluginBase extends ComponentPluginBase implements ContainerFactor
     // Non-Twig tokens are a straight string replacement, Twig tokens get run
     // through an inline template for rendering and replacement.
     $text = strtr($text, $other_tokens);
-    if ($twig_tokens && !empty($text)) {
+    if ($twig_tokens) {
+      // Use the unfiltered text for the Twig template, then filter the output.
+      // Otherwise, Xss::filterAdmin could remove valid Twig syntax before the
+      // template is parsed.
       $build = array(
         '#type' => 'inline_template',
         '#template' => $text,
         '#context' => $twig_tokens,
+        '#post_render' => [
+          function ($children, $elements) {
+            return Xss::filterAdmin($children);
+          }
+        ],
       );
 
-      return $this->getRenderer()->render($build);
+      return (string) $this->getRenderer()->render($build);
     }
     else {
       return $text;
diff --git a/core/modules/views/src/Plugin/views/cache/CachePluginBase.php b/core/modules/views/src/Plugin/views/cache/CachePluginBase.php
index 06a18e3de..3a38dd0c4 100644
--- a/core/modules/views/src/Plugin/views/cache/CachePluginBase.php
+++ b/core/modules/views/src/Plugin/views/cache/CachePluginBase.php
@@ -153,7 +153,7 @@ abstract class CachePluginBase extends PluginBase {
    * Clear out cached data for a view.
    */
   public function cacheFlush() {
-    Cache::invalidateTags($this->view->storage->getCacheTags());
+    Cache::invalidateTags($this->view->storage->getCacheTagsToInvalidate());
   }
 
   /**
@@ -211,7 +211,7 @@ abstract class CachePluginBase extends PluginBase {
         'items_per_page' => $this->view->getItemsPerPage(),
         'offset' => $this->view->getOffset(),
       ];
-      $key_data += \Drupal::service('cache_contexts_manager')->convertTokensToKeys($this->displayHandler->getCacheMetadata()['contexts']);
+      $key_data += \Drupal::service('cache_contexts_manager')->convertTokensToKeys($this->displayHandler->getCacheMetadata()['contexts'])->getKeys();
 
       $this->resultsKey = $this->view->storage->id() . ':' . $this->displayHandler->display['id'] . ':results:' . hash('sha256', serialize($key_data));
     }
diff --git a/core/modules/views/src/Plugin/views/display/DisplayMenuInterface.php b/core/modules/views/src/Plugin/views/display/DisplayMenuInterface.php
new file mode 100644
index 000000000..ec32559a2
--- /dev/null
+++ b/core/modules/views/src/Plugin/views/display/DisplayMenuInterface.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\views\Plugin\views\display\DisplayMenuInterface.
+ */
+
+namespace Drupal\views\Plugin\views\display;
+
+/**
+ * Defines an interface for displays that provide menu links.
+ */
+interface DisplayMenuInterface {
+
+  /**
+   * Gets menu links, if this display provides some.
+   *
+   * @return array
+   *   The menu links registers for this display.
+   *
+   * @see \Drupal\views\Plugin\Derivative\ViewsMenuLink
+   */
+  public function getMenuLinks();
+
+}
diff --git a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
index 3245bd2da..f9ae57a05 100644
--- a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
+++ b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
@@ -2112,13 +2112,6 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
     }
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function getMenuLinks() {
-    return array();
-  }
-
   /**
    * {@inheritdoc}
    */
@@ -2472,18 +2465,6 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
   public function newDisplay() {
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function remove() {
-    $menu_links = $this->getMenuLinks();
-    /** @var \Drupal\Core\Menu\MenuLinkManagerInterface $menu_link_manager */
-    $menu_link_manager = \Drupal::service('plugin.manager.menu.link');
-    foreach ($menu_links as $menu_link_id => $menu_link) {
-      $menu_link_manager->removeDefinition("views_view:$menu_link_id");
-    }
-  }
-
   /**
    * {@inheritdoc}
    */
@@ -2611,6 +2592,13 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
     }
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function remove() {
+
+  }
+
   /**
    * Merges plugins default values.
    *
diff --git a/core/modules/views/src/Plugin/views/display/DisplayPluginInterface.php b/core/modules/views/src/Plugin/views/display/DisplayPluginInterface.php
index c1aba0c3b..780073be3 100644
--- a/core/modules/views/src/Plugin/views/display/DisplayPluginInterface.php
+++ b/core/modules/views/src/Plugin/views/display/DisplayPluginInterface.php
@@ -381,16 +381,6 @@ interface DisplayPluginInterface {
    */
   public function renderMoreLink();
 
-  /**
-   * Gets menu links, if this display provides some.
-   *
-   * @return array
-   *   The menu links registers for this display.
-   *
-   * @see \Drupal\views\Plugin\Derivative\ViewsMenuLink
-   */
-  public function getMenuLinks();
-
   /**
    * Renders this display.
    */
diff --git a/core/modules/views/src/Plugin/views/display/DisplayRouterInterface.php b/core/modules/views/src/Plugin/views/display/DisplayRouterInterface.php
index 65328edcf..03f651b72 100644
--- a/core/modules/views/src/Plugin/views/display/DisplayRouterInterface.php
+++ b/core/modules/views/src/Plugin/views/display/DisplayRouterInterface.php
@@ -71,4 +71,5 @@ interface DisplayRouterInterface extends DisplayPluginInterface {
    * @see \Drupal\views\Plugin\views\display\DisplayRouterInterface::alterRoutes()
    */
   public function getAlteredRouteNames();
+
 }
diff --git a/core/modules/views/src/Plugin/views/display/Feed.php b/core/modules/views/src/Plugin/views/display/Feed.php
index 0798690bd..e4da10e25 100644
--- a/core/modules/views/src/Plugin/views/display/Feed.php
+++ b/core/modules/views/src/Plugin/views/display/Feed.php
@@ -67,7 +67,7 @@ class Feed extends PathPluginBase implements ResponseDisplayPluginInterface {
     /** @var \Drupal\Core\Render\RendererInterface $renderer */
     $renderer = \Drupal::service('renderer');
 
-    $output = $renderer->renderRoot($build);
+    $output = (string) $renderer->renderRoot($build);
 
     if (empty($output)) {
       throw new NotFoundHttpException();
diff --git a/core/modules/views/src/Plugin/views/display/Page.php b/core/modules/views/src/Plugin/views/display/Page.php
index 193979e78..7ec356086 100644
--- a/core/modules/views/src/Plugin/views/display/Page.php
+++ b/core/modules/views/src/Plugin/views/display/Page.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\views\Plugin\views\display;
 
+use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Utility\Xss;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Form\FormStateInterface;
@@ -181,7 +182,8 @@ class Page extends PathPluginBase {
     //   it should be dropped.
     if (is_array($render)) {
       $render += array(
-        '#title' => Xss::filterAdmin($this->view->getTitle()),
+        // @todo https://www.drupal.org/node/2527360 remove call to SafeMarkup.
+        '#title' => SafeMarkup::xssFilter($this->view->getTitle(), Xss::getAdminTagList()),
       );
     }
     return $render;
diff --git a/core/modules/views/src/Plugin/views/display/PathPluginBase.php b/core/modules/views/src/Plugin/views/display/PathPluginBase.php
index d1aee853c..599e7f083 100644
--- a/core/modules/views/src/Plugin/views/display/PathPluginBase.php
+++ b/core/modules/views/src/Plugin/views/display/PathPluginBase.php
@@ -29,7 +29,7 @@ use Symfony\Component\Routing\RouteCollection;
  *
  * @see \Drupal\views\EventSubscriber\RouteSubscriber
  */
-abstract class PathPluginBase extends DisplayPluginBase implements DisplayRouterInterface {
+abstract class PathPluginBase extends DisplayPluginBase implements DisplayRouterInterface, DisplayMenuInterface {
 
   use UrlGeneratorTrait;
 
@@ -521,4 +521,16 @@ abstract class PathPluginBase extends DisplayPluginBase implements DisplayRouter
     return $this->state->get('views.view_route_names') ?: array();
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function remove() {
+    $menu_links = $this->getMenuLinks();
+    /** @var \Drupal\Core\Menu\MenuLinkManagerInterface $menu_link_manager */
+    $menu_link_manager = \Drupal::service('plugin.manager.menu.link');
+    foreach ($menu_links as $menu_link_id => $menu_link) {
+      $menu_link_manager->removeDefinition("views_view:$menu_link_id");
+    }
+  }
+
 }
diff --git a/core/modules/views/src/Plugin/views/exposed_form/ExposedFormPluginBase.php b/core/modules/views/src/Plugin/views/exposed_form/ExposedFormPluginBase.php
index 11a3e2d71..d17f70c78 100644
--- a/core/modules/views/src/Plugin/views/exposed_form/ExposedFormPluginBase.php
+++ b/core/modules/views/src/Plugin/views/exposed_form/ExposedFormPluginBase.php
@@ -321,7 +321,7 @@ abstract class ExposedFormPluginBase extends PluginBase implements CacheablePlug
     }
 
     // Set the form to allow redirect.
-    if (empty($this->view->live_preview)) {
+    if (empty($this->view->live_preview) && !\Drupal::request()->isXmlHttpRequest()) {
       $form_state->disableRedirect(FALSE);
     }
     else {
diff --git a/core/modules/views/src/Plugin/views/field/Field.php b/core/modules/views/src/Plugin/views/field/Field.php
index 386456cff..251d02520 100644
--- a/core/modules/views/src/Plugin/views/field/Field.php
+++ b/core/modules/views/src/Plugin/views/field/Field.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\views\Plugin\views\field;
 
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Utility\Xss as CoreXss;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityManagerInterface;
@@ -671,7 +670,7 @@ class Field extends FieldPluginBase implements CacheablePluginInterface, MultiIt
     if (!empty($items)) {
       $items = $this->prepareItemsByDelta($items);
       if ($this->options['multi_type'] == 'separator' || !$this->options['group_rows']) {
-        $separator = $this->options['multi_type'] == 'separator' ? SafeMarkup::checkAdminXss($this->options['separator']) : '';
+        $separator = $this->options['multi_type'] == 'separator' ? CoreXss::filterAdmin($this->options['separator']) : '';
         $build = [
           '#type' => 'inline_template',
           '#template' => '{{ items | safe_join(separator) }}',
diff --git a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
index f17df1887..ee16994a9 100644
--- a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
+++ b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
@@ -16,6 +16,7 @@ use Drupal\Component\Utility\Xss;
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Render\Renderer;
+use Drupal\Core\Render\SafeString;
 use Drupal\Core\Url as CoreUrl;
 use Drupal\views\Plugin\views\HandlerBase;
 use Drupal\views\Plugin\views\display\DisplayPluginBase;
@@ -394,7 +395,7 @@ abstract class FieldPluginBase extends HandlerBase implements FieldHandlerInterf
     if ($relationship_id == 'none') {
       return $values->_entity;
     }
-    else {
+    elseif (isset($values->_relationship_entities[$relationship_id])) {
       return $values->_relationship_entities[$relationship_id];
     }
   }
@@ -875,10 +876,16 @@ abstract class FieldPluginBase extends HandlerBase implements FieldHandlerInterf
       $this->documentSelfTokens($options[t('Fields')]);
 
       // Default text.
-      $output = '<p>' . $this->t('You must add some additional fields to this display before using this field. These fields may be marked as <em>Exclude from display</em> if you prefer. Note that due to rendering order, you cannot use fields that come after this field; if you need a field not listed here, rearrange your fields.') . '</p>';
+
+      $output = [];
+      $output[] = [
+        '#markup' => '<p>' . $this->t('You must add some additional fields to this display before using this field. These fields may be marked as <em>Exclude from display</em> if you prefer. Note that due to rendering order, you cannot use fields that come after this field; if you need a field not listed here, rearrange your fields.') . '</p>',
+      ];
       // We have some options, so make a list.
       if (!empty($options)) {
-        $output = '<p>' . $this->t("The following replacement tokens are available for this field. Note that due to rendering order, you cannot use fields that come after this field; if you need a field not listed here, rearrange your fields.") . '</p>';
+        $output[] = [
+          '#markup' => '<p>' . $this->t("The following replacement tokens are available for this field. Note that due to rendering order, you cannot use fields that come after this field; if you need a field not listed here, rearrange your fields.") . '</p>',
+        ];
         foreach (array_keys($options) as $type) {
           if (!empty($options[$type])) {
             $items = array();
@@ -890,7 +897,7 @@ abstract class FieldPluginBase extends HandlerBase implements FieldHandlerInterf
               '#items' => $items,
               '#list_type' => $type,
             );
-            $output .= $this->getRenderer()->render($item_list);
+            $output[] = $item_list;
           }
         }
       }
@@ -901,7 +908,7 @@ abstract class FieldPluginBase extends HandlerBase implements FieldHandlerInterf
       $form['alter']['help'] = array(
         '#type' => 'details',
         '#title' => $this->t('Replacement patterns'),
-        '#value' => SafeMarkup::set($output),
+        '#value' => $output,
         '#states' => array(
           'visible' => array(
             array(
@@ -1131,7 +1138,7 @@ abstract class FieldPluginBase extends HandlerBase implements FieldHandlerInterf
     else {
       $value = $this->render($values);
       if (is_array($value)) {
-        $value = $this->getRenderer()->render($value);
+        $value = (string) $this->getRenderer()->render($value);
       }
       $this->last_render = $value;
       $this->original_value = $value;
@@ -1144,7 +1151,7 @@ abstract class FieldPluginBase extends HandlerBase implements FieldHandlerInterf
         foreach ($raw_items as $count => $item) {
           $value = $this->render_item($count, $item);
           if (is_array($value)) {
-            $value = $this->getRenderer()->render($value);
+            $value = (string) $this->getRenderer()->render($value);
           }
           $this->last_render = $value;
           $this->original_value = $this->last_render;
@@ -1162,7 +1169,7 @@ abstract class FieldPluginBase extends HandlerBase implements FieldHandlerInterf
       }
 
       if (is_array($value)) {
-        $value = $this->getRenderer()->render($value);
+        $value = (string) $this->getRenderer()->render($value);
       }
       // This happens here so that renderAsLink can get the unaltered value of
       // this field as a token rather than the altered value.
@@ -1284,9 +1291,7 @@ abstract class FieldPluginBase extends HandlerBase implements FieldHandlerInterf
    * Render this field as user-defined altered text.
    */
   protected function renderAltered($alter, $tokens) {
-    // Filter this right away as our substitutions are already sanitized.
-    $template = Xss::filterAdmin($alter['text']);
-    return $this->viewsTokenReplace($template, $tokens);
+    return SafeString::create($this->viewsTokenReplace($alter['text'], $tokens));
   }
 
   /**
diff --git a/core/modules/views/src/Plugin/views/field/NumericField.php b/core/modules/views/src/Plugin/views/field/NumericField.php
index 70622d12d..999a64811 100644
--- a/core/modules/views/src/Plugin/views/field/NumericField.php
+++ b/core/modules/views/src/Plugin/views/field/NumericField.php
@@ -102,6 +102,7 @@ class NumericField extends FieldPluginBase {
     for ($i = 0; $i < $plurals; $i++) {
       $form['format_plural_values'][$i] = array(
         '#type' => 'textfield',
+        // @todo Should use better labels https://www.drupal.org/node/2499639
         '#title' => ($i == 0 ? $this->t('Singular form') : $this->formatPlural($i, 'First plural form', '@count. plural form')),
         '#default_value' => isset($plural_array[$i]) ? $plural_array[$i] : '',
         '#description' => $this->t('Text to use for this variant, @count will be replaced with the value.'),
diff --git a/core/modules/views/src/Plugin/views/pager/Full.php b/core/modules/views/src/Plugin/views/pager/Full.php
index da1a0ec7b..a0af22549 100644
--- a/core/modules/views/src/Plugin/views/pager/Full.php
+++ b/core/modules/views/src/Plugin/views/pager/Full.php
@@ -96,6 +96,7 @@ class Full extends SqlBase {
       '#element' => $this->options['id'],
       '#parameters' => $input,
       '#quantity' => $this->options['quantity'],
+      '#route_name' => !empty($this->view->live_preview) ? '<current>' : '<none>',
     );
   }
 
diff --git a/core/modules/views/src/Plugin/views/pager/Mini.php b/core/modules/views/src/Plugin/views/pager/Mini.php
index 654724294..72f5d1c38 100644
--- a/core/modules/views/src/Plugin/views/pager/Mini.php
+++ b/core/modules/views/src/Plugin/views/pager/Mini.php
@@ -103,6 +103,7 @@ class Mini extends SqlBase {
       '#tags' => $tags,
       '#element' => $this->options['id'],
       '#parameters' => $input,
+      '#route_name' => !empty($this->view->live_preview) ? '<current>' : '<none>',
     );
   }
 
diff --git a/core/modules/views/src/Plugin/views/pager/SqlBase.php b/core/modules/views/src/Plugin/views/pager/SqlBase.php
index b2d738924..4262701d9 100644
--- a/core/modules/views/src/Plugin/views/pager/SqlBase.php
+++ b/core/modules/views/src/Plugin/views/pager/SqlBase.php
@@ -382,14 +382,9 @@ abstract class SqlBase extends PagerPluginBase implements CacheablePluginInterfa
    * {@inheritdoc}
    */
   public function getCacheContexts() {
-    $contexts = ['url.query_args.pagers:' . $this->options['id']];
-    if ($this->options['expose']['items_per_page']) {
-      $contexts[] = 'url.query_args:items_per_page';
-    }
-    if ($this->options['expose']['offset']) {
-      $contexts[] = 'url.query_args:offset';
-    }
-    return $contexts;
+    // The rendered link needs to play well with any other query parameter used
+    // on the page, like other pagers and exposed filter.
+    return ['url.query_args'];
   }
 
 }
diff --git a/core/modules/views/src/Plugin/views/query/QueryPluginBase.php b/core/modules/views/src/Plugin/views/query/QueryPluginBase.php
index 0d6d9f862..97498e95c 100644
--- a/core/modules/views/src/Plugin/views/query/QueryPluginBase.php
+++ b/core/modules/views/src/Plugin/views/query/QueryPluginBase.php
@@ -237,12 +237,15 @@ abstract class QueryPluginBase extends PluginBase implements CacheablePluginInte
    *   An appropriate query expression pointing to the date field.
    * @param string $format
    *   A format string for the result, like 'Y-m-d H:i:s'.
+   * @param boolean $string_date
+   *   For certain databases, date format functions vary depending on string or
+   *   numeric storage.
    *
    * @return string
    *   A string representing the field formatted as a date in the format
    *   specified by $format.
    */
-  public function getDateFormat($field, $format) {
+  public function getDateFormat($field, $format, $string_date = FALSE) {
     return $field;
   }
 
diff --git a/core/modules/views/src/Plugin/views/query/Sql.php b/core/modules/views/src/Plugin/views/query/Sql.php
index 2ddfd2199..7ee7316e1 100644
--- a/core/modules/views/src/Plugin/views/query/Sql.php
+++ b/core/modules/views/src/Plugin/views/query/Sql.php
@@ -1454,7 +1454,7 @@ class Sql extends QueryPluginBase {
           drupal_set_message($e->getMessage(), 'error');
         }
         else {
-          throw new DatabaseExceptionWrapper(format_string('Exception in @label[@view_name]: @message', array('@label' => $view->storage->label(), '@view_name' => $view->storage->id(), '@message' => $e->getMessage())));
+          throw new DatabaseExceptionWrapper("Exception in {$view->storage->label()}[$view->storage->id()]: {$e->getMessage()}");
         }
       }
 
@@ -1748,9 +1748,9 @@ class Sql extends QueryPluginBase {
   }
 
   /**
-   * Overrides \Drupal\views\Plugin\views\query\QueryPluginBase::getDateFormat().
+   * {@inheritdoc}
    */
-  public function getDateFormat($field, $format) {
+  public function getDateFormat($field, $format, $string_date = FALSE) {
     $db_type = Database::getConnection()->databaseType();
     switch ($db_type) {
       case 'mysql':
@@ -1797,7 +1797,12 @@ class Sql extends QueryPluginBase {
           'A' => 'AM',
         );
         $format = strtr($format, $replace);
-        return "TO_CHAR($field, '$format')";
+        if (!$string_date) {
+          return "TO_CHAR($field, '$format')";
+        }
+        // In order to allow for partials (eg, only the year), transform to a
+        // date, back to a string again.
+        return "TO_CHAR(TO_TIMESTAMP($field, 'YYYY-MM-DD HH24:MI:SS'), '$format')";
       case 'sqlite':
         $replace = array(
           'Y' => '%Y',
@@ -1827,15 +1832,19 @@ class Sql extends QueryPluginBase {
           'A' => '',
         );
         $format = strtr($format, $replace);
+
+        // Don't use the 'unixepoch' flag for string date comparisons.
+        $unixepoch = $string_date ? '' : ", 'unixepoch'";
+
         // SQLite does not have a ISO week substitution string, so it needs
         // special handling.
         // @see http://en.wikipedia.org/wiki/ISO_week_date#Calculation
         // @see http://stackoverflow.com/a/15511864/1499564
         if ($format === '%W') {
-          $expression = "((strftime('%j', date(strftime('%Y-%m-%d', $field, 'unixepoch'), '-3 days', 'weekday 4')) - 1) / 7 + 1)";
+          $expression = "((strftime('%j', date(strftime('%Y-%m-%d', $field" . $unixepoch . "), '-3 days', 'weekday 4')) - 1) / 7 + 1)";
         }
         else {
-          $expression = "strftime('$format', $field, 'unixepoch')";
+          $expression = "strftime('$format', $field" . $unixepoch . ")";
         }
         // The expression yields a string, but the comparison value is an
         // integer in case the comparison value is a float, integer, or numeric.
diff --git a/core/modules/views/src/Plugin/views/row/OpmlFields.php b/core/modules/views/src/Plugin/views/row/OpmlFields.php
index 2e936f58e..4654bcad7 100644
--- a/core/modules/views/src/Plugin/views/row/OpmlFields.php
+++ b/core/modules/views/src/Plugin/views/row/OpmlFields.php
@@ -217,7 +217,7 @@ class OpmlFields extends RowPluginBase {
     if (empty($this->view->style_plugin) || !is_object($this->view->style_plugin) || empty($field_id)) {
       return '';
     }
-    return $this->view->style_plugin->getField($index, $field_id);
+    return (string) $this->view->style_plugin->getField($index, $field_id);
   }
 
 }
diff --git a/core/modules/views/src/Plugin/views/style/StylePluginBase.php b/core/modules/views/src/Plugin/views/style/StylePluginBase.php
index af10867c2..3bb472fb5 100644
--- a/core/modules/views/src/Plugin/views/style/StylePluginBase.php
+++ b/core/modules/views/src/Plugin/views/style/StylePluginBase.php
@@ -8,9 +8,10 @@
 namespace Drupal\views\Plugin\views\style;
 
 use Drupal\Component\Utility\Html;
-use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Component\Utility\Xss;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Render\Element;
+use Drupal\Core\Render\SafeString;
 use Drupal\views\Plugin\views\display\DisplayPluginBase;
 use Drupal\views\Plugin\views\PluginBase;
 use Drupal\views\Plugin\views\wizard\WizardInterface;
@@ -239,6 +240,11 @@ abstract class StylePluginBase extends PluginBase {
 
       $value = $this->viewsTokenReplace($value, $tokens);
     }
+    else {
+      // ::viewsTokenReplace() will run Xss::filterAdmin on the
+      // resulting string. We do the same here for consistency.
+      $value = Xss::filterAdmin($value);
+    }
     return $value;
   }
 
@@ -700,8 +706,9 @@ abstract class StylePluginBase extends PluginBase {
             $placeholders = array_keys($post_render_tokens);
             $values = array_values($post_render_tokens);
             foreach ($this->rendered_fields[$index] as &$rendered_field) {
-              $rendered_field = str_replace($placeholders, $values, $rendered_field);
-              SafeMarkup::set($rendered_field);
+              // Placeholders and rendered fields have been processed by the
+              // render system and are therefore safe.
+              $rendered_field = SafeString::create(str_replace($placeholders, $values, $rendered_field));
             }
           }
         }
@@ -738,7 +745,7 @@ abstract class StylePluginBase extends PluginBase {
    * @param string $field
    *   The ID of the field.
    *
-   * @return string|null
+   * @return \Drupal\Core\Render\SafeString|null
    *   The output of the field, or NULL if it was empty.
    */
   public function getField($index, $field) {
diff --git a/core/modules/views/src/Plugin/views/style/Table.php b/core/modules/views/src/Plugin/views/style/Table.php
index 4efeda2e6..8a594cf0a 100644
--- a/core/modules/views/src/Plugin/views/style/Table.php
+++ b/core/modules/views/src/Plugin/views/style/Table.php
@@ -444,8 +444,9 @@ class Table extends StylePluginBase implements CacheablePluginInterface {
 
     foreach ($this->options['info'] as $field_id => $info) {
       if (!empty($info['sortable'])) {
-        $contexts[] = 'url.query_args:order';
-        $contexts[] = 'url.query_args:sort';
+        // The rendered link needs to play well with any other query parameter
+        // used on the page, like pager and exposed filter.
+        $contexts[] = 'url.query_args';
         break;
       }
     }
diff --git a/core/modules/views/src/Routing/ViewPageController.php b/core/modules/views/src/Routing/ViewPageController.php
index 7d0d2b61f..cf3ae5377 100644
--- a/core/modules/views/src/Routing/ViewPageController.php
+++ b/core/modules/views/src/Routing/ViewPageController.php
@@ -7,54 +7,13 @@
 
 namespace Drupal\views\Routing;
 
-use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
-use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\views\Plugin\views\display\Page;
-use Drupal\views\ViewExecutableFactory;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Defines a page controller to execute and render a view.
  */
-class ViewPageController implements ContainerInjectionInterface {
-
-  /**
-   * The entity storage.
-   *
-   * @var \Drupal\Core\Entity\EntityStorageInterface
-   */
-  protected $storage;
-
-  /**
-   * The view executable factory.
-   *
-   * @var \Drupal\views\ViewExecutableFactory
-   */
-  protected $executableFactory;
-
-  /**
-   * Constructs a ViewPageController object.
-   *
-   * @param \Drupal\Core\Entity\EntityStorageInterface $storage
-   *   The entity storage.
-   * @param \Drupal\views\ViewExecutableFactory $executable_factory
-   *   The view executable factory
-   */
-  public function __construct(EntityStorageInterface $storage, ViewExecutableFactory $executable_factory) {
-    $this->storage = $storage;
-    $this->executableFactory = $executable_factory;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('entity.manager')->getStorage('view'),
-      $container->get('views.executable')
-    );
-  }
+class ViewPageController {
 
   /**
    * Handler a response for a given view and display.
diff --git a/core/modules/views/src/Tests/GlossaryTest.php b/core/modules/views/src/Tests/GlossaryTest.php
index 7d55f85e3..72854e90e 100644
--- a/core/modules/views/src/Tests/GlossaryTest.php
+++ b/core/modules/views/src/Tests/GlossaryTest.php
@@ -71,17 +71,29 @@ class GlossaryTest extends ViewTestBase {
     $url = Url::fromRoute('view.glossary.page_1');
 
     // Verify cache tags.
-    $this->assertPageCacheContextsAndTags($url, ['languages:' . LanguageInterface::TYPE_CONTENT, 'languages:' . LanguageInterface::TYPE_INTERFACE, 'theme', 'url', 'user.node_grants:view', 'user.permissions'], [
-      'config:views.view.glossary',
-      'node:' . $nodes_by_char['a'][0]->id(), 'node:' . $nodes_by_char['a'][1]->id(), 'node:' . $nodes_by_char['a'][2]->id(),
-      'node_list',
-      'user:0',
-      'user_list',
-      'rendered',
-      // FinishResponseSubscriber adds this cache tag to responses that have the
-      // 'user.permissions' cache context for anonymous users.
-      'config:user.role.anonymous',
-    ]);
+    $this->assertPageCacheContextsAndTags(
+      $url,
+      [
+        'languages:' . LanguageInterface::TYPE_CONTENT,
+        'languages:' . LanguageInterface::TYPE_INTERFACE,
+        'theme',
+        'url',
+        'user.node_grants:view',
+        'user.permissions',
+        'route',
+      ],
+      [
+        'config:views.view.glossary',
+        'node:' . $nodes_by_char['a'][0]->id(), 'node:' . $nodes_by_char['a'][1]->id(), 'node:' . $nodes_by_char['a'][2]->id(),
+        'node_list',
+        'user:0',
+        'user_list',
+        'rendered',
+        // FinishResponseSubscriber adds this cache tag to responses that have the
+        // 'user.permissions' cache context for anonymous users.
+        'config:user.role.anonymous',
+      ]
+    );
 
     // Check the actual page response.
     $this->drupalGet($url);
diff --git a/core/modules/views/src/Tests/Handler/FieldCounterTest.php b/core/modules/views/src/Tests/Handler/FieldCounterTest.php
index 4d1eac1fd..9fe24743c 100644
--- a/core/modules/views/src/Tests/Handler/FieldCounterTest.php
+++ b/core/modules/views/src/Tests/Handler/FieldCounterTest.php
@@ -51,11 +51,11 @@ class FieldCounterTest extends ViewUnitTestBase {
     $view->preview();
 
     $counter = $view->style_plugin->getField(0, 'counter');
-    $this->assertEqual($counter, 1, format_string('Make sure the expected number (@expected) patches with the rendered number (@counter)', array('@expected' => 1, '@counter' => $counter)));
+    $this->assertEqual($counter, '1', format_string('Make sure the expected number (@expected) patches with the rendered number (@counter)', array('@expected' => 1, '@counter' => $counter)));
     $counter = $view->style_plugin->getField(1, 'counter');
-    $this->assertEqual($counter, 2, format_string('Make sure the expected number (@expected) patches with the rendered number (@counter)', array('@expected' => 2, '@counter' => $counter)));
+    $this->assertEqual($counter, '2', format_string('Make sure the expected number (@expected) patches with the rendered number (@counter)', array('@expected' => 2, '@counter' => $counter)));
     $counter = $view->style_plugin->getField(2, 'counter');
-    $this->assertEqual($counter, 3, format_string('Make sure the expected number (@expected) patches with the rendered number (@counter)', array('@expected' => 3, '@counter' => $counter)));
+    $this->assertEqual($counter, '3', format_string('Make sure the expected number (@expected) patches with the rendered number (@counter)', array('@expected' => 3, '@counter' => $counter)));
     $view->destroy();
     $view->storage->invalidateCaches();
 
@@ -80,13 +80,13 @@ class FieldCounterTest extends ViewUnitTestBase {
 
     $counter = $view->style_plugin->getField(0, 'counter');
     $expected_number = 0 + $rand_start;
-    $this->assertEqual($counter, $expected_number, format_string('Make sure the expected number (@expected) patches with the rendered number (@counter)', array('@expected' => $expected_number, '@counter' => $counter)));
+    $this->assertEqual($counter, (string) $expected_number, format_string('Make sure the expected number (@expected) patches with the rendered number (@counter)', array('@expected' => $expected_number, '@counter' => $counter)));
     $counter = $view->style_plugin->getField(1, 'counter');
     $expected_number = 1 + $rand_start;
-    $this->assertEqual($counter, $expected_number, format_string('Make sure the expected number (@expected) patches with the rendered number (@counter)', array('@expected' => $expected_number, '@counter' => $counter)));
+    $this->assertEqual($counter, (string) $expected_number, format_string('Make sure the expected number (@expected) patches with the rendered number (@counter)', array('@expected' => $expected_number, '@counter' => $counter)));
     $counter = $view->style_plugin->getField(2, 'counter');
     $expected_number = 2 + $rand_start;
-    $this->assertEqual($counter, $expected_number, format_string('Make sure the expected number (@expected) patches with the rendered number (@counter)', array('@expected' => $expected_number, '@counter' => $counter)));
+    $this->assertEqual($counter, (string) $expected_number, format_string('Make sure the expected number (@expected) patches with the rendered number (@counter)', array('@expected' => $expected_number, '@counter' => $counter)));
   }
 
   // @TODO: Write tests for pager.
diff --git a/core/modules/views/src/Tests/Handler/FieldFieldTest.php b/core/modules/views/src/Tests/Handler/FieldFieldTest.php
index 8ad0bd14b..599338581 100644
--- a/core/modules/views/src/Tests/Handler/FieldFieldTest.php
+++ b/core/modules/views/src/Tests/Handler/FieldFieldTest.php
@@ -251,18 +251,18 @@ class FieldFieldTest extends ViewUnitTestBase {
     $executable = Views::getView('test_field_field_test');
     $executable->execute();
 
-    $this->assertEqual(1, $executable->getStyle()->getField(0, 'id'));
-    $this->assertEqual(3, $executable->getStyle()->getField(0, 'field_test'));
-    $this->assertEqual(2, $executable->getStyle()->getField(1, 'id'));
+    $this->assertEqual('1', $executable->getStyle()->getField(0, 'id'));
+    $this->assertEqual('3', $executable->getStyle()->getField(0, 'field_test'));
+    $this->assertEqual('2', $executable->getStyle()->getField(1, 'id'));
     // @todo Switch this assertion to assertIdentical('', ...) when
     //   https://www.drupal.org/node/2488006 gets fixed.
-    $this->assertEqual(0, $executable->getStyle()->getField(1, 'field_test'));
-    $this->assertEqual(3, $executable->getStyle()->getField(2, 'id'));
-    $this->assertEqual(8, $executable->getStyle()->getField(2, 'field_test'));
-    $this->assertEqual(4, $executable->getStyle()->getField(3, 'id'));
-    $this->assertEqual(5, $executable->getStyle()->getField(3, 'field_test'));
-    $this->assertEqual(5, $executable->getStyle()->getField(4, 'id'));
-    $this->assertEqual(6, $executable->getStyle()->getField(4, 'field_test'));
+    $this->assertEqual('0', $executable->getStyle()->getField(1, 'field_test'));
+    $this->assertEqual('3', $executable->getStyle()->getField(2, 'id'));
+    $this->assertEqual('8', $executable->getStyle()->getField(2, 'field_test'));
+    $this->assertEqual('4', $executable->getStyle()->getField(3, 'id'));
+    $this->assertEqual('5', $executable->getStyle()->getField(3, 'field_test'));
+    $this->assertEqual('5', $executable->getStyle()->getField(4, 'id'));
+    $this->assertEqual('6', $executable->getStyle()->getField(4, 'field_test'));
   }
 
   /**
@@ -326,10 +326,10 @@ class FieldFieldTest extends ViewUnitTestBase {
     $executable->execute();
 
     for ($i = 0; $i < 5; $i++) {
-      $this->assertEqual($i + 1, $executable->getStyle()->getField($i, 'id'));
+      $this->assertEqual((string) ($i + 1), $executable->getStyle()->getField($i, 'id'));
       $this->assertEqual('test ' . $i, $executable->getStyle()->getField($i, 'name'));
       $entity = EntityTest::load($i + 1);
-      $this->assertEqual('<a href="' . $entity->url() . '" hreflang="' . $entity->language()->getId() . '">test ' . $i . '</a>', $executable->getStyle()->getField($i, 'name_alias'));
+      $this->assertEqual('<a href="' . $entity->url() . '" hreflang="' . $entity->language()->getId() . '">test ' . $i . '</a>', (string) $executable->getStyle()->getField($i, 'name_alias'));
     }
   }
 
@@ -426,24 +426,24 @@ class FieldFieldTest extends ViewUnitTestBase {
     $executable = Views::getView('test_field_field_revision_test');
     $executable->execute();
 
-    $this->assertEqual(1, $executable->getStyle()->getField(0, 'id'));
-    $this->assertEqual(1, $executable->getStyle()->getField(0, 'revision_id'));
-    $this->assertEqual(1, $executable->getStyle()->getField(0, 'field_test'));
+    $this->assertEqual('1', $executable->getStyle()->getField(0, 'id'));
+    $this->assertEqual('1', $executable->getStyle()->getField(0, 'revision_id'));
+    $this->assertEqual('1', $executable->getStyle()->getField(0, 'field_test'));
     $this->assertEqual('base value', $executable->getStyle()->getField(0, 'name'));
 
-    $this->assertEqual(1, $executable->getStyle()->getField(1, 'id'));
-    $this->assertEqual(2, $executable->getStyle()->getField(1, 'revision_id'));
-    $this->assertEqual(2, $executable->getStyle()->getField(1, 'field_test'));
+    $this->assertEqual('1', $executable->getStyle()->getField(1, 'id'));
+    $this->assertEqual('2', $executable->getStyle()->getField(1, 'revision_id'));
+    $this->assertEqual('2', $executable->getStyle()->getField(1, 'field_test'));
     $this->assertEqual('revision value1', $executable->getStyle()->getField(1, 'name'));
 
-    $this->assertEqual(1, $executable->getStyle()->getField(2, 'id'));
-    $this->assertEqual(3, $executable->getStyle()->getField(2, 'revision_id'));
-    $this->assertEqual(3, $executable->getStyle()->getField(2, 'field_test'));
+    $this->assertEqual('1', $executable->getStyle()->getField(2, 'id'));
+    $this->assertEqual('3', $executable->getStyle()->getField(2, 'revision_id'));
+    $this->assertEqual('3', $executable->getStyle()->getField(2, 'field_test'));
     $this->assertEqual('revision value2', $executable->getStyle()->getField(2, 'name'));
 
-    $this->assertEqual(2, $executable->getStyle()->getField(3, 'id'));
-    $this->assertEqual(4, $executable->getStyle()->getField(3, 'revision_id'));
-    $this->assertEqual(4, $executable->getStyle()->getField(3, 'field_test'));
+    $this->assertEqual('2', $executable->getStyle()->getField(3, 'id'));
+    $this->assertEqual('4', $executable->getStyle()->getField(3, 'revision_id'));
+    $this->assertEqual('4', $executable->getStyle()->getField(3, 'field_test'));
     $this->assertEqual('next entity value', $executable->getStyle()->getField(3, 'name'));
   }
 
@@ -484,29 +484,29 @@ class FieldFieldTest extends ViewUnitTestBase {
     $executable = Views::getView('test_field_field_revision_complex_test');
     $executable->execute();
 
-    $this->assertEqual(1, $executable->getStyle()->getField(0, 'id'));
-    $this->assertEqual(1, $executable->getStyle()->getField(0, 'revision_id'));
+    $this->assertEqual('1', $executable->getStyle()->getField(0, 'id'));
+    $this->assertEqual('1', $executable->getStyle()->getField(0, 'revision_id'));
     $this->assertEqual($this->testUsers[0]->getTimeZone(), $executable->getStyle()->getField(0, 'timezone'));
     $this->assertEqual('1, 3, 7', $executable->getStyle()->getField(0, 'field_test_multiple'));
     $this->assertEqual('1', $executable->getStyle()->getField(0, 'field_test_multiple_1'));
     $this->assertEqual('3, 7', $executable->getStyle()->getField(0, 'field_test_multiple_2'));
 
-    $this->assertEqual(1, $executable->getStyle()->getField(1, 'id'));
-    $this->assertEqual(2, $executable->getStyle()->getField(1, 'revision_id'));
+    $this->assertEqual('1', $executable->getStyle()->getField(1, 'id'));
+    $this->assertEqual('2', $executable->getStyle()->getField(1, 'revision_id'));
     $this->assertEqual($this->testUsers[1]->getTimeZone(), $executable->getStyle()->getField(1, 'timezone'));
     $this->assertEqual('0, 3, 5', $executable->getStyle()->getField(1, 'field_test_multiple'));
     $this->assertEqual('0', $executable->getStyle()->getField(1, 'field_test_multiple_1'));
     $this->assertEqual('3, 5', $executable->getStyle()->getField(1, 'field_test_multiple_2'));
 
-    $this->assertEqual(1, $executable->getStyle()->getField(2, 'id'));
-    $this->assertEqual(3, $executable->getStyle()->getField(2, 'revision_id'));
+    $this->assertEqual('1', $executable->getStyle()->getField(2, 'id'));
+    $this->assertEqual('3', $executable->getStyle()->getField(2, 'revision_id'));
     $this->assertEqual($this->testUsers[2]->getTimeZone(), $executable->getStyle()->getField(2, 'timezone'));
     $this->assertEqual('9, 9, 9', $executable->getStyle()->getField(2, 'field_test_multiple'));
     $this->assertEqual('9', $executable->getStyle()->getField(2, 'field_test_multiple_1'));
     $this->assertEqual('9, 9', $executable->getStyle()->getField(2, 'field_test_multiple_2'));
 
-    $this->assertEqual(2, $executable->getStyle()->getField(3, 'id'));
-    $this->assertEqual(4, $executable->getStyle()->getField(3, 'revision_id'));
+    $this->assertEqual('2', $executable->getStyle()->getField(3, 'id'));
+    $this->assertEqual('4', $executable->getStyle()->getField(3, 'revision_id'));
     $this->assertEqual($this->testUsers[3]->getTimeZone(), $executable->getStyle()->getField(3, 'timezone'));
     $this->assertEqual('2, 9, 9', $executable->getStyle()->getField(3, 'field_test_multiple'));
     $this->assertEqual('2', $executable->getStyle()->getField(3, 'field_test_multiple_1'));
@@ -531,9 +531,7 @@ class FieldFieldTest extends ViewUnitTestBase {
     $executable = Views::getView('test_field_field_test');
     $executable->execute();
 
-    // @todo Switch this assertion to assertIdentical('', ...) when
-    //   https://www.drupal.org/node/2488006 gets fixed.
-    $this->assertEqual(0, $executable->getStyle()->getField(1, 'field_test'));
+    $this->assertEqual('', $executable->getStyle()->getField(1, 'field_test'));
   }
 
 }
diff --git a/core/modules/views/src/Tests/Handler/FieldGroupRowsTest.php b/core/modules/views/src/Tests/Handler/FieldGroupRowsTest.php
index d318a7967..9cfd854e4 100644
--- a/core/modules/views/src/Tests/Handler/FieldGroupRowsTest.php
+++ b/core/modules/views/src/Tests/Handler/FieldGroupRowsTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\views\Tests\Handler;
 
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
+use Drupal\Core\Render\RenderContext;
 use Drupal\views\Views;
 
 /**
@@ -67,6 +68,9 @@ class FieldGroupRowsTest extends HandlerTestBase {
    * Testing the "Grouped rows" functionality.
    */
   public function testGroupRows() {
+    /** @var \Drupal\Core\Render\RendererInterface $renderer */
+    $renderer = \Drupal::service('renderer');
+
     $edit = array(
       'title' => $this->randomMachineName(),
       $this->fieldName => array('a', 'b', 'c'),
@@ -77,7 +81,10 @@ class FieldGroupRowsTest extends HandlerTestBase {
 
     // Test grouped rows.
     $this->executeView($view);
-    $this->assertEqual($view->field[$this->fieldName]->advancedRender($view->result[0]), 'a, b, c');
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field[$this->fieldName]->advancedRender($view->result[0]);
+    });
+    $this->assertEqual($output, 'a, b, c');
 
     // Change the group_rows checkbox to false.
     $view = Views::getView('test_group_rows');
@@ -88,11 +95,20 @@ class FieldGroupRowsTest extends HandlerTestBase {
     $view->render();
 
     $view->row_index = 0;
-    $this->assertEqual($view->field[$this->fieldName]->advancedRender($view->result[0]), 'a');
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field[$this->fieldName]->advancedRender($view->result[0]);
+    });
+    $this->assertEqual($output, 'a');
     $view->row_index = 1;
-    $this->assertEqual($view->field[$this->fieldName]->advancedRender($view->result[1]), 'b');
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field[$this->fieldName]->advancedRender($view->result[1]);
+    });
+    $this->assertEqual($output, 'b');
     $view->row_index = 2;
-    $this->assertEqual($view->field[$this->fieldName]->advancedRender($view->result[2]), 'c');
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field[$this->fieldName]->advancedRender($view->result[2]);
+    });
+    $this->assertEqual($output, 'c');
   }
 
 }
diff --git a/core/modules/views/src/Tests/Handler/FieldUnitTest.php b/core/modules/views/src/Tests/Handler/FieldUnitTest.php
index f76e1cecd..85fabe3da 100644
--- a/core/modules/views/src/Tests/Handler/FieldUnitTest.php
+++ b/core/modules/views/src/Tests/Handler/FieldUnitTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\views\Tests\Handler;
 
+use Drupal\Core\Render\RenderContext;
 use Drupal\views\Tests\ViewUnitTestBase;
 use Drupal\views\Plugin\views\field\FieldPluginBase;
 use Drupal\views\Views;
@@ -52,12 +53,18 @@ class FieldUnitTest extends ViewUnitTestBase {
    * Tests that the render function is called.
    */
   public function testRender() {
+    /** @var \Drupal\Core\Render\RendererInterface $renderer */
+    $renderer = \Drupal::service('renderer');
+
     $view = Views::getView('test_field_tokens');
     $this->executeView($view);
 
     $random_text = $this->randomMachineName();
     $view->field['job']->setTestValue($random_text);
-    $this->assertEqual($view->field['job']->theme($view->result[0]), $random_text, 'Make sure the render method rendered the manual set value.');
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['job']->theme($view->result[0]);
+    });
+    $this->assertEqual($output, $random_text, 'Make sure the render method rendered the manual set value.');
   }
 
   /**
@@ -141,6 +148,9 @@ class FieldUnitTest extends ViewUnitTestBase {
    * Tests general rewriting of the output.
    */
   public function testRewrite() {
+    /** @var \Drupal\Core\Render\RendererInterface $renderer */
+    $renderer = \Drupal::service('renderer');
+
     $view = Views::getView('test_view');
     $view->initHandlers();
     $this->executeView($view);
@@ -149,11 +159,15 @@ class FieldUnitTest extends ViewUnitTestBase {
 
     // Don't check the rewrite checkbox, so the text shouldn't appear.
     $id_field->options['alter']['text'] = $random_text = $this->randomMachineName();
-    $output = $id_field->theme($row);
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) {
+      return $id_field->theme($row);
+    });
     $this->assertNotSubString($output, $random_text);
 
     $id_field->options['alter']['alter_text'] = TRUE;
-    $output = $id_field->theme($row);
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) {
+      return $id_field->theme($row);
+    });
     $this->assertSubString($output, $random_text);
   }
 
@@ -161,6 +175,9 @@ class FieldUnitTest extends ViewUnitTestBase {
    * Tests the field tokens, row level and field level.
    */
   public function testFieldTokens() {
+    /** @var \Drupal\Core\Render\RendererInterface $renderer */
+    $renderer = \Drupal::service('renderer');
+
     $view = Views::getView('test_field_tokens');
     $this->executeView($view);
     $name_field_0 = $view->field['name'];
@@ -175,26 +192,32 @@ class FieldUnitTest extends ViewUnitTestBase {
     $name_field_1->options['alter']['text'] = '{{ name_1 }} {{ name }}';
 
     $name_field_2->options['alter']['alter_text'] = TRUE;
-    $name_field_2->options['alter']['text'] = '{{ name_2 }} {{ name_1 }}';
+    $name_field_2->options['alter']['text'] = '{% if name_2|length > 3 %}{{ name_2 }} {{ name_1 }}{% endif %}';
 
     foreach ($view->result as $row) {
       $expected_output_0 = $row->views_test_data_name;
       $expected_output_1 = "$row->views_test_data_name $row->views_test_data_name";
       $expected_output_2 = "$row->views_test_data_name $row->views_test_data_name $row->views_test_data_name";
 
-      $output = $name_field_0->advancedRender($row);
+      $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($name_field_0, $row) {
+        return $name_field_0->advancedRender($row);
+      });
       $this->assertEqual($output, $expected_output_0, format_string('Test token replacement: "!token" gave "!output"', [
         '!token' => $name_field_0->options['alter']['text'],
         '!output' => $output,
       ]));
 
-      $output = $name_field_1->advancedRender($row);
+      $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($name_field_1, $row) {
+        return $name_field_1->advancedRender($row);
+      });
       $this->assertEqual($output, $expected_output_1, format_string('Test token replacement: "!token" gave "!output"', [
         '!token' => $name_field_1->options['alter']['text'],
         '!output' => $output,
       ]));
 
-      $output = $name_field_2->advancedRender($row);
+      $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($name_field_2, $row) {
+        return $name_field_2->advancedRender($row);
+      });
       $this->assertEqual($output, $expected_output_2, format_string('Test token replacement: "!token" gave "!output"', [
         '!token' => $name_field_2->options['alter']['text'],
         '!output' => $output,
@@ -207,7 +230,9 @@ class FieldUnitTest extends ViewUnitTestBase {
 
     $random_text = $this->randomMachineName();
     $job_field->setTestValue($random_text);
-    $output = $job_field->advancedRender($row);
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($job_field, $row) {
+      return $job_field->advancedRender($row);
+    });
     $this->assertSubString($output, $random_text, format_string('Make sure the self token (!token => !value) appears in the output (!output)', [
       '!value' => $random_text,
       '!output' => $output,
@@ -219,12 +244,46 @@ class FieldUnitTest extends ViewUnitTestBase {
     $job_field->options['alter']['text'] = $old_token;
     $random_text = $this->randomMachineName();
     $job_field->setTestValue($random_text);
-    $output = $job_field->advancedRender($row);
-    $this->assertSubString($output, $old_token, format_string('Make sure the old token style (!token => !value) is not changed in the output (!output)', [
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($job_field, $row) {
+      return $job_field->advancedRender($row);
+    });
+    $this->assertEqual($output, $old_token, format_string('Make sure the old token style (!token => !value) is not changed in the output (!output)', [
       '!value' => $random_text,
       '!output' => $output,
       '!token' => $job_field->options['alter']['text'],
     ]));
+
+    // Verify HTML tags are allowed in rewrite templates while token
+    // replacements are escaped.
+    $job_field->options['alter']['text'] = '<h1>{{ job }}</h1>';
+    $random_text = $this->randomMachineName();
+    $job_field->setTestValue('<span>' . $random_text . '</span>');
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($job_field, $row) {
+      return $job_field->advancedRender($row);
+    });
+    $this->assertEqual($output, '<h1>&lt;span&gt;' . $random_text . '&lt;/span&gt;</h1>', 'Valid tags are allowed in rewrite templates and token replacements.');
+
+    // Verify <script> tags are correctly removed from rewritten text.
+    $rewrite_template = '<script>alert("malicious");</script>';
+    $job_field->options['alter']['text'] = $rewrite_template;
+    $random_text = $this->randomMachineName();
+    $job_field->setTestValue($random_text);
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($job_field, $row) {
+      return $job_field->advancedRender($row);
+    });
+    $this->assertNotSubString($output, '<script>', 'Ensure a script tag in the rewrite template is removed.');
+
+    $rewrite_template = '<script>{{ job }}</script>';
+    $job_field->options['alter']['text'] = $rewrite_template;
+    $random_text = $this->randomMachineName();
+    $job_field->setTestValue($random_text);
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($job_field, $row) {
+      return $job_field->advancedRender($row);
+    });
+    $this->assertEqual($output, $random_text, format_string('Make sure a script tag in the template (!template) is removed, leaving only the replaced token in the output (!output)', [
+      '!output' => $output,
+      '!template' => $rewrite_template,
+    ]));
   }
 
   /**
@@ -268,6 +327,9 @@ class FieldUnitTest extends ViewUnitTestBase {
    * This tests alters the result to get easier and less coupled results.
    */
   function _testHideIfEmpty() {
+    /** @var \Drupal\Core\Render\RendererInterface $renderer */
+    $renderer = \Drupal::service('renderer');
+
     $view = Views::getView('test_view');
     $view->initDisplay();
     $this->executeView($view);
@@ -284,22 +346,30 @@ class FieldUnitTest extends ViewUnitTestBase {
 
     // Test a valid string.
     $view->result[0]->{$column_map_reversed['name']} = $random_name;
-    $render = $view->field['name']->advancedRender($view->result[0]);
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
     $this->assertIdentical($render, $random_name, 'By default, a string should not be treated as empty.');
 
     // Test an empty string.
     $view->result[0]->{$column_map_reversed['name']} = "";
-    $render = $view->field['name']->advancedRender($view->result[0]);
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
     $this->assertIdentical($render, "", 'By default, "" should not be treated as empty.');
 
     // Test zero as an integer.
     $view->result[0]->{$column_map_reversed['name']} = 0;
-    $render = $view->field['name']->advancedRender($view->result[0]);
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
     $this->assertIdentical($render, '0', 'By default, 0 should not be treated as empty.');
 
     // Test zero as a string.
     $view->result[0]->{$column_map_reversed['name']} = "0";
-    $render = $view->field['name']->advancedRender($view->result[0]);
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
     $this->assertIdentical($render, "0", 'By default, "0" should not be treated as empty.');
 
     // Test when results are not rewritten and non-zero empty values are hidden.
@@ -309,22 +379,30 @@ class FieldUnitTest extends ViewUnitTestBase {
 
     // Test a valid string.
     $view->result[0]->{$column_map_reversed['name']} = $random_name;
-    $render = $view->field['name']->advancedRender($view->result[0]);
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
     $this->assertIdentical($render, $random_name, 'If hide_empty is checked, a string should not be treated as empty.');
 
     // Test an empty string.
     $view->result[0]->{$column_map_reversed['name']} = "";
-    $render = $view->field['name']->advancedRender($view->result[0]);
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
     $this->assertIdentical($render, "", 'If hide_empty is checked, "" should be treated as empty.');
 
     // Test zero as an integer.
     $view->result[0]->{$column_map_reversed['name']} = 0;
-    $render = $view->field['name']->advancedRender($view->result[0]);
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
     $this->assertIdentical($render, '0', 'If hide_empty is checked, but not empty_zero, 0 should not be treated as empty.');
 
     // Test zero as a string.
     $view->result[0]->{$column_map_reversed['name']} = "0";
-    $render = $view->field['name']->advancedRender($view->result[0]);
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
     $this->assertIdentical($render, "0", 'If hide_empty is checked, but not empty_zero, "0" should not be treated as empty.');
 
     // Test when results are not rewritten and all empty values are hidden.
@@ -334,12 +412,16 @@ class FieldUnitTest extends ViewUnitTestBase {
 
     // Test zero as an integer.
     $view->result[0]->{$column_map_reversed['name']} = 0;
-    $render = $view->field['name']->advancedRender($view->result[0]);
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
     $this->assertIdentical($render, "", 'If hide_empty and empty_zero are checked, 0 should be treated as empty.');
 
     // Test zero as a string.
     $view->result[0]->{$column_map_reversed['name']} = "0";
-    $render = $view->field['name']->advancedRender($view->result[0]);
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
     $this->assertIdentical($render, "", 'If hide_empty and empty_zero are checked, "0" should be treated as empty.');
 
     // Test when results are rewritten to a valid string and non-zero empty
@@ -352,22 +434,30 @@ class FieldUnitTest extends ViewUnitTestBase {
 
     // Test a valid string.
     $view->result[0]->{$column_map_reversed['name']} = $random_value;
-    $render = $view->field['name']->advancedRender($view->result[0]);
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
     $this->assertIdentical($render, $random_name, 'If the rewritten string is not empty, it should not be treated as empty.');
 
     // Test an empty string.
     $view->result[0]->{$column_map_reversed['name']} = "";
-    $render = $view->field['name']->advancedRender($view->result[0]);
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
     $this->assertIdentical($render, $random_name, 'If the rewritten string is not empty, "" should not be treated as empty.');
 
     // Test zero as an integer.
     $view->result[0]->{$column_map_reversed['name']} = 0;
-    $render = $view->field['name']->advancedRender($view->result[0]);
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
     $this->assertIdentical($render, $random_name, 'If the rewritten string is not empty, 0 should not be treated as empty.');
 
     // Test zero as a string.
     $view->result[0]->{$column_map_reversed['name']} = "0";
-    $render = $view->field['name']->advancedRender($view->result[0]);
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
     $this->assertIdentical($render, $random_name, 'If the rewritten string is not empty, "0" should not be treated as empty.');
 
     // Test when results are rewritten to an empty string and non-zero empty results are hidden.
@@ -379,22 +469,30 @@ class FieldUnitTest extends ViewUnitTestBase {
 
     // Test a valid string.
     $view->result[0]->{$column_map_reversed['name']} = $random_name;
-    $render = $view->field['name']->advancedRender($view->result[0]);
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
     $this->assertIdentical($render, $random_name, 'If the rewritten string is empty, it should not be treated as empty.');
 
     // Test an empty string.
     $view->result[0]->{$column_map_reversed['name']} = "";
-    $render = $view->field['name']->advancedRender($view->result[0]);
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
     $this->assertIdentical($render, "", 'If the rewritten string is empty, "" should be treated as empty.');
 
     // Test zero as an integer.
     $view->result[0]->{$column_map_reversed['name']} = 0;
-    $render = $view->field['name']->advancedRender($view->result[0]);
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
     $this->assertIdentical($render, '0', 'If the rewritten string is empty, 0 should not be treated as empty.');
 
     // Test zero as a string.
     $view->result[0]->{$column_map_reversed['name']} = "0";
-    $render = $view->field['name']->advancedRender($view->result[0]);
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
     $this->assertIdentical($render, "0", 'If the rewritten string is empty, "0" should not be treated as empty.');
 
     // Test when results are rewritten to zero as a string and non-zero empty
@@ -407,22 +505,30 @@ class FieldUnitTest extends ViewUnitTestBase {
 
     // Test a valid string.
     $view->result[0]->{$column_map_reversed['name']} = $random_name;
-    $render = $view->field['name']->advancedRender($view->result[0]);
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
     $this->assertIdentical($render, "0", 'If the rewritten string is zero and empty_zero is not checked, the string rewritten as 0 should not be treated as empty.');
 
     // Test an empty string.
     $view->result[0]->{$column_map_reversed['name']} = "";
-    $render = $view->field['name']->advancedRender($view->result[0]);
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
     $this->assertIdentical($render, "0", 'If the rewritten string is zero and empty_zero is not checked, "" rewritten as 0 should not be treated as empty.');
 
     // Test zero as an integer.
     $view->result[0]->{$column_map_reversed['name']} = 0;
-    $render = $view->field['name']->advancedRender($view->result[0]);
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
     $this->assertIdentical($render, "0", 'If the rewritten string is zero and empty_zero is not checked, 0 should not be treated as empty.');
 
     // Test zero as a string.
     $view->result[0]->{$column_map_reversed['name']} = "0";
-    $render = $view->field['name']->advancedRender($view->result[0]);
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
     $this->assertIdentical($render, "0", 'If the rewritten string is zero and empty_zero is not checked, "0" should not be treated as empty.');
 
     // Test when results are rewritten to a valid string and non-zero empty
@@ -435,22 +541,30 @@ class FieldUnitTest extends ViewUnitTestBase {
 
     // Test a valid string.
     $view->result[0]->{$column_map_reversed['name']} = $random_name;
-    $render = $view->field['name']->advancedRender($view->result[0]);
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
     $this->assertIdentical($render, $random_value, 'If the original and rewritten strings are valid, it should not be treated as empty.');
 
     // Test an empty string.
     $view->result[0]->{$column_map_reversed['name']} = "";
-    $render = $view->field['name']->advancedRender($view->result[0]);
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
     $this->assertIdentical($render, "", 'If either the original or rewritten string is invalid, "" should be treated as empty.');
 
     // Test zero as an integer.
     $view->result[0]->{$column_map_reversed['name']} = 0;
-    $render = $view->field['name']->advancedRender($view->result[0]);
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
     $this->assertIdentical($render, $random_value, 'If the original and rewritten strings are valid, 0 should not be treated as empty.');
 
     // Test zero as a string.
     $view->result[0]->{$column_map_reversed['name']} = "0";
-    $render = $view->field['name']->advancedRender($view->result[0]);
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
     $this->assertIdentical($render, $random_value, 'If the original and rewritten strings are valid, "0" should not be treated as empty.');
 
     // Test when results are rewritten to zero as a string and all empty
@@ -463,22 +577,30 @@ class FieldUnitTest extends ViewUnitTestBase {
 
     // Test a valid string.
     $view->result[0]->{$column_map_reversed['name']} = $random_name;
-    $render = $view->field['name']->advancedRender($view->result[0]);
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
     $this->assertIdentical($render, "", 'If the rewritten string is zero, it should be treated as empty.');
 
     // Test an empty string.
     $view->result[0]->{$column_map_reversed['name']} = "";
-    $render = $view->field['name']->advancedRender($view->result[0]);
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
     $this->assertIdentical($render, "", 'If the rewritten string is zero, "" should be treated as empty.');
 
     // Test zero as an integer.
     $view->result[0]->{$column_map_reversed['name']} = 0;
-    $render = $view->field['name']->advancedRender($view->result[0]);
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
     $this->assertIdentical($render, "", 'If the rewritten string is zero, 0 should not be treated as empty.');
 
     // Test zero as a string.
     $view->result[0]->{$column_map_reversed['name']} = "0";
-    $render = $view->field['name']->advancedRender($view->result[0]);
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
     $this->assertIdentical($render, "", 'If the rewritten string is zero, "0" should not be treated as empty.');
   }
 
@@ -486,6 +608,9 @@ class FieldUnitTest extends ViewUnitTestBase {
    * Tests the usage of the empty text.
    */
   function _testEmptyText() {
+    /** @var \Drupal\Core\Render\RendererInterface $renderer */
+    $renderer = \Drupal::service('renderer');
+
     $view = Views::getView('test_view');
     $view->initDisplay();
     $this->executeView($view);
@@ -495,27 +620,37 @@ class FieldUnitTest extends ViewUnitTestBase {
 
     $empty_text = $view->field['name']->options['empty'] = $this->randomMachineName();
     $view->result[0]->{$column_map_reversed['name']} = "";
-    $render = $view->field['name']->advancedRender($view->result[0]);
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
     $this->assertIdentical($render, $empty_text, 'If a field is empty, the empty text should be used for the output.');
 
     $view->result[0]->{$column_map_reversed['name']} = "0";
-    $render = $view->field['name']->advancedRender($view->result[0]);
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
     $this->assertIdentical($render, "0", 'If a field is 0 and empty_zero is not checked, the empty text should not be used for the output.');
 
     $view->result[0]->{$column_map_reversed['name']} = "0";
     $view->field['name']->options['empty_zero'] = TRUE;
-    $render = $view->field['name']->advancedRender($view->result[0]);
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
     $this->assertIdentical($render, $empty_text, 'If a field is 0 and empty_zero is checked, the empty text should be used for the output.');
 
     $view->result[0]->{$column_map_reversed['name']} = "";
     $view->field['name']->options['alter']['alter_text'] = TRUE;
     $alter_text = $view->field['name']->options['alter']['text'] = $this->randomMachineName();
     $view->field['name']->options['hide_alter_empty'] = FALSE;
-    $render = $view->field['name']->advancedRender($view->result[0]);
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
     $this->assertIdentical($render, $alter_text, 'If a field is empty, some rewrite text exists, but hide_alter_empty is not checked, render the rewrite text.');
 
     $view->field['name']->options['hide_alter_empty'] = TRUE;
-    $render = $view->field['name']->advancedRender($view->result[0]);
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
     $this->assertIdentical($render, $empty_text, 'If a field is empty, some rewrite text exists, and hide_alter_empty is checked, use the empty text.');
   }
 
diff --git a/core/modules/views/src/Tests/Handler/FieldWebTest.php b/core/modules/views/src/Tests/Handler/FieldWebTest.php
index 45a161704..3ffec6b8d 100644
--- a/core/modules/views/src/Tests/Handler/FieldWebTest.php
+++ b/core/modules/views/src/Tests/Handler/FieldWebTest.php
@@ -10,6 +10,7 @@ namespace Drupal\views\Tests\Handler;
 use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\Unicode;
 use Drupal\Component\Utility\UrlHelper;
+use Drupal\Core\Render\RenderContext;
 use Drupal\system\Tests\Cache\AssertPageCacheContextsAndTagsTrait;
 use Drupal\views\Views;
 
@@ -67,23 +68,21 @@ class FieldWebTest extends HandlerTestBase {
     $this->assertResponse(200);
 
     // Only the id and name should be click sortable, but not the name.
-    $this->assertLinkByHref(\Drupal::url('view.test_click_sort.page_1', [], ['query' => ['order' => 'id', 'sort' => 'asc']]));
-    $this->assertLinkByHref(\Drupal::url('view.test_click_sort.page_1', [], ['query' => ['order' => 'name', 'sort' => 'desc']]));
-    $this->assertNoLinkByHref(\Drupal::url('view.test_click_sort.page_1', [], ['query' => ['order' => 'created']]));
+    $this->assertLinkByHref(\Drupal::url('<none>', [], ['query' => ['order' => 'id', 'sort' => 'asc']]));
+    $this->assertLinkByHref(\Drupal::url('<none>', [], ['query' => ['order' => 'name', 'sort' => 'desc']]));
+    $this->assertNoLinkByHref(\Drupal::url('<none>', [], ['query' => ['order' => 'created']]));
 
     // Check that the view returns the click sorting cache contexts.
     $expected_contexts = [
       'languages:language_interface',
       'theme',
-      'url.query_args.pagers:0',
-      'url.query_args:order',
-      'url.query_args:sort',
+      'url.query_args',
     ];
     $this->assertCacheContexts($expected_contexts);
 
     // Clicking a click sort should change the order.
     $this->clickLink(t('ID'));
-    $this->assertLinkByHref(\Drupal::url('view.test_click_sort.page_1', [], ['query' => ['order' => 'id', 'sort' => 'desc']]));
+    $this->assertLinkByHref(\Drupal::url('<none>', [], ['query' => ['order' => 'id', 'sort' => 'desc']]));
     // Check that the output has the expected order (asc).
     $ids = $this->clickSortLoadIdsFromOutput();
     $this->assertEqual($ids, range(1, 5));
@@ -197,6 +196,9 @@ class FieldWebTest extends HandlerTestBase {
    * Tests rewriting the output to a link.
    */
   public function testAlterUrl() {
+    /** @var \Drupal\Core\Render\RendererInterface $renderer */
+    $renderer = \Drupal::service('renderer');
+
     $view = Views::getView('test_view');
     $view->setDisplay();
     $view->initHandlers();
@@ -211,13 +213,17 @@ class FieldWebTest extends HandlerTestBase {
     // Tests that the suffix/prefix appears on the output.
     $id_field->options['alter']['prefix'] = $prefix = $this->randomMachineName();
     $id_field->options['alter']['suffix'] = $suffix = $this->randomMachineName();
-    $output = $id_field->theme($row);
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) {
+      return $id_field->theme($row);
+    });
     $this->assertSubString($output, $prefix);
     $this->assertSubString($output, $suffix);
     unset($id_field->options['alter']['prefix']);
     unset($id_field->options['alter']['suffix']);
 
-    $output = $id_field->theme($row);
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) {
+      return $id_field->theme($row);
+    });
     $this->assertSubString($output, $path, 'Make sure that the path is part of the output');
 
     // Some generic test code adapted from the UrlTest class, which tests
@@ -228,44 +234,60 @@ class FieldWebTest extends HandlerTestBase {
 
       $expected_result = \Drupal::url('entity.node.canonical', ['node' => '123'], ['absolute' => $absolute]);
       $alter['absolute'] = $absolute;
-      $result = $id_field->theme($row);
+      $result = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) {
+        return $id_field->theme($row);
+      });
       $this->assertSubString($result, $expected_result);
 
       $expected_result = \Drupal::url('entity.node.canonical', ['node' => '123'], ['fragment' => 'foo', 'absolute' => $absolute]);
       $alter['path'] = 'node/123#foo';
-      $result = $id_field->theme($row);
+      $result = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) {
+        return $id_field->theme($row);
+      });
       $this->assertSubString($result, $expected_result);
 
       $expected_result = \Drupal::url('entity.node.canonical', ['node' => '123'], ['query' => ['foo' => NULL], 'absolute' => $absolute]);
       $alter['path'] = 'node/123?foo';
-      $result = $id_field->theme($row);
+      $result = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) {
+        return $id_field->theme($row);
+      });
       $this->assertSubString($result, $expected_result);
 
       $expected_result = \Drupal::url('entity.node.canonical', ['node' => '123'], ['query' => ['foo' => 'bar', 'bar' => 'baz'], 'absolute' => $absolute]);
       $alter['path'] = 'node/123?foo=bar&bar=baz';
-      $result = $id_field->theme($row);
+      $result = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) {
+        return $id_field->theme($row);
+      });
       $this->assertSubString(Html::decodeEntities($result), Html::decodeEntities($expected_result));
 
       // @todo The route-based URL generator strips out NULL attributes.
       // $expected_result = \Drupal::url('entity.node.canonical', ['node' => '123'], ['query' => ['foo' => NULL], 'fragment' => 'bar', 'absolute' => $absolute]);
       $expected_result = \Drupal::urlGenerator()->generateFromPath('node/123', array('query' => array('foo' => NULL), 'fragment' => 'bar', 'absolute' => $absolute));
       $alter['path'] = 'node/123?foo#bar';
-      $result = $id_field->theme($row);
+      $result = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) {
+        return $id_field->theme($row);
+      });
       $this->assertSubString(Html::decodeEntities($result), Html::decodeEntities($expected_result));
 
       $expected_result = \Drupal::url('<front>', [], ['absolute' => $absolute]);
       $alter['path'] = '<front>';
-      $result = $id_field->theme($row);
+      $result = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) {
+        return $id_field->theme($row);
+      });
       $this->assertSubString($result, $expected_result);
     }
 
     // Tests the replace spaces with dashes feature.
     $id_field->options['alter']['replace_spaces'] = TRUE;
     $id_field->options['alter']['path'] = $path = $this->randomMachineName() . ' ' . $this->randomMachineName();
-    $output = $id_field->theme($row);
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) {
+      return $id_field->theme($row);
+    });
     $this->assertSubString($output, str_replace(' ', '-', $path));
     $id_field->options['alter']['replace_spaces'] = FALSE;
-    $output = $id_field->theme($row);
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) {
+      return $id_field->theme($row);
+    });
     // The url has a space in it, so to check we have to decode the url output.
     $this->assertSubString(urldecode($output), $path);
 
@@ -273,44 +295,60 @@ class FieldWebTest extends HandlerTestBase {
     // Switch on the external flag should output an external url as well.
     $id_field->options['alter']['external'] = TRUE;
     $id_field->options['alter']['path'] = $path = 'www.drupal.org';
-    $output = $id_field->theme($row);
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) {
+      return $id_field->theme($row);
+    });
     $this->assertSubString($output, 'http://www.drupal.org');
 
     // Setup a not external url, which shouldn't lead to an external url.
     $id_field->options['alter']['external'] = FALSE;
     $id_field->options['alter']['path'] = $path = 'www.drupal.org';
-    $output = $id_field->theme($row);
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) {
+      return $id_field->theme($row);
+    });
     $this->assertNotSubString($output, 'http://www.drupal.org');
 
     // Tests the transforming of the case setting.
     $id_field->options['alter']['path'] = $path = $this->randomMachineName();
     $id_field->options['alter']['path_case'] = 'none';
-    $output = $id_field->theme($row);
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) {
+      return $id_field->theme($row);
+    });
     $this->assertSubString($output, $path);
 
     // Switch to uppercase and lowercase.
     $id_field->options['alter']['path_case'] = 'upper';
-    $output = $id_field->theme($row);
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) {
+      return $id_field->theme($row);
+    });
     $this->assertSubString($output, strtoupper($path));
     $id_field->options['alter']['path_case'] = 'lower';
-    $output = $id_field->theme($row);
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) {
+      return $id_field->theme($row);
+    });
     $this->assertSubString($output, strtolower($path));
 
     // Switch to ucfirst and ucwords.
     $id_field->options['alter']['path_case'] = 'ucfirst';
     $id_field->options['alter']['path'] = 'drupal has a great community';
-    $output = $id_field->theme($row);
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) {
+      return $id_field->theme($row);
+    });
     $this->assertSubString($output, UrlHelper::encodePath('Drupal has a great community'));
 
     $id_field->options['alter']['path_case'] = 'ucwords';
-    $output = $id_field->theme($row);
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) {
+      return $id_field->theme($row);
+    });
     $this->assertSubString($output, UrlHelper::encodePath('Drupal Has A Great Community'));
     unset($id_field->options['alter']['path_case']);
 
     // Tests the linkclass setting and see whether it actually exists in the
     // output.
     $id_field->options['alter']['link_class'] = $class = $this->randomMachineName();
-    $output = $id_field->theme($row);
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) {
+      return $id_field->theme($row);
+    });
     $elements = $this->xpathContent($output, '//a[contains(@class, :class)]', array(':class' => $class));
     $this->assertTrue($elements);
     // @fixme link_class, alt, rel cannot be unset, which should be fixed.
@@ -318,21 +356,27 @@ class FieldWebTest extends HandlerTestBase {
 
     // Tests the alt setting.
     $id_field->options['alter']['alt'] = $rel = $this->randomMachineName();
-    $output = $id_field->theme($row);
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) {
+      return $id_field->theme($row);
+    });
     $elements = $this->xpathContent($output, '//a[contains(@title, :alt)]', array(':alt' => $rel));
     $this->assertTrue($elements);
     $id_field->options['alter']['alt'] = '';
 
     // Tests the rel setting.
     $id_field->options['alter']['rel'] = $rel = $this->randomMachineName();
-    $output = $id_field->theme($row);
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) {
+      return $id_field->theme($row);
+    });
     $elements = $this->xpathContent($output, '//a[contains(@rel, :rel)]', array(':rel' => $rel));
     $this->assertTrue($elements);
     $id_field->options['alter']['rel'] = '';
 
     // Tests the target setting.
     $id_field->options['alter']['target'] = $target = $this->randomMachineName();
-    $output = $id_field->theme($row);
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) {
+      return $id_field->theme($row);
+    });
     $elements = $this->xpathContent($output, '//a[contains(@target, :target)]', array(':target' => $target));
     $this->assertTrue($elements);
     unset($id_field->options['alter']['target']);
@@ -453,6 +497,9 @@ class FieldWebTest extends HandlerTestBase {
    * Tests trimming/read-more/ellipses.
    */
   public function testTextRendering() {
+    /** @var \Drupal\Core\Render\RendererInterface $renderer */
+    $renderer = \Drupal::service('renderer');
+
     $view = Views::getView('test_field_output');
     $view->initHandlers();
     $name_field = $view->field['name'];
@@ -465,18 +512,24 @@ class FieldWebTest extends HandlerTestBase {
     $row = $view->result[0];
 
     $name_field->options['alter']['strip_tags'] = TRUE;
-    $output = $name_field->advancedRender($row);
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($name_field, $row) {
+      return $name_field->advancedRender($row);
+    });
     $this->assertSubString($output, $random_text, 'Find text without html if stripping of views field output is enabled.');
     $this->assertNotSubString($output, $html_text, 'Find no text with the html if stripping of views field output is enabled.');
 
     // Tests preserving of html tags.
     $name_field->options['alter']['preserve_tags'] = '<div>';
-    $output = $name_field->advancedRender($row);
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($name_field, $row) {
+      return $name_field->advancedRender($row);
+    });
     $this->assertSubString($output, $random_text, 'Find text without html if stripping of views field output is enabled but a div is allowed.');
     $this->assertSubString($output, $html_text, 'Find text with the html if stripping of views field output is enabled but a div is allowed.');
 
     $name_field->options['alter']['strip_tags'] = FALSE;
-    $output = $name_field->advancedRender($row);
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($name_field, $row) {
+      return $name_field->advancedRender($row);
+    });
     $this->assertSubString($output, $random_text, 'Find text without html if stripping of views field output is disabled.');
     $this->assertSubString($output, $html_text, 'Find text with the html if stripping of views field output is disabled.');
 
@@ -485,13 +538,17 @@ class FieldWebTest extends HandlerTestBase {
     $views_test_data_name = $row->views_test_data_name;
     $row->views_test_data_name = '  ' . $views_test_data_name . '     ';
     $name_field->options['alter']['trim_whitespace'] = TRUE;
-    $output = $name_field->advancedRender($row);
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($name_field, $row) {
+      return $name_field->advancedRender($row);
+    });
 
     $this->assertSubString($output, $views_test_data_name, 'Make sure the trimmed text can be found if trimming is enabled.');
     $this->assertNotSubString($output, $row->views_test_data_name, 'Make sure the untrimmed text can be found if trimming is enabled.');
 
     $name_field->options['alter']['trim_whitespace'] = FALSE;
-    $output = $name_field->advancedRender($row);
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($name_field, $row) {
+      return $name_field->advancedRender($row);
+    });
     $this->assertSubString($output, $views_test_data_name, 'Make sure the trimmed text can be found if trimming is disabled.');
     $this->assertSubString($output, $row->views_test_data_name, 'Make sure the untrimmed text can be found  if trimming is disabled.');
 
@@ -504,12 +561,16 @@ class FieldWebTest extends HandlerTestBase {
     $name_field->options['alter']['max_length'] = 5;
     $trimmed_name = Unicode::substr($row->views_test_data_name, 0, 5);
 
-    $output = $name_field->advancedRender($row);
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($name_field, $row) {
+      return $name_field->advancedRender($row);
+    });
     $this->assertSubString($output, $trimmed_name, format_string('Make sure the trimmed output (!trimmed) appears in the rendered output (!output).', array('!trimmed' => $trimmed_name, '!output' => $output)));
     $this->assertNotSubString($output, $row->views_test_data_name, format_string("Make sure the untrimmed value (!untrimmed) shouldn't appear in the rendered output (!output).", array('!untrimmed' => $row->views_test_data_name, '!output' => $output)));
 
     $name_field->options['alter']['max_length'] = 9;
-    $output = $name_field->advancedRender($row);
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($name_field, $row) {
+      return $name_field->advancedRender($row);
+    });
     $this->assertSubString($output, $trimmed_name, format_string('Make sure the untrimmed (!untrimmed) output appears in the rendered output  (!output).', array('!trimmed' => $trimmed_name, '!output' => $output)));
 
     // Take word_boundary into account for the tests.
@@ -549,7 +610,9 @@ class FieldWebTest extends HandlerTestBase {
 
     foreach ($tuples as $tuple) {
       $row->views_test_data_name = $tuple['value'];
-      $output = $name_field->advancedRender($row);
+      $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($name_field, $row) {
+        return $name_field->advancedRender($row);
+      });
 
       if ($tuple['trimmed']) {
         $this->assertNotSubString($output, $tuple['value'], format_string('The untrimmed value (!untrimmed) should not appear in the trimmed output (!output).', array('!untrimmed' => $tuple['value'], '!output' => $output)));
@@ -566,22 +629,30 @@ class FieldWebTest extends HandlerTestBase {
     $name_field->options['alter']['more_link_text'] = $more_text = $this->randomMachineName();
     $name_field->options['alter']['more_link_path'] = $more_path = $this->randomMachineName();
 
-    $output = $name_field->advancedRender($row);
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($name_field, $row) {
+      return $name_field->advancedRender($row);
+    });
     $this->assertSubString($output, $more_text, 'Make sure a read more text is displayed if the output got trimmed');
     $this->assertTrue($this->xpathContent($output, '//a[contains(@href, :path)]', array(':path' => $more_path)), 'Make sure the read more link points to the right destination.');
 
     $name_field->options['alter']['more_link'] = FALSE;
-    $output = $name_field->advancedRender($row);
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($name_field, $row) {
+      return $name_field->advancedRender($row);
+    });
     $this->assertNotSubString($output, $more_text, 'Make sure no read more text appears.');
     $this->assertFalse($this->xpathContent($output, '//a[contains(@href, :path)]', array(':path' => $more_path)), 'Make sure no read more link appears.');
 
     // Check for the ellipses.
     $row->views_test_data_name = $this->randomMachineName(8);
     $name_field->options['alter']['max_length'] = 5;
-    $output = $name_field->advancedRender($row);
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($name_field, $row) {
+      return $name_field->advancedRender($row);
+    });
     $this->assertSubString($output, '…', 'An ellipsis should appear if the output is trimmed');
     $name_field->options['alter']['max_length'] = 10;
-    $output = $name_field->advancedRender($row);
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($name_field, $row) {
+      return $name_field->advancedRender($row);
+    });
     $this->assertNotSubString($output, '…', 'No ellipsis should appear if the output is not trimmed');
   }
 
diff --git a/core/modules/views/src/Tests/Handler/RelationshipTest.php b/core/modules/views/src/Tests/Handler/RelationshipTest.php
index 76b449705..884aca6bd 100644
--- a/core/modules/views/src/Tests/Handler/RelationshipTest.php
+++ b/core/modules/views/src/Tests/Handler/RelationshipTest.php
@@ -7,8 +7,8 @@
 
 namespace Drupal\views\Tests\Handler;
 
+use Drupal\simpletest\UserCreationTrait;
 use Drupal\views\Views;
-use Drupal\views\Tests\ViewUnitTestBase;
 use Drupal\views\Tests\Plugin\RelationshipJoinTestBase;
 
 /**
@@ -18,6 +18,7 @@ use Drupal\views\Tests\Plugin\RelationshipJoinTestBase;
  * @see \Drupal\views\Plugin\views\relationship\RelationshipPluginBase
  */
 class RelationshipTest extends RelationshipJoinTestBase {
+  use UserCreationTrait;
 
   /**
    * Views used by this test.
@@ -133,4 +134,51 @@ class RelationshipTest extends RelationshipJoinTestBase {
     $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
   }
 
+  /**
+   * Tests rendering of a view with a relationship.
+   */
+  public function testRelationshipRender() {
+    $author1 = $this->createUser();
+    db_query("UPDATE {views_test_data} SET uid = :uid WHERE id = 1", [':uid' => $author1->id()]);
+    $author2 = $this->createUser();
+    db_query("UPDATE {views_test_data} SET uid = :uid WHERE id = 2", [':uid' => $author2->id()]);
+    // Set uid to non-existing author uid for row 3.
+    db_query("UPDATE {views_test_data} SET uid = :uid WHERE id = 3", [':uid' => $author2->id() + 123]);
+
+    $view = Views::getView('test_view');
+    // Add a relationship for authors.
+    $view->getDisplay()->overrideOption('relationships', [
+      'uid' => [
+        'id' => 'uid',
+        'table' => 'views_test_data',
+        'field' => 'uid',
+      ],
+    ]);
+    // Add fields for {views_test_data}.id and author name.
+    $view->getDisplay()->overrideOption('fields', [
+      'id' => [
+        'id' => 'id',
+        'table' => 'views_test_data',
+        'field' => 'id',
+      ],
+      'author' => [
+        'id' => 'author',
+        'table' => 'users_field_data',
+        'field' => 'name',
+        'relationship' => 'uid',
+      ],
+    ]);
+
+    // Render the view.
+    $output = $view->preview();
+    $html = $this->container->get('renderer')->renderRoot($output);
+    $this->setRawContent($html);
+
+    // Check that the output contains correct values.
+    $xpath = '//div[@class="views-row" and div[@class="views-field views-field-id"]=:id and div[@class="views-field views-field-author"]=:author]';
+    $this->assertEqual(1, count($this->xpath($xpath, [':id' => 1, ':author' => $author1->getUsername()])));
+    $this->assertEqual(1, count($this->xpath($xpath, [':id' => 2, ':author' => $author2->getUsername()])));
+    $this->assertEqual(1, count($this->xpath($xpath, [':id' => 3, ':author' => ''])));
+  }
+
 }
diff --git a/core/modules/views/src/Tests/Plugin/CacheTagTest.php b/core/modules/views/src/Tests/Plugin/CacheTagTest.php
index 3d497d5a2..dc4005c08 100644
--- a/core/modules/views/src/Tests/Plugin/CacheTagTest.php
+++ b/core/modules/views/src/Tests/Plugin/CacheTagTest.php
@@ -197,7 +197,7 @@ class CacheTagTest extends PluginTestBase {
     $view->destroy();
     // Invalidate the views cache tags in order to invalidate the render
     // caching.
-    \Drupal::service('cache_tags.invalidator')->invalidateTags($view->storage->getCacheTags());
+    \Drupal::service('cache_tags.invalidator')->invalidateTags($view->storage->getCacheTagsToInvalidate());
     $build = $view->buildRenderable();
     $renderer->renderPlain($build);
 
diff --git a/core/modules/views/src/Tests/Plugin/CacheTest.php b/core/modules/views/src/Tests/Plugin/CacheTest.php
index e628f8eb3..0d8c9075b 100644
--- a/core/modules/views/src/Tests/Plugin/CacheTest.php
+++ b/core/modules/views/src/Tests/Plugin/CacheTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\views\Tests\Plugin;
 
+use Drupal\Core\Render\RenderContext;
 use Drupal\node\Entity\Node;
 use Drupal\views\Tests\ViewUnitTestBase;
 use Drupal\views\Views;
@@ -282,14 +283,18 @@ class CacheTest extends ViewUnitTestBase {
     $output = $view->buildRenderable();
     /** @var \Drupal\Core\Render\RendererInterface $renderer */
     $renderer = \Drupal::service('renderer');
-    $renderer->render($output);
+    $renderer->executeInRenderContext(new RenderContext(), function () use (&$output, $renderer) {
+      return $renderer->render($output);
+    });
 
     unset($view->pre_render_called);
     $view->destroy();
 
     $view->setDisplay();
     $output = $view->buildRenderable();
-    $renderer->render($output);
+    $renderer->executeInRenderContext(new RenderContext(), function () use (&$output, $renderer) {
+      return $renderer->render($output);
+    });
 
     $this->assertTrue(in_array('views_test_data/test', $output['#attached']['library']), 'Make sure libraries are added for cached views.');
     $this->assertEqual(['foo' => 'bar'], $output['#attached']['drupalSettings'], 'Make sure drupalSettings are added for cached views.');
diff --git a/core/modules/views/src/Tests/Plugin/ExposedFormTest.php b/core/modules/views/src/Tests/Plugin/ExposedFormTest.php
index ffc9bbe51..1427c5de5 100644
--- a/core/modules/views/src/Tests/Plugin/ExposedFormTest.php
+++ b/core/modules/views/src/Tests/Plugin/ExposedFormTest.php
@@ -206,11 +206,7 @@ class ExposedFormTest extends ViewTestBase {
       'languages:language_interface',
       'entity_test_view_grants',
       'theme',
-      'url.query_args.pagers:0',
-      'url.query_args:items_per_page',
-      'url.query_args:offset',
-      'url.query_args:sort_order',
-      'url.query_args:sort_by',
+      'url.query_args',
       'languages:language_content'
     ];
 
diff --git a/core/modules/views/src/Tests/Plugin/PagerTest.php b/core/modules/views/src/Tests/Plugin/PagerTest.php
index 4a75fdc5f..c1c6c97bb 100644
--- a/core/modules/views/src/Tests/Plugin/PagerTest.php
+++ b/core/modules/views/src/Tests/Plugin/PagerTest.php
@@ -261,7 +261,7 @@ class PagerTest extends PluginTestBase {
 
     // Test pager cache contexts.
     $this->drupalGet('test_pager_full');
-    $this->assertCacheContexts(['languages:language_interface', 'theme', 'timezone', 'url.query_args.pagers:0', 'user.node_grants:view']);
+    $this->assertCacheContexts(['languages:language_interface', 'theme', 'timezone', 'url.query_args', 'user.node_grants:view']);
   }
 
   /**
diff --git a/core/modules/views/src/Tests/QueryGroupByTest.php b/core/modules/views/src/Tests/QueryGroupByTest.php
index 768aaafbf..4fb206211 100644
--- a/core/modules/views/src/Tests/QueryGroupByTest.php
+++ b/core/modules/views/src/Tests/QueryGroupByTest.php
@@ -253,9 +253,9 @@ class QueryGroupByTest extends ViewUnitTestBase {
     $this->executeView($view);
     $this->assertEqual(2, count($view->result));
 
-    $this->assertEqual(3, $view->getStyle()->getField(0, 'id'));
+    $this->assertEqual('3', $view->getStyle()->getField(0, 'id'));
     $this->assertEqual('1', $view->getStyle()->getField(0, 'field_test'));
-    $this->assertEqual(6, $view->getStyle()->getField(1, 'id'));
+    $this->assertEqual('6', $view->getStyle()->getField(1, 'id'));
     $this->assertEqual('2', $view->getStyle()->getField(1, 'field_test'));
 
     $entities[2]->field_test[0]->value = 3;
@@ -267,15 +267,15 @@ class QueryGroupByTest extends ViewUnitTestBase {
     $this->executeView($view);
     $this->assertEqual(5, count($view->result));
 
-    $this->assertEqual(3, $view->getStyle()->getField(0, 'id'));
+    $this->assertEqual('3', $view->getStyle()->getField(0, 'id'));
     $this->assertEqual('1', $view->getStyle()->getField(0, 'field_test'));
-    $this->assertEqual(3, $view->getStyle()->getField(1, 'id'));
+    $this->assertEqual('3', $view->getStyle()->getField(1, 'id'));
     $this->assertEqual('2', $view->getStyle()->getField(1, 'field_test'));
-    $this->assertEqual(1, $view->getStyle()->getField(2, 'id'));
+    $this->assertEqual('1', $view->getStyle()->getField(2, 'id'));
     $this->assertEqual('3', $view->getStyle()->getField(2, 'field_test'));
-    $this->assertEqual(1, $view->getStyle()->getField(3, 'id'));
+    $this->assertEqual('1', $view->getStyle()->getField(3, 'id'));
     $this->assertEqual('4', $view->getStyle()->getField(3, 'field_test'));
-    $this->assertEqual(1, $view->getStyle()->getField(4, 'id'));
+    $this->assertEqual('1', $view->getStyle()->getField(4, 'id'));
     $this->assertEqual('5', $view->getStyle()->getField(4, 'field_test'));
 
     // Check that translated values are correctly retrieved and are not grouped
@@ -288,7 +288,7 @@ class QueryGroupByTest extends ViewUnitTestBase {
     $this->executeView($view);
 
     $this->assertEqual(6, count($view->result));
-    $this->assertEqual(3, $view->getStyle()->getField(5, 'id'));
+    $this->assertEqual('3', $view->getStyle()->getField(5, 'id'));
     $this->assertEqual('6', $view->getStyle()->getField(5, 'field_test'));
   }
 
diff --git a/core/modules/views/src/Tests/RenderCacheIntegrationTest.php b/core/modules/views/src/Tests/RenderCacheIntegrationTest.php
index b1235b1ec..76a98576e 100644
--- a/core/modules/views/src/Tests/RenderCacheIntegrationTest.php
+++ b/core/modules/views/src/Tests/RenderCacheIntegrationTest.php
@@ -124,7 +124,11 @@ class RenderCacheIntegrationTest extends ViewUnitTestBase {
     $this->pass('Test pager');
     $this->pass('Page 1');
     \Drupal::request()->query->set('page', 0);
-    $tags_page_1 = Cache::mergeTags($base_tags, $entities[1]->getCacheTags(), $entities[2]->getCacheTags(), $entities[3]->getCacheTags(), $entities[4]->getCacheTags(), $entities[5]->getCacheTags());
+    $tags_page_1 = Cache::mergeTags($base_tags, $entities[1]->getCacheTags());
+    $tags_page_1 = Cache::mergeTags($tags_page_1, $entities[2]->getCacheTags());
+    $tags_page_1 = Cache::mergeTags($tags_page_1, $entities[3]->getCacheTags());
+    $tags_page_1 = Cache::mergeTags($tags_page_1, $entities[4]->getCacheTags());
+    $tags_page_1 = Cache::mergeTags($tags_page_1, $entities[5]->getCacheTags());
     $this->assertViewsCacheTags($view, $tags_page_1, $do_assert_views_caches, $tags_page_1);
     $this->assertViewsCacheTagsFromStaticRenderArray($view, $tags_page_1, $do_assert_views_caches);
     $view->destroy();
@@ -254,7 +258,8 @@ class RenderCacheIntegrationTest extends ViewUnitTestBase {
     $entity->save();
 
     $result_tags_with_entity = Cache::mergeTags($base_tags, $entities[0]->getCacheTags());
-    $render_tags_with_entity = Cache::mergeTags($base_render_tags, $entities[0]->getCacheTags(), ['entity_test_view']);
+    $render_tags_with_entity = Cache::mergeTags($base_render_tags, $entities[0]->getCacheTags());
+    $render_tags_with_entity = Cache::mergeTags($render_tags_with_entity, ['entity_test_view']);
     $this->assertViewsCacheTags($view, $result_tags_with_entity, $do_assert_views_caches, $render_tags_with_entity);
     $this->assertViewsCacheTagsFromStaticRenderArray($view, $render_tags_with_entity, $do_assert_views_caches);
 
@@ -265,9 +270,13 @@ class RenderCacheIntegrationTest extends ViewUnitTestBase {
       $entity->save();
     }
 
-    $new_entities_cache_tags = Cache::mergeTags($entities[1]->getCacheTags(), $entities[2]->getCacheTags(), $entities[3]->getCacheTags(), $entities[4]->getCacheTags(), $entities[5]->getCacheTags());
+    $new_entities_cache_tags = Cache::mergeTags($entities[1]->getCacheTags(), $entities[2]->getCacheTags());
+    $new_entities_cache_tags = Cache::mergeTags($new_entities_cache_tags, $entities[3]->getCacheTags());
+    $new_entities_cache_tags = Cache::mergeTags($new_entities_cache_tags, $entities[4]->getCacheTags());
+    $new_entities_cache_tags = Cache::mergeTags($new_entities_cache_tags, $entities[5]->getCacheTags());
     $result_tags_page_1 = Cache::mergeTags($base_tags, $new_entities_cache_tags);
-    $render_tags_page_1 = Cache::mergeTags($base_render_tags, $new_entities_cache_tags, ['entity_test_view']);
+    $render_tags_page_1 = Cache::mergeTags($base_render_tags, $new_entities_cache_tags);
+    $render_tags_page_1 = Cache::mergeTags($render_tags_page_1, ['entity_test_view']);
     $this->assertViewsCacheTags($view, $result_tags_page_1, $do_assert_views_caches, $render_tags_page_1);
     $this->assertViewsCacheTagsFromStaticRenderArray($view, $render_tags_page_1, $do_assert_views_caches);
   }
@@ -292,7 +301,7 @@ class RenderCacheIntegrationTest extends ViewUnitTestBase {
     $view = View::load('test_display');
     $view->save();
 
-    $this->assertEqual(['languages:' . LanguageInterface::TYPE_CONTENT, 'languages:' . LanguageInterface::TYPE_INTERFACE, 'url.query_args.pagers:0', 'user.node_grants:view', 'user.permissions'], $view->getDisplay('default')['cache_metadata']['contexts']);
+    $this->assertEqual(['languages:' . LanguageInterface::TYPE_CONTENT, 'languages:' . LanguageInterface::TYPE_INTERFACE, 'url.query_args', 'user.node_grants:view', 'user.permissions'], $view->getDisplay('default')['cache_metadata']['contexts']);
   }
 
 }
diff --git a/core/modules/views/src/Tests/TokenReplaceTest.php b/core/modules/views/src/Tests/TokenReplaceTest.php
index ad00b7ed1..6410c9039 100644
--- a/core/modules/views/src/Tests/TokenReplaceTest.php
+++ b/core/modules/views/src/Tests/TokenReplaceTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\views\Tests;
 
+use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\views\Views;
 
 /**
@@ -54,9 +55,25 @@ class TokenReplaceTest extends ViewUnitTestBase {
       '[view:page-count]' => '1',
     );
 
+    $base_bubbleable_metadata = BubbleableMetadata::createFromObject($view->storage);
+    $metadata_tests = [];
+    $metadata_tests['[view:label]'] = $base_bubbleable_metadata;
+    $metadata_tests['[view:description]'] = $base_bubbleable_metadata;
+    $metadata_tests['[view:id]'] = $base_bubbleable_metadata;
+    $metadata_tests['[view:title]'] = $base_bubbleable_metadata;
+    $metadata_tests['[view:url]'] = $base_bubbleable_metadata;
+    $metadata_tests['[view:total-rows]'] = $base_bubbleable_metadata;
+    $metadata_tests['[view:base-table]'] = $base_bubbleable_metadata;
+    $metadata_tests['[view:base-field]'] = $base_bubbleable_metadata;
+    $metadata_tests['[view:items-per-page]'] = $base_bubbleable_metadata;
+    $metadata_tests['[view:current-page]'] = $base_bubbleable_metadata;
+    $metadata_tests['[view:page-count]'] = $base_bubbleable_metadata;
+
     foreach ($expected as $token => $expected_output) {
-      $output = $token_handler->replace($token, array('view' => $view));
+      $bubbleable_metadata = new BubbleableMetadata();
+      $output = $token_handler->replace($token, array('view' => $view), [], $bubbleable_metadata);
       $this->assertIdentical($output, $expected_output, format_string('Token %token replaced correctly.', array('%token' => $token)));
+      $this->assertEqual($bubbleable_metadata, $metadata_tests[$token]);
     }
   }
 
diff --git a/core/modules/views/src/Tests/ViewExecutableTest.php b/core/modules/views/src/Tests/ViewExecutableTest.php
index 3771c0d1e..26e381d97 100644
--- a/core/modules/views/src/Tests/ViewExecutableTest.php
+++ b/core/modules/views/src/Tests/ViewExecutableTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\views\Tests;
 
 use Drupal\comment\Tests\CommentTestTrait;
+use Drupal\Component\Utility\Xss;
 use Drupal\views\Entity\View;
 use Drupal\views\Views;
 use Drupal\views\ViewExecutable;
@@ -326,7 +327,7 @@ class ViewExecutableTest extends ViewUnitTestBase {
     // Test the title methods.
     $title = $this->randomString();
     $view->setTitle($title);
-    $this->assertEqual($view->getTitle(), $title);
+    $this->assertEqual($view->getTitle(), Xss::filterAdmin($title));
   }
 
   /**
diff --git a/core/modules/views/src/Tests/ViewUnitTestBase.php b/core/modules/views/src/Tests/ViewUnitTestBase.php
index 3aba1f556..b5dfc4220 100644
--- a/core/modules/views/src/Tests/ViewUnitTestBase.php
+++ b/core/modules/views/src/Tests/ViewUnitTestBase.php
@@ -31,7 +31,7 @@ abstract class ViewUnitTestBase extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('system', 'views', 'views_test_config', 'views_test_data');
+  public static $modules = array('system', 'views', 'views_test_config', 'views_test_data', 'user');
 
   /**
    * {@inheritdoc}
diff --git a/core/modules/views/src/Tests/Wizard/BasicTest.php b/core/modules/views/src/Tests/Wizard/BasicTest.php
index d55b941ba..fe736ded7 100644
--- a/core/modules/views/src/Tests/Wizard/BasicTest.php
+++ b/core/modules/views/src/Tests/Wizard/BasicTest.php
@@ -133,6 +133,7 @@ class BasicTest extends WizardTestBase {
 
     // Confirm that the block is available in the block administration UI.
     $this->drupalGet('admin/structure/block/list/' . $this->config('system.theme')->get('default'));
+    $this->clickLinkPartialName('Place block');
     $this->assertText($view3['label']);
 
     // Place the block.
diff --git a/core/modules/views/src/Tests/Wizard/ItemsPerPageTest.php b/core/modules/views/src/Tests/Wizard/ItemsPerPageTest.php
index 8e8edfc19..132df5821 100644
--- a/core/modules/views/src/Tests/Wizard/ItemsPerPageTest.php
+++ b/core/modules/views/src/Tests/Wizard/ItemsPerPageTest.php
@@ -71,6 +71,7 @@ class ItemsPerPageTest extends WizardTestBase {
 
     // Confirm that the block is listed in the block administration UI.
     $this->drupalGet('admin/structure/block/list/' . $this->config('system.theme')->get('default'));
+    $this->clickLinkPartialName('Place block');
     $this->assertText($view['label']);
 
     // Place the block, visit a page that displays the block, and check that the
diff --git a/core/modules/views/src/ViewExecutable.php b/core/modules/views/src/ViewExecutable.php
index b21f3148c..ddab68cd4 100644
--- a/core/modules/views/src/ViewExecutable.php
+++ b/core/modules/views/src/ViewExecutable.php
@@ -9,7 +9,6 @@ namespace Drupal\views;
 
 use Drupal\Component\Utility\Html;
 use Drupal\Core\Cache\Cache;
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\DependencyInjection\DependencySerializationTrait;
 use Drupal\Core\Form\FormState;
 use Drupal\Core\Routing\RouteProviderInterface;
@@ -1615,29 +1614,6 @@ class ViewExecutable implements \Serializable {
     $this->is_attachment = FALSE;
   }
 
-  /**
-   * Returns menu links from the view and the named display handler.
-   *
-   * @param string $display_id
-   *   A display ID.
-   *
-   * @return array|bool
-   *   The generated menu links for this view and display, FALSE if the call
-   *   to ::setDisplay failed.
-   */
-  public function getMenuLinks($display_id = NULL) {
-    // Prepare the view with the information we have. This was probably already
-    // called, but it's good to be safe.
-    if (!$this->setDisplay($display_id)) {
-      return FALSE;
-    }
-
-    // Execute the hook.
-    if (isset($this->display_handler)) {
-      return $this->display_handler->getMenuLinks();
-    }
-  }
-
   /**
    * Determine if the given user has access to the view. Note that
    * this sets the display handler if it hasn't been.
@@ -1897,7 +1873,7 @@ class ViewExecutable implements \Serializable {
   public function getUrlInfo($display_id = '') {
     $this->initDisplay();
     if (!$this->display_handler instanceof DisplayRouterInterface) {
-      throw new \InvalidArgumentException(SafeMarkup::format('You cannot generate a URL for the display @display_id', ['@display_id' => $display_id]));
+      throw new \InvalidArgumentException("You cannot generate a URL for the display '$display_id'");
     }
     return $this->display_handler->getUrlInfo();
   }
diff --git a/core/modules/views/tests/modules/views_test_data/src/Cache/ViewsTestCacheContext.php b/core/modules/views/tests/modules/views_test_data/src/Cache/ViewsTestCacheContext.php
index b66ba3830..e9ddc082a 100644
--- a/core/modules/views/tests/modules/views_test_data/src/Cache/ViewsTestCacheContext.php
+++ b/core/modules/views/tests/modules/views_test_data/src/Cache/ViewsTestCacheContext.php
@@ -7,10 +7,13 @@
 
 namespace Drupal\views_test_data\Cache;
 
+use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Cache\Context\CacheContextInterface;
 
 /**
  * Test cache context which uses a dynamic context coming from state.
+ *
+ * Cache context ID: 'views_test_cache_context'.
  */
 class ViewsTestCacheContext implements CacheContextInterface {
 
@@ -28,4 +31,11 @@ class ViewsTestCacheContext implements CacheContextInterface {
     return \Drupal::state()->get('views_test_cache_context', 'George');
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheableMetadata() {
+    return new CacheableMetadata();
+  }
+
 }
diff --git a/core/modules/views/tests/src/Unit/Controller/ViewAjaxControllerTest.php b/core/modules/views/tests/src/Unit/Controller/ViewAjaxControllerTest.php
index dc5a898f6..f054b912d 100644
--- a/core/modules/views/tests/src/Unit/Controller/ViewAjaxControllerTest.php
+++ b/core/modules/views/tests/src/Unit/Controller/ViewAjaxControllerTest.php
@@ -7,11 +7,13 @@
 
 namespace Drupal\Tests\views\Unit\Controller {
 
+use Drupal\Core\Render\RenderContext;
 use Drupal\Tests\UnitTestCase;
 use Drupal\views\Ajax\ViewAjaxResponse;
 use Drupal\views\Controller\ViewAjaxController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
  * @coversDefaultClass \Drupal\views\Controller\ViewAjaxController
@@ -76,6 +78,11 @@ class ViewAjaxControllerTest extends UnitTestCase {
         $elements['#attached'] = [];
         return isset($elements['#markup']) ? $elements['#markup'] : '';
       }));
+    $this->renderer->expects($this->any())
+      ->method('executeInRenderContext')
+      ->willReturnCallback(function (RenderContext $context, callable $callable) {
+        return $callable();
+      });
     $this->currentPath = $this->getMockBuilder('Drupal\Core\Path\CurrentPathStack')
       ->disableOriginalConstructor()
       ->getMock();
@@ -83,8 +90,23 @@ class ViewAjaxControllerTest extends UnitTestCase {
 
     $this->viewAjaxController = new ViewAjaxController($this->viewStorage, $this->executableFactory, $this->renderer, $this->currentPath, $this->redirectDestination);
 
+    $request_stack = new RequestStack();
+    $request_stack->push(new Request());
+    $args = [
+      $this->getMock('\Drupal\Core\Controller\ControllerResolverInterface'),
+      $this->getMock('\Drupal\Core\Theme\ThemeManagerInterface'),
+      $this->getMock('\Drupal\Core\Render\ElementInfoManagerInterface'),
+      $this->getMock('\Drupal\Core\Render\RenderCacheInterface'),
+      $request_stack,
+      [
+        'required_cache_contexts' => [
+          'languages:language_interface',
+          'theme',
+        ],
+      ],
+    ];
     $this->renderer = $this->getMockBuilder('Drupal\Core\Render\Renderer')
-      ->disableOriginalConstructor()
+      ->setConstructorArgs($args)
       ->setMethods(NULL)
       ->getMock();
     $container = new ContainerBuilder();
diff --git a/core/modules/views/tests/src/Unit/Plugin/field/FieldPluginBaseTest.php b/core/modules/views/tests/src/Unit/Plugin/field/FieldPluginBaseTest.php
index 0e4553705..7b87f225e 100644
--- a/core/modules/views/tests/src/Unit/Plugin/field/FieldPluginBaseTest.php
+++ b/core/modules/views/tests/src/Unit/Plugin/field/FieldPluginBaseTest.php
@@ -168,20 +168,12 @@ class FieldPluginBaseTest extends UnitTestCase {
    * Sets up the unrouted url assembler and the link generator.
    */
   protected function setUpUrlIntegrationServices() {
-    $config = $this->getMockBuilder('Drupal\Core\Config\ImmutableConfig')
-      ->disableOriginalConstructor()
-      ->getMock();
-    $config_factory = $this->getMock('\Drupal\Core\Config\ConfigFactoryInterface');
-    $config_factory->expects($this->any())
-      ->method('get')
-      ->willReturn($config);
-
     $this->pathProcessor = $this->getMock('Drupal\Core\PathProcessor\OutboundPathProcessorInterface');
-    $this->unroutedUrlAssembler = new UnroutedUrlAssembler($this->requestStack, $config_factory, $this->pathProcessor);
+    $this->unroutedUrlAssembler = new UnroutedUrlAssembler($this->requestStack, $this->pathProcessor);
 
     \Drupal::getContainer()->set('unrouted_url_assembler', $this->unroutedUrlAssembler);
 
-    $this->linkGenerator = new LinkGenerator($this->urlGenerator, $this->getMock('Drupal\Core\Extension\ModuleHandlerInterface'));
+    $this->linkGenerator = new LinkGenerator($this->urlGenerator, $this->getMock('Drupal\Core\Extension\ModuleHandlerInterface'), $this->renderer);
   }
 
   /**
@@ -453,6 +445,7 @@ class FieldPluginBaseTest extends UnitTestCase {
       '#type' => 'inline_template',
       '#template' => 'base:test-path/' . explode('/', $path)[1],
       '#context' => ['foo' => 123],
+      '#post_render' => [function() {}],
     ];
 
     $this->renderer->expects($this->once())
diff --git a/core/modules/views/tests/src/Unit/Routing/ViewPageControllerTest.php b/core/modules/views/tests/src/Unit/Routing/ViewPageControllerTest.php
index d39ef3377..460440619 100644
--- a/core/modules/views/tests/src/Unit/Routing/ViewPageControllerTest.php
+++ b/core/modules/views/tests/src/Unit/Routing/ViewPageControllerTest.php
@@ -13,7 +13,6 @@ use Drupal\views\Routing\ViewPageController;
 use Symfony\Cmf\Component\Routing\RouteObjectInterface;
 use Symfony\Component\HttpFoundation\ParameterBag;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag;
 use Symfony\Component\Routing\Route;
 
 /**
@@ -29,20 +28,6 @@ class ViewPageControllerTest extends UnitTestCase {
    */
   public $pageController;
 
-  /**
-   * The mocked view storage.
-   *
-   * @var \Drupal\views\ViewStorage|\PHPUnit_Framework_MockObject_MockObject
-   */
-  protected $storage;
-
-  /**
-   * The mocked view executable factory.
-   *
-   * @var \Drupal\views\ViewExecutableFactory|\PHPUnit_Framework_MockObject_MockObject
-   */
-  protected $executableFactory;
-
   /**
    * A render array expected for every page controller render array result.
    *
@@ -56,23 +41,13 @@ class ViewPageControllerTest extends UnitTestCase {
   ];
 
   protected function setUp() {
-    $this->storage = $this->getMockBuilder('Drupal\Core\Config\Entity\ConfigEntityStorage')
-      ->disableOriginalConstructor()
-      ->getMock();
-    $this->executableFactory = $this->getMockBuilder('Drupal\views\ViewExecutableFactory')
-      ->disableOriginalConstructor()
-      ->getMock();
-
-    $this->pageController = new ViewPageController($this->storage, $this->executableFactory);
+    $this->pageController = new ViewPageController();
   }
 
   /**
    * Tests the page controller.
    */
   public function testPageController() {
-    $this->storage->expects($this->never())
-      ->method('load');
-
     $build = [
       '#type' => 'view',
       '#name' => 'test_page_view',
@@ -102,9 +77,6 @@ class ViewPageControllerTest extends UnitTestCase {
    * Tests the page controller with arguments on a non overridden page view.
    */
   public function testHandleWithArgumentsWithoutOverridden() {
-    $this->storage->expects($this->never())
-      ->method('load');
-
     $request = new Request();
     $request->attributes->set('view_id', 'test_page_view');
     $request->attributes->set('display_id', 'page_1');
@@ -139,9 +111,6 @@ class ViewPageControllerTest extends UnitTestCase {
    * Note: This test does not care about upcasting for now.
    */
   public function testHandleWithArgumentsOnOverriddenRoute() {
-    $this->storage->expects($this->never())
-      ->method('load');
-
     $request = new Request();
     $request->attributes->set('view_id', 'test_page_view');
     $request->attributes->set('display_id', 'page_1');
@@ -179,9 +148,6 @@ class ViewPageControllerTest extends UnitTestCase {
    * are pulled in.
    */
   public function testHandleWithArgumentsOnOverriddenRouteWithUpcasting() {
-    $this->storage->expects($this->never())
-      ->method('load');
-
     $request = new Request();
     $request->attributes->set('view_id', 'test_page_view');
     $request->attributes->set('display_id', 'page_1');
diff --git a/core/modules/views/views.theme.inc b/core/modules/views/views.theme.inc
index fbe962e3d..7728d89f3 100644
--- a/core/modules/views/views.theme.inc
+++ b/core/modules/views/views.theme.inc
@@ -494,7 +494,9 @@ function template_preprocess_views_view_table(&$variables) {
           'attributes' => array('title' => $title),
           'query' => $query,
         );
-        $variables['header'][$field]['content'] = \Drupal::l($label, new Url('<current>', [], $link_options));
+        // It is ok to specify no URL path here as we will always reload the
+        // current page.
+        $variables['header'][$field]['content'] = \Drupal::l($label, new Url('<none>', [], $link_options));
       }
 
       $variables['header'][$field]['default_classes'] = $fields[$field]->options['element_default_classes'];
@@ -1050,6 +1052,10 @@ function template_preprocess_views_mini_pager(&$variables) {
     }
     $variables['items']['next']['attributes'] = new Attribute();
   }
+
+  // This is is based on the entire current query string. We need to ensure
+  // cacheability is affected accordingly.
+  $variables['#cache']['contexts'][] = 'url.query_args';
 }
 
 /**
diff --git a/core/modules/views/views.tokens.inc b/core/modules/views/views.tokens.inc
index 1e0540b5d..eb766bcf6 100644
--- a/core/modules/views/views.tokens.inc
+++ b/core/modules/views/views.tokens.inc
@@ -6,6 +6,7 @@
  */
 
 use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Core\Render\BubbleableMetadata;
 
 /**
  * Implements hook_token_info().
@@ -68,9 +69,7 @@ function views_token_info() {
 /**
  * Implements hook_tokens().
  */
-function views_tokens($type, $tokens, array $data = array(), array $options = array()) {
-  $token_service = \Drupal::token();
-
+function views_tokens($type, $tokens, array $data, array $options, BubbleableMetadata $bubbleable_metadata) {
   $url_options = array('absolute' => TRUE);
   if (isset($options['language'])) {
     $url_options['language'] = $options['language'];
@@ -83,6 +82,8 @@ function views_tokens($type, $tokens, array $data = array(), array $options = ar
     /** @var \Drupal\views\ViewExecutable $view */
     $view = $data['view'];
 
+    $bubbleable_metadata->addCacheableDependency($view->storage);
+
     foreach ($tokens as $name => $original) {
       switch ($name) {
         case 'label':
@@ -104,7 +105,8 @@ function views_tokens($type, $tokens, array $data = array(), array $options = ar
 
         case 'url':
           if ($url = $view->getUrl()) {
-            $replacements[$original] = $url->setOptions($url_options)->toString();
+            $replacements[$original] = $url->setOptions($url_options)
+              ->toString();
           }
           break;
         case 'base-table':
@@ -129,13 +131,6 @@ function views_tokens($type, $tokens, array $data = array(), array $options = ar
           break;
       }
     }
-
-    // [view:url:*] nested tokens. This only works if Token module is installed.
-    if ($url_tokens = $token_service->findWithPrefix($tokens, 'url')) {
-      if ($path = $view->getUrl()) {
-        $replacements += $token_service->generate('url', $url_tokens, array('path' => $url->getInternalPath()), $options);
-      }
-    }
   }
 
   return $replacements;
diff --git a/core/modules/views_ui/src/Controller/ViewsUIController.php b/core/modules/views_ui/src/Controller/ViewsUIController.php
index 474f7bc9f..b40bfc8c7 100644
--- a/core/modules/views_ui/src/Controller/ViewsUIController.php
+++ b/core/modules/views_ui/src/Controller/ViewsUIController.php
@@ -196,7 +196,7 @@ class ViewsUIController extends ControllerBase {
    * Returns the form to edit a view.
    *
    * @param \Drupal\views_ui\ViewUI $view
-   *   The view being deleted.
+   *   The view to be edited.
    * @param string|null $display_id
    *   (optional) The display ID being edited. Defaults to NULL, which will load
    *   the first available display.
diff --git a/core/modules/views_ui/src/Form/Ajax/ViewsFormBase.php b/core/modules/views_ui/src/Form/Ajax/ViewsFormBase.php
index 3c0e43517..d9c5dfc63 100644
--- a/core/modules/views_ui/src/Form/Ajax/ViewsFormBase.php
+++ b/core/modules/views_ui/src/Form/Ajax/ViewsFormBase.php
@@ -12,6 +12,8 @@ use Drupal\Core\Ajax\OpenModalDialogCommand;
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormState;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Render\BubbleableMetadata;
+use Drupal\Core\Render\RenderContext;
 use Drupal\views_ui\ViewUI;
 use Drupal\views\ViewEntityInterface;
 use Drupal\views\Ajax;
@@ -205,8 +207,21 @@ abstract class ViewsFormBase extends FormBase implements ViewsFormInterface {
     }
     $form_state->disableCache();
 
-    $form = \Drupal::formBuilder()->buildForm($form_class, $form_state);
+    // Builds the form in a render context in order to ensure that cacheable
+    // metadata is bubbled up.
+    $render_context = new RenderContext();
+    $callable = function () use ($form_class, &$form_state) {
+      return \Drupal::formBuilder()->buildForm($form_class, $form_state);
+    };
+    $form = $renderer->executeInRenderContext($render_context, $callable);
+
+    if (!$render_context->isEmpty()) {
+      BubbleableMetadata::createFromRenderArray($form)
+        ->merge($render_context->pop())
+        ->applyTo($form);
+    }
     $output = $renderer->renderRoot($form);
+
     drupal_process_attached($form);
 
     // These forms have the title built in, so set the title here:
diff --git a/core/modules/views_ui/src/ProxyClass/ParamConverter/ViewUIConverter.php b/core/modules/views_ui/src/ProxyClass/ParamConverter/ViewUIConverter.php
new file mode 100644
index 000000000..b742e7d5a
--- /dev/null
+++ b/core/modules/views_ui/src/ProxyClass/ParamConverter/ViewUIConverter.php
@@ -0,0 +1,92 @@
+<?php
+
+/**
+ * @file
+ * Contains Drupal\views_ui\ProxyClass\ParamConverter\ViewUIConverter.
+ */
+
+/**
+ * This file was generated via php core/scripts/generate-proxy-class.php 'Drupal\views_ui\ParamConverter\ViewUIConverter' "core/modules/views_ui/src".
+ */
+
+namespace Drupal\views_ui\ProxyClass\ParamConverter {
+
+    /**
+     * Provides a proxy class for \Drupal\views_ui\ParamConverter\ViewUIConverter.
+     *
+     * @see \Drupal\Component\ProxyBuilder
+     */
+    class ViewUIConverter implements \Drupal\Core\ParamConverter\ParamConverterInterface
+    {
+
+        use \Drupal\Core\DependencyInjection\DependencySerializationTrait;
+
+        /**
+         * The id of the original proxied service.
+         *
+         * @var string
+         */
+        protected $drupalProxyOriginalServiceId;
+
+        /**
+         * The real proxied service, after it was lazy loaded.
+         *
+         * @var \Drupal\views_ui\ParamConverter\ViewUIConverter
+         */
+        protected $service;
+
+        /**
+         * The service container.
+         *
+         * @var \Symfony\Component\DependencyInjection\ContainerInterface
+         */
+        protected $container;
+
+        /**
+         * Constructs a ProxyClass Drupal proxy object.
+         *
+         * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
+         *   The container.
+         * @param string $drupal_proxy_original_service_id
+         *   The service ID of the original service.
+         */
+        public function __construct(\Symfony\Component\DependencyInjection\ContainerInterface $container, $drupal_proxy_original_service_id)
+        {
+            $this->container = $container;
+            $this->drupalProxyOriginalServiceId = $drupal_proxy_original_service_id;
+        }
+
+        /**
+         * Lazy loads the real service from the container.
+         *
+         * @return object
+         *   Returns the constructed real service.
+         */
+        protected function lazyLoadItself()
+        {
+            if (!isset($this->service)) {
+                $this->service = $this->container->get($this->drupalProxyOriginalServiceId);
+            }
+
+            return $this->service;
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function convert($value, $definition, $name, array $defaults)
+        {
+            return $this->lazyLoadItself()->convert($value, $definition, $name, $defaults);
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        public function applies($definition, $name, \Symfony\Component\Routing\Route $route)
+        {
+            return $this->lazyLoadItself()->applies($definition, $name, $route);
+        }
+
+    }
+
+}
diff --git a/core/modules/views_ui/src/Tests/DisplayPathTest.php b/core/modules/views_ui/src/Tests/DisplayPathTest.php
index cc6826fb2..004b9f045 100644
--- a/core/modules/views_ui/src/Tests/DisplayPathTest.php
+++ b/core/modules/views_ui/src/Tests/DisplayPathTest.php
@@ -6,6 +6,8 @@
  */
 
 namespace Drupal\views_ui\Tests;
+use Drupal\Core\Menu\MenuTreeParameters;
+use Drupal\menu_link_content\Entity\MenuLinkContent;
 
 /**
  * Tests the UI of generic display path plugin.
@@ -149,4 +151,71 @@ class DisplayPathTest extends UITestBase {
     $this->assertCacheContext('user.permissions');
   }
 
+  /**
+   * Tests the regression in https://www.drupal.org/node/2532490.
+   */
+  public function testDefaultMenuTabRegression() {
+    $this->container->get('module_installer')->install(['menu_ui', 'menu_link_content', 'toolbar', 'system']);
+    $admin_user = $this->drupalCreateUser([
+      'administer views',
+      'administer blocks',
+      'bypass node access',
+      'access user profiles',
+      'view all revisions',
+      'administer permissions',
+      'administer menu',
+      'link to any page',
+      'access toolbar',
+    ]);
+    $this->drupalLogin($admin_user);
+
+    $edit = [
+      'title[0][value]' => 'Menu title',
+      'link[0][uri]' => '/admin/foo',
+      'menu_parent' => 'admin:system.admin'
+    ];
+    $this->drupalPostForm('admin/structure/menu/manage/admin/add', $edit, t('Save'));
+
+    $menu_items = \Drupal::entityManager()->getStorage('menu_link_content')->getQuery()
+      ->sort('id', 'DESC')
+      ->pager(1)
+      ->execute();
+    $menu_item = end($menu_items);
+    /** @var \Drupal\menu_link_content\MenuLinkContentInterface $menu_link_content */
+    $menu_link_content = MenuLinkContent::load($menu_item);
+
+    $edit = [];
+    $edit['label'] = $this->randomMachineName(16);
+    $view_id = $edit['id'] = strtolower($this->randomMachineName(16));
+    $edit['description'] = $this->randomMachineName(16);
+    $edit['page[create]'] = TRUE;
+    $edit['page[path]'] = 'admin/foo';
+
+    $this->drupalPostForm('admin/structure/views/add', $edit, t('Save and edit'));
+
+    $parameters = new MenuTreeParameters();
+    $parameters->addCondition('id', $menu_link_content->getPluginId());
+    $result = \Drupal::menuTree()->load('admin', $parameters);
+    $plugin_definition = end($result)->link->getPluginDefinition();
+    $this->assertEqual('view.' . $view_id . '.page_1', $plugin_definition['route_name']);
+
+    $this->clickLink(t('No menu'));
+
+    $this->drupalPostForm(NULL, [
+      'menu[type]' => 'default tab',
+      'menu[title]' => 'Menu title',
+    ], t('Apply'));
+
+    $this->assertText('Default tab options');
+
+    $this->drupalPostForm(NULL, [
+      'tab_options[type]' => 'normal',
+      'tab_options[title]' => 'Parent title',
+    ], t('Apply'));
+
+    $this->drupalPostForm(NULL, [], t('Save'));
+    // Assert that saving the view will not cause an exception.
+    $this->assertResponse(200);
+  }
+
 }
diff --git a/core/modules/views_ui/src/Tests/OverrideDisplaysTest.php b/core/modules/views_ui/src/Tests/OverrideDisplaysTest.php
index f1815a89a..2a693f7c3 100644
--- a/core/modules/views_ui/src/Tests/OverrideDisplaysTest.php
+++ b/core/modules/views_ui/src/Tests/OverrideDisplaysTest.php
@@ -50,6 +50,7 @@ class OverrideDisplaysTest extends UITestBase {
 
     // Confirm that the view block is available in the block administration UI.
     $this->drupalGet('admin/structure/block/list/' . $this->config('system.theme')->get('default'));
+    $this->clickLinkPartialName('Place block');
     $this->assertText($view['label']);
 
     // Place the block.
@@ -109,6 +110,7 @@ class OverrideDisplaysTest extends UITestBase {
 
     // Confirm that the block is available in the block administration UI.
     $this->drupalGet('admin/structure/block/list/' . $this->config('system.theme')->get('default'));
+    $this->clickLinkPartialName('Place block');
     $this->assertText($view['label']);
 
     // Put the block into the first sidebar region, and make sure it will not
diff --git a/core/modules/views_ui/src/Tests/UITestBase.php b/core/modules/views_ui/src/Tests/UITestBase.php
index 1fe0cec10..19d77e083 100644
--- a/core/modules/views_ui/src/Tests/UITestBase.php
+++ b/core/modules/views_ui/src/Tests/UITestBase.php
@@ -74,4 +74,23 @@ abstract class UITestBase extends ViewTestBase {
     return $default;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function drupalGet($path, array $options = array(), array $headers = array()) {
+    $url = $this->buildUrl($path, $options);
+
+    // Ensure that each nojs page is accessible via ajax as well.
+    if (strpos($url, 'nojs') !== FALSE) {
+      $url = str_replace('nojs', 'ajax', $url);
+      $result = $this->drupalGet($url, $options, $headers);
+      $this->assertResponse(200);
+      $this->assertHeader('Content-Type', 'application/json');
+      $this->assertTrue(json_decode($result), 'Ensure that the AJAX request returned valid content.');
+    }
+
+    return parent::drupalGet($path, $options, $headers);
+  }
+
+
 }
diff --git a/core/modules/views_ui/src/ViewAddForm.php b/core/modules/views_ui/src/ViewAddForm.php
index 6db3e95e6..5b816d93c 100644
--- a/core/modules/views_ui/src/ViewAddForm.php
+++ b/core/modules/views_ui/src/ViewAddForm.php
@@ -162,7 +162,7 @@ class ViewAddForm extends ViewFormBase {
   /**
    * {@inheritdoc}
    */
-  public function validate(array $form, FormStateInterface $form_state) {
+  public function validateForm(array &$form, FormStateInterface $form_state) {
     $wizard_type = $form_state->getValue(array('show', 'wizard_key'));
     $wizard_instance = $this->wizardManager->createInstance($wizard_type);
     $form_state->set('wizard', $wizard_instance->getPluginDefinition());
diff --git a/core/modules/views_ui/src/ViewDuplicateForm.php b/core/modules/views_ui/src/ViewDuplicateForm.php
index 36f1a7fc5..ccc1a49f5 100644
--- a/core/modules/views_ui/src/ViewDuplicateForm.php
+++ b/core/modules/views_ui/src/ViewDuplicateForm.php
@@ -58,7 +58,6 @@ class ViewDuplicateForm extends ViewFormBase {
     $actions['submit'] = array(
       '#type' => 'submit',
       '#value' => $this->t('Duplicate'),
-      '#submit' => array('::submitForm'),
     );
     return $actions;
   }
diff --git a/core/modules/views_ui/src/ViewEditForm.php b/core/modules/views_ui/src/ViewEditForm.php
index 9e598f28d..d71d88866 100644
--- a/core/modules/views_ui/src/ViewEditForm.php
+++ b/core/modules/views_ui/src/ViewEditForm.php
@@ -122,12 +122,6 @@ class ViewEditForm extends ViewFormBase {
     $form['#attached']['library'][] = 'views_ui/views_ui.admin';
     $form['#attached']['library'][] = 'views_ui/admin.styling';
 
-    $form['#attached']['drupalSettings']['views']['ajax'] = [
-      'id' => '.views-ajax-body',
-      'title' => '.views-ajax-title',
-      'popup' => '.views-ajax-popup',
-    ];
-
     $form += array(
       '#prefix' => '',
       '#suffix' => '',
@@ -220,23 +214,6 @@ class ViewEditForm extends ViewFormBase {
         '#type' => 'container',
         'tab_content' => $tab_content,
       );
-
-      // The content of the popup dialog.
-      $form['ajax-area'] = array(
-        '#type' => 'container',
-        '#attributes' => array(
-          'class' => array('views-ajax-popup'),
-        ),
-      );
-      $form['ajax-area']['ajax-title'] = array(
-        '#markup' => '<div class="views-ajax-title"></div>',
-      );
-      $form['ajax-area']['ajax-body'] = array(
-        '#type' => 'container',
-        '#attributes' => array(
-          'class' => array('views-ajax-body'),
-        ),
-      );
     }
 
     return $form;
@@ -264,8 +241,8 @@ class ViewEditForm extends ViewFormBase {
   /**
    * {@inheritdoc}
    */
-  public function validate(array $form, FormStateInterface $form_state) {
-    parent::validate($form, $form_state);
+  public function validateForm(array &$form, FormStateInterface $form_state) {
+    parent::validateForm($form, $form_state);
 
     $view = $this->entity;
     if ($view->isLocked()) {
diff --git a/core/modules/views_ui/src/ViewUI.php b/core/modules/views_ui/src/ViewUI.php
index 05451beb8..8168bf228 100644
--- a/core/modules/views_ui/src/ViewUI.php
+++ b/core/modules/views_ui/src/ViewUI.php
@@ -10,7 +10,6 @@ namespace Drupal\views_ui;
 use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\Timer;
 use Drupal\Component\Utility\Xss;
-use Drupal\Core\Config\Entity\ThirdPartySettingsInterface;
 use Drupal\Core\EventSubscriber\AjaxResponseSubscriber;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Url;
@@ -18,7 +17,6 @@ use Drupal\views\Views;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\views\ViewExecutable;
 use Drupal\Core\Database\Database;
-use Drupal\Core\TypedData\TypedDataInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\views\Plugin\views\query\Sql;
 use Drupal\views\Entity\View;
@@ -1336,4 +1334,40 @@ class ViewUI implements ViewEntityInterface {
     return $this->storage->hasTrustedData();
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function addCacheableDependency($other_object) {
+    $this->storage->addCacheableDependency($other_object);
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function addCacheContexts(array $cache_contexts) {
+    return $this->storage->addCacheContexts($cache_contexts);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function mergeCacheMaxAge($max_age) {
+    return $this->storage->mergeCacheMaxAge($max_age);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheTagsToInvalidate() {
+    return $this->storage->getCacheTagsToInvalidate();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function addCacheTags(array $cache_tags) {
+    return $this->storage->addCacheTags($cache_tags);
+  }
+
 }
diff --git a/core/modules/views_ui/templates/views-ui-build-group-filter-form.html.twig b/core/modules/views_ui/templates/views-ui-build-group-filter-form.html.twig
new file mode 100644
index 000000000..0e05c27cd
--- /dev/null
+++ b/core/modules/views_ui/templates/views-ui-build-group-filter-form.html.twig
@@ -0,0 +1,57 @@
+{#
+/**
+ * @file
+ * Default theme implementation for Views UI build group filter form.
+ *
+ * Available variables:
+ * - form: A render element representing the form. Contains the following:
+ *   - form_description: The exposed filter's description.
+ *   - expose_button: The button to toggle the expose filter form.
+ *   - group_button: Toggle options between single and grouped filters.
+ *   - label: A filter label input field.
+ *   - description: A filter description field.
+ *   - value: The filters available values.
+ *   - optional: A checkbox to require this filter or not.
+ *   - remember: A checkbox to remember selected filter value(s) (per user).
+ *   - widget: Radio Buttons to select the filter widget.
+ *   - add_group: A button to add another row to the table.
+ *   - more: A details element for additional field exposed filter fields.
+ * - table: A rendered table element of the group filter form.
+ *
+ * @see template_preprocess_views_ui_build_group_filter_form()
+ *
+ * @ingroup themeable
+ */
+#}
+{{ form.form_description }}
+{{ form.expose_button }}
+{{ form.group_button }}
+<div class="views-left-40">
+  {{ form.optional }}
+  {{ form.remember }}
+</div>
+<div class="views-right-60">
+  {{ form.widget }}
+  {{ form.label }}
+  {{ form.description }}
+</div>
+{#
+  Render the rest of the form elements excluding elements that are rendered
+  elsewhere.
+#}
+{{ form|without(
+    'form_description',
+    'expose_button',
+    'group_button',
+    'optional',
+    'remember',
+    'widget',
+    'label',
+    'description',
+    'add_group',
+    'more'
+  )
+}}
+{{ table }}
+{{ form.add_group }}
+{{ form.more }}
diff --git a/core/modules/views_ui/views_ui.module b/core/modules/views_ui/views_ui.module
index 45cf248d2..5dba4fe32 100644
--- a/core/modules/views_ui/views_ui.module
+++ b/core/modules/views_ui/views_ui.module
@@ -8,12 +8,8 @@
 use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Url;
-use Drupal\views\Views;
 use Drupal\views\ViewExecutable;
-use Drupal\views_ui\ViewUI;
 use Drupal\views\Analyzer;
-use Drupal\Core\Ajax\AjaxResponse;
-use Drupal\Core\Ajax\ReplaceCommand;
 use Drupal\Component\Utility\Xss;
 
 /**
@@ -97,7 +93,6 @@ function views_ui_theme() {
     'views_ui_build_group_filter_form' => array(
       'render element' => 'form',
       'file' => 'views_ui.theme.inc',
-      'function' => 'theme_views_ui_build_group_filter_form',
     ),
 
     // On behalf of a plugin
@@ -129,7 +124,7 @@ function views_ui_preprocess_views_view(&$variables) {
 
   // Render title for the admin preview.
   if (!empty($view->live_preview)) {
-    $variables['title'] = Xss::filterAdmin($view->getTitle());
+    $variables['title']['#markup'] = $view->getTitle();
   }
 
   if (!empty($view->live_preview) && \Drupal::moduleHandler()->moduleExists('contextual')) {
diff --git a/core/modules/views_ui/views_ui.theme.inc b/core/modules/views_ui/views_ui.theme.inc
index cd259ca51..f9b165a11 100644
--- a/core/modules/views_ui/views_ui.theme.inc
+++ b/core/modules/views_ui/views_ui.theme.inc
@@ -65,35 +65,18 @@ function template_preprocess_views_ui_display_tab_bucket(&$variables) {
 }
 
 /**
- * Theme the build group filter form.
+ * Prepares variables for Views UI build group filter form templates.
  *
- * @ingroup themeable
+ * Default template: views-ui-build-group-filter-form.html.twig.
+ *
+ * @param array $variables
+ *   An associative array containing:
+ *   - form: A render element representing the form.
  */
-function theme_views_ui_build_group_filter_form($variables) {
+function template_preprocess_views_ui_build_group_filter_form(&$variables) {
   $form = $variables['form'];
-  $more = drupal_render($form['more']);
-
-  $output = drupal_render($form['form_description']);
-  $output .= drupal_render($form['expose_button']);
-  $output .= drupal_render($form['group_button']);
-  if (isset($form['required'])) {
-    $output .= drupal_render($form['required']);
-  }
-
-  $output .= drupal_render($form['operator']);
-  $output .= drupal_render($form['value']);
-
-  $output .= '<div class="views-left-40">';
-  $output .= drupal_render($form['optional']);
-  $output .= drupal_render($form['remember']);
-  $output .= '</div>';
-
-  $output .= '<div class="views-right-60">';
-  $output .= drupal_render($form['widget']);
-  $output .= drupal_render($form['label']);
-  $output .= drupal_render($form['description']);
-  $output .= '</div>';
 
+  // Prepare table of options.
   $header = array(
     t('Default'),
     t('Weight'),
@@ -103,14 +86,14 @@ function theme_views_ui_build_group_filter_form($variables) {
     t('Operations'),
   );
 
+  // Prepare default selectors.
   $form_state = new FormState();
   $form['default_group'] = Element\Radios::processRadios($form['default_group'], $form_state, $form);
   $form['default_group_multiple'] = Element\Checkboxes::processCheckboxes($form['default_group_multiple'], $form_state, $form);
   $form['default_group']['All']['#title'] = '';
 
-  hide($form['default_group_multiple']['All']);
   $rows[] = array(
-    drupal_render($form['default_group']['All']),
+    ['data' => $form['default_group']['All']],
     '',
     array(
       'data' => \Drupal::config('views.settings')->get('ui.exposed_filter_any_label') == 'old_any' ? t('&lt;Any&gt;') : t('- Any -'),
@@ -118,6 +101,9 @@ function theme_views_ui_build_group_filter_form($variables) {
       'class' => array('class' => 'any-default-radios-row'),
     ),
   );
+  // Remove the 'All' default_group form element because it's added to the
+  // table row.
+  unset($variables['form']['default_group']['All']);
 
   foreach (Element::children($form['group_items']) as $group_id) {
     $form['group_items'][$group_id]['value']['#title'] = '';
@@ -125,6 +111,10 @@ function theme_views_ui_build_group_filter_form($variables) {
       $form['default_group'][$group_id],
       $form['default_group_multiple'][$group_id],
     ];
+    // Remove these fields from the form since they are moved into the table.
+    unset($variables['form']['default_group'][$group_id]);
+    unset($variables['form']['default_group_multiple'][$group_id]);
+
     $link = [
       '#type' => 'link',
       '#url' => Url::fromRoute('<none>', [], [
@@ -145,15 +135,15 @@ function theme_views_ui_build_group_filter_form($variables) {
     $remove = [$form['group_items'][$group_id]['remove'], $link];
     $data = array(
       'default' => ['data' => $default],
-      'weight' => drupal_render($form['group_items'][$group_id]['weight']),
-      'title' => drupal_render($form['group_items'][$group_id]['title']),
-      'operator' => drupal_render($form['group_items'][$group_id]['operator']),
-      'value' => drupal_render($form['group_items'][$group_id]['value']),
+      'weight' => ['data' => $form['group_items'][$group_id]['weight']],
+      'title' => ['data' => $form['group_items'][$group_id]['title']],
+      'operator' => ['data' => $form['group_items'][$group_id]['operator']],
+      'value' => ['data' => $form['group_items'][$group_id]['value']],
       'remove' => ['data' => $remove],
     );
     $rows[] = array('data' => $data, 'id' => 'views-row-' . $group_id, 'class' => array('draggable'));
   }
-  $table = array(
+  $variables['table'] = array(
     '#type' => 'table',
     '#header' => $header,
     '#rows' => $rows,
@@ -170,11 +160,8 @@ function theme_views_ui_build_group_filter_form($variables) {
     ),
   );
 
-  // Render the "Add another item" button below the table.
-  $add_another = drupal_render($form['add_group']);
-  $render_form = drupal_render_children($form);
-
-  return $output . $render_form . drupal_render($table) . $add_another . $more;
+  // Hide fields used in table.
+  unset($variables['form']['group_items']);
 }
 
 /**
diff --git a/core/profiles/minimal/src/Tests/MinimalTest.php b/core/profiles/minimal/src/Tests/MinimalTest.php
index d70c09700..bfc4e19cd 100644
--- a/core/profiles/minimal/src/Tests/MinimalTest.php
+++ b/core/profiles/minimal/src/Tests/MinimalTest.php
@@ -34,5 +34,10 @@ class MinimalTest extends WebTestBase {
     $this->drupalGet('');
     $this->assertText(t('Tools'));
     $this->assertText(t('Administration'));
+
+    // Ensure that there are no pending updates after installation.
+    $this->drupalLogin($this->rootUser);
+    $this->drupalGet('update.php/selection');
+    $this->assertText('No pending updates.');
   }
 }
diff --git a/core/profiles/standard/src/Tests/StandardTest.php b/core/profiles/standard/src/Tests/StandardTest.php
index 19b703e86..ee867d125 100644
--- a/core/profiles/standard/src/Tests/StandardTest.php
+++ b/core/profiles/standard/src/Tests/StandardTest.php
@@ -152,6 +152,11 @@ class StandardTest extends WebTestBase {
     $this->adminUser->save();
     $this->drupalGet('node/add');
     $this->assertResponse(200);
+
+    // Ensure that there are no pending updates after installation.
+    $this->drupalLogin($this->rootUser);
+    $this->drupalGet('update.php/selection');
+    $this->assertText('No pending updates.');
   }
 
 }
diff --git a/core/profiles/standard/standard.install b/core/profiles/standard/standard.install
index fd339b8bc..4d4416ae6 100644
--- a/core/profiles/standard/standard.install
+++ b/core/profiles/standard/standard.install
@@ -16,12 +16,6 @@ use Drupal\user\RoleInterface;
  * @see system_install()
  */
 function standard_install() {
-  // Now that all modules are installed, make sure the entity storage and other
-  // handlers are up to date with the current entity and field definitions. For
-  // example, Path module adds a base field to nodes and taxonomy terms after
-  // those modules are already installed.
-  \Drupal::service('entity.definition_update_manager')->applyUpdates();
-
   // Set front page to "node".
   \Drupal::configFactory()->getEditable('system.site')->set('page.front', '/node')->save(TRUE);
 
diff --git a/core/scripts/generate-proxy-class.php b/core/scripts/generate-proxy-class.php
new file mode 100644
index 000000000..d5f0e4366
--- /dev/null
+++ b/core/scripts/generate-proxy-class.php
@@ -0,0 +1,23 @@
+#!/usr/bin/env php
+<?php
+
+use Drupal\Core\Command\GenerateProxyClassApplication;
+use Drupal\Core\DrupalKernel;
+use Drupal\Core\ProxyBuilder\ProxyBuilder;
+use Drupal\Core\Site\Settings;
+use Symfony\Component\HttpFoundation\Request;
+
+if (PHP_SAPI !== 'cli') {
+  return;
+}
+
+// Bootstrap.
+$autoloader = require __DIR__ . '/../../autoload.php';
+require_once __DIR__ . '/../includes/bootstrap.inc';
+$request = Request::createFromGlobals();
+Settings::initialize(dirname(dirname(__DIR__)), DrupalKernel::findSitePath($request), $autoloader);
+$kernel = DrupalKernel::createFromRequest($request, $autoloader, 'prod')->boot();
+
+// Run the database dump command.
+$application = new GenerateProxyClassApplication(new ProxyBuilder());
+$application->run();
diff --git a/core/scripts/migrate-db.sh b/core/scripts/migrate-db.sh
index 9adddbc78..16ed45a41 100755
--- a/core/scripts/migrate-db.sh
+++ b/core/scripts/migrate-db.sh
@@ -286,7 +286,7 @@ function restore_table($path, Connection $connection) {
  * @param string $path
  *  The path to the dump file.
  *
- * @return boolean
+ * @return bool
  */
 function table_is_valid($path) {
   // The call to rtrim() is important, since we need to extract a specific
diff --git a/core/scripts/run-tests.sh b/core/scripts/run-tests.sh
index 174f14de7..0ccdc350c 100755
--- a/core/scripts/run-tests.sh
+++ b/core/scripts/run-tests.sh
@@ -1204,7 +1204,8 @@ function simpletest_script_open_browser() {
   $css_assets = \Drupal::service('asset.css.collection_renderer')->render($resolver->getCssAssets($assets, FALSE));
 
   // Make the html page to write to disk.
-  $html = '<head>' . drupal_render($js_assets_header) . drupal_render($css_assets) . '</head><body>' . drupal_render($form) . drupal_render($js_assets_footer) .'</body>';
+  $render_service = \Drupal::service('renderer');
+  $html = '<head>' . ($js_assets_header) . $render_service->renderPlain($css_assets) . '</head><body>' . $render_service->renderPlain($form) . $render_service->renderPlain($js_assets_footer) .'</body>';
 
   // Ensure we have assets verbose directory - tests with no verbose output will not
   // have created one.
diff --git a/core/tests/Drupal/Tests/Component/Assertion/InspectorTest.php b/core/tests/Drupal/Tests/Component/Assertion/InspectorTest.php
new file mode 100644
index 000000000..55b09d8d5
--- /dev/null
+++ b/core/tests/Drupal/Tests/Component/Assertion/InspectorTest.php
@@ -0,0 +1,241 @@
+<?php
+/**
+ * @file
+ * Contains \Drupal\Tests\Component\InspectorTest.
+ */
+
+namespace Drupal\Tests\Component\Assertion;
+
+use PHPUnit_Framework_TestCase;
+use Drupal\Component\Assertion\Inspector;
+
+/**
+ * @coversDefaultClass \Drupal\Component\Assertion\Inspector
+ * @group Inspector
+ */
+class InspectorTest extends PHPUnit_Framework_TestCase {
+
+  /**
+   * Tests asserting argument is an array or traversable object.
+   *
+   * @covers ::assertTraversable
+   */
+  public function testAssertTraversable() {
+    $this->assertTrue(Inspector::assertTraversable([]));
+    $this->assertTrue(Inspector::assertTraversable(new \ArrayObject()));
+    $this->assertFalse(Inspector::assertTraversable(new \stdClass()));
+    $this->assertFalse(Inspector::assertTraversable('foo'));
+  }
+
+  /**
+   * Tests asserting all members are strings.
+   *
+   * @covers ::assertAllStrings
+   */
+  public function testAssertAllStrings() {
+    $this->assertTrue(Inspector::assertAllStrings([]));
+    $this->assertTrue(Inspector::assertAllStrings(['foo', 'bar']));
+    $this->assertFalse(Inspector::assertAllStrings('foo'));
+    $this->assertFalse(Inspector::assertAllStrings(['foo', new StringObject()]));
+  }
+
+  /**
+   * Tests asserting all members are strings or objects with __toString().
+   *
+   * @covers ::assertAllStringable
+   */
+  public function testAssertAllStringable() {
+    $this->assertTrue(Inspector::assertAllStringable([]));
+    $this->assertTrue(Inspector::assertAllStringable(['foo', 'bar']));
+    $this->assertFalse(Inspector::assertAllStringable('foo'));
+    $this->assertTrue(Inspector::assertAllStringable(['foo', new StringObject()]));
+  }
+
+  /**
+   * Tests asserting all members are arrays.
+   *
+   * @covers ::assertAllArrays
+   */
+  public function testAssertAllArrays() {
+    $this->assertTrue(Inspector::assertAllArrays([]));
+    $this->assertTrue(Inspector::assertAllArrays([[], []]));
+    $this->assertFalse(Inspector::assertAllArrays([[], 'foo']));
+  }
+
+  /**
+   * Tests asserting array is 0-indexed - the strict definition of array.
+   *
+   * @covers ::assertStrictArray
+   */
+  public function testAssertStrictArray() {
+    $this->assertTrue(Inspector::assertStrictArray([]));
+    $this->assertTrue(Inspector::assertStrictArray(['bar', 'foo']));
+    $this->assertFalse(Inspector::assertStrictArray(['foo' => 'bar', 'bar' => 'foo']));
+  }
+
+  /**
+   * Tests asserting all members are strict arrays.
+   *
+   * @covers ::assertAllStrictArrays
+   */
+  public function testAssertAllStrictArrays() {
+    $this->assertTrue(Inspector::assertAllStrictArrays([]));
+    $this->assertTrue(Inspector::assertAllStrictArrays([[], []]));
+    $this->assertFalse(Inspector::assertAllStrictArrays([['foo' => 'bar', 'bar' => 'foo']]));
+  }
+
+  /**
+   * Tests asserting all members have specified keys.
+   *
+   * @covers ::assertAllHaveKey
+   */
+  public function testAssertAllHaveKey() {
+    $this->assertTrue(Inspector::assertAllHaveKey([]));
+    $this->assertTrue(Inspector::assertAllHaveKey([['foo' => 'bar', 'bar' => 'foo']]));
+    $this->assertTrue(Inspector::assertAllHaveKey([['foo' => 'bar', 'bar' => 'foo']], 'foo'));
+    $this->assertTrue(Inspector::assertAllHaveKey([['foo' => 'bar', 'bar' => 'foo']], 'bar', 'foo'));
+    $this->assertFalse(Inspector::assertAllHaveKey([['foo' => 'bar', 'bar' => 'foo']], 'bar', 'foo', 'moo'));
+  }
+
+  /**
+   * Tests asserting all members are integers.
+   *
+   * @covers ::assertAllIntegers
+   */
+  public function testAssertAllIntegers() {
+    $this->assertTrue(Inspector::assertAllIntegers([]));
+    $this->assertTrue(Inspector::assertAllIntegers([1, 2, 3]));
+    $this->assertFalse(Inspector::assertAllIntegers([1, 2, 3.14]));
+    $this->assertFalse(Inspector::assertAllIntegers([1, '2', 3]));
+  }
+
+  /**
+   * Tests asserting all members are floating point variables.
+   *
+   * @covers ::assertAllFloat
+   */
+  public function testAssertAllFloat() {
+    $this->assertTrue(Inspector::assertAllFloat([]));
+    $this->assertTrue(Inspector::assertAllFloat([1.0, 2.1, 3.14]));
+    $this->assertFalse(Inspector::assertAllFloat([1, 2.1, 3.14]));
+    $this->assertFalse(Inspector::assertAllFloat([1.0, '2', 3]));
+    $this->assertFalse(Inspector::assertAllFloat(['Titanic']));
+  }
+
+  /**
+   * Tests asserting all members are callable.
+   *
+   * @covers ::assertAllCallable
+   */
+  public function testAllCallable() {
+    $this->assertTrue(Inspector::assertAllCallable([
+      'strchr',
+      [$this, 'callMe'],
+      [__CLASS__, 'callMeStatic'],
+      function() {
+        return TRUE;
+      }
+    ]));
+
+    $this->assertFalse(Inspector::assertAllCallable([
+      'strchr',
+      [$this, 'callMe'],
+      [__CLASS__, 'callMeStatic'],
+      function() {
+        return TRUE;
+      },
+      "I'm not callable"
+    ]));
+  }
+
+  /**
+   * Tests asserting all members are !empty().
+   *
+   * @covers ::assertAllNotEmpty
+   */
+  public function testAllNotEmpty() {
+    $this->assertTrue(Inspector::assertAllNotEmpty([1, 'two']));
+    $this->assertFalse(Inspector::assertAllNotEmpty(['']));
+  }
+
+  /**
+   * Tests asserting all arguments are numbers or strings castable to numbers.
+   *
+   * @covers ::assertAllNumeric
+   */
+  public function testAssertAllNumeric() {
+    $this->assertTrue(Inspector::assertAllNumeric([1, '2', 3.14]));
+    $this->assertFalse(Inspector::assertAllNumeric([1, 'two', 3.14]));
+  }
+
+  /**
+   * Tests asserting strstr() or stristr() match.
+   *
+   * @covers ::assertAllMatch
+   */
+  public function testAssertAllMatch() {
+    $this->assertTrue(Inspector::assertAllMatch('f', ['fee', 'fi', 'fo']));
+    $this->assertTrue(Inspector::assertAllMatch('F', ['fee', 'fi', 'fo']));
+    $this->assertTrue(Inspector::assertAllMatch('f', ['fee', 'fi', 'fo'], TRUE));
+    $this->assertFalse(Inspector::assertAllMatch('F', ['fee', 'fi', 'fo'], TRUE));
+    $this->assertFalse(Inspector::assertAllMatch('e', ['fee', 'fi', 'fo']));
+    $this->assertFalse(Inspector::assertAllMatch('1', [12]));
+  }
+
+  /**
+   * Tests asserting regular expression match.
+   *
+   * @covers ::assertAllRegularExpressionMatch
+   */
+  public function testAssertAllRegularExpressionMatch() {
+    $this->assertTrue(Inspector::assertAllRegularExpressionMatch('/f/i', ['fee', 'fi', 'fo']));
+    $this->assertTrue(Inspector::assertAllRegularExpressionMatch('/F/i', ['fee', 'fi', 'fo']));
+    $this->assertTrue(Inspector::assertAllRegularExpressionMatch('/f/', ['fee', 'fi', 'fo']));
+    $this->assertFalse(Inspector::assertAllRegularExpressionMatch('/F/', ['fee', 'fi', 'fo']));
+    $this->assertFalse(Inspector::assertAllRegularExpressionMatch('/e/', ['fee', 'fi', 'fo']));
+    $this->assertFalse(Inspector::assertAllRegularExpressionMatch('/1/', [12]));
+  }
+
+  /**
+   * Tests asserting all members are objects.
+   *
+   * @covers ::assertAllObjects
+   */
+  public function testAssertAllObjects() {
+    $this->assertTrue(Inspector::assertAllObjects([new \ArrayObject(), new \ArrayObject()]));
+    $this->assertFalse(Inspector::assertAllObjects([new \ArrayObject(), new \ArrayObject(), 'foo']));
+    $this->assertTrue(Inspector::assertAllObjects([new \ArrayObject(), new \ArrayObject()], '\\Traversable'));
+    $this->assertFalse(Inspector::assertAllObjects([new \ArrayObject(), new \ArrayObject(), 'foo'], '\\Traversable'));
+    $this->assertFalse(Inspector::assertAllObjects([new \ArrayObject(), new StringObject()], '\\Traversable'));
+    $this->assertTrue(Inspector::assertAllObjects([new \ArrayObject(), new StringObject()], '\\Traversable', '\\Drupal\\Tests\\Component\\Assertion\\StringObject'));
+    $this->assertFalse(Inspector::assertAllObjects([new \ArrayObject(), new StringObject(), new \stdClass()], '\\ArrayObject', '\\Drupal\\Tests\\Component\\Assertion\\StringObject'));
+  }
+
+  /**
+   * Test method referenced by ::testAllCallable().
+   */
+  public function callMe() {
+    return TRUE;
+  }
+
+  /**
+   * Test method referenced by ::testAllCallable().
+   */
+  public static function callMeStatic() {
+    return TRUE;
+  }
+
+}
+
+/**
+ * Quick class for testing for objects with __toString.
+ */
+class StringObject {
+  /**
+   * {@inheritdoc}
+   */
+  public function __toString() {
+    return 'foo';
+  }
+
+}
diff --git a/core/tests/Drupal/Tests/Component/ProxyBuilder/ProxyBuilderTest.php b/core/tests/Drupal/Tests/Component/ProxyBuilder/ProxyBuilderTest.php
index a0f57fe6b..53a14f5aa 100644
--- a/core/tests/Drupal/Tests/Component/ProxyBuilder/ProxyBuilderTest.php
+++ b/core/tests/Drupal/Tests/Component/ProxyBuilder/ProxyBuilderTest.php
@@ -37,7 +37,23 @@ class ProxyBuilderTest extends UnitTestCase {
    */
   public function testBuildProxyClassName() {
     $class_name = $this->proxyBuilder->buildProxyClassName('Drupal\Tests\Component\ProxyBuilder\TestServiceNoMethod');
-    $this->assertEquals('Drupal_Tests_Component_ProxyBuilder_TestServiceNoMethod_Proxy', $class_name);
+    $this->assertEquals('Drupal\Tests\ProxyClass\Component\ProxyBuilder\TestServiceNoMethod', $class_name);
+  }
+
+  /**
+   * @covers ::buildProxyClassName
+   */
+  public function testBuildProxyClassNameForModule() {
+    $class_name = $this->proxyBuilder->buildProxyClassName('Drupal\views_ui\ParamConverter\ViewUIConverter');
+    $this->assertEquals('Drupal\views_ui\ProxyClass\ParamConverter\ViewUIConverter', $class_name);
+  }
+
+  /**
+   * @covers ::buildProxyNamespace
+   */
+  public function testBuildProxyNamespace() {
+    $class_name = $this->proxyBuilder->buildProxyNamespace('Drupal\Tests\Component\ProxyBuilder\TestServiceNoMethod');
+    $this->assertEquals('Drupal\Tests\ProxyClass\Component\ProxyBuilder', $class_name);
   }
 
   /**
@@ -65,10 +81,13 @@ class ProxyBuilderTest extends UnitTestCase {
 
     $method_body = <<<'EOS'
 
-    public function method()
-    {
-        return $this->lazyLoadItself()->method();
-    }
+/**
+ * {@inheritdoc}
+ */
+public function method()
+{
+    return $this->lazyLoadItself()->method();
+}
 
 EOS;
     $this->assertEquals($this->buildExpectedClass($class, $method_body), $result);
@@ -86,10 +105,13 @@ EOS;
 
     $method_body = <<<'EOS'
 
-    public function methodWithParameter($parameter)
-    {
-        return $this->lazyLoadItself()->methodWithParameter($parameter);
-    }
+/**
+ * {@inheritdoc}
+ */
+public function methodWithParameter($parameter)
+{
+    return $this->lazyLoadItself()->methodWithParameter($parameter);
+}
 
 EOS;
     $this->assertEquals($this->buildExpectedClass($class, $method_body), $result);
@@ -108,11 +130,14 @@ EOS;
     // @todo Solve the silly linebreak for array()
     $method_body = <<<'EOS'
 
-    public function complexMethod($parameter, callable $function, \Drupal\Tests\Component\ProxyBuilder\TestServiceNoMethod $test_service = NULL, array &$elements = array (
-    ))
-    {
-        return $this->lazyLoadItself()->complexMethod($parameter, $function, $test_service, $elements);
-    }
+/**
+ * {@inheritdoc}
+ */
+public function complexMethod($parameter, callable $function, \Drupal\Tests\Component\ProxyBuilder\TestServiceNoMethod $test_service = NULL, array &$elements = array (
+))
+{
+    return $this->lazyLoadItself()->complexMethod($parameter, $function, $test_service, $elements);
+}
 
 EOS;
 
@@ -131,10 +156,13 @@ EOS;
     // @todo Solve the silly linebreak for array()
     $method_body = <<<'EOS'
 
-    public function &returnReference()
-    {
-        return $this->lazyLoadItself()->returnReference();
-    }
+/**
+ * {@inheritdoc}
+ */
+public function &returnReference()
+{
+    return $this->lazyLoadItself()->returnReference();
+}
 
 EOS;
 
@@ -153,10 +181,13 @@ EOS;
 
     $method_body = <<<'EOS'
 
-    public function testMethod($parameter)
-    {
-        return $this->lazyLoadItself()->testMethod($parameter);
-    }
+/**
+ * {@inheritdoc}
+ */
+public function testMethod($parameter)
+{
+    return $this->lazyLoadItself()->testMethod($parameter);
+}
 
 EOS;
 
@@ -189,10 +220,13 @@ EOS;
 
     $method_body = <<<'EOS'
 
-    public function testMethod($parameter)
-    {
-        return $this->lazyLoadItself()->testMethod($parameter);
-    }
+/**
+ * {@inheritdoc}
+ */
+public function testMethod($parameter)
+{
+    return $this->lazyLoadItself()->testMethod($parameter);
+}
 
 EOS;
 
@@ -212,10 +246,13 @@ $this->assertEquals($this->buildExpectedClass($class, $method_body), $result);
     // Ensure that the static method is not wrapped.
     $method_body = <<<'EOS'
 
-    public static function testMethod($parameter)
-    {
-        \Drupal\Tests\Component\ProxyBuilder\TestServiceWithPublicStaticMethod::testMethod($parameter);
-    }
+/**
+ * {@inheritdoc}
+ */
+public static function testMethod($parameter)
+{
+    \Drupal\Tests\Component\ProxyBuilder\TestServiceWithPublicStaticMethod::testMethod($parameter);
+}
 
 EOS;
 
@@ -232,53 +269,87 @@ EOS;
    *   The code of the entire proxy.
    */
   protected function buildExpectedClass($class, $expected_methods_body, $interface_string = '') {
-    $proxy_class = $this->proxyBuilder->buildProxyClassName($class);
+    $namespace = ProxyBuilder::buildProxyNamespace($class);
+    $reflection = new \ReflectionClass($class);
+    $proxy_class = $reflection->getShortName();
+
     $expected_string = <<<'EOS'
-/**
- * Provides a proxy class for \{{ class }}.
- *
- * @see \Drupal\Component\ProxyBuilder
- */
-class {{ proxy_class }}{{ interface_string }}
-{
+
+namespace {{ namespace }} {
 
     /**
-     * @var string
-     */
-    protected $serviceId;
-
-    /**
-     * @var \{{ class }}
-     */
-    protected $service;
-
-    /**
-     * The service container.
+     * Provides a proxy class for \{{ class }}.
      *
-     * @var \Symfony\Component\DependencyInjection\ContainerInterface
+     * @see \Drupal\Component\ProxyBuilder
      */
-    protected $container;
-
-    public function __construct(\Symfony\Component\DependencyInjection\ContainerInterface $container, $serviceId)
+    class {{ proxy_class }}{{ interface_string }}
     {
-        $this->container = $container;
-        $this->serviceId = $serviceId;
-    }
 
-    protected function lazyLoadItself()
-    {
-        if (!isset($this->service)) {
-            $method_name = 'get' . Container::camelize($this->serviceId) . 'Service';
-            $this->service = $this->container->$method_name(false);
+        /**
+         * The id of the original proxied service.
+         *
+         * @var string
+         */
+        protected $drupalProxyOriginalServiceId;
+
+        /**
+         * The real proxied service, after it was lazy loaded.
+         *
+         * @var \{{ class }}
+         */
+        protected $service;
+
+        /**
+         * The service container.
+         *
+         * @var \Symfony\Component\DependencyInjection\ContainerInterface
+         */
+        protected $container;
+
+        /**
+         * Constructs a ProxyClass Drupal proxy object.
+         *
+         * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
+         *   The container.
+         * @param string $drupal_proxy_original_service_id
+         *   The service ID of the original service.
+         */
+        public function __construct(\Symfony\Component\DependencyInjection\ContainerInterface $container, $drupal_proxy_original_service_id)
+        {
+            $this->container = $container;
+            $this->drupalProxyOriginalServiceId = $drupal_proxy_original_service_id;
         }
 
-        return $this->service;
-    }
+        /**
+         * Lazy loads the real service from the container.
+         *
+         * @return object
+         *   Returns the constructed real service.
+         */
+        protected function lazyLoadItself()
+        {
+            if (!isset($this->service)) {
+                $this->service = $this->container->get($this->drupalProxyOriginalServiceId);
+            }
+
+            return $this->service;
+        }
 {{ expected_methods_body }}
+    }
+
 }
 
 EOS;
+
+    $expected_methods_body = implode("\n", array_map(function ($value) {
+      if ($value === '') {
+        return $value;
+      }
+      return "        $value";
+    }, explode("\n", $expected_methods_body)));
+
     $expected_string = str_replace('{{ proxy_class }}', $proxy_class, $expected_string);
+    $expected_string = str_replace('{{ namespace }}', $namespace, $expected_string);
     $expected_string = str_replace('{{ class }}', $class, $expected_string);
     $expected_string = str_replace('{{ expected_methods_body }}', $expected_methods_body, $expected_string);
     $expected_string = str_replace('{{ interface_string }}', $interface_string, $expected_string);
diff --git a/core/tests/Drupal/Tests/Component/ProxyBuilder/ProxyDumperTest.php b/core/tests/Drupal/Tests/Component/ProxyBuilder/ProxyDumperTest.php
deleted file mode 100644
index 8285306b8..000000000
--- a/core/tests/Drupal/Tests/Component/ProxyBuilder/ProxyDumperTest.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\Tests\Component\ProxyBuilder\ProxyDumperTest.
- */
-
-namespace Drupal\Tests\Component\ProxyBuilder;
-
-use Drupal\Component\ProxyBuilder\ProxyDumper;
-use Drupal\Tests\UnitTestCase;
-use Symfony\Component\DependencyInjection\Definition;
-
-/**
- * @coversDefaultClass \Drupal\Component\ProxyBuilder\ProxyDumper
- * @group proxy_builder
- */
-class ProxyDumperTest extends UnitTestCase {
-
-  /**
-   * The mocked proxy builder.
-   *
-   * @var \Drupal\Component\ProxyBuilder\ProxyBuilder|\PHPUnit_Framework_MockObject_MockObject
-   */
-  protected $proxyBuilder;
-
-  /**
-   * The tested proxy dumper.
-   *
-   * @var \Drupal\Component\ProxyBuilder\ProxyDumper
-   */
-  protected $proxyDumper;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->proxyBuilder = $this->getMockBuilder('Drupal\Component\ProxyBuilder\ProxyBuilder')
-      ->disableOriginalConstructor()
-      ->setMethods(['build'])
-      ->getMock();
-    $this->proxyDumper = new ProxyDumper($this->proxyBuilder);
-  }
-
-  /**
-   * @dataProvider providerTestIsProxyCandidate
-   * @covers ::isProxyCandidate
-   */
-  public function testIsProxyCandidate(Definition $definition, $expected) {
-    $this->assertSame($expected, $this->proxyDumper->isProxyCandidate($definition));
-  }
-
-  public function providerTestIsProxyCandidate() {
-    // Not lazy service.
-    $data = [];
-    $definition = new Definition('Drupal\Tests\Component\ProxyBuilder\TestService');
-    $data[] = [$definition, FALSE];
-    // Not existing service.
-    $definition = new Definition('Drupal\Tests\Component\ProxyBuilder\TestNotExistingService');
-    $definition->setLazy(TRUE);
-    $data[] = [$definition, FALSE];
-    // Existing and lazy service.
-    $definition = new Definition('Drupal\Tests\Component\ProxyBuilder\TestService');
-    $definition->setLazy(TRUE);
-    $data[] = [$definition, TRUE];
-
-    return $data;
-  }
-
-  public function testGetProxyFactoryCode() {
-    $definition = new Definition('Drupal\Tests\Component\ProxyBuilder\TestService');
-    $definition->setLazy(TRUE);
-
-    $result = $this->proxyDumper->getProxyFactoryCode($definition, 'test_service');
-
-    $expected = <<<'EOS'
-        if ($lazyLoad) {
-            return $this->services['test_service'] = new Drupal_Tests_Component_ProxyBuilder_TestService_Proxy($this, 'test_service');
-        }
-
-EOS;
-
-    $this->assertEquals($expected, $result);
-  }
-
-  /**
-   * @covers ::getProxyCode
-   */
-  public function testGetProxyCode() {
-    $definition = new Definition('Drupal\Tests\Component\ProxyBuilder\TestService');
-    $definition->setLazy(TRUE);
-
-    $class = 'class Drupal_Tests_Component_ProxyBuilder_TestService_Proxy {}';
-    $this->proxyBuilder->expects($this->once())
-      ->method('build')
-      ->with('Drupal\Tests\Component\ProxyBuilder\TestService')
-      ->willReturn($class);
-
-    $result = $this->proxyDumper->getProxyCode($definition);
-    $this->assertEquals($class, $result);
-  }
-
-  /**
-   * @covers ::getProxyCode
-   */
-  public function testGetProxyCodeWithSameClassMultipleTimes() {
-    $definition = new Definition('Drupal\Tests\Component\ProxyBuilder\TestService');
-    $definition->setLazy(TRUE);
-
-    $class = 'class Drupal_Tests_Component_ProxyBuilder_TestService_Proxy {}';
-    $this->proxyBuilder->expects($this->once())
-      ->method('build')
-      ->with('Drupal\Tests\Component\ProxyBuilder\TestService')
-      ->willReturn($class);
-
-    $result = $this->proxyDumper->getProxyCode($definition);
-    $this->assertEquals($class, $result);
-
-    $result = $this->proxyDumper->getProxyCode($definition);
-    $this->assertEquals('', $result);
-  }
-
-}
-
-class TestService {
-
-}
diff --git a/core/tests/Drupal/Tests/Component/Utility/SafeMarkupTest.php b/core/tests/Drupal/Tests/Component/Utility/SafeMarkupTest.php
index 1776e752f..90a475fa4 100644
--- a/core/tests/Drupal/Tests/Component/Utility/SafeMarkupTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/SafeMarkupTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\Tests\Component\Utility;
 
 use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Component\Utility\Xss;
 use Drupal\Tests\UnitTestCase;
 
 /**
@@ -212,6 +213,41 @@ class SafeMarkupTest extends UnitTestCase {
     $this->assertEquals($is_safe, SafeMarkup::isSafe($result));
   }
 
+  /**
+   * Tests the interaction between the safe list and XSS filtering.
+   *
+   * @covers ::xssFilter
+   * @covers ::escape
+   */
+  public function testAdminXss() {
+    // Use the predefined XSS admin tag list. This strips the <marquee> tags.
+    $this->assertEquals('text', SafeMarkup::xssFilter('<marquee>text</marquee>', Xss::getAdminTagList()));
+    $this->assertTrue(SafeMarkup::isSafe('text'), 'The string \'text\' is marked as safe.');
+
+    // This won't strip the <marquee> tags and the string with HTML will be
+    // marked as safe.
+    $filtered = SafeMarkup::xssFilter('<marquee>text</marquee>', array('marquee'));
+    $this->assertEquals('<marquee>text</marquee>', $filtered);
+    $this->assertTrue(SafeMarkup::isSafe('<marquee>text</marquee>'), 'The string \'<marquee>text</marquee>\' is marked as safe.');
+
+    // SafeMarkup::xssFilter() with the default tag list will strip the
+    // <marquee> tag even though the string was marked safe above.
+    $this->assertEquals('text', SafeMarkup::xssFilter('<marquee>text</marquee>'));
+
+    // SafeMarkup::escape() will not escape the markup tag since the string was
+    // marked safe above.
+    $this->assertEquals('<marquee>text</marquee>', SafeMarkup::escape($filtered));
+
+    // SafeMarkup::checkPlain() will escape the markup tag even though the
+    // string was marked safe above.
+    $this->assertEquals('&lt;marquee&gt;text&lt;/marquee&gt;', SafeMarkup::checkPlain($filtered));
+
+    // Ensure that SafeMarkup::xssFilter strips all tags when passed an empty
+    // array and uses the default tag list when not passed a tag list.
+    $this->assertEquals('text', SafeMarkup::xssFilter('<em>text</em>', []));
+    $this->assertEquals('<em>text</em>', SafeMarkup::xssFilter('<em>text</em>'));
+  }
+
   /**
    * Data provider for testReplace().
    *
diff --git a/core/tests/Drupal/Tests/ComposerIntegrationTest.php b/core/tests/Drupal/Tests/ComposerIntegrationTest.php
index fdaef7193..a7900f7ee 100644
--- a/core/tests/Drupal/Tests/ComposerIntegrationTest.php
+++ b/core/tests/Drupal/Tests/ComposerIntegrationTest.php
@@ -48,6 +48,7 @@ class ComposerIntegrationTest extends UnitTestCase {
     return [
       $this->root,
       $this->root . '/core',
+      $this->root . '/core/lib/Drupal/Component/Gettext',
       $this->root . '/core/lib/Drupal/Component/Plugin',
       $this->root . '/core/lib/Drupal/Component/ProxyBuilder',
       $this->root . '/core/lib/Drupal/Component/Utility',
diff --git a/core/tests/Drupal/Tests/Core/Access/AccessResultTest.php b/core/tests/Drupal/Tests/Core/Access/AccessResultTest.php
index 123888aae..881b09660 100644
--- a/core/tests/Drupal/Tests/Core/Access/AccessResultTest.php
+++ b/core/tests/Drupal/Tests/Core/Access/AccessResultTest.php
@@ -12,6 +12,7 @@ use Drupal\Core\Access\AccessResultInterface;
 use Drupal\Core\Access\AccessResultNeutral;
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Cache\CacheableDependencyInterface;
+use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Tests\UnitTestCase;
 
 /**
@@ -20,6 +21,28 @@ use Drupal\Tests\UnitTestCase;
  */
 class AccessResultTest extends UnitTestCase {
 
+  /**
+   * The cache contexts manager.
+   *
+   * @var \Drupal\Core\Cache\Context\CacheContextsManager|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $cacheContextsManager;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->cacheContextsManager = $this->getMockBuilder('Drupal\Core\Cache\Context\CacheContextsManager')
+      ->disableOriginalConstructor()
+      ->getMock();
+
+    $container = new ContainerBuilder();
+    $container->set('cache_contexts_manager', $this->cacheContextsManager);
+    \Drupal::setContainer($container);
+  }
+
   protected function assertDefaultCacheability(AccessResult $access) {
     $this->assertSame([], $access->getCacheContexts());
     $this->assertSame([], $access->getCacheTags());
@@ -382,18 +405,17 @@ class AccessResultTest extends UnitTestCase {
 
   /**
    * @covers ::addCacheTags
-   * @covers ::resetCacheTags
+   * @covers ::addCacheableDependency
    * @covers ::getCacheTags
-   * @covers ::cacheUntilEntityChanges
-   * @covers ::cacheUntilConfigurationChanges
+   * @covers ::resetCacheTags
    */
   public function testCacheTags() {
-    $verify = function (AccessResult $access, array $tags) {
+    $verify = function (AccessResult $access, array $tags, array $contexts = [], $max_age = Cache::PERMANENT) {
       $this->assertFalse($access->isAllowed());
       $this->assertFalse($access->isForbidden());
       $this->assertTrue($access->isNeutral());
-      $this->assertSame(Cache::PERMANENT, $access->getCacheMaxAge());
-      $this->assertSame([], $access->getCacheContexts());
+      $this->assertSame($max_age, $access->getCacheMaxAge());
+      $this->assertSame($contexts, $access->getCacheContexts());
       $this->assertSame($tags, $access->getCacheTags());
     };
 
@@ -420,29 +442,26 @@ class AccessResultTest extends UnitTestCase {
       ->addCacheTags(['bar:baz']);
     $verify($access, ['bar:baz', 'bar:qux', 'foo:bar', 'foo:baz']);
 
-    // ::cacheUntilEntityChanges() convenience method.
+    // ::addCacheableDependency() convenience method.
     $node = $this->getMock('\Drupal\node\NodeInterface');
     $node->expects($this->any())
       ->method('getCacheTags')
       ->will($this->returnValue(array('node:20011988')));
+    $node->expects($this->any())
+      ->method('getCacheMaxAge')
+      ->willReturn(600);
+    $node->expects($this->any())
+      ->method('getCacheContexts')
+      ->willReturn(['user']);
     $tags = array('node:20011988');
     $a = AccessResult::neutral()->addCacheTags($tags);
     $verify($a, $tags);
-    $b = AccessResult::neutral()->cacheUntilEntityChanges($node);
-    $verify($b, $tags);
-    $this->assertEquals($a, $b);
+    $b = AccessResult::neutral()->addCacheableDependency($node);
+    $verify($b, $tags, ['user'], 600);
 
-    // ::cacheUntilConfigurationChanges() convenience method.
-    $configuration = $this->getMock('\Drupal\Core\Config\ConfigBase');
-    $configuration->expects($this->any())
-      ->method('getCacheTags')
-      ->will($this->returnValue(array('config:foo.bar.baz')));
-    $tags = array('config:foo.bar.baz');
-    $a = AccessResult::neutral()->addCacheTags($tags);
-    $verify($a, $tags);
-    $b = AccessResult::neutral()->cacheUntilConfigurationChanges($configuration);
-    $verify($b, $tags);
-    $this->assertEquals($a, $b);
+    $non_cacheable_dependency = new \stdClass();
+    $non_cacheable = AccessResult::neutral()->addCacheableDependency($non_cacheable_dependency);
+    $verify($non_cacheable, [], [], 0);
   }
 
   /**
diff --git a/core/tests/Drupal/Tests/Core/Access/RouteProcessorCsrfTest.php b/core/tests/Drupal/Tests/Core/Access/RouteProcessorCsrfTest.php
index dc7a864e1..a2ab1f1c3 100644
--- a/core/tests/Drupal/Tests/Core/Access/RouteProcessorCsrfTest.php
+++ b/core/tests/Drupal/Tests/Core/Access/RouteProcessorCsrfTest.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\Tests\Core\Access;
 
-use Drupal\Core\Cache\CacheableMetadata;
+use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\Tests\UnitTestCase;
 use Drupal\Core\Access\RouteProcessorCsrf;
 use Symfony\Component\Routing\Route;
@@ -50,71 +50,73 @@ class RouteProcessorCsrfTest extends UnitTestCase {
     $route = new Route('/test-path');
     $parameters = array();
 
-    $cacheable_metadata = new CacheableMetadata();
-    $this->processor->processOutbound('test', $route, $parameters, $cacheable_metadata);
+    $bubbleable_metadata = new BubbleableMetadata();
+    $this->processor->processOutbound('test', $route, $parameters, $bubbleable_metadata);
     // No parameters should be added to the parameters array.
     $this->assertEmpty($parameters);
     // Cacheability of routes without a _csrf_token route requirement is
     // unaffected.
-    $this->assertEquals((new CacheableMetadata()), $cacheable_metadata);
+    $this->assertEquals((new BubbleableMetadata()), $bubbleable_metadata);
   }
 
   /**
    * Tests the processOutbound() method with a _csrf_token route requirement.
    */
   public function testProcessOutbound() {
-    $this->csrfToken->expects($this->once())
-      ->method('get')
-      // The leading '/' will be stripped from the path.
-      ->with('test-path')
-      ->will($this->returnValue('test_token'));
-
     $route = new Route('/test-path', array(), array('_csrf_token' => 'TRUE'));
     $parameters = array();
 
-    $cacheable_metadata = new CacheableMetadata();
-    $this->processor->processOutbound('test', $route, $parameters, $cacheable_metadata);
+    $bubbleable_metadata = new BubbleableMetadata();
+    $this->processor->processOutbound('test', $route, $parameters, $bubbleable_metadata);
     // 'token' should be added to the parameters array.
     $this->assertArrayHasKey('token', $parameters);
-    $this->assertSame($parameters['token'], 'test_token');
-    // Cacheability of routes with a _csrf_token route requirement is max-age=0.
-    $this->assertEquals((new CacheableMetadata())->setCacheMaxAge(0), $cacheable_metadata);
+    // Bubbleable metadata of routes with a _csrf_token route requirement is a
+    // placeholder.
+    $path = 'test-path';
+    $placeholder = hash('sha1', $path);
+    $placeholder_render_array = [
+      '#lazy_builder' => ['route_processor_csrf:renderPlaceholderCsrfToken', [$path]],
+    ];
+    $this->assertSame($parameters['token'], $placeholder);
+    $this->assertEquals((new BubbleableMetadata())->setAttachments(['placeholders' => [$placeholder => $placeholder_render_array]]), $bubbleable_metadata);
   }
 
   /**
    * Tests the processOutbound() method with a dynamic path and one replacement.
    */
   public function testProcessOutboundDynamicOne() {
-    $this->csrfToken->expects($this->once())
-      ->method('get')
-      ->with('test-path/100')
-      ->will($this->returnValue('test_token'));
-
     $route = new Route('/test-path/{slug}', array(), array('_csrf_token' => 'TRUE'));
     $parameters = array('slug' => 100);
 
-    $cacheable_metadata = new CacheableMetadata();
-    $this->processor->processOutbound('test', $route, $parameters, $cacheable_metadata);
-    // Cacheability of routes with a _csrf_token route requirement is max-age=0.
-    $this->assertEquals((new CacheableMetadata())->setCacheMaxAge(0), $cacheable_metadata);
+    $bubbleable_metadata = new BubbleableMetadata();
+    $this->processor->processOutbound('test', $route, $parameters, $bubbleable_metadata);
+    // Bubbleable metadata of routes with a _csrf_token route requirement is a
+    // placeholder.
+    $path = 'test-path/100';
+    $placeholder = hash('sha1', $path);
+    $placeholder_render_array = [
+      '#lazy_builder' => ['route_processor_csrf:renderPlaceholderCsrfToken', [$path]],
+    ];
+    $this->assertEquals((new BubbleableMetadata())->setAttachments(['placeholders' => [$placeholder => $placeholder_render_array]]), $bubbleable_metadata);
   }
 
   /**
    * Tests the processOutbound() method with two parameter replacements.
    */
   public function testProcessOutboundDynamicTwo() {
-    $this->csrfToken->expects($this->once())
-      ->method('get')
-      ->with('100/test-path/test')
-      ->will($this->returnValue('test_token'));
-
     $route = new Route('{slug_1}/test-path/{slug_2}', array(), array('_csrf_token' => 'TRUE'));
     $parameters = array('slug_1' => 100, 'slug_2' => 'test');
 
-    $cacheable_metadata = new CacheableMetadata();
-    $this->processor->processOutbound('test', $route, $parameters, $cacheable_metadata);
-    // Cacheability of routes with a _csrf_token route requirement is max-age=0.
-    $this->assertEquals((new CacheableMetadata())->setCacheMaxAge(0), $cacheable_metadata);
+    $bubbleable_metadata = new BubbleableMetadata();
+    $this->processor->processOutbound('test', $route, $parameters, $bubbleable_metadata);
+    // Bubbleable metadata of routes with a _csrf_token route requirement is a
+    // placeholder.
+    $path = '100/test-path/test';
+    $placeholder = hash('sha1', $path);
+    $placeholder_render_array = [
+      '#lazy_builder' => ['route_processor_csrf:renderPlaceholderCsrfToken', [$path]],
+    ];
+    $this->assertEquals((new BubbleableMetadata())->setAttachments(['placeholders' => [$placeholder => $placeholder_render_array]]), $bubbleable_metadata);
   }
 
 }
diff --git a/core/tests/Drupal/Tests/Core/Asset/CssOptimizerUnitTest.php b/core/tests/Drupal/Tests/Core/Asset/CssOptimizerUnitTest.php
index 3ad398c17..d5513c53b 100644
--- a/core/tests/Drupal/Tests/Core/Asset/CssOptimizerUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/Asset/CssOptimizerUnitTest.php
@@ -71,7 +71,7 @@ class CssOptimizerUnitTest extends UnitTestCase {
       // - Stripped comments and white-space.
       // - Retain white-space in selectors. (https://www.drupal.org/node/472820)
       // - Retain pseudo-selectors. (https://www.drupal.org/node/460448)
-      0 => array(
+      array(
         array(
           'group' => -100,
           'every_page' => TRUE,
@@ -92,7 +92,7 @@ class CssOptimizerUnitTest extends UnitTestCase {
       //   file_create_url(). (https://www.drupal.org/node/1961340)
       // - Imported files that are external (protocol-relative URL or not)
       //   should not be expanded. (https://www.drupal.org/node/2014851)
-      1 => array(
+      array(
         array(
           'group' => -100,
           'every_page' => TRUE,
@@ -108,7 +108,7 @@ class CssOptimizerUnitTest extends UnitTestCase {
       ),
       // File. Tests:
       // - Retain comment hacks.
-      2 => array(
+      array(
         array(
           'group' => -100,
           'every_page' => TRUE,
@@ -126,7 +126,7 @@ class CssOptimizerUnitTest extends UnitTestCase {
       // - CSS import path is properly interpreted.
       //   (https://www.drupal.org/node/1198904)
       // - Don't adjust data URIs (https://www.drupal.org/node/2142441)
-      5 => array(
+      array(
         array(
           'group' => -100,
           'every_page' => TRUE,
@@ -143,7 +143,7 @@ class CssOptimizerUnitTest extends UnitTestCase {
       // File. Tests:
       // - Any @charaset declaration at the beginning of a file should be
       //   removed without breaking subsequent CSS.
-      6 => array(
+      array(
         array(
           'group' => -100,
           'every_page' => TRUE,
@@ -157,7 +157,7 @@ class CssOptimizerUnitTest extends UnitTestCase {
         ),
         file_get_contents($path . 'charset.css.optimized.css'),
       ),
-      7 => array(
+      array(
         array(
           'group' => -100,
           'every_page' => TRUE,
@@ -171,7 +171,7 @@ class CssOptimizerUnitTest extends UnitTestCase {
         ),
         file_get_contents($path . 'charset.css.optimized.css'),
       ),
-      6 => array(
+      array(
         array(
           'group' => -100,
           'every_page' => TRUE,
@@ -185,7 +185,7 @@ class CssOptimizerUnitTest extends UnitTestCase {
         ),
         '.byte-order-mark-test{content:"☃";}'. "\n",
       ),
-      7 => array(
+      array(
         array(
           'group' => -100,
           'every_page' => TRUE,
@@ -199,7 +199,7 @@ class CssOptimizerUnitTest extends UnitTestCase {
         ),
         '.charset-test{content:"€";}' . "\n",
       ),
-      8 => array(
+      array(
         array(
           'group' => -100,
           'every_page' => TRUE,
@@ -213,7 +213,7 @@ class CssOptimizerUnitTest extends UnitTestCase {
         ),
         '.byte-order-mark-charset-test{content:"☃";}' . "\n",
       ),
-      9 => array(
+      array(
         array(
           'group' => -100,
           'every_page' => TRUE,
diff --git a/core/tests/Drupal/Tests/Core/Authentication/AuthenticationCollectorTest.php b/core/tests/Drupal/Tests/Core/Authentication/AuthenticationCollectorTest.php
new file mode 100644
index 000000000..609f4f30f
--- /dev/null
+++ b/core/tests/Drupal/Tests/Core/Authentication/AuthenticationCollectorTest.php
@@ -0,0 +1,95 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\Core\Authentication\AuthenticationCollectorTest.
+ */
+
+namespace Drupal\Tests\Core\Authentication;
+
+use Drupal\Core\Authentication\AuthenticationCollector;
+use Drupal\Core\Authentication\AuthenticationProviderInterface;
+use Drupal\Tests\UnitTestCase;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * @coversDefaultClass \Drupal\Core\Authentication\AuthenticationCollector
+ * @group Authentication
+ */
+class AuthenticationCollectorTest extends UnitTestCase {
+
+  /**
+   * Tests adding, getting, and order of priorities.
+   *
+   * @covers ::addProvider
+   * @covers ::getSortedProviders
+   * @covers ::getProvider
+   * @covers ::isGlobal
+   */
+  public function testAuthenticationCollector() {
+    $providers = [];
+    $global = [];
+    $authentication_collector = new AuthenticationCollector();
+    $priorities = [2, 0, -8, 10, 1, 3, -5, 0, 6, -10, -4];
+    foreach ($priorities as $priority) {
+      $provider_id = $this->randomMachineName();
+      $provider = new TestAuthenticationProvider($provider_id);
+      $providers[$priority][$provider_id] = $provider;
+      $global[$provider_id] = rand(0, 1) > 0.5;
+      $authentication_collector->addProvider($provider, $provider_id, $priority, $global[$provider_id]);
+    }
+    // Sort the $providers array by priority (highest number is lowest priority)
+    // and compare with AuthenticationCollector::getSortedProviders().
+    krsort($providers);
+
+    // Merge nested providers from $providers into $sorted_providers.
+    $sorted_providers = [];
+    foreach ($providers as $providers_priority) {
+      $sorted_providers = array_merge($sorted_providers, $providers_priority);
+    }
+    $this->assertEquals($sorted_providers, $authentication_collector->getSortedProviders());
+
+    // Test AuthenticationCollector::getProvider() and
+    // AuthenticationCollector::isGlobal().
+    foreach ($sorted_providers as $provider) {
+      $this->assertEquals($provider, $authentication_collector->getProvider($provider->providerId));
+      $this->assertEquals($global[$provider->providerId], $authentication_collector->isGlobal($provider->providerId));
+    }
+  }
+
+}
+
+/**
+ * A simple provider for unit testing AuthenticationCollector.
+ */
+class TestAuthenticationProvider implements AuthenticationProviderInterface {
+
+  /**
+   * The provider id.
+   *
+   * @var string
+   */
+  public $providerId;
+
+  /**
+   * Constructor.
+   */
+  public function __construct($provider_id) {
+    $this->providerId = $provider_id;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function applies(Request $request) {
+    return TRUE;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function authenticate(Request $request) {
+    return NULL;
+  }
+
+}
diff --git a/core/tests/Drupal/Tests/Core/Authentication/AuthenticationManagerTest.php b/core/tests/Drupal/Tests/Core/Authentication/AuthenticationManagerTest.php
index da7331d2a..315d5d6b6 100644
--- a/core/tests/Drupal/Tests/Core/Authentication/AuthenticationManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/Authentication/AuthenticationManagerTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\Tests\Core\Authentication;
 
+use Drupal\Core\Authentication\AuthenticationCollector;
 use Drupal\Core\Authentication\AuthenticationManager;
 use Drupal\Core\Authentication\AuthenticationProviderFilterInterface;
 use Drupal\Core\Authentication\AuthenticationProviderInterface;
@@ -28,9 +29,10 @@ class AuthenticationManagerTest extends UnitTestCase {
    * @dataProvider providerTestDefaultFilter
    */
   public function testDefaultFilter($applies, $has_route, $auth_option, $provider_id, $global) {
-    $authentication_manager = new AuthenticationManager();
     $auth_provider = $this->getMock('Drupal\Core\Authentication\AuthenticationProviderInterface');
-    $authentication_manager->addProvider($auth_provider, $provider_id, 0, $global);
+    $auth_collector = new AuthenticationCollector();
+    $auth_collector->addProvider($auth_provider, $provider_id, 0, $global);
+    $authentication_manager = new AuthenticationManager($auth_collector);
 
     $request = new Request();
     if ($has_route) {
@@ -48,14 +50,16 @@ class AuthenticationManagerTest extends UnitTestCase {
    * @covers ::applyFilter
    */
   public function testApplyFilterWithFilterprovider() {
-    $authentication_manager = new AuthenticationManager();
     $auth_provider = $this->getMock('Drupal\Tests\Core\Authentication\TestAuthenticationProviderInterface');
-    $authentication_manager->addProvider($auth_provider, 'filtered', 0);
-
     $auth_provider->expects($this->once())
       ->method('appliesToRoutedRequest')
       ->willReturn(TRUE);
 
+    $authentication_collector = new AuthenticationCollector();
+    $authentication_collector->addProvider($auth_provider, 'filtered', 0);
+
+    $authentication_manager = new AuthenticationManager($authentication_collector);
+
     $request = new Request();
     $this->assertTrue($authentication_manager->appliesToRoutedRequest($request, FALSE));
   }
diff --git a/core/tests/Drupal/Tests/Core/Cache/CacheableMetadataTest.php b/core/tests/Drupal/Tests/Core/Cache/CacheableMetadataTest.php
index f2dbd3e28..05b51aad5 100644
--- a/core/tests/Drupal/Tests/Core/Cache/CacheableMetadataTest.php
+++ b/core/tests/Drupal/Tests/Core/Cache/CacheableMetadataTest.php
@@ -42,6 +42,28 @@ class CacheableMetadataTest extends UnitTestCase {
     $this->assertEquals($expected, $a->merge($b));
   }
 
+  /**
+   * @covers ::addCacheableDependency
+   * @dataProvider providerTestMerge
+   *
+   * This only tests at a high level, because it reuses existing logic. Detailed
+   * tests exist for the existing logic:
+   *
+   * @see \Drupal\Tests\Core\Cache\CacheTest::testMergeTags()
+   * @see \Drupal\Tests\Core\Cache\CacheTest::testMergeMaxAges()
+   * @see \Drupal\Tests\Core\Cache\CacheContextsTest
+   */
+  public function testAddCacheableDependency(CacheableMetadata $a, CacheableMetadata $b, CacheableMetadata $expected) {
+    $cache_contexts_manager = $this->getMockBuilder('Drupal\Core\Cache\Context\CacheContextsManager')
+      ->disableOriginalConstructor()
+      ->getMock();
+    $container = new ContainerBuilder();
+    $container->set('cache_contexts_manager', $cache_contexts_manager);
+    \Drupal::setContainer($container);
+
+    $this->assertEquals($expected, $a->addCacheableDependency($b));
+  }
+
   /**
    * Provides test data for testMerge().
    *
diff --git a/core/tests/Drupal/Tests/Core/Cache/Context/CacheContextsManagerTest.php b/core/tests/Drupal/Tests/Core/Cache/Context/CacheContextsManagerTest.php
index 99a32b330..db8d7b70a 100644
--- a/core/tests/Drupal/Tests/Core/Cache/Context/CacheContextsManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/Cache/Context/CacheContextsManagerTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\Tests\Core\Cache\Context;
 
+use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Cache\Context\CacheContextsManager;
 use Drupal\Core\Cache\Context\CacheContextInterface;
 use Drupal\Core\Cache\Context\CalculatedCacheContextInterface;
@@ -32,10 +33,11 @@ class CacheContextsManagerTest extends UnitTestCase {
     $container->expects($this->any())
       ->method('get')
       ->will($this->returnValueMap([
-        ['a', Container::EXCEPTION_ON_INVALID_REFERENCE, new FooCacheContext()],
-        ['a.b', Container::EXCEPTION_ON_INVALID_REFERENCE, new FooCacheContext()],
-        ['a.b.c', Container::EXCEPTION_ON_INVALID_REFERENCE, new BazCacheContext()],
-        ['x', Container::EXCEPTION_ON_INVALID_REFERENCE, new BazCacheContext()],
+        ['cache_context.a', Container::EXCEPTION_ON_INVALID_REFERENCE, new FooCacheContext()],
+        ['cache_context.a.b', Container::EXCEPTION_ON_INVALID_REFERENCE, new FooCacheContext()],
+        ['cache_context.a.b.c', Container::EXCEPTION_ON_INVALID_REFERENCE, new BazCacheContext()],
+        ['cache_context.x', Container::EXCEPTION_ON_INVALID_REFERENCE, new BazCacheContext()],
+        ['cache_context.a.b.no-optimize', Container::EXCEPTION_ON_INVALID_REFERENCE, new NoOptimizeCacheContext()],
       ]));
     $cache_contexts_manager = new CacheContextsManager($container, $this->getContextsFixture());
 
@@ -74,6 +76,9 @@ class CacheContextsManagerTest extends UnitTestCase {
       [['a', 'a.b.c:foo'], ['a']],
       [['a.b.c:foo', 'a'], ['a']],
       [['a.b.c:foo', 'a.b.c'], ['a.b.c']],
+
+      // max-age 0 is treated as non-optimizable.
+      [['a.b.no-optimize', 'a.b', 'a'], ['a.b.no-optimize', 'a']],
     ];
   }
 
@@ -91,17 +96,17 @@ class CacheContextsManagerTest extends UnitTestCase {
     ]);
 
     $expected = [
-      'baz.cnenzrgreN',
-      'baz.cnenzrgreO',
-      'bar',
+      '[baz:parameterA]=cnenzrgreN',
+      '[baz:parameterB]=cnenzrgreO',
+      '[foo]=bar',
     ];
-    $this->assertEquals($expected, $new_keys);
+    $this->assertEquals($expected, $new_keys->getKeys());
   }
 
   /**
    * @covers ::convertTokensToKeys
    *
-   * @expectedException \InvalidArgumentException
+   * @expectedException \LogicException
    * @expectedExceptionMessage "non-cache-context" is not a valid cache context ID.
    */
   public function testInvalidContext() {
@@ -234,6 +239,13 @@ class FooCacheContext implements CacheContextInterface {
     return 'bar';
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheableMetadata() {
+    return new CacheableMetadata();
+  }
+
 }
 
 /**
@@ -255,7 +267,43 @@ class BazCacheContext implements CalculatedCacheContextInterface {
     if (!is_string($parameter) || strlen($parameter) ===  0) {
       throw new \Exception();
     }
-    return 'baz.' . str_rot13($parameter);
+    return str_rot13($parameter);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheableMetadata($parameter = NULL) {
+    return new CacheableMetadata();
+  }
+
+}
+
+/**
+ * Non-optimizable context class.
+ */
+class NoOptimizeCacheContext implements CacheContextInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function getLabel() {
+    return 'Foo';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getContext() {
+    return 'bar';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheableMetadata() {
+    $cacheable_metadata = new CacheableMetadata();
+    return $cacheable_metadata->setCacheMaxAge(0);
   }
 
 }
diff --git a/core/tests/Drupal/Tests/Core/Config/ConfigTest.php b/core/tests/Drupal/Tests/Core/Config/ConfigTest.php
index a048f9567..7a34a9342 100644
--- a/core/tests/Drupal/Tests/Core/Config/ConfigTest.php
+++ b/core/tests/Drupal/Tests/Core/Config/ConfigTest.php
@@ -413,17 +413,12 @@ class ConfigTest extends UnitTestCase {
       // Name missing namespace (dot).
       array(
         'MissingNamespace',
-        SafeMarkup::format('Missing namespace in Config object name MissingNamespace.', array(
-          '@name' => 'MissingNamespace',
-        )),
+        'Missing namespace in Config object name MissingNamespace.',
       ),
       // Exceeds length (max length plus an extra dot).
       array(
         str_repeat('a', Config::MAX_NAME_LENGTH) . ".",
-        SafeMarkup::format('Config object name @name exceeds maximum allowed length of @length characters.', array(
-          '@name' => str_repeat('a', Config::MAX_NAME_LENGTH) . ".",
-          '@length' => Config::MAX_NAME_LENGTH,
-        )),
+        'Config object name ' . str_repeat('a', Config::MAX_NAME_LENGTH) . '. exceeds maximum allowed length of ' . Config::MAX_NAME_LENGTH . ' characters.',
       ),
     );
     // Name must not contain : ? * < > " ' / \
@@ -431,9 +426,7 @@ class ConfigTest extends UnitTestCase {
       $name = 'name.' . $char;
       $return[] = array(
         $name,
-        SafeMarkup::format('Invalid character in Config object name @name.', array(
-          '@name' => $name,
-        )),
+        "Invalid character in Config object name $name.",
       );
     }
     return $return;
diff --git a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityBaseUnitTest.php b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityBaseUnitTest.php
index b65407745..fa1c006a2 100644
--- a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityBaseUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityBaseUnitTest.php
@@ -376,10 +376,6 @@ class ConfigEntityBaseUnitTest extends UnitTestCase {
    * @depends testSetStatus
    */
   public function testDisable() {
-    $this->cacheTagsInvalidator->expects($this->once())
-      ->method('invalidateTags')
-      ->with(array('config:test_provider.'  . $this->entityTypeId . '.' . $this->id));
-
     $this->entity->setStatus(TRUE);
     $this->assertSame($this->entity, $this->entity->disable());
     $this->assertFalse($this->entity->status());
@@ -444,18 +440,38 @@ class ConfigEntityBaseUnitTest extends UnitTestCase {
           'label' => 'label',
         ),
       )));
-    $entity_a = $this->entity;
-    $entity_a->label = 'foo';
-    $entity_b = clone $this->entity;
-    $entity_b->label = 'bar';
+
+    $entity_a = $this->getMock('\Drupal\Core\Config\Entity\ConfigEntityInterface');
+    $entity_a->expects($this->atLeastOnce())
+      ->method('label')
+      ->willReturn('foo');
+    $entity_b = $this->getMock('\Drupal\Core\Config\Entity\ConfigEntityInterface');
+    $entity_b->expects($this->atLeastOnce())
+      ->method('label')
+      ->willReturn('bar');
+
+    // Test sorting by label.
     $list = array($entity_a, $entity_b);
     // Suppress errors because of https://bugs.php.net/bug.php?id=50688.
     @usort($list, '\Drupal\Core\Config\Entity\ConfigEntityBase::sort');
     $this->assertSame($entity_b, $list[0]);
+
+    $list = array($entity_b, $entity_a);
+    // Suppress errors because of https://bugs.php.net/bug.php?id=50688.
+    @usort($list, '\Drupal\Core\Config\Entity\ConfigEntityBase::sort');
+    $this->assertSame($entity_b, $list[0]);
+
+    // Test sorting by weight.
     $entity_a->weight = 0;
     $entity_b->weight = 1;
+    $list = array($entity_b, $entity_a);
     // Suppress errors because of https://bugs.php.net/bug.php?id=50688.
-    @usort($list, array($entity_a, 'sort'));
+    @usort($list, '\Drupal\Core\Config\Entity\ConfigEntityBase::sort');
+    $this->assertSame($entity_a, $list[0]);
+
+    $list = array($entity_a, $entity_b);
+    // Suppress errors because of https://bugs.php.net/bug.php?id=50688.
+    @usort($list, '\Drupal\Core\Config\Entity\ConfigEntityBase::sort');
     $this->assertSame($entity_a, $list[0]);
   }
 
diff --git a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php
index c4413eb91..508f39b43 100644
--- a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php
+++ b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\Tests\Core\Config\Entity {
 
+use Drupal\Core\Cache\Cache;
 use Drupal\Core\Config\Entity\ConfigEntityInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Language\Language;
@@ -103,6 +104,13 @@ class ConfigEntityStorageTest extends UnitTestCase {
    */
   protected $configManager;
 
+  /**
+   * The cache contexts manager.
+   *
+   * @var \Drupal\Core\Cache\Context\CacheContextsManager|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $cacheContextsManager;
+
   /**
    * {@inheritdoc}
    *
@@ -170,12 +178,17 @@ class ConfigEntityStorageTest extends UnitTestCase {
 
     $this->configManager = $this->getMock('Drupal\Core\Config\ConfigManagerInterface');
 
+    $this->cacheContextsManager = $this->getMockBuilder('Drupal\Core\Cache\Context\CacheContextsManager')
+      ->disableOriginalConstructor()
+      ->getMock();
+
     $container = new ContainerBuilder();
     $container->set('entity.manager', $this->entityManager);
     $container->set('config.typed', $this->typedConfigManager);
     $container->set('cache_tags.invalidator', $this->cacheTagsInvalidator);
     $container->set('config.manager', $this->configManager);
     $container->set('language_manager', $this->languageManager);
+    $container->set('cache_contexts_manager', $this->cacheContextsManager);
     \Drupal::setContainer($container);
 
   }
@@ -611,6 +624,18 @@ class ConfigEntityStorageTest extends UnitTestCase {
         array('', array('id' => 'foo')),
         array('id', 'foo'),
       )));
+    $config_object->expects($this->exactly(1))
+      ->method('getCacheContexts')
+      ->willReturn([]);
+    $config_object->expects($this->exactly(1))
+      ->method('getCacheTags')
+      ->willReturn(['config:foo']);
+    $config_object->expects($this->exactly(1))
+      ->method('getCacheMaxAge')
+      ->willReturn(Cache::PERMANENT);
+    $config_object->expects($this->exactly(1))
+      ->method('getName')
+      ->willReturn('foo');
 
     $this->cacheTagsInvalidator->expects($this->never())
       ->method('invalidateTags');
@@ -664,6 +689,18 @@ class ConfigEntityStorageTest extends UnitTestCase {
         array('', array('id' => 'foo')),
         array('id', 'foo'),
       )));
+    $config_object->expects($this->exactly(1))
+      ->method('getCacheContexts')
+      ->willReturn([]);
+    $config_object->expects($this->exactly(1))
+      ->method('getCacheTags')
+      ->willReturn(['config:foo']);
+    $config_object->expects($this->exactly(1))
+      ->method('getCacheMaxAge')
+      ->willReturn(Cache::PERMANENT);
+    $config_object->expects($this->exactly(1))
+      ->method('getName')
+      ->willReturn('foo');
 
     $this->configFactory->expects($this->once())
       ->method('loadMultiple')
@@ -694,6 +731,19 @@ class ConfigEntityStorageTest extends UnitTestCase {
         array('', array('id' => 'foo')),
         array('id', 'foo'),
       )));
+    $foo_config_object->expects($this->exactly(1))
+      ->method('getCacheContexts')
+      ->willReturn([]);
+    $foo_config_object->expects($this->exactly(1))
+      ->method('getCacheTags')
+      ->willReturn(['config:foo']);
+    $foo_config_object->expects($this->exactly(1))
+      ->method('getCacheMaxAge')
+      ->willReturn(Cache::PERMANENT);
+    $foo_config_object->expects($this->exactly(1))
+      ->method('getName')
+      ->willReturn('foo');
+
     $bar_config_object = $this->getMockBuilder('Drupal\Core\Config\Config')
       ->disableOriginalConstructor()
       ->getMock();
@@ -703,6 +753,18 @@ class ConfigEntityStorageTest extends UnitTestCase {
         array('', array('id' => 'bar')),
         array('id', 'bar'),
       )));
+    $bar_config_object->expects($this->exactly(1))
+      ->method('getCacheContexts')
+      ->willReturn([]);
+    $bar_config_object->expects($this->exactly(1))
+      ->method('getCacheTags')
+      ->willReturn(['config:bar']);
+    $bar_config_object->expects($this->exactly(1))
+      ->method('getCacheMaxAge')
+      ->willReturn(Cache::PERMANENT);
+    $bar_config_object->expects($this->exactly(1))
+      ->method('getName')
+      ->willReturn('foo');
 
     $this->configFactory->expects($this->once())
       ->method('listAll')
@@ -742,6 +804,18 @@ class ConfigEntityStorageTest extends UnitTestCase {
         array('', array('id' => 'foo')),
         array('id', 'foo'),
       )));
+    $config_object->expects($this->exactly(1))
+      ->method('getCacheContexts')
+      ->willReturn([]);
+    $config_object->expects($this->exactly(1))
+      ->method('getCacheTags')
+      ->willReturn(['config:foo']);
+    $config_object->expects($this->exactly(1))
+      ->method('getCacheMaxAge')
+      ->willReturn(Cache::PERMANENT);
+    $config_object->expects($this->exactly(1))
+      ->method('getName')
+      ->willReturn('foo');
 
     $this->configFactory->expects($this->once())
       ->method('loadMultiple')
diff --git a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityTypeTest.php b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityTypeTest.php
index 524fea0e9..97bf172c7 100644
--- a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityTypeTest.php
+++ b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityTypeTest.php
@@ -9,7 +9,6 @@ namespace Drupal\Tests\Core\Config\Entity;
 
 use Drupal\Tests\UnitTestCase;
 use Drupal\Core\Config\Entity\ConfigEntityType;
-use Drupal\Component\Utility\SafeMarkup;
 
 /**
  * @coversDefaultClass \Drupal\Core\Config\Entity\ConfigEntityType
@@ -41,8 +40,6 @@ class ConfigEntityTypeTest extends UnitTestCase {
    * @covers ::getConfigPrefix
    */
   public function testConfigPrefixLengthExceeds() {
-    $message_text = 'The configuration file name prefix @config_prefix exceeds the maximum character limit of @max_char.';
-
     // A provider length of 24 and config_prefix length of 59 (+1 for the .)
     // results in a config length of 84, which is too long.
     $definition = array(
@@ -50,10 +47,10 @@ class ConfigEntityTypeTest extends UnitTestCase {
       'config_prefix' => $this->randomMachineName(59),
     );
     $config_entity = $this->setUpConfigEntityType($definition);
-    $this->setExpectedException('\Drupal\Core\Config\ConfigPrefixLengthException', SafeMarkup::format($message_text, array(
-      '@config_prefix' => $definition['provider'] . '.' . $definition['config_prefix'],
-      '@max_char' => ConfigEntityType::PREFIX_LENGTH,
-    )));
+    $this->setExpectedException(
+      '\Drupal\Core\Config\ConfigPrefixLengthException',
+      "The configuration file name prefix {$definition['provider']}.{$definition['config_prefix']} exceeds the maximum character limit of " . ConfigEntityType::PREFIX_LENGTH
+    );
     $this->assertEmpty($config_entity->getConfigPrefix());
   }
 
diff --git a/core/tests/Drupal/Tests/Core/ContentNegotiationTest.php b/core/tests/Drupal/Tests/Core/ContentNegotiationTest.php
index 9c54eae2b..b5f9d3f72 100644
--- a/core/tests/Drupal/Tests/Core/ContentNegotiationTest.php
+++ b/core/tests/Drupal/Tests/Core/ContentNegotiationTest.php
@@ -73,7 +73,7 @@ class ContentNegotiationTest extends UnitTestCase {
     $request = new Request();
     $request->headers->set('X-Requested-With', 'XMLHttpRequest');
 
-    $this->assertSame('ajax', $this->contentNegotiation->getContentType($request));
+    $this->assertSame('html', $this->contentNegotiation->getContentType($request));
   }
 
 }
diff --git a/core/tests/Drupal/Tests/Core/Datetime/DateTest.php b/core/tests/Drupal/Tests/Core/Datetime/DateTest.php
index 9cc04e5cd..ba2c7c8d7 100644
--- a/core/tests/Drupal/Tests/Core/Datetime/DateTest.php
+++ b/core/tests/Drupal/Tests/Core/Datetime/DateTest.php
@@ -131,7 +131,7 @@ class DateTest extends UnitTestCase {
       array(121, 2, '2 min 1 sec'),
       // Check for hours with minutes and seconds.
       array(3601, 1, '1 hour'),
-      array(3601, 2, '1 hour 1 sec'),
+      array(3601, 2, '1 hour'),
       // Check for higher units.
       array(86401, 1, '1 day'),
       array(604800, 1, '1 week'),
@@ -310,8 +310,8 @@ class DateTest extends UnitTestCase {
       // Checks for hours and possibly minutes or seconds.
       array('1 hour', $this->createTimestamp('2013-12-11 09:09:08'), $request_time),
       array('1 hour', $this->createTimestamp('2013-12-11 09:09:08'), $request_time),
-      array('1 hour 1 second', $this->createTimestamp('2013-12-11 09:09:07'), $request_time),
-      array('1 hour 2 seconds', $this->createTimestamp('2013-12-11 09:09:06'), $request_time),
+      array('1 hour', $this->createTimestamp('2013-12-11 09:09:07'), $request_time),
+      array('1 hour', $this->createTimestamp('2013-12-11 09:09:06'), $request_time),
       array('1 hour 1 minute', $this->createTimestamp('2013-12-11 09:08:08'), $request_time),
       array('1 hour 1 minute 1 second', $this->createTimestamp('2013-12-11 09:08:07'), $request_time, $granularity_3),
       array('1 hour 1 minute 2 seconds', $this->createTimestamp('2013-12-11 09:08:06'), $request_time, $granularity_4),
@@ -321,13 +321,13 @@ class DateTest extends UnitTestCase {
 
       // Checks for days and possibly hours, minutes or seconds.
       array('1 day', $this->createTimestamp('2013-12-10 10:09:08'), $request_time),
-      array('1 day 1 second', $this->createTimestamp('2013-12-10 10:09:07'), $request_time),
+      array('1 day', $this->createTimestamp('2013-12-10 10:09:07'), $request_time),
       array('1 day 1 hour', $this->createTimestamp('2013-12-10 09:09:08'), $request_time),
       array('1 day 1 hour 1 minute', $this->createTimestamp('2013-12-10 09:08:07'), $request_time, $granularity_3 + $langcode_en),
       array('1 day 1 hour 1 minute 1 second', $this->createTimestamp('2013-12-10 09:08:07'), $request_time, $granularity_4 + $langcode_lolspeak),
       array('1 day 2 hours 2 minutes 2 seconds', $this->createTimestamp('2013-12-10 08:07:06'), $request_time, $granularity_4),
       array('2 days', $this->createTimestamp('2013-12-09 10:09:08'), $request_time),
-      array('2 days 2 minutes', $this->createTimestamp('2013-12-09 10:07:08'), $request_time),
+      array('2 days', $this->createTimestamp('2013-12-09 10:07:08'), $request_time),
       array('2 days 2 hours', $this->createTimestamp('2013-12-09 08:09:08'), $request_time),
       array('2 days 2 hours 2 minutes', $this->createTimestamp('2013-12-09 08:07:06'), $request_time, $granularity_3 + $langcode_en),
       array('2 days 2 hours 2 minutes 2 seconds', $this->createTimestamp('2013-12-09 08:07:06'), $request_time, $granularity_4 + $langcode_lolspeak),
@@ -343,33 +343,33 @@ class DateTest extends UnitTestCase {
 
       // Checks for months and possibly days, hours, minutes or seconds.
       array('1 month', $this->createTimestamp('2013-11-11 10:09:08'), $request_time),
-      array('1 month 1 second', $this->createTimestamp('2013-11-11 10:09:07'), $request_time),
-      array('1 month 1 hour', $this->createTimestamp('2013-11-11 09:09:08'), $request_time),
-      array('1 month 1 hour 1 minute', $this->createTimestamp('2013-11-11 09:08:07'), $request_time, $granularity_3),
-      array('1 month 1 hour 1 minute 1 second', $this->createTimestamp('2013-11-11 09:08:07'), $request_time, $granularity_4),
+      array('1 month', $this->createTimestamp('2013-11-11 10:09:07'), $request_time),
+      array('1 month', $this->createTimestamp('2013-11-11 09:09:08'), $request_time),
+      array('1 month', $this->createTimestamp('2013-11-11 09:08:07'), $request_time, $granularity_3),
+      array('1 month', $this->createTimestamp('2013-11-11 09:08:07'), $request_time, $granularity_4),
       array('1 month 4 weeks', $this->createTimestamp('2013-10-13 10:09:08'), $request_time),
       array('1 month 4 weeks 1 day', $this->createTimestamp('2013-10-13 10:09:08'), $request_time, $granularity_3),
       array('1 month 4 weeks', $this->createTimestamp('2013-10-12 10:09:08'), $request_time),
       array('1 month 4 weeks 2 days', $this->createTimestamp('2013-10-12 10:09:08'), $request_time, $granularity_3),
       array('2 months', $this->createTimestamp('2013-10-11 10:09:08'), $request_time),
-      array('2 months 1 day', $this->createTimestamp('2013-10-10 10:09:08'), $request_time),
-      array('2 months 2 days', $this->createTimestamp('2013-10-09 08:07:06'), $request_time),
-      array('2 months 2 days 2 hours', $this->createTimestamp('2013-10-09 08:07:06'), $request_time, $granularity_3),
-      array('2 months 2 days 2 hours 2 minutes', $this->createTimestamp('2013-10-09 08:07:06'), $request_time, $granularity_4),
-      array('6 months 2 days', $this->createTimestamp('2013-06-09 10:09:08'), $request_time),
-      array('11 months 3 hours', $this->createTimestamp('2013-01-11 07:09:08'), $request_time),
+      array('2 months', $this->createTimestamp('2013-10-10 10:09:08'), $request_time),
+      array('2 months', $this->createTimestamp('2013-10-09 08:07:06'), $request_time),
+      array('2 months', $this->createTimestamp('2013-10-09 08:07:06'), $request_time, $granularity_3),
+      array('2 months', $this->createTimestamp('2013-10-09 08:07:06'), $request_time, $granularity_4),
+      array('6 months', $this->createTimestamp('2013-06-09 10:09:08'), $request_time),
+      array('11 months', $this->createTimestamp('2013-01-11 07:09:08'), $request_time),
       array('11 months 4 weeks', $this->createTimestamp('2012-12-12 10:09:08'), $request_time),
       array('11 months 4 weeks 2 days', $this->createTimestamp('2012-12-12 10:09:08'), $request_time, $granularity_3),
 
       // Checks for years and possibly months, days, hours, minutes or seconds.
       array('1 year', $this->createTimestamp('2012-12-11 10:09:08'), $request_time),
-      array('1 year 1 minute', $this->createTimestamp('2012-12-11 10:08:08'), $request_time),
-      array('1 year 1 day', $this->createTimestamp('2012-12-10 10:09:08'), $request_time),
+      array('1 year', $this->createTimestamp('2012-12-11 10:08:08'), $request_time),
+      array('1 year', $this->createTimestamp('2012-12-10 10:09:08'), $request_time),
       array('2 years', $this->createTimestamp('2011-12-11 10:09:08'), $request_time),
-      array('2 years 2 minutes', $this->createTimestamp('2011-12-11 10:07:08'), $request_time),
-      array('2 years 2 days', $this->createTimestamp('2011-12-09 10:09:08'), $request_time),
-      array('2 years 2 months 2 days', $this->createTimestamp('2011-10-09 08:07:06'), $request_time, $granularity_3),
-      array('2 years 2 months 2 days 2 hours', $this->createTimestamp('2011-10-09 08:07:06'), $request_time, $granularity_4),
+      array('2 years', $this->createTimestamp('2011-12-11 10:07:08'), $request_time),
+      array('2 years', $this->createTimestamp('2011-12-09 10:09:08'), $request_time),
+      array('2 years 2 months', $this->createTimestamp('2011-10-09 08:07:06'), $request_time, $granularity_3),
+      array('2 years 2 months', $this->createTimestamp('2011-10-09 08:07:06'), $request_time, $granularity_4),
       array('10 years', $this->createTimestamp('2003-12-11 10:09:08'), $request_time),
       array('100 years', $this->createTimestamp('1913-12-11 10:09:08'), $request_time),
 
diff --git a/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/BackendCompilerPassTest.php b/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/BackendCompilerPassTest.php
index 6f726c136..ae11ee562 100644
--- a/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/BackendCompilerPassTest.php
+++ b/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/BackendCompilerPassTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\Tests\Core\DependencyInjection\Compiler;
 
+use Drupal\Core\Database\Driver\sqlite\Connection;
 use Drupal\Core\DependencyInjection\Compiler\BackendCompilerPass;
 use Drupal\Tests\UnitTestCase;
 use Symfony\Component\DependencyInjection\Alias;
@@ -48,7 +49,7 @@ class BackendCompilerPassTest extends UnitTestCase {
   public function testProcess($expected_class, ContainerBuilder $container) {
     $this->backendPass->process($container);
 
-    $this->assertInstanceOf($expected_class, $container->get('service'));
+    $this->assertEquals($expected_class, get_class($container->get('service')));
   }
 
   /**
@@ -59,28 +60,70 @@ class BackendCompilerPassTest extends UnitTestCase {
   public function providerTestProcess() {
     $data = array();
     // Add a container with no set default_backend.
-    $container = new ContainerBuilder();
-    $prefix = '\\' . __NAMESPACE__ . '\\';
-    $container->setDefinition('service', (new Definition($prefix . 'ServiceClassDefault'))->addTag('backend_overridable'));
-    $container->setDefinition('mysql.service', new Definition($prefix . 'ServiceClassMysql'));
+    $prefix = __NAMESPACE__ . '\\ServiceClass';
+    $service = (new Definition($prefix . 'Default'))->addTag('backend_overridable');
+    $container = $this->getMysqlContainer($service);
 
-    $data[] = array($prefix . 'ServiceClassDefault', $container);
+    $data[] = array($prefix . 'Default', $container);
 
     // Set the default_backend so the mysql service should be used.
-    $container = clone $container;
+    $container = $this->getMysqlContainer($service);
     $container->setParameter('default_backend', 'mysql');
-    $data[] = array($prefix . 'ServiceClassMysql', $container);
+    $data[] = array($prefix . 'Mysql', $container);
 
     // Configure a manual alias for the service, so ensure that it is not
     // overridden by the default backend.
     $container = clone $container;
-    $container->setDefinition('mariadb.service', new Definition($prefix . 'ServiceClassMariaDb'));
+    $container->setDefinition('mariadb.service', new Definition($prefix . 'MariaDb'));
     $container->setAlias('service', new Alias('mariadb.service'));
-    $data[] = array($prefix . 'ServiceClassMariaDb', $container);
+    $data[] = array($prefix . 'MariaDb', $container);
+
+    // Check the database driver is the default.
+    $container = $this->getSqliteContainer($service);
+    $data[] = array($prefix . 'Sqlite', $container);
+
+    // Test the opt out.
+    $container = $this->getSqliteContainer($service);
+    $container->setParameter('default_backend', '');
+    $data[] = array($prefix . 'Default', $container);
 
     return $data;
   }
 
+  /**
+   * Creates a container with a sqlite database service in it.
+   *
+   * This is necessary because the container clone does not clone the parameter
+   * bag so the setParameter() call effects the parent container as well.
+   *
+   * @param $service
+   * @return ContainerBuilder
+   */
+  protected function getSqliteContainer($service) {
+    $container = new ContainerBuilder();
+    $container->setDefinition('service', $service);
+    $container->setDefinition('sqlite.service', new Definition(__NAMESPACE__ . '\\ServiceClassSqlite'));
+    $mock = $this->getMockBuilder('Drupal\Core\Database\Driver\sqlite\Connection')->setMethods(NULL)->disableOriginalConstructor()->getMock();
+    $container->set('database', $mock);
+    return $container;
+  }
+
+  /**
+   * Creates a container with a mysql database service definition in it.
+   *
+   * This is necessary because the container clone does not clone the parameter
+   * bag so the setParameter() call effects the parent container as well.
+   *
+   * @param $service
+   * @return ContainerBuilder
+   */
+  protected function getMysqlContainer($service) {
+    $container = new ContainerBuilder();
+    $container->setDefinition('service', $service);
+    $container->setDefinition('mysql.service', new Definition(__NAMESPACE__ . '\\ServiceClassMysql'));
+    return $container;
+  }
+
 }
 
 class ServiceClassDefault {
@@ -91,3 +134,6 @@ class ServiceClassMysql extends ServiceClassDefault {
 
 class ServiceClassMariaDb extends ServiceClassMysql {
 }
+
+class ServiceClassSqlite extends ServiceClassDefault {
+}
diff --git a/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/ProxyServicesPassTest.php b/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/ProxyServicesPassTest.php
new file mode 100644
index 000000000..2567513ce
--- /dev/null
+++ b/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/ProxyServicesPassTest.php
@@ -0,0 +1,85 @@
+<?php
+
+/**
+ * @file
+ * Contains
+ *   \Drupal\Tests\Core\DependencyInjection\Compiler\ProxyServicesPassTest.
+ */
+
+namespace Drupal\Tests\Core\DependencyInjection\Compiler;
+
+use Drupal\Core\DependencyInjection\Compiler\ProxyServicesPass;
+use Drupal\Core\DependencyInjection\ContainerBuilder;
+use Drupal\Tests\UnitTestCase;
+use Symfony\Component\DependencyInjection\Reference;
+
+/**
+ * @coversDefaultClass \Drupal\Core\DependencyInjection\Compiler\ProxyServicesPass
+ * @group DependencyInjection
+ */
+class ProxyServicesPassTest extends UnitTestCase {
+
+  /**
+   * The tested proxy services pass.
+   *
+   * @var \Drupal\Core\DependencyInjection\Compiler\ProxyServicesPass
+   */
+  protected $proxyServicesPass;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->proxyServicesPass = new ProxyServicesPass();
+  }
+
+
+  /**
+   * @covers ::process
+   */
+  public function testContainerWithoutLazyServices() {
+    $container = new ContainerBuilder();
+    $container->register('plugin_cache_clearer', 'Drupal\Core\Plugin\CachedDiscoveryClearer');
+
+    $this->proxyServicesPass->process($container);
+
+    $this->assertCount(1, $container->getDefinitions());
+    $this->assertEquals('Drupal\Core\Plugin\CachedDiscoveryClearer', $container->getDefinition('plugin_cache_clearer')->getClass());
+  }
+
+  /**
+   * @covers ::process
+   */
+  public function testContainerWithLazyServices() {
+    $container = new ContainerBuilder();
+    $container->register('plugin_cache_clearer', 'Drupal\Core\Plugin\CachedDiscoveryClearer')
+      ->setLazy(TRUE);
+
+    $this->proxyServicesPass->process($container);
+
+    $this->assertCount(2, $container->getDefinitions());
+
+    $non_proxy_definition = $container->getDefinition('drupal.proxy_original_service.plugin_cache_clearer');
+    $this->assertEquals('Drupal\Core\Plugin\CachedDiscoveryClearer', $non_proxy_definition->getClass());
+    $this->assertFalse($non_proxy_definition->isLazy());
+    $this->assertTrue($non_proxy_definition->isPublic());
+
+    $this->assertEquals('Drupal\Core\ProxyClass\Plugin\CachedDiscoveryClearer', $container->getDefinition('plugin_cache_clearer')->getClass());
+  }
+
+  /**
+   * @covers ::process
+   *
+   * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
+   */
+  public function testContainerWithLazyServicesWithoutProxyClass() {
+    $container = new ContainerBuilder();
+    $container->register('alias_whitelist', 'Drupal\Core\Path\AliasWhitelist')
+      ->setLazy(TRUE);
+
+    $this->proxyServicesPass->process($container);
+  }
+
+}
diff --git a/core/tests/Drupal/Tests/Core/Entity/ContentEntityBaseUnitTest.php b/core/tests/Drupal/Tests/Core/Entity/ContentEntityBaseUnitTest.php
index b3bd6bd78..f00ecfa40 100644
--- a/core/tests/Drupal/Tests/Core/Entity/ContentEntityBaseUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/ContentEntityBaseUnitTest.php
@@ -9,6 +9,7 @@ namespace Drupal\Tests\Core\Entity;
 
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
+use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\Core\Field\BaseFieldDefinition;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\Tests\UnitTestCase;
@@ -349,6 +350,64 @@ class ContentEntityBaseUnitTest extends UnitTestCase {
     $this->assertSame(1, count($this->entity->validate()));
   }
 
+  /**
+   * Tests required validation.
+   *
+   * @covers ::validate
+   * @covers ::isValidationRequired
+   * @covers ::setValidationRequired
+   * @covers ::save
+   * @covers ::preSave
+   *
+   * @expectedException \LogicException
+   * @expectedExceptionMessage Entity validation was skipped.
+   */
+  public function testRequiredValidation() {
+    $validator = $this->getMock('\Symfony\Component\Validator\ValidatorInterface');
+    /** @var \Symfony\Component\Validator\ConstraintViolationList|\PHPUnit_Framework_MockObject_MockObject $empty_violation_list */
+    $empty_violation_list = $this->getMockBuilder('\Symfony\Component\Validator\ConstraintViolationList')
+      ->setMethods(NULL)
+      ->getMock();
+    $validator->expects($this->at(0))
+      ->method('validate')
+      ->with($this->entity->getTypedData())
+      ->will($this->returnValue($empty_violation_list));
+    $this->typedDataManager->expects($this->any())
+      ->method('getValidator')
+      ->will($this->returnValue($validator));
+
+    /** @var \Drupal\Core\Entity\EntityStorageInterface|\PHPUnit_Framework_MockObject_MockObject $storage */
+    $storage = $this->getMock('\Drupal\Core\Entity\EntityStorageInterface');
+    $storage->expects($this->any())
+      ->method('save')
+      ->willReturnCallback(function (ContentEntityInterface $entity) use ($storage) {
+        $entity->preSave($storage);
+      });
+
+    $this->entityManager->expects($this->any())
+      ->method('getStorage')
+      ->with($this->entityTypeId)
+      ->will($this->returnValue($storage));
+
+    // Check that entities can be saved normally when validation is not
+    // required.
+    $this->assertFalse($this->entity->isValidationRequired());
+    $this->entity->save();
+
+    // Make validation required and check that if the entity is validated, it
+    // can be saved normally.
+    $this->entity->setValidationRequired(TRUE);
+    $this->assertTrue($this->entity->isValidationRequired());
+    $this->entity->validate();
+    $this->entity->save();
+
+    // Check that the "validated" status is reset after saving the entity and
+    // that trying to save a non-validated entity when validation is required
+    // results in an exception.
+    $this->assertTrue($this->entity->isValidationRequired());
+    $this->entity->save();
+  }
+
   /**
    * @covers ::bundle
    */
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityManagerTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityManagerTest.php
index 11b7ceda7..a7f1c5eb8 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityManagerTest.php
@@ -265,6 +265,25 @@ class EntityManagerTest extends UnitTestCase {
     $this->entityManager->clearCachedDefinitions();
   }
 
+  /**
+   * Tests the processDefinition() method.
+   *
+   * @covers ::processDefinition
+   *
+   * @expectedException \Drupal\Core\Entity\Exception\InvalidLinkTemplateException
+   * @expectedExceptionMessage Link template 'canonical' for entity type 'apple' must start with a leading slash, the current link template is 'path/to/apple'
+   */
+  public function testProcessDefinition() {
+    $apple = $this->getMock('Drupal\Core\Entity\EntityTypeInterface');
+    $apple->expects($this->once())
+      ->method('getLinkTemplates')
+      ->willReturn(['canonical' => 'path/to/apple']);
+
+    $this->setUpEntityManager(array('apple' => $apple));
+
+    $this->entityManager->processDefinition($apple, 'apple');
+  }
+
   /**
    * Tests the getDefinition() method.
    *
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityUnitTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityUnitTest.php
index a9fe86044..929ff004c 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityUnitTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\Tests\Core\Entity;
 
 use Drupal\Core\Access\AccessResult;
+use Drupal\Core\Cache\Cache;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\Entity\Entity;
 use Drupal\Core\Entity\Exception\NoCorrespondingEntityClassException;
@@ -486,4 +487,62 @@ class EntityUnitTest extends UnitTestCase {
   public function testReferencedEntities() {
     $this->assertSame(array(), $this->entity->referencedEntities());
   }
+
+  /**
+   * @covers ::getCacheTags
+   * @covers ::getCacheTagsToInvalidate
+   * @covers ::addCacheTags
+   */
+  public function testCacheTags() {
+    // Ensure that both methods return the same by default.
+    $this->assertEquals([$this->entityTypeId . ':' . 1], $this->entity->getCacheTags());
+    $this->assertEquals([$this->entityTypeId . ':' . 1], $this->entity->getCacheTagsToInvalidate());
+
+    // Add an additional cache tag and make sure only getCacheTags() returns
+    // that.
+    $this->entity->addCacheTags(['additional_cache_tag']);
+
+    // EntityTypeId is random so it can shift order. We need to duplicate the
+    // sort from \Drupal\Core\Cache\Cache::mergeTags().
+    $tags = ['additional_cache_tag', $this->entityTypeId . ':' . 1];
+    sort($tags);
+    $this->assertEquals($tags, $this->entity->getCacheTags());
+    $this->assertEquals([$this->entityTypeId . ':' . 1], $this->entity->getCacheTagsToInvalidate());
+  }
+
+  /**
+   * @covers ::getCacheContexts
+   * @covers ::addCacheContexts
+   */
+  public function testCacheContexts() {
+    $cache_contexts_manager = $this->getMockBuilder('Drupal\Core\Cache\Context\CacheContextsManager')
+      ->disableOriginalConstructor()
+      ->getMock();
+    $container = new ContainerBuilder();
+    $container->set('cache_contexts_manager', $cache_contexts_manager);
+    \Drupal::setContainer($container);
+
+    // There are no cache contexts by default.
+    $this->assertEquals([], $this->entity->getCacheContexts());
+
+    // Add an additional cache context.
+    $this->entity->addCacheContexts(['user']);
+    $this->assertEquals(['user'], $this->entity->getCacheContexts());
+  }
+
+  /**
+   * @covers ::getCacheMaxAge
+   * @covers ::mergeCacheMaxAge
+   */
+  public function testCacheMaxAge() {
+    // Cache max age is permanent by default.
+    $this->assertEquals(Cache::PERMANENT, $this->entity->getCacheMaxAge());
+
+    // Set two cache max ages, the lower value is the one that needs to be
+    // returned.
+    $this->entity->mergeCacheMaxAge(600);
+    $this->entity->mergeCacheMaxAge(1800);
+    $this->assertEquals(600, $this->entity->getCacheMaxAge());
+  }
+
 }
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityUrlTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityUrlTest.php
index 8b9852c54..022a232d6 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityUrlTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityUrlTest.php
@@ -110,7 +110,7 @@ class EntityUrlTest extends UnitTestCase {
    * @covers ::urlInfo
    *
    * @expectedException \Drupal\Core\Entity\Exception\UndefinedLinkTemplateException
-   * @expectedExceptionMessage No link template "canonical" found for the "test_entity_type" entity type
+   * @expectedExceptionMessage No link template 'canonical' found for the 'test_entity_type' entity type
    *
    * @dataProvider providerTestUrlInfoForInvalidLinkTemplate
    */
diff --git a/core/tests/Drupal/Tests/Core/Entity/KeyValueStore/KeyValueEntityStorageTest.php b/core/tests/Drupal/Tests/Core/Entity/KeyValueStore/KeyValueEntityStorageTest.php
index 02662290f..2727cd152 100644
--- a/core/tests/Drupal/Tests/Core/Entity/KeyValueStore/KeyValueEntityStorageTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/KeyValueStore/KeyValueEntityStorageTest.php
@@ -466,7 +466,7 @@ class KeyValueEntityStorageTest extends UnitTestCase {
    * @covers ::doSave
    *
    * @expectedException \Drupal\Core\Entity\EntityStorageException
-   * @expectedExceptionMessage test_entity_type entity with ID foo already exists
+   * @expectedExceptionMessage 'test_entity_type' entity with ID 'foo' already exists
    */
   public function testSaveDuplicate() {
     $this->setUpKeyValueEntityStorage();
diff --git a/core/tests/Drupal/Tests/Core/Entity/Sql/DefaultTableMappingTest.php b/core/tests/Drupal/Tests/Core/Entity/Sql/DefaultTableMappingTest.php
index 15b6ba000..330695ec6 100644
--- a/core/tests/Drupal/Tests/Core/Entity/Sql/DefaultTableMappingTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/Sql/DefaultTableMappingTest.php
@@ -291,7 +291,7 @@ class DefaultTableMappingTest extends UnitTestCase {
    *   The name of the column to be processed.
    *
    * @expectedException \Drupal\Core\Entity\Sql\SqlContentEntityStorageException
-   * @expectedExceptionMessage Column information not available for the "test" field.
+   * @expectedExceptionMessage Column information not available for the 'test' field.
    *
    * @covers ::getFieldColumnName
    *
@@ -437,7 +437,7 @@ class DefaultTableMappingTest extends UnitTestCase {
    * Tests DefaultTableMapping::getFieldTableName() with an invalid parameter.
    *
    * @expectedException \Drupal\Core\Entity\Sql\SqlContentEntityStorageException
-   * @expectedExceptionMessage Table information not available for the "invalid_field_name" field.
+   * @expectedExceptionMessage Table information not available for the 'invalid_field_name' field.
    *
    * @covers ::getFieldTableName
    */
diff --git a/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php b/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php
index e67b8e6a8..9b6f0e2d7 100644
--- a/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php
@@ -502,6 +502,15 @@ class SqlContentEntityStorageSchemaTest extends UnitTestCase {
       ),
     ));
 
+    $this->setUpStorageDefinition('default_langcode', array(
+      'columns' => array(
+        'value' => array(
+          'type' => 'int',
+          'size' => 'tiny',
+        ),
+      ),
+    ));
+
     $expected = array(
       'entity_test' => array(
         'description' => 'The base table for entity_test entities.',
@@ -531,10 +540,21 @@ class SqlContentEntityStorageSchemaTest extends UnitTestCase {
             'type' => 'varchar',
             'not null' => TRUE,
           ),
+          'default_langcode' => array(
+            'type' => 'int',
+            'size' => 'tiny',
+            'not null' => true,
+          ),
         ),
         'primary key' => array('id', 'langcode'),
         'unique keys' => array(),
-        'indexes' => array(),
+        'indexes' => array(
+          'entity_test__id__default_langcode__langcode' => array(
+            0 => 'id',
+            1 => 'default_langcode',
+            2 => 'langcode',
+          ),
+        ),
         'foreign keys' => array(
           'entity_test' => array(
             'table' => 'entity_test',
@@ -547,7 +567,9 @@ class SqlContentEntityStorageSchemaTest extends UnitTestCase {
     $this->setUpStorageSchema($expected);
 
     $table_mapping = new DefaultTableMapping($this->entityType, $this->storageDefinitions);
-    $table_mapping->setFieldNames('entity_test', array_keys($this->storageDefinitions));
+    $non_data_fields = array_keys($this->storageDefinitions);
+    unset($non_data_fields[array_search('default_langcode', $non_data_fields)]);
+    $table_mapping->setFieldNames('entity_test', $non_data_fields);
     $table_mapping->setFieldNames('entity_test_field_data', array_keys($this->storageDefinitions));
 
     $this->storage->expects($this->any())
@@ -604,6 +626,14 @@ class SqlContentEntityStorageSchemaTest extends UnitTestCase {
         ),
       ),
     ));
+    $this->setUpStorageDefinition('default_langcode', array(
+      'columns' => array(
+        'value' => array(
+          'type' => 'int',
+          'size' => 'tiny',
+        ),
+      ),
+    ));
 
     $expected = array(
       'entity_test' => array(
@@ -677,11 +707,21 @@ class SqlContentEntityStorageSchemaTest extends UnitTestCase {
             'type' => 'varchar',
             'not null' => TRUE,
           ),
+          'default_langcode' => array(
+            'type' => 'int',
+            'size' => 'tiny',
+            'not null' => true,
+          ),
         ),
         'primary key' => array('id', 'langcode'),
         'unique keys' => array(),
         'indexes' => array(
           'entity_test__revision_id' => array('revision_id'),
+          'entity_test__id__default_langcode__langcode' => array(
+            0 => 'id',
+            1 => 'default_langcode',
+            2 => 'langcode',
+          ),
         ),
         'foreign keys' => array(
           'entity_test' => array(
@@ -705,10 +745,21 @@ class SqlContentEntityStorageSchemaTest extends UnitTestCase {
             'type' => 'varchar',
             'not null' => TRUE,
           ),
+          'default_langcode' => array(
+            'type' => 'int',
+            'size' => 'tiny',
+            'not null' => true,
+          ),
         ),
         'primary key' => array('revision_id', 'langcode'),
         'unique keys' => array(),
-        'indexes' => array(),
+        'indexes' => array(
+          'entity_test__id__default_langcode__langcode' => array(
+            0 => 'id',
+            1 => 'default_langcode',
+            2 => 'langcode',
+          ),
+        ),
         'foreign keys' => array(
           'entity_test' => array(
             'table' => 'entity_test',
@@ -725,8 +776,10 @@ class SqlContentEntityStorageSchemaTest extends UnitTestCase {
     $this->setUpStorageSchema($expected);
 
     $table_mapping = new DefaultTableMapping($this->entityType, $this->storageDefinitions);
-    $table_mapping->setFieldNames('entity_test', array_keys($this->storageDefinitions));
-    $table_mapping->setFieldNames('entity_test_revision', array_keys($this->storageDefinitions));
+    $non_data_fields = array_keys($this->storageDefinitions);
+    unset($non_data_fields[array_search('default_langcode', $non_data_fields)]);
+    $table_mapping->setFieldNames('entity_test', $non_data_fields);
+    $table_mapping->setFieldNames('entity_test_revision', $non_data_fields);
     $table_mapping->setFieldNames('entity_test_field_data', array_keys($this->storageDefinitions));
     $table_mapping->setFieldNames('entity_test_revision_field_data', array_keys($this->storageDefinitions));
 
diff --git a/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageTest.php b/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageTest.php
index 8d5b681b2..16f66c385 100644
--- a/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageTest.php
@@ -1130,8 +1130,10 @@ class SqlContentEntityStorageTest extends UnitTestCase {
 
     $entity_storage = $this->getMockBuilder('Drupal\Core\Entity\Sql\SqlContentEntityStorage')
       ->setConstructorArgs(array($this->entityType, $this->connection, $this->entityManager, $this->cache, $this->languageManager))
-      ->setMethods(array('getFromStorage'))
+      ->setMethods(array('getFromStorage', 'invokeStorageLoadHook'))
       ->getMock();
+    $entity_storage->method('invokeStorageLoadHook')
+      ->willReturn(NULL);
     $entity_storage->expects($this->once())
       ->method('getFromStorage')
       ->with(array($id))
@@ -1180,8 +1182,10 @@ class SqlContentEntityStorageTest extends UnitTestCase {
 
     $entity_storage = $this->getMockBuilder('Drupal\Core\Entity\Sql\SqlContentEntityStorage')
       ->setConstructorArgs(array($this->entityType, $this->connection, $this->entityManager, $this->cache, $this->languageManager))
-      ->setMethods(array('getFromStorage'))
+      ->setMethods(array('getFromStorage', 'invokeStorageLoadHook'))
       ->getMock();
+    $entity_storage->method('invokeStorageLoadHook')
+      ->willReturn(NULL);
     $entity_storage->expects($this->once())
       ->method('getFromStorage')
       ->with(array($id))
diff --git a/core/tests/Drupal/Tests/Core/EventSubscriber/PsrResponseSubscriberTest.php b/core/tests/Drupal/Tests/Core/EventSubscriber/PsrResponseSubscriberTest.php
new file mode 100644
index 000000000..2e3552ef4
--- /dev/null
+++ b/core/tests/Drupal/Tests/Core/EventSubscriber/PsrResponseSubscriberTest.php
@@ -0,0 +1,99 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\Core\EventSubscriber\PsrResponseSubscriberTest.
+ */
+
+namespace Drupal\Tests\Core\EventSubscriber;
+
+use Drupal\Tests\UnitTestCase;
+use \Drupal\Core\EventSubscriber\PsrResponseSubscriber;
+
+/**
+ * @coversDefaultClass \Drupal\Core\EventSubscriber\PsrResponseSubscriber
+ * @group EventSubscriber
+ */
+class PsrResponseSubscriberTest extends UnitTestCase {
+
+  /**
+   * The tested path root subscriber.
+   *
+   * @var \Drupal\Core\EventSubscriber\PsrResponseSubscriber
+   */
+  protected $psrResponseSubscriber;
+
+  /**
+   * The tested path root subscriber.
+   *
+   * @var \Symfony\Bridge\PsrHttpMessage\HttpFoundationFactoryInterface|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $httpFoundationFactoryMock;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setUp() {
+    $factory = $this->getMock('Symfony\Bridge\PsrHttpMessage\HttpFoundationFactoryInterface', [], [], '', NULL);
+    $factory
+      ->expects($this->any())
+      ->method('createResponse')
+      ->willReturn($this->getMock('Symfony\Component\HttpFoundation\Response'));
+
+    $this->httpFoundationFactoryMock = $factory;
+
+    $this->psrResponseSubscriber = new PsrResponseSubscriber($this->httpFoundationFactoryMock);
+  }
+
+  /**
+   * Tests altering and finished event.
+   *
+   * @covers ::onKernelView
+   */
+  public function testConvertsControllerResult() {
+    $event = $this->createEventMock($this->getMock('Psr\Http\Message\ResponseInterface'));
+    $event
+      ->expects($this->once())
+      ->method('setResponse')
+      ->with($this->isInstanceOf('Symfony\Component\HttpFoundation\Response'));
+    $this->psrResponseSubscriber->onKernelView($event);
+  }
+
+
+  /**
+   * Tests altering and finished event.
+   *
+   * @covers ::onKernelView
+   */
+  public function testDoesNotConvertControllerResult() {
+    $event = $this->createEventMock([]);
+    $event
+      ->expects($this->never())
+      ->method('setResponse');
+    $this->psrResponseSubscriber->onKernelView($event);
+    $event = $this->createEventMock(NULL);
+    $event
+      ->expects($this->never())
+      ->method('setResponse');
+    $this->psrResponseSubscriber->onKernelView($event);
+  }
+
+  /**
+   * Sets up an alias event that return $controllerResult.
+   *
+   * @param mixed $controller_result
+   *    The return Object.
+   *
+   * @return \Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent|\PHPUnit_Framework_MockObject_MockObject
+   *    A mock object to test.
+   */
+  protected function createEventMock($controller_result) {
+    $event = $this->getMock('Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent', [], [], '', NULL);
+    $event
+      ->expects($this->once())
+      ->method('getControllerResult')
+      ->willReturn($controller_result);
+    return $event;
+  }
+
+}
diff --git a/core/tests/Drupal/Tests/Core/EventSubscriber/RedirectResponseSubscriberTest.php b/core/tests/Drupal/Tests/Core/EventSubscriber/RedirectResponseSubscriberTest.php
index e1002056b..193c25b0c 100644
--- a/core/tests/Drupal/Tests/Core/EventSubscriber/RedirectResponseSubscriberTest.php
+++ b/core/tests/Drupal/Tests/Core/EventSubscriber/RedirectResponseSubscriberTest.php
@@ -9,7 +9,9 @@ namespace Drupal\Tests\Core\EventSubscriber;
 
 use Drupal\Core\EventSubscriber\RedirectResponseSubscriber;
 use Drupal\Core\Routing\RequestContext;
+use Drupal\Core\Routing\TrustedRedirectResponse;
 use Drupal\Tests\UnitTestCase;
+use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
@@ -24,6 +26,31 @@ use Symfony\Component\HttpKernel\KernelEvents;
  */
 class RedirectResponseSubscriberTest extends UnitTestCase {
 
+  /**
+   * The mocked request context.
+   *
+   * @var \Drupal\Core\Routing\RequestContext|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $requestContext;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->requestContext = $this->getMockBuilder('Drupal\Core\Routing\RequestContext')
+      ->disableOriginalConstructor()
+      ->getMock();
+    $this->requestContext->expects($this->any())
+      ->method('getCompleteBaseUrl')
+      ->willReturn('http://example.com/drupal');
+
+    $container = new Container();
+    $container->set('router.request_context', $this->requestContext);
+    \Drupal::setContainer($container);
+  }
+
   /**
    * Test destination detection and redirection.
    *
@@ -57,15 +84,9 @@ class RedirectResponseSubscriberTest extends UnitTestCase {
           ]);
     }
 
-    $request_context = $this->getMockBuilder('Drupal\Core\Routing\RequestContext')
-      ->disableOriginalConstructor()
-      ->getMock();
-    $request_context->expects($this->any())
-      ->method('getCompleteBaseUrl')
-      ->willReturn('http://example.com/drupal');
     $request->headers->set('HOST', 'example.com');
 
-    $listener = new RedirectResponseSubscriber($url_generator, $request_context);
+    $listener = new RedirectResponseSubscriber($url_generator, $this->requestContext);
     $dispatcher->addListener(KernelEvents::RESPONSE, array($listener, 'checkRedirectUrl'));
     $event = new FilterResponseEvent($kernel, $request, HttpKernelInterface::SUB_REQUEST, $response);
     $dispatcher->dispatch(KernelEvents::RESPONSE, $event);
@@ -87,12 +108,9 @@ class RedirectResponseSubscriberTest extends UnitTestCase {
   public static function providerTestDestinationRedirect() {
     return array(
       array(new Request(), FALSE),
-      array(new Request(array('destination' => 'http://example.com')), FALSE),
-      array(new Request(array('destination' => 'http://example.com/foobar')), FALSE),
-      array(new Request(array('destination' => 'http://example.ca/drupal')), FALSE),
       array(new Request(array('destination' => 'test')), 'http://example.com/drupal/test'),
-      array(new Request(array('destination' => '/test')), 'http://example.com/test'),
-      array(new Request(array('destination' => '/example.com')), 'http://example.com/example.com'),
+      array(new Request(array('destination' => '/drupal/test')), 'http://example.com/drupal/test'),
+      array(new Request(array('destination' => 'example.com')), 'http://example.com/drupal/example.com'),
       array(new Request(array('destination' => 'example:com')), 'http://example.com/drupal/example:com'),
       array(new Request(array('destination' => 'javascript:alert(0)')), 'http://example.com/drupal/javascript:alert(0)'),
       array(new Request(array('destination' => 'http://example.com/drupal/')), 'http://example.com/drupal/'),
@@ -101,7 +119,94 @@ class RedirectResponseSubscriberTest extends UnitTestCase {
   }
 
   /**
-   * @expectedException \InvalidArgumentException
+   * @dataProvider providerTestDestinationRedirectToExternalUrl
+   *
+   * @expectedException \PHPUnit_Framework_Error
+   */
+  public function testDestinationRedirectToExternalUrl($request, $expected) {
+    $dispatcher = new EventDispatcher();
+    $kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
+    $response = new RedirectResponse('http://other-example.com');
+    $url_generator = $this->getMockBuilder('Drupal\Core\Routing\UrlGenerator')
+      ->disableOriginalConstructor()
+      ->setMethods(array('generateFromPath'))
+      ->getMock();
+
+    $request_context = $this->getMockBuilder('Drupal\Core\Routing\RequestContext')
+      ->disableOriginalConstructor()
+      ->getMock();
+    $request_context->expects($this->any())
+      ->method('getCompleteBaseUrl')
+      ->willReturn('http://example.com/drupal');
+
+    if ($expected) {
+      $url_generator
+        ->expects($this->any())
+        ->method('generateFromPath')
+        ->willReturnMap([
+          ['test', ['query' => [], 'fragment' => '', 'absolute' => TRUE], FALSE, 'http://example.com/drupal/test'],
+          ['example.com', ['query' => [], 'fragment' => '', 'absolute' => TRUE], FALSE, 'http://example.com/drupal/example.com'],
+          ['example:com', ['query' => [], 'fragment' => '', 'absolute' => TRUE], FALSE, 'http://example.com/drupal/example:com'],
+          ['javascript:alert(0)', ['query' => [], 'fragment' => '', 'absolute' => TRUE], FALSE, 'http://example.com/drupal/javascript:alert(0)'],
+          ['/test', ['query' => [], 'fragment' => '', 'absolute' => TRUE], FALSE, 'http://example.com/test'],
+        ]);
+    }
+
+    $listener = new RedirectResponseSubscriber($url_generator, $request_context);
+    $dispatcher->addListener(KernelEvents::RESPONSE, array($listener, 'checkRedirectUrl'));
+    $event = new FilterResponseEvent($kernel, $request, HttpKernelInterface::SUB_REQUEST, $response);
+    $dispatcher->dispatch(KernelEvents::RESPONSE, $event);
+
+    $this->assertEquals(400, $event->getResponse()->getStatusCode());
+  }
+
+  /**
+   * @covers ::checkRedirectUrl
+   */
+  public function testRedirectWithOptInExternalUrl() {
+    $dispatcher = new EventDispatcher();
+    $kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
+    $response = new TrustedRedirectResponse('http://external-url.com');
+    $url_generator = $this->getMockBuilder('Drupal\Core\Routing\UrlGenerator')
+      ->disableOriginalConstructor()
+      ->setMethods(array('generateFromPath'))
+      ->getMock();
+
+    $request_context = $this->getMockBuilder('Drupal\Core\Routing\RequestContext')
+      ->disableOriginalConstructor()
+      ->getMock();
+    $request_context->expects($this->any())
+      ->method('getCompleteBaseUrl')
+      ->willReturn('http://example.com/drupal');
+
+    $request = Request::create('');
+    $request->headers->set('HOST', 'example.com');
+
+    $listener = new RedirectResponseSubscriber($url_generator, $request_context);
+    $dispatcher->addListener(KernelEvents::RESPONSE, array($listener, 'checkRedirectUrl'));
+    $event = new FilterResponseEvent($kernel, $request, HttpKernelInterface::SUB_REQUEST, $response);
+    $dispatcher->dispatch(KernelEvents::RESPONSE, $event);
+
+    $target_url = $event->getResponse()->getTargetUrl();
+    $this->assertEquals('http://external-url.com', $target_url);
+  }
+
+  /**
+   * Data provider for testDestinationRedirectToExternalUrl().
+   */
+  public function providerTestDestinationRedirectToExternalUrl() {
+    return [
+      'absolute external url' => [new Request(['destination' => 'http://example.com']), 'http://example.com'],
+      'absolute external url with folder' => [new Request(['destination' => 'http://example.com/foobar']), 'http://example.com/foobar'],
+      'absolute external url with folder2' => [new Request(['destination' => 'http://example.ca/drupal']), 'http://example.ca/drupal'],
+      'path without drupal basepath' => [new Request(['destination' => '/test']), 'http://example.com/test'],
+      'path with URL' => [new Request(['destination' => '/example.com']), 'http://example.com/example.com'],
+      'path with URL and two slashes' => [new Request(['destination' => '//example.com']), 'http://example.com//example.com'],
+    ];
+  }
+
+  /**
+   * @expectedException \PHPUnit_Framework_Error
    *
    * @dataProvider providerTestDestinationRedirectWithInvalidUrl
    */
@@ -119,6 +224,8 @@ class RedirectResponseSubscriberTest extends UnitTestCase {
     $dispatcher->addListener(KernelEvents::RESPONSE, array($listener, 'checkRedirectUrl'));
     $event = new FilterResponseEvent($kernel, $request, HttpKernelInterface::SUB_REQUEST, $response);
     $dispatcher->dispatch(KernelEvents::RESPONSE, $event);
+
+    $this->assertEquals(400, $event->getResponse()->getStatusCode());
   }
 
   /**
@@ -128,6 +235,11 @@ class RedirectResponseSubscriberTest extends UnitTestCase {
     $data = [];
     $data[] = [new Request(array('destination' => '//example:com'))];
     $data[] = [new Request(array('destination' => '//example:com/test'))];
+    $data['absolute external url'] = [new Request(['destination' => 'http://example.com'])];
+    $data['absolute external url with folder'] = [new Request(['destination' => 'http://example.ca/drupal'])];
+    $data['path without drupal basepath'] = [new Request(['destination' => '/test'])];
+    $data['path with URL'] = [new Request(['destination' => '/example.com'])];
+    $data['path with URL and two slashes'] = [new Request(['destination' => '//example.com'])];
 
     return $data;
   }
diff --git a/core/tests/Drupal/Tests/Core/File/MimeTypeGuesserTest.php b/core/tests/Drupal/Tests/Core/File/MimeTypeGuesserTest.php
index a1bf9c232..6e3f0e830 100644
--- a/core/tests/Drupal/Tests/Core/File/MimeTypeGuesserTest.php
+++ b/core/tests/Drupal/Tests/Core/File/MimeTypeGuesserTest.php
@@ -9,6 +9,7 @@ namespace Drupal\Tests\Core\File;
 
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\File\MimeType\MimeTypeGuesser;
+use Drupal\Core\StreamWrapper\StreamWrapperManager;
 use Drupal\Tests\UnitTestCase;
 use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesser as SymfonyMimeTypeGuesser;
 
@@ -34,10 +35,23 @@ class MimeTypeGuesserTest extends UnitTestCase {
       $this->assertNotInstanceOf('Drupal\Core\File\MimeType\MimeTypeGuesser', $guessers[0]);
     }
     $container = new ContainerBuilder();
-    $container->set('file.mime_type.guesser', new MimeTypeGuesser());
+    $container->set('file.mime_type.guesser', new MimeTypeGuesser(new StreamWrapperManager()));
     MimeTypeGuesser::registerWithSymfonyGuesser($container);
+    $symfony_guesser = SymfonyMimeTypeGuesser::getInstance();
     $guessers = $this->readAttribute($symfony_guesser, 'guessers');
+    $this->assertSame($container->get('file.mime_type.guesser'), $guessers[0]);
     $this->assertInstanceOf('Drupal\Core\File\MimeType\MimeTypeGuesser', $guessers[0]);
+    $count = count($guessers);
+
+    $container = new ContainerBuilder();
+    $container->set('file.mime_type.guesser', new MimeTypeGuesser(new StreamWrapperManager()));
+    MimeTypeGuesser::registerWithSymfonyGuesser($container);
+    $symfony_guesser = SymfonyMimeTypeGuesser::getInstance();
+    $guessers = $this->readAttribute($symfony_guesser, 'guessers');
+    $this->assertSame($container->get('file.mime_type.guesser'), $guessers[0]);
+    $this->assertInstanceOf('Drupal\Core\File\MimeType\MimeTypeGuesser', $guessers[0]);
+    $new_count = count($guessers);
+    $this->assertEquals($count, $new_count, 'The count of mime type guessers remains the same after container re-init.');
   }
 
 }
diff --git a/core/tests/Drupal/Tests/Core/Form/FormBuilderTest.php b/core/tests/Drupal/Tests/Core/Form/FormBuilderTest.php
index 60445709f..09445ce33 100644
--- a/core/tests/Drupal/Tests/Core/Form/FormBuilderTest.php
+++ b/core/tests/Drupal/Tests/Core/Form/FormBuilderTest.php
@@ -7,6 +7,9 @@
 
 namespace Drupal\Tests\Core\Form;
 
+use Drupal\Component\Utility\NestedArray;
+use Drupal\Core\Access\AccessResult;
+use Drupal\Core\Access\AccessResultForbidden;
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Form\EnforcedResponseException;
 use Drupal\Core\Form\FormBuilderInterface;
@@ -280,7 +283,7 @@ class FormBuilderTest extends FormTestBase {
   }
 
   /**
-   * Tests the rebuildForm() method.
+   * Tests the rebuildForm() method for a POST submission.
    */
   public function testRebuildForm() {
     $form_id = 'test_form_id';
@@ -300,6 +303,9 @@ class FormBuilderTest extends FormTestBase {
     $form = $this->formBuilder->buildForm($form_arg, $form_state);
     $original_build_id = $form['#build_id'];
 
+    $this->request->setMethod('POST');
+    $form_state->setRequestMethod('POST');
+
     // Rebuild the form, and assert that the build ID has not changed.
     $form_state->setRebuild();
     $input['form_id'] = $form_id;
@@ -307,11 +313,51 @@ class FormBuilderTest extends FormTestBase {
     $form_state->addRebuildInfo('copy', ['#build_id' => TRUE]);
     $this->formBuilder->processForm($form_id, $form, $form_state);
     $this->assertSame($original_build_id, $form['#build_id']);
+    $this->assertTrue($form_state->isCached());
 
     // Rebuild the form again, and assert that there is a new build ID.
     $form_state->setRebuildInfo([]);
     $form = $this->formBuilder->buildForm($form_arg, $form_state);
     $this->assertNotSame($original_build_id, $form['#build_id']);
+    $this->assertTrue($form_state->isCached());
+  }
+
+  /**
+   * Tests the rebuildForm() method for a GET submission.
+   */
+  public function testRebuildFormOnGetRequest() {
+    $form_id = 'test_form_id';
+    $expected_form = $form_id();
+
+    // The form will be built four times.
+    $form_arg = $this->getMock('Drupal\Core\Form\FormInterface');
+    $form_arg->expects($this->exactly(2))
+      ->method('getFormId')
+      ->will($this->returnValue($form_id));
+    $form_arg->expects($this->exactly(4))
+      ->method('buildForm')
+      ->will($this->returnValue($expected_form));
+
+    // Do an initial build of the form and track the build ID.
+    $form_state = new FormState();
+    $form_state->setMethod('GET');
+    $form = $this->formBuilder->buildForm($form_arg, $form_state);
+    $original_build_id = $form['#build_id'];
+
+    // Rebuild the form, and assert that the build ID has not changed.
+    $form_state->setRebuild();
+    $input['form_id'] = $form_id;
+    $form_state->setUserInput($input);
+    $form_state->addRebuildInfo('copy', ['#build_id' => TRUE]);
+    $this->formBuilder->processForm($form_id, $form, $form_state);
+    $this->assertSame($original_build_id, $form['#build_id']);
+    $this->assertFalse($form_state->isCached());
+
+    // Rebuild the form again, and assert that there is a new build ID.
+    $form_state->setRebuildInfo([]);
+    $form = $this->formBuilder->buildForm($form_arg, $form_state);
+    $this->assertNotSame($original_build_id, $form['#build_id']);
+    $this->assertFalse($form_state->isCached());
   }
 
   /**
@@ -335,6 +381,7 @@ class FormBuilderTest extends FormTestBase {
     // Do an initial build of the form and track the build ID.
     $form_state = (new FormState())
       ->addBuildInfo('files', [['module' => 'node', 'type' => 'pages.inc']])
+      ->setRequestMethod('POST')
       ->setCached();
     $form = $this->formBuilder->buildForm($form_arg, $form_state);
 
@@ -404,6 +451,7 @@ class FormBuilderTest extends FormTestBase {
       ->with($form_build_id);
 
     $form_state = new FormState();
+    $form_state->setRequestMethod('POST');
     $form_state->setCached();
     $this->simulateFormSubmission($form_id, $form_arg, $form_state);
   }
@@ -449,6 +497,171 @@ class FormBuilderTest extends FormTestBase {
     $this->formBuilder->buildForm($form_arg, $form_state);
   }
 
+  /**
+   * @covers ::buildForm
+   *
+   * @dataProvider providerTestChildAccessInheritance
+   */
+  public function testChildAccessInheritance($element, $access_checks) {
+    $form_arg = new TestFormWithPredefinedForm();
+    $form_arg->setForm($element);
+
+    $form_state = new FormState();
+
+    $form = $this->formBuilder->buildForm($form_arg, $form_state);
+
+    $actual_access_structure = [];
+    $expected_access_structure = [];
+
+    // Ensure that the expected access checks are set.
+    foreach ($access_checks as $access_check) {
+      $parents = $access_check[0];
+      $parents[] = '#access';
+
+      $actual_access = NestedArray::getValue($form, $parents);
+      $actual_access_structure[] = [$parents, $actual_access];
+      $expected_access_structure[] = [$parents, $access_check[1]];
+    }
+
+    $this->assertEquals($expected_access_structure, $actual_access_structure);
+  }
+
+  /**
+   * Data provider for testChildAccessInheritance.
+   *
+   * @return array
+   */
+  public function providerTestChildAccessInheritance() {
+    $data = [];
+
+    $element = [
+      'child0' => [
+        '#type' => 'checkbox',
+      ],
+      'child1' => [
+        '#type' => 'checkbox',
+      ],
+      'child2' => [
+        '#type' => 'fieldset',
+        'child2.0' => [
+          '#type' => 'checkbox',
+        ],
+        'child2.1' => [
+          '#type' => 'checkbox',
+        ],
+        'child2.2' => [
+          '#type' => 'checkbox',
+        ],
+      ],
+    ];
+
+    // Sets access FALSE on the root level, this should be inherited completely.
+    $clone = $element;
+    $clone['#access'] = FALSE;
+
+    $expected_access = [];
+    $expected_access[] = [[], FALSE];
+    $expected_access[] = [['child0'], FALSE];
+    $expected_access[] = [['child1'], FALSE];
+    $expected_access[] = [['child2'], FALSE];
+    $expected_access[] = [['child2', 'child2.0'], FALSE];
+    $expected_access[] = [['child2', 'child2.1'], FALSE];
+    $expected_access[] = [['child2', 'child2.2'], FALSE];
+
+    $data['access-false-root'] = [$clone, $expected_access];
+
+    $clone = $element;
+    $access_result = AccessResult::forbidden()->addCacheContexts(['user']);
+    $clone['#access'] = $access_result;
+
+    $expected_access = [];
+    $expected_access[] = [[], $access_result];
+    $expected_access[] = [['child0'], $access_result];
+    $expected_access[] = [['child1'], $access_result];
+    $expected_access[] = [['child2'], $access_result];
+    $expected_access[] = [['child2', 'child2.0'], $access_result];
+    $expected_access[] = [['child2', 'child2.1'], $access_result];
+    $expected_access[] = [['child2', 'child2.2'], $access_result];
+
+    $data['access-forbidden-root'] = [$clone, $expected_access];
+
+    // Allow access on the most outer level but set FALSE otherwise.
+    $clone = $element;
+    $clone['#access'] = TRUE;
+    $clone['child0']['#access'] = FALSE;
+
+    $expected_access = [];
+    $expected_access[] = [[], TRUE];
+    $expected_access[] = [['child0'], FALSE];
+    $expected_access[] = [['child1'], NULL];
+    $expected_access[] = [['child2'], NULL];
+    $expected_access[] = [['child2', 'child2.0'], NULL];
+    $expected_access[] = [['child2', 'child2.1'], NULL];
+    $expected_access[] = [['child2', 'child2.2'], NULL];
+
+    $data['access-true-root'] = [$clone, $expected_access];
+
+    // Allow access on the most outer level but forbid otherwise.
+    $clone = $element;
+    $access_result_allowed = AccessResult::allowed()
+      ->addCacheContexts(['user']);
+    $clone['#access'] = $access_result_allowed;
+    $access_result_forbidden = AccessResult::forbidden()
+      ->addCacheContexts(['user']);
+    $clone['child0']['#access'] = $access_result_forbidden;
+
+    $expected_access = [];
+    $expected_access[] = [[], $access_result_allowed];
+    $expected_access[] = [['child0'], $access_result_forbidden];
+    $expected_access[] = [['child1'], NULL];
+    $expected_access[] = [['child2'], NULL];
+    $expected_access[] = [['child2', 'child2.0'], NULL];
+    $expected_access[] = [['child2', 'child2.1'], NULL];
+    $expected_access[] = [['child2', 'child2.2'], NULL];
+
+    $data['access-allowed-root'] = [$clone, $expected_access];
+
+    // Allow access on the most outer level, deny access on a parent, and allow
+    // on a child. The denying should be inherited.
+    $clone = $element;
+    $clone['#access'] = TRUE;
+    $clone['child2']['#access'] = FALSE;
+    $clone['child2.0']['#access'] = TRUE;
+    $clone['child2.1']['#access'] = TRUE;
+    $clone['child2.2']['#access'] = TRUE;
+
+    $expected_access = [];
+    $expected_access[] = [[], TRUE];
+    $expected_access[] = [['child0'], NULL];
+    $expected_access[] = [['child1'], NULL];
+    $expected_access[] = [['child2'], FALSE];
+    $expected_access[] = [['child2', 'child2.0'], FALSE];
+    $expected_access[] = [['child2', 'child2.1'], FALSE];
+    $expected_access[] = [['child2', 'child2.2'], FALSE];
+
+    $data['access-mixed-parents'] = [$clone, $expected_access];
+
+    $clone = $element;
+    $clone['#access'] = $access_result_allowed;
+    $clone['child2']['#access'] = $access_result_forbidden;
+    $clone['child2.0']['#access'] = $access_result_allowed;
+    $clone['child2.1']['#access'] = $access_result_allowed;
+    $clone['child2.2']['#access'] = $access_result_allowed;
+
+    $expected_access = [];
+    $expected_access[] = [[], $access_result_allowed];
+    $expected_access[] = [['child0'], NULL];
+    $expected_access[] = [['child1'], NULL];
+    $expected_access[] = [['child2'], $access_result_forbidden];
+    $expected_access[] = [['child2', 'child2.0'], $access_result_forbidden];
+    $expected_access[] = [['child2', 'child2.1'], $access_result_forbidden];
+    $expected_access[] = [['child2', 'child2.2'], $access_result_forbidden];
+
+    $data['access-mixed-parents-object'] = [$clone, $expected_access];
+
+    return $data;
+  }
+
 }
 
 class TestForm implements FormInterface {
@@ -467,3 +680,21 @@ class TestFormInjected extends TestForm implements ContainerInjectionInterface {
     return new static();
   }
 }
+
+
+class TestFormWithPredefinedForm extends TestForm {
+
+  /**
+   * @var array
+   */
+  protected $form;
+
+  public function setForm($form) {
+    $this->form = $form;
+  }
+
+  public function buildForm(array $form, FormStateInterface $form_state) {
+    return $this->form;
+  }
+
+}
diff --git a/core/tests/Drupal/Tests/Core/Form/FormCacheTest.php b/core/tests/Drupal/Tests/Core/Form/FormCacheTest.php
index 452ac54ff..e846b8d7f 100644
--- a/core/tests/Drupal/Tests/Core/Form/FormCacheTest.php
+++ b/core/tests/Drupal/Tests/Core/Form/FormCacheTest.php
@@ -427,6 +427,8 @@ class FormCacheTest extends UnitTestCase {
    * @covers ::setCache
    */
   public function testSetCacheWithSafeStrings() {
+    // A call to SafeMarkup::set() is appropriate in this test as a way to add a
+    // string to the safe list in the simplest way possible. Normally, avoid it.
     SafeMarkup::set('a_safe_string');
     $form_build_id = 'the_form_build_id';
     $form = [
diff --git a/core/tests/Drupal/Tests/Core/Form/FormStateTest.php b/core/tests/Drupal/Tests/Core/Form/FormStateTest.php
index b92c5f7b8..24904e35f 100644
--- a/core/tests/Drupal/Tests/Core/Form/FormStateTest.php
+++ b/core/tests/Drupal/Tests/Core/Form/FormStateTest.php
@@ -422,6 +422,11 @@ class FormStateTest extends UnitTestCase {
       'cache' => $cache_key,
       'no_cache' => $no_cache_key,
     ]);
+
+    $form_state->setMethod('POST');
+    $this->assertSame($expected, $form_state->isCached());
+
+    $form_state->setMethod('GET');
     $this->assertSame($expected, $form_state->isCached());
   }
 
@@ -463,6 +468,28 @@ class FormStateTest extends UnitTestCase {
     return $data;
   }
 
+  /**
+   * @covers ::setCached
+   */
+  public function testSetCachedPost() {
+    $form_state = new FormState();
+    $form_state->setRequestMethod('POST');
+    $form_state->setCached();
+    $this->assertTrue($form_state->isCached());
+  }
+
+  /**
+   * @covers ::setCached
+   *
+   * @expectedException \LogicException
+   * @expectedExceptionMessage Form state caching on GET requests is not allowed.
+   */
+  public function testSetCachedGet() {
+    $form_state = new FormState();
+    $form_state->setRequestMethod('GET');
+    $form_state->setCached();
+  }
+
   /**
    * @covers ::isMethodType
    * @covers ::setMethod
diff --git a/core/tests/Drupal/Tests/Core/Http/ClientFactoryTest.php b/core/tests/Drupal/Tests/Core/Http/ClientFactoryTest.php
new file mode 100644
index 000000000..780616820
--- /dev/null
+++ b/core/tests/Drupal/Tests/Core/Http/ClientFactoryTest.php
@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\Core\Http\ClientFactoryTest.
+ */
+
+namespace Drupal\Tests\Core\Http;
+
+use Drupal\Core\Http\ClientFactory;
+use Drupal\Core\Site\Settings;
+use Drupal\Tests\UnitTestCase;
+
+/**
+ * @coversDefaultClass \Drupal\Core\Http\ClientFactory
+ * @group Http
+ */
+class ClientFactoryTest extends UnitTestCase {
+
+  /**
+   * The client factory under test.
+   *
+   * @var \Drupal\Core\Http\ClientFactory
+   */
+  protected $factory;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setUp() {
+    $stack = $this->getMockBuilder('GuzzleHttp\HandlerStack')
+      ->disableOriginalConstructor()
+      ->getMock();
+    $this->factory = new ClientFactory($stack);
+  }
+
+  /**
+   * @covers ::fromOptions
+   * @dataProvider providerTestCreateFromOptions
+   *
+   * @param array $settings_config
+   * @param array $parameter_config
+   * @param array $expected_config_keys
+   */
+  public function testCreateFromOptions($settings_config, $parameter_config, $expected_config_keys) {
+    if ($settings_config) {
+      new Settings(['http_client_config' => $settings_config]);
+    }
+    else {
+      new Settings([]);
+    }
+
+    $client = $this->factory->fromOptions($parameter_config);
+
+    foreach ($expected_config_keys as $key => $expected) {
+      $this->assertSame($expected, $client->getConfig($key));
+    }
+  }
+
+  /**
+   * Data provider for testCreateFromOptions
+   *
+   * @return array
+   */
+  public function providerTestCreateFromOptions() {
+    return [
+      [[], [], ['verify' => TRUE, 'timeout' => 30]],
+      [['timeout' => 40], [], ['verify' => TRUE, 'timeout' => 40]],
+      [[], ['timeout' => 50], ['verify' => TRUE, 'timeout' => 50]],
+      [['timeout' => 40], ['timeout' => 50], ['verify' => TRUE, 'timeout' => 50]],
+    ];
+  }
+
+}
diff --git a/core/tests/Drupal/Tests/Core/Menu/ContextualLinkDefaultTest.php b/core/tests/Drupal/Tests/Core/Menu/ContextualLinkDefaultTest.php
index e3825ca0b..ac9208825 100644
--- a/core/tests/Drupal/Tests/Core/Menu/ContextualLinkDefaultTest.php
+++ b/core/tests/Drupal/Tests/Core/Menu/ContextualLinkDefaultTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\Tests\Core\Menu;
 
 use Drupal\Core\Menu\ContextualLinkDefault;
+use Drupal\Core\StringTranslation\TranslationWrapper;
 use Drupal\Tests\UnitTestCase;
 use Symfony\Component\HttpFoundation\ParameterBag;
 use Symfony\Component\HttpFoundation\Request;
@@ -63,17 +64,18 @@ class ContextualLinkDefaultTest extends UnitTestCase {
 
   protected function setupContextualLinkDefault() {
     $this->contextualLinkDefault = new ContextualLinkDefault($this->config, $this->pluginId, $this->pluginDefinition);
-    $this->contextualLinkDefault->setStringTranslation($this->stringTranslation);
   }
 
   /**
    * @covers ::getTitle
    */
-  public function testGetTitle($title = 'Example') {
-    $this->pluginDefinition['title'] = $title;
+  public function testGetTitle() {
+    $title = 'Example';
+    $this->pluginDefinition['title'] = (new TranslationWrapper($title))
+      ->setStringTranslation($this->stringTranslation);
     $this->stringTranslation->expects($this->once())
       ->method('translate')
-      ->with($this->pluginDefinition['title'], array(), array())
+      ->with($title, array(), array())
       ->will($this->returnValue('Example translated'));
 
     $this->setupContextualLinkDefault();
@@ -84,11 +86,12 @@ class ContextualLinkDefaultTest extends UnitTestCase {
    * @covers ::getTitle
    */
   public function testGetTitleWithContext() {
-    $this->pluginDefinition['title'] = 'Example';
-    $this->pluginDefinition['title_context'] = 'context';
+    $title = 'Example';
+    $this->pluginDefinition['title'] = (new TranslationWrapper($title, array(), array('context' => 'context')))
+      ->setStringTranslation($this->stringTranslation);
     $this->stringTranslation->expects($this->once())
       ->method('translate')
-      ->with($this->pluginDefinition['title'], array(), array('context' => $this->pluginDefinition['title_context']))
+      ->with($title, array(), array('context' => 'context'))
       ->will($this->returnValue('Example translated with context'));
 
     $this->setupContextualLinkDefault();
@@ -99,11 +102,12 @@ class ContextualLinkDefaultTest extends UnitTestCase {
    * @covers ::getTitle
    */
   public function testGetTitleWithTitleArguments() {
-    $this->pluginDefinition['title'] = 'Example @test';
-    $this->pluginDefinition['title_arguments'] = array('@test' => 'value');
+    $title = 'Example @test';
+    $this->pluginDefinition['title'] = (new TranslationWrapper($title, array('@test' => 'value')))
+      ->setStringTranslation($this->stringTranslation);
     $this->stringTranslation->expects($this->once())
       ->method('translate')
-      ->with($this->pluginDefinition['title'], $this->arrayHasKey('@test'), array())
+      ->with($title, array('@test' => 'value'), array())
       ->will($this->returnValue('Example value'));
 
     $this->setupContextualLinkDefault();
diff --git a/core/tests/Drupal/Tests/Core/Menu/LocalActionDefaultTest.php b/core/tests/Drupal/Tests/Core/Menu/LocalActionDefaultTest.php
index dade25461..02d4578d4 100644
--- a/core/tests/Drupal/Tests/Core/Menu/LocalActionDefaultTest.php
+++ b/core/tests/Drupal/Tests/Core/Menu/LocalActionDefaultTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\Tests\Core\Menu;
 
 use Drupal\Core\Menu\LocalActionDefault;
+use Drupal\Core\StringTranslation\TranslationWrapper;
 use Drupal\Tests\UnitTestCase;
 use Symfony\Component\HttpFoundation\ParameterBag;
 use Symfony\Component\HttpFoundation\Request;
@@ -74,7 +75,6 @@ class LocalActionDefaultTest extends UnitTestCase {
    */
   protected function setupLocalActionDefault() {
     $this->localActionDefault = new LocalActionDefault($this->config, $this->pluginId, $this->pluginDefinition, $this->routeProvider);
-    $this->localActionDefault->setStringTranslation($this->stringTranslation);
   }
 
   /**
@@ -83,10 +83,11 @@ class LocalActionDefaultTest extends UnitTestCase {
    * @see \Drupal\Core\Menu\LocalTaskDefault::getTitle()
    */
   public function testGetTitle() {
-    $this->pluginDefinition['title'] = 'Example';
+    $this->pluginDefinition['title'] = (new TranslationWrapper('Example'))
+      ->setStringTranslation($this->stringTranslation);
     $this->stringTranslation->expects($this->once())
       ->method('translate')
-      ->with($this->pluginDefinition['title'], array(), array())
+      ->with('Example', array(), array())
       ->will($this->returnValue('Example translated'));
 
     $this->setupLocalActionDefault();
@@ -99,11 +100,11 @@ class LocalActionDefaultTest extends UnitTestCase {
    * @see \Drupal\Core\Menu\LocalTaskDefault::getTitle()
    */
   public function testGetTitleWithContext() {
-    $this->pluginDefinition['title'] = 'Example';
-    $this->pluginDefinition['title_context'] = 'context';
+    $this->pluginDefinition['title'] = (new TranslationWrapper('Example', array(), array('context' => 'context')))
+      ->setStringTranslation($this->stringTranslation);
     $this->stringTranslation->expects($this->once())
       ->method('translate')
-      ->with($this->pluginDefinition['title'], array(), array('context' => 'context'))
+      ->with('Example', array(), array('context' => 'context'))
       ->will($this->returnValue('Example translated with context'));
 
     $this->setupLocalActionDefault();
@@ -114,11 +115,11 @@ class LocalActionDefaultTest extends UnitTestCase {
    * Tests the getTitle method with title arguments.
    */
   public function testGetTitleWithTitleArguments() {
-    $this->pluginDefinition['title'] = 'Example @test';
-    $this->pluginDefinition['title_arguments'] = array('@test' => 'value');
+    $this->pluginDefinition['title'] = (new TranslationWrapper('Example @test', array('@test' => 'value')))
+      ->setStringTranslation($this->stringTranslation);
     $this->stringTranslation->expects($this->once())
       ->method('translate')
-      ->with($this->pluginDefinition['title'], $this->arrayHasKey('@test'), array())
+      ->with('Example @test', array('@test' => 'value'), array())
       ->will($this->returnValue('Example value'));
 
     $this->setupLocalActionDefault();
diff --git a/core/tests/Drupal/Tests/Core/Menu/LocalTaskDefaultTest.php b/core/tests/Drupal/Tests/Core/Menu/LocalTaskDefaultTest.php
index 573444b9b..6e393a836 100644
--- a/core/tests/Drupal/Tests/Core/Menu/LocalTaskDefaultTest.php
+++ b/core/tests/Drupal/Tests/Core/Menu/LocalTaskDefaultTest.php
@@ -10,8 +10,8 @@ namespace Drupal\Tests\Core\Menu;
 use Drupal\Core\Menu\LocalTaskDefault;
 use Drupal\Core\Routing\RouteMatch;
 use Drupal\Core\Routing\RouteProviderInterface;
+use Drupal\Core\StringTranslation\TranslationWrapper;
 use Drupal\Tests\UnitTestCase;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Route;
 
 /**
@@ -77,9 +77,7 @@ class LocalTaskDefaultTest extends UnitTestCase {
   protected function setupLocalTaskDefault() {
     $this->localTaskBase = new TestLocalTaskDefault($this->config, $this->pluginId, $this->pluginDefinition);
     $this->localTaskBase
-      ->setRouteProvider($this->routeProvider)
-      ->setStringTranslation($this->stringTranslation);
-
+      ->setRouteProvider($this->routeProvider);
   }
 
   /**
@@ -234,11 +232,12 @@ class LocalTaskDefaultTest extends UnitTestCase {
   /**
    * @covers ::getTitle
    */
-  public function testGetTitleWithoutContext() {
-    $this->pluginDefinition['title'] = 'Example';
+  public function testGetTitle() {
+    $this->pluginDefinition['title'] = (new TranslationWrapper('Example'))
+      ->setStringTranslation($this->stringTranslation);
     $this->stringTranslation->expects($this->once())
       ->method('translate')
-      ->with($this->pluginDefinition['title'], array(), array())
+      ->with('Example', array(), array())
       ->will($this->returnValue('Example translated'));
 
     $this->setupLocalTaskDefault();
@@ -249,11 +248,12 @@ class LocalTaskDefaultTest extends UnitTestCase {
    * @covers ::getTitle
    */
   public function testGetTitleWithContext() {
-    $this->pluginDefinition['title'] = 'Example';
-    $this->pluginDefinition['title_context'] = 'context';
+    $title = 'Example';
+    $this->pluginDefinition['title'] = (new TranslationWrapper($title, array(), array('context' => 'context')))
+      ->setStringTranslation($this->stringTranslation);
     $this->stringTranslation->expects($this->once())
       ->method('translate')
-      ->with($this->pluginDefinition['title'], array(), array('context' => 'context'))
+      ->with($title, array(), array('context' => 'context'))
       ->will($this->returnValue('Example translated with context'));
 
     $this->setupLocalTaskDefault();
@@ -264,16 +264,16 @@ class LocalTaskDefaultTest extends UnitTestCase {
    * @covers ::getTitle
    */
   public function testGetTitleWithTitleArguments() {
-    $this->pluginDefinition['title'] = 'Example @test';
-    $this->pluginDefinition['title_arguments'] = array('@test' => 'value');
+    $title = 'Example @test';
+    $this->pluginDefinition['title'] = (new TranslationWrapper('Example @test', array('@test' => 'value')))
+      ->setStringTranslation($this->stringTranslation);
     $this->stringTranslation->expects($this->once())
       ->method('translate')
-      ->with($this->pluginDefinition['title'], $this->arrayHasKey('@test'), array())
+      ->with($title, array('@test' => 'value'), array())
       ->will($this->returnValue('Example value'));
 
     $this->setupLocalTaskDefault();
-    $request = new Request();
-    $this->assertEquals('Example value', $this->localTaskBase->getTitle($request));
+    $this->assertEquals('Example value', $this->localTaskBase->getTitle());
   }
 
   /**
diff --git a/core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorAliasTest.php b/core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorAliasTest.php
index bf5203eab..da6bef88b 100644
--- a/core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorAliasTest.php
+++ b/core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorAliasTest.php
@@ -8,8 +8,8 @@
 namespace Drupal\Tests\Core\PathProcessor;
 
 use Drupal\Core\Cache\Cache;
-use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\PathProcessor\PathProcessorAlias;
+use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\Tests\UnitTestCase;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -70,11 +70,11 @@ class PathProcessorAliasTest extends UnitTestCase {
         array('url', NULL, 'url'),
       )));
 
-    $cacheable_metadata = new CacheableMetadata();
-    $this->assertEquals($expected_path, $this->pathProcessor->processOutbound($path, $options, NULL, $cacheable_metadata));
+    $bubbleable_metadata = new BubbleableMetadata();
+    $this->assertEquals($expected_path, $this->pathProcessor->processOutbound($path, $options, NULL, $bubbleable_metadata));
     // Cacheability of paths replaced with path aliases is permanent.
     // @todo https://www.drupal.org/node/2480077
-    $this->assertEquals((new CacheableMetadata())->setCacheMaxAge(Cache::PERMANENT), $cacheable_metadata);
+    $this->assertEquals((new BubbleableMetadata())->setCacheMaxAge(Cache::PERMANENT), $bubbleable_metadata);
   }
 
   /**
diff --git a/core/tests/Drupal/Tests/Core/Plugin/Context/ContextTest.php b/core/tests/Drupal/Tests/Core/Plugin/Context/ContextTest.php
index 97702c7cc..b59ed8aec 100644
--- a/core/tests/Drupal/Tests/Core/Plugin/Context/ContextTest.php
+++ b/core/tests/Drupal/Tests/Core/Plugin/Context/ContextTest.php
@@ -7,8 +7,11 @@
 
 namespace Drupal\Tests\Core\Plugin\Context;
 
+use Drupal\Core\Cache\CacheableDependencyInterface;
 use Drupal\Core\Plugin\Context\Context;
+use Drupal\Core\TypedData\TypedDataInterface;
 use Drupal\Tests\UnitTestCase;
+use Symfony\Component\DependencyInjection\Container;
 
 /**
  * @coversDefaultClass \Drupal\Core\Plugin\Context\Context
@@ -43,6 +46,91 @@ class ContextTest extends UnitTestCase {
   public function setUp() {
     parent::setUp();
 
+    $this->typedDataManager = $this->getMockBuilder('Drupal\Core\TypedData\TypedDataManager')
+      ->disableOriginalConstructor()
+      ->setMethods(array('create'))
+      ->getMock();
+  }
+
+  /**
+   * @covers ::getContextValue
+   */
+  public function testDefaultValue() {
+    $this->setUpDefaultValue();
+
+    $context = new Context($this->contextDefinition);
+    $context->setTypedDataManager($this->typedDataManager);
+    $this->assertEquals('test', $context->getContextValue());
+  }
+
+  /**
+   * @covers ::getContextData
+   */
+  public function testDefaultDataValue() {
+    $this->setUpDefaultValue();
+
+    $context = new Context($this->contextDefinition);
+    $context->setTypedDataManager($this->typedDataManager);
+    $this->assertEquals($this->typedData, $context->getContextData());
+  }
+
+  /**
+   * @covers ::setContextValue
+   */
+  public function testSetContextValueTypedData() {
+
+    $this->contextDefinition = $this->getMockBuilder('Drupal\Core\Plugin\Context\ContextDefinitionInterface')
+      ->setMethods(array('getDefaultValue', 'getDataDefinition'))
+      ->getMockForAbstractClass();
+
+    $context = new Context($this->contextDefinition);
+    $context->setTypedDataManager($this->typedDataManager);
+    $typed_data = $this->getMock('Drupal\Core\TypedData\TypedDataInterface');
+    $context->setContextValue($typed_data);
+    $this->assertSame($typed_data, $context->getContextData());
+  }
+
+  /**
+   * @covers ::setContextValue
+   */
+  public function testSetContextValueCacheableDependency() {
+    $container = new Container();
+    $cache_context_manager = $this->getMockBuilder('Drupal\Core\Cache\CacheContextsManager')
+      ->disableOriginalConstructor()
+      ->getMock();
+    $container->set('cache_contexts_manager', $cache_context_manager);
+    $cache_context_manager->expects($this->any())
+      ->method('validateTokens')
+      ->with(['route'])
+      ->willReturn(['route']);
+    \Drupal::setContainer($container);
+
+    $this->contextDefinition = $this->getMock('Drupal\Core\Plugin\Context\ContextDefinitionInterface');
+
+    $context = new Context($this->contextDefinition);
+    $context->setTypedDataManager($this->typedDataManager);
+    $cacheable_dependency = $this->getMock('Drupal\Tests\Core\Plugin\Context\TypedDataCacheableDependencyInterface');
+    $cacheable_dependency->expects($this->once())
+      ->method('getCacheTags')
+      ->willReturn(['node:1']);
+    $cacheable_dependency->expects($this->once())
+      ->method('getCacheContexts')
+      ->willReturn(['route']);
+    $cacheable_dependency->expects($this->once())
+      ->method('getCacheMaxAge')
+      ->willReturn(60);
+
+    $context->setContextValue($cacheable_dependency);
+    $this->assertSame($cacheable_dependency, $context->getContextData());
+    $this->assertEquals(['node:1'], $context->getCacheTags());
+    $this->assertEquals(['route'], $context->getCacheContexts());
+    $this->assertEquals(60, $context->getCacheMaxAge());
+  }
+
+  /**
+   * Set up mocks for the getDefaultValue() method call.
+   */
+  protected function setUpDefaultValue() {
     $mock_data_definition = $this->getMock('Drupal\Core\TypedData\DataDefinitionInterface');
 
     $this->contextDefinition = $this->getMockBuilder('Drupal\Core\Plugin\Context\ContextDefinitionInterface')
@@ -59,33 +147,14 @@ class ContextTest extends UnitTestCase {
 
     $this->typedData = $this->getMock('Drupal\Core\TypedData\TypedDataInterface');
 
-    $this->typedDataManager = $this->getMockBuilder('Drupal\Core\TypedData\TypedDataManager')
-      ->disableOriginalConstructor()
-      ->setMethods(array('create'))
-      ->getMock();
-
     $this->typedDataManager->expects($this->once())
       ->method('create')
       ->with($mock_data_definition, 'test')
       ->willReturn($this->typedData);
   }
-
-  /**
-   * @covers ::getContextValue
-   */
-  public function testDefaultValue() {
-    $context = new Context($this->contextDefinition);
-    $context->setTypedDataManager($this->typedDataManager);
-    $this->assertEquals('test', $context->getContextValue());
-  }
-
-  /**
-   * @covers ::getContextData
-   */
-  public function testDefaultDataValue() {
-    $context = new Context($this->contextDefinition);
-    $context->setTypedDataManager($this->typedDataManager);
-    $this->assertEquals($this->typedData, $context->getContextData());
-  }
-
 }
+
+/**
+ * Test interface used for mocking.
+ */
+interface TypedDataCacheableDependencyInterface extends CacheableDependencyInterface, TypedDataInterface { }
diff --git a/core/tests/Drupal/Tests/Core/Plugin/Context/LazyContextRepositoryTest.php b/core/tests/Drupal/Tests/Core/Plugin/Context/LazyContextRepositoryTest.php
new file mode 100644
index 000000000..73a2b3a36
--- /dev/null
+++ b/core/tests/Drupal/Tests/Core/Plugin/Context/LazyContextRepositoryTest.php
@@ -0,0 +1,152 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\Core\Plugin\Context\LazyContextRepositoryTest.
+ */
+
+namespace Drupal\Tests\Core\Plugin\Context;
+
+use Drupal\Core\Plugin\Context\Context;
+use Drupal\Core\Plugin\Context\ContextDefinition;
+use Drupal\Core\Plugin\Context\LazyContextRepository;
+use Drupal\Tests\UnitTestCase;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+ * @coversDefaultClass \Drupal\Core\Plugin\Context\LazyContextRepository
+ * @group context
+ */
+class LazyContextRepositoryTest extends UnitTestCase {
+
+  /**
+   * The container.
+   *
+   * @var \Symfony\Component\DependencyInjection\ContainerBuilder
+   */
+  protected $container;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->container = new ContainerBuilder();
+  }
+
+  /**
+   * @covers ::getRuntimeContexts
+   */
+  public function testGetRuntimeContextsSingle() {
+    $contexts = $this->setupContextAndProvider('test_provider', ['test_context']);
+
+    $lazy_context_repository = new LazyContextRepository($this->container, ['test_provider']);
+    $run_time_contexts = $lazy_context_repository->getRuntimeContexts(['@test_provider:test_context']);
+    $this->assertEquals(['@test_provider:test_context' => $contexts[0]], $run_time_contexts);
+  }
+
+  /**
+   * @covers ::getRuntimeContexts
+   */
+  public function testGetRuntimeMultipleContextsPerService() {
+    $contexts = $this->setupContextAndProvider('test_provider', ['test_context0', 'test_context1']);
+
+    $lazy_context_repository = new LazyContextRepository($this->container, ['test_provider']);
+    $run_time_contexts = $lazy_context_repository->getRuntimeContexts(['@test_provider:test_context0', '@test_provider:test_context1']);
+    $this->assertEquals(['@test_provider:test_context0' => $contexts[0], '@test_provider:test_context1' => $contexts[1]], $run_time_contexts);
+  }
+
+  /**
+   * @covers ::getRuntimeContexts
+   */
+  public function testGetRuntimeMultipleContextProviders() {
+    $contexts0 = $this->setupContextAndProvider('test_provider', ['test_context0', 'test_context1'], ['test_context0']);
+    $contexts1 = $this->setupContextAndProvider('test_provider2', ['test1_context0', 'test1_context1'], ['test1_context0']);
+
+    $lazy_context_repository = new LazyContextRepository($this->container, ['test_provider']);
+    $run_time_contexts = $lazy_context_repository->getRuntimeContexts(['@test_provider:test_context0', '@test_provider2:test1_context0']);
+    $this->assertEquals(['@test_provider:test_context0' => $contexts0[0], '@test_provider2:test1_context0' => $contexts1[1]], $run_time_contexts);
+  }
+
+  /**
+   * @covers ::getRuntimeContexts
+   * @expectedException \InvalidArgumentException
+   * @expectedExceptionMessage You must provide the context IDs in the @{service_id}:{unqualified_context_id} format.
+   */
+  public function testInvalidContextId() {
+    $lazy_context_repository = new LazyContextRepository($this->container, ['test_provider']);
+    $lazy_context_repository->getRuntimeContexts(['test_context', '@test_provider:test_context1']);
+  }
+
+  /**
+   * @covers ::getRuntimeContexts
+   */
+  public function testGetRuntimeStaticCache() {
+    $context0 = new Context(new ContextDefinition('example'));
+    $context1 = new Context(new ContextDefinition('example'));
+
+    $context_provider = $this->prophesize('\Drupal\Core\Plugin\Context\ContextProviderInterface');
+    $context_provider->getRuntimeContexts(['test_context0', 'test_context1'])
+      ->shouldBeCalledTimes(1)
+      ->willReturn(['test_context0' => $context0, 'test_context1' => $context1]);
+    $context_provider = $context_provider->reveal();
+    $this->container->set('test_provider', $context_provider);
+
+    $lazy_context_repository = new LazyContextRepository($this->container, ['test_provider']);
+    $lazy_context_repository->getRuntimeContexts(['@test_provider:test_context0', '@test_provider:test_context1']);
+    $lazy_context_repository->getRuntimeContexts(['@test_provider:test_context0', '@test_provider:test_context1']);
+  }
+
+  /**
+   * @covers ::getAvailableContexts
+   */
+  public function testGetAvailableContexts() {
+    $contexts0 = $this->setupContextAndProvider('test_provider0', ['test0_context0', 'test0_context1']);
+    $contexts1 = $this->setupContextAndProvider('test_provider1', ['test1_context0', 'test1_context1']);
+
+    $lazy_context_repository = new LazyContextRepository($this->container, ['test_provider0', 'test_provider1']);
+    $contexts = $lazy_context_repository->getAvailableContexts();
+
+    $this->assertEquals([
+      '@test_provider0:test0_context0' => $contexts0[0],
+      '@test_provider0:test0_context1' => $contexts0[1],
+      '@test_provider1:test1_context0' => $contexts1[0],
+      '@test_provider1:test1_context1' => $contexts1[1],
+    ], $contexts);
+
+  }
+
+  /**
+   * Sets up contexts and context providers.
+   *
+   * @param string $service_id
+   *   The service ID of the service provider.
+   * @param string[] $unqualified_context_ids
+   *   An array of context slot names.
+   * @param string[] $expected_unqualified_context_ids
+   *   The expected unqualified context IDs passed to getRuntimeContexts.
+   *
+   * @return array
+   *   An array of set up contexts.
+   */
+  protected function setupContextAndProvider($service_id, array $unqualified_context_ids, array $expected_unqualified_context_ids = []) {
+    $contexts = [];
+    for ($i = 0; $i < count($unqualified_context_ids); $i++) {
+      $contexts[] = new Context(new ContextDefinition('example'));
+    }
+
+    $expected_unqualified_context_ids = $expected_unqualified_context_ids ?: $unqualified_context_ids;
+
+    $context_provider = $this->prophesize('\Drupal\Core\Plugin\Context\ContextProviderInterface');
+    $context_provider->getRuntimeContexts($expected_unqualified_context_ids)
+      ->willReturn(array_combine($unqualified_context_ids, $contexts));
+    $context_provider->getAvailableContexts()
+      ->willReturn(array_combine($unqualified_context_ids, $contexts));
+    $context_provider = $context_provider->reveal();
+    $this->container->set($service_id, $context_provider);
+
+    return $contexts;
+  }
+
+}
diff --git a/core/tests/Drupal/Tests/Core/Plugin/ContextHandlerTest.php b/core/tests/Drupal/Tests/Core/Plugin/ContextHandlerTest.php
index 5427dd692..8900fddfd 100644
--- a/core/tests/Drupal/Tests/Core/Plugin/ContextHandlerTest.php
+++ b/core/tests/Drupal/Tests/Core/Plugin/ContextHandlerTest.php
@@ -233,6 +233,9 @@ class ContextHandlerTest extends UnitTestCase {
     $context_hit->expects($this->atLeastOnce())
       ->method('getContextValue')
       ->will($this->returnValue(array('foo')));
+    $context_hit->expects($this->atLeastOnce())
+      ->method('hasContextValue')
+      ->willReturn(TRUE);
     $context_miss = $this->getMock('Drupal\Core\Plugin\Context\ContextInterface');
     $context_miss->expects($this->never())
       ->method('getContextValue');
@@ -242,24 +245,39 @@ class ContextHandlerTest extends UnitTestCase {
       'miss' => $context_miss,
     );
 
+    $context_definition = $this->getMock('Drupal\Core\Plugin\Context\ContextDefinitionInterface');
+
     $plugin = $this->getMock('Drupal\Core\Plugin\ContextAwarePluginInterface');
     $plugin->expects($this->once())
       ->method('getContextMapping')
       ->willReturn([]);
     $plugin->expects($this->once())
       ->method('getContextDefinitions')
-      ->will($this->returnValue(array('hit' => 'hit')));
+      ->will($this->returnValue(array('hit' => $context_definition)));
     $plugin->expects($this->once())
       ->method('setContextValue')
       ->with('hit', array('foo'));
 
+    // Make sure that the cacheability metadata is passed to the plugin context.
+    $plugin_context = $this->getMock('Drupal\Core\Plugin\Context\ContextInterface');
+    $plugin_context->expects($this->once())
+      ->method('addCacheableDependency')
+      ->with($context_hit);
+    $plugin->expects($this->once())
+      ->method('getContext')
+      ->with('hit')
+      ->willReturn($plugin_context);
+
     $this->contextHandler->applyContextMapping($plugin, $contexts);
   }
 
   /**
    * @covers ::applyContextMapping
+   *
+   * @expectedException \Drupal\Component\Plugin\Exception\ContextException
+   * @expectedExceptionMessage Required contexts without a value: hit.
    */
-  public function testApplyContextMappingConfigurable() {
+  public function testApplyContextMappingMissingRequired() {
     $context = $this->getMock('Drupal\Core\Plugin\Context\ContextInterface');
     $context->expects($this->never())
       ->method('getContextValue');
@@ -268,13 +286,126 @@ class ContextHandlerTest extends UnitTestCase {
       'name' => $context,
     );
 
+    $context_definition = $this->getMock('Drupal\Core\Plugin\Context\ContextDefinitionInterface');
+    $context_definition->expects($this->atLeastOnce())
+      ->method('isRequired')
+      ->willReturn(TRUE);
+
     $plugin = $this->getMock('Drupal\Tests\Core\Plugin\TestConfigurableContextAwarePluginInterface');
     $plugin->expects($this->once())
       ->method('getContextMapping')
       ->willReturn([]);
     $plugin->expects($this->once())
       ->method('getContextDefinitions')
-      ->will($this->returnValue(array('hit' => 'hit')));
+      ->will($this->returnValue(array('hit' => $context_definition)));
+    $plugin->expects($this->never())
+      ->method('setContextValue');
+
+    // No context, so no cacheability metadata can be passed along.
+    $plugin->expects($this->never())
+      ->method('getContext');
+
+    $this->contextHandler->applyContextMapping($plugin, $contexts);
+  }
+
+  /**
+   * @covers ::applyContextMapping
+   */
+  public function testApplyContextMappingMissingNotRequired() {
+    $context = $this->getMock('Drupal\Core\Plugin\Context\ContextInterface');
+    $context->expects($this->never())
+      ->method('getContextValue');
+
+    $contexts = array(
+      'name' => $context,
+    );
+
+    $context_definition = $this->getMock('Drupal\Core\Plugin\Context\ContextDefinitionInterface');
+    $context_definition->expects($this->atLeastOnce())
+      ->method('isRequired')
+      ->willReturn(FALSE);
+
+    $plugin = $this->getMock('Drupal\Tests\Core\Plugin\TestConfigurableContextAwarePluginInterface');
+    $plugin->expects($this->once())
+      ->method('getContextMapping')
+      ->willReturn(['optional' => 'missing']);
+    $plugin->expects($this->once())
+      ->method('getContextDefinitions')
+      ->will($this->returnValue(array('optional' => $context_definition)));
+    $plugin->expects($this->never())
+      ->method('setContextValue');
+
+    // No context, so no cacheability metadata can be passed along.
+    $plugin->expects($this->never())
+      ->method('getContext');
+
+    $this->contextHandler->applyContextMapping($plugin, $contexts);
+  }
+
+  /**
+   * @covers ::applyContextMapping
+   *
+   * @expectedException \Drupal\Component\Plugin\Exception\ContextException
+   * @expectedExceptionMessage Required contexts without a value: hit.
+   */
+  public function testApplyContextMappingNoValueRequired() {
+    $context = $this->getMock('Drupal\Core\Plugin\Context\ContextInterface');
+    $context->expects($this->never())
+      ->method('getContextValue');
+    $context->expects($this->atLeastOnce())
+      ->method('hasContextValue')
+      ->willReturn(FALSE);
+
+    $contexts = array(
+      'hit' => $context,
+    );
+
+    $context_definition = $this->getMock('Drupal\Core\Plugin\Context\ContextDefinitionInterface');
+    $context_definition->expects($this->atLeastOnce())
+      ->method('isRequired')
+      ->willReturn(TRUE);
+
+    $plugin = $this->getMock('Drupal\Tests\Core\Plugin\TestConfigurableContextAwarePluginInterface');
+    $plugin->expects($this->once())
+      ->method('getContextMapping')
+      ->willReturn([]);
+    $plugin->expects($this->once())
+      ->method('getContextDefinitions')
+      ->will($this->returnValue(array('hit' => $context_definition)));
+    $plugin->expects($this->never())
+      ->method('setContextValue');
+
+    $this->contextHandler->applyContextMapping($plugin, $contexts);
+  }
+
+
+  /**
+   * @covers ::applyContextMapping
+   */
+  public function testApplyContextMappingNoValueNonRequired() {
+    $context = $this->getMock('Drupal\Core\Plugin\Context\ContextInterface');
+    $context->expects($this->never())
+      ->method('getContextValue');
+    $context->expects($this->atLeastOnce())
+      ->method('hasContextValue')
+      ->willReturn(FALSE);
+
+    $contexts = array(
+      'hit' => $context,
+    );
+
+    $context_definition = $this->getMock('Drupal\Core\Plugin\Context\ContextDefinitionInterface');
+    $context_definition->expects($this->atLeastOnce())
+      ->method('isRequired')
+      ->willReturn(FALSE);
+
+    $plugin = $this->getMock('Drupal\Tests\Core\Plugin\TestConfigurableContextAwarePluginInterface');
+    $plugin->expects($this->once())
+      ->method('getContextMapping')
+      ->willReturn([]);
+    $plugin->expects($this->once())
+      ->method('getContextDefinitions')
+      ->will($this->returnValue(array('hit' => $context_definition)));
     $plugin->expects($this->never())
       ->method('setContextValue');
 
@@ -289,22 +420,37 @@ class ContextHandlerTest extends UnitTestCase {
     $context->expects($this->atLeastOnce())
       ->method('getContextValue')
       ->will($this->returnValue(array('foo')));
+    $context->expects($this->atLeastOnce())
+      ->method('hasContextValue')
+      ->willReturn(TRUE);
 
     $contexts = array(
       'name' => $context,
     );
 
+    $context_definition = $this->getMock('Drupal\Core\Plugin\Context\ContextDefinitionInterface');
+
     $plugin = $this->getMock('Drupal\Tests\Core\Plugin\TestConfigurableContextAwarePluginInterface');
     $plugin->expects($this->once())
       ->method('getContextMapping')
       ->willReturn([]);
     $plugin->expects($this->once())
       ->method('getContextDefinitions')
-      ->will($this->returnValue(array('hit' => 'hit')));
+      ->will($this->returnValue(array('hit' => $context_definition)));
     $plugin->expects($this->once())
       ->method('setContextValue')
       ->with('hit', array('foo'));
 
+    // Make sure that the cacheability metadata is passed to the plugin context.
+    $plugin_context = $this->getMock('Drupal\Core\Plugin\Context\ContextInterface');
+    $plugin_context->expects($this->once())
+      ->method('addCacheableDependency')
+      ->with($context);
+    $plugin->expects($this->once())
+      ->method('getContext')
+      ->with('hit')
+      ->willReturn($plugin_context);
+
     $this->contextHandler->applyContextMapping($plugin, $contexts, ['hit' => 'name']);
   }
 
@@ -323,13 +469,15 @@ class ContextHandlerTest extends UnitTestCase {
       'name' => $context,
     );
 
+    $context_definition = $this->getMock('Drupal\Core\Plugin\Context\ContextDefinitionInterface');
+
     $plugin = $this->getMock('Drupal\Tests\Core\Plugin\TestConfigurableContextAwarePluginInterface');
     $plugin->expects($this->once())
       ->method('getContextMapping')
       ->willReturn([]);
     $plugin->expects($this->once())
       ->method('getContextDefinitions')
-      ->will($this->returnValue(array('hit' => 'hit')));
+      ->will($this->returnValue(array('hit' => $context_definition)));
     $plugin->expects($this->never())
       ->method('setContextValue');
 
diff --git a/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDiscoveryTest.php b/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDiscoveryTest.php
index 3aa99e405..22aacc4f5 100644
--- a/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDiscoveryTest.php
+++ b/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDiscoveryTest.php
@@ -7,8 +7,10 @@
 
 namespace Drupal\Tests\Core\Plugin\Discovery;
 
+use Drupal\Core\StringTranslation\TranslationWrapper;
 use Drupal\Tests\UnitTestCase;
 use Drupal\Core\Plugin\Discovery\YamlDiscovery;
+use org\bovigo\vfs\vfsStream;
 
 /**
  * @coversDefaultClass \Drupal\Core\Plugin\Discovery\YamlDiscovery
@@ -70,6 +72,44 @@ class YamlDiscoveryTest extends UnitTestCase {
     }
   }
 
+  /**
+   * @covers ::getDefinitions
+   */
+  public function testGetDefinitionsWithTranslatableDefinitions() {
+    vfsStream::setup('root');
+
+    $file_1 = <<<'EOS'
+test_plugin:
+  title: test title
+EOS;
+    $file_2 = <<<'EOS'
+test_plugin2:
+  title: test title2
+  title_context: 'test-context'
+EOS;
+    vfsStream::create([
+      'test_1' => [
+        'test_1.test.yml' => $file_1,
+      ],
+      'test_2' => [
+        'test_2.test.yml' => $file_2,
+      ]]
+    );
+
+    $discovery = new YamlDiscovery('test', ['test_1' => vfsStream::url('root/test_1'), 'test_2' => vfsStream::url('root/test_2')]);
+    $discovery->addTranslatableProperty('title', 'title_context');
+    $definitions = $discovery->getDefinitions();
+
+    $this->assertCount(2, $definitions);
+    $plugin_1 = $definitions['test_plugin'];
+    $plugin_2 = $definitions['test_plugin2'];
+
+    $this->assertInstanceOf(TranslationWrapper::class, $plugin_1['title']);
+    $this->assertEquals([], $plugin_1['title']->getOptions());
+    $this->assertInstanceOf(TranslationWrapper::class, $plugin_2['title']);
+    $this->assertEquals(['context' => 'test-context'], $plugin_2['title']->getOptions());
+  }
+
   /**
    * Tests the getDefinition() method.
    */
diff --git a/core/tests/Drupal/Tests/Core/ProxyBuilder/ProxyBuilderTest.php b/core/tests/Drupal/Tests/Core/ProxyBuilder/ProxyBuilderTest.php
index f04b75abf..c18b00cfd 100644
--- a/core/tests/Drupal/Tests/Core/ProxyBuilder/ProxyBuilderTest.php
+++ b/core/tests/Drupal/Tests/Core/ProxyBuilder/ProxyBuilderTest.php
@@ -44,11 +44,14 @@ class ProxyBuilderTest extends UnitTestCase {
     // @todo Solve the silly linebreak for array()
     $method_body = <<<'EOS'
 
-    public function complexMethod($parameter, callable $function, \Drupal\Tests\Core\ProxyBuilder\TestServiceNoMethod $test_service = NULL, array &$elements = array (
-    ))
-    {
-        return $this->lazyLoadItself()->complexMethod($parameter, $function, $test_service, $elements);
-    }
+/**
+ * {@inheritdoc}
+ */
+public function complexMethod($parameter, callable $function, \Drupal\Tests\Core\ProxyBuilder\TestServiceNoMethod $test_service = NULL, array &$elements = array (
+))
+{
+    return $this->lazyLoadItself()->complexMethod($parameter, $function, $test_service, $elements);
+}
 
 EOS;
 
@@ -65,55 +68,88 @@ EOS;
    *   The code of the entire proxy.
    */
   protected function buildExpectedClass($class, $expected_methods_body, $interface_string = '') {
-    $proxy_class = $this->proxyBuilder->buildProxyClassName($class);
+    $reflection = new \ReflectionClass($class);
+    $namespace = ProxyBuilder::buildProxyNamespace($class);
+    $proxy_class = $reflection->getShortName();
     $expected_string = <<<'EOS'
-/**
- * Provides a proxy class for \{{ class }}.
- *
- * @see \Drupal\Component\ProxyBuilder
- */
-class {{ proxy_class }}{{ interface_string }}
-{
 
-    use \Drupal\Core\DependencyInjection\DependencySerializationTrait;
+namespace {{ namespace }} {
 
     /**
-     * @var string
-     */
-    protected $serviceId;
-
-    /**
-     * @var \{{ class }}
-     */
-    protected $service;
-
-    /**
-     * The service container.
+     * Provides a proxy class for \{{ class }}.
      *
-     * @var \Symfony\Component\DependencyInjection\ContainerInterface
+     * @see \Drupal\Component\ProxyBuilder
      */
-    protected $container;
-
-    public function __construct(\Symfony\Component\DependencyInjection\ContainerInterface $container, $serviceId)
+    class {{ proxy_class }}{{ interface_string }}
     {
-        $this->container = $container;
-        $this->serviceId = $serviceId;
-    }
 
-    protected function lazyLoadItself()
-    {
-        if (!isset($this->service)) {
-            $method_name = 'get' . Container::camelize($this->serviceId) . 'Service';
-            $this->service = $this->container->$method_name(false);
+        use \Drupal\Core\DependencyInjection\DependencySerializationTrait;
+
+        /**
+         * The id of the original proxied service.
+         *
+         * @var string
+         */
+        protected $drupalProxyOriginalServiceId;
+
+        /**
+         * The real proxied service, after it was lazy loaded.
+         *
+         * @var \{{ class }}
+         */
+        protected $service;
+
+        /**
+         * The service container.
+         *
+         * @var \Symfony\Component\DependencyInjection\ContainerInterface
+         */
+        protected $container;
+
+        /**
+         * Constructs a ProxyClass Drupal proxy object.
+         *
+         * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
+         *   The container.
+         * @param string $drupal_proxy_original_service_id
+         *   The service ID of the original service.
+         */
+        public function __construct(\Symfony\Component\DependencyInjection\ContainerInterface $container, $drupal_proxy_original_service_id)
+        {
+            $this->container = $container;
+            $this->drupalProxyOriginalServiceId = $drupal_proxy_original_service_id;
         }
 
-        return $this->service;
-    }
+        /**
+         * Lazy loads the real service from the container.
+         *
+         * @return object
+         *   Returns the constructed real service.
+         */
+        protected function lazyLoadItself()
+        {
+            if (!isset($this->service)) {
+                $this->service = $this->container->get($this->drupalProxyOriginalServiceId);
+            }
+
+            return $this->service;
+        }
 {{ expected_methods_body }}
+    }
+
 }
 
 EOS;
+
+    $expected_methods_body = implode("\n", array_map(function ($value) {
+      if ($value === '') {
+        return $value;
+      }
+      return "        $value";
+    }, explode("\n", $expected_methods_body)));
+
     $expected_string = str_replace('{{ proxy_class }}', $proxy_class, $expected_string);
+    $expected_string = str_replace('{{ namespace }}', $namespace, $expected_string);
     $expected_string = str_replace('{{ class }}', $class, $expected_string);
     $expected_string = str_replace('{{ expected_methods_body }}', $expected_methods_body, $expected_string);
     $expected_string = str_replace('{{ interface_string }}', $interface_string, $expected_string);
diff --git a/core/tests/Drupal/Tests/Core/Render/BubbleableMetadataTest.php b/core/tests/Drupal/Tests/Core/Render/BubbleableMetadataTest.php
index 52b6ef503..e695c7923 100644
--- a/core/tests/Drupal/Tests/Core/Render/BubbleableMetadataTest.php
+++ b/core/tests/Drupal/Tests/Core/Render/BubbleableMetadataTest.php
@@ -648,4 +648,52 @@ class BubbleableMetadataTest extends UnitTestCase {
     ];
   }
 
+
+  /**
+   * @covers ::addCacheableDependency
+   * @dataProvider providerTestMerge
+   *
+   * This only tests at a high level, because it reuses existing logic. Detailed
+   * tests exist for the existing logic:
+   *
+   * @see \Drupal\Tests\Core\Cache\CacheTest::testMergeTags()
+   * @see \Drupal\Tests\Core\Cache\CacheTest::testMergeMaxAges()
+   * @see \Drupal\Tests\Core\Cache\CacheContextsTest
+   */
+  public function testAddCacheableDependency(BubbleableMetadata $a, $b, BubbleableMetadata $expected) {
+    $cache_contexts_manager = $this->getMockBuilder('Drupal\Core\Cache\Context\CacheContextsManager')
+      ->disableOriginalConstructor()
+      ->getMock();
+    $container = new ContainerBuilder();
+    $container->set('cache_contexts_manager', $cache_contexts_manager);
+    \Drupal::setContainer($container);
+
+    $this->assertEquals($expected, $a->addCacheableDependency($b));
+  }
+
+  /**
+   * Provides test data for testMerge().
+   *
+   * @return array
+   */
+  public function providerTestAddCachableDependency() {
+    return [
+      // Merge in a cacheable metadata.
+      'merge-cacheable-metadata' => [
+        (new BubbleableMetadata())->setCacheContexts(['foo'])->setCacheTags(['foo'])->setCacheMaxAge(20),
+        (new CacheableMetadata())->setCacheContexts(['bar'])->setCacheTags(['bar'])->setCacheMaxAge(60),
+        (new BubbleableMetadata())->setCacheContexts(['foo', 'bar'])->setCacheTags(['foo', 'bar'])->setCacheMaxAge(20)
+      ],
+      'merge-bubbleable-metadata' => [
+        (new BubbleableMetadata())->setCacheContexts(['foo'])->setCacheTags(['foo'])->setCacheMaxAge(20)->setAttachments(['foo' => []]),
+        (new BubbleableMetadata())->setCacheContexts(['bar'])->setCacheTags(['bar'])->setCacheMaxAge(60)->setAttachments(['bar' => []]),
+        (new BubbleableMetadata())->setCacheContexts(['foo', 'bar'])->setCacheTags(['foo', 'bar'])->setCacheMaxAge(20)->setAttachments(['foo' => [], 'bar' => []])
+      ],
+      'merge-attachments-metadata' => [
+        (new BubbleableMetadata())->setAttachments(['foo' => []]),
+        (new BubbleableMetadata())->setAttachments(['baro' => []]),
+        (new BubbleableMetadata())->setAttachments(['foo' => [], 'bar' => []])
+      ],
+    ];
+  }
 }
diff --git a/core/tests/Drupal/Tests/Core/Render/Element/RenderElementTest.php b/core/tests/Drupal/Tests/Core/Render/Element/RenderElementTest.php
new file mode 100644
index 000000000..35a0dab5c
--- /dev/null
+++ b/core/tests/Drupal/Tests/Core/Render/Element/RenderElementTest.php
@@ -0,0 +1,117 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\Core\Render\Element\RenderElementTest.
+ */
+
+namespace Drupal\Tests\Core\Render\Element;
+
+use Drupal\Core\DependencyInjection\ContainerBuilder;
+use Drupal\Core\Form\FormBuilderInterface;
+use Drupal\Core\GeneratedUrl;
+use Drupal\Core\Render\Element\RenderElement;
+use Drupal\Tests\UnitTestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+
+/**
+ * @coversDefaultClass \Drupal\Core\Render\Element\RenderElement
+ * @group Render
+ */
+class RenderElementTest extends UnitTestCase {
+
+  /**
+   * The request stack.
+   *
+   * @var \Symfony\Component\HttpFoundation\RequestStack
+   */
+  protected $requestStack;
+
+  /**
+   * The container.
+   *
+   * @var \Drupal\Core\DependencyInjection\ContainerBuilder
+   */
+  protected $container;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->requestStack = new RequestStack();
+    $this->container = new ContainerBuilder();
+    $this->container->set('request_stack', $this->requestStack);
+    \Drupal::setContainer($this->container);
+  }
+
+  /**
+   * @covers ::preRenderAjaxForm
+   */
+  public function testPreRenderAjaxForm() {
+    $request = Request::create('/test');
+    $request->query->set('foo', 'bar');
+    $this->requestStack->push($request);
+
+    $prophecy = $this->prophesize('Drupal\Core\Routing\UrlGeneratorInterface');
+    $url = '/test?foo=bar&ajax_form=1';
+    $prophecy->generateFromRoute('<current>', [], ['query' => ['foo' => 'bar', FormBuilderInterface::AJAX_FORM_REQUEST => TRUE]], TRUE)
+      ->willReturn((new GeneratedUrl())->setCacheContexts(['route'])->setGeneratedUrl($url));
+
+    $url_generator = $prophecy->reveal();
+    $this->container->set('url_generator', $url_generator);
+
+    $element = [
+      '#type' => 'select',
+      '#id' => 'test',
+      '#ajax' => [
+        'wrapper' => 'foo',
+        'callback' => 'test-callback',
+      ],
+    ];
+
+    $element = RenderElement::preRenderAjaxForm($element);
+
+    $this->assertTrue($element['#ajax_processed']);
+    $this->assertEquals($url, $element['#attached']['drupalSettings']['ajax']['test']['url']);
+  }
+
+  /**
+   * @covers ::preRenderAjaxForm
+   */
+  public function testPreRenderAjaxFormWithQueryOptions() {
+    $request = Request::create('/test');
+    $request->query->set('foo', 'bar');
+    $this->requestStack->push($request);
+
+    $prophecy = $this->prophesize('Drupal\Core\Routing\UrlGeneratorInterface');
+    $url = '/test?foo=bar&other=query&ajax_form=1';
+    $prophecy->generateFromRoute('<current>', [], ['query' => ['foo' => 'bar', 'other' => 'query', FormBuilderInterface::AJAX_FORM_REQUEST => TRUE]], TRUE)
+      ->willReturn((new GeneratedUrl())->setCacheContexts(['route'])->setGeneratedUrl($url));
+
+    $url_generator = $prophecy->reveal();
+    $this->container->set('url_generator', $url_generator);
+
+    $element = [
+      '#type' => 'select',
+      '#id' => 'test',
+      '#ajax' => [
+        'wrapper' => 'foo',
+        'callback' => 'test-callback',
+        'options' => [
+          'query' => [
+            'other' => 'query',
+          ],
+        ],
+      ],
+    ];
+
+    $element = RenderElement::preRenderAjaxForm($element);
+
+    $this->assertTrue($element['#ajax_processed']);
+    $this->assertEquals($url, $element['#attached']['drupalSettings']['ajax']['test']['url']);
+  }
+
+}
diff --git a/core/tests/Drupal/Tests/Core/Render/ElementTest.php b/core/tests/Drupal/Tests/Core/Render/ElementTest.php
index 75c0645e5..414922211 100644
--- a/core/tests/Drupal/Tests/Core/Render/ElementTest.php
+++ b/core/tests/Drupal/Tests/Core/Render/ElementTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\Tests\Core\Render;
 
+use Drupal\Core\Access\AccessResult;
 use Drupal\Tests\UnitTestCase;
 use Drupal\Core\Render\Element;
 
@@ -151,6 +152,8 @@ class ElementTest extends UnitTestCase {
       array(array('#property1' => '', 'child1' => array()), array('child1')),
       array(array('#property1' => '', 'child1' => array(), 'child2' => array('#access' => TRUE)), array('child1', 'child2')),
       array(array('#property1' => '', 'child1' => array(), 'child2' => array('#access' => FALSE)), array('child1')),
+      'access_result_object_allowed' => array(array('#property1' => '', 'child1' => array(), 'child2' => array('#access' => AccessResult::allowed())), array('child1', 'child2')),
+      'access_result_object_forbidden' => array(array('#property1' => '', 'child1' => array(), 'child2' => array('#access' => AccessResult::forbidden())), array('child1')),
       array(array('#property1' => '', 'child1' => array(), 'child2' => array('#type' => 'textfield')), array('child1', 'child2')),
       array(array('#property1' => '', 'child1' => array(), 'child2' => array('#type' => 'value')), array('child1')),
       array(array('#property1' => '', 'child1' => array(), 'child2' => array('#type' => 'hidden')), array('child1')),
diff --git a/core/tests/Drupal/Tests/Core/Render/MetadataBubblingUrlGeneratorTest.php b/core/tests/Drupal/Tests/Core/Render/MetadataBubblingUrlGeneratorTest.php
new file mode 100644
index 000000000..29e3fbf70
--- /dev/null
+++ b/core/tests/Drupal/Tests/Core/Render/MetadataBubblingUrlGeneratorTest.php
@@ -0,0 +1,84 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\Core\Render\MetadataBubblingUrlGeneratorTest.
+ */
+
+namespace Drupal\Tests\Core\Render;
+
+use Drupal\Core\Render\MetadataBubblingUrlGenerator;
+use Drupal\Core\Url;
+use Drupal\Tests\Core\Routing\UrlGeneratorTest;
+
+/**
+ * Confirm that the MetadataBubblingUrlGenerator is functioning properly.
+ *
+ * @coversDefaultClass \Drupal\Core\Render\MetadataBubblingUrlGenerator
+ *
+ * @group Render
+ */
+class MetadataBubblingUrlGeneratorTest extends UrlGeneratorTest {
+
+  /**
+   * The renderer.
+   *
+   * @var \Drupal\Core\Render\RendererInterface|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $renderer;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->renderer = $this->getMock('\Drupal\Core\Render\RendererInterface');
+    $this->renderer->expects($this->any())
+      ->method('hasRenderContext')
+      ->willReturn(TRUE);
+
+    $this->generator = new MetadataBubblingUrlGenerator($this->generator, $this->renderer);
+  }
+
+  /**
+   * Tests bubbling of cacheable metadata for URLs.
+   *
+   * @param bool $collect_bubbleable_metadata
+   *   Whether bubbleable metadata should be collected.
+   * @param int $invocations
+   *   The expected amount of invocations for the ::bubble() method.
+   * @param array $options
+   *   The URL options.
+   *
+   * @covers ::bubble
+   *
+   * @dataProvider providerUrlBubbleableMetadataBubbling
+   */
+  public function testUrlBubbleableMetadataBubbling($collect_bubbleable_metadata, $invocations, array $options) {
+    $self = $this;
+
+    $this->renderer->expects($this->exactly($invocations))
+      ->method('render')
+      ->willReturnCallback(function ($build) use ($self) {
+        $self->assertTrue(!empty($build['#cache']));
+      });
+
+    $url = new Url('test_1', [], $options);
+    $url->setUrlGenerator($this->generator);
+    $url->toString($collect_bubbleable_metadata);
+  }
+
+  /**
+   * Data provider for ::testUrlBubbleableMetadataBubbling().
+   */
+  public function providerUrlBubbleableMetadataBubbling() {
+    return [
+      // No bubbling when bubbleable metadata is collected.
+      [TRUE, 0, []],
+      // Bubbling when bubbleable metadata is not collected.
+      [FALSE, 1, []],
+    ];
+  }
+
+}
diff --git a/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php b/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php
index 20375882f..d659849f4 100644
--- a/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php
+++ b/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php
@@ -125,6 +125,7 @@ class RendererBubblingTest extends RendererTestBase {
         'contexts' => ['bar', 'foo'],
         'tags' => [],
         'bin' => $bin,
+        'max-age' => 3600,
       ],
     ], $bin);
   }
@@ -279,6 +280,7 @@ class RendererBubblingTest extends RendererTestBase {
           'contexts' => ['bar', 'foo'],
           'tags' => ['dee', 'fiddle', 'har', 'yar'],
           'bin' => 'render',
+          'max-age' => Cache::PERMANENT,
         ],
       ],
       'parent:bar:foo' => [
@@ -325,6 +327,8 @@ class RendererBubblingTest extends RendererTestBase {
           '#cache' => [
             'contexts' => ['foo'],
             'tags' => ['c'],
+            // A lower max-age; the redirecting cache item should be updated.
+            'max-age' => 1800,
           ],
           'grandgrandchild' => [
             '#access_callback' => function () {
@@ -335,6 +339,8 @@ class RendererBubblingTest extends RendererTestBase {
             '#cache' => [
               'contexts' => ['bar'],
               'tags' => ['d'],
+              // A lower max-age; the redirecting cache item should be updated.
+              'max-age' => 300,
             ],
           ],
         ],
@@ -353,6 +359,7 @@ class RendererBubblingTest extends RendererTestBase {
         'contexts' => ['user.roles'],
         'tags' => ['a', 'b'],
         'bin' => 'render',
+        'max-age' => Cache::PERMANENT,
       ],
     ]);
     $this->assertRenderCacheItem('parent:r.A', [
@@ -366,7 +373,7 @@ class RendererBubblingTest extends RendererTestBase {
     ]);
 
     // Request 2: role B, the grandchild is accessible => bubbled cache
-    // contexts: foo, user.roles.
+    // contexts: foo, user.roles + merged max-age: 1800.
     $element = $test_element;
     $current_user_role = 'B';
     $this->renderer->renderRoot($element);
@@ -377,6 +384,7 @@ class RendererBubblingTest extends RendererTestBase {
         'contexts' => ['foo', 'user.roles'],
         'tags' => ['a', 'b', 'c'],
         'bin' => 'render',
+        'max-age' => 1800,
       ],
     ]);
     $this->assertRenderCacheItem('parent:foo:r.B', [
@@ -384,7 +392,7 @@ class RendererBubblingTest extends RendererTestBase {
       '#cache' => [
         'contexts' => ['foo', 'user.roles'],
         'tags' => ['a', 'b', 'c'],
-        'max-age' => Cache::PERMANENT,
+        'max-age' => 1800,
       ],
       '#markup' => 'parent',
     ]);
@@ -409,6 +417,7 @@ class RendererBubblingTest extends RendererTestBase {
         'contexts' => ['foo', 'user.roles'],
         'tags' => ['a', 'b', 'c'],
         'bin' => 'render',
+        'max-age' => 1800,
       ],
     ]);
     $this->assertRenderCacheItem('parent:foo:r.A', [
@@ -416,13 +425,17 @@ class RendererBubblingTest extends RendererTestBase {
       '#cache' => [
         'contexts' => ['foo', 'user.roles'],
         'tags' => ['a', 'b'],
+        // Note that the max-age here is unaffected. When role A, the grandchild
+        // is never rendered, so neither is its max-age of 1800 present here,
+        // despite 1800 being the max-age of the redirecting cache item.
         'max-age' => Cache::PERMANENT,
       ],
       '#markup' => 'parent',
     ]);
 
     // Request 4: role C, both the grandchild and the grandgrandchild are
-    // accessible => bubbled cache contexts: foo, bar, user.roles.
+    // accessible => bubbled cache contexts: foo, bar, user.roles + merged
+    // max-age: 300.
     $element = $test_element;
     $current_user_role = 'C';
     $this->renderer->renderRoot($element);
@@ -433,6 +446,7 @@ class RendererBubblingTest extends RendererTestBase {
         'contexts' => ['bar', 'foo', 'user.roles'],
         'tags' => ['a', 'b', 'c', 'd'],
         'bin' => 'render',
+        'max-age' => 300,
       ],
     ];
     $this->assertRenderCacheItem('parent', $final_parent_cache_item);
@@ -441,7 +455,7 @@ class RendererBubblingTest extends RendererTestBase {
       '#cache' => [
         'contexts' => ['bar', 'foo', 'user.roles'],
         'tags' => ['a', 'b', 'c', 'd'],
-        'max-age' => Cache::PERMANENT,
+        'max-age' => 300,
       ],
       '#markup' => 'parent',
     ]);
@@ -456,6 +470,10 @@ class RendererBubblingTest extends RendererTestBase {
       '#cache' => [
         'contexts' => ['bar', 'foo', 'user.roles'],
         'tags' => ['a', 'b'],
+        // Note that the max-age here is unaffected. When role A, the grandchild
+        // is never rendered, so neither is its max-age of 1800 present here,
+        // nor the grandgrandchild's max-age of 300, despite 300 being the
+        // max-age of the redirecting cache item.
         'max-age' => Cache::PERMANENT,
       ],
       '#markup' => 'parent',
@@ -471,7 +489,11 @@ class RendererBubblingTest extends RendererTestBase {
       '#cache' => [
         'contexts' => ['bar', 'foo', 'user.roles'],
         'tags' => ['a', 'b', 'c'],
-        'max-age' => Cache::PERMANENT,
+        // Note that the max-age here is unaffected. When role B, the
+        // grandgrandchild is never rendered, so neither is its max-age of 300
+        // present here, despite 300 being the max-age of the redirecting cache
+        // item.
+        'max-age' => 1800,
       ],
       '#markup' => 'parent',
     ]);
diff --git a/core/tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php b/core/tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php
index a3fe9089f..9e3aaa76d 100644
--- a/core/tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php
+++ b/core/tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php
@@ -215,7 +215,7 @@ class RendererPlaceholdersTest extends RendererTestBase {
     if ($cid_parts !== FALSE) {
       // Verify render cached placeholder.
       $cached_element = $this->memoryCache->get(implode(':', $cid_parts))->data;
-      $this->assertSame($expected_data, $cached_element, 'The correct data is cached: the stored #markup and #attached properties are not affected by the placeholder being replaced.');
+      $this->assertEquals($expected_data, $cached_element, 'The correct data is cached: the stored #markup and #attached properties are not affected by the placeholder being replaced.');
     }
   }
   /**
@@ -237,8 +237,8 @@ class RendererPlaceholdersTest extends RendererTestBase {
     // No #cache on parent element.
     $element['#prefix'] = '<p>#cache disabled</p>';
     $output = $this->renderer->renderRoot($element);
-    $this->assertSame('<p>#cache disabled</p><p>This is a rendered placeholder!</p>', $output, 'Output is overridden.');
-    $this->assertSame('<p>#cache disabled</p><p>This is a rendered placeholder!</p>', $element['#markup'], '#markup is overridden.');
+    $this->assertSame('<p>#cache disabled</p><p>This is a rendered placeholder!</p>', (string) $output, 'Output is overridden.');
+    $this->assertSame('<p>#cache disabled</p><p>This is a rendered placeholder!</p>', (string) $element['#markup'], '#markup is overridden.');
     $expected_js_settings = [
       'foo' => 'bar',
       'dynamic_animal' => $args[0],
@@ -283,9 +283,9 @@ class RendererPlaceholdersTest extends RendererTestBase {
     $element['#cache'] = ['keys' => ['placeholder_test_GET']];
     $element['#prefix'] = '<p>#cache enabled, GET</p>';
     $output = $this->renderer->renderRoot($element);
-    $this->assertSame('<p>#cache enabled, GET</p><p>This is a rendered placeholder!</p>', $output, 'Output is overridden.');
+    $this->assertSame('<p>#cache enabled, GET</p><p>This is a rendered placeholder!</p>', (string) $output, 'Output is overridden.');
     $this->assertTrue(isset($element['#printed']), 'No cache hit');
-    $this->assertSame('<p>#cache enabled, GET</p><p>This is a rendered placeholder!</p>', $element['#markup'], '#markup is overridden.');
+    $this->assertSame('<p>#cache enabled, GET</p><p>This is a rendered placeholder!</p>', (string) $element['#markup'], '#markup is overridden.');
     $expected_js_settings = [
       'foo' => 'bar',
       'dynamic_animal' => $args[0],
@@ -321,9 +321,9 @@ class RendererPlaceholdersTest extends RendererTestBase {
     $element['#cache'] = ['keys' => ['placeholder_test_GET']];
     $element['#prefix'] = '<p>#cache enabled, GET</p>';
     $output = $this->renderer->renderRoot($element);
-    $this->assertSame('<p>#cache enabled, GET</p><p>This is a rendered placeholder!</p>', $output, 'Output is overridden.');
+    $this->assertSame('<p>#cache enabled, GET</p><p>This is a rendered placeholder!</p>', (string) $output, 'Output is overridden.');
     $this->assertFalse(isset($element['#printed']), 'Cache hit');
-    $this->assertSame('<p>#cache enabled, GET</p><p>This is a rendered placeholder!</p>', $element['#markup'], '#markup is overridden.');
+    $this->assertSame('<p>#cache enabled, GET</p><p>This is a rendered placeholder!</p>', (string) $element['#markup'], '#markup is overridden.');
     $expected_js_settings = [
       'foo' => 'bar',
       'dynamic_animal' => $args[0],
@@ -351,9 +351,9 @@ class RendererPlaceholdersTest extends RendererTestBase {
     $element['#cache'] = ['keys' => ['placeholder_test_POST']];
     $element['#prefix'] = '<p>#cache enabled, POST</p>';
     $output = $this->renderer->renderRoot($element);
-    $this->assertSame('<p>#cache enabled, POST</p><p>This is a rendered placeholder!</p>', $output, 'Output is overridden.');
+    $this->assertSame('<p>#cache enabled, POST</p><p>This is a rendered placeholder!</p>', (string) $output, 'Output is overridden.');
     $this->assertTrue(isset($element['#printed']), 'No cache hit');
-    $this->assertSame('<p>#cache enabled, POST</p><p>This is a rendered placeholder!</p>', $element['#markup'], '#markup is overridden.');
+    $this->assertSame('<p>#cache enabled, POST</p><p>This is a rendered placeholder!</p>', (string) $element['#markup'], '#markup is overridden.');
     $expected_js_settings = [
       'foo' => 'bar',
       'dynamic_animal' => $args[0],
@@ -383,7 +383,7 @@ class RendererPlaceholdersTest extends RendererTestBase {
 
     $output = $this->renderer->renderRoot($element);
     $this->assertEquals('<p>This is a rendered placeholder!</p>', $output, 'The output has been modified by the indirect, recursive placeholder #lazy_builder callback.');
-    $this->assertSame($element['#markup'], '<p>This is a rendered placeholder!</p>', '#markup is overridden by the indirect, recursive placeholder #lazy_builder callback.');
+    $this->assertSame((string) $element['#markup'], '<p>This is a rendered placeholder!</p>', '#markup is overridden by the indirect, recursive placeholder #lazy_builder callback.');
     $expected_js_settings = [
       'dynamic_animal' => $args[0],
     ];
@@ -546,9 +546,9 @@ class RendererPlaceholdersTest extends RendererTestBase {
 </details></div>
 </details>
 HTML;
-    $this->assertSame($expected_output, $output, 'Output is not overridden.');
+    $this->assertSame($expected_output, (string) $output, 'Output is not overridden.');
     $this->assertTrue(isset($element['#printed']), 'No cache hit');
-    $this->assertSame($expected_output, $output, '#markup is not overridden.');
+    $this->assertSame($expected_output, (string) $element['#markup'], '#markup is not overridden.');
     $expected_js_settings = [
       'foo' => 'bar',
       'dynamic_animal' => [$args_1[0] => TRUE, $args_2[0] => TRUE, $args_3[0] => TRUE],
@@ -595,7 +595,7 @@ HTML;
     // GET request: #cache enabled, cache hit.
     $element = $test_element;
     $output = $this->renderer->renderRoot($element);
-    $this->assertSame($expected_output, $output, 'Output is not overridden.');
+    $this->assertSame($expected_output, (string) $output, 'Output is not overridden.');
     $this->assertFalse(isset($element['#printed']), 'Cache hit');
     $this->assertSame($element['#attached']['drupalSettings'], $expected_js_settings, '#attached is modified; both the original JavaScript setting and the ones added by each placeholder #lazy_builder callback exist.');
 
@@ -604,8 +604,8 @@ HTML;
     unset($test_element['#cache']);
     $element = $test_element;
     $output = $this->renderer->renderRoot($element);
-    $this->assertSame($expected_output, $output, 'Output is not overridden.');
-    $this->assertSame($expected_output, $output, '#markup is not overridden.');
+    $this->assertSame($expected_output, (string) $output, 'Output is not overridden.');
+    $this->assertSame($expected_output, (string) $element['#markup'], '#markup is not overridden.');
     $this->assertSame($element['#attached']['drupalSettings'], $expected_js_settings, '#attached is modified; both the original JavaScript setting and the ones added by each #lazy_builder callback exist.');
   }
 
diff --git a/core/tests/Drupal/Tests/Core/Render/RendererTest.php b/core/tests/Drupal/Tests/Core/Render/RendererTest.php
index 3e3e3bd6d..c6845f560 100644
--- a/core/tests/Drupal/Tests/Core/Render/RendererTest.php
+++ b/core/tests/Drupal/Tests/Core/Render/RendererTest.php
@@ -7,9 +7,13 @@
 
 namespace Drupal\Tests\Core\Render;
 
+use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Core\Access\AccessResult;
+use Drupal\Core\Access\AccessResultInterface;
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Cache\CacheableDependencyInterface;
 use Drupal\Core\Render\Element;
+use Drupal\Core\Render\SafeString;
 use Drupal\Core\Template\Attribute;
 
 /**
@@ -43,7 +47,7 @@ class RendererTest extends RendererTestBase {
       $setup_code();
     }
 
-    $this->assertSame($expected, $this->renderer->renderRoot($build));
+    $this->assertSame($expected, (string) $this->renderer->renderRoot($build));
   }
 
   /**
@@ -367,7 +371,7 @@ class RendererTest extends RendererTestBase {
    * @covers ::render
    * @covers ::doRender
    *
-   * @dataProvider providerBoolean
+   * @dataProvider providerAccessValues
    */
   public function testRenderWithPresetAccess($access) {
     $build = [
@@ -381,7 +385,7 @@ class RendererTest extends RendererTestBase {
    * @covers ::render
    * @covers ::doRender
    *
-   * @dataProvider providerBoolean
+   * @dataProvider providerAccessValues
    */
   public function testRenderWithAccessCallbackCallable($access) {
     $build = [
@@ -399,7 +403,7 @@ class RendererTest extends RendererTestBase {
    * @covers ::render
    * @covers ::doRender
    *
-   * @dataProvider providerBoolean
+   * @dataProvider providerAccessValues
    */
   public function testRenderWithAccessPropertyAndCallback($access) {
     $build = [
@@ -416,16 +420,49 @@ class RendererTest extends RendererTestBase {
    * @covers ::render
    * @covers ::doRender
    *
-   * @dataProvider providerBoolean
+   * @dataProvider providerAccessValues
    */
   public function testRenderWithAccessControllerResolved($access) {
+
+    switch ($access) {
+      case AccessResult::allowed():
+        $method = 'accessResultAllowed';
+        break;
+
+      case AccessResult::forbidden():
+        $method = 'accessResultForbidden';
+        break;
+
+      case FALSE:
+        $method = 'accessFalse';
+        break;
+
+      case TRUE:
+        $method = 'accessTrue';
+        break;
+    }
+
     $build = [
-      '#access_callback' => 'Drupal\Tests\Core\Render\TestAccessClass::' . ($access ? 'accessTrue' : 'accessFalse'),
+      '#access_callback' => 'Drupal\Tests\Core\Render\TestAccessClass::' . $method,
     ];
 
     $this->assertAccess($build, $access);
   }
 
+  /**
+   * @covers ::render
+   * @covers ::doRender
+   */
+  public function testRenderAccessCacheablityDependencyInheritance() {
+    $build = [
+      '#access' => AccessResult::allowed()->addCacheContexts(['user']),
+    ];
+
+    $this->renderer->renderPlain($build);
+
+    $this->assertEquals(['languages:language_interface', 'theme', 'user'], $build['#cache']['contexts']);
+  }
+
   /**
    * Tests that a first render returns the rendered output and a second doesn't.
    *
@@ -451,10 +488,12 @@ class RendererTest extends RendererTestBase {
    *
    * @return array
    */
-  public function providerBoolean() {
+  public function providerAccessValues() {
     return [
       [FALSE],
-      [TRUE]
+      [TRUE],
+      [AccessResult::forbidden()],
+      [AccessResult::allowed()],
     ];
   }
 
@@ -469,11 +508,11 @@ class RendererTest extends RendererTestBase {
   protected function assertAccess($build, $access) {
     $sensitive_content = $this->randomContextValue();
     $build['#markup'] = $sensitive_content;
-    if ($access) {
-      $this->assertSame($sensitive_content, $this->renderer->renderRoot($build));
+    if (($access instanceof AccessResultInterface && $access->isAllowed()) || $access === TRUE) {
+      $this->assertSame($sensitive_content, (string) $this->renderer->renderRoot($build));
     }
     else {
-      $this->assertSame('', $this->renderer->renderRoot($build));
+      $this->assertSame('', (string) $this->renderer->renderRoot($build));
     }
   }
 
@@ -653,10 +692,13 @@ class RendererTest extends RendererTestBase {
       ],
       // Collect expected property names.
       '#cache_properties' => array_keys(array_filter($expected_results)),
-      'child1' => ['#markup' => 1],
-      'child2' => ['#markup' => 2],
-      '#custom_property' => ['custom_value'],
+      'child1' => ['#markup' => SafeString::create('1')],
+      'child2' => ['#markup' => SafeString::create('2')],
+      // Mark the value as safe.
+      '#custom_property' => SafeMarkup::checkPlain('custom_value'),
+      '#custom_property_array' => ['custom value'],
     ];
+
     $this->renderer->renderRoot($element);
 
     $cache = $this->cacheFactory->get('render');
@@ -671,9 +713,14 @@ class RendererTest extends RendererTestBase {
       $this->assertEquals($cached, (bool) $expected);
       // Check that only the #markup key is preserved for children.
       if ($cached) {
-        $this->assertArrayEquals($data[$property], $original[$property]);
+        $this->assertEquals($data[$property], $original[$property]);
       }
     }
+    // #custom_property_array can not be a safe_cache_property.
+    $safe_cache_properties = array_diff(Element::properties(array_filter($expected_results)), ['#custom_property_array']);
+    foreach ($safe_cache_properties as $cache_property) {
+      $this->assertTrue(SafeMarkup::isSafe($data[$cache_property]), "$cache_property is marked as a safe string");
+    }
   }
 
   /**
@@ -686,14 +733,15 @@ class RendererTest extends RendererTestBase {
   public function providerTestRenderCacheProperties() {
     return [
       [[]],
-      [['child1' => 0, 'child2' => 0, '#custom_property' => 0]],
-      [['child1' => 0, 'child2' => 0, '#custom_property' => 1]],
-      [['child1' => 0, 'child2' => 1, '#custom_property' => 0]],
-      [['child1' => 0, 'child2' => 1, '#custom_property' => 1]],
-      [['child1' => 1, 'child2' => 0, '#custom_property' => 0]],
-      [['child1' => 1, 'child2' => 0, '#custom_property' => 1]],
-      [['child1' => 1, 'child2' => 1, '#custom_property' => 0]],
-      [['child1' => 1, 'child2' => 1, '#custom_property' => 1]],
+      [['child1' => 0, 'child2' => 0, '#custom_property' => 0, '#custom_property_array' => 0]],
+      [['child1' => 0, 'child2' => 0, '#custom_property' => 1, '#custom_property_array' => 0]],
+      [['child1' => 0, 'child2' => 1, '#custom_property' => 0, '#custom_property_array' => 0]],
+      [['child1' => 0, 'child2' => 1, '#custom_property' => 1, '#custom_property_array' => 0]],
+      [['child1' => 1, 'child2' => 0, '#custom_property' => 0, '#custom_property_array' => 0]],
+      [['child1' => 1, 'child2' => 0, '#custom_property' => 1, '#custom_property_array' => 0]],
+      [['child1' => 1, 'child2' => 1, '#custom_property' => 0, '#custom_property_array' => 0]],
+      [['child1' => 1, 'child2' => 1, '#custom_property' => 1, '#custom_property_array' => 0]],
+      [['child1' => 1, 'child2' => 1, '#custom_property' => 1, '#custom_property_array' => 1]],
     ];
   }
 
@@ -784,6 +832,14 @@ class TestAccessClass {
     return FALSE;
   }
 
+  public static function accessResultAllowed() {
+    return AccessResult::allowed();
+  }
+
+  public static function accessResultForbidden() {
+    return AccessResult::forbidden();
+  }
+
 }
 
 class TestCallables {
diff --git a/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php b/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php
index 7388c6123..9ab89785e 100644
--- a/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php
+++ b/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php
@@ -8,11 +8,12 @@
 namespace Drupal\Tests\Core\Render;
 
 use Drupal\Core\Cache\Cache;
+use Drupal\Core\Cache\CacheableMetadata;
+use Drupal\Core\Cache\Context\ContextCacheKeys;
 use Drupal\Core\Cache\MemoryBackend;
-use Drupal\Core\Language\LanguageInterface;
 use Drupal\Core\Render\Element;
-use Drupal\Core\Render\Renderer;
 use Drupal\Core\Render\RenderCache;
+use Drupal\Core\Render\Renderer;
 use Drupal\Tests\UnitTestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpFoundation\Request;
@@ -100,6 +101,9 @@ class RendererTestBase extends UnitTestCase {
     $this->themeManager = $this->getMock('Drupal\Core\Theme\ThemeManagerInterface');
     $this->elementInfo = $this->getMock('Drupal\Core\Render\ElementInfoManagerInterface');
     $this->requestStack = new RequestStack();
+    $request = new Request();
+    $request->server->set('REQUEST_TIME', $_SERVER['REQUEST_TIME']);
+    $this->requestStack->push($request);
     $this->cacheFactory = $this->getMock('Drupal\Core\Cache\CacheFactoryInterface');
     $this->cacheContextsManager = $this->getMockBuilder('Drupal\Core\Cache\Context\CacheContextsManager')
       ->disableOriginalConstructor()
@@ -124,10 +128,10 @@ class RendererTestBase extends UnitTestCase {
               $keys[] = $context_id;
           }
         }
-        return $keys;
+        return new ContextCacheKeys($keys, new CacheableMetadata());
       });
     $this->renderCache = new RenderCache($this->requestStack, $this->cacheFactory, $this->cacheContextsManager);
-    $this->renderer = new Renderer($this->controllerResolver, $this->themeManager, $this->elementInfo, $this->renderCache, $this->rendererConfig);
+    $this->renderer = new Renderer($this->controllerResolver, $this->themeManager, $this->elementInfo, $this->renderCache, $this->requestStack, $this->rendererConfig);
 
     $container = new ContainerBuilder();
     $container->set('cache_contexts_manager', $this->cacheContextsManager);
diff --git a/core/tests/Drupal/Tests/Core/RouteProcessor/RouteProcessorManagerTest.php b/core/tests/Drupal/Tests/Core/RouteProcessor/RouteProcessorManagerTest.php
index 77d31ff94..ca1cbbcb9 100644
--- a/core/tests/Drupal/Tests/Core/RouteProcessor/RouteProcessorManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/RouteProcessor/RouteProcessorManagerTest.php
@@ -8,7 +8,7 @@
 namespace Drupal\Tests\Core\RouteProcessor;
 
 use Drupal\Core\Cache\Cache;
-use Drupal\Core\Cache\CacheableMetadata;
+use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\Core\RouteProcessor\RouteProcessorManager;
 use Drupal\Tests\UnitTestCase;
 use Symfony\Component\Routing\Route;
@@ -49,10 +49,10 @@ class RouteProcessorManagerTest extends UnitTestCase {
       $this->processorManager->addOutbound($processor, $priority);
     }
 
-    $cacheable_metadata = new CacheableMetadata();
-    $this->processorManager->processOutbound($route_name, $route, $parameters, $cacheable_metadata);
+    $bubbleable_metadata = new BubbleableMetadata();
+    $this->processorManager->processOutbound($route_name, $route, $parameters, $bubbleable_metadata);
     // Default cacheability is: permanently cacheable, no cache tags/contexts.
-    $this->assertEquals((new CacheableMetadata())->setCacheMaxAge(Cache::PERMANENT), $cacheable_metadata);
+    $this->assertEquals((new BubbleableMetadata())->setCacheMaxAge(Cache::PERMANENT), $bubbleable_metadata);
   }
 
   /**
diff --git a/core/tests/Drupal/Tests/Core/Routing/TrustedRedirectResponseTest.php b/core/tests/Drupal/Tests/Core/Routing/TrustedRedirectResponseTest.php
new file mode 100644
index 000000000..4ac1333fa
--- /dev/null
+++ b/core/tests/Drupal/Tests/Core/Routing/TrustedRedirectResponseTest.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\Core\Routing\TrustedRedirectResponseTest.
+ */
+
+namespace Drupal\Tests\Core\Routing;
+
+use Drupal\Core\Routing\RequestContext;
+use Drupal\Core\Routing\TrustedRedirectResponse;
+use Drupal\Tests\UnitTestCase;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+ * @coversDefaultClass \Drupal\Core\Routing\TrustedRedirectResponse
+ * @group Routing
+ */
+class TrustedRedirectResponseTest extends UnitTestCase {
+
+  /**
+   * @covers ::setTargetUrl
+   */
+  public function testSetTargetUrlWithInternalUrl() {
+    $redirect_response = new TrustedRedirectResponse('/example');
+    $redirect_response->setTargetUrl('/example2');
+
+    $this->assertEquals('/example2', $redirect_response->getTargetUrl());
+  }
+
+  /**
+   * @covers ::setTargetUrl
+   * @expectedException \InvalidArgumentException
+   */
+  public function testSetTargetUrlWithUntrustedUrl() {
+    $request_context = new RequestContext();
+    $request_context->setCompleteBaseUrl('https://www.drupal.org');
+    $container = new ContainerBuilder();
+    $container->set('router.request_context', $request_context);
+    \Drupal::setContainer($container);
+
+    $redirect_response = new TrustedRedirectResponse('/example');
+
+    $redirect_response->setTargetUrl('http://evil-url.com/example');
+  }
+
+  /**
+   * @covers ::setTargetUrl
+   */
+  public function testSetTargetUrlWithTrustedUrl() {
+    $redirect_response = new TrustedRedirectResponse('/example');
+
+    $redirect_response->setTrustedTargetUrl('http://good-external-url.com/example');
+    $this->assertEquals('http://good-external-url.com/example', $redirect_response->getTargetUrl());
+  }
+
+}
diff --git a/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php b/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php
index 57edd5173..2e04b8736 100644
--- a/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php
+++ b/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php
@@ -8,10 +8,10 @@
 namespace Drupal\Tests\Core\Routing;
 
 use Drupal\Core\Cache\Cache;
-use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\PathProcessor\PathProcessorAlias;
 use Drupal\Core\PathProcessor\PathProcessorManager;
+use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\Core\Routing\RequestContext;
 use Drupal\Core\Routing\UrlGenerator;
 use Drupal\Tests\UnitTestCase;
@@ -23,6 +23,7 @@ use Symfony\Component\Routing\RouteCollection;
 /**
  * Confirm that the UrlGenerator is functioning properly.
  *
+ * @coversDefaultClass \Drupal\Core\Routing\UrlGenerator
  * @group Routing
  */
 class UrlGeneratorTest extends UnitTestCase {
@@ -70,11 +71,14 @@ class UrlGeneratorTest extends UnitTestCase {
     $first_route = new Route('/test/one');
     $second_route = new Route('/test/two/{narf}');
     $third_route = new Route('/test/two/');
-    $fourth_route = new Route('/test/four', array(), array(), array(), '', ['https']);
+    $fourth_route = new Route('/test/four', [], [], [], '', ['https']);
+    $none_route = new Route('', [], [], ['_no_path' => TRUE]);
+
     $routes->add('test_1', $first_route);
     $routes->add('test_2', $second_route);
     $routes->add('test_3', $third_route);
     $routes->add('test_4', $fourth_route);
+    $routes->add('<none>', $none_route);
 
     // Create a route provider stub.
     $provider = $this->getMockBuilder('Drupal\Core\Routing\RouteProvider')
@@ -85,22 +89,26 @@ class UrlGeneratorTest extends UnitTestCase {
     // are not passed in and default to an empty array.
     $route_name_return_map = $routes_names_return_map = array();
     $return_map_values = array(
-      array(
+      [
         'route_name' => 'test_1',
         'return' => $first_route,
-      ),
-      array(
+      ],
+      [
         'route_name' => 'test_2',
         'return' => $second_route,
-      ),
-      array(
+      ],
+      [
         'route_name' => 'test_3',
         'return' => $third_route,
-      ),
-      array(
+      ],
+      [
         'route_name' => 'test_4',
         'return' => $fourth_route,
-      ),
+      ],
+      [
+        'route_name' => '<none>',
+        'return' => $none_route,
+      ],
     );
     foreach ($return_map_values as $values) {
       $route_name_return_map[] = array($values['route_name'], $values['return']);
@@ -139,9 +147,7 @@ class UrlGeneratorTest extends UnitTestCase {
       ->disableOriginalConstructor()
       ->getMock();
 
-    $config_factory_stub = $this->getConfigFactoryStub(array('system.filter' => array('protocols' => array('http', 'https'))));
-
-    $generator = new UrlGenerator($provider, $processor_manager, $this->routeProcessorManager, $config_factory_stub, $this->requestStack);
+    $generator = new UrlGenerator($provider, $processor_manager, $this->routeProcessorManager, $this->requestStack, ['http', 'https']);
     $generator->setContext($context);
     $this->generator = $generator;
   }
@@ -185,7 +191,7 @@ class UrlGeneratorTest extends UnitTestCase {
 
 
     // Check that the two generate methods return the same result.
-    $this->assertGenerateFromRoute('test_1', [], [], $url, (new CacheableMetadata())->setCacheMaxAge(Cache::PERMANENT));
+    $this->assertGenerateFromRoute('test_1', [], [], $url, (new BubbleableMetadata())->setCacheMaxAge(Cache::PERMANENT));
 
     $path = $this->generator->getPathFromRoute('test_1');
     $this->assertEquals('test/one', $path);
@@ -217,13 +223,13 @@ class UrlGeneratorTest extends UnitTestCase {
 
     $options = array('fragment' => 'top');
     // Extra parameters should appear in the query string.
-    $this->assertGenerateFromRoute('test_1', ['zoo' => 5], $options, '/hello/world?zoo=5#top', (new CacheableMetadata())->setCacheMaxAge(Cache::PERMANENT));
+    $this->assertGenerateFromRoute('test_1', ['zoo' => 5], $options, '/hello/world?zoo=5#top', (new BubbleableMetadata())->setCacheMaxAge(Cache::PERMANENT));
 
     $options = array('query' => array('page' => '1'), 'fragment' => 'bottom');
-    $this->assertGenerateFromRoute('test_2', ['narf' => 5], $options, '/goodbye/cruel/world?page=1#bottom', (new CacheableMetadata())->setCacheMaxAge(Cache::PERMANENT));
+    $this->assertGenerateFromRoute('test_2', ['narf' => 5], $options, '/goodbye/cruel/world?page=1#bottom', (new BubbleableMetadata())->setCacheMaxAge(Cache::PERMANENT));
 
     // Changing the parameters, the route still matches but there is no alias.
-    $this->assertGenerateFromRoute('test_2', ['narf' => 7], $options, '/test/two/7?page=1#bottom', (new CacheableMetadata())->setCacheMaxAge(Cache::PERMANENT));
+    $this->assertGenerateFromRoute('test_2', ['narf' => 7], $options, '/test/two/7?page=1#bottom', (new BubbleableMetadata())->setCacheMaxAge(Cache::PERMANENT));
 
     $path = $this->generator->getPathFromRoute('test_2', array('narf' => '5'));
     $this->assertEquals('test/two/5', $path);
@@ -235,7 +241,7 @@ class UrlGeneratorTest extends UnitTestCase {
    * @dataProvider providerTestAliasGenerationWithOptions
    */
   public function testAliasGenerationWithOptions($route_name, $route_parameters, $options, $expected) {
-    $this->assertGenerateFromRoute($route_name, $route_parameters, $options, $expected, (new CacheableMetadata())->setCacheMaxAge(Cache::PERMANENT));
+    $this->assertGenerateFromRoute($route_name, $route_parameters, $options, $expected, (new BubbleableMetadata())->setCacheMaxAge(Cache::PERMANENT));
   }
 
   /**
@@ -299,7 +305,7 @@ class UrlGeneratorTest extends UnitTestCase {
 
     $options = array('absolute' => TRUE, 'fragment' => 'top');
     // Extra parameters should appear in the query string.
-    $this->assertGenerateFromRoute('test_1', ['zoo' => 5], $options, 'http://localhost/hello/world?zoo=5#top', (new CacheableMetadata())->setCacheMaxAge(Cache::PERMANENT)->setCacheContexts(['url.site']));
+    $this->assertGenerateFromRoute('test_1', ['zoo' => 5], $options, 'http://localhost/hello/world?zoo=5#top', (new BubbleableMetadata())->setCacheMaxAge(Cache::PERMANENT)->setCacheContexts(['url.site']));
   }
 
   /**
@@ -307,13 +313,13 @@ class UrlGeneratorTest extends UnitTestCase {
    */
   public function testBaseURLGeneration() {
     $options = array('base_url' => 'http://www.example.com:8888');
-    $this->assertGenerateFromRoute('test_1', [], $options, 'http://www.example.com:8888/hello/world', (new CacheableMetadata())->setCacheMaxAge(Cache::PERMANENT));
+    $this->assertGenerateFromRoute('test_1', [], $options, 'http://www.example.com:8888/hello/world', (new BubbleableMetadata())->setCacheMaxAge(Cache::PERMANENT));
 
     $options = array('base_url' => 'http://www.example.com:8888', 'https' => TRUE);
-    $this->assertGenerateFromRoute('test_1', [], $options, 'https://www.example.com:8888/hello/world', (new CacheableMetadata())->setCacheMaxAge(Cache::PERMANENT));
+    $this->assertGenerateFromRoute('test_1', [], $options, 'https://www.example.com:8888/hello/world', (new BubbleableMetadata())->setCacheMaxAge(Cache::PERMANENT));
 
     $options = array('base_url' => 'https://www.example.com:8888', 'https' => FALSE);
-    $this->assertGenerateFromRoute('test_1', [], $options, 'http://www.example.com:8888/hello/world', (new CacheableMetadata())->setCacheMaxAge(Cache::PERMANENT));
+    $this->assertGenerateFromRoute('test_1', [], $options, 'http://www.example.com:8888/hello/world', (new BubbleableMetadata())->setCacheMaxAge(Cache::PERMANENT));
 
     $this->routeProcessorManager->expects($this->exactly(2))
       ->method('processOutbound')
@@ -321,7 +327,7 @@ class UrlGeneratorTest extends UnitTestCase {
 
     $options = array('base_url' => 'http://www.example.com:8888', 'fragment' => 'top');
     // Extra parameters should appear in the query string.
-    $this->assertGenerateFromRoute('test_1', ['zoo' => 5], $options, 'http://www.example.com:8888/hello/world?zoo=5#top', (new CacheableMetadata())->setCacheMaxAge(Cache::PERMANENT));
+    $this->assertGenerateFromRoute('test_1', ['zoo' => 5], $options, 'http://www.example.com:8888/hello/world?zoo=5#top', (new BubbleableMetadata())->setCacheMaxAge(Cache::PERMANENT));
   }
 
   /**
@@ -338,7 +344,7 @@ class UrlGeneratorTest extends UnitTestCase {
       ->with($this->anything());
 
     $options = array('absolute' => TRUE, 'https' => TRUE);
-    $this->assertGenerateFromRoute('test_1', [], $options, 'https://localhost/hello/world', (new CacheableMetadata())->setCacheMaxAge(Cache::PERMANENT)->setCacheContexts(['url.site']));
+    $this->assertGenerateFromRoute('test_1', [], $options, 'https://localhost/hello/world', (new BubbleableMetadata())->setCacheMaxAge(Cache::PERMANENT)->setCacheContexts(['url.site']));
   }
 
   /**
@@ -362,8 +368,8 @@ class UrlGeneratorTest extends UnitTestCase {
         $request->headers->set('host', ['www.example.com']);
         $this->requestStack->push($request);
 
-        // Determine the expected cacheability.
-        $expected_cacheability = (new CacheableMetadata())
+        // Determine the expected bubbleable metadata.
+        $expected_cacheability = (new BubbleableMetadata())
           ->setCacheContexts($absolute ? ['url.site'] : [])
           ->setCacheMaxAge(Cache::PERMANENT);
 
@@ -374,46 +380,83 @@ class UrlGeneratorTest extends UnitTestCase {
         $this->assertEquals($url, $result, "$url == $result");
         $generated_url = $this->generator->generateFromPath('node/123', array('absolute' => $absolute), TRUE);
         $this->assertEquals($url, $generated_url->getGeneratedUrl(), "$url == $result");
-        $this->assertEquals($expected_cacheability, CacheableMetadata::createFromObject($generated_url));
+        $this->assertEquals($expected_cacheability, BubbleableMetadata::createFromObject($generated_url));
 
         $url = $base . 'node/123#foo';
         $result = $this->generator->generateFromPath('node/123', array('fragment' => 'foo', 'absolute' => $absolute));
         $this->assertEquals($url, $result, "$url == $result");
         $generated_url = $this->generator->generateFromPath('node/123', array('fragment' => 'foo', 'absolute' => $absolute), TRUE);
         $this->assertEquals($url, $generated_url->getGeneratedUrl(), "$url == $result");
-        $this->assertEquals($expected_cacheability, CacheableMetadata::createFromObject($generated_url));
+        $this->assertEquals($expected_cacheability, BubbleableMetadata::createFromObject($generated_url));
 
         $url = $base . 'node/123?foo';
         $result = $this->generator->generateFromPath('node/123', array('query' => array('foo' => NULL), 'absolute' => $absolute));
         $this->assertEquals($url, $result, "$url == $result");
         $generated_url = $this->generator->generateFromPath('node/123', array('query' => array('foo' => NULL), 'absolute' => $absolute), TRUE);
         $this->assertEquals($url, $generated_url->getGeneratedUrl(), "$url == $result");
-        $this->assertEquals($expected_cacheability, CacheableMetadata::createFromObject($generated_url));
+        $this->assertEquals($expected_cacheability, BubbleableMetadata::createFromObject($generated_url));
 
         $url = $base . 'node/123?foo=bar&bar=baz';
         $result = $this->generator->generateFromPath('node/123', array('query' => array('foo' => 'bar', 'bar' => 'baz'), 'absolute' => $absolute));
         $this->assertEquals($url, $result, "$url == $result");
         $generated_url = $this->generator->generateFromPath('node/123', array('query' => array('foo' => 'bar', 'bar' => 'baz'), 'absolute' => $absolute), TRUE);
         $this->assertEquals($url, $generated_url->getGeneratedUrl(), "$url == $result");
-        $this->assertEquals($expected_cacheability, CacheableMetadata::createFromObject($generated_url));
+        $this->assertEquals($expected_cacheability, BubbleableMetadata::createFromObject($generated_url));
 
         $url = $base . 'node/123?foo#bar';
         $result = $this->generator->generateFromPath('node/123', array('query' => array('foo' => NULL), 'fragment' => 'bar', 'absolute' => $absolute));
         $this->assertEquals($url, $result, "$url == $result");
         $generated_url = $this->generator->generateFromPath('node/123', array('query' => array('foo' => NULL), 'fragment' => 'bar', 'absolute' => $absolute), TRUE);
         $this->assertEquals($url, $generated_url->getGeneratedUrl(), "$url == $result");
-        $this->assertEquals($expected_cacheability, CacheableMetadata::createFromObject($generated_url));
+        $this->assertEquals($expected_cacheability, BubbleableMetadata::createFromObject($generated_url));
 
         $url = $base;
         $result = $this->generator->generateFromPath('<front>', array('absolute' => $absolute));
         $this->assertEquals($url, $result, "$url == $result");
         $generated_url = $this->generator->generateFromPath('<front>', array('absolute' => $absolute), TRUE);
         $this->assertEquals($url, $generated_url->getGeneratedUrl(), "$url == $result");
-        $this->assertEquals($expected_cacheability, CacheableMetadata::createFromObject($generated_url));
+        $this->assertEquals($expected_cacheability, BubbleableMetadata::createFromObject($generated_url));
       }
     }
   }
 
+  /**
+   * Tests generating a relative URL with no path.
+   *
+   * @param array $options
+   *   An array of URL options.
+   * @param string $expected_url
+   *   The expected relative URL.
+   *
+   * @covers ::generateFromRoute
+   *
+   * @dataProvider providerTestNoPath
+   */
+  public function testNoPath($options, $expected_url) {
+    $url = $this->generator->generateFromRoute('<none>', [], $options);
+    $this->assertEquals($expected_url, $url);
+  }
+
+  /**
+   * Data provider for ::testNoPath().
+   */
+  public function providerTestNoPath() {
+    return [
+      // Empty options.
+      [[], ''],
+      // Query parameters only.
+      [['query' => ['foo' => 'bar']], '?foo=bar'],
+      // Multiple query parameters.
+      [['query' => ['foo' => 'bar', 'baz' => '']], '?foo=bar&baz='],
+      // Fragment only.
+      [['fragment' => 'foo'], '#foo'],
+      // Query parameters and fragment.
+      [['query' => ['bar' => 'baz'], 'fragment' => 'foo'], '?bar=baz#foo'],
+      // Multiple query parameters and fragment.
+      [['query' => ['bar' => 'baz', 'foo' => 'bar'], 'fragment' => 'foo'], '?bar=baz&foo=bar#foo'],
+    ];
+  }
+
   /**
    * Asserts \Drupal\Core\Routing\UrlGenerator::generateFromRoute()'s output.
    *
@@ -425,10 +468,10 @@ class UrlGeneratorTest extends UnitTestCase {
    *   The options to test.
    * @param $expected_url
    *   The expected generated URL string.
-   * @param \Drupal\Core\Cache\CacheableMetadata $expected_cacheability
-   *   The expected generated cacheability metadata.
+   * @param \Drupal\Core\Render\BubbleableMetadata $expected_bubbleable_metadata
+   *   The expected generated bubbleable metadata.
    */
-  protected function assertGenerateFromRoute($route_name, array $route_parameters, array $options, $expected_url, CacheableMetadata $expected_cacheability) {
+  protected function assertGenerateFromRoute($route_name, array $route_parameters, array $options, $expected_url, BubbleableMetadata $expected_bubbleable_metadata) {
     // First, test with $collect_cacheability_metadata set to the default value.
     $url = $this->generator->generateFromRoute($route_name, $route_parameters, $options);
     $this->assertSame($expected_url, $url);
@@ -436,7 +479,7 @@ class UrlGeneratorTest extends UnitTestCase {
     // Second, test with it set to TRUE.
     $generated_url = $this->generator->generateFromRoute($route_name, $route_parameters, $options, TRUE);
     $this->assertSame($expected_url, $generated_url->getGeneratedUrl());
-    $this->assertEquals($expected_cacheability, CacheableMetadata::createFromObject($generated_url));
+    $this->assertEquals($expected_bubbleable_metadata, BubbleableMetadata::createFromObject($generated_url));
   }
 
 }
diff --git a/core/tests/Drupal/Tests/Core/Session/SessionConfigurationTest.php b/core/tests/Drupal/Tests/Core/Session/SessionConfigurationTest.php
index 4d6ef9697..59325eb1e 100644
--- a/core/tests/Drupal/Tests/Core/Session/SessionConfigurationTest.php
+++ b/core/tests/Drupal/Tests/Core/Session/SessionConfigurationTest.php
@@ -51,7 +51,7 @@ class SessionConfigurationTest extends UnitTestCase {
   public function providerTestGeneratedCookieDomain() {
     return [
       ['http://example.com/path/index.php', '.example.com'],
-      ['http://www.example.com/path/index.php', '.example.com'],
+      ['http://www.example.com/path/index.php', '.www.example.com'],
       ['http://subdomain.example.com/path/index.php', '.subdomain.example.com'],
       ['http://example.com:8080/path/index.php', '.example.com'],
       ['https://example.com/path/index.php', '.example.com'],
diff --git a/core/tests/Drupal/Tests/Core/Site/SettingsTest.php b/core/tests/Drupal/Tests/Core/Site/SettingsTest.php
index 59ec7d2a9..c92f6768a 100644
--- a/core/tests/Drupal/Tests/Core/Site/SettingsTest.php
+++ b/core/tests/Drupal/Tests/Core/Site/SettingsTest.php
@@ -118,4 +118,17 @@ class SettingsTest extends UnitTestCase {
     serialize(new Settings([]));
   }
 
+  /**
+   * Tests Settings::getApcuPrefix().
+   *
+   * @covers ::getApcuPrefix
+   */
+  public function testGetApcuPrefix() {
+    $settings = new Settings(array('hash_salt' => 123));
+    $this->assertNotEquals($settings::getApcuPrefix('cache_test', '/test/a'), $settings::getApcuPrefix('cache_test', '/test/b'));
+
+    $settings = new Settings(array('hash_salt' => 123, 'apcu_ensure_unique_prefix' => FALSE));
+    $this->assertNotEquals($settings::getApcuPrefix('cache_test', '/test/a'), $settings::getApcuPrefix('cache_test', '/test/b'));
+  }
+
 }
diff --git a/core/tests/Drupal/Tests/Core/UrlTest.php b/core/tests/Drupal/Tests/Core/UrlTest.php
index 296a8b509..635eec338 100644
--- a/core/tests/Drupal/Tests/Core/UrlTest.php
+++ b/core/tests/Drupal/Tests/Core/UrlTest.php
@@ -89,8 +89,8 @@ class UrlTest extends UnitTestCase {
       array('non-existent', NULL, FALSE, 'non-existent'),
     );
 
-    // $this->map has $collect_cacheability_metadata = FALSE; also generate the
-    // $collect_cacheability_metadata = TRUE case for ::generateFromRoute().
+    // $this->map has $collect_bubbleable_metadata = FALSE; also generate the
+    // $collect_bubbleable_metadata = TRUE case for ::generateFromRoute().
     $generate_from_route_map = [];
     foreach ($this->map as $values) {
       $generate_from_route_map[] = $values;
@@ -382,7 +382,7 @@ class UrlTest extends UnitTestCase {
       $this->assertSame($path, $url->toString());
       $generated_url = $url->toString(TRUE);
       $this->assertSame($path, $generated_url->getGeneratedUrl());
-      $this->assertInstanceOf('\Drupal\Core\Cache\CacheableMetadata', $generated_url);
+      $this->assertInstanceOf('\Drupal\Core\Render\BubbleableMetadata', $generated_url);
     }
   }
 
@@ -779,7 +779,7 @@ class UrlTest extends UnitTestCase {
 
   /**
    * @expectedException \InvalidArgumentException
-   * @expectedExceptionMessage The route URI "route:" is invalid.
+   * @expectedExceptionMessage The route URI 'route:' is invalid.
    */
   public function testFromRouteUriWithMissingRouteName() {
     Url::fromUri('route:');
diff --git a/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php b/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php
index fde662c17..9392d22cf 100644
--- a/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php
+++ b/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php
@@ -43,6 +43,13 @@ class LinkGeneratorTest extends UnitTestCase {
    */
   protected $moduleHandler;
 
+  /**
+   * The mocked renderer service.
+   *
+   * @var \PHPUnit_Framework_MockObject_MockObject|\Drupal\Core\Render\RendererInterface
+   */
+  protected $renderer;
+
   /**
    * The mocked URL Assembler service.
    *
@@ -68,8 +75,8 @@ class LinkGeneratorTest extends UnitTestCase {
 
     $this->urlGenerator = $this->getMock('\Drupal\Core\Routing\UrlGenerator', array(), array(), '', FALSE);
     $this->moduleHandler = $this->getMock('Drupal\Core\Extension\ModuleHandlerInterface');
-
-    $this->linkGenerator = new LinkGenerator($this->urlGenerator, $this->moduleHandler);
+    $this->renderer = $this->getMock('\Drupal\Core\Render\RendererInterface');
+    $this->linkGenerator = new LinkGenerator($this->urlGenerator, $this->moduleHandler, $this->renderer);
     $this->urlAssembler = $this->getMock('\Drupal\Core\Utility\UnroutedUrlAssemblerInterface');
   }
 
@@ -462,12 +469,12 @@ class LinkGeneratorTest extends UnitTestCase {
   }
 
   /**
-   * Tests the LinkGenerator's support for collecting cacheability metadata.
+   * Tests the LinkGenerator's support for collecting bubbleable metadata.
    *
    * @see \Drupal\Core\Utility\LinkGenerator::generate()
    * @see \Drupal\Core\Utility\LinkGenerator::generateFromLink()
    */
-  public function testGenerateCacheability() {
+  public function testGenerateBubbleableMetadata() {
     $options = ['query' => [], 'language' => NULL, 'set_active_class' => FALSE, 'absolute' => FALSE];
     $this->urlGenerator->expects($this->any())
       ->method('generateFromRoute')
@@ -484,14 +491,14 @@ class LinkGeneratorTest extends UnitTestCase {
     $this->assertSame($expected_link_markup, $this->linkGenerator->generate('Test', $url));
     $generated_link = $this->linkGenerator->generate('Test', $url, TRUE);
     $this->assertSame($expected_link_markup, $generated_link->getGeneratedLink());
-    $this->assertInstanceOf('\Drupal\Core\Cache\CacheableMetadata', $generated_link);
+    $this->assertInstanceOf('\Drupal\Core\Render\BubbleableMetadata', $generated_link);
 
     // Test ::generateFromLink().
     $link = new Link('Test', $url);
     $this->assertSame($expected_link_markup, $this->linkGenerator->generateFromLink($link));
     $generated_link = $this->linkGenerator->generateFromLink($link, TRUE);
     $this->assertSame($expected_link_markup, $generated_link->getGeneratedLink());
-    $this->assertInstanceOf('\Drupal\Core\Cache\CacheableMetadata', $generated_link);
+    $this->assertInstanceOf('\Drupal\Core\Render\BubbleableMetadata', $generated_link);
   }
 
   /**
diff --git a/core/tests/Drupal/Tests/Core/Utility/TokenTest.php b/core/tests/Drupal/Tests/Core/Utility/TokenTest.php
index 0a9a570fc..a738282a4 100644
--- a/core/tests/Drupal/Tests/Core/Utility/TokenTest.php
+++ b/core/tests/Drupal/Tests/Core/Utility/TokenTest.php
@@ -7,7 +7,10 @@
 
 namespace Drupal\Tests\Core\Utility;
 
+use Drupal\Core\Cache\Context\CacheContextsManager;
+use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\Language\LanguageInterface;
+use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\Core\Utility\Token;
 use Drupal\Tests\UnitTestCase;
 
@@ -59,6 +62,20 @@ class TokenTest extends UnitTestCase {
    */
   protected $cacheTagsInvalidator;
 
+  /**
+   * The cache contexts manager.
+   *
+   * @var \Drupal\Core\Cache\Context\CacheContextsManager
+   */
+  protected $cacheContextManager;
+
+  /**
+   * The renderer.
+   *
+   * @var \Drupal\Core\Render\RendererInterface|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $renderer;
+
   /**
    * {@inheritdoc}
    */
@@ -73,7 +90,17 @@ class TokenTest extends UnitTestCase {
 
     $this->cacheTagsInvalidator = $this->getMock('\Drupal\Core\Cache\CacheTagsInvalidatorInterface');
 
-    $this->token = new Token($this->moduleHandler, $this->cache, $this->languageManager, $this->cacheTagsInvalidator);
+    $this->renderer = $this->getMock('Drupal\Core\Render\RendererInterface');
+
+    $this->token = new Token($this->moduleHandler, $this->cache, $this->languageManager, $this->cacheTagsInvalidator, $this->renderer);
+
+    $container = new ContainerBuilder();
+    $this->cacheContextManager = new CacheContextsManager($container, [
+      'current_user',
+      'custom_context'
+    ]);
+    $container->set('cache_contexts_manager', $this->cacheContextManager);
+    \Drupal::setContainer($container);
   }
 
   /**
@@ -122,6 +149,108 @@ class TokenTest extends UnitTestCase {
     $this->token->getInfo();
   }
 
+  /**
+   * @covers ::replace
+   */
+  public function testReplaceWithBubbleableMetadataObject() {
+    $this->moduleHandler->expects($this->any())
+      ->method('invokeAll')
+      ->willReturn(['[node:title]' => 'hello world']);
+
+    $bubbleable_metadata = new BubbleableMetadata();
+    $bubbleable_metadata->setCacheContexts(['current_user']);
+    $bubbleable_metadata->setCacheMaxAge(12);
+
+    $node = $this->prophesize('Drupal\node\NodeInterface');
+    $node->getCacheTags()->willReturn(['node:1']);
+    $node->getCacheContexts()->willReturn(['custom_context']);
+    $node->getCacheMaxAge()->willReturn(10);
+    $node = $node->reveal();
+
+    $result = $this->token->replace('[node:title]', ['node' => $node], [], $bubbleable_metadata);
+    $this->assertEquals('hello world', $result);
+
+    $this->assertEquals(['node:1'], $bubbleable_metadata->getCacheTags());
+    $this->assertEquals([
+      'current_user',
+      'custom_context'
+    ], $bubbleable_metadata->getCacheContexts());
+    $this->assertEquals(10, $bubbleable_metadata->getCacheMaxAge());
+  }
+
+  /**
+   * @covers ::replace
+   */
+  public function testReplaceWithHookTokensWithBubbleableMetadata() {
+    $this->moduleHandler->expects($this->any())
+      ->method('invokeAll')
+      ->willReturnCallback(function ($hook_name, $args) {
+        $cacheable_metadata = $args[4];
+        $cacheable_metadata->addCacheContexts(['custom_context']);
+        $cacheable_metadata->addCacheTags(['node:1']);
+        $cacheable_metadata->setCacheMaxAge(10);
+
+        return ['[node:title]' => 'hello world'];
+      });
+
+    $node = $this->prophesize('Drupal\node\NodeInterface');
+    $node->getCacheContexts()->willReturn([]);
+    $node->getCacheTags()->willReturn([]);
+    $node->getCacheMaxAge()->willReturn(14);
+    $node = $node->reveal();
+
+    $bubbleable_metadata = new BubbleableMetadata();
+    $bubbleable_metadata->setCacheContexts(['current_user']);
+    $bubbleable_metadata->setCacheMaxAge(12);
+
+    $result = $this->token->replace('[node:title]', ['node' => $node], [], $bubbleable_metadata);
+    $this->assertEquals('hello world', $result);
+    $this->assertEquals(['node:1'], $bubbleable_metadata->getCacheTags());
+    $this->assertEquals([
+      'current_user',
+      'custom_context'
+    ], $bubbleable_metadata->getCacheContexts());
+    $this->assertEquals(10, $bubbleable_metadata->getCacheMaxAge());
+  }
+
+  /**
+   * @covers ::replace
+   * @covers ::replace
+   */
+  public function testReplaceWithHookTokensAlterWithBubbleableMetadata() {
+    $this->moduleHandler->expects($this->any())
+      ->method('invokeAll')
+      ->willReturn([]);
+
+    $this->moduleHandler->expects($this->any())
+      ->method('alter')
+      ->willReturnCallback(function ($hook_name, array &$replacements, array $context, BubbleableMetadata $bubbleable_metadata) {
+        $replacements['[node:title]'] = 'hello world';
+        $bubbleable_metadata->addCacheContexts(['custom_context']);
+        $bubbleable_metadata->addCacheTags(['node:1']);
+        $bubbleable_metadata->setCacheMaxAge(10);
+      });
+
+    $node = $this->prophesize('Drupal\node\NodeInterface');
+    $node->getCacheContexts()->willReturn([]);
+    $node->getCacheTags()->willReturn([]);
+    $node->getCacheMaxAge()->willReturn(14);
+    $node = $node->reveal();
+
+    $bubbleable_metadata = new BubbleableMetadata();
+    $bubbleable_metadata->setCacheContexts(['current_user']);
+    $bubbleable_metadata->setCacheMaxAge(12);
+
+    $result = $this->token->replace('[node:title]', ['node' => $node], [], $bubbleable_metadata);
+    $this->assertEquals('hello world', $result);
+    $this->assertEquals(['node:1'], $bubbleable_metadata->getCacheTags());
+    $this->assertEquals([
+      'current_user',
+      'custom_context'
+    ], $bubbleable_metadata->getCacheContexts());
+    $this->assertEquals(10, $bubbleable_metadata->getCacheMaxAge());
+  }
+
   /**
    * @covers ::resetInfo
    */
diff --git a/core/tests/Drupal/Tests/Core/Utility/UnroutedUrlAssemblerTest.php b/core/tests/Drupal/Tests/Core/Utility/UnroutedUrlAssemblerTest.php
index 98fab074a..e13b85b99 100644
--- a/core/tests/Drupal/Tests/Core/Utility/UnroutedUrlAssemblerTest.php
+++ b/core/tests/Drupal/Tests/Core/Utility/UnroutedUrlAssemblerTest.php
@@ -7,8 +7,8 @@
 
 namespace Drupal\Tests\Core\Utility;
 
-use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\GeneratedUrl;
+use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\Core\Utility\UnroutedUrlAssembler;
 use Drupal\Tests\UnitTestCase;
 use Symfony\Component\HttpFoundation\Request;
@@ -55,9 +55,8 @@ class UnroutedUrlAssemblerTest extends UnitTestCase {
     parent::setUp();
 
     $this->requestStack = new RequestStack();
-    $this->configFactory = $this->getConfigFactoryStub(['system.filter' => []]);
     $this->pathProcessor = $this->getMock('Drupal\Core\PathProcessor\OutboundPathProcessorInterface');
-    $this->unroutedUrlAssembler = new UnroutedUrlAssembler($this->requestStack, $this->configFactory, $this->pathProcessor);
+    $this->unroutedUrlAssembler = new UnroutedUrlAssembler($this->requestStack, $this->pathProcessor);
   }
 
   /**
@@ -87,7 +86,7 @@ class UnroutedUrlAssemblerTest extends UnitTestCase {
    $this->assertEquals($expected, $this->unroutedUrlAssembler->assemble($uri, $options));
    $generated_url = $this->unroutedUrlAssembler->assemble($uri, $options, TRUE);
    $this->assertEquals($expected, $generated_url->getGeneratedUrl());
-   $this->assertInstanceOf('\Drupal\Core\Cache\CacheableMetadata', $generated_url);
+   $this->assertInstanceOf('\Drupal\Core\Render\BubbleableMetadata', $generated_url);
   }
 
   /**
@@ -153,9 +152,9 @@ class UnroutedUrlAssemblerTest extends UnitTestCase {
     $this->setupRequestStack(FALSE);
     $this->pathProcessor->expects($this->exactly(2))
       ->method('processOutbound')
-      ->willReturnCallback(function($path, &$options = [], Request $request = NULL, CacheableMetadata $cacheable_metadata = NULL) {
-        if ($cacheable_metadata) {
-          $cacheable_metadata->setCacheContexts(['some-cache-context']);
+      ->willReturnCallback(function($path, &$options = [], Request $request = NULL, BubbleableMetadata $bubbleable_metadata = NULL) {
+        if ($bubbleable_metadata) {
+          $bubbleable_metadata->setCacheContexts(['some-cache-context']);
         }
         return 'test-other-uri';
       });
diff --git a/core/themes/bartik/bartik.breakpoints.yml b/core/themes/bartik/bartik.breakpoints.yml
index cf28bed9c..66a8a74f6 100644
--- a/core/themes/bartik/bartik.breakpoints.yml
+++ b/core/themes/bartik/bartik.breakpoints.yml
@@ -1,7 +1,7 @@
 bartik.mobile:
   label: mobile
   mediaQuery: ''
-  weight: 2
+  weight: 0
   multipliers:
     - 1x
 bartik.narrow:
@@ -13,6 +13,6 @@ bartik.narrow:
 bartik.wide:
   label: wide
   mediaQuery: 'all and (min-width: 851px)'
-  weight: 0
+  weight: 2
   multipliers:
     - 1x
diff --git a/core/themes/bartik/bartik.theme b/core/themes/bartik/bartik.theme
index 1f69448e4..4f83a9ee9 100644
--- a/core/themes/bartik/bartik.theme
+++ b/core/themes/bartik/bartik.theme
@@ -125,6 +125,6 @@ function _bartik_process_page(&$variables) {
   if ($variables['hide_site_slogan']) {
     // If toggle_site_slogan is FALSE, the site_slogan will be empty, so we
     // rebuild it.
-    $variables['site_slogan'] = Xss::filterAdmin($site_config->get('slogan'));
+    $variables['site_slogan']['#markup'] = $site_config->get('slogan');
   }
 }
diff --git a/core/themes/bartik/css/base/elements.css b/core/themes/bartik/css/base/elements.css
index 3b8489694..3bf574a66 100644
--- a/core/themes/bartik/css/base/elements.css
+++ b/core/themes/bartik/css/base/elements.css
@@ -124,6 +124,10 @@ blockquote:after {
 blockquote > p:first-child {
   display: inline;
 }
+.feed-icon {
+  display: block;
+  margin: 25px 0 0 0;
+}
 img {
   max-width: 100%;
   height: auto;
diff --git a/core/themes/bartik/css/components/comments.css b/core/themes/bartik/css/components/comments.css
index 9f22c5122..8515cd963 100644
--- a/core/themes/bartik/css/components/comments.css
+++ b/core/themes/bartik/css/components/comments.css
@@ -7,19 +7,23 @@
 #content .comment-wrapper h2 {
   margin-bottom: 1em;
 }
+#content .comment-wrapper h2.comment-form__title {
+  margin-bottom: 1em;
+}
 .comment {
-  margin-bottom: 20px;
+  margin-bottom: 19px;
+  vertical-align: top;
   display: table;
-  vertical-align: top;
 }
-.comment__attribution {
-  display: table-cell;
+[dir="rtl"] .comment {
+  direction: rtl;
+}
+
+.comment__meta {
   padding: 0 30px 0 0; /* LTR */
-  vertical-align: top;
-  overflow: hidden;
+  font-size: 1.071em;
 }
-[dir="rtl"] .comment__attribution {
-  float: right;
+[dir="rtl"] .comment__meta {
   padding: 0 0 0 30px;
 }
 .comment__attribution img {
@@ -32,32 +36,34 @@
 .comment__author .username {
   white-space: nowrap;
 }
-.comment__submitted__data {
+.comment__author {
   margin: 4px 0;
-  font-size: 1.071em;
   line-height: 1.2;
 }
 .comment__time {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 0.786em;
+  margin-bottom: 4px;
   color: #68696b;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 0.733em;
+  line-height: 1.2;
+
 }
 .comment__permalink {
-  font-size: 0.786em;
+  font-size: 0.733em;
+  line-height: 1.2;
 }
 .comment__content {
+  position: relative;
+  display: table-cell;
+  padding: 10px 25px 10px 25px;
+  vertical-align: top;
+  width: 100%;
+  border: 1px solid #d3d7d9;
   font-size: 0.929em;
   line-height: 1.6;
 }
-.comment__text {
-  padding: 10px 25px;
-  border: 1px solid #d3d7d9;
-  display: table-cell;
-  vertical-align: top;
-  position: relative;
-  width: 100%;
-}
-.comment__text:before {
+
+.comment__content:before {
   content: '';
   position: absolute;
   right: 100%; /* LTR */
@@ -66,13 +72,13 @@
   border-right: 20px solid #d3d7d9; /* LTR */
   border-bottom: 20px solid transparent;
 }
-[dir="rtl"] .comment__text:before {
+[dir="rtl"] .comment__content:before {
   right: auto;
   left: 100%;
   border-right: none;
   border-left: 20px solid #d3d7d9;
 }
-.comment__text:after {
+.comment__content:after {
   content: '';
   position: absolute;
   right: 100%; /* LTR */
@@ -82,7 +88,7 @@
   border-bottom: 20px solid transparent;
   margin-right: -1px; /* LTR */
 }
-[dir="rtl"] .comment__text:after {
+[dir="rtl"] .comment__content:after {
   right: auto;
   left: 100%;
   border-right: none;
@@ -90,6 +96,14 @@
   margin-right: 0;
   margin-left: -1px;
 }
+.comment__content h3 {
+  margin-top: 0.94em;
+  margin-bottom: 0.45em;
+  font-size: 1.171em;
+}
+.comment__content nav {
+  padding-top: 1px;
+}
 .comment .indented {
   margin-left: 40px; /* LTR */
 }
@@ -97,13 +111,14 @@
   margin-right: 40px;
   margin-left: 0;
 }
-.comment ul.links {
+.comment .links {
   padding: 0 0 0.25em 0;
 }
-.comment ul.links li {
+.comment .links li {
   padding: 0 0.5em 0 0; /* LTR */
+  font-size: 1.08em;
 }
-[dir="rtl"] .comment ul.links li {
+[dir="rtl"] .comment .links li {
   padding: 0 0 0 0.5em;
 }
 .comment--unpublished {
@@ -116,14 +131,11 @@
   margin-right: 0;
   padding: 5px 5px 5px 2px;
 }
-.comment-footer {
-  display: table-row;
-}
-.comment--unpublished .comment__text:after,
-.node--unpublished .comment__text:after {
+.comment--unpublished .comment__content:after,
+.node--unpublished .comment__content:after {
   border-right-color: #fff4f4; /* LTR */
 }
-[dir="rtl"] .comment--unpublished .comment__text:after,
-[dir="rtl"] .node--unpublished .comment__text:after {
+[dir="rtl"] .comment--unpublished .comment__content:after,
+[dir="rtl"] .node--unpublished .comment__content:after {
   border-left-color: #fff4f4;
 }
diff --git a/core/themes/bartik/css/components/contextual.css b/core/themes/bartik/css/components/contextual.css
index 1e4d2a9b4..f823d81a0 100644
--- a/core/themes/bartik/css/components/contextual.css
+++ b/core/themes/bartik/css/components/contextual.css
@@ -3,15 +3,7 @@
  * Contextual links styles for Bartik.
  */
 
-#header .contextual .trigger,
-.site-footer .contextual .trigger {
-  border: none;
-}
-.contextual-region .contextual .contextual-links a {
+.contextual-links a {
   border-bottom: none;
-  font-size: 0.923em;
   text-shadow: 0 0 0;
 }
-.contextual-links {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-}
diff --git a/core/themes/bartik/css/components/dropbutton.component.css b/core/themes/bartik/css/components/dropbutton.component.css
index 729815adf..db5596550 100644
--- a/core/themes/bartik/css/components/dropbutton.component.css
+++ b/core/themes/bartik/css/components/dropbutton.component.css
@@ -1,13 +1,15 @@
-/* ---------- Dropbutton ----------- */
-.js .dropbutton-multiple.open .dropbutton-widget {
-  border-radius: 1em;
+/**
+ * @file
+ * Visual styles for Bartik's dropbutton component.
+ */
+
+.js .dropbutton-wrapper .dropbutton-widget {
+  /* This is required to win over specifity of .js td .dropbutton-widget */
+  position: relative;
 }
 .js .dropbutton-widget {
-  position: relative !important;
-  border: 1px solid #e4e4e4;
-  border-bottom-color: #b4b4b4;
-  border-left-color: #d2d2d2;
-  border-right-color: #d2d2d2;
+  border: 1px solid;
+  border-color: #e4e4e4 #d2d2d2 #b4b4b4 #d2d2d2;
   background-color: #fff;
   background-image: -webkit-linear-gradient(top, #f3f3f3, #e8e8e8);
   background-image: linear-gradient(to bottom, #f3f3f3, #e8e8e8);
@@ -16,96 +18,40 @@
   text-align: center;
   margin: 0.125em 0;
   border-radius: 1em;
+  overflow: hidden;
 }
 .js .dropbutton-widget:hover {
-  border-top-color: #e4e4e4;
-  border-bottom-color: #b4b4b4;
-  border-left-color: #d2d2d2;
-  border-right-color: #d2d2d2;
+  border-color: #e4e4e4 #d2d2d2 #b4b4b4 #d2d2d2;
 }
 .js .dropbutton-widget .button {
   border: none;
   margin: 0;
   padding: 0.32em 1em;
-  width: 100%;
-  border-radius: 1em;
-}
-.js .dropbutton-widget .button:hover {
-  border-radius: 1em 0 0 1em; /* LTR */
-}
-[dir="rtl"].js .dropbutton-widget .button:hover {
-  border-radius: 0 1em 1em 0;
-}
-.js .dropbutton-single .dropbutton-widget .dropbutton-action a {
-  color: #3a3a3a;
-}
-.js .dropbutton-single .dropbutton-widget .dropbutton-action a:hover {
-  background: #dedede;
-  border-radius: 1em;
+  background: transparent none;
 }
 .js .dropbutton-multiple .dropbutton-widget .dropbutton-action a {
-  color: #3a3a3a;
   margin-right: 0; /* LTR */
 }
 [dir="rtl"].js .dropbutton-multiple .dropbutton-widget .dropbutton-action a {
   margin-left: 0;
 }
-.js .dropbutton-multiple .dropbutton-widget .dropbutton-action a:hover {
-  background: #dedede;
-}
-.js .dropbutton-multiple .dropbutton-widget .dropbutton-action:first-child a:hover {
-  border-radius: 1em 0 0 1em; /* LTR */
-}
-[dir="rtl"].js .dropbutton-multiple .dropbutton-widget .dropbutton-action:first-child a:hover {
-  border-radius: 0 1em 1em 0;
-}
-.js .dropbutton-multiple.open .dropbutton-widget .dropbutton-action:first-child a:hover {
-  border-radius: 1em 0 0 0; /* LTR */
-}
-[dir="rtl"].js .dropbutton-multiple.open .dropbutton-widget .dropbutton-action:first-child a:hover {
-  border-radius: 0 1em 0 0;
-}
-.js .dropdown-widget .publish .button {
-  border-radius: 1em 0 0 1em; /* LTR */
-}
-[dir="rtl"].js .dropbutton-widget .publish .button {
-  border-radius: 0 1em 1em 0;
-}
-.js .dropbutton-multiple.open .dropbutton-action:first-child a,
-.js .dropbutton-multiple.open .dropbutton-action:first-child .button {
-  border-radius: 1em 0 0 0; /* LTR */
-}
-[dir="rtl"].js .dropbutton-multiple.open .dropbutton-action:first-child a,
-[dir="rtl"].js .dropbutton-multiple.open .dropbutton-action:first-child .button {
-  border-radius: 0 1em 0 0;
-}
-.js .dropbutton-multiple.open .dropbutton-action:last-child a,
-.js .dropbutton-multiple.open .dropbutton-action:last-child .button {
-  border-radius: 0 0 0 1em; /* LTR */
-}
-[dir="rtl"].js .dropbutton-multiple.open .dropbutton-action:last-child a,
-[dir="rtl"].js .dropbutton-multiple.open .dropbutton-action:last-child .button {
-  border-radius: 0 0 1em 0;
-}
 .js .dropbutton .secondary-action {
   border-top-color: #ccc;
 }
 .js .dropbutton-toggle button {
-  border-radius: 0 1em 1em 0; /* LTR */
   background-color: #e8e8e8;
   background-image: -webkit-linear-gradient(top, #e8e8e8, #d2d2d2);
   background-image: linear-gradient(to bottom, #e8e8e8, #d2d2d2);
 }
-[dir="rtl"].js .dropbutton-toggle button {
-  border-radius: 1em 0 0 1em;
-}
-.js .dropbutton-toggle .button:hover {
+.js .dropbutton-toggle .dropbutton-arrow:hover {
   background: #ccc;
 }
-
 .js .dropbutton a {
-  border-bottom: none;
+  color: #3a3a3a;
+  border-bottom: 0 none;
 }
+.js .dropbutton .dropbutton-action:hover,
 .js .dropbutton a:hover {
-  border-bottom-style: none;
+  background: #dedede;
+  border-bottom: 0 none;
 }
diff --git a/core/themes/bartik/css/components/form.css b/core/themes/bartik/css/components/form.css
index 4574da0ca..378bcb469 100644
--- a/core/themes/bartik/css/components/form.css
+++ b/core/themes/bartik/css/components/form.css
@@ -276,6 +276,6 @@ input.form-submit:focus {
 }
 
 /* Form error message styles. */
-.form-error-message {
-  color: #ea2800;
+.form-item--error-message {
+  color: #e32700;
 }
diff --git a/core/themes/bartik/templates/comment.html.twig b/core/themes/bartik/templates/comment.html.twig
index 2dac83154..8927db40e 100644
--- a/core/themes/bartik/templates/comment.html.twig
+++ b/core/themes/bartik/templates/comment.html.twig
@@ -70,6 +70,7 @@
 {%
   set classes = [
     'comment',
+    'js-comment',
     status != 'published' ? 'comment--' ~ status,
     comment.owner.anonymous ? 'by-anonymous',
     author_id and author_id == commented_entity.getOwnerId() ? 'by-' ~ commented_entity.getEntityTypeId() ~ '-author',
@@ -77,43 +78,37 @@
   ]
 %}
 <article role="article"{{ attributes.addClass(classes)|without('role') }}>
-  <header class="comment-header">
-    <div class="comment__attribution">
-      {{ user_picture }}
-      <div class="comment__submitted">
-        <p class="comment__author comment__submitted__data">{{ author }}</p>
-        <p class="comment__time comment__submitted__data">{{ created }}</p>
-        <p class="comment__permalink comment__submitted__data">{{ permalink }}</p>
-        {#
-          // Indicate the semantic relationship between parent and child comments
-          // for accessibility. The list is difficult to navigate in a screen
-          // reader without this information.
-        #}
-        {% if parent %}
-          <p class="visually-hidden">{{ parent }}</p>
-        {% endif %}
-      </div>
-    </div>
-  </header>
-  <div class="comment__text">
+  {#
+    Hide the "new" indicator by default, let a piece of JavaScript ask the
+    server which comments are new for the user. Rendering the final "new"
+    indicator here would break the render cache.
+  #}
+  <span class="hidden" data-comment-timestamp="{{ new_indicator_timestamp }}"></span>
+
+  <footer class="comment__meta">
+    {{ user_picture }}
+    <p class="comment__author">{{ author }}</p>
+    <p class="comment__time">{{ created }}</p>
+    <p class="comment__permalink">{{ permalink }}</p>
     {#
-    Hide the "new" indicator by default, let a piece of JavaScript ask
-    the server which comments are new for the user. Rendering the final
-    "new" indicator here would break the render cache.
+      Indicate the semantic relationship between parent and child comments
+      for accessibility. The list is difficult to navigate in a screen
+      reader without this information.
     #}
-    <span class="hidden new" data-comment-timestamp="{{ new_indicator_timestamp }}"></span>
+    {% if parent %}
+      <p class="visually-hidden">{{ parent }}</p>
+    {% endif %}
+  </footer>
+
+  <div{{ content_attributes.addClass('comment__content') }}>
     {% if title %}
       {{ title_prefix }}
-        <h3{{ title_attributes }}>{{ title }}</h3>
+      <h3{{ title_attributes }}>{{ title }}</h3>
       {{ title_suffix }}
     {% endif %}
-    <div{{ content_attributes.addClass('comment__content') }}>
-      {{ content|without('links') }}
-    </div>
-    <footer class="comment__footer">
-      {% if content.links %}
-        <nav>{{ content.links }}</nav>
-      {% endif %}
-    </footer>
+    {{ content|without('links') }}
+    {% if content.links %}
+      <nav>{{ content.links }}</nav>
+    {% endif %}
   </div>
 </article>
diff --git a/core/themes/classy/classy.info.yml b/core/themes/classy/classy.info.yml
index 93a52685f..bd61ce093 100644
--- a/core/themes/classy/classy.info.yml
+++ b/core/themes/classy/classy.info.yml
@@ -7,3 +7,4 @@ core: 8.x
 
 libraries:
   - classy/base
+  - core/normalize
diff --git a/core/themes/classy/classy.libraries.yml b/core/themes/classy/classy.libraries.yml
index 4603ff1ed..a5bde7712 100644
--- a/core/themes/classy/classy.libraries.yml
+++ b/core/themes/classy/classy.libraries.yml
@@ -15,3 +15,9 @@ drupal.comment.threaded:
   css:
     theme:
       css/comment/comment.theme.css: {}
+
+search.results:
+  version: VERSION
+  css:
+    theme:
+      css/search/search.theme.css: {}
diff --git a/core/modules/search/css/search.theme.css b/core/themes/classy/css/search/search.theme.css
similarity index 100%
rename from core/modules/search/css/search.theme.css
rename to core/themes/classy/css/search/search.theme.css
diff --git a/core/themes/classy/templates/content/comment.html.twig b/core/themes/classy/templates/content/comment.html.twig
index bb06364e4..25e7d37b7 100644
--- a/core/themes/classy/templates/content/comment.html.twig
+++ b/core/themes/classy/templates/content/comment.html.twig
@@ -70,38 +70,28 @@
 {%
   set classes = [
     'comment',
+    'js-comment',
     status != 'published' ? status,
     comment.owner.anonymous ? 'by-anonymous',
     author_id and author_id == commented_entity.getOwnerId() ? 'by-' ~ commented_entity.getEntityTypeId() ~ '-author',
-    'clearfix',
   ]
 %}
 <article{{ attributes.addClass(classes) }}>
-  {% if title %}
-    {{ title_prefix }}
-  {% endif %}
-
   {#
-  Hide the "new" indicator by default, let a piece of JavaScript ask
-  the server which comments are new for the user. Rendering the final
-  "new" indicator here would break the render cache.
+    Hide the "new" indicator by default, let a piece of JavaScript ask the
+    server which comments are new for the user. Rendering the final "new"
+    indicator here would break the render cache.
   #}
   <mark class="hidden" data-comment-timestamp="{{ new_indicator_timestamp }}"></mark>
 
-  {% if title %}
-    <h3{{ title_attributes }}>{{ title }}</h3>
-    {{ title_suffix }}
-  {% endif %}
-
-
-  <footer>
+  <footer class="comment__meta">
     {{ user_picture }}
-    <p class="submitted">{{ submitted }}</p>
+    <p class="comment__submitted">{{ submitted }}</p>
 
     {#
-      Indicate the semantic relationship between parent and child comments
-      for accessibility. The list is difficult to navigate in a screen
-      reader without this information.
+      Indicate the semantic relationship between parent and child comments for
+      accessibility. The list is difficult to navigate in a screen reader
+      without this information.
     #}
     {% if parent %}
       <p class="parent visually-hidden">{{ parent }}</p>
@@ -111,9 +101,11 @@
   </footer>
 
   <div{{ content_attributes.addClass('content') }}>
-    {{ content|without('links') }}
+    {% if title %}
+      {{ title_prefix }}
+      <h3{{ title_attributes }}>{{ title }}</h3>
+      {{ title_suffix }}
+    {% endif %}
+    {{ content }}
   </div>
-  {% if content.links %}
-    {{ content.links }}
-  {% endif %}
 </article>
diff --git a/core/themes/classy/templates/content/search-result.html.twig b/core/themes/classy/templates/content/search-result.html.twig
index bdf543469..714b00517 100644
--- a/core/themes/classy/templates/content/search-result.html.twig
+++ b/core/themes/classy/templates/content/search-result.html.twig
@@ -56,6 +56,7 @@
  * @see template_preprocess_search_result()
  */
 #}
+{{ attach_library('classy/search.results') }}
 {{ title_prefix }}
 <h3{{ title_attributes.addClass('search-result__title') }}>
   <a href="{{ url }}">{{ title }}</a>
diff --git a/core/themes/classy/templates/field/field--text.html.twig b/core/themes/classy/templates/field/field--text.html.twig
index 9cd1ab9fa..5d1690c3e 100644
--- a/core/themes/classy/templates/field/field--text.html.twig
+++ b/core/themes/classy/templates/field/field--text.html.twig
@@ -14,7 +14,15 @@
  *
  * @see https://www.drupal.org/node/2358529
  *
+ * A 'text-formatted' class is added to assist with default styling of base
+ * elements such as paragraphs and lists that may not have classes assigned to
+ * them. This allows user entered content to have default styling without
+ * interfering with the styles of other UI components such as system generated
+ * lists or other dynamic content.
+ *
+ * @see https://www.drupal.org/node/2539860
+ *
  * @ingroup themeable
  */
 #}
-{% set attributes = attributes.addClass('clearfix') %}
+{% set attributes = attributes.addClass('clearfix', 'text-formatted') %}
diff --git a/core/themes/classy/templates/form/datetime-wrapper.html.twig b/core/themes/classy/templates/form/datetime-wrapper.html.twig
index 56da17309..fa04a65c7 100644
--- a/core/themes/classy/templates/form/datetime-wrapper.html.twig
+++ b/core/themes/classy/templates/form/datetime-wrapper.html.twig
@@ -24,7 +24,7 @@
 {% endif %}
 {{ content }}
 {% if errors %}
-  <div class="form-error-message">
+  <div class="form-item--error-message">
     <strong>{{ errors }}</strong>
   </div>
 {% endif %}
diff --git a/core/themes/classy/templates/form/fieldset.html.twig b/core/themes/classy/templates/form/fieldset.html.twig
index 67b8451ba..5e0d79538 100644
--- a/core/themes/classy/templates/form/fieldset.html.twig
+++ b/core/themes/classy/templates/form/fieldset.html.twig
@@ -40,7 +40,7 @@
   </legend>
   <div class="fieldset-wrapper">
     {% if errors %}
-      <div class="form-error-message">
+      <div class="form-item--error-message">
         <strong>{{ errors }}</strong>
       </div>
     {% endif %}
diff --git a/core/themes/classy/templates/form/form-element.html.twig b/core/themes/classy/templates/form/form-element.html.twig
index f0d4d5601..65028fa3b 100644
--- a/core/themes/classy/templates/form/form-element.html.twig
+++ b/core/themes/classy/templates/form/form-element.html.twig
@@ -52,7 +52,7 @@
     'form-item-' ~ name|clean_class,
     title_display not in ['after', 'before'] ? 'form-no-label',
     disabled == 'disabled' ? 'form-disabled',
-    errors ? 'form-error',
+    errors ? 'form-item--error',
   ]
 %}
 {%
@@ -81,7 +81,7 @@
     {{ label }}
   {% endif %}
   {% if errors %}
-    <div class="form-error-message">
+    <div class="form-item--error-message">
       <strong>{{ errors }}</strong>
     </div>
   {% endif %}
diff --git a/core/themes/classy/templates/form/select.html.twig b/core/themes/classy/templates/form/select.html.twig
index 51baa7a17..3150bdcb3 100644
--- a/core/themes/classy/templates/form/select.html.twig
+++ b/core/themes/classy/templates/form/select.html.twig
@@ -10,4 +10,18 @@
  * @see template_preprocess_select()
  */
 #}
-<select{{ attributes }}>{{ options }}</select>
+{% spaceless %}
+  <select{{ attributes }}>
+    {% for option in options %}
+      {% if option.type == 'optgroup' %}
+        <optgroup label="{{ option.label }}">
+          {% for sub_option in option.options %}
+            <option value="{{ sub_option.value }}"{{ sub_option.selected ? ' selected="selected"' }}>{{ sub_option.label }}</option>
+          {% endfor %}
+        </optgroup>
+      {% elseif option.type == 'option' %}
+        <option value="{{ option.value }}"{{ option.selected ? ' selected="selected"' }}>{{ option.label }}</option>
+      {% endif %}
+    {% endfor %}
+  </select>
+{% endspaceless %}
diff --git a/core/themes/classy/templates/misc/feed-icon.html.twig b/core/themes/classy/templates/misc/feed-icon.html.twig
deleted file mode 100644
index 19db66acb..000000000
--- a/core/themes/classy/templates/misc/feed-icon.html.twig
+++ /dev/null
@@ -1,16 +0,0 @@
-{#
-/**
- * @file
- * Theme override for a feed icon.
- *
- * Available variables:
- * - url: An internal system path or a fully qualified external URL of the feed.
- * - icon: The rendered HTML (<img> tag) for the feed icon image.
- * - attributes: Remaining HTML attributes for the feed link.
- *   - title: A descriptive title of the feed link.
- *   - class: HTML classes to be applied to the feed link.
- *
- * @see template_preprocess_feed_icon()
- */
-#}
-<a href="{{ url }}"{{ attributes.addClass('feed-icon')|without('href') }}>{{ icon }}</a>
diff --git a/core/themes/classy/templates/navigation/links.html.twig b/core/themes/classy/templates/navigation/links.html.twig
index 5f62ac3f6..f82f41a15 100644
--- a/core/themes/classy/templates/navigation/links.html.twig
+++ b/core/themes/classy/templates/navigation/links.html.twig
@@ -11,8 +11,6 @@
  *   - href: The link URL. If omitted, the 'title' is shown as a plain text
  *     item in the links list. If 'href' is supplied, the entire link is passed
  *     to l() as its $options parameter.
- *   - html: (optional) Whether or not 'title' is HTML. If set, the title will
- *     not be passed through \Drupal\Component\Utility\SafeMarkup::checkPlain().
  *   - attributes: (optional) HTML attributes for the anchor, or for the <span>
  *     tag if no 'href' is supplied.
  *   - link_key: The link CSS class.
diff --git a/core/themes/classy/templates/user/user.html.twig b/core/themes/classy/templates/user/user.html.twig
index 9ee9c0a70..9a824effd 100644
--- a/core/themes/classy/templates/user/user.html.twig
+++ b/core/themes/classy/templates/user/user.html.twig
@@ -8,14 +8,8 @@
  *
  * Available variables:
  * - content: A list of content items. Use 'content' to print all content, or
- *   print a subset such as 'content.field_example'.
- * - Field variables: For each field attached to the user a corresponding
- *   variable is defined; e.g., account.field_example has a variable
- *   'field_example' defined. When needing to access a field's raw values,
- *   developers/themers are strongly encouraged to use these variables.
- *   Otherwise they will have to explicitly specify the desired field language,
- *   e.g. account.field_example.en, thus overriding any language negotiation
- *   rule that was previously applied.
+ *   print a subset such as 'content.field_example'. Fields attached to a user
+ *   such as 'user_picture' are available as 'content.user_picture'.
  * - attributes: HTML attributes for the container element.
  * - user: A Drupal User entity.
  *
diff --git a/core/themes/seven/css/components/form.css b/core/themes/seven/css/components/form.css
index 07232de4f..f74eb74c8 100644
--- a/core/themes/seven/css/components/form.css
+++ b/core/themes/seven/css/components/form.css
@@ -12,7 +12,7 @@ fieldset:not(.fieldgroup) {
   padding: 30px 18px 18px;
   position: relative;
 }
-fieldset:not(.fieldgroup) legend {
+fieldset:not(.fieldgroup) > legend {
   font-size: 1em;
   font-weight: bold;
   letter-spacing: 0.08em;
@@ -96,14 +96,14 @@ label[for] {
   width: 7px;
   height: 7px;
 }
-.form-error-message {
+.form-item--error-message {
   margin-top: 0.15em;
-  color: #ea2800;
+  color: #e32700;
 }
-.fieldset-wrapper > .form-error-message {
+.fieldset-wrapper > .form-item--error-message {
   margin-top: 0;
 }
-.text-format-wrapper .form-error-message {
+.text-format-wrapper .form-item--error-message {
   border: solid #ccc;
   border-width: 0 1px;
   margin: 0;
diff --git a/core/modules/search/css/search.admin.css b/core/themes/seven/css/components/search-admin-settings.css
similarity index 100%
rename from core/modules/search/css/search.admin.css
rename to core/themes/seven/css/components/search-admin-settings.css
diff --git a/core/themes/seven/seven.breakpoints.yml b/core/themes/seven/seven.breakpoints.yml
index 9cc1fda40..1b6bd2fb4 100644
--- a/core/themes/seven/seven.breakpoints.yml
+++ b/core/themes/seven/seven.breakpoints.yml
@@ -1,12 +1,12 @@
 seven.mobile:
   label: mobile
   mediaQuery: '(min-width: 0em)'
-  weight: 1
+  weight: 0
   multipliers:
     - 1x
 seven.wide:
   label: wide
   mediaQuery: 'screen and (min-width: 40em)'
-  weight: 0
+  weight: 1
   multipliers:
     - 1x
diff --git a/core/themes/seven/seven.libraries.yml b/core/themes/seven/seven.libraries.yml
index a576e1db9..0b814b57f 100644
--- a/core/themes/seven/seven.libraries.yml
+++ b/core/themes/seven/seven.libraries.yml
@@ -25,6 +25,7 @@ global-styling:
       css/components/panel.css: {}
       css/components/skip-link.css: {}
       css/components/tables.css: {}
+      css/components/search-admin-settings.css: {}
       css/components/system-status-report.css: {}
       css/components/tabs.css: {}
       css/components/tour.theme.css: {}
diff --git a/core/themes/seven/seven.theme b/core/themes/seven/seven.theme
index b71e22c20..b508d9475 100644
--- a/core/themes/seven/seven.theme
+++ b/core/themes/seven/seven.theme
@@ -75,7 +75,6 @@ function seven_preprocess_node_add_list(&$variables) {
     /** @var \Drupal\node\NodeTypeInterface $type */
     foreach ($variables['content'] as $type) {
       $variables['types'][$type->id()]['label'] = SafeMarkup::checkPlain($type->label());
-      $variables['types'][$type->id()]['description'] = Xss::filterAdmin($type->getDescription());
       $variables['types'][$type->id()]['url'] = \Drupal::url('node.add', array('node_type' => $type->id()));
     }
   }
@@ -85,13 +84,12 @@ function seven_preprocess_node_add_list(&$variables) {
  * Implements hook_preprocess_HOOK() for block content add list templates.
  *
  * Displays the list of available custom block types for creation, adding
- * separate variables for the label, description, and url.
+ * separate variables for the label and url.
  */
 function seven_preprocess_block_content_add_list(&$variables) {
   if (!empty($variables['content'])) {
     foreach ($variables['content'] as $type) {
       $variables['types'][$type->id()]['label'] = SafeMarkup::checkPlain($type->label());
-      $variables['types'][$type->id()]['description'] = Xss::filterAdmin($type->getDescription());
       $options = array('query' => \Drupal::request()->query->all());
       $variables['types'][$type->id()]['url'] = \Drupal::url('block_content.add_form', array('block_content_type' => $type->id()), $options);
     }
diff --git a/core/themes/stark/stark.breakpoints.yml b/core/themes/stark/stark.breakpoints.yml
index 92d33b297..d1cdd9b4e 100644
--- a/core/themes/stark/stark.breakpoints.yml
+++ b/core/themes/stark/stark.breakpoints.yml
@@ -1,7 +1,7 @@
 stark.mobile:
   label: mobile
   mediaQuery: '(min-width: 0px)'
-  weight: 2
+  weight: 0
   multipliers:
    - 1x
 stark.narrow:
@@ -13,6 +13,6 @@ stark.narrow:
 stark.wide:
   label: wide
   mediaQuery: 'all and (min-width: 960px)'
-  weight: 0
+  weight: 2
   multipliers:
     - 1x
diff --git a/core/vendor/behat/mink-goutte-driver/.travis.yml b/core/vendor/behat/mink-goutte-driver/.travis.yml
index b09e45710..d21d960c9 100644
--- a/core/vendor/behat/mink-goutte-driver/.travis.yml
+++ b/core/vendor/behat/mink-goutte-driver/.travis.yml
@@ -2,6 +2,10 @@ language: php
 
 php: [5.3, 5.4, 5.5, 5.6, hhvm]
 
+before_install:
+  # Force using Goutte 2 on HHVM for now because Guzzle 6 is broken there
+  - if [ "hhvm" = "$TRAVIS_PHP_VERSION" ]; then composer require fabpot/goutte '~2' --no-update; fi
+
 before_script:
   - export WEB_FIXTURES_HOST=http://localhost
 
diff --git a/core/vendor/behat/mink-goutte-driver/README.md b/core/vendor/behat/mink-goutte-driver/README.md
old mode 100755
new mode 100644
index c7877c519..cba60a08b
--- a/core/vendor/behat/mink-goutte-driver/README.md
+++ b/core/vendor/behat/mink-goutte-driver/README.md
@@ -4,9 +4,9 @@ Mink Goutte Driver
 [![Latest Stable Version](https://poser.pugx.org/behat/mink-goutte-driver/v/stable.svg)](https://packagist.org/packages/behat/mink-goutte-driver)
 [![Latest Unstable Version](https://poser.pugx.org/behat/mink-goutte-driver/v/unstable.svg)](https://packagist.org/packages/behat/mink-goutte-driver)
 [![Total Downloads](https://poser.pugx.org/behat/mink-goutte-driver/downloads.svg)](https://packagist.org/packages/behat/mink-goutte-driver)
-[![Build Status](https://travis-ci.org/Behat/MinkGoutteDriver.svg?branch=master)](https://travis-ci.org/Behat/MinkGoutteDriver)
-[![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/Behat/MinkGoutteDriver/badges/quality-score.png?s=ca141bb2cad18e74cf3d3b132b1a6aa0f3f004a5)](https://scrutinizer-ci.com/g/Behat/MinkGoutteDriver/)
-[![Code Coverage](https://scrutinizer-ci.com/g/Behat/MinkGoutteDriver/badges/coverage.png?s=ca2d17a948660bfaeb4a95bf1a709644305c54f3)](https://scrutinizer-ci.com/g/Behat/MinkGoutteDriver/)
+[![Build Status](https://travis-ci.org/minkphp/MinkGoutteDriver.svg?branch=master)](https://travis-ci.org/minkphp/MinkGoutteDriver)
+[![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/minkphp/MinkGoutteDriver/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/minkphp/MinkGoutteDriver/)
+[![Code Coverage](https://scrutinizer-ci.com/g/minkphp/MinkGoutteDriver/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/minkphp/MinkGoutteDriver/)
 [![License](https://poser.pugx.org/behat/mink-goutte-driver/license.svg)](https://packagist.org/packages/behat/mink-goutte-driver)
 
 Usage Example
@@ -15,23 +15,28 @@ Usage Example
 ``` php
 <?php
 
+require "vendor/autoload.php";
+
 use Behat\Mink\Mink,
     Behat\Mink\Session,
     Behat\Mink\Driver\GoutteDriver,
     Behat\Mink\Driver\Goutte\Client as GoutteClient;
 
-$startUrl = 'http://example.com';
-
 $mink = new Mink(array(
-    'goutte' => new Session(new GoutteDriver(new GoutteClient($startUrl))),
+    'goutte' => new Session(new GoutteDriver(new GoutteClient())),
 ));
 
-$mink->getSession('goutte')->getPage()->findLink('Chat')->click();
+$session = $mink->getSession('goutte');
+$session->visit("http://php.net/");
+$session->getPage()->clickLink('Downloads');
+echo $session->getCurrentUrl() . PHP_EOL;
 ```
 
 Installation
 ------------
 
+Add a file composer.json with content:
+
 ``` json
 {
     "require": {
@@ -41,6 +46,8 @@ Installation
 }
 ```
 
+(or merge the above into your project's existing composer.json file)
+
 ``` bash
 $> curl -sS https://getcomposer.org/installer | php
 $> php composer.phar install
@@ -49,5 +56,5 @@ $> php composer.phar install
 Maintainers
 -----------
 
-* Konstantin Kudryashov [everzet](http://github.com/everzet)
-* Other [awesome developers](https://github.com/Behat/MinkGoutteDriver/graphs/contributors)
+* Christophe Coevoet [stof](https://github.com/stof)
+* Other [awesome developers](https://github.com/minkphp/MinkGoutteDriver/graphs/contributors)
diff --git a/core/vendor/behat/mink-goutte-driver/composer.json b/core/vendor/behat/mink-goutte-driver/composer.json
index 7444a5045..f103906ec 100644
--- a/core/vendor/behat/mink-goutte-driver/composer.json
+++ b/core/vendor/behat/mink-goutte-driver/composer.json
@@ -18,12 +18,12 @@
         "php":                           ">=5.3.1",
         "behat/mink":                    "~1.6@dev",
         "behat/mink-browserkit-driver":  "~1.2@dev",
-        "fabpot/goutte":                 "~1.0.4|~2.0"
+        "fabpot/goutte":                 "~1.0.4|~2.0|~3.1"
     },
 
     "autoload": {
-        "psr-0": {
-            "Behat\\Mink\\Driver": "src/"
+        "psr-4": {
+            "Behat\\Mink\\Driver\\": "src/"
         }
     },
 
diff --git a/core/vendor/behat/mink-goutte-driver/phpunit.xml.dist b/core/vendor/behat/mink-goutte-driver/phpunit.xml.dist
index f374c53ae..cbe57c47d 100644
--- a/core/vendor/behat/mink-goutte-driver/phpunit.xml.dist
+++ b/core/vendor/behat/mink-goutte-driver/phpunit.xml.dist
@@ -17,7 +17,7 @@
 
     <filter>
         <whitelist>
-            <directory>./src/Behat/Mink/Driver</directory>
+            <directory>./src</directory>
         </whitelist>
     </filter>
 </phpunit>
diff --git a/core/vendor/behat/mink-goutte-driver/src/Behat/Mink/Driver/Goutte/Client.php b/core/vendor/behat/mink-goutte-driver/src/Goutte/Client.php
similarity index 100%
rename from core/vendor/behat/mink-goutte-driver/src/Behat/Mink/Driver/Goutte/Client.php
rename to core/vendor/behat/mink-goutte-driver/src/Goutte/Client.php
diff --git a/core/vendor/behat/mink-goutte-driver/src/Behat/Mink/Driver/GoutteDriver.php b/core/vendor/behat/mink-goutte-driver/src/GoutteDriver.php
similarity index 100%
rename from core/vendor/behat/mink-goutte-driver/src/Behat/Mink/Driver/GoutteDriver.php
rename to core/vendor/behat/mink-goutte-driver/src/GoutteDriver.php
diff --git a/core/vendor/composer/autoload_files.php b/core/vendor/composer/autoload_files.php
index 853f9a068..6f932aaf6 100644
--- a/core/vendor/composer/autoload_files.php
+++ b/core/vendor/composer/autoload_files.php
@@ -6,6 +6,8 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(
-    $vendorDir . '/react/promise/src/functions_include.php',
+    $vendorDir . '/guzzlehttp/psr7/src/functions.php',
+    $vendorDir . '/guzzlehttp/promises/src/functions.php',
+    $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php',
     $baseDir . '/lib/Drupal.php',
 );
diff --git a/core/vendor/composer/autoload_namespaces.php b/core/vendor/composer/autoload_namespaces.php
index 60382889c..63f4b704a 100644
--- a/core/vendor/composer/autoload_namespaces.php
+++ b/core/vendor/composer/autoload_namespaces.php
@@ -12,7 +12,6 @@ return array(
     'Stack' => array($vendorDir . '/stack/builder/src'),
     'Psr\\Log\\' => array($vendorDir . '/psr/log'),
     'Prophecy\\' => array($vendorDir . '/phpspec/prophecy/src'),
-    'Gliph' => array($vendorDir . '/sdboyer/gliph/src'),
     'Egulias\\' => array($vendorDir . '/egulias/email-validator/src'),
     'EasyRdf_' => array($vendorDir . '/easyrdf/easyrdf/lib'),
     'Doctrine\\Instantiator\\' => array($vendorDir . '/doctrine/instantiator/src'),
@@ -22,5 +21,5 @@ return array(
     'Doctrine\\Common\\Cache\\' => array($vendorDir . '/doctrine/cache/lib'),
     'Doctrine\\Common\\Annotations\\' => array($vendorDir . '/doctrine/annotations/lib'),
     'Doctrine\\Common\\' => array($vendorDir . '/doctrine/common/lib'),
-    'Behat\\Mink\\Driver' => array($vendorDir . '/behat/mink-browserkit-driver/src', $vendorDir . '/behat/mink-goutte-driver/src'),
+    'Behat\\Mink\\Driver' => array($vendorDir . '/behat/mink-browserkit-driver/src'),
 );
diff --git a/core/vendor/composer/autoload_psr4.php b/core/vendor/composer/autoload_psr4.php
index a026f26f5..aeaabc1b5 100644
--- a/core/vendor/composer/autoload_psr4.php
+++ b/core/vendor/composer/autoload_psr4.php
@@ -9,6 +9,7 @@ return array(
     'Zend\\Stdlib\\' => array($vendorDir . '/zendframework/zend-stdlib'),
     'Zend\\Feed\\' => array($vendorDir . '/zendframework/zend-feed'),
     'Zend\\Escaper\\' => array($vendorDir . '/zendframework/zend-escaper'),
+    'Zend\\Diactoros\\' => array($vendorDir . '/zendframework/zend-diactoros/src'),
     'Symfony\\Component\\Yaml\\' => array($vendorDir . '/symfony/yaml'),
     'Symfony\\Component\\Validator\\' => array($vendorDir . '/symfony/validator'),
     'Symfony\\Component\\Translation\\' => array($vendorDir . '/symfony/translation'),
@@ -26,14 +27,16 @@ return array(
     'Symfony\\Component\\ClassLoader\\' => array($vendorDir . '/symfony/class-loader'),
     'Symfony\\Component\\BrowserKit\\' => array($vendorDir . '/symfony/browser-kit'),
     'Symfony\\Cmf\\Component\\Routing\\' => array($vendorDir . '/symfony-cmf/routing'),
-    'React\\Promise\\' => array($vendorDir . '/react/promise/src'),
+    'Symfony\\Bridge\\PsrHttpMessage\\' => array($vendorDir . '/symfony/psr-http-message-bridge'),
+    'Psr\\Http\\Message\\' => array($vendorDir . '/psr/http-message/src'),
     'Masterminds\\' => array($vendorDir . '/masterminds/html5/src'),
-    'GuzzleHttp\\Stream\\' => array($vendorDir . '/guzzlehttp/streams/src'),
-    'GuzzleHttp\\Ring\\' => array($vendorDir . '/guzzlehttp/ringphp/src'),
+    'GuzzleHttp\\Psr7\\' => array($vendorDir . '/guzzlehttp/psr7/src'),
+    'GuzzleHttp\\Promise\\' => array($vendorDir . '/guzzlehttp/promises/src'),
     'GuzzleHttp\\' => array($vendorDir . '/guzzlehttp/guzzle/src'),
     'Goutte\\' => array($vendorDir . '/fabpot/goutte/Goutte'),
     'Drupal\\Driver\\' => array($baseDir . '/../drivers/lib/Drupal/Driver'),
     'Drupal\\Core\\' => array($baseDir . '/lib/Drupal/Core'),
     'Drupal\\Component\\' => array($baseDir . '/lib/Drupal/Component'),
+    'Behat\\Mink\\Driver\\' => array($vendorDir . '/behat/mink-goutte-driver/src'),
     'Behat\\Mink\\' => array($vendorDir . '/behat/mink/src'),
 );
diff --git a/core/vendor/composer/installed.json b/core/vendor/composer/installed.json
index 457c12ec1..e06354398 100644
--- a/core/vendor/composer/installed.json
+++ b/core/vendor/composer/installed.json
@@ -1,58 +1,4 @@
 [
-    {
-        "name": "doctrine/lexer",
-        "version": "v1.0",
-        "version_normalized": "1.0.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/doctrine/lexer.git",
-            "reference": "v1.0"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/doctrine/lexer/zipball/2f708a85bb3aab5d99dab8be435abd73e0b18acb",
-            "reference": "v1.0",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.2"
-        },
-        "time": "2013-01-12 18:59:04",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-0": {
-                "Doctrine\\Common\\Lexer\\": "lib/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Guilherme Blanco",
-                "email": "guilhermeblanco@gmail.com",
-                "homepage": "http://www.instaclick.com"
-            },
-            {
-                "name": "Roman Borschel",
-                "email": "roman@code-factory.org"
-            },
-            {
-                "name": "Johannes M. Schmitt",
-                "email": "schmittjoh@gmail.com",
-                "homepage": "https://github.com/schmittjoh",
-                "role": "Developer of wrapped JMSSerializerBundle"
-            }
-        ],
-        "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.",
-        "homepage": "http://www.doctrine-project.org",
-        "keywords": [
-            "lexer",
-            "parser"
-        ]
-    },
     {
         "name": "doctrine/inflector",
         "version": "v1.0",
@@ -329,58 +275,6 @@
             "parser"
         ]
     },
-    {
-        "name": "guzzlehttp/streams",
-        "version": "3.0.0",
-        "version_normalized": "3.0.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/guzzle/streams.git",
-            "reference": "47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/guzzle/streams/zipball/47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5",
-            "reference": "47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.4.0"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "~4.0"
-        },
-        "time": "2014-10-12 19:18:40",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "3.0-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "GuzzleHttp\\Stream\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Michael Dowling",
-                "email": "mtdowling@gmail.com",
-                "homepage": "https://github.com/mtdowling"
-            }
-        ],
-        "description": "Provides a simple abstraction over streams of data",
-        "homepage": "http://guzzlephp.org/",
-        "keywords": [
-            "Guzzle",
-            "stream"
-        ]
-    },
     {
         "name": "phpunit/php-text-template",
         "version": "1.2.0",
@@ -529,56 +423,6 @@
             "timer"
         ]
     },
-    {
-        "name": "sdboyer/gliph",
-        "version": "0.1.8",
-        "version_normalized": "0.1.8.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/sdboyer/gliph.git",
-            "reference": "db9e4b77622f91e2d338cc45f83c2cd0e3cf0e1e"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/sdboyer/gliph/zipball/db9e4b77622f91e2d338cc45f83c2cd0e3cf0e1e",
-            "reference": "db9e4b77622f91e2d338cc45f83c2cd0e3cf0e1e",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "3.7.*",
-            "satooshi/php-coveralls": "0.6.*"
-        },
-        "time": "2014-08-03 14:34:47",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-0": {
-                "Gliph": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Sam Boyer",
-                "email": "tech@samboyer.org"
-            }
-        ],
-        "description": "A graph library for PHP.",
-        "homepage": "http://github.com/sdboyer/gliph",
-        "keywords": [
-            "gliph",
-            "graph",
-            "library",
-            "php",
-            "spl"
-        ]
-    },
     {
         "name": "psr/log",
         "version": "1.0.0",
@@ -730,58 +574,6 @@
             "routing"
         ]
     },
-    {
-        "name": "egulias/email-validator",
-        "version": "1.2.5",
-        "version_normalized": "1.2.5.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/egulias/EmailValidator.git",
-            "reference": "518f80a0ff7c1a35780e7702f4262c8c6f2b807f"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/518f80a0ff7c1a35780e7702f4262c8c6f2b807f",
-            "reference": "518f80a0ff7c1a35780e7702f4262c8c6f2b807f",
-            "shasum": ""
-        },
-        "require": {
-            "doctrine/lexer": "~1.0",
-            "php": ">= 5.3.3"
-        },
-        "require-dev": {
-            "satooshi/php-coveralls": "dev-master"
-        },
-        "time": "2014-11-06 08:59:44",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.3.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-0": {
-                "Egulias\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Eduardo Gulias Davis"
-            }
-        ],
-        "description": "A library for validating emails",
-        "homepage": "https://github.com/egulias/EmailValidator",
-        "keywords": [
-            "email",
-            "validation",
-            "validator"
-        ]
-    },
     {
         "name": "easyrdf/easyrdf",
         "version": "0.9.0",
@@ -1093,157 +885,6 @@
             "testing"
         ]
     },
-    {
-        "name": "behat/mink-goutte-driver",
-        "version": "v1.1.0",
-        "version_normalized": "1.1.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/minkphp/MinkGoutteDriver.git",
-            "reference": "2bf327b4166694ecaa8ae7f956cb6ae252ecf03e"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/minkphp/MinkGoutteDriver/zipball/2bf327b4166694ecaa8ae7f956cb6ae252ecf03e",
-            "reference": "2bf327b4166694ecaa8ae7f956cb6ae252ecf03e",
-            "shasum": ""
-        },
-        "require": {
-            "behat/mink": "~1.6@dev",
-            "behat/mink-browserkit-driver": "~1.2@dev",
-            "fabpot/goutte": "~1.0.4|~2.0",
-            "php": ">=5.3.1"
-        },
-        "time": "2014-10-09 09:21:12",
-        "type": "mink-driver",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.1.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-0": {
-                "Behat\\Mink\\Driver": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Konstantin Kudryashov",
-                "email": "ever.zet@gmail.com",
-                "homepage": "http://everzet.com"
-            }
-        ],
-        "description": "Goutte driver for Mink framework",
-        "homepage": "http://mink.behat.org/",
-        "keywords": [
-            "browser",
-            "goutte",
-            "headless",
-            "testing"
-        ]
-    },
-    {
-        "name": "fabpot/goutte",
-        "version": "v2.0.3",
-        "version_normalized": "2.0.3.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/FriendsOfPHP/Goutte.git",
-            "reference": "65ab61eae03d670b93a9044ad2328eb81aa1bde5"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/FriendsOfPHP/Goutte/zipball/65ab61eae03d670b93a9044ad2328eb81aa1bde5",
-            "reference": "65ab61eae03d670b93a9044ad2328eb81aa1bde5",
-            "shasum": ""
-        },
-        "require": {
-            "guzzlehttp/guzzle": ">=4,<6",
-            "php": ">=5.4.0",
-            "symfony/browser-kit": "~2.1",
-            "symfony/css-selector": "~2.1",
-            "symfony/dom-crawler": "~2.1"
-        },
-        "time": "2014-11-28 09:48:17",
-        "type": "application",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.0-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Goutte\\": "Goutte"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            }
-        ],
-        "description": "A simple PHP Web Scraper",
-        "homepage": "https://github.com/FriendsOfPHP/Goutte",
-        "keywords": [
-            "scraper"
-        ]
-    },
-    {
-        "name": "react/promise",
-        "version": "v2.2.0",
-        "version_normalized": "2.2.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/reactphp/promise.git",
-            "reference": "365fcee430dfa4ace1fbc75737ca60ceea7eeeef"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/reactphp/promise/zipball/365fcee430dfa4ace1fbc75737ca60ceea7eeeef",
-            "reference": "365fcee430dfa4ace1fbc75737ca60ceea7eeeef",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.4.0"
-        },
-        "time": "2014-12-30 13:32:42",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.0-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "React\\Promise\\": "src/"
-            },
-            "files": [
-                "src/functions_include.php"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Jan Sorgalla",
-                "email": "jsorgalla@googlemail.com"
-            }
-        ],
-        "description": "A lightweight implementation of CommonJS Promises/A for PHP"
-    },
     {
         "name": "masterminds/html5",
         "version": "2.1.0",
@@ -1311,119 +952,6 @@
             "xml"
         ]
     },
-    {
-        "name": "guzzlehttp/guzzle",
-        "version": "5.2.0",
-        "version_normalized": "5.2.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/guzzle/guzzle.git",
-            "reference": "475b29ccd411f2fa8a408e64576418728c032cfa"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/guzzle/guzzle/zipball/475b29ccd411f2fa8a408e64576418728c032cfa",
-            "reference": "475b29ccd411f2fa8a408e64576418728c032cfa",
-            "shasum": ""
-        },
-        "require": {
-            "guzzlehttp/ringphp": "~1.0",
-            "php": ">=5.4.0"
-        },
-        "require-dev": {
-            "ext-curl": "*",
-            "phpunit/phpunit": "~4.0",
-            "psr/log": "~1.0"
-        },
-        "time": "2015-01-28 01:03:29",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "5.0-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "GuzzleHttp\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Michael Dowling",
-                "email": "mtdowling@gmail.com",
-                "homepage": "https://github.com/mtdowling"
-            }
-        ],
-        "description": "Guzzle is a PHP HTTP client library and framework for building RESTful web service clients",
-        "homepage": "http://guzzlephp.org/",
-        "keywords": [
-            "client",
-            "curl",
-            "framework",
-            "http",
-            "http client",
-            "rest",
-            "web service"
-        ]
-    },
-    {
-        "name": "guzzlehttp/ringphp",
-        "version": "1.0.7",
-        "version_normalized": "1.0.7.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/guzzle/RingPHP.git",
-            "reference": "52d868f13570a9a56e5fce6614e0ec75d0f13ac2"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/guzzle/RingPHP/zipball/52d868f13570a9a56e5fce6614e0ec75d0f13ac2",
-            "reference": "52d868f13570a9a56e5fce6614e0ec75d0f13ac2",
-            "shasum": ""
-        },
-        "require": {
-            "guzzlehttp/streams": "~3.0",
-            "php": ">=5.4.0",
-            "react/promise": "~2.0"
-        },
-        "require-dev": {
-            "ext-curl": "*",
-            "phpunit/phpunit": "~4.0"
-        },
-        "suggest": {
-            "ext-curl": "Guzzle will use specific adapters if cURL is present"
-        },
-        "time": "2015-03-30 01:43:20",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.0-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "GuzzleHttp\\Ring\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Michael Dowling",
-                "email": "mtdowling@gmail.com",
-                "homepage": "https://github.com/mtdowling"
-            }
-        ],
-        "description": "Provides a simple API and specification that abstracts away the details of HTTP into a single PHP function."
-    },
     {
         "name": "zendframework/zend-stdlib",
         "version": "2.4.0",
@@ -2427,18 +1955,233 @@
         "homepage": "http://vfs.bovigo.org/"
     },
     {
-        "name": "symfony/class-loader",
-        "version": "v2.7.0",
-        "version_normalized": "2.7.0.0",
+        "name": "doctrine/lexer",
+        "version": "v1.0.1",
+        "version_normalized": "1.0.1.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/symfony/ClassLoader.git",
-            "reference": "fa19598cb708b92d983b34aae313f57c217f9386"
+            "url": "https://github.com/doctrine/lexer.git",
+            "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/ClassLoader/zipball/fa19598cb708b92d983b34aae313f57c217f9386",
-            "reference": "fa19598cb708b92d983b34aae313f57c217f9386",
+            "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c",
+            "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.2"
+        },
+        "time": "2014-09-09 13:34:57",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.0.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-0": {
+                "Doctrine\\Common\\Lexer\\": "lib/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Roman Borschel",
+                "email": "roman@code-factory.org"
+            },
+            {
+                "name": "Guilherme Blanco",
+                "email": "guilhermeblanco@gmail.com"
+            },
+            {
+                "name": "Johannes Schmitt",
+                "email": "schmittjoh@gmail.com"
+            }
+        ],
+        "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.",
+        "homepage": "http://www.doctrine-project.org",
+        "keywords": [
+            "lexer",
+            "parser"
+        ]
+    },
+    {
+        "name": "psr/http-message",
+        "version": "1.0",
+        "version_normalized": "1.0.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/php-fig/http-message.git",
+            "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/php-fig/http-message/zipball/85d63699f0dbedb190bbd4b0d2b9dc707ea4c298",
+            "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.0"
+        },
+        "time": "2015-05-04 20:22:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.0.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Psr\\Http\\Message\\": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "PHP-FIG",
+                "homepage": "http://www.php-fig.org/"
+            }
+        ],
+        "description": "Common interface for HTTP messages",
+        "keywords": [
+            "http",
+            "http-message",
+            "psr",
+            "psr-7",
+            "request",
+            "response"
+        ]
+    },
+    {
+        "name": "symfony/psr-http-message-bridge",
+        "version": "v0.2",
+        "version_normalized": "0.2.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/psr-http-message-bridge.git",
+            "reference": "dc7e308e1dc2898a46776e2221a643cb08315453"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/dc7e308e1dc2898a46776e2221a643cb08315453",
+            "reference": "dc7e308e1dc2898a46776e2221a643cb08315453",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.3",
+            "psr/http-message": "~1.0",
+            "symfony/http-foundation": "~2.3|~3.0"
+        },
+        "require-dev": {
+            "symfony/phpunit-bridge": "~2.7|~3.0"
+        },
+        "suggest": {
+            "zendframework/zend-diactoros": "To use the Zend Diactoros factory"
+        },
+        "time": "2015-05-29 17:57:12",
+        "type": "symfony-bridge",
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Symfony\\Bridge\\PsrHttpMessage\\": ""
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Symfony Community",
+                "homepage": "http://symfony.com/contributors"
+            },
+            {
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
+            }
+        ],
+        "description": "PSR HTTP message bridge",
+        "homepage": "http://symfony.com",
+        "keywords": [
+            "http",
+            "http-message",
+            "psr-7"
+        ]
+    },
+    {
+        "name": "zendframework/zend-diactoros",
+        "version": "1.1.0",
+        "version_normalized": "1.1.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/zendframework/zend-diactoros.git",
+            "reference": "df65f70fc36f24d51a90ad706a09cd9b74fc4dd8"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/df65f70fc36f24d51a90ad706a09cd9b74fc4dd8",
+            "reference": "df65f70fc36f24d51a90ad706a09cd9b74fc4dd8",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.4",
+            "psr/http-message": "~1.0"
+        },
+        "provide": {
+            "psr/http-message-implementation": "~1.0.0"
+        },
+        "require-dev": {
+            "phpunit/phpunit": "~4.6",
+            "squizlabs/php_codesniffer": "^2.3.1"
+        },
+        "time": "2015-06-24 20:42:54",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.0-dev",
+                "dev-develop": "1.1-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Zend\\Diactoros\\": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "BSD-2-Clause"
+        ],
+        "description": "PSR HTTP Message implementations",
+        "homepage": "https://github.com/zendframework/zend-diactoros",
+        "keywords": [
+            "http",
+            "psr",
+            "psr-7"
+        ]
+    },
+    {
+        "name": "symfony/class-loader",
+        "version": "v2.7.2",
+        "version_normalized": "2.7.2.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/ClassLoader.git",
+            "reference": "2fccbc544997340808801a7410cdcb96dd12edc4"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/ClassLoader/zipball/2fccbc544997340808801a7410cdcb96dd12edc4",
+            "reference": "2fccbc544997340808801a7410cdcb96dd12edc4",
             "shasum": ""
         },
         "require": {
@@ -2448,7 +2191,7 @@
             "symfony/finder": "~2.0,>=2.0.5",
             "symfony/phpunit-bridge": "~2.7"
         },
-        "time": "2015-05-15 13:33:16",
+        "time": "2015-06-25 12:52:11",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -2478,10 +2221,69 @@
         "description": "Symfony ClassLoader Component",
         "homepage": "https://symfony.com"
     },
+    {
+        "name": "symfony/console",
+        "version": "v2.7.2",
+        "version_normalized": "2.7.2.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/Console.git",
+            "reference": "8cf484449130cabfd98dcb4694ca9945802a21ed"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/Console/zipball/8cf484449130cabfd98dcb4694ca9945802a21ed",
+            "reference": "8cf484449130cabfd98dcb4694ca9945802a21ed",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.9"
+        },
+        "require-dev": {
+            "psr/log": "~1.0",
+            "symfony/event-dispatcher": "~2.1",
+            "symfony/phpunit-bridge": "~2.7",
+            "symfony/process": "~2.1"
+        },
+        "suggest": {
+            "psr/log": "For using the console logger",
+            "symfony/event-dispatcher": "",
+            "symfony/process": ""
+        },
+        "time": "2015-07-09 16:07:40",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.7-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Symfony\\Component\\Console\\": ""
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "https://symfony.com/contributors"
+            }
+        ],
+        "description": "Symfony Console Component",
+        "homepage": "https://symfony.com"
+    },
     {
         "name": "symfony/css-selector",
-        "version": "v2.7.0",
-        "version_normalized": "2.7.0.0",
+        "version": "v2.7.2",
+        "version_normalized": "2.7.2.0",
         "source": {
             "type": "git",
             "url": "https://github.com/symfony/CssSelector.git",
@@ -2535,17 +2337,17 @@
     },
     {
         "name": "symfony/dependency-injection",
-        "version": "v2.7.0",
-        "version_normalized": "2.7.0.0",
+        "version": "v2.7.2",
+        "version_normalized": "2.7.2.0",
         "source": {
             "type": "git",
             "url": "https://github.com/symfony/DependencyInjection.git",
-            "reference": "137bf489c5151c7eb1e4b7dd34a123f9a74b966d"
+            "reference": "d56b1b89a0c8b34a6eca6211ec76c43256ec4030"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/137bf489c5151c7eb1e4b7dd34a123f9a74b966d",
-            "reference": "137bf489c5151c7eb1e4b7dd34a123f9a74b966d",
+            "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/d56b1b89a0c8b34a6eca6211ec76c43256ec4030",
+            "reference": "d56b1b89a0c8b34a6eca6211ec76c43256ec4030",
             "shasum": ""
         },
         "require": {
@@ -2565,7 +2367,7 @@
             "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them",
             "symfony/yaml": ""
         },
-        "time": "2015-05-29 14:44:44",
+        "time": "2015-07-09 16:07:40",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -2596,18 +2398,80 @@
         "homepage": "https://symfony.com"
     },
     {
-        "name": "symfony/http-foundation",
-        "version": "v2.7.0",
-        "version_normalized": "2.7.0.0",
+        "name": "symfony/debug",
+        "version": "v2.7.2",
+        "version_normalized": "2.7.2.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/symfony/HttpFoundation.git",
-            "reference": "729de183da037c125c5f6366bd4f0631ba1a1abb"
+            "url": "https://github.com/symfony/Debug.git",
+            "reference": "9daa1bf9f7e615fa2fba30357e479a90141222e3"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/729de183da037c125c5f6366bd4f0631ba1a1abb",
-            "reference": "729de183da037c125c5f6366bd4f0631ba1a1abb",
+            "url": "https://api.github.com/repos/symfony/Debug/zipball/9daa1bf9f7e615fa2fba30357e479a90141222e3",
+            "reference": "9daa1bf9f7e615fa2fba30357e479a90141222e3",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.9",
+            "psr/log": "~1.0"
+        },
+        "conflict": {
+            "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
+        },
+        "require-dev": {
+            "symfony/class-loader": "~2.2",
+            "symfony/http-foundation": "~2.1",
+            "symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2",
+            "symfony/phpunit-bridge": "~2.7"
+        },
+        "suggest": {
+            "symfony/http-foundation": "",
+            "symfony/http-kernel": ""
+        },
+        "time": "2015-07-09 16:07:40",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.7-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Symfony\\Component\\Debug\\": ""
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "https://symfony.com/contributors"
+            }
+        ],
+        "description": "Symfony Debug Component",
+        "homepage": "https://symfony.com"
+    },
+    {
+        "name": "symfony/http-foundation",
+        "version": "v2.7.2",
+        "version_normalized": "2.7.2.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/HttpFoundation.git",
+            "reference": "88903c0531b90d4ecd90282b18f08c0c77bde0b2"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/88903c0531b90d4ecd90282b18f08c0c77bde0b2",
+            "reference": "88903c0531b90d4ecd90282b18f08c0c77bde0b2",
             "shasum": ""
         },
         "require": {
@@ -2617,7 +2481,7 @@
             "symfony/expression-language": "~2.4",
             "symfony/phpunit-bridge": "~2.7"
         },
-        "time": "2015-05-22 14:54:25",
+        "time": "2015-07-09 16:07:40",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -2652,17 +2516,17 @@
     },
     {
         "name": "symfony/event-dispatcher",
-        "version": "v2.7.0",
-        "version_normalized": "2.7.0.0",
+        "version": "v2.7.2",
+        "version_normalized": "2.7.2.0",
         "source": {
             "type": "git",
             "url": "https://github.com/symfony/EventDispatcher.git",
-            "reference": "687039686d0e923429ba6e958d0baa920cd5d458"
+            "reference": "9310b5f9a87ec2ea75d20fec0b0017c77c66dac3"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/687039686d0e923429ba6e958d0baa920cd5d458",
-            "reference": "687039686d0e923429ba6e958d0baa920cd5d458",
+            "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/9310b5f9a87ec2ea75d20fec0b0017c77c66dac3",
+            "reference": "9310b5f9a87ec2ea75d20fec0b0017c77c66dac3",
             "shasum": ""
         },
         "require": {
@@ -2680,7 +2544,7 @@
             "symfony/dependency-injection": "",
             "symfony/http-kernel": ""
         },
-        "time": "2015-05-02 15:21:08",
+        "time": "2015-06-18 19:21:56",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -2712,17 +2576,17 @@
     },
     {
         "name": "symfony/http-kernel",
-        "version": "v2.7.0",
-        "version_normalized": "2.7.0.0",
+        "version": "v2.7.2",
+        "version_normalized": "2.7.2.0",
         "source": {
             "type": "git",
             "url": "https://github.com/symfony/HttpKernel.git",
-            "reference": "74acbb7ef9c4aae0620d3250b9b990d2fff28d16"
+            "reference": "4a8a6f2a847475b3a38da50363a07f69b5cbf37e"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/74acbb7ef9c4aae0620d3250b9b990d2fff28d16",
-            "reference": "74acbb7ef9c4aae0620d3250b9b990d2fff28d16",
+            "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/4a8a6f2a847475b3a38da50363a07f69b5cbf37e",
+            "reference": "4a8a6f2a847475b3a38da50363a07f69b5cbf37e",
             "shasum": ""
         },
         "require": {
@@ -2762,7 +2626,7 @@
             "symfony/finder": "",
             "symfony/var-dumper": ""
         },
-        "time": "2015-05-30 16:52:28",
+        "time": "2015-07-13 19:27:49",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -2794,17 +2658,17 @@
     },
     {
         "name": "symfony/routing",
-        "version": "v2.7.0",
-        "version_normalized": "2.7.0.0",
+        "version": "v2.7.2",
+        "version_normalized": "2.7.2.0",
         "source": {
             "type": "git",
             "url": "https://github.com/symfony/Routing.git",
-            "reference": "6f0333fb8b89cf6f8fd9d6740c5e83b73d9c95b9"
+            "reference": "ea9134f277162b02e5f80ac058b75a77637b0d26"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/Routing/zipball/6f0333fb8b89cf6f8fd9d6740c5e83b73d9c95b9",
-            "reference": "6f0333fb8b89cf6f8fd9d6740c5e83b73d9c95b9",
+            "url": "https://api.github.com/repos/symfony/Routing/zipball/ea9134f277162b02e5f80ac058b75a77637b0d26",
+            "reference": "ea9134f277162b02e5f80ac058b75a77637b0d26",
             "shasum": ""
         },
         "require": {
@@ -2829,7 +2693,7 @@
             "symfony/expression-language": "For using expression matching",
             "symfony/yaml": "For using the YAML loader"
         },
-        "time": "2015-05-19 06:58:17",
+        "time": "2015-07-09 16:07:40",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -2867,17 +2731,17 @@
     },
     {
         "name": "symfony/serializer",
-        "version": "v2.7.0",
-        "version_normalized": "2.7.0.0",
+        "version": "v2.7.2",
+        "version_normalized": "2.7.2.0",
         "source": {
             "type": "git",
             "url": "https://github.com/symfony/Serializer.git",
-            "reference": "634d3adf119396320fba4c14caa01390700e7f3b"
+            "reference": "4ce2211d3a5d3a3605de7cc040af2808882f3c95"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/Serializer/zipball/634d3adf119396320fba4c14caa01390700e7f3b",
-            "reference": "634d3adf119396320fba4c14caa01390700e7f3b",
+            "url": "https://api.github.com/repos/symfony/Serializer/zipball/4ce2211d3a5d3a3605de7cc040af2808882f3c95",
+            "reference": "4ce2211d3a5d3a3605de7cc040af2808882f3c95",
             "shasum": ""
         },
         "require": {
@@ -2898,7 +2762,7 @@
             "symfony/property-access": "For using the ObjectNormalizer.",
             "symfony/yaml": "For using the default YAML mapping loader."
         },
-        "time": "2015-05-29 14:44:44",
+        "time": "2015-07-08 06:12:51",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -2930,17 +2794,17 @@
     },
     {
         "name": "symfony/translation",
-        "version": "v2.7.0-BETA2",
-        "version_normalized": "2.7.0.0-beta2",
+        "version": "v2.7.2",
+        "version_normalized": "2.7.2.0",
         "source": {
             "type": "git",
             "url": "https://github.com/symfony/Translation.git",
-            "reference": "1be5bbed3938247acd7c5f4e4f29dd32db636b1f"
+            "reference": "c8dc34cc936152c609cdd722af317e4239d10dd6"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/Translation/zipball/1be5bbed3938247acd7c5f4e4f29dd32db636b1f",
-            "reference": "1be5bbed3938247acd7c5f4e4f29dd32db636b1f",
+            "url": "https://api.github.com/repos/symfony/Translation/zipball/c8dc34cc936152c609cdd722af317e4239d10dd6",
+            "reference": "c8dc34cc936152c609cdd722af317e4239d10dd6",
             "shasum": ""
         },
         "require": {
@@ -2961,7 +2825,7 @@
             "symfony/config": "",
             "symfony/yaml": ""
         },
-        "time": "2015-05-11 02:35:29",
+        "time": "2015-07-09 16:07:40",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -2993,17 +2857,17 @@
     },
     {
         "name": "symfony/validator",
-        "version": "v2.7.0",
-        "version_normalized": "2.7.0.0",
+        "version": "v2.7.2",
+        "version_normalized": "2.7.2.0",
         "source": {
             "type": "git",
             "url": "https://github.com/symfony/Validator.git",
-            "reference": "3a5461a388ff8962790fd5a39e6e2da84ba1e824"
+            "reference": "26a190dbdf7a19fc2251c2d59547a717918b6c77"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/Validator/zipball/3a5461a388ff8962790fd5a39e6e2da84ba1e824",
-            "reference": "3a5461a388ff8962790fd5a39e6e2da84ba1e824",
+            "url": "https://api.github.com/repos/symfony/Validator/zipball/26a190dbdf7a19fc2251c2d59547a717918b6c77",
+            "reference": "26a190dbdf7a19fc2251c2d59547a717918b6c77",
             "shasum": ""
         },
         "require": {
@@ -3033,7 +2897,7 @@
             "symfony/property-access": "For using the 2.4 Validator API",
             "symfony/yaml": ""
         },
-        "time": "2015-05-29 14:44:44",
+        "time": "2015-07-02 06:17:05",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -3065,17 +2929,17 @@
     },
     {
         "name": "symfony/process",
-        "version": "v2.7.0",
-        "version_normalized": "2.7.0.0",
+        "version": "v2.7.2",
+        "version_normalized": "2.7.2.0",
         "source": {
             "type": "git",
             "url": "https://github.com/symfony/Process.git",
-            "reference": "e0a82b58e36afc60f8e79b8bc85a22bb064077c1"
+            "reference": "48aeb0e48600321c272955132d7606ab0a49adb3"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/Process/zipball/e0a82b58e36afc60f8e79b8bc85a22bb064077c1",
-            "reference": "e0a82b58e36afc60f8e79b8bc85a22bb064077c1",
+            "url": "https://api.github.com/repos/symfony/Process/zipball/48aeb0e48600321c272955132d7606ab0a49adb3",
+            "reference": "48aeb0e48600321c272955132d7606ab0a49adb3",
             "shasum": ""
         },
         "require": {
@@ -3084,7 +2948,7 @@
         "require-dev": {
             "symfony/phpunit-bridge": "~2.7"
         },
-        "time": "2015-05-15 13:33:16",
+        "time": "2015-07-01 11:25:50",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -3116,17 +2980,17 @@
     },
     {
         "name": "symfony/yaml",
-        "version": "v2.7.0",
-        "version_normalized": "2.7.0.0",
+        "version": "v2.7.2",
+        "version_normalized": "2.7.2.0",
         "source": {
             "type": "git",
             "url": "https://github.com/symfony/Yaml.git",
-            "reference": "4a29a5248aed4fb45f626a7bbbd330291492f5c3"
+            "reference": "4bfbe0ed3909bfddd75b70c094391ec1f142f860"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/Yaml/zipball/4a29a5248aed4fb45f626a7bbbd330291492f5c3",
-            "reference": "4a29a5248aed4fb45f626a7bbbd330291492f5c3",
+            "url": "https://api.github.com/repos/symfony/Yaml/zipball/4bfbe0ed3909bfddd75b70c094391ec1f142f860",
+            "reference": "4bfbe0ed3909bfddd75b70c094391ec1f142f860",
             "shasum": ""
         },
         "require": {
@@ -3135,7 +2999,7 @@
         "require-dev": {
             "symfony/phpunit-bridge": "~2.7"
         },
-        "time": "2015-05-02 15:21:08",
+        "time": "2015-07-01 11:25:50",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -3165,140 +3029,19 @@
         "description": "Symfony Yaml Component",
         "homepage": "https://symfony.com"
     },
-    {
-        "name": "symfony/console",
-        "version": "v2.7.0",
-        "version_normalized": "2.7.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/Console.git",
-            "reference": "7f0bec04961c61c961df0cb8c2ae88dbfd83f399"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/Console/zipball/7f0bec04961c61c961df0cb8c2ae88dbfd83f399",
-            "reference": "7f0bec04961c61c961df0cb8c2ae88dbfd83f399",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.9"
-        },
-        "require-dev": {
-            "psr/log": "~1.0",
-            "symfony/event-dispatcher": "~2.1",
-            "symfony/phpunit-bridge": "~2.7",
-            "symfony/process": "~2.1"
-        },
-        "suggest": {
-            "psr/log": "For using the console logger",
-            "symfony/event-dispatcher": "",
-            "symfony/process": ""
-        },
-        "time": "2015-05-29 16:22:24",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.7-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Component\\Console\\": ""
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Symfony Console Component",
-        "homepage": "https://symfony.com"
-    },
-    {
-        "name": "symfony/debug",
-        "version": "v2.7.0",
-        "version_normalized": "2.7.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/Debug.git",
-            "reference": "1df2971b27a6ff73dae4ea622f42802000ec332d"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/Debug/zipball/1df2971b27a6ff73dae4ea622f42802000ec332d",
-            "reference": "1df2971b27a6ff73dae4ea622f42802000ec332d",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.9",
-            "psr/log": "~1.0"
-        },
-        "conflict": {
-            "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
-        },
-        "require-dev": {
-            "symfony/class-loader": "~2.2",
-            "symfony/http-foundation": "~2.1",
-            "symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2",
-            "symfony/phpunit-bridge": "~2.7"
-        },
-        "suggest": {
-            "symfony/http-foundation": "",
-            "symfony/http-kernel": ""
-        },
-        "time": "2015-05-22 14:54:25",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.7-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Component\\Debug\\": ""
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Symfony Debug Component",
-        "homepage": "https://symfony.com"
-    },
     {
         "name": "symfony/dom-crawler",
-        "version": "v2.7.0",
-        "version_normalized": "2.7.0.0",
+        "version": "v2.7.2",
+        "version_normalized": "2.7.2.0",
         "source": {
             "type": "git",
             "url": "https://github.com/symfony/DomCrawler.git",
-            "reference": "11d8eb8ccc1533f4c2d89a025f674894fda520b3"
+            "reference": "9dabece63182e95c42b06967a0d929a5df78bc35"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/11d8eb8ccc1533f4c2d89a025f674894fda520b3",
-            "reference": "11d8eb8ccc1533f4c2d89a025f674894fda520b3",
+            "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/9dabece63182e95c42b06967a0d929a5df78bc35",
+            "reference": "9dabece63182e95c42b06967a0d929a5df78bc35",
             "shasum": ""
         },
         "require": {
@@ -3311,7 +3054,7 @@
         "suggest": {
             "symfony/css-selector": ""
         },
-        "time": "2015-05-22 14:54:25",
+        "time": "2015-07-09 16:07:40",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -3343,17 +3086,17 @@
     },
     {
         "name": "symfony/browser-kit",
-        "version": "v2.7.0",
-        "version_normalized": "2.7.0.0",
+        "version": "v2.7.2",
+        "version_normalized": "2.7.2.0",
         "source": {
             "type": "git",
             "url": "https://github.com/symfony/BrowserKit.git",
-            "reference": "70cdc18dd601a486a8cc69ee26367cbaedd60400"
+            "reference": "176905d3d74c2f99e6ab70f4f5a89460532495ae"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/70cdc18dd601a486a8cc69ee26367cbaedd60400",
-            "reference": "70cdc18dd601a486a8cc69ee26367cbaedd60400",
+            "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/176905d3d74c2f99e6ab70f4f5a89460532495ae",
+            "reference": "176905d3d74c2f99e6ab70f4f5a89460532495ae",
             "shasum": ""
         },
         "require": {
@@ -3368,7 +3111,7 @@
         "suggest": {
             "symfony/process": ""
         },
-        "time": "2015-05-02 15:21:08",
+        "time": "2015-07-09 16:07:40",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -3397,5 +3140,342 @@
         ],
         "description": "Symfony BrowserKit Component",
         "homepage": "https://symfony.com"
+    },
+    {
+        "name": "guzzlehttp/psr7",
+        "version": "1.1.0",
+        "version_normalized": "1.1.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/guzzle/psr7.git",
+            "reference": "af0e1758de355eb113917ad79c3c0e3604bce4bd"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/guzzle/psr7/zipball/af0e1758de355eb113917ad79c3c0e3604bce4bd",
+            "reference": "af0e1758de355eb113917ad79c3c0e3604bce4bd",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.4.0",
+            "psr/http-message": "~1.0"
+        },
+        "provide": {
+            "psr/http-message-implementation": "1.0"
+        },
+        "require-dev": {
+            "phpunit/phpunit": "~4.0"
+        },
+        "time": "2015-06-24 19:55:15",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.0-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "GuzzleHttp\\Psr7\\": "src/"
+            },
+            "files": [
+                "src/functions.php"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Michael Dowling",
+                "email": "mtdowling@gmail.com",
+                "homepage": "https://github.com/mtdowling"
+            }
+        ],
+        "description": "PSR-7 message implementation",
+        "keywords": [
+            "http",
+            "message",
+            "stream",
+            "uri"
+        ]
+    },
+    {
+        "name": "guzzlehttp/promises",
+        "version": "1.0.1",
+        "version_normalized": "1.0.1.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/guzzle/promises.git",
+            "reference": "2ee5bc7f1a92efecc90da7f6711a53a7be26b5b7"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/guzzle/promises/zipball/2ee5bc7f1a92efecc90da7f6711a53a7be26b5b7",
+            "reference": "2ee5bc7f1a92efecc90da7f6711a53a7be26b5b7",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.5.0"
+        },
+        "require-dev": {
+            "phpunit/phpunit": "~4.0"
+        },
+        "time": "2015-06-24 16:16:25",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.0-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "GuzzleHttp\\Promise\\": "src/"
+            },
+            "files": [
+                "src/functions.php"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Michael Dowling",
+                "email": "mtdowling@gmail.com",
+                "homepage": "https://github.com/mtdowling"
+            }
+        ],
+        "description": "Guzzle promises library",
+        "keywords": [
+            "promise"
+        ]
+    },
+    {
+        "name": "guzzlehttp/guzzle",
+        "version": "dev-master",
+        "version_normalized": "9999999-dev",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/guzzle/guzzle.git",
+            "reference": "1879fbe853b0c64d109e369c7aeff09849e62d1e"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/guzzle/guzzle/zipball/1879fbe853b0c64d109e369c7aeff09849e62d1e",
+            "reference": "1879fbe853b0c64d109e369c7aeff09849e62d1e",
+            "shasum": ""
+        },
+        "require": {
+            "guzzlehttp/promises": "~1.0",
+            "guzzlehttp/psr7": "~1.1",
+            "php": ">=5.5.0"
+        },
+        "require-dev": {
+            "ext-curl": "*",
+            "phpunit/phpunit": "~4.0",
+            "psr/log": "~1.0"
+        },
+        "time": "2015-07-10 20:04:21",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "6.0-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "files": [
+                "src/functions_include.php"
+            ],
+            "psr-4": {
+                "GuzzleHttp\\": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Michael Dowling",
+                "email": "mtdowling@gmail.com",
+                "homepage": "https://github.com/mtdowling"
+            }
+        ],
+        "description": "Guzzle is a PHP HTTP client library",
+        "homepage": "http://guzzlephp.org/",
+        "keywords": [
+            "client",
+            "curl",
+            "framework",
+            "http",
+            "http client",
+            "rest",
+            "web service"
+        ]
+    },
+    {
+        "name": "fabpot/goutte",
+        "version": "v3.1.0",
+        "version_normalized": "3.1.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/FriendsOfPHP/Goutte.git",
+            "reference": "d9a5a28782d30e9f4e20176caea58a1d459f2c71"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/FriendsOfPHP/Goutte/zipball/d9a5a28782d30e9f4e20176caea58a1d459f2c71",
+            "reference": "d9a5a28782d30e9f4e20176caea58a1d459f2c71",
+            "shasum": ""
+        },
+        "require": {
+            "guzzlehttp/guzzle": "^6.0",
+            "php": ">=5.5.0",
+            "symfony/browser-kit": "~2.1",
+            "symfony/css-selector": "~2.1",
+            "symfony/dom-crawler": "~2.1"
+        },
+        "time": "2015-06-24 16:11:31",
+        "type": "application",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "3.1-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Goutte\\": "Goutte"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
+            }
+        ],
+        "description": "A simple PHP Web Scraper",
+        "homepage": "https://github.com/FriendsOfPHP/Goutte",
+        "keywords": [
+            "scraper"
+        ]
+    },
+    {
+        "name": "behat/mink-goutte-driver",
+        "version": "dev-master",
+        "version_normalized": "9999999-dev",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/minkphp/MinkGoutteDriver.git",
+            "reference": "cc5ce119b5a8e06662f634b35967aff0b0c7dfdd"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/minkphp/MinkGoutteDriver/zipball/cc5ce119b5a8e06662f634b35967aff0b0c7dfdd",
+            "reference": "cc5ce119b5a8e06662f634b35967aff0b0c7dfdd",
+            "shasum": ""
+        },
+        "require": {
+            "behat/mink": "~1.6@dev",
+            "behat/mink-browserkit-driver": "~1.2@dev",
+            "fabpot/goutte": "~1.0.4|~2.0|~3.1",
+            "php": ">=5.3.1"
+        },
+        "time": "2015-06-27 00:15:11",
+        "type": "mink-driver",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.1.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Behat\\Mink\\Driver\\": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Konstantin Kudryashov",
+                "email": "ever.zet@gmail.com",
+                "homepage": "http://everzet.com"
+            }
+        ],
+        "description": "Goutte driver for Mink framework",
+        "homepage": "http://mink.behat.org/",
+        "keywords": [
+            "browser",
+            "goutte",
+            "headless",
+            "testing"
+        ]
+    },
+    {
+        "name": "egulias/email-validator",
+        "version": "1.2.9",
+        "version_normalized": "1.2.9.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/egulias/EmailValidator.git",
+            "reference": "af864423f50ea59f96c87bb1eae147a70bcf67a1"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/af864423f50ea59f96c87bb1eae147a70bcf67a1",
+            "reference": "af864423f50ea59f96c87bb1eae147a70bcf67a1",
+            "shasum": ""
+        },
+        "require": {
+            "doctrine/lexer": "~1.0,>=1.0.1",
+            "php": ">= 5.3.3"
+        },
+        "require-dev": {
+            "phpunit/phpunit": "~4.4",
+            "satooshi/php-coveralls": "dev-master"
+        },
+        "time": "2015-06-22 21:07:51",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.0.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-0": {
+                "Egulias\\": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Eduardo Gulias Davis"
+            }
+        ],
+        "description": "A library for validating emails",
+        "homepage": "https://github.com/egulias/EmailValidator",
+        "keywords": [
+            "email",
+            "emailvalidation",
+            "emailvalidator",
+            "validation",
+            "validator"
+        ]
     }
 ]
diff --git a/core/vendor/doctrine/lexer/LICENSE b/core/vendor/doctrine/lexer/LICENSE
new file mode 100644
index 000000000..5e781fce4
--- /dev/null
+++ b/core/vendor/doctrine/lexer/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2006-2013 Doctrine Project
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/core/vendor/doctrine/lexer/composer.json b/core/vendor/doctrine/lexer/composer.json
index 5e6e83a1a..8cd694c65 100644
--- a/core/vendor/doctrine/lexer/composer.json
+++ b/core/vendor/doctrine/lexer/composer.json
@@ -15,5 +15,10 @@
     },
     "autoload": {
         "psr-0": { "Doctrine\\Common\\Lexer\\": "lib/" }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.0.x-dev"
+        }
     }
 }
diff --git a/core/vendor/doctrine/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php b/core/vendor/doctrine/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php
index eb6cf7c02..399a55230 100644
--- a/core/vendor/doctrine/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php
+++ b/core/vendor/doctrine/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php
@@ -22,35 +22,58 @@ namespace Doctrine\Common\Lexer;
 /**
  * Base class for writing simple lexers, i.e. for creating small DSLs.
  *
- * @since   2.0
- * @author  Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author  Jonathan Wage <jonwage@gmail.com>
- * @author  Roman Borschel <roman@code-factory.org>
+ * @since  2.0
+ * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
+ * @author Jonathan Wage <jonwage@gmail.com>
+ * @author Roman Borschel <roman@code-factory.org>
  */
 abstract class AbstractLexer
 {
     /**
-     * @var array Array of scanned tokens
+     * Lexer original input string.
+     *
+     * @var string
+     */
+    private $input;
+
+    /**
+     * Array of scanned tokens.
+     *
+     * Each token is an associative array containing three items:
+     *  - 'value'    : the string value of the token in the input string
+     *  - 'type'     : the type of the token (identifier, numeric, string, input
+     *                 parameter, none)
+     *  - 'position' : the position of the token in the input string
+     *
+     * @var array
      */
     private $tokens = array();
 
     /**
-     * @var integer Current lexer position in input string
+     * Current lexer position in input string.
+     *
+     * @var integer
      */
     private $position = 0;
 
     /**
-     * @var integer Current peek of current lexer position
+     * Current peek of current lexer position.
+     *
+     * @var integer
      */
     private $peek = 0;
 
     /**
-     * @var array The next token in the input.
+     * The next token in the input.
+     *
+     * @var array
      */
     public $lookahead;
 
     /**
-     * @var array The last matched/seen token.
+     * The last matched/seen token.
+     *
+     * @var array
      */
     public $token;
 
@@ -61,16 +84,22 @@ abstract class AbstractLexer
      * Any unprocessed tokens from any previous input are lost.
      *
      * @param string $input The input to be tokenized.
+     *
+     * @return void
      */
     public function setInput($input)
     {
+        $this->input  = $input;
         $this->tokens = array();
+
         $this->reset();
         $this->scan($input);
     }
 
     /**
      * Resets the lexer.
+     *
+     * @return void
      */
     public function reset()
     {
@@ -82,6 +111,8 @@ abstract class AbstractLexer
 
     /**
      * Resets the peek pointer to 0.
+     *
+     * @return void
      */
     public function resetPeek()
     {
@@ -91,17 +122,32 @@ abstract class AbstractLexer
     /**
      * Resets the lexer position on the input to the given position.
      *
-     * @param integer $position Position to place the lexical scanner
+     * @param integer $position Position to place the lexical scanner.
+     *
+     * @return void
      */
     public function resetPosition($position = 0)
     {
         $this->position = $position;
     }
 
+    /**
+     * Retrieve the original lexer's input until a given position. 
+     *
+     * @param integer $position
+     *
+     * @return string
+     */
+    public function getInputUntilPosition($position)
+    {
+        return substr($this->input, 0, $position);
+    }
+
     /**
      * Checks whether a given token matches the current lookahead.
      *
      * @param integer|string $token
+     *
      * @return boolean
      */
     public function isNextToken($token)
@@ -110,9 +156,10 @@ abstract class AbstractLexer
     }
 
     /**
-     * Checks whether any of the given tokens matches the current lookahead
+     * Checks whether any of the given tokens matches the current lookahead.
      *
      * @param array $tokens
+     *
      * @return boolean
      */
     public function isNextTokenAny(array $tokens)
@@ -123,13 +170,7 @@ abstract class AbstractLexer
     /**
      * Moves to the next token in the input string.
      *
-     * A token is an associative array containing three items:
-     *  - 'value'    : the string value of the token in the input string
-     *  - 'type'     : the type of the token (identifier, numeric, string, input
-     *                 parameter, none)
-     *  - 'position' : the position of the token in the input string
-     *
-     * @return array|null the next token; null if there is no more tokens left
+     * @return boolean
      */
     public function moveNext()
     {
@@ -145,6 +186,8 @@ abstract class AbstractLexer
      * Tells the lexer to skip input tokens until it sees a token with the given value.
      *
      * @param string $type The token type to skip until.
+     *
+     * @return void
      */
     public function skipUntil($type)
     {
@@ -154,10 +197,11 @@ abstract class AbstractLexer
     }
 
     /**
-     * Checks if given value is identical to the given token
+     * Checks if given value is identical to the given token.
      *
-     * @param mixed $value
+     * @param mixed   $value
      * @param integer $token
+     *
      * @return boolean
      */
     public function isA($value, $token)
@@ -168,7 +212,7 @@ abstract class AbstractLexer
     /**
      * Moves the lookahead token forward.
      *
-     * @return array | null The next token or NULL if there are no more tokens ahead.
+     * @return array|null The next token or NULL if there are no more tokens ahead.
      */
     public function peek()
     {
@@ -194,15 +238,21 @@ abstract class AbstractLexer
     /**
      * Scans the input string for tokens.
      *
-     * @param string $input a query string
+     * @param string $input A query string.
+     *
+     * @return void
      */
     protected function scan($input)
     {
         static $regex;
 
         if ( ! isset($regex)) {
-            $regex = '/(' . implode(')|(', $this->getCatchablePatterns()) . ')|'
-                   . implode('|', $this->getNonCatchablePatterns()) . '/i';
+            $regex = sprintf(
+                '/(%s)|%s/%s',
+                implode(')|(', $this->getCatchablePatterns()),
+                implode('|', $this->getNonCatchablePatterns()),
+                $this->getModifiers()
+            );
         }
 
         $flags = PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_OFFSET_CAPTURE;
@@ -224,6 +274,7 @@ abstract class AbstractLexer
      * Gets the literal for a given token.
      *
      * @param integer $token
+     *
      * @return string
      */
     public function getLiteral($token)
@@ -241,6 +292,16 @@ abstract class AbstractLexer
         return $token;
     }
 
+    /**
+     * Regex modifiers
+     *
+     * @return string
+     */
+    protected function getModifiers()
+    {
+        return 'i';
+    }
+
     /**
      * Lexical catchable patterns.
      *
@@ -259,6 +320,7 @@ abstract class AbstractLexer
      * Retrieve token type. Also processes the token value if necessary.
      *
      * @param string $value
+     *
      * @return integer
      */
     abstract protected function getType(&$value);
diff --git a/core/vendor/egulias/email-validator/.gitignore b/core/vendor/egulias/email-validator/.gitignore
new file mode 100644
index 000000000..16308144f
--- /dev/null
+++ b/core/vendor/egulias/email-validator/.gitignore
@@ -0,0 +1,2 @@
+report/
+vendor/
diff --git a/core/vendor/egulias/email-validator/.travis.yml b/core/vendor/egulias/email-validator/.travis.yml
index d3583de45..f25de0fb8 100644
--- a/core/vendor/egulias/email-validator/.travis.yml
+++ b/core/vendor/egulias/email-validator/.travis.yml
@@ -1,3 +1,5 @@
+sudo: false
+
 language: php
 
 php:
@@ -5,11 +7,25 @@ php:
   - 5.4
   - 5.5
   - 5.6
+  - 7.0
   - hhvm
 
-before_script:
- - wget http://getcomposer.org/composer.phar
- - php composer.phar install --dev --no-interaction
+env:
+  global:
+    - deps=no
+
+matrix:
+  fast_finish: true
+  include:
+    - php: 5.3
+      env: deps=low
+    - php: 5.6
+      env: deps=high
+
+install:
+  - if [ "$deps" = "no" ]; then composer install; fi
+  - if [ "$deps" = "low" ]; then composer update --prefer-lowest; fi
+  - if [ "$deps" = "high" ]; then composer update; fi
 
 script:
  - mkdir -p build/logs
diff --git a/core/vendor/egulias/email-validator/README.md b/core/vendor/egulias/email-validator/README.md
index 61ad6cb1e..262693bf7 100644
--- a/core/vendor/egulias/email-validator/README.md
+++ b/core/vendor/egulias/email-validator/README.md
@@ -1,6 +1,9 @@
-EmailValidator [![Build Status](https://travis-ci.org/egulias/EmailValidator.png?branch=master)](https://travis-ci.org/egulias/EmailValidator) [![Coverage Status](https://coveralls.io/repos/egulias/EmailValidator/badge.png?branch=master)](https://coveralls.io/r/egulias/EmailValidator?branch=master) [![SensioLabsInsight](https://insight.sensiolabs.com/projects/22ba6692-9c02-42e5-a65d-1c5696bfffc6/small.png)](https://insight.sensiolabs.com/projects/22ba6692-9c02-42e5-a65d-1c5696bfffc6)[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/egulias/EmailValidator/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/egulias/EmailValidator/?branch=master)
+#EmailValidator
+[![Build Status](https://travis-ci.org/egulias/EmailValidator.png?branch=master)](https://travis-ci.org/egulias/EmailValidator) [![Coverage Status](https://coveralls.io/repos/egulias/EmailValidator/badge.png?branch=master)](https://coveralls.io/r/egulias/EmailValidator?branch=master) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/egulias/EmailValidator/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/egulias/EmailValidator/?branch=master) [![SensioLabsInsight](https://insight.sensiolabs.com/projects/22ba6692-9c02-42e5-a65d-1c5696bfffc6/small.png)](https://insight.sensiolabs.com/projects/22ba6692-9c02-42e5-a65d-1c5696bfffc6)
 =============================
+With the help of
 
+![Powered by PhpStorm](https://www.jetbrains.com/phpstorm/documentation/docs/logo_phpstorm.png)
 ##Installation##
 
 Run the command below to install via Composer
diff --git a/core/vendor/egulias/email-validator/composer.json b/core/vendor/egulias/email-validator/composer.json
index c8fb886d4..1ccb77a14 100644
--- a/core/vendor/egulias/email-validator/composer.json
+++ b/core/vendor/egulias/email-validator/composer.json
@@ -3,22 +3,23 @@
   "description":  "A library for validating emails",
   "homepage":     "https://github.com/egulias/EmailValidator",
   "type":         "Library",
-  "keywords":     ["email", "validation", "validator"],
+  "keywords":     ["email", "validation", "validator", "emailvalidation", "emailvalidator"],
   "license":      "MIT",
   "authors": [
     {"name": "Eduardo Gulias Davis"}
   ],
   "extra": {
     "branch-alias": {
-      "dev-master": "1.3.x-dev"
+      "dev-master": "2.0.x-dev"
     }
   },
   "require":      {
     "php": ">= 5.3.3",
-    "doctrine/lexer": "~1.0"
+    "doctrine/lexer": "~1.0,>=1.0.1"
   },
   "require-dev" :   {
-    "satooshi/php-coveralls": "dev-master"
+    "satooshi/php-coveralls": "dev-master",
+    "phpunit/phpunit": "~4.4"
   },
   "autoload": {
     "psr-0": {
diff --git a/core/vendor/egulias/email-validator/composer.lock b/core/vendor/egulias/email-validator/composer.lock
index 3e5a48535..49f7df867 100644
--- a/core/vendor/egulias/email-validator/composer.lock
+++ b/core/vendor/egulias/email-validator/composer.lock
@@ -4,26 +4,31 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "9e9dff0cc08c7292600453e681201e13",
+    "hash": "9426f5a00cf0f71d83c287a7c0ff392b",
     "packages": [
         {
             "name": "doctrine/lexer",
-            "version": "v1.0",
+            "version": "v1.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/lexer.git",
-                "reference": "2f708a85bb3aab5d99dab8be435abd73e0b18acb"
+                "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/lexer/zipball/2f708a85bb3aab5d99dab8be435abd73e0b18acb",
-                "reference": "2f708a85bb3aab5d99dab8be435abd73e0b18acb",
+                "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c",
+                "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.2"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
             "autoload": {
                 "psr-0": {
                     "Doctrine\\Common\\Lexer\\": "lib/"
@@ -34,20 +39,17 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com",
-                    "homepage": "http://www.instaclick.com"
-                },
                 {
                     "name": "Roman Borschel",
                     "email": "roman@code-factory.org"
                 },
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
                 {
                     "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com",
-                    "homepage": "http://jmsyst.com",
-                    "role": "Developer of wrapped JMSSerializerBundle"
+                    "email": "schmittjoh@gmail.com"
                 }
             ],
             "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.",
@@ -56,22 +58,76 @@
                 "lexer",
                 "parser"
             ],
-            "time": "2013-01-12 18:59:04"
+            "time": "2014-09-09 13:34:57"
         }
     ],
     "packages-dev": [
         {
-            "name": "guzzle/guzzle",
-            "version": "v3.9.2",
+            "name": "doctrine/instantiator",
+            "version": "1.0.5",
             "source": {
                 "type": "git",
-                "url": "https://github.com/guzzle/guzzle3.git",
-                "reference": "54991459675c1a2924122afbb0e5609ade581155"
+                "url": "https://github.com/doctrine/instantiator.git",
+                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle3/zipball/54991459675c1a2924122afbb0e5609ade581155",
-                "reference": "54991459675c1a2924122afbb0e5609ade581155",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3,<8.0-DEV"
+            },
+            "require-dev": {
+                "athletic/athletic": "~0.1.8",
+                "ext-pdo": "*",
+                "ext-phar": "*",
+                "phpunit/phpunit": "~4.0",
+                "squizlabs/php_codesniffer": "~2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com",
+                    "homepage": "http://ocramius.github.com/"
+                }
+            ],
+            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
+            "homepage": "https://github.com/doctrine/instantiator",
+            "keywords": [
+                "constructor",
+                "instantiate"
+            ],
+            "time": "2015-06-14 21:17:01"
+        },
+        {
+            "name": "guzzle/guzzle",
+            "version": "v3.9.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/guzzle3.git",
+                "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/guzzle3/zipball/0645b70d953bc1c067bbc8d5bc53194706b628d9",
+                "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9",
                 "shasum": ""
             },
             "require": {
@@ -112,6 +168,9 @@
                 "zendframework/zend-cache": "2.*,<2.3",
                 "zendframework/zend-log": "2.*,<2.3"
             },
+            "suggest": {
+                "guzzlehttp/guzzle": "Guzzle 5 has moved to a new package name. The package you have installed, Guzzle 3, is deprecated."
+            },
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -139,7 +198,7 @@
                     "homepage": "https://github.com/guzzle/guzzle/contributors"
                 }
             ],
-            "description": "Guzzle is a PHP HTTP client library and framework for building RESTful web service clients",
+            "description": "PHP HTTP client. This library is deprecated in favor of https://packagist.org/packages/guzzlehttp/guzzle",
             "homepage": "http://guzzlephp.org/",
             "keywords": [
                 "client",
@@ -150,7 +209,483 @@
                 "rest",
                 "web service"
             ],
-            "time": "2014-08-11 04:32:36"
+            "time": "2015-03-18 18:23:50"
+        },
+        {
+            "name": "phpdocumentor/reflection-docblock",
+            "version": "2.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
+                "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d68dbdc53dc358a816f00b300704702b2eaff7b8",
+                "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0"
+            },
+            "suggest": {
+                "dflydev/markdown": "~1.0",
+                "erusev/parsedown": "~1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "phpDocumentor": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "mike.vanriel@naenius.com"
+                }
+            ],
+            "time": "2015-02-03 12:10:50"
+        },
+        {
+            "name": "phpspec/prophecy",
+            "version": "v1.4.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpspec/prophecy.git",
+                "reference": "3132b1f44c7bf2ec4c7eb2d3cb78fdeca760d373"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/3132b1f44c7bf2ec4c7eb2d3cb78fdeca760d373",
+                "reference": "3132b1f44c7bf2ec4c7eb2d3cb78fdeca760d373",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.2",
+                "phpdocumentor/reflection-docblock": "~2.0",
+                "sebastian/comparator": "~1.1"
+            },
+            "require-dev": {
+                "phpspec/phpspec": "~2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Prophecy\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                },
+                {
+                    "name": "Marcello Duarte",
+                    "email": "marcello.duarte@gmail.com"
+                }
+            ],
+            "description": "Highly opinionated mocking framework for PHP 5.3+",
+            "homepage": "https://github.com/phpspec/prophecy",
+            "keywords": [
+                "Double",
+                "Dummy",
+                "fake",
+                "mock",
+                "spy",
+                "stub"
+            ],
+            "time": "2015-04-27 22:15:08"
+        },
+        {
+            "name": "phpunit/php-code-coverage",
+            "version": "2.1.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+                "reference": "631e365cf26bb2c078683e8d9bcf8bc631ac4d44"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/631e365cf26bb2c078683e8d9bcf8bc631ac4d44",
+                "reference": "631e365cf26bb2c078683e8d9bcf8bc631ac4d44",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "phpunit/php-file-iterator": "~1.3",
+                "phpunit/php-text-template": "~1.2",
+                "phpunit/php-token-stream": "~1.3",
+                "sebastian/environment": "~1.0",
+                "sebastian/version": "~1.0"
+            },
+            "require-dev": {
+                "ext-xdebug": ">=2.1.4",
+                "phpunit/phpunit": "~4"
+            },
+            "suggest": {
+                "ext-dom": "*",
+                "ext-xdebug": ">=2.2.1",
+                "ext-xmlwriter": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.1.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+            "keywords": [
+                "coverage",
+                "testing",
+                "xunit"
+            ],
+            "time": "2015-06-19 07:11:55"
+        },
+        {
+            "name": "phpunit/php-file-iterator",
+            "version": "1.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
+                "reference": "a923bb15680d0089e2316f7a4af8f437046e96bb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/a923bb15680d0089e2316f7a4af8f437046e96bb",
+                "reference": "a923bb15680d0089e2316f7a4af8f437046e96bb",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
+            "keywords": [
+                "filesystem",
+                "iterator"
+            ],
+            "time": "2015-04-02 05:19:05"
+        },
+        {
+            "name": "phpunit/php-text-template",
+            "version": "1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "keywords": [
+                "template"
+            ],
+            "time": "2015-06-21 13:50:34"
+        },
+        {
+            "name": "phpunit/php-timer",
+            "version": "1.0.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "83fe1bdc5d47658b727595c14da140da92b3d66d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/83fe1bdc5d47658b727595c14da140da92b3d66d",
+                "reference": "83fe1bdc5d47658b727595c14da140da92b3d66d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Utility class for timing",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "keywords": [
+                "timer"
+            ],
+            "time": "2015-06-13 07:35:30"
+        },
+        {
+            "name": "phpunit/php-token-stream",
+            "version": "1.4.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
+                "reference": "7a9b0969488c3c54fd62b4d504b3ec758fd005d9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/7a9b0969488c3c54fd62b4d504b3ec758fd005d9",
+                "reference": "7a9b0969488c3c54fd62b4d504b3ec758fd005d9",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Wrapper around PHP's tokenizer extension.",
+            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
+            "keywords": [
+                "tokenizer"
+            ],
+            "time": "2015-06-19 03:43:16"
+        },
+        {
+            "name": "phpunit/phpunit",
+            "version": "4.7.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit.git",
+                "reference": "f6701ef3faea759acd1910a7751d8d102a7fd5bc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f6701ef3faea759acd1910a7751d8d102a7fd5bc",
+                "reference": "f6701ef3faea759acd1910a7751d8d102a7fd5bc",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-json": "*",
+                "ext-pcre": "*",
+                "ext-reflection": "*",
+                "ext-spl": "*",
+                "php": ">=5.3.3",
+                "phpspec/prophecy": "~1.3,>=1.3.1",
+                "phpunit/php-code-coverage": "~2.1",
+                "phpunit/php-file-iterator": "~1.4",
+                "phpunit/php-text-template": "~1.2",
+                "phpunit/php-timer": ">=1.0.6",
+                "phpunit/phpunit-mock-objects": "~2.3",
+                "sebastian/comparator": "~1.1",
+                "sebastian/diff": "~1.2",
+                "sebastian/environment": "~1.2",
+                "sebastian/exporter": "~1.2",
+                "sebastian/global-state": "~1.0",
+                "sebastian/version": "~1.0",
+                "symfony/yaml": "~2.1|~3.0"
+            },
+            "suggest": {
+                "phpunit/php-invoker": "~1.1"
+            },
+            "bin": [
+                "phpunit"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.7.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "The PHP Unit Testing framework.",
+            "homepage": "https://phpunit.de/",
+            "keywords": [
+                "phpunit",
+                "testing",
+                "xunit"
+            ],
+            "time": "2015-06-21 07:23:36"
+        },
+        {
+            "name": "phpunit/phpunit-mock-objects",
+            "version": "2.3.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
+                "reference": "92408bb1968a81b3217a6fdf6c1a198da83caa35"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/92408bb1968a81b3217a6fdf6c1a198da83caa35",
+                "reference": "92408bb1968a81b3217a6fdf6c1a198da83caa35",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "~1.0,>=1.0.2",
+                "php": ">=5.3.3",
+                "phpunit/php-text-template": "~1.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "suggest": {
+                "ext-soap": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Mock Object library for PHPUnit",
+            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
+            "keywords": [
+                "mock",
+                "xunit"
+            ],
+            "time": "2015-06-11 15:55:48"
         },
         {
             "name": "psr/log",
@@ -196,12 +731,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/satooshi/php-coveralls.git",
-                "reference": "94389a0ebdb64857d6899b5e0254dffa99e5aa96"
+                "reference": "2fbf803803d179ab1082807308a67bbd5a760c70"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/satooshi/php-coveralls/zipball/94389a0ebdb64857d6899b5e0254dffa99e5aa96",
-                "reference": "94389a0ebdb64857d6899b5e0254dffa99e5aa96",
+                "url": "https://api.github.com/repos/satooshi/php-coveralls/zipball/2fbf803803d179ab1082807308a67bbd5a760c70",
+                "reference": "2fbf803803d179ab1082807308a67bbd5a760c70",
                 "shasum": ""
             },
             "require": {
@@ -263,35 +798,408 @@
                 "github",
                 "test"
             ],
-            "time": "2014-07-09 10:45:38"
+            "time": "2014-11-11 15:35:34"
         },
         {
-            "name": "symfony/config",
-            "version": "v2.5.4",
-            "target-dir": "Symfony/Component/Config",
+            "name": "sebastian/comparator",
+            "version": "1.1.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/Config.git",
-                "reference": "080eabdc256c1d7a3a7cf6296271edb68eb1ab2b"
+                "url": "https://github.com/sebastianbergmann/comparator.git",
+                "reference": "1dd8869519a225f7f2b9eb663e225298fade819e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Config/zipball/080eabdc256c1d7a3a7cf6296271edb68eb1ab2b",
-                "reference": "080eabdc256c1d7a3a7cf6296271edb68eb1ab2b",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1dd8869519a225f7f2b9eb663e225298fade819e",
+                "reference": "1dd8869519a225f7f2b9eb663e225298fade819e",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3",
-                "symfony/filesystem": "~2.3"
+                "sebastian/diff": "~1.2",
+                "sebastian/exporter": "~1.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.5-dev"
+                    "dev-master": "1.1.x-dev"
                 }
             },
             "autoload": {
-                "psr-0": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides the functionality to compare PHP values for equality",
+            "homepage": "http://www.github.com/sebastianbergmann/comparator",
+            "keywords": [
+                "comparator",
+                "compare",
+                "equality"
+            ],
+            "time": "2015-01-29 16:28:08"
+        },
+        {
+            "name": "sebastian/diff",
+            "version": "1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/diff.git",
+                "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/863df9687835c62aa423a22412d26fa2ebde3fd3",
+                "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Diff implementation",
+            "homepage": "http://www.github.com/sebastianbergmann/diff",
+            "keywords": [
+                "diff"
+            ],
+            "time": "2015-02-22 15:13:53"
+        },
+        {
+            "name": "sebastian/environment",
+            "version": "1.2.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/environment.git",
+                "reference": "5a8c7d31914337b69923db26c4221b81ff5a196e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/5a8c7d31914337b69923db26c4221b81ff5a196e",
+                "reference": "5a8c7d31914337b69923db26c4221b81ff5a196e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides functionality to handle HHVM/PHP environments",
+            "homepage": "http://www.github.com/sebastianbergmann/environment",
+            "keywords": [
+                "Xdebug",
+                "environment",
+                "hhvm"
+            ],
+            "time": "2015-01-01 10:01:08"
+        },
+        {
+            "name": "sebastian/exporter",
+            "version": "1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/exporter.git",
+                "reference": "84839970d05254c73cde183a721c7af13aede943"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/84839970d05254c73cde183a721c7af13aede943",
+                "reference": "84839970d05254c73cde183a721c7af13aede943",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "sebastian/recursion-context": "~1.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides the functionality to export PHP variables for visualization",
+            "homepage": "http://www.github.com/sebastianbergmann/exporter",
+            "keywords": [
+                "export",
+                "exporter"
+            ],
+            "time": "2015-01-27 07:23:06"
+        },
+        {
+            "name": "sebastian/global-state",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/global-state.git",
+                "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/c7428acdb62ece0a45e6306f1ae85e1c05b09c01",
+                "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
+            "suggest": {
+                "ext-uopz": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Snapshotting of global state",
+            "homepage": "http://www.github.com/sebastianbergmann/global-state",
+            "keywords": [
+                "global state"
+            ],
+            "time": "2014-10-06 09:23:50"
+        },
+        {
+            "name": "sebastian/recursion-context",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/recursion-context.git",
+                "reference": "3989662bbb30a29d20d9faa04a846af79b276252"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/3989662bbb30a29d20d9faa04a846af79b276252",
+                "reference": "3989662bbb30a29d20d9faa04a846af79b276252",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides functionality to recursively process PHP variables",
+            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "time": "2015-01-24 09:48:32"
+        },
+        {
+            "name": "sebastian/version",
+            "version": "1.0.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/version.git",
+                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
+                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
+                "shasum": ""
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
+            "homepage": "https://github.com/sebastianbergmann/version",
+            "time": "2015-06-21 13:59:46"
+        },
+        {
+            "name": "symfony/config",
+            "version": "v2.7.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/Config.git",
+                "reference": "58ded81f1f582a87c528ef3dae9a859f78b5f374"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/Config/zipball/58ded81f1f582a87c528ef3dae9a859f78b5f374",
+                "reference": "58ded81f1f582a87c528ef3dae9a859f78b5f374",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9",
+                "symfony/filesystem": "~2.3"
+            },
+            "require-dev": {
+                "symfony/phpunit-bridge": "~2.7"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.7-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
                     "Symfony\\Component\\Config\\": ""
                 }
             },
@@ -300,53 +1208,55 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony Config Component",
-            "homepage": "http://symfony.com",
-            "time": "2014-08-31 03:22:04"
+            "homepage": "https://symfony.com",
+            "time": "2015-06-11 14:06:56"
         },
         {
             "name": "symfony/console",
-            "version": "v2.5.4",
-            "target-dir": "Symfony/Component/Console",
+            "version": "v2.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Console.git",
-                "reference": "748beed2a1e73179c3f5154d33fe6ae100c1aeb1"
+                "reference": "564398bc1f33faf92fc2ec86859983d30eb81806"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Console/zipball/748beed2a1e73179c3f5154d33fe6ae100c1aeb1",
-                "reference": "748beed2a1e73179c3f5154d33fe6ae100c1aeb1",
+                "url": "https://api.github.com/repos/symfony/Console/zipball/564398bc1f33faf92fc2ec86859983d30eb81806",
+                "reference": "564398bc1f33faf92fc2ec86859983d30eb81806",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=5.3.9"
             },
             "require-dev": {
                 "psr/log": "~1.0",
-                "symfony/event-dispatcher": "~2.1"
+                "symfony/event-dispatcher": "~2.1",
+                "symfony/phpunit-bridge": "~2.7",
+                "symfony/process": "~2.1"
             },
             "suggest": {
                 "psr/log": "For using the console logger",
-                "symfony/event-dispatcher": ""
+                "symfony/event-dispatcher": "",
+                "symfony/process": ""
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.5-dev"
+                    "dev-master": "2.7-dev"
                 }
             },
             "autoload": {
-                "psr-0": {
+                "psr-4": {
                     "Symfony\\Component\\Console\\": ""
                 }
             },
@@ -355,42 +1265,43 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony Console Component",
-            "homepage": "http://symfony.com",
-            "time": "2014-08-14 16:10:54"
+            "homepage": "https://symfony.com",
+            "time": "2015-06-10 15:30:22"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v2.5.4",
-            "target-dir": "Symfony/Component/EventDispatcher",
+            "version": "v2.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/EventDispatcher.git",
-                "reference": "8faf5cc7e80fde74a650a36e60d32ce3c3e0457b"
+                "reference": "be3c5ff8d503c46768aeb78ce6333051aa6f26d9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/8faf5cc7e80fde74a650a36e60d32ce3c3e0457b",
-                "reference": "8faf5cc7e80fde74a650a36e60d32ce3c3e0457b",
+                "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/be3c5ff8d503c46768aeb78ce6333051aa6f26d9",
+                "reference": "be3c5ff8d503c46768aeb78ce6333051aa6f26d9",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=5.3.9"
             },
             "require-dev": {
                 "psr/log": "~1.0",
-                "symfony/config": "~2.0",
-                "symfony/dependency-injection": "~2.0",
-                "symfony/stopwatch": "~2.2"
+                "symfony/config": "~2.0,>=2.0.5",
+                "symfony/dependency-injection": "~2.6",
+                "symfony/expression-language": "~2.6",
+                "symfony/phpunit-bridge": "~2.7",
+                "symfony/stopwatch": "~2.3"
             },
             "suggest": {
                 "symfony/dependency-injection": "",
@@ -399,11 +1310,11 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.5-dev"
+                    "dev-master": "2.7-dev"
                 }
             },
             "autoload": {
-                "psr-0": {
+                "psr-4": {
                     "Symfony\\Component\\EventDispatcher\\": ""
                 }
             },
@@ -412,45 +1323,47 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony EventDispatcher Component",
-            "homepage": "http://symfony.com",
-            "time": "2014-07-28 13:20:46"
+            "homepage": "https://symfony.com",
+            "time": "2015-06-08 09:37:21"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v2.5.4",
-            "target-dir": "Symfony/Component/Filesystem",
+            "version": "v2.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Filesystem.git",
-                "reference": "a765efd199e02ff4001c115c318e219030be9364"
+                "reference": "a0d43eb3e17d4f4c6990289805a488a0482a07f3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Filesystem/zipball/a765efd199e02ff4001c115c318e219030be9364",
-                "reference": "a765efd199e02ff4001c115c318e219030be9364",
+                "url": "https://api.github.com/repos/symfony/Filesystem/zipball/a0d43eb3e17d4f4c6990289805a488a0482a07f3",
+                "reference": "a0d43eb3e17d4f4c6990289805a488a0482a07f3",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=5.3.9"
+            },
+            "require-dev": {
+                "symfony/phpunit-bridge": "~2.7"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.5-dev"
+                    "dev-master": "2.7-dev"
                 }
             },
             "autoload": {
-                "psr-0": {
+                "psr-4": {
                     "Symfony\\Component\\Filesystem\\": ""
                 }
             },
@@ -459,45 +1372,47 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony Filesystem Component",
-            "homepage": "http://symfony.com",
-            "time": "2014-09-03 09:00:14"
+            "homepage": "https://symfony.com",
+            "time": "2015-06-08 09:37:21"
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v2.5.4",
-            "target-dir": "Symfony/Component/Stopwatch",
+            "version": "v2.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Stopwatch.git",
-                "reference": "22ab4f76cdeefd38b00022a6be5709190a2fd046"
+                "reference": "c653f1985f6c2b7dbffd04d48b9c0a96aaef814b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Stopwatch/zipball/22ab4f76cdeefd38b00022a6be5709190a2fd046",
-                "reference": "22ab4f76cdeefd38b00022a6be5709190a2fd046",
+                "url": "https://api.github.com/repos/symfony/Stopwatch/zipball/c653f1985f6c2b7dbffd04d48b9c0a96aaef814b",
+                "reference": "c653f1985f6c2b7dbffd04d48b9c0a96aaef814b",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=5.3.9"
+            },
+            "require-dev": {
+                "symfony/phpunit-bridge": "~2.7"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.5-dev"
+                    "dev-master": "2.7-dev"
                 }
             },
             "autoload": {
-                "psr-0": {
+                "psr-4": {
                     "Symfony\\Component\\Stopwatch\\": ""
                 }
             },
@@ -506,45 +1421,47 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony Stopwatch Component",
-            "homepage": "http://symfony.com",
-            "time": "2014-08-14 16:10:54"
+            "homepage": "https://symfony.com",
+            "time": "2015-06-04 20:11:48"
         },
         {
             "name": "symfony/yaml",
-            "version": "v2.5.4",
-            "target-dir": "Symfony/Component/Yaml",
+            "version": "v2.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Yaml.git",
-                "reference": "01a7695bcfb013d0a15c6757e15aae120342986f"
+                "reference": "9808e75c609a14f6db02f70fccf4ca4aab53c160"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Yaml/zipball/01a7695bcfb013d0a15c6757e15aae120342986f",
-                "reference": "01a7695bcfb013d0a15c6757e15aae120342986f",
+                "url": "https://api.github.com/repos/symfony/Yaml/zipball/9808e75c609a14f6db02f70fccf4ca4aab53c160",
+                "reference": "9808e75c609a14f6db02f70fccf4ca4aab53c160",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=5.3.9"
+            },
+            "require-dev": {
+                "symfony/phpunit-bridge": "~2.7"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.5-dev"
+                    "dev-master": "2.7-dev"
                 }
             },
             "autoload": {
-                "psr-0": {
+                "psr-4": {
                     "Symfony\\Component\\Yaml\\": ""
                 }
             },
@@ -553,32 +1470,29 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony Yaml Component",
-            "homepage": "http://symfony.com",
-            "time": "2014-08-31 03:22:04"
+            "homepage": "https://symfony.com",
+            "time": "2015-06-10 15:30:22"
         }
     ],
-    "aliases": [
-
-    ],
+    "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
         "satooshi/php-coveralls": 20
     },
     "prefer-stable": false,
+    "prefer-lowest": false,
     "platform": {
         "php": ">= 5.3.3"
     },
-    "platform-dev": [
-
-    ]
+    "platform-dev": []
 }
diff --git a/core/vendor/egulias/email-validator/documentation/Ohter.md b/core/vendor/egulias/email-validator/documentation/Other.md
similarity index 100%
rename from core/vendor/egulias/email-validator/documentation/Ohter.md
rename to core/vendor/egulias/email-validator/documentation/Other.md
diff --git a/core/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailLexer.php b/core/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailLexer.php
index 7056235cd..d8522fff1 100644
--- a/core/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailLexer.php
+++ b/core/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailLexer.php
@@ -75,8 +75,6 @@ class EmailLexer extends AbstractLexer
         '\0'   => self::C_NUL,
     );
 
-    protected $invalidASCII = array(226 => 1,);
-
     protected $hasInvalidTokens = false;
 
     protected $previous;
@@ -138,12 +136,12 @@ class EmailLexer extends AbstractLexer
     protected function getCatchablePatterns()
     {
         return array(
-            '[a-zA-Z_]+[46]?',
+            '[a-zA-Z_]+[46]?', //ASCII and domain literal
+            '[^\x00-\x7F]',  //UTF-8
             '[0-9]+',
             '\r\n',
             '::',
-            '\s+',
-            '[\x10-\x1F]+',
+            '\s+?',
             '.',
             );
     }
@@ -155,7 +153,7 @@ class EmailLexer extends AbstractLexer
      */
     protected function getNonCatchablePatterns()
     {
-        return array('[\x7f-\xff]+');
+        return array('[\xA0-\xff]+');
     }
 
     /**
@@ -167,16 +165,15 @@ class EmailLexer extends AbstractLexer
      */
     protected function getType(&$value)
     {
-
         if ($this->isNullType($value)) {
             return self::C_NUL;
         }
 
-        if (isset($this->charValue[$value])) {
+        if ($this->isValid($value)) {
             return $this->charValue[$value];
         }
 
-        if ($this->isInvalid($value)) {
+        if ($this->isUTF8Invalid($value)) {
             $this->hasInvalidTokens = true;
             return self::INVALID;
         }
@@ -184,8 +181,18 @@ class EmailLexer extends AbstractLexer
         return  self::GENERIC;
     }
 
+    protected function isValid($value)
+    {
+        if (isset($this->charValue[$value])) {
+            return true;
+        }
+
+        return false;
+    }
+
     /**
-     * @param string $value
+     * @param $value
+     * @return bool
      */
     protected function isNullType($value)
     {
@@ -197,18 +204,20 @@ class EmailLexer extends AbstractLexer
     }
 
     /**
-     * @param string $value
+     * @param $value
+     * @return bool
      */
-    protected function isInvalid($value)
+    protected function isUTF8Invalid($value)
     {
-        if (preg_match('/[\x10-\x1F]+/', $value)) {
-            return true;
-        }
-
-        if (isset($this->invalidASCII[ord($value)])) {
+        if (preg_match('/\p{Cc}+/u', $value)) {
             return true;
         }
 
         return false;
     }
+
+    protected function getModifiers()
+    {
+        return 'iu';
+    }
 }
diff --git a/core/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailParser.php b/core/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailParser.php
index 0c5d15684..5f4c4aa58 100644
--- a/core/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailParser.php
+++ b/core/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailParser.php
@@ -29,7 +29,8 @@ class EmailParser
     }
 
     /**
-     * @param string $str
+     * @param $str
+     * @return array
      */
     public function parse($str)
     {
@@ -39,15 +40,16 @@ class EmailParser
             throw new \InvalidArgumentException('ERR_NOLOCALPART');
         }
 
-        if ($this->lexer->hasInvalidTokens()) {
-            throw new \InvalidArgumentException('ERR_INVALID_ATEXT');
-        }
 
         $this->localPartParser->parse($str);
         $this->domainPartParser->parse($str);
 
         $this->setParts($str);
 
+        if ($this->lexer->hasInvalidTokens()) {
+            throw new \InvalidArgumentException('ERR_INVALID_ATEXT');
+        }
+
         return array('local' => $this->localPart, 'domain' => $this->domainPart);
     }
 
diff --git a/core/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/DomainPart.php b/core/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/DomainPart.php
index 33875a493..c4d0cf602 100644
--- a/core/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/DomainPart.php
+++ b/core/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/DomainPart.php
@@ -104,6 +104,7 @@ class DomainPart extends Parser
     {
         $domain = '';
         do {
+
             $prev = $this->lexer->getPrevious();
 
             if ($this->lexer->token['type'] === EmailLexer::S_SLASH) {
@@ -217,9 +218,6 @@ class DomainPart extends Parser
         return $addressLiteral;
     }
 
-    /**
-     * @param string $addressLiteral
-     */
     protected function checkIPV4Tag($addressLiteral)
     {
         $matchesIP  = array();
@@ -245,6 +243,17 @@ class DomainPart extends Parser
 
     protected function checkDomainPartExceptions($prev)
     {
+        $invalidDomainTokens = array(
+            EmailLexer::S_DQUOTE => true,
+            EmailLexer::S_SEMICOLON => true,
+            EmailLexer::S_GREATERTHAN => true,
+            EmailLexer::S_LOWERTHAN => true,
+        );
+
+        if (isset($invalidDomainTokens[$this->lexer->token['type']])) {
+            throw new \InvalidArgumentException('ERR_EXPECTING_ATEXT');
+        }
+
         if ($this->lexer->token['type'] === EmailLexer::S_COMMA) {
             throw new \InvalidArgumentException('ERR_COMMA_IN_DOMAIN');
         }
diff --git a/core/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/LocalPart.php b/core/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/LocalPart.php
index 4db0ea62a..2f7716409 100644
--- a/core/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/LocalPart.php
+++ b/core/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/LocalPart.php
@@ -6,7 +6,6 @@ use Egulias\EmailValidator\EmailLexer;
 use Egulias\EmailValidator\EmailValidator;
 use \InvalidArgumentException;
 
-
 class LocalPart extends Parser
 {
     public function parse($localPart)
diff --git a/core/vendor/egulias/email-validator/tests/egulias/Tests/EmailValidator/EmailLexerTest.php b/core/vendor/egulias/email-validator/tests/egulias/Tests/EmailValidator/EmailLexerTest.php
index 4af771cf1..d5389efa5 100644
--- a/core/vendor/egulias/email-validator/tests/egulias/Tests/EmailValidator/EmailLexerTest.php
+++ b/core/vendor/egulias/email-validator/tests/egulias/Tests/EmailValidator/EmailLexerTest.php
@@ -26,6 +26,73 @@ class EmailLexerTests extends \PHPUnit_Framework_TestCase
         $this->assertEquals($token, $lexer->token['type']);
     }
 
+    public function testLexerParsesMultipleSpaces()
+    {
+        $lexer = new EmailLexer();
+        $lexer->setInput('  ');
+        $lexer->moveNext();
+        $lexer->moveNext();
+        $this->assertEquals(EmailLexer::S_SP, $lexer->token['type']);
+        $lexer->moveNext();
+        $this->assertEquals(EmailLexer::S_SP, $lexer->token['type']);
+    }
+
+    /**
+     * @dataProvider invalidUTF8CharsProvider
+     */
+    public function testLexerParsesInvalidUTF8($char)
+    {
+        $lexer = new EmailLexer();
+        $lexer->setInput($char);
+        $lexer->moveNext();
+        $lexer->moveNext();
+
+        $this->assertEquals(EmailLexer::INVALID, $lexer->token['type']);
+    }
+
+    public function invalidUTF8CharsProvider()
+    {
+        $chars = array();
+        for ($i = 0; $i < 0x100; ++$i) {
+            $c = $this->utf8Chr($i);
+            if (preg_match('/(?=\p{Cc})(?=[^\t\n\n\r])/u', $c) && !preg_match('/\x{0000}/u', $c)) {
+                $chars[] = array($c);
+            }
+        }
+
+        return $chars;
+    }
+
+    protected function utf8Chr($code_point)
+    {
+
+        if ($code_point < 0 || 0x10FFFF < $code_point || (0xD800 <= $code_point && $code_point <= 0xDFFF)) {
+            return '';
+        }
+
+        if ($code_point < 0x80) {
+            $hex[0] = $code_point;
+            $ret = chr($hex[0]);
+        } elseif ($code_point < 0x800) {
+            $hex[0] = 0x1C0 | $code_point >> 6;
+            $hex[1] = 0x80  | $code_point & 0x3F;
+            $ret = chr($hex[0]).chr($hex[1]);
+        } elseif ($code_point < 0x10000) {
+            $hex[0] = 0xE0 | $code_point >> 12;
+            $hex[1] = 0x80 | $code_point >> 6 & 0x3F;
+            $hex[2] = 0x80 | $code_point & 0x3F;
+            $ret = chr($hex[0]).chr($hex[1]).chr($hex[2]);
+        } else {
+            $hex[0] = 0xF0 | $code_point >> 18;
+            $hex[1] = 0x80 | $code_point >> 12 & 0x3F;
+            $hex[2] = 0x80 | $code_point >> 6 & 0x3F;
+            $hex[3] = 0x80 | $code_point  & 0x3F;
+            $ret = chr($hex[0]).chr($hex[1]).chr($hex[2]).chr($hex[3]);
+        }
+
+        return $ret;
+    }
+
     public function testLexerForTab()
     {
         $lexer = new EmailLexer();
@@ -36,6 +103,17 @@ class EmailLexerTests extends \PHPUnit_Framework_TestCase
         $this->assertEquals(EmailLexer::S_HTAB, $lexer->token['type']);
     }
 
+    public function testLexerForUTF8()
+    {
+        $lexer = new EmailLexer();
+        $lexer->setInput("áÇ@bar.com");
+        $lexer->moveNext();
+        $lexer->moveNext();
+        $this->assertEquals(EmailLexer::GENERIC, $lexer->token['type']);
+        $lexer->moveNext();
+        $this->assertEquals(EmailLexer::GENERIC, $lexer->token['type']);
+    }
+
     public function testLexerSearchToken()
     {
         $lexer = new EmailLexer();
@@ -44,15 +122,6 @@ class EmailLexerTests extends \PHPUnit_Framework_TestCase
         $this->assertTrue($lexer->find(EmailLexer::S_HTAB));
     }
 
-    public function testLexerHasInvalidTokens()
-    {
-        $lexer = new EmailLexer();
-        $lexer->setInput(chr(226));
-        $lexer->moveNext();
-        $lexer->moveNext();
-        $this->assertTrue($lexer->hasInvalidTokens());
-    }
-
     public function getTokens()
     {
         return array(
@@ -85,7 +154,7 @@ class EmailLexerTests extends \PHPUnit_Framework_TestCase
             array('}', EmailLexer::S_CLOSEQBRACKET),
             array('',  EmailLexer::S_EMPTY),
             array(chr(31),  EmailLexer::INVALID),
-            array(chr(226),  EmailLexer::INVALID),
+            array(chr(226),  EmailLexer::GENERIC),
             array(chr(0),  EmailLexer::C_NUL)
         );
     }
diff --git a/core/vendor/egulias/email-validator/tests/egulias/Tests/EmailValidator/EmailValidatorTest.php b/core/vendor/egulias/email-validator/tests/egulias/Tests/EmailValidator/EmailValidatorTest.php
index e72fde4dd..1491df75d 100644
--- a/core/vendor/egulias/email-validator/tests/egulias/Tests/EmailValidator/EmailValidatorTest.php
+++ b/core/vendor/egulias/email-validator/tests/egulias/Tests/EmailValidator/EmailValidatorTest.php
@@ -26,9 +26,18 @@ class EmailValidatorTest extends \PHPUnit_Framework_TestCase
         $this->assertTrue($this->validator->isValid($email));
     }
 
+    public function testInvalidUTF8Email()
+    {
+        $validator = new EmailValidator;
+        $email     = "\x80\x81\x82@\x83\x84\x85.\x86\x87\x88";
+
+        $this->assertFalse($validator->isValid($email));
+    }
+
     public function getValidEmails()
     {
         return array(
+            array('â@iana.org'),
             array('fabien@symfony.com'),
             array('example@example.co.uk'),
             array('fabien_potencier@example.fr'),
@@ -47,6 +56,13 @@ class EmailValidatorTest extends \PHPUnit_Framework_TestCase
             array('"test\ test"@iana.org'),
             array('""@iana.org'),
             array('"\""@iana.org'),
+            array('müller@möller.de'),
+            array('test@email*'),
+            array('test@email!'),
+            array('test@email&'),
+            array('test@email^'),
+            array('test@email%'),
+            array('test@email$'),
         );
     }
 
@@ -61,7 +77,9 @@ class EmailValidatorTest extends \PHPUnit_Framework_TestCase
     public function getInvalidEmails()
     {
         return array(
-
+            array('test@example.com test'),
+            array('user  name@example.com'),
+            array('user   name@example.com'),
             array('example.@example.co.uk'),
             array('example@example@example.co.uk'),
             array('(test_exampel@example.fr)'),
@@ -98,6 +116,13 @@ class EmailValidatorTest extends \PHPUnit_Framework_TestCase
             array('test@iana.org \r\n\r\n'),
             array('test@iana.org  \r\n\r\n '),
             array('test@iana/icann.org'),
+            array('test@foo;bar.com'),
+            array('test;123@foobar.com'),
+            array('test@example..com'),
+            array('email.email@email."'),
+            array('test@email>'),
+            array('test@email<'),
+            array('test@email{'),
         );
     }
 
@@ -163,13 +188,32 @@ class EmailValidatorTest extends \PHPUnit_Framework_TestCase
     public function getInvalidEmailsWithWarnings()
     {
         return array(
-            array(array( EmailValidator::DEPREC_CFWS_NEAR_AT,), 'example @example.co.uk'),
-            array(array( EmailValidator::DEPREC_CFWS_NEAR_AT,), 'example@ example.co.uk'),
-            array(array( EmailValidator::CFWS_COMMENT,), 'example@example(examplecomment).co.uk'),
+            array(
+                array(
+                    EmailValidator::DEPREC_CFWS_NEAR_AT,
+                    EmailValidator::DNSWARN_NO_RECORD
+                ),
+                'example @example.co.uk'
+            ),
+            array(
+                array(
+                    EmailValidator::DEPREC_CFWS_NEAR_AT,
+                    EmailValidator::DNSWARN_NO_RECORD
+                ),
+                'example@ example.co.uk'
+            ),
+            array(
+                array(
+                    EmailValidator::CFWS_COMMENT,
+                    EmailValidator::DNSWARN_NO_RECORD
+                ),
+                'example@example(examplecomment).co.uk'
+            ),
             array(
                 array(
                     EmailValidator::CFWS_COMMENT,
                     EmailValidator::DEPREC_CFWS_NEAR_AT,
+                    EmailValidator::DNSWARN_NO_RECORD,
                 ),
                 'example(examplecomment)@example.co.uk'
             ),
@@ -177,6 +221,7 @@ class EmailValidatorTest extends \PHPUnit_Framework_TestCase
                 array(
                     EmailValidator::RFC5321_QUOTEDSTRING,
                     EmailValidator::CFWS_FWS,
+                    EmailValidator::DNSWARN_NO_RECORD,
                 ),
                 "\"\t\"@example.co.uk"
             ),
@@ -184,6 +229,7 @@ class EmailValidatorTest extends \PHPUnit_Framework_TestCase
                 array(
                     EmailValidator::RFC5321_QUOTEDSTRING,
                     EmailValidator::CFWS_FWS,
+                    EmailValidator::DNSWARN_NO_RECORD
                 ),
                 "\"\r\"@example.co.uk"
             ),
@@ -275,12 +321,14 @@ class EmailValidatorTest extends \PHPUnit_Framework_TestCase
             array(
                 array(
                     EmailValidator::RFC5321_QUOTEDSTRING,
+                    EmailValidator::DNSWARN_NO_RECORD
                 ),
                 '"example"@example.co.uk'
             ),
             array(
                 array(
                     EmailValidator::RFC5322_LOCAL_TOOLONG,
+                    EmailValidator::DNSWARN_NO_RECORD
                 ),
                 'too_long_localpart_too_long_localpart_too_long_localpart_too_long_localpart@example.co.uk'
             ),
diff --git a/core/vendor/fabpot/goutte/.travis.yml b/core/vendor/fabpot/goutte/.travis.yml
index 66cf3207e..26a4ed153 100644
--- a/core/vendor/fabpot/goutte/.travis.yml
+++ b/core/vendor/fabpot/goutte/.travis.yml
@@ -1,9 +1,9 @@
 language: php
 
 php:
+    - 7.0
     - 5.6
     - 5.5
-    - 5.4
     - hhvm
 
 install:
@@ -15,3 +15,4 @@ script:
 matrix:
     allow_failures:
         - php: hhvm
+        - php: 7.0
diff --git a/core/vendor/fabpot/goutte/Goutte/Client.php b/core/vendor/fabpot/goutte/Goutte/Client.php
index cde3ea375..609595d73 100644
--- a/core/vendor/fabpot/goutte/Goutte/Client.php
+++ b/core/vendor/fabpot/goutte/Goutte/Client.php
@@ -13,10 +13,9 @@ namespace Goutte;
 
 use GuzzleHttp\Client as GuzzleClient;
 use GuzzleHttp\ClientInterface as GuzzleClientInterface;
+use GuzzleHttp\Cookie\CookieJar;
 use GuzzleHttp\Exception\RequestException;
-use GuzzleHttp\Message\RequestInterface;
-use GuzzleHttp\Message\Response as GuzzleResponse;
-use GuzzleHttp\Post\PostFile;
+use Psr\Http\Message\ResponseInterface;
 use Symfony\Component\BrowserKit\Client as BaseClient;
 use Symfony\Component\BrowserKit\Response;
 
@@ -25,6 +24,7 @@ use Symfony\Component\BrowserKit\Response;
  *
  * @author Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author Michael Dowling <michael@guzzlephp.org>
+ * @author Charles Sarrazin <charles@sarraz.in>
  */
 class Client extends BaseClient
 {
@@ -90,45 +90,46 @@ class Client extends BaseClient
             }
         }
 
-        $body = null;
-        if (!in_array($request->getMethod(), array('GET', 'HEAD'))) {
-            if (null !== $request->getContent()) {
-                $body = $request->getContent();
-            } else {
-                $body = $request->getParameters();
-            }
-        }
-
-        $this->getClient()->setDefaultOption('auth', $this->auth);
+        $cookies = CookieJar::fromArray(
+            $this->getCookieJar()->allRawValues($request->getUri()),
+            $request->getServer()['HTTP_HOST']
+        );
 
         $requestOptions = array(
-            'body' => $body,
-            'cookies' => $this->getCookieJar()->allRawValues($request->getUri()),
+            'cookies' => $cookies,
             'allow_redirects' => false,
-            'timeout' => 30,
+            'auth' => $this->auth,
         );
 
+        if (!in_array($request->getMethod(), array('GET', 'HEAD'))) {
+            if (null !== $content = $request->getContent()) {
+                $requestOptions['body'] = $content;
+            } else {
+                if ($files = $request->getFiles()) {
+                    $requestOptions['multipart'] = [];
+
+                    $this->addPostFields($request->getParameters(), $requestOptions['multipart']);
+                    $this->addPostFiles($files, $requestOptions['multipart']);
+                } else {
+                    $requestOptions['form_params'] = $request->getParameters();
+                }
+            }
+        }
+
         if (!empty($headers)) {
             $requestOptions['headers'] = $headers;
         }
 
-        $guzzleRequest = $this->getClient()->createRequest(
-            $request->getMethod(),
-            $request->getUri(),
-            $requestOptions
-        );
+        $method = $request->getMethod();
+        $uri = $request->getUri();
 
         foreach ($this->headers as $name => $value) {
-            $guzzleRequest->setHeader($name, $value);
-        }
-
-        if ('POST' == $request->getMethod() || 'PUT' == $request->getMethod()) {
-            $this->addPostFiles($guzzleRequest, $request->getFiles());
+            $requestOptions['headers'][$name] = $value;
         }
 
         // Let BrowserKit handle redirects
         try {
-            $response = $this->getClient()->send($guzzleRequest);
+            $response = $this->getClient()->request($method, $uri, $requestOptions);
         } catch (RequestException $e) {
             $response = $e->getResponse();
             if (null === $response) {
@@ -139,33 +140,63 @@ class Client extends BaseClient
         return $this->createResponse($response);
     }
 
-    protected function addPostFiles(RequestInterface $request, array $files, $arrayName = '')
+    protected function addPostFiles(array $files, array &$multipart, $arrayName = '')
     {
+        if (empty($files)) {
+            return;
+        }
+
         foreach ($files as $name => $info) {
             if (!empty($arrayName)) {
                 $name = $arrayName.'['.$name.']';
             }
 
+            $file = [
+                'name' => $name,
+            ];
+
             if (is_array($info)) {
                 if (isset($info['tmp_name'])) {
                     if ('' !== $info['tmp_name']) {
-                        $request->getBody()->addFile(new PostFile($name, fopen($info['tmp_name'], 'r'), isset($info['name']) ? $info['name'] : null));
+                        $file['contents'] = fopen($info['tmp_name'], 'r');
+                        if (isset($info['name'])) {
+                            $file['filename'] = $info['name'];
+                        }
                     } else {
                         continue;
                     }
                 } else {
-                    $this->addPostFiles($request, $info, $name);
+                    $this->addPostFiles($info, $multipart, $name);
+                    continue;
                 }
             } else {
-                $request->getBody()->addFile(new PostFile($name, fopen($info, 'r')));
+                $file['contents'] = fopen($info, 'r');
+            }
+
+            $multipart[] = $file;
+        }
+    }
+
+    public function addPostFields(array $formParams, array &$multipart, $arrayName = '')
+    {
+        foreach ($formParams as $name => $value) {
+            if (!empty($arrayName)) {
+                $name = $arrayName.'['.$name.']';
+            }
+
+            if (is_array($value)) {
+                $this->addPostFields($value, $multipart, $name);
+            } else {
+                $multipart[] = [
+                    'name' => $name,
+                    'contents' => $value,
+                ];
             }
         }
     }
 
-    protected function createResponse(GuzzleResponse $response)
+    protected function createResponse(ResponseInterface $response)
     {
-        $headers = $response->getHeaders();
-
-        return new Response($response->getBody(true), $response->getStatusCode(), $headers);
+        return new Response((string) $response->getBody(), $response->getStatusCode(), $response->getHeaders());
     }
 }
diff --git a/core/vendor/fabpot/goutte/Goutte/Tests/ClientTest.php b/core/vendor/fabpot/goutte/Goutte/Tests/ClientTest.php
index da2e47c2a..f10d8fbea 100644
--- a/core/vendor/fabpot/goutte/Goutte/Tests/ClientTest.php
+++ b/core/vendor/fabpot/goutte/Goutte/Tests/ClientTest.php
@@ -14,31 +14,34 @@ namespace Goutte\Tests;
 use Goutte\Client;
 use GuzzleHttp\Client as GuzzleClient;
 use GuzzleHttp\Exception\RequestException;
-use GuzzleHttp\Message\Response as GuzzleResponse;
-use GuzzleHttp\Stream\Stream;
-use GuzzleHttp\Subscriber\History;
-use GuzzleHttp\Subscriber\Mock;
-use GuzzleHttp\Post\PostFile;
+use GuzzleHttp\Handler\MockHandler;
+use GuzzleHttp\HandlerStack;
+use GuzzleHttp\Psr7\Response as GuzzleResponse;
+use GuzzleHttp\Middleware;
 use Symfony\Component\BrowserKit\Cookie;
 
 /**
- * Goutte Client Test
+ * Goutte Client Test.
  *
  * @author Michael Dowling <michael@guzzlephp.org>
+ * @author Charles Sarrazin <charles@sarraz.in>
  */
 class ClientTest extends \PHPUnit_Framework_TestCase
 {
     protected $history;
+    /** @var MockHandler */
     protected $mock;
 
-    protected function getGuzzle()
+    protected function getGuzzle(array $responses = [])
     {
-        $this->history = new History();
-        $this->mock = new Mock();
-        $this->mock->addResponse(new GuzzleResponse(200, array(), Stream::factory('<html><body><p>Hi</p></body></html>')));
-        $guzzle = new GuzzleClient(array('redirect.disable' => true, 'base_url' => ''));
-        $guzzle->getEmitter()->attach($this->mock);
-        $guzzle->getEmitter()->attach($this->history);
+        if (empty($responses)) {
+            $responses = [new GuzzleResponse(200, [], '<html><body><p>Hi</p></body></html>')];
+        }
+        $this->mock = new MockHandler($responses);
+        $handlerStack = HandlerStack::create($this->mock);
+        $this->history = [];
+        $handlerStack->push(Middleware::history($this->history));
+        $guzzle = new GuzzleClient(array('redirect.disable' => true, 'base_uri' => '', 'handler' => $handlerStack));
 
         return $guzzle;
     }
@@ -63,8 +66,8 @@ class ClientTest extends \PHPUnit_Framework_TestCase
         $client = new Client();
         $client->setClient($guzzle);
         $client->setHeader('X-Test', 'test');
-        $crawler = $client->request('GET', 'http://www.example.com/');
-        $this->assertEquals('test', $this->history->getLastRequest()->getHeader('X-Test'));
+        $client->request('GET', 'http://www.example.com/');
+        $this->assertEquals('test', end($this->history)['request']->getHeaderLine('X-Test'));
     }
 
     public function testCustomUserAgent()
@@ -73,8 +76,8 @@ class ClientTest extends \PHPUnit_Framework_TestCase
         $client = new Client();
         $client->setClient($guzzle);
         $client->setHeader('User-Agent', 'foo');
-        $crawler = $client->request('GET', 'http://www.example.com/');
-        $this->assertEquals('foo', $this->history->getLastRequest()->getHeader('User-Agent'));
+        $client->request('GET', 'http://www.example.com/');
+        $this->assertEquals('Symfony2 BrowserKit, foo', end($this->history)['request']->getHeaderLine('User-Agent'));
     }
 
     public function testUsesAuth()
@@ -83,11 +86,9 @@ class ClientTest extends \PHPUnit_Framework_TestCase
         $client = new Client();
         $client->setClient($guzzle);
         $client->setAuth('me', '**');
-        $crawler = $client->request('GET', 'http://www.example.com/');
-        $request = $this->history->getLastRequest();
-        $this->assertEquals('me', $request->getConfig()->get('auth')[0]);
-        $this->assertEquals('**', $request->getConfig()->get('auth')[1]);
-        $this->assertEquals('basic', $request->getConfig()->get('auth')[2]);
+        $client->request('GET', 'http://www.example.com/');
+        $request = end($this->history)['request'];
+        $this->assertEquals('Basic bWU6Kio=', $request->getHeaderLine('Authorization'));
     }
 
     public function testResetsAuth()
@@ -97,10 +98,9 @@ class ClientTest extends \PHPUnit_Framework_TestCase
         $client->setClient($guzzle);
         $client->setAuth('me', '**');
         $client->resetAuth();
-        $crawler = $client->request('GET', 'http://www.example.com/');
-        $request = $this->history->getLastRequest();
-        $this->assertNull($request->getConfig()->get('auth')[0]);
-        $this->assertNull($request->getConfig()->get('auth')[1]);
+        $client->request('GET', 'http://www.example.com/');
+        $request = end($this->history)['request'];
+        $this->assertEquals('', $request->getHeaderLine('authorization'));
     }
 
     public function testUsesCookies()
@@ -109,9 +109,9 @@ class ClientTest extends \PHPUnit_Framework_TestCase
         $client = new Client();
         $client->setClient($guzzle);
         $client->getCookieJar()->set(new Cookie('test', '123'));
-        $crawler = $client->request('GET', 'http://www.example.com/');
-        $request = $this->history->getLastRequest();
-        $this->assertEquals('test=123', $request->getHeader('Cookie'));
+        $client->request('GET', 'http://www.example.com/');
+        $request = end($this->history)['request'];
+        $this->assertEquals('test=123', $request->getHeaderLine('Cookie'));
     }
 
     public function testUsesPostFiles()
@@ -122,18 +122,20 @@ class ClientTest extends \PHPUnit_Framework_TestCase
         $files = array(
             'test' => array(
                 'name' => 'test.txt',
-                'tmp_name' => __FILE__,
+                'tmp_name' => __DIR__.'/fixtures.txt',
             ),
         );
 
-        $crawler = $client->request('POST', 'http://www.example.com/', array(), $files);
-        $request = $this->history->getLastRequest();
+        $client->request('POST', 'http://www.example.com/', array(), $files);
+        $request = end($this->history)['request'];
 
-        $files = $request->getBody()->getFiles();
-        $this->assertFile(reset($files), 'test', 'test.txt', array(
-          'Content-Type' => 'text/plain',
-          'Content-Disposition' => 'form-data; filename="test.txt"; name="test"',
-        ));
+        $stream = $request->getBody();
+        $boundary = $stream->getBoundary();
+        $this->assertEquals(
+            "--$boundary\r\nContent-Disposition: form-data; name=\"test\"; filename=\"test.txt\"\r\nContent-Length: 4\r\n"
+            ."Content-Type: text/plain\r\n\r\nfoo\n\r\n--$boundary--\r\n",
+            $stream->getContents()
+        );
     }
 
     public function testUsesPostNamedFiles()
@@ -142,16 +144,19 @@ class ClientTest extends \PHPUnit_Framework_TestCase
         $client = new Client();
         $client->setClient($guzzle);
         $files = array(
-            'test' => __FILE__,
+            'test' => __DIR__.'/fixtures.txt',
         );
 
-        $crawler = $client->request('POST', 'http://www.example.com/', array(), $files);
-        $request = $this->history->getLastRequest();
-        $files = $request->getBody()->getFiles();
-        $this->assertFile(reset($files), 'test', __FILE__, array(
-          'Content-Type' => 'text/x-php',
-          'Content-Disposition' => 'form-data; filename="ClientTest.php"; name="test"',
-        ));
+        $client->request('POST', 'http://www.example.com/', array(), $files);
+        $request = end($this->history)['request'];
+
+        $stream = $request->getBody();
+        $boundary = $stream->getBoundary();
+        $this->assertEquals(
+            "--$boundary\r\nContent-Disposition: form-data; name=\"test\"; filename=\"fixtures.txt\"\r\nContent-Length: 4\r\n"
+            ."Content-Type: text/plain\r\n\r\nfoo\n\r\n--$boundary--\r\n",
+            $stream->getContents()
+        );
     }
 
     public function testUsesPostFilesNestedFields()
@@ -163,18 +168,73 @@ class ClientTest extends \PHPUnit_Framework_TestCase
             'form' => array(
                 'test' => array(
                     'name' => 'test.txt',
-                    'tmp_name' => __FILE__,
+                    'tmp_name' => __DIR__.'/fixtures.txt',
                 ),
             ),
         );
 
-        $crawler = $client->request('POST', 'http://www.example.com/', array(), $files);
-        $request = $this->history->getLastRequest();
-        $files = $request->getBody()->getFiles();
-        $this->assertFile(reset($files), 'form[test]', 'test.txt', array(
-            'Content-Type' => 'text/plain',
-            'Content-Disposition' => 'form-data; filename="test.txt"; name="form[test]"',
-        ));
+        $client->request('POST', 'http://www.example.com/', array(), $files);
+        $request = end($this->history)['request'];
+
+        $stream = $request->getBody();
+        $boundary = $stream->getBoundary();
+        $this->assertEquals(
+            "--$boundary\r\nContent-Disposition: form-data; name=\"form[test]\"; filename=\"test.txt\"\r\nContent-Length: 4\r\n"
+            ."Content-Type: text/plain\r\n\r\nfoo\n\r\n--$boundary--\r\n",
+            $stream->getContents()
+        );
+    }
+
+    public function testPostFormWithFiles()
+    {
+        $guzzle = $this->getGuzzle();
+        $client = new Client();
+        $client->setClient($guzzle);
+        $files = array(
+            'test' => __DIR__.'/fixtures.txt',
+        );
+        $params = array(
+            'foo' => 'bar',
+        );
+
+        $client->request('POST', 'http://www.example.com/', $params, $files);
+        $request = end($this->history)['request'];
+
+        $stream = $request->getBody();
+        $boundary = $stream->getBoundary();
+        $this->assertEquals(
+            "--$boundary\r\nContent-Disposition: form-data; name=\"foo\"\r\nContent-Length: 3\r\n"
+            ."\r\nbar\r\n"
+            ."--$boundary\r\nContent-Disposition: form-data; name=\"test\"; filename=\"fixtures.txt\"\r\nContent-Length: 4\r\n"
+            ."Content-Type: text/plain\r\n\r\nfoo\n\r\n--$boundary--\r\n",
+        $stream->getContents());
+    }
+
+    public function testPostEmbeddedFormWithFiles()
+    {
+        $guzzle = $this->getGuzzle();
+        $client = new Client();
+        $client->setClient($guzzle);
+        $files = array(
+            'test' => __DIR__.'/fixtures.txt',
+        );
+        $params = array(
+            'foo' => array(
+                'bar' => 'baz',
+            ),
+        );
+
+        $client->request('POST', 'http://www.example.com/', $params, $files);
+        $request = end($this->history)['request'];
+
+        $stream = $request->getBody();
+        $boundary = $stream->getBoundary();
+        $this->assertEquals(
+            "--$boundary\r\nContent-Disposition: form-data; name=\"foo[bar]\"\r\nContent-Length: 3\r\n"
+            ."\r\nbaz\r\n"
+            ."--$boundary\r\nContent-Disposition: form-data; name=\"test\"; filename=\"fixtures.txt\"\r\nContent-Length: 4\r\n"
+            ."Content-Type: text/plain\r\n\r\nfoo\n\r\n--$boundary--\r\n",
+        $stream->getContents());
     }
 
     public function testUsesPostFilesOnClientSide()
@@ -183,16 +243,19 @@ class ClientTest extends \PHPUnit_Framework_TestCase
         $client = new Client();
         $client->setClient($guzzle);
         $files = array(
-            'test' => __FILE__,
+            'test' => __DIR__.'/fixtures.txt',
         );
 
-        $crawler = $client->request('POST', 'http://www.example.com/', array(), $files);
-        $request = $this->history->getLastRequest();
-        $files = $request->getBody()->getFiles();
-        $this->assertFile(reset($files), 'test', __FILE__, array(
-          'Content-Type' => 'text/x-php',
-          'Content-Disposition' => 'form-data; filename="ClientTest.php"; name="test"',
-        ));
+        $client->request('POST', 'http://www.example.com/', array(), $files);
+        $request = end($this->history)['request'];
+
+        $stream = $request->getBody();
+        $boundary = $stream->getBoundary();
+        $this->assertEquals(
+            "--$boundary\r\nContent-Disposition: form-data; name=\"test\"; filename=\"fixtures.txt\"\r\nContent-Length: 4\r\n"
+            ."Content-Type: text/plain\r\n\r\nfoo\n\r\n--$boundary--\r\n",
+            $stream->getContents()
+        );
     }
 
     public function testUsesPostFilesUploadError()
@@ -210,10 +273,12 @@ class ClientTest extends \PHPUnit_Framework_TestCase
             ),
         );
 
-        $crawler = $client->request('POST', 'http://www.example.com/', array(), $files);
-        $request = $this->history->getLastRequest();
+        $client->request('POST', 'http://www.example.com/', array(), $files);
+        $request = end($this->history)['request'];
+        $stream = $request->getBody();
+        $boundary = $stream->getBoundary();
 
-        $this->assertEquals(array(), $request->getBody()->getFiles());
+        $this->assertEquals("--$boundary--\r\n", $stream->getContents());
     }
 
     public function testCreatesResponse()
@@ -227,13 +292,12 @@ class ClientTest extends \PHPUnit_Framework_TestCase
 
     public function testHandlesRedirectsCorrectly()
     {
-        $guzzle = $this->getGuzzle();
-
-        $this->mock->clearQueue();
-        $this->mock->addResponse(new GuzzleResponse(301, array(
-            'Location' => 'http://www.example.com/',
-        )));
-        $this->mock->addResponse(new GuzzleResponse(200, [], Stream::factory('<html><body><p>Test</p></body></html>')));
+        $guzzle = $this->getGuzzle([
+            new GuzzleResponse(301, array(
+                'Location' => 'http://www.example.com/',
+            )),
+            new GuzzleResponse(200, [], '<html><body><p>Test</p></body></html>'),
+        ]);
 
         $client = new Client();
         $client->setClient($guzzle);
@@ -247,12 +311,11 @@ class ClientTest extends \PHPUnit_Framework_TestCase
 
     public function testConvertsGuzzleHeadersToArrays()
     {
-        $guzzle = $this->getGuzzle();
-
-        $this->mock->clearQueue();
-        $this->mock->addResponse(new GuzzleResponse(200, array(
-            'Date' => 'Tue, 04 Jun 2013 13:22:41 GMT',
-        )));
+        $guzzle = $this->getGuzzle([
+            new GuzzleResponse(200, array(
+                'Date' => 'Tue, 04 Jun 2013 13:22:41 GMT',
+            )),
+        ]);
 
         $client = new Client();
         $client->setClient($guzzle);
@@ -260,48 +323,30 @@ class ClientTest extends \PHPUnit_Framework_TestCase
         $response = $client->getResponse();
         $headers = $response->getHeaders();
 
-        $this->assertInternalType("array", array_shift($headers), "Header not converted from Guzzle\Http\Message\Header to array");
+        $this->assertInternalType('array', array_shift($headers), 'Header not converted from Guzzle\Http\Message\Header to array');
     }
 
     public function testNullResponseException()
     {
         $this->setExpectedException('GuzzleHttp\Exception\RequestException');
-        $guzzle = $this->getGuzzle();
-        $this->mock->clearQueue();
-        $exception = new RequestException('', $this->getMock('GuzzleHttp\Message\RequestInterface'));
-        $this->mock->addException($exception);
+        $guzzle = $this->getGuzzle([
+            new RequestException('', $this->getMock('Psr\Http\Message\RequestInterface')),
+        ]);
         $client = new Client();
         $client->setClient($guzzle);
         $client->request('GET', 'http://www.example.com/');
-        $response = $client->getResponse();
-    }
-
-    protected function assertFile(PostFile $postFile, $fieldName, $fileName, $headers)
-    {
-        $this->assertEquals($postFile->getName(), $fieldName);
-        $this->assertEquals($postFile->getFilename(), $fileName);
-
-        $postFileHeaders = $postFile->getHeaders();
-
-        // Note: Sort 'Content-Disposition' values before comparing, because the order changed in Guzzle 4.2.2
-        $postFileHeaders['Content-Disposition'] = explode('; ', $postFileHeaders['Content-Disposition']);
-        sort($postFileHeaders['Content-Disposition']);
-        $headers['Content-Disposition'] = explode('; ', $headers['Content-Disposition']);
-        sort($headers['Content-Disposition']);
-
-        $this->assertEquals($postFileHeaders, $headers);
+        $client->getResponse();
     }
 
     public function testHttps()
     {
-        $guzzle = $this->getGuzzle();
+        $guzzle = $this->getGuzzle([
+            new GuzzleResponse(200, [], '<html><body><p>Test</p></body></html>'),
+        ]);
 
-        $this->mock->clearQueue();
-        $this->mock->addResponse(new GuzzleResponse(200, [], Stream::factory('<html><body><p>Test</p></body></html>')));
         $client = new Client();
         $client->setClient($guzzle);
         $crawler = $client->request('GET', 'https://www.example.com/');
-        $this->assertEquals('https', $this->history->getLastRequest()->getScheme());
         $this->assertEquals('Test', $crawler->filter('p')->text());
     }
 
@@ -313,7 +358,7 @@ class ClientTest extends \PHPUnit_Framework_TestCase
           'HTTP_USER_AGENT' => 'SomeHost',
         ]);
         $client->setClient($guzzle);
-        $crawler = $client->request('GET', 'http://www.example.com/');
-        $this->assertEquals('SomeHost', $this->history->getLastRequest()->getHeader('User-Agent'));
+        $client->request('GET', 'http://www.example.com/');
+        $this->assertEquals('SomeHost', end($this->history)['request']->getHeaderLine('User-Agent'));
     }
 }
diff --git a/core/vendor/fabpot/goutte/Goutte/Tests/fixtures.txt b/core/vendor/fabpot/goutte/Goutte/Tests/fixtures.txt
new file mode 100644
index 000000000..257cc5642
--- /dev/null
+++ b/core/vendor/fabpot/goutte/Goutte/Tests/fixtures.txt
@@ -0,0 +1 @@
+foo
diff --git a/core/vendor/fabpot/goutte/README.rst b/core/vendor/fabpot/goutte/README.rst
index 58eecdb53..c1ade391f 100644
--- a/core/vendor/fabpot/goutte/README.rst
+++ b/core/vendor/fabpot/goutte/README.rst
@@ -9,11 +9,12 @@ responses.
 Requirements
 ------------
 
-Goutte depends on PHP 5.4+ and Guzzle 4+.
+Goutte depends on PHP 5.5+ and Guzzle 6+.
 
 .. tip::
 
-    If you need support for PHP 5.3 or Guzzle 3, use Goutte 1.0.6.
+    If you need support for PHP 5.4 or Guzzle 4-5, use Goutte 2.x.
+    If you need support for PHP 5.3 or Guzzle 3, use Goutte 1.x.
 
 Installation
 ------------
@@ -22,7 +23,7 @@ Add ``fabpot/goutte`` as a require dependency in your ``composer.json`` file:
 
 .. code-block:: bash
 
-    php composer.phar require fabpot/goutte:~2.0
+    composer require fabpot/goutte
 
 .. tip::
 
@@ -32,6 +33,9 @@ Add ``fabpot/goutte`` as a require dependency in your ``composer.json`` file:
 
         require_once '/path/to/goutte.phar';
 
+    The phars for Goutte 1.x are also available for `download
+    <http://get.sensiolabs.org/goutte-v1.0.7.phar>`.
+
 Usage
 -----
 
@@ -73,7 +77,7 @@ Extract data:
 .. code-block:: php
 
     // Get the latest post in this category and display the titles
-    $crawler->filter('h2.post > a')->each(function ($node) {
+    $crawler->filter('h2 > a')->each(function ($node) {
         print $node->text()."\n";
     });
 
@@ -92,8 +96,14 @@ Submit forms:
 More Information
 ----------------
 
-Read the documentation of the BrowserKit and DomCrawler Symfony Components for
-more information about what you can do with Goutte.
+Read the documentation of the BrowserKit and `DomCrawler
+<http://symfony.com/doc/any/components/dom_crawler.html>`_ Symfony Components
+for more information about what you can do with Goutte.
+
+Pronunciation
+-------------
+
+Goutte is pronounced ``goot`` i.e. it rhymes with ``boot`` and not ``out``.
 
 Technical Information
 ---------------------
diff --git a/core/vendor/fabpot/goutte/composer.json b/core/vendor/fabpot/goutte/composer.json
index 63d87e72d..1a0ed82f1 100644
--- a/core/vendor/fabpot/goutte/composer.json
+++ b/core/vendor/fabpot/goutte/composer.json
@@ -12,18 +12,18 @@
         }
     ],
     "require": {
-        "php": ">=5.4.0",
+        "php": ">=5.5.0",
         "symfony/browser-kit": "~2.1",
         "symfony/css-selector": "~2.1",
         "symfony/dom-crawler": "~2.1",
-        "guzzlehttp/guzzle": ">=4,<6"
+        "guzzlehttp/guzzle": "^6.0"
     },
     "autoload": {
         "psr-4": { "Goutte\\": "Goutte" }
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.0-dev"
+            "dev-master": "3.1-dev"
         }
     }
 }
diff --git a/core/vendor/guzzlehttp/guzzle/.gitignore b/core/vendor/guzzlehttp/guzzle/.gitignore
deleted file mode 100644
index 83ec41e24..000000000
--- a/core/vendor/guzzlehttp/guzzle/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-phpunit.xml
-composer.phar
-composer.lock
-composer-test.lock
-vendor/
-build/artifacts/
-artifacts/
-docs/_build
-docs/*.pyc
-.idea
-.DS_STORE
diff --git a/core/vendor/guzzlehttp/guzzle/.travis.yml b/core/vendor/guzzlehttp/guzzle/.travis.yml
index 77bcf4a70..c0689d161 100644
--- a/core/vendor/guzzlehttp/guzzle/.travis.yml
+++ b/core/vendor/guzzlehttp/guzzle/.travis.yml
@@ -1,15 +1,13 @@
 language: php
 
 php:
-  - 5.4
   - 5.5
   - 5.6
+  - 7.0
   - hhvm
 
 before_script:
   - curl --version
-  - pear config-set php_ini ~/.phpenv/versions/`php -r 'echo phpversion();'`/etc/php.ini || echo 'Error modifying PEAR'
-  - pecl install uri_template || echo 'Error installing uri_template'
   - composer self-update
   - composer install --no-interaction --prefer-source --dev
   - ~/.nvm/nvm.sh install v0.6.14
@@ -20,6 +18,7 @@ script: make test
 matrix:
   allow_failures:
     - php: hhvm
+    - php: 7.0
   fast_finish: true
 
 before_deploy:
@@ -36,4 +35,4 @@ deploy:
     repo: guzzle/guzzle
     tags: true
     all_branches: true
-    php: 5.4
+    php: 5.5
diff --git a/core/vendor/guzzlehttp/guzzle/CHANGELOG.md b/core/vendor/guzzlehttp/guzzle/CHANGELOG.md
index caafb425f..d639f4e65 100644
--- a/core/vendor/guzzlehttp/guzzle/CHANGELOG.md
+++ b/core/vendor/guzzlehttp/guzzle/CHANGELOG.md
@@ -1,5 +1,116 @@
 # CHANGELOG
 
+## 6.0.2 - 2015-07-04
+
+* Fixed a memory leak in the curl handlers in which references to callbacks
+  were not being removed by `curl_reset`.
+* Cookies are now extracted properly before redirects.
+* Cookies now allow more character ranges.
+* Decoded Content-Encoding responses are now modified to correctly reflect
+  their state if the encoding was automatically removed by a handler. This
+  means that the `Content-Encoding` header may be removed an the
+  `Content-Length` modified to reflect the message size after removing the
+  encoding.
+* Added a more explicit error message when trying to use `form_params` and
+  `multipart` in the same request.
+* Several fixes for HHVM support.
+* Functions are now conditionally required using an additional level of
+  indirection to help with global Composer installations.
+
+## 6.0.1 - 2015-05-27
+
+* Fixed a bug with serializing the `query` request option where the `&`
+  separator was missing.
+* Added a better error message for when `body` is provided as an array. Please
+  use `form_params` or `multipart` instead.
+* Various doc fixes.
+
+## 6.0.0 - 2015-05-26
+
+* See the UPGRADING.md document for more information.
+* Added `multipart` and `form_params` request options.
+* Added `synchronous` request option.
+* Added the `on_headers` request option.
+* Fixed `expect` handling.
+* No longer adding default middlewares in the client ctor. These need to be
+  present on the provided handler in order to work.
+* Requests are no longer initiated when sending async requests with the
+  CurlMultiHandler. This prevents unexpected recursion from requests completing
+  while ticking the cURL loop.
+* Removed the semantics of setting `default` to `true`. This is no longer
+  required now that the cURL loop is not ticked for async requests.
+* Added request and response logging middleware.
+* No longer allowing self signed certificates when using the StreamHandler.
+* Ensuring that `sink` is valid if saving to a file.
+* Request exceptions now include a "handler context" which provides handler
+  specific contextual information.
+* Added `GuzzleHttp\RequestOptions` to allow request options to be applied
+  using constants.
+* `$maxHandles` has been removed from CurlMultiHandler.
+* `MultipartPostBody` is now part of the `guzzlehttp/psr7` package.
+
+## 5.3.0 - 2015-05-19
+
+* Mock now supports `save_to`
+* Marked `AbstractRequestEvent::getTransaction()` as public.
+* Fixed a bug in which multiple headers using different casing would overwrite
+  previous headers in the associative array.
+* Added `Utils::getDefaultHandler()`
+* Marked `GuzzleHttp\Client::getDefaultUserAgent` as deprecated.
+* URL scheme is now always lowercased.
+
+## 6.0.0-beta.1
+
+* Requires PHP >= 5.5
+* Updated to use PSR-7
+  * Requires immutable messages, which basically means an event based system
+    owned by a request instance is no longer possible.
+  * Utilizing the [Guzzle PSR-7 package](https://github.com/guzzle/psr7).
+  * Removed the dependency on `guzzlehttp/streams`. These stream abstractions
+    are available in the `guzzlehttp/psr7` package under the `GuzzleHttp\Psr7`
+    namespace.
+* Added middleware and handler system
+  * Replaced the Guzzle event and subscriber system with a middleware system.
+  * No longer depends on RingPHP, but rather places the HTTP handlers directly
+    in Guzzle, operating on PSR-7 messages.
+  * Retry logic is now encapsulated in `GuzzleHttp\Middleware::retry`, which
+    means the `guzzlehttp/retry-subscriber` is now obsolete.
+  * Mocking responses is now handled using `GuzzleHttp\Handler\MockHandler`.
+* Asynchronous responses
+  * No longer supports the `future` request option to send an async request.
+    Instead, use one of the `*Async` methods of a client (e.g., `requestAsync`,
+    `getAsync`, etc.).
+  * Utilizing `GuzzleHttp\Promise` instead of React's promise library to avoid
+    recursion required by chaining and forwarding react promises. See
+    https://github.com/guzzle/promises
+  * Added `requestAsync` and `sendAsync` to send request asynchronously.
+  * Added magic methods for `getAsync()`, `postAsync()`, etc. to send requests
+    asynchronously.
+* Request options
+  * POST and form updates
+    * Added the `form_fields` and `form_files` request options.
+    * Removed the `GuzzleHttp\Post` namespace.
+    * The `body` request option no longer accepts an array for POST requests.
+  * The `exceptions` request option has been deprecated in favor of the
+    `http_errors` request options.
+  * The `save_to` request option has been deprecated in favor of `sink` request
+    option.
+* Clients no longer accept an array of URI template string and variables for
+  URI variables. You will need to expand URI templates before passing them
+  into a client constructor or request method.
+* Client methods `get()`, `post()`, `put()`, `patch()`, `options()`, etc. are
+  now magic methods that will send synchronous requests.
+* Replaced `Utils.php` with plain functions in `functions.php`.
+* Removed `GuzzleHttp\Collection`.
+* Removed `GuzzleHttp\BatchResults`. Batched pool results are now returned as
+  an array.
+* Removed `GuzzleHttp\Query`. Query string handling is now handled using an
+  associative array passed into the `query` request option. The query string
+  is serialized using PHP's `http_build_query`. If you need more control, you
+  can pass the query string in as a string.
+* `GuzzleHttp\QueryParser` has been replaced with the
+  `GuzzleHttp\Psr7\parse_query`.
+
 ## 5.2.0 - 2015-01-27
 
 * Added `AppliesHeadersInterface` to make applying headers to a request based
diff --git a/core/vendor/guzzlehttp/guzzle/LICENSE b/core/vendor/guzzlehttp/guzzle/LICENSE
index 71d3b783c..9af9fba68 100644
--- a/core/vendor/guzzlehttp/guzzle/LICENSE
+++ b/core/vendor/guzzlehttp/guzzle/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2014 Michael Dowling, https://github.com/mtdowling <mtdowling@gmail.com>
+Copyright (c) 2011-2015 Michael Dowling, https://github.com/mtdowling <mtdowling@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/core/vendor/guzzlehttp/guzzle/Makefile b/core/vendor/guzzlehttp/guzzle/Makefile
deleted file mode 100644
index 69bf3273e..000000000
--- a/core/vendor/guzzlehttp/guzzle/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-all: clean coverage docs
-
-start-server:
-	cd vendor/guzzlehttp/ringphp && make start-server
-
-stop-server:
-	cd vendor/guzzlehttp/ringphp && make stop-server
-
-test: start-server
-	vendor/bin/phpunit
-	$(MAKE) stop-server
-
-coverage: start-server
-	vendor/bin/phpunit --coverage-html=artifacts/coverage
-	$(MAKE) stop-server
-
-view-coverage:
-	open artifacts/coverage/index.html
-
-clean:
-	rm -rf artifacts/*
-
-docs:
-	cd docs && make html && cd ..
-
-view-docs:
-	open docs/_build/html/index.html
-
-tag:
-	$(if $(TAG),,$(error TAG is not defined. Pass via "make tag TAG=4.2.1"))
-	@echo Tagging $(TAG)
-	chag update $(TAG)
-	sed -i '' -e "s/VERSION = '.*'/VERSION = '$(TAG)'/" src/ClientInterface.php
-	php -l src/ClientInterface.php
-	git add -A
-	git commit -m '$(TAG) release'
-	chag tag
-
-perf: start-server
-	php tests/perf.php
-	$(MAKE) stop-server
-
-package: burgomaster
-	php build/packager.php
-
-burgomaster:
-	mkdir -p build/artifacts
-	curl -s https://raw.githubusercontent.com/mtdowling/Burgomaster/0.0.2/src/Burgomaster.php > build/artifacts/Burgomaster.php
-
-.PHONY: docs burgomaster
diff --git a/core/vendor/guzzlehttp/guzzle/README.md b/core/vendor/guzzlehttp/guzzle/README.md
index 9df698115..c18c10b9e 100644
--- a/core/vendor/guzzlehttp/guzzle/README.md
+++ b/core/vendor/guzzlehttp/guzzle/README.md
@@ -1,25 +1,24 @@
-Guzzle, PHP HTTP client and webservice framework
-================================================
+Guzzle, PHP HTTP client
+=======================
 
-[![Build Status](https://secure.travis-ci.org/guzzle/guzzle.png?branch=master)](http://travis-ci.org/guzzle/guzzle)
+[![Build Status](https://secure.travis-ci.org/guzzle/guzzle.svg?branch=master)](http://travis-ci.org/guzzle/guzzle)
 
 Guzzle is a PHP HTTP client that makes it easy to send HTTP requests and
 trivial to integrate with web services.
 
-- Manages things like persistent connections, represents query strings as
-  collections, simplifies sending streaming POST requests with fields and
-  files, and abstracts away the underlying HTTP transport layer.
-- Can send both synchronous and asynchronous requests using the same interface
-  without requiring a dependency on a specific event loop.
-- Pluggable HTTP adapters allows Guzzle to integrate with any method you choose
-  for sending HTTP requests over the wire (e.g., cURL, sockets, PHP's stream
-  wrapper, non-blocking event loops like ReactPHP.
-- Guzzle makes it so that you no longer need to fool around with cURL options,
-  stream contexts, or sockets.
+- Simple interface for building query strings, POST requests, streaming large
+  uploads, streaming large downloads, using HTTP cookies, uploading JSON data,
+  etc...
+- Can send both synchronous and asynchronous requests using the same interface.
+- Uses PSR-7 interfaces for requests, responses, and streams. This allows you
+  to utilize other PSR-7 compatible libraries with Guzzle.
+- Abstracts away the underlying HTTP transport, allowing you to write
+  environment and transport agnostic code; i.e., no hard dependency on cURL,
+  PHP streams, sockets, or non-blocking event loops.
+- Middleware system allows you to augment and compose client behavior.
 
 ```php
 $client = new GuzzleHttp\Client();
-$response = $client->get('http://guzzlephp.org');
 $res = $client->get('https://api.github.com/user', ['auth' =>  ['user', 'pass']]);
 echo $res->getStatusCode();
 // "200"
@@ -27,22 +26,23 @@ echo $res->getHeader('content-type');
 // 'application/json; charset=utf8'
 echo $res->getBody();
 // {"type":"User"...'
-var_export($res->json());
-// Outputs the JSON decoded data
 
 // Send an asynchronous request.
-$req = $client->createRequest('GET', 'http://httpbin.org', ['future' => true]);
-$client->send($req)->then(function ($response) {
-    echo 'I completed! ' . $response;
+$request = new \GuzzleHttp\Psr7\Request('GET', 'http://httpbin.org');
+$promise = $client->sendAsync($request)->then(function ($response) {
+    echo 'I completed! ' . $response->getBody();
 });
+$promise->wait();
 ```
 
-Get more information and answers with the
-[Documentation](http://guzzlephp.org/),
-[Forums](https://groups.google.com/forum/?hl=en#!forum/guzzle),
-and [Gitter](https://gitter.im/guzzle/guzzle).
+## Help and docs
 
-### Installing via Composer
+- [Documentation](http://guzzlephp.org/)
+- [stackoverflow](http://stackoverflow.com/questions/tagged/guzzle)
+- [Gitter](https://gitter.im/guzzle/guzzle)
+
+
+## Installing Guzzle
 
 The recommended way to install Guzzle is through
 [Composer](http://getcomposer.org).
@@ -55,7 +55,7 @@ curl -sS https://getcomposer.org/installer | php
 Next, run the Composer command to install the latest stable version of Guzzle:
 
 ```bash
-composer require guzzlehttp/guzzle
+composer.phar require guzzlehttp/guzzle
 ```
 
 After installing, you need to require Composer's autoloader:
@@ -64,7 +64,25 @@ After installing, you need to require Composer's autoloader:
 require 'vendor/autoload.php';
 ```
 
-### Documentation
+You can then later update Guzzle using composer:
 
-More information can be found in the online documentation at
-http://guzzlephp.org/.
+ ```bash
+composer.phar update
+ ```
+
+
+## Version Guidance
+
+| Version | Status      | Packagist           | Namespace    | Repo                | Docs                | PSR-7 |
+|---------|-------------|---------------------|--------------|---------------------|---------------------|-------|
+| 3.x     | EOL         | `guzzle/guzzle`     | `Guzzle`     | [v3][guzzle-3-repo] | [v3][guzzle-3-docs] | No    |
+| 4.x     | EOL         | `guzzlehttp/guzzle` | `GuzzleHttp` | N/A                 | N/A                 | No    |
+| 5.x     | Maintained  | `guzzlehttp/guzzle` | `GuzzleHttp` | [v5][guzzle-5-repo] | [v5][guzzle-5-docs] | No    |
+| 6.x     | Latest      | `guzzlehttp/guzzle` | `GuzzleHttp` | [v6][guzzle-6-repo] | [v6][guzzle-6-docs] | Yes   |
+
+[guzzle-3-repo]: https://github.com/guzzle/guzzle3
+[guzzle-5-repo]: https://github.com/guzzle/guzzle/tree/5.3
+[guzzle-6-repo]: https://github.com/guzzle/guzzle
+[guzzle-3-docs]: http://guzzle3.readthedocs.org/en/latest/
+[guzzle-5-docs]: http://guzzle.readthedocs.org/en/5.3/
+[guzzle-6-docs]: http://guzzle.readthedocs.org/en/latest/
diff --git a/core/vendor/guzzlehttp/guzzle/UPGRADING.md b/core/vendor/guzzlehttp/guzzle/UPGRADING.md
index ee8c39dd4..0e86214da 100644
--- a/core/vendor/guzzlehttp/guzzle/UPGRADING.md
+++ b/core/vendor/guzzlehttp/guzzle/UPGRADING.md
@@ -1,12 +1,161 @@
 Guzzle Upgrade Guide
 ====================
 
+5.0 to 6.0
+----------
+
+Guzzle now uses [PSR-7](http://www.php-fig.org/psr/psr-7/) for HTTP messages.
+Due to the fact that these messages are immutable, this prompted a refactoring
+of Guzzle to use a middleware based system rather than an event system. Any
+HTTP message interaction (e.g., `GuzzleHttp\Message\Request`) need to be
+updated to work with the new immutable PSR-7 request and response objects. Any
+event listeners or subscribers need to be updated to become middleware
+functions that wrap handlers (or are injected into a
+`GuzzleHttp\HandlerStack`).
+
+- Removed `GuzzleHttp\BatchResults`
+- Removed `GuzzleHttp\Collection`
+- Removed `GuzzleHttp\HasDataTrait`
+- Removed `GuzzleHttp\ToArrayInterface`
+- The `guzzlehttp/streams` dependency has been removed. Stream functionality
+  is now present in the `GuzzleHttp\Psr7` namespace provided by the
+  `guzzlehttp/psr7` package.
+- Guzzle no longer uses ReactPHP promises and now uses the
+  `guzzlehttp/promises` library. We use a custom promise library for three
+  significant reasons:
+  1. React promises (at the time of writing this) are recursive. Promise
+     chaining and promise resolution will eventually blow the stack. Guzzle
+     promises are not recursive as they use a sort of trampolining technique.
+     Note: there has been movement in the React project to modify promises to
+     no longer utilize recursion.
+  2. Guzzle needs to have the ability to synchronously block on a promise to
+     wait for a result. Guzzle promises allows this functionality (and does
+     not require the use of recursion).
+  3. Because we need to be able to wait on a result, doing so using React
+     promises requires wrapping react promises with RingPHP futures. This
+     overhead is no longer needed, reducing stack sizes, reducing complexity,
+     and improving performance.
+- `GuzzleHttp\Mimetypes` has been moved to a function in
+  `GuzzleHttp\Psr7\mimetype_from_extension` and
+  `GuzzleHttp\Psr7\mimetype_from_filename`.
+- `GuzzleHttp\Query` and `GuzzleHttp\QueryParser` have been removed. Query
+  strings must now be passed into request objects as strings, or provided to
+  the `query` request option when creating requests with clients. The `query`
+  option uses PHP's `http_build_query` to convert an array to a string. If you
+  need a different serialization technique, you will need to pass the query
+  string in as a string. There are a couple helper functions that will make
+  working with query strings easier: `GuzzleHttp\Psr7\parse_query` and
+  `GuzzleHttp\Psr7\build_query`.
+- Guzzle no longer has a dependency on RingPHP. Due to the use of a middleware
+  system based on PSR-7, using RingPHP and it's middleware system as well adds
+  more complexity than the benefits it provides. All HTTP handlers that were
+  present in RingPHP have been modified to work directly with PSR-7 messages
+  and placed in the `GuzzleHttp\Handler` namespace. This significantly reduces
+  complexity in Guzzle, removes a dependency, and improves performance. RingPHP
+  will be maintained for Guzzle 5 support, but will no longer be a part of
+  Guzzle 6.
+- As Guzzle now uses a middleware based systems the event system and RingPHP
+  integration has been removed. Note: while the event system has been removed,
+  it is possible to add your own type of event system that is powered by the
+  middleware system.
+  - Removed the `Event` namespace.
+  - Removed the `Subscriber` namespace.
+  - Removed `Transaction` class
+  - Removed `RequestFsm`
+  - Removed `RingBridge`
+  - `GuzzleHttp\Subscriber\Cookie` is now provided by
+    `GuzzleHttp\Middleware::cookies`
+  - `GuzzleHttp\Subscriber\HttpError` is now provided by
+    `GuzzleHttp\Middleware::httpError`
+  - `GuzzleHttp\Subscriber\History` is now provided by
+    `GuzzleHttp\Middleware::history`
+  - `GuzzleHttp\Subscriber\Mock` is now provided by
+    `GuzzleHttp\Handler\MockHandler`
+  - `GuzzleHttp\Subscriber\Prepare` is now provided by
+    `GuzzleHttp\PrepareBodyMiddleware`
+  - `GuzzleHttp\Subscriber\Redirect` is now provided by
+    `GuzzleHttp\RedirectMiddleware`
+- Guzzle now uses `Psr\Http\Message\UriInterface` (implements in
+  `GuzzleHttp\Psr7\Uri`) for URI support. `GuzzleHttp\Url` is now gone.
+- Static functions in `GuzzleHttp\Utils` have been moved to namespaced
+  functions under the `GuzzleHttp` namespace. This requires either a Composer
+  based autoloader or you to include functions.php.
+- `GuzzleHttp\ClientInterface::getDefaultOption` has been renamed to
+  `GuzzleHttp\ClientInterface::getConfig`.
+- `GuzzleHttp\ClientInterface::setDefaultOption` has been removed.
+
+## Migrating to middleware
+
+The change to PSR-7 unfortunately required significant refactoring to Guzzle
+due to the fact that PSR-7 messages are immutable. Guzzle 5 relied on an event
+system from plugins. The event system relied on mutability of HTTP messages and
+side effects in order to work. With immutable messages, you have to change your
+workflow to become more about either returning a value (e.g., functional
+middlewares) or setting a value on an object. Guzzle v6 has chosen the
+functional middleware approach.
+
+Instead of using the event system to listen for things like the `before` event,
+you now create a stack based middleware function that intercepts a request on
+the way in and the promise of the response on the way out. This is a much
+simpler and more predictable approach than the event system and works nicely
+with PSR-7 middleware. Due to the use of promises, the middleware system is
+also asynchronous.
+
+v5:
+
+```php
+use GuzzleHttp\Event\BeforeEvent;
+$client = new GuzzleHttp\Client();
+// Get the emitter and listen to the before event.
+$client->getEmitter()->on('before', function (BeforeEvent $e) {
+    // Guzzle v5 events relied on mutation
+    $e->getRequest()->setHeader('X-Foo', 'Bar');
+});
+```
+
+v6:
+
+In v6, you can modify the request before it is sent using the `mapRequest`
+middleware. The idiomatic way in v6 to modify the request/response lifecycle is
+to setup a handler middleware stack up front and inject the handler into a
+client.
+
+```php
+use GuzzleHttp\Middleware;
+// Create a handler stack that has all of the default middlewares attached
+$handler = GuzzleHttp\HandlerStack::create();
+// Push the handler onto the handler stack
+$handler->push(Middleware::mapRequest(function (RequestInterface $request) {
+    // Notice that we have to return a request object
+    return $request->withHeader('X-Foo', 'Bar');
+});
+// Inject the handler into the client
+$client = new GuzzleHttp\Client(['handler' => $handler]);
+```
+
+## POST Requests
+
+This version added the [`form_params`](http://guzzle.readthedocs.org/en/latest/request-options.html#form_params)
+and `multipart` request options. `form_params` is an associative array of
+strings or array of strings and is used to serialize an
+`application/x-www-form-urlencoded` POST request. The
+[`multipart`](http://guzzle.readthedocs.org/en/latest/request-options.html#multipart)
+option is now used to send a multipart/form-data POST request.
+
+`GuzzleHttp\Post\PostFile` has been removed. Use the `multipart` option to add
+POST files to a multipart/form-data request.
+
+The `body` option no longer accepts an array to send POST requests. Please use
+`multipart` or `form_params` instead.
+
+The `base_url` option has been renamed to `base_uri`.
+
 4.x to 5.0
 ----------
 
 ## Rewritten Adapter Layer
 
-Guzzle now uses `RingPHP <http://ringphp.readthedocs.org/en/latest/>`_ to send
+Guzzle now uses [RingPHP](http://ringphp.readthedocs.org/en/latest) to send
 HTTP requests. The `adapter` option in a `GuzzleHttp\Client` constructor
 is still supported, but it has now been renamed to `handler`. Instead of
 passing a `GuzzleHttp\Adapter\AdapterInterface`, you must now pass a PHP
@@ -14,7 +163,7 @@ passing a `GuzzleHttp\Adapter\AdapterInterface`, you must now pass a PHP
 
 ## Removed Fluent Interfaces
 
-`Fluent interfaces were removed <http://ocramius.github.io/blog/fluent-interfaces-are-evil/>`_
+[Fluent interfaces were removed](http://ocramius.github.io/blog/fluent-interfaces-are-evil)
 from the following classes:
 
 - `GuzzleHttp\Collection`
@@ -35,7 +184,7 @@ functions can be used as replacements.
   deprecated in favor of using `GuzzleHttp\Pool::batch()`.
 
 The "procedural" global client has been removed with no replacement (e.g.,
-`GuzzleHttp\get()`, `GuzzleHttp\post()`, etc.). Use a `GuzzleHttl\Client`
+`GuzzleHttp\get()`, `GuzzleHttp\post()`, etc.). Use a `GuzzleHttp\Client`
 object as a replacement.
 
 ## `throwImmediately` has been removed
diff --git a/core/vendor/guzzlehttp/guzzle/build/packager.php b/core/vendor/guzzlehttp/guzzle/build/packager.php
deleted file mode 100644
index 724bf6349..000000000
--- a/core/vendor/guzzlehttp/guzzle/build/packager.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-require __DIR__ . '/artifacts/Burgomaster.php';
-
-$stageDirectory = __DIR__ . '/artifacts/staging';
-$projectRoot = __DIR__ . '/../';
-$packager = new \Burgomaster($stageDirectory, $projectRoot);
-
-// Copy basic files to the stage directory. Note that we have chdir'd onto
-// the $projectRoot directory, so use relative paths.
-foreach (['README.md', 'LICENSE'] as $file) {
-    $packager->deepCopy($file, $file);
-}
-
-// Copy each dependency to the staging directory. Copy *.php and *.pem files.
-$packager->recursiveCopy('src', 'GuzzleHttp', ['php']);
-$packager->recursiveCopy('vendor/react/promise/src', 'React/Promise');
-$packager->recursiveCopy('vendor/guzzlehttp/ringphp/src', 'GuzzleHttp/Ring');
-$packager->recursiveCopy('vendor/guzzlehttp/streams/src', 'GuzzleHttp/Stream');
-$packager->createAutoloader(['React/Promise/functions.php']);
-$packager->createPhar(__DIR__ . '/artifacts/guzzle.phar');
-$packager->createZip(__DIR__ . '/artifacts/guzzle.zip');
diff --git a/core/vendor/guzzlehttp/guzzle/composer.json b/core/vendor/guzzlehttp/guzzle/composer.json
index e9615a01e..35ccb8a3d 100644
--- a/core/vendor/guzzlehttp/guzzle/composer.json
+++ b/core/vendor/guzzlehttp/guzzle/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "guzzlehttp/guzzle",
     "type": "library",
-    "description": "Guzzle is a PHP HTTP client library and framework for building RESTful web service clients",
+    "description": "Guzzle is a PHP HTTP client library",
     "keywords": ["framework", "http", "rest", "web service", "curl", "client", "HTTP client"],
     "homepage": "http://guzzlephp.org/",
     "license": "MIT",
@@ -13,15 +13,17 @@
         }
     ],
     "require": {
-        "php": ">=5.4.0",
-        "guzzlehttp/ringphp": "~1.0"
+        "php": ">=5.5.0",
+        "guzzlehttp/psr7": "~1.1",
+        "guzzlehttp/promises": "~1.0"
     },
     "require-dev": {
         "ext-curl": "*",
-        "psr/log": "~1.0",
-        "phpunit/phpunit": "~4.0"
+        "phpunit/phpunit": "~4.0",
+        "psr/log": "~1.0"
     },
     "autoload": {
+        "files": ["src/functions_include.php"],
         "psr-4": {
             "GuzzleHttp\\": "src/"
         }
@@ -33,7 +35,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.0-dev"
+            "dev-master": "6.0-dev"
         }
     }
 }
diff --git a/core/vendor/guzzlehttp/guzzle/docs/Makefile b/core/vendor/guzzlehttp/guzzle/docs/Makefile
deleted file mode 100644
index d92e03f95..000000000
--- a/core/vendor/guzzlehttp/guzzle/docs/Makefile
+++ /dev/null
@@ -1,153 +0,0 @@
-# Makefile for Sphinx documentation
-#
-
-# You can set these variables from the command line.
-SPHINXOPTS    =
-SPHINXBUILD   = sphinx-build
-PAPER         =
-BUILDDIR      = _build
-
-# Internal variables.
-PAPEROPT_a4     = -D latex_paper_size=a4
-PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
-# the i18n builder cannot share the environment and doctrees with the others
-I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
-
-.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
-
-help:
-	@echo "Please use \`make <target>' where <target> is one of"
-	@echo "  html       to make standalone HTML files"
-	@echo "  dirhtml    to make HTML files named index.html in directories"
-	@echo "  singlehtml to make a single large HTML file"
-	@echo "  pickle     to make pickle files"
-	@echo "  json       to make JSON files"
-	@echo "  htmlhelp   to make HTML files and a HTML help project"
-	@echo "  qthelp     to make HTML files and a qthelp project"
-	@echo "  devhelp    to make HTML files and a Devhelp project"
-	@echo "  epub       to make an epub"
-	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
-	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
-	@echo "  text       to make text files"
-	@echo "  man        to make manual pages"
-	@echo "  texinfo    to make Texinfo files"
-	@echo "  info       to make Texinfo files and run them through makeinfo"
-	@echo "  gettext    to make PO message catalogs"
-	@echo "  changes    to make an overview of all changed/added/deprecated items"
-	@echo "  linkcheck  to check all external links for integrity"
-	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
-
-clean:
-	-rm -rf $(BUILDDIR)/*
-
-html:
-	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
-
-dirhtml:
-	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
-
-singlehtml:
-	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
-	@echo
-	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
-
-pickle:
-	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
-	@echo
-	@echo "Build finished; now you can process the pickle files."
-
-json:
-	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
-	@echo
-	@echo "Build finished; now you can process the JSON files."
-
-htmlhelp:
-	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
-	@echo
-	@echo "Build finished; now you can run HTML Help Workshop with the" \
-	      ".hhp project file in $(BUILDDIR)/htmlhelp."
-
-qthelp:
-	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
-	@echo
-	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
-	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/Guzzle.qhcp"
-	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/Guzzle.qhc"
-
-devhelp:
-	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
-	@echo
-	@echo "Build finished."
-	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/Guzzle"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/Guzzle"
-	@echo "# devhelp"
-
-epub:
-	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
-	@echo
-	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
-
-latex:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo
-	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
-	@echo "Run \`make' in that directory to run these through (pdf)latex" \
-	      "(use \`make latexpdf' here to do that automatically)."
-
-latexpdf:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo "Running LaTeX files through pdflatex..."
-	$(MAKE) -C $(BUILDDIR)/latex all-pdf
-	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
-
-text:
-	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
-	@echo
-	@echo "Build finished. The text files are in $(BUILDDIR)/text."
-
-man:
-	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
-	@echo
-	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
-
-texinfo:
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo
-	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
-	@echo "Run \`make' in that directory to run these through makeinfo" \
-	      "(use \`make info' here to do that automatically)."
-
-info:
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo "Running Texinfo files through makeinfo..."
-	make -C $(BUILDDIR)/texinfo info
-	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
-
-gettext:
-	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
-	@echo
-	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
-
-changes:
-	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
-	@echo
-	@echo "The overview file is in $(BUILDDIR)/changes."
-
-linkcheck:
-	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
-	@echo
-	@echo "Link check complete; look for any errors in the above output " \
-	      "or in $(BUILDDIR)/linkcheck/output.txt."
-
-doctest:
-	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
-	@echo "Testing of doctests in the sources finished, look at the " \
-	      "results in $(BUILDDIR)/doctest/output.txt."
diff --git a/core/vendor/guzzlehttp/guzzle/docs/_static/guzzle-icon.png b/core/vendor/guzzlehttp/guzzle/docs/_static/guzzle-icon.png
deleted file mode 100644
index f1017f7e6..000000000
Binary files a/core/vendor/guzzlehttp/guzzle/docs/_static/guzzle-icon.png and /dev/null differ
diff --git a/core/vendor/guzzlehttp/guzzle/docs/_static/logo.png b/core/vendor/guzzlehttp/guzzle/docs/_static/logo.png
deleted file mode 100644
index 965a4ef41..000000000
Binary files a/core/vendor/guzzlehttp/guzzle/docs/_static/logo.png and /dev/null differ
diff --git a/core/vendor/guzzlehttp/guzzle/docs/_templates/nav_links.html b/core/vendor/guzzlehttp/guzzle/docs/_templates/nav_links.html
deleted file mode 100644
index 7950a0f8e..000000000
--- a/core/vendor/guzzlehttp/guzzle/docs/_templates/nav_links.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<li><a href="https://github.com/guzzle/guzzle">GitHub</a></li>
-<li><a href="https://groups.google.com/forum/?hl=en#!forum/guzzle">Forum</a></li>
-<li><a href="irc:irc.freenode.com/#guzzlephp">IRC</a></li>
diff --git a/core/vendor/guzzlehttp/guzzle/docs/clients.rst b/core/vendor/guzzlehttp/guzzle/docs/clients.rst
deleted file mode 100644
index 0614a25ed..000000000
--- a/core/vendor/guzzlehttp/guzzle/docs/clients.rst
+++ /dev/null
@@ -1,1315 +0,0 @@
-=======
-Clients
-=======
-
-Clients are used to create requests, create transactions, send requests
-through an HTTP handler, and return a response. You can add default request
-options to a client that are applied to every request (e.g., default headers,
-default query string parameters, etc.), and you can add event listeners and
-subscribers to every request created by a client.
-
-Creating a client
-=================
-
-The constructor of a client accepts an associative array of configuration
-options.
-
-base_url
-    Configures a base URL for the client so that requests created
-    using a relative URL are combined with the ``base_url`` of the client
-    according to section `5.2 of RFC 3986 <http://tools.ietf.org/html/rfc3986#section-5.2>`_.
-
-    .. code-block:: php
-
-        // Create a client with a base URL
-        $client = new GuzzleHttp\Client(['base_url' => 'https://github.com']);
-        // Send a request to https://github.com/notifications
-        $response = $client->get('/notifications');
-
-    `Absolute URLs <http://tools.ietf.org/html/rfc3986#section-4.3>`_ sent
-    through a client will not use the base URL of the client.
-
-handler
-    Configures the `RingPHP handler <http://ringphp.readthedocs.org>`_
-    used to transfer the HTTP requests of a client. Guzzle will, by default,
-    utilize a stacked handlers that chooses the best handler to use based on the
-    provided request options and based on the extensions available in the
-    environment.
-
-message_factory
-    Specifies the factory used to create HTTP requests and responses
-    (``GuzzleHttp\Message\MessageFactoryInterface``).
-
-defaults
-    Associative array of :ref:`request-options` that are applied to every
-    request created by the client. This allows you to specify things like
-    default headers (e.g., User-Agent), default query string parameters, SSL
-    configurations, and any other supported request options.
-
-emitter
-    Specifies an event emitter (``GuzzleHttp\Event\EmitterInterface``) instance
-    to be used by the client to emit request events. This option is useful if
-    you need to inject an emitter with listeners/subscribers already attached.
-
-Here's an example of creating a client with various options.
-
-.. code-block:: php
-
-    use GuzzleHttp\Client;
-
-    $client = new Client([
-        'base_url' => ['https://api.twitter.com/{version}/', ['version' => 'v1.1']],
-        'defaults' => [
-            'headers' => ['Foo' => 'Bar'],
-            'query'   => ['testing' => '123'],
-            'auth'    => ['username', 'password'],
-            'proxy'   => 'tcp://localhost:80'
-        ]
-    ]);
-
-Sending Requests
-================
-
-Requests can be created using various methods of a client. You can create
-**and** send requests using one of the following methods:
-
-- ``GuzzleHttp\Client::get``: Sends a GET request.
-- ``GuzzleHttp\Client::head``: Sends a HEAD request
-- ``GuzzleHttp\Client::post``: Sends a POST request
-- ``GuzzleHttp\Client::put``: Sends a PUT request
-- ``GuzzleHttp\Client::delete``: Sends a DELETE request
-- ``GuzzleHttp\Client::options``: Sends an OPTIONS request
-
-Each of the above methods accepts a URL as the first argument and an optional
-associative array of :ref:`request-options` as the second argument.
-
-Synchronous Requests
---------------------
-
-Guzzle sends synchronous (blocking) requests when the ``future`` request option
-is not specified. This means that the request will complete immediately, and if
-an error is encountered, a ``GuzzleHttp\Exception\RequestException`` will be
-thrown.
-
-.. code-block:: php
-
-    $client = new GuzzleHttp\Client();
-
-    $client->put('http://httpbin.org', [
-        'headers'         => ['X-Foo' => 'Bar'],
-        'body'            => 'this is the body!',
-        'save_to'         => '/path/to/local/file',
-        'allow_redirects' => false,
-        'timeout'         => 5
-    ]);
-
-Synchronous Error Handling
-~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-When a recoverable error is encountered while calling the ``send()`` method of
-a client, a ``GuzzleHttp\Exception\RequestException`` is thrown.
-
-.. code-block:: php
-
-    use GuzzleHttp\Client;
-    use GuzzleHttp\Exception\RequestException;
-
-    $client = new Client();
-
-    try {
-        $client->get('http://httpbin.org');
-    } catch (RequestException $e) {
-        echo $e->getRequest() . "\n";
-        if ($e->hasResponse()) {
-            echo $e->getResponse() . "\n";
-        }
-    }
-
-``GuzzleHttp\Exception\RequestException`` always contains a
-``GuzzleHttp\Message\RequestInterface`` object that can be accessed using the
-exception's ``getRequest()`` method.
-
-A response might be present in the exception. In the event of a networking
-error, no response will be received. You can check if a ``RequestException``
-has a response using the ``hasResponse()`` method. If the exception has a
-response, then you can access the associated
-``GuzzleHttp\Message\ResponseInterface`` using the ``getResponse()`` method of
-the exception.
-
-Asynchronous Requests
----------------------
-
-You can send asynchronous requests by setting the ``future`` request option
-to ``true`` (or a string that your handler understands). This creates a
-``GuzzleHttp\Message\FutureResponse`` object that has not yet completed. Once
-you have a future response, you can use a promise object obtained by calling
-the ``then`` method of the response to take an action when the response has
-completed or encounters an error.
-
-.. code-block:: php
-
-    $response = $client->put('http://httpbin.org/get', ['future' => true]);
-
-    // Call the function when the response completes
-    $response->then(function ($response) {
-        echo $response->getStatusCode();
-    });
-
-You can call the ``wait()`` method of a future response to block until it has
-completed. You also use a future response object just like a normal response
-object by accessing the methods of the response. Using a future response like a
-normal response object, also known as *dereferencing*, will block until the
-response has completed.
-
-.. code-block:: php
-
-    $response = $client->put('http://httpbin.org/get', ['future' => true]);
-
-    // Block until the response has completed
-    echo $response->getStatusCode();
-
-.. important::
-
-    If an exception occurred while transferring the future response, then the
-    exception encountered will be thrown when dereferencing.
-
-.. note::
-
-    It depends on the RingPHP handler used by a client, but you typically need
-    to use the same RingPHP handler in order to utilize asynchronous requests
-    across multiple clients.
-
-Asynchronous Error Handling
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Handling errors with future response object promises is a bit different. When
-using a promise, exceptions are forwarded to the ``$onError`` function provided
-to the second argument of the ``then()`` function.
-
-.. code-block:: php
-
-    $response = $client->put('http://httpbin.org/get', ['future' => true]);
-
-    $response
-        ->then(
-            function ($response) {
-                // This is called when the request succeeded
-                echo 'Success: ' . $response->getStatusCode();
-                // Returning a value will forward the value to the next promise
-                // in the chain.
-                return $response;
-            },
-            function ($error) {
-                // This is called when the exception failed.
-                echo 'Exception: ' . $error->getMessage();
-                // Throwing will "forward" the exception to the next promise
-                // in the chain.
-                throw $error;
-            }
-        )
-        ->then(
-            function($response) {
-                // This is called after the first promise in the chain. It
-                // receives the value returned from the first promise.
-                echo $response->getReasonPhrase();
-            },
-            function ($error) {
-                // This is called if the first promise error handler in the
-                // chain rethrows the exception.
-                echo 'Error: ' . $error->getMessage();
-            }
-        );
-
-Please see the `React/Promises project documentation <https://github.com/reactphp/promise>`_
-for more information on how promise resolution and rejection forwarding works.
-
-HTTP Errors
------------
-
-If the ``exceptions`` request option is not set to ``false``, then exceptions
-are thrown for HTTP protocol errors as well:
-``GuzzleHttp\Exception\ClientErrorResponseException`` for 4xx level HTTP
-responses and ``GuzzleHttp\Exception\ServerException`` for 5xx level responses,
-both of which extend from ``GuzzleHttp\Exception\BadResponseException``.
-
-Creating Requests
------------------
-
-You can create a request without sending it. This is useful for building up
-requests over time or sending requests in concurrently.
-
-.. code-block:: php
-
-    $request = $client->createRequest('GET', 'http://httpbin.org', [
-        'headers' => ['X-Foo' => 'Bar']
-    ]);
-
-    // Modify the request as needed
-    $request->setHeader('Baz', 'bar');
-
-After creating a request, you can send it with the client's ``send()`` method.
-
-.. code-block:: php
-
-    $response = $client->send($request);
-
-Sending Requests With a Pool
-============================
-
-You can send requests concurrently using a fixed size pool via the
-``GuzzleHttp\Pool`` class. The Pool class is an implementation of
-``GuzzleHttp\Ring\Future\FutureInterface``, meaning it can be dereferenced at a
-later time or cancelled before sending. The Pool constructor accepts a client
-object, iterator or array that yields ``GuzzleHttp\Message\RequestInterface``
-objects, and an optional associative array of options that can be used to
-affect the transfer.
-
-.. code-block:: php
-
-    use GuzzleHttp\Pool;
-
-    $requests = [
-        $client->createRequest('GET', 'http://httpbin.org'),
-        $client->createRequest('DELETE', 'http://httpbin.org/delete'),
-        $client->createRequest('PUT', 'http://httpbin.org/put', ['body' => 'test'])
-    ];
-
-    $options = [];
-
-    // Create a pool. Note: the options array is optional.
-    $pool = new Pool($client, $requests, $options);
-
-    // Send the requests
-    $pool->wait();
-
-The Pool constructor accepts the following associative array of options:
-
-- **pool_size**: Integer representing the maximum number of requests that are
-  allowed to be sent concurrently.
-- **before**: Callable or array representing the event listeners to add to
-  each request's :ref:`before_event` event.
-- **complete**: Callable or array representing the event listeners to add to
-  each request's :ref:`complete_event` event.
-- **error**: Callable or array representing the event listeners to add to
-  each request's :ref:`error_event` event.
-- **end**: Callable or array representing the event listeners to add to
-  each request's :ref:`end_event` event.
-
-The "before", "complete", "error", and "end" event options accept a callable or
-an array of associative arrays where each associative array contains a "fn" key
-with a callable value, an optional "priority" key representing the event
-priority (with a default value of 0), and an optional "once" key that can be
-set to true so that the event listener will be removed from the request after
-it is first triggered.
-
-.. code-block:: php
-
-    use GuzzleHttp\Pool;
-    use GuzzleHttp\Event\CompleteEvent;
-
-    // Add a single event listener using a callable.
-    Pool::send($client, $requests, [
-        'complete' => function (CompleteEvent $event) {
-            echo 'Completed request to ' . $event->getRequest()->getUrl() . "\n";
-            echo 'Response: ' . $event->getResponse()->getBody() . "\n\n";
-        }
-    ]);
-
-    // The above is equivalent to the following, but the following structure
-    // allows you to add multiple event listeners to the same event name.
-    Pool::send($client, $requests, [
-        'complete' => [
-            [
-                'fn'       => function (CompleteEvent $event) { /* ... */ },
-                'priority' => 0,    // Optional
-                'once'     => false // Optional
-            ]
-        ]
-    ]);
-
-Asynchronous Response Handling
-------------------------------
-
-When sending requests concurrently using a pool, the request/response/error
-lifecycle must be handled asynchronously. This means that you give the Pool
-multiple requests and handle the response or errors that is associated with the
-request using event callbacks.
-
-.. code-block:: php
-
-    use GuzzleHttp\Pool;
-    use GuzzleHttp\Event\ErrorEvent;
-
-    Pool::send($client, $requests, [
-        'complete' => function (CompleteEvent $event) {
-            echo 'Completed request to ' . $event->getRequest()->getUrl() . "\n";
-            echo 'Response: ' . $event->getResponse()->getBody() . "\n\n";
-            // Do something with the completion of the request...
-        },
-        'error' => function (ErrorEvent $event) {
-            echo 'Request failed: ' . $event->getRequest()->getUrl() . "\n";
-            echo $event->getException();
-            // Do something to handle the error...
-        }
-    ]);
-
-The ``GuzzleHttp\Event\ErrorEvent`` event object is emitted when an error
-occurs during a transfer. With this event, you have access to the request that
-was sent, the response that was received (if one was received), access to
-transfer statistics, and the ability to intercept the exception with a
-different ``GuzzleHttp\Message\ResponseInterface`` object. See :doc:`events`
-for more information.
-
-Handling Errors After Transferring
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-It sometimes might be easier to handle all of the errors that occurred during a
-transfer after all of the requests have been sent. Here we are adding each
-failed request to an array that we can use to process errors later.
-
-.. code-block:: php
-
-    use GuzzleHttp\Pool;
-    use GuzzleHttp\Event\ErrorEvent;
-
-    $errors = [];
-    Pool::send($client, $requests, [
-        'error' => function (ErrorEvent $event) use (&$errors) {
-            $errors[] = $event;
-        }
-    ]);
-
-    foreach ($errors as $error) {
-        // Handle the error...
-    }
-
-.. _batch-requests:
-
-Batching Requests
------------------
-
-Sometimes you just want to send a few requests concurrently and then process
-the results all at once after they've been sent. Guzzle provides a convenience
-function ``GuzzleHttp\Pool::batch()`` that makes this very simple:
-
-.. code-block:: php
-
-    use GuzzleHttp\Pool;
-    use GuzzleHttp\Client;
-
-    $client = new Client();
-
-    $requests = [
-        $client->createRequest('GET', 'http://httpbin.org/get'),
-        $client->createRequest('HEAD', 'http://httpbin.org/get'),
-        $client->createRequest('PUT', 'http://httpbin.org/put'),
-    ];
-
-    // Results is a GuzzleHttp\BatchResults object.
-    $results = Pool::batch($client, $requests);
-
-    // Can be accessed by index.
-    echo $results[0]->getStatusCode();
-
-    // Can be accessed by request.
-    echo $results->getResult($requests[0])->getStatusCode();
-
-    // Retrieve all successful responses
-    foreach ($results->getSuccessful() as $response) {
-        echo $response->getStatusCode() . "\n";
-    }
-
-    // Retrieve all failures.
-    foreach ($results->getFailures() as $requestException) {
-        echo $requestException->getMessage() . "\n";
-    }
-
-``GuzzleHttp\Pool::batch()`` accepts an optional associative array of options
-in the third argument that allows you to specify the 'before', 'complete',
-'error', and 'end' events as well as specify the maximum number of requests to
-send concurrently using the 'pool_size' option key.
-
-.. _request-options:
-
-Request Options
-===============
-
-You can customize requests created by a client using **request options**.
-Request options control various aspects of a request including, headers,
-query string parameters, timeout settings, the body of a request, and much
-more.
-
-All of the following examples use the following client:
-
-.. code-block:: php
-
-    $client = new GuzzleHttp\Client(['base_url' => 'http://httpbin.org']);
-
-headers
--------
-
-:Summary: Associative array of headers to add to the request. Each key is the
-    name of a header, and each value is a string or array of strings
-    representing the header field values.
-:Types: array
-:Defaults: None
-
-.. code-block:: php
-
-    // Set various headers on a request
-    $client->get('/get', [
-        'headers' => [
-            'User-Agent' => 'testing/1.0',
-            'Accept'     => 'application/json',
-            'X-Foo'      => ['Bar', 'Baz']
-        ]
-    ]);
-
-body
-----
-
-:Summary: The ``body`` option is used to control the body of an entity
-    enclosing request (e.g., PUT, POST, PATCH).
-:Types:
-    - string
-    - ``fopen()`` resource
-    - ``GuzzleHttp\Stream\StreamInterface``
-    - ``GuzzleHttp\Post\PostBodyInterface``
-:Default: None
-
-This setting can be set to any of the following types:
-
-- string
-
-  .. code-block:: php
-
-      // You can send requests that use a string as the message body.
-      $client->put('/put', ['body' => 'foo']);
-
-- resource returned from ``fopen()``
-
-  .. code-block:: php
-
-      // You can send requests that use a stream resource as the body.
-      $resource = fopen('http://httpbin.org', 'r');
-      $client->put('/put', ['body' => $resource]);
-
-- Array
-
-  Use an array to send POST style requests that use a
-  ``GuzzleHttp\Post\PostBodyInterface`` object as the body.
-
-  .. code-block:: php
-
-      // You can send requests that use a POST body containing fields & files.
-      $client->post('/post', [
-          'body' => [
-              'field' => 'abc',
-              'other_field' => '123',
-              'file_name' => fopen('/path/to/file', 'r')
-          ]
-      ]);
-
-- ``GuzzleHttp\Stream\StreamInterface``
-
-  .. code-block:: php
-
-      // You can send requests that use a Guzzle stream object as the body
-      $stream = GuzzleHttp\Stream\Stream::factory('contents...');
-      $client->post('/post', ['body' => $stream]);
-
-json
-----
-
-:Summary: The ``json`` option is used to easily upload JSON encoded data as the
-    body of a request. A Content-Type header of ``application/json`` will be
-    added if no Content-Type header is already present on the message.
-:Types:
-    Any PHP type that can be operated on by PHP's ``json_encode()`` function.
-:Default: None
-
-.. code-block:: php
-
-    $request = $client->createRequest('PUT', '/put', ['json' => ['foo' => 'bar']]);
-    echo $request->getHeader('Content-Type');
-    // application/json
-    echo $request->getBody();
-    // {"foo":"bar"}
-
-.. note::
-
-    This request option does not support customizing the Content-Type header
-    or any of the options from PHP's `json_encode() <http://www.php.net/manual/en/function.json-encode.php>`_
-    function. If you need to customize these settings, then you must pass the
-    JSON encoded data into the request yourself using the ``body`` request
-    option and you must specify the correct Content-Type header using the
-    ``headers`` request option.
-
-query
------
-
-:Summary: Associative array of query string values to add to the request.
-:Types:
-    - array
-    - ``GuzzleHttp\Query``
-:Default: None
-
-.. code-block:: php
-
-    // Send a GET request to /get?foo=bar
-    $client->get('/get', ['query' => ['foo' => 'bar']]);
-
-Query strings specified in the ``query`` option are combined with any query
-string values that are parsed from the URL.
-
-.. code-block:: php
-
-    // Send a GET request to /get?abc=123&foo=bar
-    $client->get('/get?abc=123', ['query' => ['foo' => 'bar']]);
-
-auth
-----
-
-:Summary: Pass an array of HTTP authentication parameters to use with the
-    request. The array must contain the username in index [0], the password in
-    index [1], and you can optionally provide a built-in authentication type in
-    index [2]. Pass ``null`` to disable authentication for a request.
-:Types:
-    - array
-    - string
-    - null
-:Default: None
-
-The built-in authentication types are as follows:
-
-basic
-    Use `basic HTTP authentication <http://www.ietf.org/rfc/rfc2069.txt>`_ in
-    the ``Authorization`` header (the default setting used if none is
-    specified).
-
-    .. code-block:: php
-
-        $client->get('/get', ['auth' => ['username', 'password']]);
-
-digest
-    Use `digest authentication <http://www.ietf.org/rfc/rfc2069.txt>`_ (must be
-    supported by the HTTP handler).
-
-    .. code-block:: php
-
-        $client->get('/get', ['auth' => ['username', 'password', 'digest']]);
-
-    *This is currently only supported when using the cURL handler, but creating
-    a replacement that can be used with any HTTP handler is planned.*
-
-.. important::
-
-    The authentication type (whether it's provided as a string or as the third
-    option in an array) is always converted to a lowercase string. Take this
-    into account when implementing custom authentication types and when
-    implementing custom message factories.
-
-Custom Authentication Schemes
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-You can also provide a string representing a custom authentication type name.
-When using a custom authentication type string, you will need to implement
-the authentication method in an event listener that checks the ``auth`` request
-option of a request before it is sent. Authentication listeners that require
-a request is not modified after they are signed should have a very low priority
-to ensure that they are fired last or near last in the event chain.
-
-.. code-block:: php
-
-    use GuzzleHttp\Event\BeforeEvent;
-    use GuzzleHttp\Event\RequestEvents;
-
-    /**
-     * Custom authentication listener that handles the "foo" auth type.
-     *
-     * Listens to the "before" event of a request and only modifies the request
-     * when the "auth" config setting of the request is "foo".
-     */
-    class FooAuth implements GuzzleHttp\Event\SubscriberInterface
-    {
-        private $password;
-
-        public function __construct($password)
-        {
-            $this->password = $password;
-        }
-
-        public function getEvents()
-        {
-            return ['before' => ['sign', RequestEvents::SIGN_REQUEST]];
-        }
-
-        public function sign(BeforeEvent $e)
-        {
-            if ($e->getRequest()->getConfig()['auth'] == 'foo') {
-                $e->getRequest()->setHeader('X-Foo', 'Foo ' . $this->password);
-            }
-        }
-    }
-
-    $client->getEmitter()->attach(new FooAuth('password'));
-    $client->get('/', ['auth' => 'foo']);
-
-Adapter Specific Authentication Schemes
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-If you need to use authentication methods provided by cURL (e.g., NTLM, GSS,
-etc.), then you need to specify a curl handler option in the ``options``
-request option array. See :ref:`config-option` for more information.
-
-.. _cookies-option:
-
-cookies
--------
-
-:Summary: Specifies whether or not cookies are used in a request or what cookie
-    jar to use or what cookies to send.
-:Types:
-    - bool
-    - array
-    - ``GuzzleHttp\Cookie\CookieJarInterface``
-:Default: None
-
-Set to ``true`` to use a shared cookie session associated with the client.
-
-.. code-block:: php
-
-    // Enable cookies using the shared cookie jar of the client.
-    $client->get('/get', ['cookies' => true]);
-
-Pass an associative array containing cookies to send in the request and start a
-new cookie session.
-
-.. code-block:: php
-
-    // Enable cookies and send specific cookies
-    $client->get('/get', ['cookies' => ['foo' => 'bar']]);
-
-Set to a ``GuzzleHttp\Cookie\CookieJarInterface`` object to use an existing
-cookie jar.
-
-.. code-block:: php
-
-    $jar = new GuzzleHttp\Cookie\CookieJar();
-    $client->get('/get', ['cookies' => $jar]);
-
-.. _allow_redirects-option:
-
-allow_redirects
----------------
-
-:Summary: Describes the redirect behavior of a request
-:Types:
-    - bool
-    - array
-:Default:
-    ::
-
-        [
-            'max'       => 5,
-            'strict'    => false,
-            'referer'   => true,
-            'protocols' => ['http', 'https']
-        ]
-
-Set to ``false`` to disable redirects.
-
-.. code-block:: php
-
-    $res = $client->get('/redirect/3', ['allow_redirects' => false]);
-    echo $res->getStatusCode();
-    // 302
-
-Set to ``true`` (the default setting) to enable normal redirects with a maximum
-number of 5 redirects.
-
-.. code-block:: php
-
-    $res = $client->get('/redirect/3');
-    echo $res->getStatusCode();
-    // 200
-
-Pass an associative array containing the 'max' key to specify the maximum
-number of redirects, provide a 'strict' key value to specify whether or not to
-use strict RFC compliant redirects (meaning redirect POST requests with POST
-requests vs. doing what most browsers do which is redirect POST requests with
-GET requests), provide a 'referer' key to specify whether or not the "Referer"
-header should be added when redirecting, and provide a 'protocols' array that
-specifies which protocols are supported for redirects (defaults to
-``['http', 'https']``).
-
-.. code-block:: php
-
-    $res = $client->get('/redirect/3', [
-        'allow_redirects' => [
-            'max'       => 10,       // allow at most 10 redirects.
-            'strict'    => true,     // use "strict" RFC compliant redirects.
-            'referer'   => true,     // add a Referer header
-            'protocols' => ['https'] // only allow https URLs
-        ]
-    ]);
-    echo $res->getStatusCode();
-    // 200
-
-decode_content
---------------
-
-:Summary: Specify whether or not ``Content-Encoding`` responses (gzip,
-    deflate, etc.) are automatically decoded.
-:Types:
-    - string
-    - bool
-:Default: ``true``
-
-This option can be used to control how content-encoded response bodies are
-handled. By default, ``decode_content`` is set to true, meaning any gzipped
-or deflated response will be decoded by Guzzle.
-
-When set to ``false``, the body of a response is never decoded, meaning the
-bytes pass through the handler unchanged.
-
-.. code-block:: php
-
-    // Request gzipped data, but do not decode it while downloading
-    $client->get('/foo.js', [
-        'headers'        => ['Accept-Encoding' => 'gzip'],
-        'decode_content' => false
-    ]);
-
-When set to a string, the bytes of a response are decoded and the string value
-provided to the ``decode_content`` option is passed as the ``Accept-Encoding``
-header of the request.
-
-.. code-block:: php
-
-    // Pass "gzip" as the Accept-Encoding header.
-    $client->get('/foo.js', ['decode_content' => 'gzip']);
-
-.. _save_to-option:
-
-save_to
--------
-
-:Summary: Specify where the body of a response will be saved.
-:Types:
-    - string
-    - ``fopen()`` resource
-    - ``GuzzleHttp\Stream\StreamInterface``
-:Default: PHP temp stream
-
-Pass a string to specify the path to a file that will store the contents of the
-response body:
-
-.. code-block:: php
-
-    $client->get('/stream/20', ['save_to' => '/path/to/file']);
-
-Pass a resource returned from ``fopen()`` to write the response to a PHP stream:
-
-.. code-block:: php
-
-    $resource = fopen('/path/to/file', 'w');
-    $client->get('/stream/20', ['save_to' => $resource]);
-
-Pass a ``GuzzleHttp\Stream\StreamInterface`` object to stream the response body
-to an open Guzzle stream:
-
-.. code-block:: php
-
-    $resource = fopen('/path/to/file', 'w');
-    $stream = GuzzleHttp\Stream\Stream::factory($resource);
-    $client->get('/stream/20', ['save_to' => $stream]);
-
-.. _events-option:
-
-events
-------
-
-:Summary: An associative array mapping event names to a callable. Or an
-    associative array containing the 'fn' key that maps to a callable, an
-    optional 'priority' key used to specify the event priority, and an optional
-    'once' key used to specify if the event should remove itself the first time
-    it is triggered.
-:Types: array
-:Default: None
-
-.. code-block:: php
-
-    use GuzzleHttp\Event\BeforeEvent;
-    use GuzzleHttp\Event\HeadersEvent;
-    use GuzzleHttp\Event\CompleteEvent;
-    use GuzzleHttp\Event\ErrorEvent;
-
-    $client->get('/', [
-        'events' => [
-            'before' => function (BeforeEvent $e) { echo 'Before'; },
-            'complete' => function (CompleteEvent $e) { echo 'Complete'; },
-            'error' => function (ErrorEvent $e) { echo 'Error'; },
-        ]
-    ]);
-
-Here's an example of using the associative array format for control over the
-priority and whether or not an event should be triggered more than once.
-
-.. code-block:: php
-
-    $client->get('/', [
-        'events' => [
-            'before' => [
-                'fn'       => function (BeforeEvent $e) { echo 'Before'; },
-                'priority' => 100,
-                'once'     => true
-            ]
-        ]
-    ]);
-
-.. _subscribers-option:
-
-subscribers
------------
-
-:Summary: Array of event subscribers to add to the request. Each value in the
-    array must be an instance of ``GuzzleHttp\Event\SubscriberInterface``.
-:Types: array
-:Default: None
-
-.. code-block:: php
-
-    use GuzzleHttp\Subscriber\History;
-    use GuzzleHttp\Subscriber\Mock;
-    use GuzzleHttp\Message\Response;
-
-    $history = new History();
-    $mock = new Mock([new Response(200)]);
-    $client->get('/', ['subscribers' => [$history, $mock]]);
-
-    echo $history;
-    // Outputs the request and response history
-
-.. _exceptions-option:
-
-exceptions
-----------
-
-:Summary: Set to ``false`` to disable throwing exceptions on an HTTP protocol
-    errors (i.e., 4xx and 5xx responses). Exceptions are thrown by default when
-    HTTP protocol errors are encountered.
-:Types: bool
-:Default: ``true``
-
-.. code-block:: php
-
-    $client->get('/status/500');
-    // Throws a GuzzleHttp\Exception\ServerException
-
-    $res = $client->get('/status/500', ['exceptions' => false]);
-    echo $res->getStatusCode();
-    // 500
-
-.. _timeout-option:
-
-timeout
--------
-
-:Summary: Float describing the timeout of the request in seconds. Use ``0``
-    to wait indefinitely (the default behavior).
-:Types: float
-:Default: ``0``
-
-.. code-block:: php
-
-    // Timeout if a server does not return a response in 3.14 seconds.
-    $client->get('/delay/5', ['timeout' => 3.14]);
-    // PHP Fatal error:  Uncaught exception 'GuzzleHttp\Exception\RequestException'
-
-.. _connect_timeout-option:
-
-connect_timeout
----------------
-
-:Summary: Float describing the number of seconds to wait while trying to connect
-    to a server. Use ``0`` to wait indefinitely (the default behavior).
-:Types: float
-:Default: ``0``
-
-.. code-block:: php
-
-    // Timeout if the client fails to connect to the server in 3.14 seconds.
-    $client->get('/delay/5', ['connect_timeout' => 3.14]);
-
-.. note::
-
-    This setting must be supported by the HTTP handler used to send a request.
-    ``connect_timeout`` is currently only supported by the built-in cURL
-    handler.
-
-.. _verify-option:
-
-verify
-------
-
-:Summary: Describes the SSL certificate verification behavior of a request.
-
-    - Set to ``true`` to enable SSL certificate verification and use the default
-      CA bundle provided by operating system.
-    - Set to ``false`` to disable certificate verification (this is insecure!).
-    - Set to a string to provide the path to a CA bundle to enable verification
-      using a custom certificate.
-:Types:
-    - bool
-    - string
-:Default: ``true``
-
-.. code-block:: php
-
-    // Use the system's CA bundle (this is the default setting)
-    $client->get('/', ['verify' => true]);
-
-    // Use a custom SSL certificate on disk.
-    $client->get('/', ['verify' => '/path/to/cert.pem']);
-
-    // Disable validation entirely (don't do this!).
-    $client->get('/', ['verify' => false]);
-
-Not all system's have a known CA bundle on disk. For example, Windows and
-OS X do not have a single common location for CA bundles. When setting
-"verify" to ``true``, Guzzle will do its best to find the most appropriate
-CA bundle on your system. When using cURL or the PHP stream wrapper on PHP
-versions >= 5.6, this happens by default. When using the PHP stream
-wrapper on versions < 5.6, Guzzle tries to find your CA bundle in the
-following order:
-
-1. Check if ``openssl.cafile`` is set in your php.ini file.
-2. Check if ``curl.cainfo`` is set in your php.ini file.
-3. Check if ``/etc/pki/tls/certs/ca-bundle.crt`` exists (Red Hat, CentOS,
-   Fedora; provided by the ca-certificates package)
-4. Check if ``/etc/ssl/certs/ca-certificates.crt`` exists (Ubuntu, Debian;
-   provided by the ca-certificates package)
-5. Check if ``/usr/local/share/certs/ca-root-nss.crt`` exists (FreeBSD;
-   provided by the ca_root_nss package)
-6. Check if ``/usr/local/etc/openssl/cert.pem`` (OS X; provided by homebrew)
-7. Check if ``C:\windows\system32\curl-ca-bundle.crt`` exists (Windows)
-8. Check if ``C:\windows\curl-ca-bundle.crt`` exists (Windows)
-
-The result of this lookup is cached in memory so that subsequent calls
-in the same process will return very quickly. However, when sending only
-a single request per-process in something like Apache, you should consider
-setting the ``openssl.cafile`` environment variable to the path on disk
-to the file so that this entire process is skipped.
-
-If you do not need a specific certificate bundle, then Mozilla provides a
-commonly used CA bundle which can be downloaded
-`here <https://raw.githubusercontent.com/bagder/ca-bundle/master/ca-bundle.crt>`_
-(provided by the maintainer of cURL). Once you have a CA bundle available on
-disk, you can set the "openssl.cafile" PHP ini setting to point to the path to
-the file, allowing you to omit the "verify" request option. Much more detail on
-SSL certificates can be found on the
-`cURL website <http://curl.haxx.se/docs/sslcerts.html>`_.
-
-.. _cert-option:
-
-cert
-----
-
-:Summary: Set to a string to specify the path to a file containing a PEM
-    formatted client side certificate. If a password is required, then set to
-    an array containing the path to the PEM file in the first array element
-    followed by the password required for the certificate in the second array
-    element.
-:Types:
-    - string
-    - array
-:Default: None
-
-.. code-block:: php
-
-    $client->get('/', ['cert' => ['/path/server.pem', 'password']]);
-
-.. _ssl_key-option:
-
-ssl_key
--------
-
-:Summary: Specify the path to a file containing a private SSL key in PEM
-    format. If a password is required, then set to an array containing the path
-    to the SSL key in the first array element followed by the password required
-    for the certificate in the second element.
-:Types:
-    - string
-    - array
-:Default: None
-
-.. note::
-
-    ``ssl_key`` is implemented by HTTP handlers. This is currently only
-    supported by the cURL handler, but might be supported by other third-part
-    handlers.
-
-.. _proxy-option:
-
-proxy
------
-
-:Summary: Pass a string to specify an HTTP proxy, or an array to specify
-    different proxies for different protocols.
-:Types:
-    - string
-    - array
-:Default: None
-
-Pass a string to specify a proxy for all protocols.
-
-.. code-block:: php
-
-    $client->get('/', ['proxy' => 'tcp://localhost:8125']);
-
-Pass an associative array to specify HTTP proxies for specific URI schemes
-(i.e., "http", "https").
-
-.. code-block:: php
-
-    $client->get('/', [
-        'proxy' => [
-            'http'  => 'tcp://localhost:8125', // Use this proxy with "http"
-            'https' => 'tcp://localhost:9124'  // Use this proxy with "https"
-        ]
-    ]);
-
-.. note::
-
-    You can provide proxy URLs that contain a scheme, username, and password.
-    For example, ``"http://username:password@192.168.16.1:10"``.
-
-.. _debug-option:
-
-debug
------
-
-:Summary: Set to ``true`` or set to a PHP stream returned by ``fopen()`` to
-    enable debug output with the handler used to send a request. For example,
-    when using cURL to transfer requests, cURL's verbose of ``CURLOPT_VERBOSE``
-    will be emitted. When using the PHP stream wrapper, stream wrapper
-    notifications will be emitted. If set to true, the output is written to
-    PHP's STDOUT. If a PHP stream is provided, output is written to the stream.
-:Types:
-    - bool
-    - ``fopen()`` resource
-:Default: None
-
-.. code-block:: php
-
-    $client->get('/get', ['debug' => true]);
-
-Running the above example would output something like the following:
-
-::
-
-    * About to connect() to httpbin.org port 80 (#0)
-    *   Trying 107.21.213.98... * Connected to httpbin.org (107.21.213.98) port 80 (#0)
-    > GET /get HTTP/1.1
-    Host: httpbin.org
-    User-Agent: Guzzle/4.0 curl/7.21.4 PHP/5.5.7
-
-    < HTTP/1.1 200 OK
-    < Access-Control-Allow-Origin: *
-    < Content-Type: application/json
-    < Date: Sun, 16 Feb 2014 06:50:09 GMT
-    < Server: gunicorn/0.17.4
-    < Content-Length: 335
-    < Connection: keep-alive
-    <
-    * Connection #0 to host httpbin.org left intact
-
-.. _stream-option:
-
-stream
-------
-
-:Summary: Set to ``true`` to stream a response rather than download it all
-    up-front.
-:Types: bool
-:Default: ``false``
-
-.. code-block:: php
-
-    $response = $client->get('/stream/20', ['stream' => true]);
-    // Read bytes off of the stream until the end of the stream is reached
-    $body = $response->getBody();
-    while (!$body->eof()) {
-        echo $body->read(1024);
-    }
-
-.. note::
-
-    Streaming response support must be implemented by the HTTP handler used by
-    a client. This option might not be supported by every HTTP handler, but the
-    interface of the response object remains the same regardless of whether or
-    not it is supported by the handler.
-
-.. _expect-option:
-
-expect
-------
-
-:Summary: Controls the behavior of the "Expect: 100-Continue" header.
-:Types:
-    - bool
-    - integer
-:Default: ``1048576``
-
-Set to ``true`` to enable the "Expect: 100-Continue" header for all requests
-that sends a body. Set to ``false`` to disable the "Expect: 100-Continue"
-header for all requests. Set to a number so that the size of the payload must
-be greater than the number in order to send the Expect header. Setting to a
-number will send the Expect header for all requests in which the size of the
-payload cannot be determined or where the body is not rewindable.
-
-By default, Guzzle will add the "Expect: 100-Continue" header when the size of
-the body of a request is greater than 1 MB and a request is using HTTP/1.1.
-
-.. note::
-
-    This option only takes effect when using HTTP/1.1. The HTTP/1.0 and
-    HTTP/2.0 protocols do not support the "Expect: 100-Continue" header.
-    Support for handling the "Expect: 100-Continue" workflow must be
-    implemented by Guzzle HTTP handlers used by a client.
-
-.. _version-option:
-
-version
--------
-
-:Summary: Protocol version to use with the request.
-:Types: string, float
-:Default: ``1.1``
-
-.. code-block:: php
-
-    // Force HTTP/1.0
-    $request = $client->createRequest('GET', '/get', ['version' => 1.0]);
-    echo $request->getProtocolVersion();
-    // 1.0
-
-.. _config-option:
-
-config
-------
-
-:Summary: Associative array of config options that are forwarded to a request's
-    configuration collection. These values are used as configuration options
-    that can be consumed by plugins and handlers.
-:Types: array
-:Default: None
-
-.. code-block:: php
-
-    $request = $client->createRequest('GET', '/get', ['config' => ['foo' => 'bar']]);
-    echo $request->getConfig('foo');
-    // 'bar'
-
-Some HTTP handlers allow you to specify custom handler-specific settings. For
-example, you can pass custom cURL options to requests by passing an associative
-array in the ``config`` request option under the ``curl`` key.
-
-.. code-block:: php
-
-    // Use custom cURL options with the request. This example uses NTLM auth
-    // to authenticate with a server.
-    $client->get('/', [
-        'config' => [
-            'curl' => [
-                CURLOPT_HTTPAUTH => CURLAUTH_NTLM,
-                CURLOPT_USERPWD  => 'username:password'
-            ]
-        ]
-    ]);
-
-future
-------
-
-:Summary: Specifies whether or not a response SHOULD be an instance of a
-    ``GuzzleHttp\Message\FutureResponse`` object.
-:Types:
-        - bool
-        - string
-:Default: ``false``
-
-By default, Guzzle requests should be synchronous. You can create asynchronous
-future responses by passing the ``future`` request option as ``true``. The
-response will only be executed when it is used like a normal response, the
-``wait()`` method of the response is called, or the corresponding handler that
-created the response is destructing and there are futures that have not been
-resolved.
-
-.. important::
-
-    This option only has an effect if your handler can create and return future
-    responses. However, even if a response is completed synchronously, Guzzle
-    will ensure that a FutureResponse object is returned for API consistency.
-
-.. code-block:: php
-
-    $response = $client->get('/foo', ['future' => true])
-        ->then(function ($response) {
-            echo 'I got a response! ' . $response;
-        });
-
-Event Subscribers
-=================
-
-Requests emit lifecycle events when they are transferred. A client object has a
-``GuzzleHttp\Common\EventEmitter`` object that can be used to add event
-*listeners* and event *subscribers* to all requests created by the client.
-
-.. important::
-
-    **Every** event listener or subscriber added to a client will be added to
-    every request created by the client.
-
-.. code-block:: php
-
-    use GuzzleHttp\Client;
-    use GuzzleHttp\Event\BeforeEvent;
-
-    $client = new Client();
-
-    // Add a listener that will echo out requests before they are sent
-    $client->getEmitter()->on('before', function (BeforeEvent $e) {
-        echo 'About to send request: ' . $e->getRequest();
-    });
-
-    $client->get('http://httpbin.org/get');
-    // Outputs the request as a string because of the event
-
-See :doc:`events` for more information on the event system used in Guzzle.
-
-Environment Variables
-=====================
-
-Guzzle exposes a few environment variables that can be used to customize the
-behavior of the library.
-
-``GUZZLE_CURL_SELECT_TIMEOUT``
-    Controls the duration in seconds that a curl_multi_* handler will use when
-    selecting on curl handles using ``curl_multi_select()``. Some systems
-    have issues with PHP's implementation of ``curl_multi_select()`` where
-    calling this function always results in waiting for the maximum duration of
-    the timeout.
-``HTTP_PROXY``
-    Defines the proxy to use when sending requests using the "http" protocol.
-``HTTPS_PROXY``
-    Defines the proxy to use when sending requests using the "https" protocol.
-
-Relevant ini Settings
----------------------
-
-Guzzle can utilize PHP ini settings when configuring clients.
-
-``openssl.cafile``
-    Specifies the path on disk to a CA file in PEM format to use when sending
-    requests over "https". See: https://wiki.php.net/rfc/tls-peer-verification#phpini_defaults
diff --git a/core/vendor/guzzlehttp/guzzle/docs/conf.py b/core/vendor/guzzlehttp/guzzle/docs/conf.py
deleted file mode 100644
index 917bdf4ca..000000000
--- a/core/vendor/guzzlehttp/guzzle/docs/conf.py
+++ /dev/null
@@ -1,28 +0,0 @@
-import sys, os
-from sphinx.highlighting import lexers
-from pygments.lexers.web import PhpLexer
-
-
-lexers['php'] = PhpLexer(startinline=True, linenos=1)
-lexers['php-annotations'] = PhpLexer(startinline=True, linenos=1)
-primary_domain = 'php'
-
-extensions = []
-templates_path = ['_templates']
-source_suffix = '.rst'
-master_doc = 'index'
-project = u'Guzzle'
-copyright = u'2014, Michael Dowling'
-version = '5.0.0'
-html_title = "Guzzle Documentation"
-html_short_title = "Guzzle"
-
-exclude_patterns = ['_build']
-html_static_path = ['_static']
-
-on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
-
-if not on_rtd:  # only import and set the theme if we're building docs locally
-    import sphinx_rtd_theme
-    html_theme = 'sphinx_rtd_theme'
-    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
diff --git a/core/vendor/guzzlehttp/guzzle/docs/events.rst b/core/vendor/guzzlehttp/guzzle/docs/events.rst
deleted file mode 100644
index 647dcd0f1..000000000
--- a/core/vendor/guzzlehttp/guzzle/docs/events.rst
+++ /dev/null
@@ -1,520 +0,0 @@
-============
-Event System
-============
-
-Guzzle uses an event emitter to allow you to easily extend the behavior of a
-request, change the response associated with a request, and implement custom
-error handling. All events in Guzzle are managed and emitted by an
-**event emitter**.
-
-Event Emitters
-==============
-
-Clients, requests, and any other class that implements the
-``GuzzleHttp\Event\HasEmitterInterface`` interface have a
-``GuzzleHttp\Event\Emitter`` object. You can add event *listeners* and
-event *subscribers* to an event *emitter*.
-
-emitter
-    An object that implements ``GuzzleHttp\Event\EmitterInterface``. This
-    object emits named events to event listeners. You may register event
-    listeners on subscribers on an emitter.
-
-event listeners
-    Callable functions that are registered on an event emitter for specific
-    events. Event listeners are registered on an emitter with a *priority*
-    setting. If no priority is provided, ``0`` is used by default.
-
-event subscribers
-    Classes that tell an event emitter what methods to listen to and what
-    functions on the class to invoke when the event is triggered. Event
-    subscribers subscribe event listeners to an event emitter. They should be
-    used when creating more complex event based logic in applications (i.e.,
-    cookie handling is implemented using an event subscriber because it's
-    easier to share a subscriber than an anonymous function and because
-    handling cookies is a complex process).
-
-priority
-    Describes the order in which event listeners are invoked when an event is
-    emitted. The higher a priority value, the earlier the event listener will
-    be invoked (a higher priority means the listener is more important). If
-    no priority is provided, the priority is assumed to be ``0``.
-
-    When specifying an event priority, you can pass ``"first"`` or ``"last"`` to
-    dynamically specify the priority based on the current event priorities
-    associated with the given event name in the emitter. Use ``"first"`` to set
-    the priority to the current highest priority plus one. Use ``"last"`` to
-    set the priority to the current lowest event priority minus one. It is
-    important to remember that these dynamic priorities are calculated only at
-    the point of insertion into the emitter and they are not rearranged after
-    subsequent listeners are added to an emitter.
-
-propagation
-    Describes whether or not other event listeners are triggered. Event
-    emitters will trigger every event listener registered to a specific event
-    in priority order until all of the listeners have been triggered **or**
-    until the propagation of an event is stopped.
-
-Getting an EventEmitter
------------------------
-
-You can get the event emitter of ``GuzzleHttp\Event\HasEmitterInterface``
-object using the the ``getEmitter()`` method. Here's an example of getting a
-client object's event emitter.
-
-.. code-block:: php
-
-    $client = new GuzzleHttp\Client();
-    $emitter = $client->getEmitter();
-
-.. note::
-
-    You'll notice that the event emitter used in Guzzle is very similar to the
-    `Symfony2 EventDispatcher component <https://github.com/symfony/symfony/tree/master/src/Symfony/Component/EventDispatcher>`_.
-    This is because the Guzzle event system is based on the Symfony2 event
-    system with several changes. Guzzle uses its own event emitter to improve
-    performance, isolate Guzzle from changes to the Symfony, and provide a few
-    improvements that make it easier to use for an HTTP client (e.g., the
-    addition of the ``once()`` method).
-
-Adding Event Listeners
-----------------------
-
-After you have the emitter, you can register event listeners that listen to
-specific events using the ``on()`` method. When registering an event listener,
-you must tell the emitter what event to listen to (e.g., "before", "after",
-"progress", "complete", "error", etc.), what callable to invoke when the
-event is triggered, and optionally provide a priority.
-
-.. code-block:: php
-
-    use GuzzleHttp\Event\BeforeEvent;
-
-    $emitter->on('before', function (BeforeEvent $event) {
-        echo $event->getRequest();
-    });
-
-When a listener is triggered, it is passed an event that implements the
-``GuzzleHttp\Event\EventInterface`` interface, the name of the event, and the
-event emitter itself. The above example could more verbosely be written as
-follows:
-
-.. code-block:: php
-
-    use GuzzleHttp\Event\BeforeEvent;
-
-    $emitter->on('before', function (
-        BeforeEvent $event,
-        $name,
-        EmitterInterface $emitter
-    ) {
-        echo $event->getRequest();
-    });
-
-You can add an event listener that automatically removes itself after it is
-triggered using the ``once()`` method of an event emitter.
-
-.. code-block:: php
-
-    $client = new GuzzleHttp\Client();
-    $client->getEmitter()->once('before', function () {
-        echo 'This will only happen once... per request!';
-    });
-
-Event Propagation
------------------
-
-Event listeners can prevent other event listeners from being triggered by
-stopping an event's propagation.
-
-Stopping event propagation can be useful, for example, if an event listener has
-changed the state of the subject to such an extent that allowing subsequent
-event listeners to be triggered could place the subject in an inconsistent
-state. This technique is used in Guzzle extensively when intercepting error
-events with responses.
-
-You can stop the propagation of an event using the ``stopPropagation()`` method
-of a ``GuzzleHttp\Event\EventInterface`` object:
-
-.. code-block:: php
-
-    use GuzzleHttp\Event\ErrorEvent;
-
-    $emitter->on('error', function (ErrorEvent $event) {
-        $event->stopPropagation();
-    });
-
-After stopping the propagation of an event, any subsequent event listeners that
-have not yet been triggered will not be triggered. You can check to see if the
-propagation of an event was stopped using the ``isPropagationStopped()`` method
-of the event.
-
-.. code-block:: php
-
-    $client = new GuzzleHttp\Client();
-    $emitter = $client->getEmitter();
-    // Note: assume that the $errorEvent was created
-    if ($emitter->emit('error', $errorEvent)->isPropagationStopped()) {
-        echo 'It was stopped!';
-    }
-
-.. hint::
-
-    When emitting events, the event that was emitted is returned from the
-    emitter. This allows you to easily chain calls as shown in the above
-    example.
-
-Event Subscribers
------------------
-
-Event subscribers are classes that implement the
-``GuzzleHttp\Event\SubscriberInterface`` object. They are used to register
-one or more event listeners to methods of the class. Event subscribers tell
-event emitters exactly which events to listen to and what method to invoke on
-the class when the event is triggered by called the ``getEvents()`` method of
-a subscriber.
-
-The following example registers event listeners to the ``before`` and
-``complete`` event of a request. When the ``before`` event is emitted, the
-``onBefore`` instance method of the subscriber is invoked. When the
-``complete`` event is emitted, the ``onComplete`` event of the subscriber is
-invoked. Each array value in the ``getEvents()`` return value MUST
-contain the name of the method to invoke and can optionally contain the
-priority of the listener (as shown in the ``before`` listener in the example).
-
-.. code-block:: php
-
-    use GuzzleHttp\Event\EmitterInterface;
-    use GuzzleHttp\Event\SubscriberInterface;
-    use GuzzleHttp\Event\BeforeEvent;
-    use GuzzleHttp\Event\CompleteEvent;
-
-    class SimpleSubscriber implements SubscriberInterface
-    {
-        public function getEvents()
-        {
-            return [
-                // Provide name and optional priority
-                'before'   => ['onBefore', 100],
-                'complete' => ['onComplete'],
-                // You can pass a list of listeners with different priorities
-                'error'    => [['beforeError', 'first'], ['afterError', 'last']]
-            ];
-        }
-
-        public function onBefore(BeforeEvent $event, $name)
-        {
-            echo 'Before!';
-        }
-
-        public function onComplete(CompleteEvent $event, $name)
-        {
-            echo 'Complete!';
-        }
-    }
-
-To register the listeners the subscriber needs to be attached to the emitter:
-
-.. code-block:: php
-
-    $client = new GuzzleHttp\Client();
-    $emitter = $client->getEmitter();
-    $subscriber = new SimpleSubscriber();
-    $emitter->attach($subscriber);
-
-    //to remove the listeners
-    $emitter->detach($subscriber);
-
-.. note::
-
-    You can specify event priorities using integers or ``"first"`` and
-    ``"last"`` to dynamically determine the priority.
-
-Event Priorities
-================
-
-When adding event listeners or subscribers, you can provide an optional event
-priority. This priority is used to determine how early or late a listener is
-triggered. Specifying the correct priority is an important aspect of ensuring
-a listener behaves as expected. For example, if you wanted to ensure that
-cookies associated with a redirect were added to a cookie jar, you'd need to
-make sure that the listener that collects the cookies is triggered before the
-listener that performs the redirect.
-
-In order to help make the process of determining the correct event priority of
-a listener easier, Guzzle provides several pre-determined named event
-priorities. These priorities are exposed as constants on the
-``GuzzleHttp\Event\RequestEvents`` object.
-
-last
-    Use ``"last"`` as an event priority to set the priority to the current
-    lowest event priority minus one.
-
-first
-    Use ``"first"`` as an event priority to set the priority to the current
-    highest priority plus one.
-
-``GuzzleHttp\Event\RequestEvents::EARLY``
-    Used when you want a listener to be triggered as early as possible in the
-    event chain.
-
-``GuzzleHttp\Event\RequestEvents::LATE``
-    Used when you want a listener to be to be triggered as late as possible in
-    the event chain.
-
-``GuzzleHttp\Event\RequestEvents::PREPARE_REQUEST``
-    Used when you want a listener to be trigger while a request is being
-    prepared during the ``before`` event. This event priority is used by the
-    ``GuzzleHttp\Subscriber\Prepare`` event subscriber which is responsible for
-    guessing a Content-Type, Content-Length, and Expect header of a request.
-    You should subscribe after this event is triggered if you want to ensure
-    that this subscriber has already been triggered.
-
-``GuzzleHttp\Event\RequestEvents::SIGN_REQUEST``
-    Used when you want a listener to be triggered when a request is about to be
-    signed. Any listener triggered at this point should expect that the request
-    object will no longer be mutated. If you are implementing a custom
-    signature subscriber, then you should use this event priority to sign
-    requests.
-
-``GuzzleHttp\Event\RequestEvents::VERIFY_RESPONSE``
-    Used when you want a listener to be triggered when a response is being
-    validated during the ``complete`` event. The
-    ``GuzzleHttp\Subscriber\HttpError`` event subscriber uses this event
-    priority to check if an exception should be thrown due to a 4xx or 5xx
-    level response status code. If you are doing any kind of verification of a
-    response during the complete event, it should happen at this priority.
-
-``GuzzleHttp\Event\RequestEvents::REDIRECT_RESPONSE``
-    Used when you want a listener to be triggered when a response is being
-    redirected during the ``complete`` event. The
-    ``GuzzleHttp\Subscriber\Redirect`` event subscriber uses this event
-    priority when performing redirects.
-
-You can use the above event priorities as a guideline for determining the
-priority of you event listeners. You can use these constants and add to or
-subtract from them to ensure that a listener happens before or after the named
-priority.
-
-.. note::
-
-    "first" and "last" priorities are not adjusted after they added to an
-    emitter. For example, if you add a listener with a priority of "first",
-    you can still add subsequent listeners with a higher priority which would
-    be triggered before the listener added with a priority of "first".
-
-Working With Request Events
-===========================
-
-Requests emit lifecycle events when they are transferred.
-
-.. important::
-
-    Excluding the ``end`` event, request lifecycle events may be triggered
-    multiple times due to redirects, retries, or reusing a request multiple
-    times. Use the ``once()`` method want the event to be triggered once. You
-    can also remove an event listener from an emitter by using the emitter which
-    is provided to the listener.
-
-.. _before_event:
-
-before
-------
-
-The ``before`` event is emitted before a request is sent. The event emitted is
-a ``GuzzleHttp\Event\BeforeEvent``.
-
-.. code-block:: php
-
-    use GuzzleHttp\Client;
-    use GuzzleHttp\Event\EmitterInterface;
-    use GuzzleHttp\Event\BeforeEvent;
-
-    $client = new Client(['base_url' => 'http://httpbin.org']);
-    $request = $client->createRequest('GET', '/');
-    $request->getEmitter()->on(
-        'before',
-        function (BeforeEvent $e, $name, EmitterInterface $emitter) {
-            echo $name . "\n";
-            // "before"
-            echo $e->getRequest()->getMethod() . "\n";
-            // "GET" / "POST" / "PUT" / etc.
-            echo get_class($e->getClient());
-            // "GuzzleHttp\Client"
-        }
-    );
-
-You can intercept a request with a response before the request is sent over the
-wire. The ``intercept()`` method of the ``BeforeEvent`` accepts a
-``GuzzleHttp\Message\ResponseInterface``. Intercepting the event will prevent
-the request from being sent over the wire and stops the propagation of the
-``before`` event, preventing subsequent event listeners from being invoked.
-
-.. code-block:: php
-
-    use GuzzleHttp\Client;
-    use GuzzleHttp\Event\BeforeEvent;
-    use GuzzleHttp\Message\Response;
-
-    $client = new Client(['base_url' => 'http://httpbin.org']);
-    $request = $client->createRequest('GET', '/status/500');
-    $request->getEmitter()->on('before', function (BeforeEvent $e) {
-        $response = new Response(200);
-        $e->intercept($response);
-    });
-
-    $response = $client->send($request);
-    echo $response->getStatusCode();
-    // 200
-
-.. attention::
-
-    Any exception encountered while executing the ``before`` event will trigger
-    the ``error`` event of a request.
-
-.. _complete_event:
-
-complete
---------
-
-The ``complete`` event is emitted after a transaction completes and an entire
-response has been received. The event is a ``GuzzleHttp\Event\CompleteEvent``.
-
-You can intercept the ``complete`` event with a different response if needed
-using the ``intercept()`` method of the event. This can be useful, for example,
-for changing the response for caching.
-
-.. code-block:: php
-
-    use GuzzleHttp\Client;
-    use GuzzleHttp\Event\CompleteEvent;
-    use GuzzleHttp\Message\Response;
-
-    $client = new Client(['base_url' => 'http://httpbin.org']);
-    $request = $client->createRequest('GET', '/status/302');
-    $cachedResponse = new Response(200);
-
-    $request->getEmitter()->on(
-        'complete',
-        function (CompleteEvent $e) use ($cachedResponse) {
-            if ($e->getResponse()->getStatusCode() == 302) {
-                // Intercept the original transaction with the new response
-                $e->intercept($cachedResponse);
-            }
-        }
-    );
-
-    $response = $client->send($request);
-    echo $response->getStatusCode();
-    // 200
-
-.. attention::
-
-    Any ``GuzzleHttp\Exception\RequestException`` encountered while executing
-    the ``complete`` event will trigger the ``error`` event of a request.
-
-.. _error_event:
-
-error
------
-
-The ``error`` event is emitted when a request fails (whether it's from a
-networking error or an HTTP protocol error). The event emitted is a
-``GuzzleHttp\Event\ErrorEvent``.
-
-This event is useful for retrying failed requests. Here's an example of
-retrying failed basic auth requests by re-sending the original request with
-a username and password.
-
-.. code-block:: php
-
-    use GuzzleHttp\Client;
-    use GuzzleHttp\Event\ErrorEvent;
-
-    $client = new Client(['base_url' => 'http://httpbin.org']);
-    $request = $client->createRequest('GET', '/basic-auth/foo/bar');
-    $request->getEmitter()->on('error', function (ErrorEvent $e) {
-        if ($e->getResponse()->getStatusCode() == 401) {
-            // Add authentication stuff as needed and retry the request
-            $e->getRequest()->setHeader('Authorization', 'Basic ' . base64_encode('foo:bar'));
-            // Get the client of the event and retry the request
-            $newResponse = $e->getClient()->send($e->getRequest());
-            // Intercept the original transaction with the new response
-            $e->intercept($newResponse);
-        }
-    });
-
-.. attention::
-
-    If an ``error`` event is intercepted with a response, then the ``complete``
-    event of a request is triggered. If the ``complete`` event fails, then the
-    ``error`` event is triggered once again.
-
-.. _progress_event:
-
-progress
---------
-
-The ``progress`` event is emitted when data is uploaded or downloaded. The
-event emitted is a ``GuzzleHttp\Event\ProgressEvent``.
-
-You can access the emitted progress values using the corresponding public
-properties of the event object:
-
-- ``$downloadSize``: The number of bytes that will be downloaded (if known)
-- ``$downloaded``: The number of bytes that have been downloaded
-- ``$uploadSize``: The number of bytes that will be uploaded (if known)
-- ``$uploaded``: The number of bytes that have been uploaded
-
-This event cannot be intercepted.
-
-.. code-block:: php
-
-    use GuzzleHttp\Client;
-    use GuzzleHttp\Event\ProgressEvent;
-
-    $client = new Client(['base_url' => 'http://httpbin.org']);
-    $request = $client->createRequest('PUT', '/put', [
-        'body' => str_repeat('.', 100000)
-    ]);
-
-    $request->getEmitter()->on('progress', function (ProgressEvent $e) {
-        echo 'Downloaded ' . $e->downloaded . ' of ' . $e->downloadSize . ' '
-            . 'Uploaded ' . $e->uploaded . ' of ' . $e->uploadSize . "\r";
-    });
-
-    $client->send($request);
-    echo "\n";
-
-.. _end_event:
-
-end
----
-
-The ``end`` event is a terminal event, emitted once per request, that provides
-access to the response that was received or the exception that was encountered.
-The event emitted is a ``GuzzleHttp\Event\EndEvent``.
-
-This event can be intercepted, but keep in mind that the ``complete`` event
-will not fire after intercepting this event.
-
-.. code-block:: php
-
-    use GuzzleHttp\Client;
-    use GuzzleHttp\Event\EndEvent;
-
-    $client = new Client(['base_url' => 'http://httpbin.org']);
-    $request = $client->createRequest('PUT', '/put', [
-        'body' => str_repeat('.', 100000)
-    ]);
-
-    $request->getEmitter()->on('end', function (EndEvent $e) {
-        if ($e->getException()) {
-            echo 'Error: ' . $e->getException()->getMessage();
-        } else {
-            echo 'Response: ' . $e->getResponse();
-        }
-    });
-
-    $client->send($request);
-    echo "\n";
diff --git a/core/vendor/guzzlehttp/guzzle/docs/faq.rst b/core/vendor/guzzlehttp/guzzle/docs/faq.rst
deleted file mode 100644
index a8e9ad060..000000000
--- a/core/vendor/guzzlehttp/guzzle/docs/faq.rst
+++ /dev/null
@@ -1,199 +0,0 @@
-===
-FAQ
-===
-
-Why should I use Guzzle?
-========================
-
-Guzzle makes it easy to send HTTP requests and super simple to integrate with
-web services. Guzzle manages things like persistent connections, represents
-query strings as collections, makes it simple to send streaming POST requests
-with fields and files, and abstracts away the underlying HTTP transport layer.
-By providing an object oriented interface for HTTP clients, requests, responses,
-headers, and message bodies, Guzzle makes it so that you no longer need to fool
-around with cURL options, stream contexts, or sockets.
-
-**Asynchronous and Synchronous Requests**
-
-Guzzle allows you to send both asynchronous and synchronous requests using the
-same interface and no direct dependency on an event loop. This flexibility
-allows Guzzle to send an HTTP request using the most appropriate HTTP handler
-based on the request being sent. For example, when sending synchronous
-requests, Guzzle will by default send requests using cURL easy handles to
-ensure you're using the fastest possible method for serially transferring HTTP
-requests. When sending asynchronous requests, Guzzle might use cURL's multi
-interface or any other asynchronous handler you configure. When you request
-streaming data, Guzzle will by default use PHP's stream wrapper.
-
-**Streams**
-
-Request and response message bodies use :doc:`Guzzle Streams <streams>`,
-allowing you to stream data without needing to load it all into memory.
-Guzzle's stream layer provides a large suite of functionality:
-
-- You can modify streams at runtime using custom or a number of
-  pre-made decorators.
-- You can emit progress events as data is read from a stream.
-- You can validate the integrity of a stream using a rolling hash as data is
-  read from a stream.
-
-**Event System and Plugins**
-
-Guzzle's  event system allows you to completely modify the behavior of a client
-or request at runtime to cater them for any API. You can send a request with a
-client, and the client can do things like automatically retry your request if
-it fails, automatically redirect, log HTTP messages that are sent over the
-wire, emit progress events as data is uploaded and downloaded, sign requests
-using OAuth 1.0, verify the integrity of messages before and after they are
-sent over the wire, and anything else you might need.
-
-**Testable**
-
-Another important aspect of Guzzle is that it's really
-:doc:`easy to test clients <testing>`. You can mock HTTP responses and when
-testing an handler implementation, Guzzle provides a mock node.js web server.
-
-**Ecosystem**
-
-Guzzle has a large `ecosystem of plugins <http://guzzle.readthedocs.org/en/latest/index.html#http-components>`_,
-including `service descriptions <https://github.com/guzzle/guzzle-services>`_
-which allows you to abstract web services using service descriptions. These
-service descriptions define how to serialize an HTTP request and how to parse
-an HTTP response into a more meaningful model object.
-
-- `Guzzle Command <https://github.com/guzzle/command>`_: Provides the building
-  blocks for service description abstraction.
-- `Guzzle Services <https://github.com/guzzle/guzzle-services>`_: Provides an
-  implementation of "Guzzle Command" that utilizes Guzzle's service description
-  format.
-
-Does Guzzle require cURL?
-=========================
-
-No. Guzzle can use any HTTP handler to send requests. This means that Guzzle
-can be used with cURL, PHP's stream wrapper, sockets, and non-blocking libraries
-like `React <http://reactphp.org/>`_. You just need to configure a
-`RingPHP <http://guzzle-ring.readthedocs.org/en/latest/>`_ handler to use a
-different method of sending requests.
-
-.. note::
-
-    Guzzle has historically only utilized cURL to send HTTP requests. cURL is
-    an amazing HTTP client (arguably the best), and Guzzle will continue to use
-    it by default when it is available. It is rare, but some developers don't
-    have cURL installed on their systems or run into version specific issues.
-    By allowing swappable HTTP handlers, Guzzle is now much more customizable
-    and able to adapt to fit the needs of more developers.
-
-Can Guzzle send asynchronous requests?
-======================================
-
-Yes. Pass the ``future`` true request option to a request to send it
-asynchronously. Guzzle will then return a ``GuzzleHttp\Message\FutureResponse``
-object that can be used synchronously by accessing the response object like a
-normal response, and it can be used asynchronously using a promise that is
-notified when the response is resolved with a real response or rejected with an
-exception.
-
-.. code-block:: php
-
-    $request = $client->createRequest('GET', ['future' => true]);
-    $client->send($request)->then(function ($response) {
-        echo 'Got a response! ' . $response;
-    });
-
-You can force an asynchronous response to complete using the ``wait()`` method
-of a response.
-
-.. code-block:: php
-
-    $request = $client->createRequest('GET', ['future' => true]);
-    $futureResponse = $client->send($request);
-    $futureResponse->wait();
-
-How can I add custom cURL options?
-==================================
-
-cURL offer a huge number of `customizable options <http://us1.php.net/curl_setopt>`_.
-While Guzzle normalizes many of these options across different handlers, there
-are times when you need to set custom cURL options. This can be accomplished
-by passing an associative array of cURL settings in the **curl** key of the
-**config** request option.
-
-For example, let's say you need to customize the outgoing network interface
-used with a client.
-
-.. code-block:: php
-
-    $client->get('/', [
-        'config' => [
-            'curl' => [
-                CURLOPT_INTERFACE => 'xxx.xxx.xxx.xxx'
-            ]
-        ]
-    ]);
-
-How can I add custom stream context options?
-============================================
-
-You can pass custom `stream context options <http://www.php.net/manual/en/context.php>`_
-using the **stream_context** key of the **config** request option. The
-**stream_context** array is an associative array where each key is a PHP
-transport, and each value is an associative array of transport options.
-
-For example, let's say you need to customize the outgoing network interface
-used with a client and allow self-signed certificates.
-
-.. code-block:: php
-
-    $client->get('/', [
-        'stream' => true,
-        'config' => [
-            'stream_context' => [
-                'ssl' => [
-                    'allow_self_signed' => true
-                ],
-                'socket' => [
-                    'bindto' => 'xxx.xxx.xxx.xxx'
-                ]
-            ]
-        ]
-    ]);
-
-Why am I getting an SSL verification error?
-===========================================
-
-You need to specify the path on disk to the CA bundle used by Guzzle for
-verifying the peer certificate. See :ref:`verify-option`.
-
-What is this Maximum function nesting error?
-============================================
-
-    Maximum function nesting level of '100' reached, aborting
-
-You could run into this error if you have the XDebug extension installed and
-you execute a lot of requests in callbacks.  This error message comes
-specifically from the XDebug extension. PHP itself does not have a function
-nesting limit. Change this setting in your php.ini to increase the limit::
-
-    xdebug.max_nesting_level = 1000
-
-Why am I getting a 417 error response?
-======================================
-
-This can occur for a number of reasons, but if you are sending PUT, POST, or
-PATCH requests with an ``Expect: 100-Continue`` header, a server that does not
-support this header will return a 417 response. You can work around this by
-setting the ``expect`` request option to ``false``:
-
-.. code-block:: php
-
-    $client = new GuzzleHttp\Client();
-
-    // Disable the expect header on a single request
-    $response = $client->put('/', [], 'the body', [
-        'expect' => false
-    ]);
-
-    // Disable the expect header on all client requests
-    $client->setDefaultOption('expect', false)
diff --git a/core/vendor/guzzlehttp/guzzle/docs/handlers.rst b/core/vendor/guzzlehttp/guzzle/docs/handlers.rst
deleted file mode 100644
index d452003fd..000000000
--- a/core/vendor/guzzlehttp/guzzle/docs/handlers.rst
+++ /dev/null
@@ -1,43 +0,0 @@
-================
-RingPHP Handlers
-================
-
-Guzzle uses RingPHP handlers to send HTTP requests over the wire.
-RingPHP provides a low-level library that can be used to "glue" Guzzle with
-any transport method you choose. By default, Guzzle utilizes cURL and PHP's
-stream wrappers to send HTTP requests.
-
-RingPHP handlers makes it extremely simple to integrate Guzzle with any
-HTTP transport. For example, you could quite easily bridge Guzzle and React
-to use Guzzle in React's event loop.
-
-Using a handler
----------------
-
-You can change the handler used by a client using the ``handler`` option in the
-``GuzzleHttp\Client`` constructor.
-
-.. code-block:: php
-
-    use GuzzleHttp\Client;
-    use GuzzleHttp\Ring\Client\MockHandler;
-
-    // Create a mock handler that always returns a 200 response.
-    $handler = new MockHandler(['status' => 200]);
-
-    // Configure to client to use the mock handler.
-    $client = new Client(['handler' => $handler]);
-
-At its core, handlers are simply PHP callables that accept a request array
-and return a ``GuzzleHttp\Ring\Future\FutureArrayInterface``. This future array
-can be used just like a normal PHP array, causing it to block, or you can use
-the promise interface using the ``then()`` method of the future. Guzzle hooks
-up to the RingPHP project using a very simple bridge class
-(``GuzzleHttp\RingBridge``).
-
-Creating a handler
-------------------
-
-See the `RingPHP <http://ringphp.readthedocs.org>`_ project
-documentation for more information on creating custom handlers that can be
-used with Guzzle clients.
diff --git a/core/vendor/guzzlehttp/guzzle/docs/http-messages.rst b/core/vendor/guzzlehttp/guzzle/docs/http-messages.rst
deleted file mode 100644
index 0c6527a8d..000000000
--- a/core/vendor/guzzlehttp/guzzle/docs/http-messages.rst
+++ /dev/null
@@ -1,483 +0,0 @@
-=============================
-Request and Response Messages
-=============================
-
-Guzzle is an HTTP client that sends HTTP requests to a server and receives HTTP
-responses. Both requests and responses are referred to as messages.
-
-Headers
-=======
-
-Both request and response messages contain HTTP headers.
-
-Complex Headers
----------------
-
-Some headers contain additional key value pair information. For example, Link
-headers contain a link and several key value pairs:
-
-::
-
-    <http://foo.com>; rel="thing"; type="image/jpeg"
-
-Guzzle provides a convenience feature that can be used to parse these types of
-headers:
-
-.. code-block:: php
-
-    use GuzzleHttp\Message\Request;
-
-    $request = new Request('GET', '/', [
-        'Link' => '<http:/.../front.jpeg>; rel="front"; type="image/jpeg"'
-    ]);
-
-    $parsed = Request::parseHeader($request, 'Link');
-    var_export($parsed);
-
-Will output:
-
-.. code-block:: php
-
-    array (
-      0 =>
-      array (
-        0 => '<http:/.../front.jpeg>',
-        'rel' => 'front',
-        'type' => 'image/jpeg',
-      ),
-    )
-
-The result contains a hash of key value pairs. Header values that have no key
-(i.e., the link) are indexed numerically while headers parts that form a key
-value pair are added as a key value pair.
-
-See :ref:`headers` for information on how the headers of a request and response
-can be accessed and modified.
-
-Body
-====
-
-Both request and response messages can contain a body.
-
-You can check to see if a request or response has a body using the
-``getBody()`` method:
-
-.. code-block:: php
-
-    $response = GuzzleHttp\get('http://httpbin.org/get');
-    if ($response->getBody()) {
-        echo $response->getBody();
-        // JSON string: { ... }
-    }
-
-The body used in request and response objects is a
-``GuzzleHttp\Stream\StreamInterface``. This stream is used for both uploading
-data and downloading data. Guzzle will, by default, store the body of a message
-in a stream that uses PHP temp streams. When the size of the body exceeds
-2 MB, the stream will automatically switch to storing data on disk rather than
-in memory (protecting your application from memory exhaustion).
-
-You can change the body used in a request or response using the ``setBody()``
-method:
-
-.. code-block:: php
-
-    use GuzzleHttp\Stream\Stream;
-    $request = $client->createRequest('PUT', 'http://httpbin.org/put');
-    $request->setBody(Stream::factory('foo'));
-
-The easiest way to create a body for a request is using the static
-``GuzzleHttp\Stream\Stream::factory()`` method. This method accepts various
-inputs like strings, resources returned from ``fopen()``, and other
-``GuzzleHttp\Stream\StreamInterface`` objects.
-
-The body of a request or response can be cast to a string or you can read and
-write bytes off of the stream as needed.
-
-.. code-block:: php
-
-    use GuzzleHttp\Stream\Stream;
-    $request = $client->createRequest('PUT', 'http://httpbin.org/put', ['body' => 'testing...']);
-
-    echo $request->getBody()->read(4);
-    // test
-    echo $request->getBody()->read(4);
-    // ing.
-    echo $request->getBody()->read(1024);
-    // ..
-    var_export($request->eof());
-    // true
-
-You can find out more about Guzzle stream objects in :doc:`streams`.
-
-Requests
-========
-
-Requests are sent from a client to a server. Requests include the method to
-be applied to a resource, the identifier of the resource, and the protocol
-version to use.
-
-Clients are used to create request messages. More precisely, clients use
-a ``GuzzleHttp\Message\MessageFactoryInterface`` to create request messages.
-You create requests with a client using the ``createRequest()`` method.
-
-.. code-block:: php
-
-    // Create a request but don't send it immediately
-    $request = $client->createRequest('GET', 'http://httpbin.org/get');
-
-Request Methods
----------------
-
-When creating a request, you are expected to provide the HTTP method you wish
-to perform. You can specify any method you'd like, including a custom method
-that might not be part of RFC 7231 (like "MOVE").
-
-.. code-block:: php
-
-    // Create a request using a completely custom HTTP method
-    $request = $client->createRequest('MOVE', 'http://httpbin.org/move', ['exceptions' => false]);
-
-    echo $request->getMethod();
-    // MOVE
-
-    $response = $client->send($request);
-    echo $response->getStatusCode();
-    // 405
-
-You can create and send a request using methods on a client that map to the
-HTTP method you wish to use.
-
-:GET: ``$client->get('http://httpbin.org/get', [/** options **/])``
-:POST: ``$client->post('http://httpbin.org/post', [/** options **/])``
-:HEAD: ``$client->head('http://httpbin.org/get', [/** options **/])``
-:PUT: ``$client->put('http://httpbin.org/put', [/** options **/])``
-:DELETE: ``$client->delete('http://httpbin.org/delete', [/** options **/])``
-:OPTIONS: ``$client->options('http://httpbin.org/get', [/** options **/])``
-:PATCH: ``$client->patch('http://httpbin.org/put', [/** options **/])``
-
-.. code-block:: php
-
-    $response = $client->patch('http://httpbin.org/patch', ['body' => 'content']);
-
-Request URI
------------
-
-The resource you are requesting with an HTTP request is identified by the
-path of the request, the query string, and the "Host" header of the request.
-
-When creating a request, you can provide the entire resource URI as a URL.
-
-.. code-block:: php
-
-    $response = $client->get('http://httbin.org/get?q=foo');
-
-Using the above code, you will send a request that uses ``httpbin.org`` as
-the Host header, sends the request over port 80, uses ``/get`` as the path,
-and sends ``?q=foo`` as the query string. All of this is parsed automatically
-from the provided URI.
-
-Sometimes you don't know what the entire request will be when it is created.
-In these cases, you can modify the request as needed before sending it using
-the ``createRequest()`` method of the client and methods on the request that
-allow you to change it.
-
-.. code-block:: php
-
-    $request = $client->createRequest('GET', 'http://httbin.org');
-
-You can change the path of the request using ``setPath()``:
-
-.. code-block:: php
-
-    $request->setPath('/get');
-    echo $request->getPath();
-    // /get
-    echo $request->getUrl();
-    // http://httpbin.com/get
-
-Scheme
-~~~~~~
-
-The `scheme <http://tools.ietf.org/html/rfc3986#section-3.1>`_ of a request
-specifies the protocol to use when sending the request. When using Guzzle, the
-scheme can be set to "http" or "https".
-
-You can change the scheme of the request using the ``setScheme()`` method:
-
-.. code-block:: php
-
-    $request = $client->createRequest('GET', 'http://httbin.org');
-    $request->setScheme('https');
-    echo $request->getScheme();
-    // https
-    echo $request->getUrl();
-    // https://httpbin.com/get
-
-Port
-~~~~
-
-No port is necessary when using the "http" or "https" schemes, but you can
-override the port using ``setPort()``. If you need to modify the port used with
-the specified scheme from the default setting, then you must use the
-``setPort()`` method.
-
-.. code-block:: php
-
-    $request = $client->createRequest('GET', 'http://httbin.org');
-    $request->setPort(8080);
-    echo $request->getPort();
-    // 8080
-    echo $request->getUrl();
-    // https://httpbin.com:8080/get
-
-    // Set the port back to the default value for the scheme
-    $request->setPort(443);
-    echo $request->getUrl();
-    // https://httpbin.com/get
-
-Query string
-~~~~~~~~~~~~
-
-You can get the query string of the request using the ``getQuery()`` method.
-This method returns a ``GuzzleHttp\Query`` object. A Query object can be
-accessed like a PHP array, iterated in a foreach statement like a PHP array,
-and cast to a string.
-
-.. code-block:: php
-
-    $request = $client->createRequest('GET', 'http://httbin.org');
-    $query = $request->getQuery();
-    $query['foo'] = 'bar';
-    $query['baz'] = 'bam';
-    $query['bam'] = ['test' => 'abc'];
-
-    echo $request->getQuery();
-    // foo=bar&baz=bam&bam%5Btest%5D=abc
-
-    echo $request->getQuery()['foo'];
-    // bar
-    echo $request->getQuery()->get('foo');
-    // bar
-    echo $request->getQuery()->get('foo');
-    // bar
-
-    var_export($request->getQuery()['bam']);
-    // array('test' => 'abc')
-
-    foreach ($query as $key => $value) {
-        var_export($value);
-    }
-
-    echo $request->getUrl();
-    // https://httpbin.com/get?foo=bar&baz=bam&bam%5Btest%5D=abc
-
-Query Aggregators
-^^^^^^^^^^^^^^^^^
-
-Query objects can store scalar values or arrays of values. When an array of
-values is added to a query object, the query object uses a query aggregator to
-convert the complex structure into a string. Query objects will use
-`PHP style query strings <http://www.php.net/http_build_query>`_ when complex
-query string parameters are converted to a string. You can customize how
-complex query string parameters are aggregated using the ``setAggregator()``
-method of a query string object.
-
-.. code-block:: php
-
-    $query->setAggregator($query::duplicateAggregator());
-
-In the above example, we've changed the query object to use the
-"duplicateAggregator". This aggregator will allow duplicate entries to appear
-in a query string rather than appending "[n]" to each value. So if you had a
-query string with ``['a' => ['b', 'c']]``, the duplicate aggregator would
-convert this to "a=b&a=c" while the default aggregator would convert this to
-"a[0]=b&a[1]=c" (with urlencoded brackets).
-
-The ``setAggregator()`` method accepts a ``callable`` which is used to convert
-a deeply nested array of query string variables into a flattened array of key
-value pairs. The callable accepts an array of query data and returns a
-flattened array of key value pairs where each value is an array of strings.
-You can use the ``GuzzleHttp\Query::walkQuery()`` static function to easily
-create custom query aggregators.
-
-Host
-~~~~
-
-You can change the host header of the request in a predictable way using the
-``setHost()`` method of a request:
-
-.. code-block:: php
-
-    $request->setHost('www.google.com');
-    echo $request->getHost();
-    // www.google.com
-    echo $request->getUrl();
-    // https://www.google.com/get?foo=bar&baz=bam
-
-.. note::
-
-    The Host header can also be changed by modifying the Host header of a
-    request directly, but modifying the Host header directly could result in
-    sending a request to a different Host than what is specified in the Host
-    header (sometimes this is actually the desired behavior).
-
-Resource
-~~~~~~~~
-
-You can use the ``getResource()`` method of a request to return the path and
-query string of a request in a single string.
-
-.. code-block:: php
-
-    $request = $client->createRequest('GET', 'http://httpbin.org/get?baz=bar');
-    echo $request->getResource();
-    // /get?baz=bar
-
-Request Config
---------------
-
-Request messages contain a configuration collection that can be used by
-event listeners and HTTP handlers to modify how a request behaves or is
-transferred over the wire. For example, many of the request options that are
-specified when creating a request are actually set as config options that are
-only acted upon by handlers and listeners when the request is sent.
-
-You can get access to the request's config object using the ``getConfig()``
-method of a request.
-
-.. code-block:: php
-
-    $request = $client->createRequest('GET', '/');
-    $config = $request->getConfig();
-
-The config object is a ``GuzzleHttp\Collection`` object that acts like
-an associative array. You can grab values from the collection using array like
-access. You can also modify and remove values using array like access.
-
-.. code-block:: php
-
-    $config['foo'] = 'bar';
-    echo $config['foo'];
-    // bar
-
-    var_export(isset($config['foo']));
-    // true
-
-    unset($config['foo']);
-    var_export(isset($config['foo']));
-    // false
-
-    var_export($config['foo']);
-    // NULL
-
-HTTP handlers and event listeners can expose additional customization options
-through request config settings. For example, in order to specify custom cURL
-options to the cURL handler, you need to specify an associative array in the
-``curl`` ``config`` request option.
-
-.. code-block:: php
-
-    $client->get('/', [
-        'config' => [
-            'curl' => [
-                CURLOPT_HTTPAUTH => CURLAUTH_NTLM,
-                CURLOPT_USERPWD  => 'username:password'
-            ]
-        ]
-    ]);
-
-Consult the HTTP handlers and event listeners you are using to see if they
-allow customization through request configuration options.
-
-Event Emitter
--------------
-
-Request objects implement ``GuzzleHttp\Event\HasEmitterInterface``, so they
-have a method called ``getEmitter()`` that can be used to get an event emitter
-used by the request. Any listener or subscriber attached to a request will only
-be triggered for the lifecycle events of a specific request. Conversely, adding
-an event listener or subscriber to a client will listen to all lifecycle events
-of all requests created by the client.
-
-See :doc:`events` for more information.
-
-Responses
-=========
-
-Responses are the HTTP messages a client receives from a server after sending
-an HTTP request message.
-
-Start-Line
-----------
-
-The start-line of a response contains the protocol and protocol version,
-status code, and reason phrase.
-
-.. code-block:: php
-
-    $response = GuzzleHttp\get('http://httpbin.org/get');
-    echo $response->getStatusCode();
-    // 200
-    echo $response->getReasonPhrase();
-    // OK
-    echo $response->getProtocolVersion();
-    // 1.1
-
-Body
-----
-
-As described earlier, you can get the body of a response using the
-``getBody()`` method.
-
-.. code-block:: php
-
-    if ($body = $response->getBody()) {
-        echo $body;
-        // Cast to a string: { ... }
-        $body->seek(0);
-        // Rewind the body
-        $body->read(1024);
-        // Read bytes of the body
-    }
-
-When working with JSON responses, you can use the ``json()`` method of a
-response:
-
-.. code-block:: php
-
-    $json = $response->json();
-
-.. note::
-
-    Guzzle uses the ``json_decode()`` method of PHP and uses arrays rather than
-    ``stdClass`` objects for objects.
-
-You can use the ``xml()`` method when working with XML data.
-
-.. code-block:: php
-
-    $xml = $response->xml();
-
-.. note::
-
-    Guzzle uses the ``SimpleXMLElement`` objects when converting response
-    bodies to XML.
-
-Effective URL
--------------
-
-The URL that was ultimately accessed that returned a response can be accessed
-using the ``getEffectiveUrl()`` method of a response. This method will return
-the URL of a request or the URL of the last redirected URL if any redirects
-occurred while transferring a request.
-
-.. code-block:: php
-
-    $response = GuzzleHttp\get('http://httpbin.org/get');
-    echo $response->getEffectiveUrl();
-    // http://httpbin.org/get
-
-    $response = GuzzleHttp\get('http://httpbin.org/redirect-to?url=http://www.google.com');
-    echo $response->getEffectiveUrl();
-    // http://www.google.com
diff --git a/core/vendor/guzzlehttp/guzzle/docs/index.rst b/core/vendor/guzzlehttp/guzzle/docs/index.rst
deleted file mode 100644
index d456a5f08..000000000
--- a/core/vendor/guzzlehttp/guzzle/docs/index.rst
+++ /dev/null
@@ -1,98 +0,0 @@
-.. title:: Guzzle | PHP HTTP client and framework for consuming RESTful web services
-
-======
-Guzzle
-======
-
-Guzzle is a PHP HTTP client that makes it easy to send HTTP requests and
-trivial to integrate with web services.
-
-- Manages things like persistent connections, represents query strings as
-  collections, simplifies sending streaming POST requests with fields and
-  files, and abstracts away the underlying HTTP transport layer.
-- Can send both synchronous and asynchronous requests using the same interface
-  without requiring a dependency on a specific event loop.
-- Pluggable HTTP handlers allows Guzzle to integrate with any method you choose
-  for sending HTTP requests over the wire (e.g., cURL, sockets, PHP's stream
-  wrapper, non-blocking event loops like `React <http://reactphp.org/>`_, etc.).
-- Guzzle makes it so that you no longer need to fool around with cURL options,
-  stream contexts, or sockets.
-
-.. code-block:: php
-
-    $client = new GuzzleHttp\Client();
-    $response = $client->get('http://guzzlephp.org');
-    $res = $client->get('https://api.github.com/user', ['auth' =>  ['user', 'pass']]);
-    echo $res->getStatusCode();
-    // "200"
-    echo $res->getHeader('content-type');
-    // 'application/json; charset=utf8'
-    echo $res->getBody();
-    // {"type":"User"...'
-    var_export($res->json());
-    // Outputs the JSON decoded data
-
-    // Send an asynchronous request.
-    $req = $client->createRequest('GET', 'http://httpbin.org', ['future' => true]);
-    $client->send($req)->then(function ($response) {
-        echo 'I completed! ' . $response;
-    });
-
-User guide
-----------
-
-.. toctree::
-    :maxdepth: 2
-
-    overview
-    quickstart
-    clients
-    http-messages
-    events
-    streams
-    handlers
-    testing
-    faq
-
-HTTP Components
----------------
-
-There are a number of optional libraries you can use along with Guzzle's HTTP
-layer to add capabilities to the client.
-
-`Log Subscriber <https://github.com/guzzle/log-subscriber>`_
-    Logs HTTP requests and responses sent over the wire using customizable
-    log message templates.
-
-`OAuth Subscriber <https://github.com/guzzle/oauth-subscriber>`_
-    Signs requests using OAuth 1.0.
-
-`Cache Subscriber <https://github.com/guzzle/cache-subscriber>`_
-    Implements a private transparent proxy cache that caches HTTP responses.
-
-`Retry Subscriber <https://github.com/guzzle/retry-subscriber>`_
-    Retries failed requests using customizable retry strategies (e.g., retry
-    based on response status code, cURL error codes, etc.)
-
-`Message Integrity Subscriber <https://github.com/guzzle/message-integrity-subscriber>`_
-    Verifies the message integrity of HTTP responses using customizable
-    validators. This plugin can be used, for example, to verify the Content-MD5
-    headers of responses.
-
-Service Description Commands
-----------------------------
-
-You can use the **Guzzle Command** library to encapsulate interaction with a
-web service using command objects. Building on top of Guzzle's command
-abstraction allows you to easily implement things like service description that
-can be used to serialize requests and parse responses using a meta-description
-of a web service.
-
-`Guzzle Command <https://github.com/guzzle/command>`_
-    Provides the foundational elements used to build high-level, command based,
-    web service clients with Guzzle.
-
-`Guzzle Services <https://github.com/guzzle/guzzle-services>`_
-    Provides an implementation of the *Guzzle Command* library that uses
-    Guzzle service descriptions to describe web services, serialize requests,
-    and parse responses into easy to use model structures.
diff --git a/core/vendor/guzzlehttp/guzzle/docs/overview.rst b/core/vendor/guzzlehttp/guzzle/docs/overview.rst
deleted file mode 100644
index 1355afa12..000000000
--- a/core/vendor/guzzlehttp/guzzle/docs/overview.rst
+++ /dev/null
@@ -1,150 +0,0 @@
-========
-Overview
-========
-
-Requirements
-============
-
-#. PHP 5.4.0
-#. To use the PHP stream handler, ``allow_url_fopen`` must be enabled in your
-   system's php.ini.
-#. To use the cURL handler, you must have a recent version of cURL >= 7.16.2
-   compiled with OpenSSL and zlib.
-
-.. note::
-
-    Guzzle no longer requires cURL in order to send HTTP requests. Guzzle will
-    use the PHP stream wrapper to send HTTP requests if cURL is not installed.
-    Alternatively, you can provide your own HTTP handler used to send requests.
-
-.. _installation:
-
-Installation
-============
-
-The recommended way to install Guzzle is with `Composer <http://getcomposer.org>`_. Composer is a dependency
-management tool for PHP that allows you to declare the dependencies your project needs and installs them into your
-project.
-
-.. code-block:: bash
-
-    # Install Composer
-    curl -sS https://getcomposer.org/installer | php
-
-You can add Guzzle as a dependency using the composer.phar CLI:
-
-.. code-block:: bash
-
-    php composer.phar require guzzlehttp/guzzle:~5.0
-
-Alternatively, you can specify Guzzle as a dependency in your project's
-existing composer.json file:
-
-.. code-block:: js
-
-    {
-      "require": {
-         "guzzlehttp/guzzle": "~5.0"
-      }
-   }
-
-After installing, you need to require Composer's autoloader:
-
-.. code-block:: php
-
-    require 'vendor/autoload.php';
-
-You can find out more on how to install Composer, configure autoloading, and
-other best-practices for defining dependencies at `getcomposer.org <http://getcomposer.org>`_.
-
-Bleeding edge
--------------
-
-During your development, you can keep up with the latest changes on the master
-branch by setting the version requirement for Guzzle to ``~5.0@dev``.
-
-.. code-block:: js
-
-   {
-      "require": {
-         "guzzlehttp/guzzle": "~5.0@dev"
-      }
-   }
-
-License
-=======
-
-Licensed using the `MIT license <http://opensource.org/licenses/MIT>`_.
-
-    Copyright (c) 2014 Michael Dowling <https://github.com/mtdowling>
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-    THE SOFTWARE.
-
-Contributing
-============
-
-Guidelines
-----------
-
-1. Guzzle follows PSR-0, PSR-1, and PSR-2.
-2. Guzzle is meant to be lean and fast with very few dependencies.
-3. Guzzle has a minimum PHP version requirement of PHP 5.4. Pull requests must
-   not require a PHP version greater than PHP 5.4.
-4. All pull requests must include unit tests to ensure the change works as
-   expected and to prevent regressions.
-
-Running the tests
------------------
-
-In order to contribute, you'll need to checkout the source from GitHub and
-install Guzzle's dependencies using Composer:
-
-.. code-block:: bash
-
-    git clone https://github.com/guzzle/guzzle.git
-    cd guzzle && curl -s http://getcomposer.org/installer | php && ./composer.phar install --dev
-
-Guzzle is unit tested with PHPUnit. Run the tests using the vendored PHPUnit
-binary:
-
-.. code-block:: bash
-
-    vendor/bin/phpunit
-
-.. note::
-
-    You'll need to install node.js v0.5.0 or newer in order to perform
-    integration tests on Guzzle's HTTP handlers.
-
-Reporting a security vulnerability
-==================================
-
-We want to ensure that Guzzle is a secure HTTP client library for everyone. If
-you've discovered a security vulnerability in Guzzle, we appreciate your help
-in disclosing it to us in a `responsible manner <http://en.wikipedia.org/wiki/Responsible_disclosure>`_.
-
-Publicly disclosing a vulnerability can put the entire community at risk. If
-you've discovered a security concern, please email us at
-security@guzzlephp.org. We'll work with you to make sure that we understand the
-scope of the issue, and that we fully address your concern. We consider
-correspondence sent to security@guzzlephp.org our highest priority, and work to
-address any issues that arise as quickly as possible.
-
-After a security vulnerability has been corrected, a security hotfix release will
-be deployed as soon as possible.
diff --git a/core/vendor/guzzlehttp/guzzle/docs/quickstart.rst b/core/vendor/guzzlehttp/guzzle/docs/quickstart.rst
deleted file mode 100644
index 65a70ed23..000000000
--- a/core/vendor/guzzlehttp/guzzle/docs/quickstart.rst
+++ /dev/null
@@ -1,448 +0,0 @@
-==========
-Quickstart
-==========
-
-This page provides a quick introduction to Guzzle and introductory examples.
-If you have not already installed, Guzzle, head over to the :ref:`installation`
-page.
-
-Make a Request
-==============
-
-You can send requests with Guzzle using a ``GuzzleHttp\ClientInterface``
-object.
-
-Creating a Client
------------------
-
-The procedural API is simple but not very testable; it's best left for quick
-prototyping. If you want to use Guzzle in a more flexible and testable way,
-then you'll need to use a ``GuzzleHttp\ClientInterface`` object.
-
-.. code-block:: php
-
-    use GuzzleHttp\Client;
-
-    $client = new Client();
-    $response = $client->get('http://httpbin.org/get');
-
-    // You can use the same methods you saw in the procedural API
-    $response = $client->delete('http://httpbin.org/delete');
-    $response = $client->head('http://httpbin.org/get');
-    $response = $client->options('http://httpbin.org/get');
-    $response = $client->patch('http://httpbin.org/patch');
-    $response = $client->post('http://httpbin.org/post');
-    $response = $client->put('http://httpbin.org/put');
-
-You can create a request with a client and then send the request with the
-client when you're ready.
-
-.. code-block:: php
-
-    $request = $client->createRequest('GET', 'http://www.foo.com');
-    $response = $client->send($request);
-
-Client objects provide a great deal of flexibility in how request are
-transferred including default request options, subscribers that are attached
-to each request, and a base URL that allows you to send requests with relative
-URLs. You can find out all about clients in the :doc:`clients` page of the
-documentation.
-
-Using Responses
-===============
-
-In the previous examples, we retrieved a ``$response`` variable. This value is
-actually a ``GuzzleHttp\Message\ResponseInterface`` object and contains lots
-of helpful information.
-
-You can get the status code and reason phrase of the response.
-
-.. code-block:: php
-
-    $code = $response->getStatusCode();
-    // 200
-
-    $reason = $response->getReasonPhrase();
-    // OK
-
-By providing the ``future`` request option to a request, you can send requests
-asynchronously using the promise interface of a future response.
-
-.. code-block:: php
-
-    $client->get('http://httpbin.org', ['future' => true])
-        ->then(function ($response) {
-            echo $response->getStatusCode();
-        });
-
-Response Body
--------------
-
-The body of a response can be retrieved and cast to a string.
-
-.. code-block:: php
-
-    $body = $response->getBody();
-    echo $body;
-    // { "some_json_data" ...}
-
-You can also read read bytes from body of a response like a stream.
-
-.. code-block:: php
-
-    $body = $response->getBody();
-
-    while (!$body->eof()) {
-        echo $body->read(1024);
-    }
-
-JSON Responses
-~~~~~~~~~~~~~~
-
-You can more easily work with JSON responses using the ``json()`` method of a
-response.
-
-.. code-block:: php
-
-    $response = $client->get('http://httpbin.org/get');
-    $json = $response->json();
-    var_dump($json[0]['origin']);
-
-Guzzle internally uses PHP's ``json_decode()`` function to parse responses. If
-Guzzle is unable to parse the JSON response body, then a
-``GuzzleHttp\Exception\ParseException`` is thrown.
-
-XML Responses
-~~~~~~~~~~~~~
-
-You can use a response's ``xml()`` method to more easily work with responses
-that contain XML data.
-
-.. code-block:: php
-
-    $response = $client->get('https://github.com/mtdowling.atom');
-    $xml = $response->xml();
-    echo $xml->id;
-    // tag:github.com,2008:/mtdowling
-
-Guzzle internally uses a ``SimpleXMLElement`` object to parse responses. If
-Guzzle is unable to parse the XML response body, then a
-``GuzzleHttp\Exception\ParseException`` is thrown.
-
-Query String Parameters
-=======================
-
-Sending query string parameters with a request is easy. You can set query
-string parameters in the request's URL.
-
-.. code-block:: php
-
-    $response = $client->get('http://httpbin.org?foo=bar');
-
-You can also specify the query string parameters using the ``query`` request
-option.
-
-.. code-block:: php
-
-    $client->get('http://httpbin.org', [
-        'query' => ['foo' => 'bar']
-    ]);
-
-And finally, you can build up the query string of a request as needed by
-calling the ``getQuery()`` method of a request and modifying the request's
-``GuzzleHttp\Query`` object as needed.
-
-.. code-block:: php
-
-    $request = $client->createRequest('GET', 'http://httpbin.org');
-    $query = $request->getQuery();
-    $query->set('foo', 'bar');
-
-    // You can use the query string object like an array
-    $query['baz'] = 'bam';
-
-    // The query object can be cast to a string
-    echo $query;
-    // foo=bar&baz=bam
-
-    // Setting a value to false or null will cause the "=" sign to be omitted
-    $query['empty'] = null;
-    echo $query;
-    // foo=bar&baz=bam&empty
-
-    // Use an empty string to include the "=" sign with an empty value
-    $query['empty'] = '';
-    echo $query;
-    // foo=bar&baz=bam&empty=
-
-.. _headers:
-
-Request and Response Headers
-----------------------------
-
-You can specify request headers when sending or creating requests with a
-client. In the following example, we send the ``X-Foo-Header`` with a value of
-``value`` by setting the ``headers`` request option.
-
-.. code-block:: php
-
-    $response = $client->get('http://httpbin.org/get', [
-        'headers' => ['X-Foo-Header' => 'value']
-    ]);
-
-You can view the headers of a response using header specific methods of a
-response class. Headers work exactly the same way for request and response
-object.
-
-You can retrieve a header from a request or response using the ``getHeader()``
-method of the object. This method is case-insensitive and by default will
-return a string containing the header field value.
-
-.. code-block:: php
-
-    $response = $client->get('http://www.yahoo.com');
-    $length = $response->getHeader('Content-Length');
-
-Header fields that contain multiple values can be retrieved as a string or as
-an array. Retrieving the field values as a string will naively concatenate all
-of the header values together with a comma. Because not all header fields
-should be represented this way (e.g., ``Set-Cookie``), you can pass an optional
-flag to the ``getHeader()`` method to retrieve the header values as an array.
-
-.. code-block:: php
-
-    $values = $response->getHeader('Set-Cookie', true);
-    foreach ($values as $value) {
-        echo $value;
-    }
-
-You can test if a request or response has a specific header using the
-``hasHeader()`` method. This method accepts a case-insensitive string and
-returns true if the header is present or false if it is not.
-
-You can retrieve all of the headers of a message using the ``getHeaders()``
-method of a request or response. The return value is an associative array where
-the keys represent the header name as it will be sent over the wire, and each
-value is an array of strings associated with the header.
-
-.. code-block:: php
-
-    $headers = $response->getHeaders();
-    foreach ($message->getHeaders() as $name => $values) {
-        echo $name . ": " . implode(", ", $values);
-    }
-
-Modifying headers
------------------
-
-The headers of a message can be modified using the ``setHeader()``,
-``addHeader()``, ``setHeaders()``, and ``removeHeader()`` methods of a request
-or response object.
-
-.. code-block:: php
-
-    $request = $client->createRequest('GET', 'http://httpbin.org/get');
-
-    // Set a single value for a header
-    $request->setHeader('User-Agent', 'Testing!');
-
-    // Set multiple values for a header in one call
-    $request->setHeader('X-Foo', ['Baz', 'Bar']);
-
-    // Add a header to the message
-    $request->addHeader('X-Foo', 'Bam');
-
-    echo $request->getHeader('X-Foo');
-    // Baz, Bar, Bam
-
-    // Remove a specific header using a case-insensitive name
-    $request->removeHeader('x-foo');
-    echo $request->getHeader('X-Foo');
-    // Echoes an empty string: ''
-
-Uploading Data
-==============
-
-Guzzle provides several methods of uploading data.
-
-You can send requests that contain a stream of data by passing a string,
-resource returned from ``fopen``, or a ``GuzzleHttp\Stream\StreamInterface``
-object to the ``body`` request option.
-
-.. code-block:: php
-
-    $r = $client->post('http://httpbin.org/post', ['body' => 'raw data']);
-
-You can easily upload JSON data using the ``json`` request option.
-
-.. code-block:: php
-
-    $r = $client->put('http://httpbin.org/put', ['json' => ['foo' => 'bar']]);
-
-POST Requests
--------------
-
-In addition to specifying the raw data of a request using the ``body`` request
-option, Guzzle provides helpful abstractions over sending POST data.
-
-Sending POST Fields
-~~~~~~~~~~~~~~~~~~~
-
-Sending ``application/x-www-form-urlencoded`` POST requests requires that you
-specify the body of a POST request as an array.
-
-.. code-block:: php
-
-    $response = $client->post('http://httpbin.org/post', [
-        'body' => [
-            'field_name' => 'abc',
-            'other_field' => '123'
-        ]
-    ]);
-
-You can also build up POST requests before sending them.
-
-.. code-block:: php
-
-    $request = $client->createRequest('POST', 'http://httpbin.org/post');
-    $postBody = $request->getBody();
-
-    // $postBody is an instance of GuzzleHttp\Post\PostBodyInterface
-    $postBody->setField('foo', 'bar');
-    echo $postBody->getField('foo');
-    // 'bar'
-
-    echo json_encode($postBody->getFields());
-    // {"foo": "bar"}
-
-    // Send the POST request
-    $response = $client->send($request);
-
-Sending POST Files
-~~~~~~~~~~~~~~~~~~
-
-Sending ``multipart/form-data`` POST requests (POST requests that contain
-files) is the same as sending ``application/x-www-form-urlencoded``, except
-some of the array values of the POST fields map to PHP ``fopen`` resources, or
-``GuzzleHttp\Stream\StreamInterface``, or
-``GuzzleHttp\Post\PostFileInterface`` objects.
-
-.. code-block:: php
-
-    use GuzzleHttp\Post\PostFile;
-
-    $response = $client->post('http://httpbin.org/post', [
-        'body' => [
-            'field_name' => 'abc',
-            'file_filed' => fopen('/path/to/file', 'r'),
-            'other_file' => new PostFile('other_file', 'this is the content')
-        ]
-    ]);
-
-Just like when sending POST fields, you can also build up POST requests with
-files before sending them.
-
-.. code-block:: php
-
-    use GuzzleHttp\Post\PostFile;
-
-    $request = $client->createRequest('POST', 'http://httpbin.org/post');
-    $postBody = $request->getBody();
-    $postBody->setField('foo', 'bar');
-    $postBody->addFile(new PostFile('test', fopen('/path/to/file', 'r')));
-    $response = $client->send($request);
-
-Cookies
-=======
-
-Guzzle can maintain a cookie session for you if instructed using the
-``cookies`` request option.
-
-- Set to ``true`` to use a shared cookie session associated with the client.
-- Pass an associative array containing cookies to send in the request and start
-  a new cookie session.
-- Set to a ``GuzzleHttp\Subscriber\CookieJar\CookieJarInterface`` object to use
-  an existing cookie jar.
-
-Redirects
-=========
-
-Guzzle will automatically follow redirects unless you tell it not to. You can
-customize the redirect behavior using the ``allow_redirects`` request option.
-
-- Set to true to enable normal redirects with a maximum number of 5 redirects.
-  This is the default setting.
-- Set to false to disable redirects.
-- Pass an associative array containing the 'max' key to specify the maximum
-  number of redirects and optionally provide a 'strict' key value to specify
-  whether or not to use strict RFC compliant redirects (meaning redirect POST
-  requests with POST requests vs. doing what most browsers do which is
-  redirect POST requests with GET requests).
-
-.. code-block:: php
-
-    $response = $client->get('http://github.com');
-    echo $response->getStatusCode();
-    // 200
-    echo $response->getEffectiveUrl();
-    // 'https://github.com/'
-
-The following example shows that redirects can be disabled.
-
-.. code-block:: php
-
-    $response = $client->get('http://github.com', ['allow_redirects' => false]);
-    echo $response->getStatusCode();
-    // 301
-    echo $response->getEffectiveUrl();
-    // 'http://github.com/'
-
-Exceptions
-==========
-
-Guzzle throws exceptions for errors that occur during a transfer.
-
-- In the event of a networking error (connection timeout, DNS errors, etc.),
-  a ``GuzzleHttp\Exception\RequestException`` is thrown. This exception
-  extends from ``GuzzleHttp\Exception\TransferException``. Catching this
-  exception will catch any exception that can be thrown while transferring
-  (non-parallel) requests.
-
-  .. code-block:: php
-
-      use GuzzleHttp\Exception\RequestException;
-
-      try {
-          $client->get('https://github.com/_abc_123_404');
-      } catch (RequestException $e) {
-          echo $e->getRequest();
-          if ($e->hasResponse()) {
-              echo $e->getResponse();
-          }
-      }
-
-- A ``GuzzleHttp\Exception\ClientException`` is thrown for 400
-  level errors if the ``exceptions`` request option is set to true. This
-  exception extends from ``GuzzleHttp\Exception\BadResponseException`` and
-  ``GuzzleHttp\Exception\BadResponseException`` extends from
-  ``GuzzleHttp\Exception\RequestException``.
-
-  .. code-block:: php
-
-      use GuzzleHttp\Exception\ClientException;
-
-      try {
-          $client->get('https://github.com/_abc_123_404');
-      } catch (ClientException $e) {
-          echo $e->getRequest();
-          echo $e->getResponse();
-      }
-
-- A ``GuzzleHttp\Exception\ServerException`` is thrown for 500 level
-  errors if the ``exceptions`` request option is set to true. This
-  exception extends from ``GuzzleHttp\Exception\BadResponseException``.
-- A ``GuzzleHttp\Exception\TooManyRedirectsException`` is thrown when too
-  many redirects are followed. This exception extends from ``GuzzleHttp\Exception\RequestException``.
-
-All of the above exceptions extend from
-``GuzzleHttp\Exception\TransferException``.
diff --git a/core/vendor/guzzlehttp/guzzle/docs/requirements.txt b/core/vendor/guzzlehttp/guzzle/docs/requirements.txt
deleted file mode 100644
index fe7a4eab4..000000000
--- a/core/vendor/guzzlehttp/guzzle/docs/requirements.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Sphinx>=1.2b1
-guzzle_sphinx_theme>=0.6.0
diff --git a/core/vendor/guzzlehttp/guzzle/docs/streams.rst b/core/vendor/guzzlehttp/guzzle/docs/streams.rst
deleted file mode 100644
index 8fe9a6984..000000000
--- a/core/vendor/guzzlehttp/guzzle/docs/streams.rst
+++ /dev/null
@@ -1,213 +0,0 @@
-=======
-Streams
-=======
-
-Guzzle uses stream objects to represent request and response message bodies.
-These stream objects allow you to work with various types of data all using a
-common interface.
-
-HTTP messages consist of a start-line, headers, and a body. The body of an HTTP
-message can be very small or extremely large. Attempting to represent the body
-of a message as a string can easily consume more memory than intended because
-the body must be stored completely in memory. Attempting to store the body of a
-request or response in memory would preclude the use of that implementation from
-being able to work with large message bodies. The StreamInterface is used in
-order to hide the implementation details of where a stream of data is read from
-or written to.
-
-Guzzle's StreamInterface exposes several methods that enable streams to be read
-from, written to, and traversed effectively.
-
-Streams expose their capabilities using three methods: ``isReadable()``,
-``isWritable()``, and ``isSeekable()``. These methods can be used by stream
-collaborators to determine if a stream is capable of their requirements.
-
-Each stream instance has various capabilities: they can be read-only,
-write-only, read-write, allow arbitrary random access (seeking forwards or
-backwards to any location), or only allow sequential access (for example in the
-case of a socket or pipe).
-
-Creating Streams
-================
-
-The best way to create a stream is using the static factory method,
-``GuzzleHttp\Stream\Stream::factory()``. This factory accepts strings,
-resources returned from ``fopen()``, an object that implements
-``__toString()``, and an object that implements
-``GuzzleHttp\Stream\StreamInterface``.
-
-.. code-block:: php
-
-    use GuzzleHttp\Stream\Stream;
-
-    $stream = Stream::factory('string data');
-    echo $stream;
-    // string data
-    echo $stream->read(3);
-    // str
-    echo $stream->getContents();
-    // ing data
-    var_export($stream->eof());
-    // true
-    var_export($stream->tell());
-    // 11
-
-Metadata
-========
-
-Guzzle streams expose stream metadata through the ``getMetadata()`` method.
-This method provides the data you would retrieve when calling PHP's
-`stream_get_meta_data() function <http://php.net/manual/en/function.stream-get-meta-data.php>`_,
-and can optionally expose other custom data.
-
-.. code-block:: php
-
-    use GuzzleHttp\Stream\Stream;
-
-    $resource = fopen('/path/to/file', 'r');
-    $stream = Stream::factory($resource);
-    echo $stream->getMetadata('uri');
-    // /path/to/file
-    var_export($stream->isReadable());
-    // true
-    var_export($stream->isWritable());
-    // false
-    var_export($stream->isSeekable());
-    // true
-
-Stream Decorators
-=================
-
-With the small and focused interface, add custom functionality to streams is
-very simple with stream decorators. Guzzle provides several built-in decorators
-that provide additional stream functionality.
-
-CachingStream
--------------
-
-The CachingStream is used to allow seeking over previously read bytes on
-non-seekable streams. This can be useful when transferring a non-seekable
-entity body fails due to needing to rewind the stream (for example, resulting
-from a redirect). Data that is read from the remote stream will be buffered in
-a PHP temp stream so that previously read bytes are cached first in memory,
-then on disk.
-
-.. code-block:: php
-
-    use GuzzleHttp\Stream\Stream;
-    use GuzzleHttp\Stream\CachingStream;
-
-    $original = Stream::factory(fopen('http://www.google.com', 'r'));
-    $stream = new CachingStream($original);
-
-    $stream->read(1024);
-    echo $stream->tell();
-    // 1024
-
-    $stream->seek(0);
-    echo $stream->tell();
-    // 0
-
-LimitStream
------------
-
-LimitStream can be used to read a subset or slice of an existing stream object.
-This can be useful for breaking a large file into smaller pieces to be sent in
-chunks (e.g. Amazon S3's multipart upload API).
-
-.. code-block:: php
-
-    use GuzzleHttp\Stream\Stream;
-    use GuzzleHttp\Stream\LimitStream;
-
-    $original = Stream::factory(fopen('/tmp/test.txt', 'r+'));
-    echo $original->getSize();
-    // >>> 1048576
-
-    // Limit the size of the body to 1024 bytes and start reading from byte 2048
-    $stream = new LimitStream($original, 1024, 2048);
-    echo $stream->getSize();
-    // >>> 1024
-    echo $stream->tell();
-    // >>> 0
-
-NoSeekStream
-------------
-
-NoSeekStream wraps a stream and does not allow seeking.
-
-.. code-block:: php
-
-    use GuzzleHttp\Stream\Stream;
-    use GuzzleHttp\Stream\LimitStream;
-
-    $original = Stream::factory('foo');
-    $noSeek = new NoSeekStream($original);
-
-    echo $noSeek->read(3);
-    // foo
-    var_export($noSeek->isSeekable());
-    // false
-    $noSeek->seek(0);
-    var_export($noSeek->read(3));
-    // NULL
-
-Creating Custom Decorators
---------------------------
-
-Creating a stream decorator is very easy thanks to the
-``GuzzleHttp\Stream\StreamDecoratorTrait``. This trait provides methods that
-implement ``GuzzleHttp\Stream\StreamInterface`` by proxying to an underlying
-stream. Just ``use`` the ``StreamDecoratorTrait`` and implement your custom
-methods.
-
-For example, let's say we wanted to call a specific function each time the last
-byte is read from a stream. This could be implemented by overriding the
-``read()`` method.
-
-.. code-block:: php
-
-    use GuzzleHttp\Stream\StreamDecoratorTrait;
-
-    class EofCallbackStream implements StreamInterface
-    {
-        use StreamDecoratorTrait;
-
-        private $callback;
-
-        public function __construct(StreamInterface $stream, callable $callback)
-        {
-            $this->stream = $stream;
-            $this->callback = $callback;
-        }
-
-        public function read($length)
-        {
-            $result = $this->stream->read($length);
-
-            // Invoke the callback when EOF is hit.
-            if ($this->eof()) {
-                call_user_func($this->callback);
-            }
-
-            return $result;
-        }
-    }
-
-This decorator could be added to any existing stream and used like so:
-
-.. code-block:: php
-
-    use GuzzleHttp\Stream\Stream;
-
-    $original = Stream::factory('foo');
-    $eofStream = new EofCallbackStream($original, function () {
-        echo 'EOF!';
-    });
-
-    $eofStream->read(2);
-    $eofStream->read(1);
-    // echoes "EOF!"
-    $eofStream->seek(0);
-    $eofStream->read(3);
-    // echoes "EOF!"
diff --git a/core/vendor/guzzlehttp/guzzle/docs/testing.rst b/core/vendor/guzzlehttp/guzzle/docs/testing.rst
deleted file mode 100644
index e7098be45..000000000
--- a/core/vendor/guzzlehttp/guzzle/docs/testing.rst
+++ /dev/null
@@ -1,232 +0,0 @@
-======================
-Testing Guzzle Clients
-======================
-
-Guzzle provides several tools that will enable you to easily mock the HTTP
-layer without needing to send requests over the internet.
-
-* Mock subscriber
-* Mock handler
-* Node.js web server for integration testing
-
-Mock Subscriber
-===============
-
-When testing HTTP clients, you often need to simulate specific scenarios like
-returning a successful response, returning an error, or returning specific
-responses in a certain order. Because unit tests need to be predictable, easy
-to bootstrap, and fast, hitting an actual remote API is a test smell.
-
-Guzzle provides a mock subscriber that can be attached to clients or requests
-that allows you to queue up a list of responses to use rather than hitting a
-remote API.
-
-.. code-block:: php
-
-    use GuzzleHttp\Client;
-    use GuzzleHttp\Subscriber\Mock;
-    use GuzzleHttp\Message\Response;
-
-    $client = new Client();
-
-    // Create a mock subscriber and queue two responses.
-    $mock = new Mock([
-        new Response(200, ['X-Foo' => 'Bar']),         // Use response object
-        "HTTP/1.1 202 OK\r\nContent-Length: 0\r\n\r\n"  // Use a response string
-    ]);
-
-    // Add the mock subscriber to the client.
-    $client->getEmitter()->attach($mock);
-    // The first request is intercepted with the first response.
-    echo $client->get('/')->getStatusCode();
-    //> 200
-    // The second request is intercepted with the second response.
-    echo $client->get('/')->getStatusCode();
-    //> 202
-
-When no more responses are in the queue and a request is sent, an
-``OutOfBoundsException`` is thrown.
-
-History Subscriber
-==================
-
-When using things like the ``Mock`` subscriber, you often need to know if the
-requests you expected to send were sent exactly as you intended. While the mock
-subscriber responds with mocked responses, the ``GuzzleHttp\Subscriber\History``
-subscriber maintains a history of the requests that were sent by a client.
-
-.. code-block:: php
-
-    use GuzzleHttp\Client;
-    use GuzzleHttp\Subscriber\History;
-
-    $client = new Client();
-    $history = new History();
-
-    // Add the history subscriber to the client.
-    $client->getEmitter()->attach($history);
-
-    $client->get('http://httpbin.org/get');
-    $client->head('http://httpbin.org/get');
-
-    // Count the number of transactions
-    echo count($history);
-    //> 2
-    // Get the last request
-    $lastRequest = $history->getLastRequest();
-    // Get the last response
-    $lastRequest = $history->getLastResponse();
-
-    // Iterate over the transactions that were sent
-    foreach ($history as $transaction) {
-        echo $transaction['request']->getMethod();
-        //> GET, HEAD
-        echo $transaction['response']->getStatusCode();
-        //> 200, 200
-    }
-
-The history subscriber can also be printed, revealing the requests and
-responses that were sent as a string, in order.
-
-.. code-block:: php
-
-    echo $history;
-
-::
-
-    > GET /get HTTP/1.1
-    Host: httpbin.org
-    User-Agent: Guzzle/4.0-dev curl/7.21.4 PHP/5.5.8
-
-    < HTTP/1.1 200 OK
-    Access-Control-Allow-Origin: *
-    Content-Type: application/json
-    Date: Tue, 25 Mar 2014 03:53:27 GMT
-    Server: gunicorn/0.17.4
-    Content-Length: 270
-    Connection: keep-alive
-
-    {
-      "headers": {
-        "Connection": "close",
-        "X-Request-Id": "3d0f7d5c-c937-4394-8248-2b8e03fcccdb",
-        "User-Agent": "Guzzle/4.0-dev curl/7.21.4 PHP/5.5.8",
-        "Host": "httpbin.org"
-      },
-      "origin": "76.104.247.1",
-      "args": {},
-      "url": "http://httpbin.org/get"
-    }
-
-    > HEAD /get HTTP/1.1
-    Host: httpbin.org
-    User-Agent: Guzzle/4.0-dev curl/7.21.4 PHP/5.5.8
-
-    < HTTP/1.1 200 OK
-    Access-Control-Allow-Origin: *
-    Content-length: 270
-    Content-Type: application/json
-    Date: Tue, 25 Mar 2014 03:53:27 GMT
-    Server: gunicorn/0.17.4
-    Connection: keep-alive
-
-Mock Adapter
-============
-
-In addition to using the Mock subscriber, you can use the
-``GuzzleHttp\Ring\Client\MockAdapter`` as the handler of a client to return the
-same response over and over or return the result of a callable function.
-
-Test Web Server
-===============
-
-Using mock responses is almost always enough when testing a web service client.
-When implementing custom :doc:`HTTP handlers <handlers>`, you'll need to send
-actual HTTP requests in order to sufficiently test the handler. However, a
-best practice is to contact a local web server rather than a server over the
-internet.
-
-- Tests are more reliable
-- Tests do not require a network connection
-- Tests have no external dependencies
-
-Using the test server
----------------------
-
-.. warning::
-
-    The following functionality is provided to help developers of Guzzle
-    develop HTTP handlers. There is no promise of backwards compatibility
-    when it comes to the node.js test server or the ``GuzzleHttp\Tests\Server``
-    class. If you are using the test server or ``Server`` class outside of
-    guzzlehttp/guzzle, then you will need to configure autoloading and
-    ensure the web server is started manually.
-
-.. hint::
-
-    You almost never need to use this test web server. You should only ever
-    consider using it when developing HTTP handlers. The test web server
-    is not necessary for mocking requests. For that, please use the
-    Mock subcribers and History subscriber.
-
-Guzzle ships with a node.js test server that receives requests and returns
-responses from a queue. The test server exposes a simple API that is used to
-enqueue responses and inspect the requests that it has received.
-
-Any operation on the ``Server`` object will ensure that
-the server is running and wait until it is able to receive requests before
-returning.
-
-.. code-block:: php
-
-    use GuzzleHttp\Client;
-    use GuzzleHttp\Tests\Server;
-
-    // Start the server and queue a response
-    Server::enqueue("HTTP/1.1 200 OK\r\n\Content-Length: 0r\n\r\n");
-
-    $client = new Client(['base_url' => Server::$url]);
-    echo $client->get('/foo')->getStatusCode();
-    // 200
-
-``GuzzleHttp\Tests\Server`` provides a static interface to the test server. You
-can queue an HTTP response or an array of responses by calling
-``Server::enqueue()``. This method accepts a string representing an HTTP
-response message, a ``GuzzleHttp\Message\ResponseInterface``, or an array of
-HTTP message strings / ``GuzzleHttp\Message\ResponseInterface`` objects.
-
-.. code-block:: php
-
-    // Queue single response
-    Server::enqueue("HTTP/1.1 200 OK\r\n\Content-Length: 0r\n\r\n");
-
-    // Clear the queue and queue an array of responses
-    Server::enqueue([
-        "HTTP/1.1 200 OK\r\n\Content-Length: 0r\n\r\n",
-        "HTTP/1.1 404 Not Found\r\n\Content-Length: 0r\n\r\n"
-    ]);
-
-When a response is queued on the test server, the test server will remove any
-previously queued responses. As the server receives requests, queued responses
-are dequeued and returned to the request. When the queue is empty, the server
-will return a 500 response.
-
-You can inspect the requests that the server has retrieved by calling
-``Server::received()``. This method accepts an optional ``$hydrate`` parameter
-that specifies if you are retrieving an array of HTTP requests as strings or an
-array of ``GuzzleHttp\Message\RequestInterface`` objects.
-
-.. code-block:: php
-
-    foreach (Server::received() as $response) {
-        echo $response;
-    }
-
-You can clear the list of received requests from the web server using the
-``Server::flush()`` method.
-
-.. code-block:: php
-
-    Server::flush();
-    echo count(Server::received());
-    // 0
diff --git a/core/vendor/guzzlehttp/guzzle/src/BatchResults.php b/core/vendor/guzzlehttp/guzzle/src/BatchResults.php
deleted file mode 100644
index e5af433dd..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/BatchResults.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-namespace GuzzleHttp;
-
-/**
- * Represents the result of a batch operation. This result container is
- * iterable, countable, and you can can get a result by value using the
- * getResult function.
- *
- * Successful results are anything other than exceptions. Failure results are
- * exceptions.
- *
- * @package GuzzleHttp
- */
-class BatchResults implements \Countable, \IteratorAggregate, \ArrayAccess
-{
-    private $hash;
-
-    /**
-     * @param \SplObjectStorage $hash Hash of key objects to result values.
-     */
-    public function __construct(\SplObjectStorage $hash)
-    {
-        $this->hash = $hash;
-    }
-
-    /**
-     * Get the keys that are available on the batch result.
-     *
-     * @return array
-     */
-    public function getKeys()
-    {
-        return iterator_to_array($this->hash);
-    }
-
-    /**
-     * Gets a result from the container for the given object. When getting
-     * results for a batch of requests, provide the request object.
-     *
-     * @param object $forObject Object to retrieve the result for.
-     *
-     * @return mixed|null
-     */
-    public function getResult($forObject)
-    {
-        return isset($this->hash[$forObject]) ? $this->hash[$forObject] : null;
-    }
-
-    /**
-     * Get an array of successful results.
-     *
-     * @return array
-     */
-    public function getSuccessful()
-    {
-        $results = [];
-        foreach ($this->hash as $key) {
-            if (!($this->hash[$key] instanceof \Exception)) {
-                $results[] = $this->hash[$key];
-            }
-        }
-
-        return $results;
-    }
-
-    /**
-     * Get an array of failed results.
-     *
-     * @return array
-     */
-    public function getFailures()
-    {
-        $results = [];
-        foreach ($this->hash as $key) {
-            if ($this->hash[$key] instanceof \Exception) {
-                $results[] = $this->hash[$key];
-            }
-        }
-
-        return $results;
-    }
-
-    /**
-     * Allows iteration over all batch result values.
-     *
-     * @return \ArrayIterator
-     */
-    public function getIterator()
-    {
-        $results = [];
-        foreach ($this->hash as $key) {
-            $results[] = $this->hash[$key];
-        }
-
-        return new \ArrayIterator($results);
-    }
-
-    /**
-     * Counts the number of elements in the batch result.
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->hash);
-    }
-
-    /**
-     * Checks if the batch contains a specific numerical array index.
-     *
-     * @param int $key Index to access
-     *
-     * @return bool
-     */
-    public function offsetExists($key)
-    {
-        return $key < count($this->hash);
-    }
-
-    /**
-     * Allows access of the batch using a numerical array index.
-     *
-     * @param int $key Index to access.
-     *
-     * @return mixed|null
-     */
-    public function offsetGet($key)
-    {
-        $i = -1;
-        foreach ($this->hash as $obj) {
-            if ($key === ++$i) {
-                return $this->hash[$obj];
-            }
-        }
-
-        return null;
-    }
-
-    public function offsetUnset($key)
-    {
-        throw new \RuntimeException('Not implemented');
-    }
-
-    public function offsetSet($key, $value)
-    {
-        throw new \RuntimeException('Not implemented');
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Client.php b/core/vendor/guzzlehttp/guzzle/src/Client.php
index f1779eb45..74f5cfe82 100644
--- a/core/vendor/guzzlehttp/guzzle/src/Client.php
+++ b/core/vendor/guzzlehttp/guzzle/src/Client.php
@@ -1,389 +1,231 @@
 <?php
 namespace GuzzleHttp;
 
-use GuzzleHttp\Event\HasEmitterTrait;
-use GuzzleHttp\Message\MessageFactory;
-use GuzzleHttp\Message\MessageFactoryInterface;
-use GuzzleHttp\Message\RequestInterface;
-use GuzzleHttp\Message\FutureResponse;
-use GuzzleHttp\Ring\Client\Middleware;
-use GuzzleHttp\Ring\Client\CurlMultiHandler;
-use GuzzleHttp\Ring\Client\CurlHandler;
-use GuzzleHttp\Ring\Client\StreamHandler;
-use GuzzleHttp\Ring\Core;
-use GuzzleHttp\Ring\Future\FutureInterface;
-use GuzzleHttp\Exception\RequestException;
-use React\Promise\FulfilledPromise;
-use React\Promise\RejectedPromise;
+use GuzzleHttp\Cookie\CookieJar;
+use GuzzleHttp\Promise;
+use GuzzleHttp\Psr7;
+use Psr\Http\Message\UriInterface;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
+use \InvalidArgumentException as Iae;
 
 /**
- * HTTP client
+ * @method ResponseInterface get($uri, array $options = [])
+ * @method ResponseInterface head($uri, array $options = [])
+ * @method ResponseInterface put($uri, array $options = [])
+ * @method ResponseInterface post($uri, array $options = [])
+ * @method ResponseInterface patch($uri, array $options = [])
+ * @method ResponseInterface delete($uri, array $options = [])
+ * @method Promise\PromiseInterface getAsync($uri, array $options = [])
+ * @method Promise\PromiseInterface headAsync($uri, array $options = [])
+ * @method Promise\PromiseInterface putAsync($uri, array $options = [])
+ * @method Promise\PromiseInterface postAsync($uri, array $options = [])
+ * @method Promise\PromiseInterface patchAsync($uri, array $options = [])
+ * @method Promise\PromiseInterface deleteAsync($uri, array $options = [])
  */
 class Client implements ClientInterface
 {
-    use HasEmitterTrait;
-
-    /** @var MessageFactoryInterface Request factory used by the client */
-    private $messageFactory;
-
-    /** @var Url Base URL of the client */
-    private $baseUrl;
-
     /** @var array Default request options */
-    private $defaults;
-
-    /** @var callable Request state machine */
-    private $fsm;
+    private $config;
 
     /**
      * Clients accept an array of constructor parameters.
      *
-     * Here's an example of creating a client using an URI template for the
-     * client's base_url and an array of default request options to apply
-     * to each request:
+     * Here's an example of creating a client using a base_uri and an array of
+     * default request options to apply to each request:
      *
      *     $client = new Client([
-     *         'base_url' => [
-     *              'http://www.foo.com/{version}/',
-     *              ['version' => '123']
-     *          ],
-     *         'defaults' => [
-     *             'timeout'         => 10,
-     *             'allow_redirects' => false,
-     *             'proxy'           => '192.168.16.1:10'
-     *         ]
+     *         'base_uri'        => 'http://www.foo.com/1.0/',
+     *         'timeout'         => 0,
+     *         'allow_redirects' => false,
+     *         'proxy'           => '192.168.16.1:10'
      *     ]);
      *
-     * @param array $config Client configuration settings
-     *     - base_url: Base URL of the client that is merged into relative URLs.
-     *       Can be a string or an array that contains a URI template followed
-     *       by an associative array of expansion variables to inject into the
-     *       URI template.
-     *     - handler: callable RingPHP handler used to transfer requests
-     *     - message_factory: Factory used to create request and response object
-     *     - defaults: Default request options to apply to each request
-     *     - emitter: Event emitter used for request events
-     *     - fsm: (internal use only) The request finite state machine. A
-     *       function that accepts a transaction and optional final state. The
-     *       function is responsible for transitioning a request through its
-     *       lifecycle events.
+     * Client configuration settings include the following options:
+     *
+     * - handler: (callable) Function that transfers HTTP requests over the
+     *   wire. The function is called with a Psr7\Http\Message\RequestInterface
+     *   and array of transfer options, and must return a
+     *   GuzzleHttp\Promise\PromiseInterface that is fulfilled with a
+     *   Psr7\Http\Message\ResponseInterface on success. "handler" is a
+     *   constructor only option that cannot be overridden in per/request
+     *   options. If no handler is provided, a default handler will be created
+     *   that enables all of the request options below by attaching all of the
+     *   default middleware to the handler.
+     * - base_uri: (string|UriInterface) Base URI of the client that is merged
+     *   into relative URIs. Can be a string or instance of UriInterface.
+     * - **: any request option
+     *
+     * @param array $config Client configuration settings.
+     *
+     * @see \GuzzleHttp\RequestOptions for a list of available request options.
      */
     public function __construct(array $config = [])
     {
-        $this->configureBaseUrl($config);
+        if (!isset($config['handler'])) {
+            $config['handler'] = HandlerStack::create();
+        }
+
+        // Convert the base_uri to a UriInterface
+        if (isset($config['base_uri'])) {
+            $config['base_uri'] = Psr7\uri_for($config['base_uri']);
+        }
+
         $this->configureDefaults($config);
+    }
 
-        if (isset($config['emitter'])) {
-            $this->emitter = $config['emitter'];
+    public function __call($method, $args)
+    {
+        if (count($args) < 1) {
+            throw new \InvalidArgumentException('Magic request methods require a URI and optional options array');
         }
 
-        $this->messageFactory = isset($config['message_factory'])
-            ? $config['message_factory']
-            : new MessageFactory();
+        $uri = $args[0];
+        $opts = isset($args[1]) ? $args[1] : [];
 
-        if (isset($config['fsm'])) {
-            $this->fsm = $config['fsm'];
-        } else {
-            if (isset($config['handler'])) {
-                $handler = $config['handler'];
-            } elseif (isset($config['adapter'])) {
-                $handler = $config['adapter'];
-            } else {
-                $handler = static::getDefaultHandler();
-            }
-            $this->fsm = new RequestFsm($handler, $this->messageFactory);
+        return substr($method, -5) === 'Async'
+            ? $this->requestAsync(substr($method, 0, -5), $uri, $opts)
+            : $this->request($method, $uri, $opts);
+    }
+
+    public function sendAsync(RequestInterface $request, array $options = [])
+    {
+        // Merge the base URI into the request URI if needed.
+        $options = $this->prepareDefaults($options);
+
+        return $this->transfer(
+            $request->withUri($this->buildUri($request->getUri(), $options)),
+            $options
+        );
+    }
+
+    public function send(RequestInterface $request, array $options = [])
+    {
+        $options[RequestOptions::SYNCHRONOUS] = true;
+        return $this->sendAsync($request, $options)->wait();
+    }
+
+    public function requestAsync($method, $uri = null, array $options = [])
+    {
+        $options = $this->prepareDefaults($options);
+        // Remove request modifying parameter because it can be done up-front.
+        $headers = isset($options['headers']) ? $options['headers'] : [];
+        $body = isset($options['body']) ? $options['body'] : null;
+        $version = isset($options['version']) ? $options['version'] : '1.1';
+        // Merge the URI into the base URI.
+        $uri = $this->buildUri($uri, $options);
+        if (is_array($body)) {
+            $this->invalidBody();
         }
+        $request = new Psr7\Request($method, $uri, $headers, $body, $version);
+        // Remove the option so that they are not doubly-applied.
+        unset($options['headers'], $options['body'], $options['version']);
+
+        return $this->transfer($request, $options);
+    }
+
+    public function request($method, $uri = null, array $options = [])
+    {
+        $options[RequestOptions::SYNCHRONOUS] = true;
+        return $this->requestAsync($method, $uri, $options)->wait();
+    }
+
+    public function getConfig($option = null)
+    {
+        return $option === null
+            ? $this->config
+            : (isset($this->config[$option]) ? $this->config[$option] : null);
+    }
+
+    private function buildUri($uri, array $config)
+    {
+        if (!isset($config['base_uri'])) {
+            return $uri instanceof UriInterface ? $uri : new Psr7\Uri($uri);
+        }
+
+        return Psr7\Uri::resolve(Psr7\uri_for($config['base_uri']), $uri);
     }
 
     /**
-     * Create a default handler to use based on the environment
+     * Configures the default options for a client.
      *
-     * @throws \RuntimeException if no viable Handler is available.
-     */
-    public static function getDefaultHandler()
-    {
-        $default = $future = $streaming = null;
-
-        if (extension_loaded('curl')) {
-            $config = [
-                'select_timeout' => getenv('GUZZLE_CURL_SELECT_TIMEOUT') ?: 1
-            ];
-            if ($maxHandles = getenv('GUZZLE_CURL_MAX_HANDLES')) {
-                $config['max_handles'] = $maxHandles;
-            }
-            $future = new CurlMultiHandler($config);
-            if (function_exists('curl_reset')) {
-                $default = new CurlHandler();
-            }
-        }
-
-        if (ini_get('allow_url_fopen')) {
-            $streaming = new StreamHandler();
-        }
-
-        if (!($default = ($default ?: $future) ?: $streaming)) {
-            throw new \RuntimeException('Guzzle requires cURL, the '
-                . 'allow_url_fopen ini setting, or a custom HTTP handler.');
-        }
-
-        $handler = $default;
-
-        if ($streaming && $streaming !== $default) {
-            $handler = Middleware::wrapStreaming($default, $streaming);
-        }
-
-        if ($future) {
-            $handler = Middleware::wrapFuture($handler, $future);
-        }
-
-        return $handler;
-    }
-
-    /**
-     * Get the default User-Agent string to use with Guzzle
-     *
-     * @return string
-     */
-    public static function getDefaultUserAgent()
-    {
-        static $defaultAgent = '';
-        if (!$defaultAgent) {
-            $defaultAgent = 'Guzzle/' . self::VERSION;
-            if (extension_loaded('curl')) {
-                $defaultAgent .= ' curl/' . curl_version()['version'];
-            }
-            $defaultAgent .= ' PHP/' . PHP_VERSION;
-        }
-
-        return $defaultAgent;
-    }
-
-    public function getDefaultOption($keyOrPath = null)
-    {
-        return $keyOrPath === null
-            ? $this->defaults
-            : Utils::getPath($this->defaults, $keyOrPath);
-    }
-
-    public function setDefaultOption($keyOrPath, $value)
-    {
-        Utils::setPath($this->defaults, $keyOrPath, $value);
-    }
-
-    public function getBaseUrl()
-    {
-        return (string) $this->baseUrl;
-    }
-
-    public function createRequest($method, $url = null, array $options = [])
-    {
-        $options = $this->mergeDefaults($options);
-        // Use a clone of the client's emitter
-        $options['config']['emitter'] = clone $this->getEmitter();
-        $url = $url || (is_string($url) && strlen($url))
-            ? $this->buildUrl($url)
-            : (string) $this->baseUrl;
-
-        return $this->messageFactory->createRequest($method, $url, $options);
-    }
-
-    public function get($url = null, $options = [])
-    {
-        return $this->send($this->createRequest('GET', $url, $options));
-    }
-
-    public function head($url = null, array $options = [])
-    {
-        return $this->send($this->createRequest('HEAD', $url, $options));
-    }
-
-    public function delete($url = null, array $options = [])
-    {
-        return $this->send($this->createRequest('DELETE', $url, $options));
-    }
-
-    public function put($url = null, array $options = [])
-    {
-        return $this->send($this->createRequest('PUT', $url, $options));
-    }
-
-    public function patch($url = null, array $options = [])
-    {
-        return $this->send($this->createRequest('PATCH', $url, $options));
-    }
-
-    public function post($url = null, array $options = [])
-    {
-        return $this->send($this->createRequest('POST', $url, $options));
-    }
-
-    public function options($url = null, array $options = [])
-    {
-        return $this->send($this->createRequest('OPTIONS', $url, $options));
-    }
-
-    public function send(RequestInterface $request)
-    {
-        $isFuture = $request->getConfig()->get('future');
-        $trans = new Transaction($this, $request, $isFuture);
-        $fn = $this->fsm;
-
-        try {
-            $fn($trans);
-            if ($isFuture) {
-                // Turn the normal response into a future if needed.
-                return $trans->response instanceof FutureInterface
-                    ? $trans->response
-                    : new FutureResponse(new FulfilledPromise($trans->response));
-            }
-            // Resolve deep futures if this is not a future
-            // transaction. This accounts for things like retries
-            // that do not have an immediate side-effect.
-            while ($trans->response instanceof FutureInterface) {
-                $trans->response = $trans->response->wait();
-            }
-            return $trans->response;
-        } catch (\Exception $e) {
-            if ($isFuture) {
-                // Wrap the exception in a promise
-                return new FutureResponse(new RejectedPromise($e));
-            }
-            throw RequestException::wrapException($trans->request, $e);
-        }
-    }
-
-    /**
-     * Get an array of default options to apply to the client
+     * @param array $config
      *
      * @return array
      */
-    protected function getDefaultOptions()
+    private function configureDefaults(array $config)
     {
-        $settings = [
-            'allow_redirects' => true,
-            'exceptions'      => true,
+        $defaults = [
+            'allow_redirects' => RedirectMiddleware::$defaultSettings,
+            'http_errors'     => true,
             'decode_content'  => true,
-            'verify'          => true
+            'verify'          => true,
+            'cookies'         => false
         ];
 
         // Use the standard Linux HTTP_PROXY and HTTPS_PROXY if set
         if ($proxy = getenv('HTTP_PROXY')) {
-            $settings['proxy']['http'] = $proxy;
+            $defaults['proxy']['http'] = $proxy;
         }
 
         if ($proxy = getenv('HTTPS_PROXY')) {
-            $settings['proxy']['https'] = $proxy;
+            $defaults['proxy']['https'] = $proxy;
         }
 
-        return $settings;
-    }
+        $this->config = $config + $defaults;
 
-    /**
-     * Expand a URI template and inherit from the base URL if it's relative
-     *
-     * @param string|array $url URL or an array of the URI template to expand
-     *                          followed by a hash of template varnames.
-     * @return string
-     * @throws \InvalidArgumentException
-     */
-    private function buildUrl($url)
-    {
-        // URI template (absolute or relative)
-        if (!is_array($url)) {
-            return strpos($url, '://')
-                ? (string) $url
-                : (string) $this->baseUrl->combine($url);
+        if (!empty($config['cookies']) && $config['cookies'] === true) {
+            $this->config['cookies'] = new CookieJar();
         }
 
-        if (!isset($url[1])) {
-            throw new \InvalidArgumentException('You must provide a hash of '
-                . 'varname options in the second element of a URL array.');
-        }
-
-        // Absolute URL
-        if (strpos($url[0], '://')) {
-            return Utils::uriTemplate($url[0], $url[1]);
-        }
-
-        // Combine the relative URL with the base URL
-        return (string) $this->baseUrl->combine(
-            Utils::uriTemplate($url[0], $url[1])
-        );
-    }
-
-    private function configureBaseUrl(&$config)
-    {
-        if (!isset($config['base_url'])) {
-            $this->baseUrl = new Url('', '');
-        } elseif (!is_array($config['base_url'])) {
-            $this->baseUrl = Url::fromString($config['base_url']);
-        } elseif (count($config['base_url']) < 2) {
-            throw new \InvalidArgumentException('You must provide a hash of '
-                . 'varname options in the second element of a base_url array.');
+        // Add the default user-agent header.
+        if (!isset($this->config['headers'])) {
+            $this->config['headers'] = ['User-Agent' => default_user_agent()];
         } else {
-            $this->baseUrl = Url::fromString(
-                Utils::uriTemplate(
-                    $config['base_url'][0],
-                    $config['base_url'][1]
-                )
-            );
-            $config['base_url'] = (string) $this->baseUrl;
-        }
-    }
-
-    private function configureDefaults($config)
-    {
-        if (!isset($config['defaults'])) {
-            $this->defaults = $this->getDefaultOptions();
-        } else {
-            $this->defaults = array_replace(
-                $this->getDefaultOptions(),
-                $config['defaults']
-            );
-        }
-
-        // Add the default user-agent header
-        if (!isset($this->defaults['headers'])) {
-            $this->defaults['headers'] = [
-                'User-Agent' => static::getDefaultUserAgent()
-            ];
-        } elseif (!Core::hasHeader($this->defaults, 'User-Agent')) {
-            // Add the User-Agent header if one was not already set
-            $this->defaults['headers']['User-Agent'] = static::getDefaultUserAgent();
+            // Add the User-Agent header if one was not already set.
+            foreach (array_keys($this->config['headers']) as $name) {
+                if (strtolower($name) === 'user-agent') {
+                    return;
+                }
+            }
+            $this->config['headers']['User-Agent'] = default_user_agent();
         }
     }
 
     /**
-     * Merges default options into the array passed by reference.
+     * Merges default options into the array.
      *
      * @param array $options Options to modify by reference
      *
      * @return array
      */
-    private function mergeDefaults($options)
+    private function prepareDefaults($options)
     {
-        $defaults = $this->defaults;
+        $defaults = $this->config;
 
-        // Case-insensitively merge in default headers if both defaults and
-        // options have headers specified.
-        if (!empty($defaults['headers']) && !empty($options['headers'])) {
-            // Create a set of lowercased keys that are present.
-            $lkeys = [];
-            foreach (array_keys($options['headers']) as $k) {
-                $lkeys[strtolower($k)] = true;
-            }
-            // Merge in lowercase default keys when not present in above set.
-            foreach ($defaults['headers'] as $key => $value) {
-                if (!isset($lkeys[strtolower($key)])) {
-                    $options['headers'][$key] = $value;
-                }
-            }
-            // No longer need to merge in headers.
+        if (!empty($defaults['headers'])) {
+            // Default headers are only added if they are not present.
+            $defaults['_conditional'] = $defaults['headers'];
             unset($defaults['headers']);
         }
 
-        $result = array_replace_recursive($defaults, $options);
-        foreach ($options as $k => $v) {
+        // Special handling for headers is required as they are added as
+        // conditional headers and as headers passed to a request ctor.
+        if (array_key_exists('headers', $options)) {
+            // Allows default headers to be unset.
+            if ($options['headers'] === null) {
+                $defaults['_conditional'] = null;
+                unset($options['headers']);
+            } elseif (!is_array($options['headers'])) {
+                throw new \InvalidArgumentException('headers must be an array');
+            }
+        }
+
+        // Shallow merge defaults underneath options.
+        $result = $options + $defaults;
+
+        // Remove null values.
+        foreach ($result as $k => $v) {
             if ($v === null) {
                 unset($result[$k]);
             }
@@ -393,11 +235,159 @@ class Client implements ClientInterface
     }
 
     /**
-     * @deprecated Use {@see GuzzleHttp\Pool} instead.
-     * @see GuzzleHttp\Pool
+     * Transfers the given request and applies request options.
+     *
+     * The URI of the request is not modified and the request options are used
+     * as-is without merging in default options.
+     *
+     * @param RequestInterface $request
+     * @param array            $options
+     *
+     * @return Promise\PromiseInterface
      */
-    public function sendAll($requests, array $options = [])
+    private function transfer(RequestInterface $request, array $options)
     {
-        Pool::send($this, $requests, $options);
+        // save_to -> sink
+        if (isset($options['save_to'])) {
+            $options['sink'] = $options['save_to'];
+            unset($options['save_to']);
+        }
+
+        // exceptions -> http_error
+        if (isset($options['exceptions'])) {
+            $options['http_errors'] = $options['exceptions'];
+            unset($options['exceptions']);
+        }
+
+        $request = $this->applyOptions($request, $options);
+        $handler = $options['handler'];
+
+        try {
+            return Promise\promise_for($handler($request, $options));
+        } catch (\Exception $e) {
+            return Promise\rejection_for($e);
+        }
+    }
+
+    /**
+     * Applies the array of request options to a request.
+     *
+     * @param RequestInterface $request
+     * @param array            $options
+     *
+     * @return RequestInterface
+     */
+    private function applyOptions(RequestInterface $request, array &$options)
+    {
+        $modify = [];
+
+        if (isset($options['form_params'])) {
+            if (isset($options['multipart'])) {
+                throw new \InvalidArgumentException('You cannot use '
+                    . 'form_params and multipart at the same time. Use the '
+                    . 'form_params option if you want to send application/'
+                    . 'x-www-form-urlencoded requests, and the multipart '
+                    . 'option to send multipart/form-data requests.');
+            }
+            $options['body'] = http_build_query($options['form_params'], null, '&');
+            unset($options['form_params']);
+            $options['_conditional']['Content-Type'] = 'application/x-www-form-urlencoded';
+        }
+
+        if (isset($options['multipart'])) {
+            $elements = $options['multipart'];
+            unset($options['multipart']);
+            $options['body'] = new Psr7\MultipartStream($elements);
+            // Use a multipart/form-data POST if a Content-Type is not set.
+            $options['_conditional']['Content-Type'] = 'multipart/form-data; boundary='
+                . $options['body']->getBoundary();
+        }
+
+        if (!empty($options['decode_content'])
+            && $options['decode_content'] !== true
+        ) {
+            $modify['set_headers']['Accept-Encoding'] = $options['decode_content'];
+        }
+
+        if (isset($options['headers'])) {
+            if (isset($modify['set_headers'])) {
+                $modify['set_headers'] = $options['headers'] + $modify['set_headers'];
+            } else {
+                $modify['set_headers'] = $options['headers'];
+            }
+            unset($options['headers']);
+        }
+
+        if (isset($options['body'])) {
+            if (is_array($options['body'])) {
+                $this->invalidBody();
+            }
+            $modify['body'] = Psr7\stream_for($options['body']);
+            unset($options['body']);
+        }
+
+        if (!empty($options['auth'])) {
+            $value = $options['auth'];
+            $type = is_array($value)
+                ? (isset($value[2]) ? strtolower($value[2]) : 'basic')
+                : $value;
+            $config['auth'] = $value;
+            switch (strtolower($type)) {
+                case 'basic':
+                    $modify['set_headers']['Authorization'] = 'Basic '
+                        . base64_encode("$value[0]:$value[1]");
+                    break;
+                case 'digest':
+                    // @todo: Do not rely on curl
+                    $options['curl'][CURLOPT_HTTPAUTH] = CURLAUTH_DIGEST;
+                    $options['curl'][CURLOPT_USERPWD] = "$value[0]:$value[1]";
+                    break;
+            }
+        }
+
+        if (isset($options['query'])) {
+            $value = $options['query'];
+            if (is_array($value)) {
+                $value = http_build_query($value, null, '&', PHP_QUERY_RFC3986);
+            }
+            if (!is_string($value)) {
+                throw new Iae('query must be a string or array');
+            }
+            $modify['query'] = $value;
+            unset($options['query']);
+        }
+
+        if (isset($options['json'])) {
+            $modify['body'] = Psr7\stream_for(json_encode($options['json']));
+            $options['_conditional']['Content-Type'] = 'application/json';
+            unset($options['json']);
+        }
+
+        $request = Psr7\modify_request($request, $modify);
+
+        // Merge in conditional headers if they are not present.
+        if (isset($options['_conditional'])) {
+            // Build up the changes so it's in a single clone of the message.
+            $modify = [];
+            foreach ($options['_conditional'] as $k => $v) {
+                if (!$request->hasHeader($k)) {
+                    $modify['set_headers'][$k] = $v;
+                }
+            }
+            $request = Psr7\modify_request($request, $modify);
+            // Don't pass this internal value along to middleware/handlers.
+            unset($options['_conditional']);
+        }
+
+        return $request;
+    }
+
+    private function invalidBody()
+    {
+        throw new \InvalidArgumentException('Passing in the "body" request '
+            . 'option as an array to send a POST request has been deprecated. '
+            . 'Please use the "form_params" request option to send a '
+            . 'application/x-www-form-urlencoded request, or a the "multipart" '
+            . 'request option to send a multipart/form-data request.');
     }
 }
diff --git a/core/vendor/guzzlehttp/guzzle/src/ClientInterface.php b/core/vendor/guzzlehttp/guzzle/src/ClientInterface.php
index fac88645d..7d155e564 100644
--- a/core/vendor/guzzlehttp/guzzle/src/ClientInterface.php
+++ b/core/vendor/guzzlehttp/guzzle/src/ClientInterface.php
@@ -1,150 +1,84 @@
 <?php
 namespace GuzzleHttp;
 
-use GuzzleHttp\Event\HasEmitterInterface;
-use GuzzleHttp\Exception\RequestException;
-use GuzzleHttp\Message\RequestInterface;
-use GuzzleHttp\Message\ResponseInterface;
+use GuzzleHttp\Promise\PromiseInterface;
+use GuzzleHttp\Exception\GuzzleException;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\UriInterface;
 
 /**
- * Client interface for sending HTTP requests
+ * Client interface for sending HTTP requests.
  */
-interface ClientInterface extends HasEmitterInterface
+interface ClientInterface
 {
-    const VERSION = '5.2.0';
+    const VERSION = '6.0.2';
 
     /**
-     * Create and return a new {@see RequestInterface} object.
+     * Send an HTTP request.
+     *
+     * @param RequestInterface $request Request to send
+     * @param array            $options Request options to apply to the given
+     *                                  request and to the transfer.
+     *
+     * @return ResponseInterface
+     * @throws GuzzleException
+     */
+    public function send(RequestInterface $request, array $options = []);
+
+    /**
+     * Asynchronously send an HTTP request.
+     *
+     * @param RequestInterface $request Request to send
+     * @param array            $options Request options to apply to the given
+     *                                  request and to the transfer.
+     *
+     * @return PromiseInterface
+     */
+    public function sendAsync(RequestInterface $request, array $options = []);
+
+    /**
+     * Create and send an HTTP request.
+     *
+     * Use an absolute path to override the base path of the client, or a
+     * relative path to append to the base path of the client. The URL can
+     * contain the query string as well.
+     *
+     * @param string              $method  HTTP method
+     * @param string|UriInterface $uri     URI object or string.
+     * @param array               $options Request options to apply.
+     *
+     * @return ResponseInterface
+     * @throws GuzzleException
+     */
+    public function request($method, $uri, array $options = []);
+
+    /**
+     * Create and send an asynchronous HTTP request.
      *
      * Use an absolute path to override the base path of the client, or a
      * relative path to append to the base path of the client. The URL can
      * contain the query string as well. Use an array to provide a URL
      * template and additional variables to use in the URL template expansion.
      *
-     * @param string           $method  HTTP method
-     * @param string|array|Url $url     URL or URI template
-     * @param array            $options Array of request options to apply.
+     * @param string              $method  HTTP method
+     * @param string|UriInterface $uri     URI object or string.
+     * @param array               $options Request options to apply.
      *
-     * @return RequestInterface
+     * @return PromiseInterface
      */
-    public function createRequest($method, $url = null, array $options = []);
+    public function requestAsync($method, $uri, array $options = []);
 
     /**
-     * Send a GET request
+     * Get a client configuration option.
      *
-     * @param string|array|Url $url     URL or URI template
-     * @param array            $options Array of request options to apply.
+     * These options include default request options of the client, a "handler"
+     * (if utilized by the concrete client), and a "base_uri" if utilized by
+     * the concrete client.
      *
-     * @return ResponseInterface
-     * @throws RequestException When an error is encountered
-     */
-    public function get($url = null, $options = []);
-
-    /**
-     * Send a HEAD request
-     *
-     * @param string|array|Url $url     URL or URI template
-     * @param array            $options Array of request options to apply.
-     *
-     * @return ResponseInterface
-     * @throws RequestException When an error is encountered
-     */
-    public function head($url = null, array $options = []);
-
-    /**
-     * Send a DELETE request
-     *
-     * @param string|array|Url $url     URL or URI template
-     * @param array            $options Array of request options to apply.
-     *
-     * @return ResponseInterface
-     * @throws RequestException When an error is encountered
-     */
-    public function delete($url = null, array $options = []);
-
-    /**
-     * Send a PUT request
-     *
-     * @param string|array|Url $url     URL or URI template
-     * @param array            $options Array of request options to apply.
-     *
-     * @return ResponseInterface
-     * @throws RequestException When an error is encountered
-     */
-    public function put($url = null, array $options = []);
-
-    /**
-     * Send a PATCH request
-     *
-     * @param string|array|Url $url     URL or URI template
-     * @param array            $options Array of request options to apply.
-     *
-     * @return ResponseInterface
-     * @throws RequestException When an error is encountered
-     */
-    public function patch($url = null, array $options = []);
-
-    /**
-     * Send a POST request
-     *
-     * @param string|array|Url $url     URL or URI template
-     * @param array            $options Array of request options to apply.
-     *
-     * @return ResponseInterface
-     * @throws RequestException When an error is encountered
-     */
-    public function post($url = null, array $options = []);
-
-    /**
-     * Send an OPTIONS request
-     *
-     * @param string|array|Url $url     URL or URI template
-     * @param array            $options Array of request options to apply.
-     *
-     * @return ResponseInterface
-     * @throws RequestException When an error is encountered
-     */
-    public function options($url = null, array $options = []);
-
-    /**
-     * Sends a single request
-     *
-     * @param RequestInterface $request Request to send
-     *
-     * @return \GuzzleHttp\Message\ResponseInterface
-     * @throws \LogicException When the handler does not populate a response
-     * @throws RequestException When an error is encountered
-     */
-    public function send(RequestInterface $request);
-
-    /**
-     * Get default request options of the client.
-     *
-     * @param string|null $keyOrPath The Path to a particular default request
-     *     option to retrieve or pass null to retrieve all default request
-     *     options. The syntax uses "/" to denote a path through nested PHP
-     *     arrays. For example, "headers/content-type".
+     * @param string|null $option The config option to retrieve.
      *
      * @return mixed
      */
-    public function getDefaultOption($keyOrPath = null);
-
-    /**
-     * Set a default request option on the client so that any request created
-     * by the client will use the provided default value unless overridden
-     * explicitly when creating a request.
-     *
-     * @param string|null $keyOrPath The Path to a particular configuration
-     *     value to set. The syntax uses a path notation that allows you to
-     *     specify nested configuration values (e.g., 'headers/content-type').
-     * @param mixed $value Default request option value to set
-     */
-    public function setDefaultOption($keyOrPath, $value);
-
-    /**
-     * Get the base URL of the client.
-     *
-     * @return string Returns the base URL if present
-     */
-    public function getBaseUrl();
+    public function getConfig($option = null);
 }
diff --git a/core/vendor/guzzlehttp/guzzle/src/Collection.php b/core/vendor/guzzlehttp/guzzle/src/Collection.php
deleted file mode 100644
index 4aabd20b0..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Collection.php
+++ /dev/null
@@ -1,236 +0,0 @@
-<?php
-namespace GuzzleHttp;
-
-/**
- * Key value pair collection object
- */
-class Collection implements
-    \ArrayAccess,
-    \IteratorAggregate,
-    \Countable,
-    ToArrayInterface
-{
-    use HasDataTrait;
-
-    /**
-     * @param array $data Associative array of data to set
-     */
-    public function __construct(array $data = [])
-    {
-        $this->data = $data;
-    }
-
-    /**
-     * Create a new collection from an array, validate the keys, and add default
-     * values where missing
-     *
-     * @param array $config   Configuration values to apply.
-     * @param array $defaults Default parameters
-     * @param array $required Required parameter names
-     *
-     * @return self
-     * @throws \InvalidArgumentException if a parameter is missing
-     */
-    public static function fromConfig(
-        array $config = [],
-        array $defaults = [],
-        array $required = []
-    ) {
-        $data = $config + $defaults;
-
-        if ($missing = array_diff($required, array_keys($data))) {
-            throw new \InvalidArgumentException(
-                'Config is missing the following keys: ' .
-                implode(', ', $missing));
-        }
-
-        return new self($data);
-    }
-
-    /**
-     * Removes all key value pairs
-     */
-    public function clear()
-    {
-        $this->data = [];
-    }
-
-    /**
-     * Get a specific key value.
-     *
-     * @param string $key Key to retrieve.
-     *
-     * @return mixed|null Value of the key or NULL
-     */
-    public function get($key)
-    {
-        return isset($this->data[$key]) ? $this->data[$key] : null;
-    }
-
-    /**
-     * Set a key value pair
-     *
-     * @param string $key   Key to set
-     * @param mixed  $value Value to set
-     */
-    public function set($key, $value)
-    {
-        $this->data[$key] = $value;
-    }
-
-    /**
-     * Add a value to a key.  If a key of the same name has already been added,
-     * the key value will be converted into an array and the new value will be
-     * pushed to the end of the array.
-     *
-     * @param string $key   Key to add
-     * @param mixed  $value Value to add to the key
-     */
-    public function add($key, $value)
-    {
-        if (!array_key_exists($key, $this->data)) {
-            $this->data[$key] = $value;
-        } elseif (is_array($this->data[$key])) {
-            $this->data[$key][] = $value;
-        } else {
-            $this->data[$key] = array($this->data[$key], $value);
-        }
-    }
-
-    /**
-     * Remove a specific key value pair
-     *
-     * @param string $key A key to remove
-     */
-    public function remove($key)
-    {
-        unset($this->data[$key]);
-    }
-
-    /**
-     * Get all keys in the collection
-     *
-     * @return array
-     */
-    public function getKeys()
-    {
-        return array_keys($this->data);
-    }
-
-    /**
-     * Returns whether or not the specified key is present.
-     *
-     * @param string $key The key for which to check the existence.
-     *
-     * @return bool
-     */
-    public function hasKey($key)
-    {
-        return array_key_exists($key, $this->data);
-    }
-
-    /**
-     * Checks if any keys contains a certain value
-     *
-     * @param string $value Value to search for
-     *
-     * @return mixed Returns the key if the value was found FALSE if the value
-     *     was not found.
-     */
-    public function hasValue($value)
-    {
-        return array_search($value, $this->data, true);
-    }
-
-    /**
-     * Replace the data of the object with the value of an array
-     *
-     * @param array $data Associative array of data
-     */
-    public function replace(array $data)
-    {
-        $this->data = $data;
-    }
-
-    /**
-     * Add and merge in a Collection or array of key value pair data.
-     *
-     * @param Collection|array $data Associative array of key value pair data
-     */
-    public function merge($data)
-    {
-        foreach ($data as $key => $value) {
-            $this->add($key, $value);
-        }
-    }
-
-    /**
-     * Overwrite key value pairs in this collection with all of the data from
-     * an array or collection.
-     *
-     * @param array|\Traversable $data Values to override over this config
-     */
-    public function overwriteWith($data)
-    {
-        if (is_array($data)) {
-            $this->data = $data + $this->data;
-        } elseif ($data instanceof Collection) {
-            $this->data = $data->toArray() + $this->data;
-        } else {
-            foreach ($data as $key => $value) {
-                $this->data[$key] = $value;
-            }
-        }
-    }
-
-    /**
-     * Returns a Collection containing all the elements of the collection after
-     * applying the callback function to each one.
-     *
-     * The callable should accept three arguments:
-     * - (string) $key
-     * - (string) $value
-     * - (array) $context
-     *
-     * The callable must return a the altered or unaltered value.
-     *
-     * @param callable $closure Map function to apply
-     * @param array    $context Context to pass to the callable
-     *
-     * @return Collection
-     */
-    public function map(callable $closure, array $context = [])
-    {
-        $collection = new static();
-        foreach ($this as $key => $value) {
-            $collection[$key] = $closure($key, $value, $context);
-        }
-
-        return $collection;
-    }
-
-    /**
-     * Iterates over each key value pair in the collection passing them to the
-     * callable. If the callable returns true, the current value from input is
-     * returned into the result Collection.
-     *
-     * The callable must accept two arguments:
-     * - (string) $key
-     * - (string) $value
-     *
-     * @param callable $closure Evaluation function
-     *
-     * @return Collection
-     */
-    public function filter(callable $closure)
-    {
-        $collection = new static();
-        foreach ($this->data as $key => $value) {
-            if ($closure($key, $value)) {
-                $collection[$key] = $value;
-            }
-        }
-
-        return $collection;
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php b/core/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php
index f8ac7dd35..4270469fc 100644
--- a/core/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php
+++ b/core/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php
@@ -1,14 +1,13 @@
 <?php
 namespace GuzzleHttp\Cookie;
 
-use GuzzleHttp\Message\RequestInterface;
-use GuzzleHttp\Message\ResponseInterface;
-use GuzzleHttp\ToArrayInterface;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
 
 /**
  * Cookie jar that stores cookies an an array
  */
-class CookieJar implements CookieJarInterface, ToArrayInterface
+class CookieJar implements CookieJarInterface
 {
     /** @var SetCookie[] Loaded cookie data */
     private $cookies = [];
@@ -194,23 +193,24 @@ class CookieJar implements CookieJarInterface, ToArrayInterface
         RequestInterface $request,
         ResponseInterface $response
     ) {
-        if ($cookieHeader = $response->getHeaderAsArray('Set-Cookie')) {
+        if ($cookieHeader = $response->getHeader('Set-Cookie')) {
             foreach ($cookieHeader as $cookie) {
                 $sc = SetCookie::fromString($cookie);
                 if (!$sc->getDomain()) {
-                    $sc->setDomain($request->getHost());
+                    $sc->setDomain($request->getUri()->getHost());
                 }
                 $this->setCookie($sc);
             }
         }
     }
 
-    public function addCookieHeader(RequestInterface $request)
+    public function withCookieHeader(RequestInterface $request)
     {
         $values = [];
-        $scheme = $request->getScheme();
-        $host = $request->getHost();
-        $path = $request->getPath();
+        $uri = $request->getUri();
+        $scheme = $uri->getScheme();
+        $host = $uri->getHost();
+        $path = $uri->getPath() ?: '/';
 
         foreach ($this->cookies as $cookie) {
             if ($cookie->matchesPath($path) &&
@@ -223,9 +223,9 @@ class CookieJar implements CookieJarInterface, ToArrayInterface
             }
         }
 
-        if ($values) {
-            $request->setHeader('Cookie', implode('; ', $values));
-        }
+        return $values
+            ? $request->withHeader('Cookie', implode('; ', $values))
+            : $request;
     }
 
     /**
diff --git a/core/vendor/guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php b/core/vendor/guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php
index 4ea8567e8..2cf298a86 100644
--- a/core/vendor/guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php
+++ b/core/vendor/guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php
@@ -1,8 +1,8 @@
 <?php
 namespace GuzzleHttp\Cookie;
 
-use GuzzleHttp\Message\RequestInterface;
-use GuzzleHttp\Message\ResponseInterface;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
 
 /**
  * Stores HTTP cookies.
@@ -17,14 +17,16 @@ use GuzzleHttp\Message\ResponseInterface;
 interface CookieJarInterface extends \Countable, \IteratorAggregate
 {
     /**
-     * Add a Cookie header to a request.
+     * Create a request with added cookie headers.
      *
      * If no matching cookies are found in the cookie jar, then no Cookie
-     * header is added to the request.
+     * header is added to the request and the same request is returned.
      *
-     * @param RequestInterface $request Request object to update
+     * @param RequestInterface $request Request object to modify.
+     *
+     * @return RequestInterface returns the modified request.
      */
-    public function addCookieHeader(RequestInterface $request);
+    public function withCookieHeader(RequestInterface $request);
 
     /**
      * Extract cookies from an HTTP response and store them in the CookieJar.
@@ -72,4 +74,11 @@ interface CookieJarInterface extends \Countable, \IteratorAggregate
      * to RFC 2965.
      */
     public function clearSessionCookies();
+
+    /**
+     * Converts the cookie jar to an array.
+     *
+     * @return array
+     */
+    public function toArray();
 }
diff --git a/core/vendor/guzzlehttp/guzzle/src/Cookie/FileCookieJar.php b/core/vendor/guzzlehttp/guzzle/src/Cookie/FileCookieJar.php
index e43185172..28cfad54d 100644
--- a/core/vendor/guzzlehttp/guzzle/src/Cookie/FileCookieJar.php
+++ b/core/vendor/guzzlehttp/guzzle/src/Cookie/FileCookieJar.php
@@ -1,8 +1,6 @@
 <?php
 namespace GuzzleHttp\Cookie;
 
-use GuzzleHttp\Utils;
-
 /**
  * Persists non-session cookies using a JSON formatted file
  */
@@ -45,15 +43,14 @@ class FileCookieJar extends CookieJar
     {
         $json = [];
         foreach ($this as $cookie) {
+            /** @var SetCookie $cookie */
             if ($cookie->getExpires() && !$cookie->getDiscard()) {
                 $json[] = $cookie->toArray();
             }
         }
 
         if (false === file_put_contents($filename, json_encode($json))) {
-            // @codeCoverageIgnoreStart
             throw new \RuntimeException("Unable to save file {$filename}");
-            // @codeCoverageIgnoreEnd
         }
     }
 
@@ -69,14 +66,12 @@ class FileCookieJar extends CookieJar
     {
         $json = file_get_contents($filename);
         if (false === $json) {
-            // @codeCoverageIgnoreStart
             throw new \RuntimeException("Unable to load file {$filename}");
-            // @codeCoverageIgnoreEnd
         }
 
-        $data = Utils::jsonDecode($json, true);
+        $data = json_decode($json, true);
         if (is_array($data)) {
-            foreach (Utils::jsonDecode($json, true) as $cookie) {
+            foreach (json_decode($json, true) as $cookie) {
                 $this->setCookie(new SetCookie($cookie));
             }
         } elseif (strlen($data)) {
diff --git a/core/vendor/guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php b/core/vendor/guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php
index 71a02d56d..1688eb670 100644
--- a/core/vendor/guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php
+++ b/core/vendor/guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php
@@ -1,8 +1,6 @@
 <?php
 namespace GuzzleHttp\Cookie;
 
-use GuzzleHttp\Utils;
-
 /**
  * Persists cookies in the client session
  */
@@ -37,6 +35,7 @@ class SessionCookieJar extends CookieJar
     {
         $json = [];
         foreach ($this as $cookie) {
+            /** @var SetCookie $cookie */
             if ($cookie->getExpires() && !$cookie->getDiscard()) {
                 $json[] = $cookie->toArray();
             }
@@ -54,7 +53,7 @@ class SessionCookieJar extends CookieJar
             ? $_SESSION[$this->sessionKey]
             : null;
 
-        $data = Utils::jsonDecode($cookieJar, true);
+        $data = json_decode($cookieJar, true);
         if (is_array($data)) {
             foreach ($data as $cookie) {
                 $this->setCookie(new SetCookie($cookie));
diff --git a/core/vendor/guzzlehttp/guzzle/src/Cookie/SetCookie.php b/core/vendor/guzzlehttp/guzzle/src/Cookie/SetCookie.php
index ac9a89081..8613e2584 100644
--- a/core/vendor/guzzlehttp/guzzle/src/Cookie/SetCookie.php
+++ b/core/vendor/guzzlehttp/guzzle/src/Cookie/SetCookie.php
@@ -1,12 +1,10 @@
 <?php
 namespace GuzzleHttp\Cookie;
 
-use GuzzleHttp\ToArrayInterface;
-
 /**
  * Set-Cookie object
  */
-class SetCookie implements ToArrayInterface
+class SetCookie
 {
     /** @var array */
     private static $defaults = [
@@ -350,8 +348,8 @@ class SetCookie implements ToArrayInterface
         }
 
         // Check if any of the invalid characters are present in the cookie name
-        if (preg_match("/[=,; \t\r\n\013\014]/", $name)) {
-            return "Cookie name must not cannot invalid characters: =,; \\t\\r\\n\\013\\014";
+        if (preg_match('/[\x00-\x20\x22\x28-\x29\x2c\x2f\x3a-\x40\x5b-\x5d\x7b\x7d\x7f]/', $name)) {
+            return 'Cookie name must not contain invalid characters: ASCII Control characters (0-31;127), space, tab and the following characters: ()<>@,;:\"/[]?={}';
         }
 
         // Value must not be empty, but can be 0
diff --git a/core/vendor/guzzlehttp/guzzle/src/Event/AbstractEvent.php b/core/vendor/guzzlehttp/guzzle/src/Event/AbstractEvent.php
deleted file mode 100644
index 0d2f4dbf0..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Event/AbstractEvent.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-namespace GuzzleHttp\Event;
-
-/**
- * Basic event class that can be extended.
- */
-abstract class AbstractEvent implements EventInterface
-{
-    private $propagationStopped = false;
-
-    public function isPropagationStopped()
-    {
-        return $this->propagationStopped;
-    }
-
-    public function stopPropagation()
-    {
-        $this->propagationStopped = true;
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Event/AbstractRequestEvent.php b/core/vendor/guzzlehttp/guzzle/src/Event/AbstractRequestEvent.php
deleted file mode 100644
index 8c8fbc94a..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Event/AbstractRequestEvent.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-namespace GuzzleHttp\Event;
-
-use GuzzleHttp\Transaction;
-use GuzzleHttp\ClientInterface;
-use GuzzleHttp\Message\RequestInterface;
-
-/**
- * Base class for request events, providing a request and client getter.
- */
-abstract class AbstractRequestEvent extends AbstractEvent
-{
-    /** @var Transaction */
-    protected $transaction;
-
-    /**
-     * @param Transaction $transaction
-     */
-    public function __construct(Transaction $transaction)
-    {
-        $this->transaction = $transaction;
-    }
-
-    /**
-     * Get the HTTP client associated with the event.
-     *
-     * @return ClientInterface
-     */
-    public function getClient()
-    {
-        return $this->transaction->client;
-    }
-
-    /**
-     * Get the request object
-     *
-     * @return RequestInterface
-     */
-    public function getRequest()
-    {
-        return $this->transaction->request;
-    }
-
-    /**
-     * Get the number of transaction retries.
-     *
-     * @return int
-     */
-    public function getRetryCount()
-    {
-        return $this->transaction->retries;
-    }
-
-    /**
-     * @return Transaction
-     */
-    protected function getTransaction()
-    {
-        return $this->transaction;
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Event/AbstractRetryableEvent.php b/core/vendor/guzzlehttp/guzzle/src/Event/AbstractRetryableEvent.php
deleted file mode 100644
index bbbdfaf83..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Event/AbstractRetryableEvent.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-namespace GuzzleHttp\Event;
-
-/**
- * Abstract request event that can be retried.
- */
-class AbstractRetryableEvent extends AbstractTransferEvent
-{
-    /**
-     * Mark the request as needing a retry and stop event propagation.
-     *
-     * This action allows you to retry a request without emitting the "end"
-     * event multiple times for a given request. When retried, the request
-     * emits a before event and is then sent again using the client that sent
-     * the original request.
-     *
-     * When retrying, it is important to limit the number of retries you allow
-     * to prevent infinite loops.
-     *
-     * This action can only be taken during the "complete" and "error" events.
-     *
-     * @param int $afterDelay If specified, the amount of time in milliseconds
-     *                        to delay before retrying. Note that this must
-     *                        be supported by the underlying RingPHP handler
-     *                        to work properly. Set to 0 or provide no value
-     *                        to retry immediately.
-     */
-    public function retry($afterDelay = 0)
-    {
-        // Setting the transition state to 'retry' will cause the next state
-        // transition of the transaction to retry the request.
-        $this->transaction->state = 'retry';
-
-        if ($afterDelay) {
-            $this->transaction->request->getConfig()->set('delay', $afterDelay);
-        }
-
-        $this->stopPropagation();
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Event/AbstractTransferEvent.php b/core/vendor/guzzlehttp/guzzle/src/Event/AbstractTransferEvent.php
deleted file mode 100644
index 3b106df00..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Event/AbstractTransferEvent.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-namespace GuzzleHttp\Event;
-
-use GuzzleHttp\Message\ResponseInterface;
-use GuzzleHttp\Ring\Future\FutureInterface;
-
-/**
- * Event that contains transfer statistics, and can be intercepted.
- */
-abstract class AbstractTransferEvent extends AbstractRequestEvent
-{
-    /**
-     * Get all transfer information as an associative array if no $name
-     * argument is supplied, or gets a specific transfer statistic if
-     * a $name attribute is supplied (e.g., 'total_time').
-     *
-     * @param string $name Name of the transfer stat to retrieve
-     *
-     * @return mixed|null|array
-     */
-    public function getTransferInfo($name = null)
-    {
-        if (!$name) {
-            return $this->transaction->transferInfo;
-        }
-
-        return isset($this->transaction->transferInfo[$name])
-            ? $this->transaction->transferInfo[$name]
-            : null;
-    }
-
-    /**
-     * Returns true/false if a response is available.
-     *
-     * @return bool
-     */
-    public function hasResponse()
-    {
-        return !($this->transaction->response instanceof FutureInterface);
-    }
-
-    /**
-     * Get the response.
-     *
-     * @return ResponseInterface|null
-     */
-    public function getResponse()
-    {
-        return $this->hasResponse() ? $this->transaction->response : null;
-    }
-
-    /**
-     * Intercept the request and associate a response
-     *
-     * @param ResponseInterface $response Response to set
-     */
-    public function intercept(ResponseInterface $response)
-    {
-        $this->transaction->response = $response;
-        $this->transaction->exception = null;
-        $this->stopPropagation();
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Event/BeforeEvent.php b/core/vendor/guzzlehttp/guzzle/src/Event/BeforeEvent.php
deleted file mode 100644
index f313c3756..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Event/BeforeEvent.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-namespace GuzzleHttp\Event;
-
-use GuzzleHttp\Message\ResponseInterface;
-
-/**
- * Event object emitted before a request is sent.
- *
- * This event MAY be emitted multiple times (i.e., if a request is retried).
- * You MAY change the Response associated with the request using the
- * intercept() method of the event.
- */
-class BeforeEvent extends AbstractRequestEvent
-{
-    /**
-     * Intercept the request and associate a response
-     *
-     * @param ResponseInterface $response Response to set
-     */
-    public function intercept(ResponseInterface $response)
-    {
-        $this->transaction->response = $response;
-        $this->transaction->exception = null;
-        $this->stopPropagation();
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Event/CompleteEvent.php b/core/vendor/guzzlehttp/guzzle/src/Event/CompleteEvent.php
deleted file mode 100644
index 56cc557e3..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Event/CompleteEvent.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-namespace GuzzleHttp\Event;
-
-/**
- * Event object emitted after a request has been completed.
- *
- * This event MAY be emitted multiple times for a single request. You MAY
- * change the Response associated with the request using the intercept()
- * method of the event.
- *
- * This event allows the request to be retried if necessary using the retry()
- * method of the event.
- */
-class CompleteEvent extends AbstractRetryableEvent {}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Event/Emitter.php b/core/vendor/guzzlehttp/guzzle/src/Event/Emitter.php
deleted file mode 100644
index 536317a9c..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Event/Emitter.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-namespace GuzzleHttp\Event;
-
-/**
- * Guzzle event emitter.
- *
- * Some of this class is based on the Symfony EventDispatcher component, which
- * ships with the following license:
- *
- *     This file is part of the Symfony package.
- *
- *     (c) Fabien Potencier <fabien@symfony.com>
- *
- *     For the full copyright and license information, please view the LICENSE
- *     file that was distributed with this source code.
- *
- * @link https://github.com/symfony/symfony/tree/master/src/Symfony/Component/EventDispatcher
- */
-class Emitter implements EmitterInterface
-{
-    /** @var array */
-    private $listeners = [];
-
-    /** @var array */
-    private $sorted = [];
-
-    public function on($eventName, callable $listener, $priority = 0)
-    {
-        if ($priority === 'first') {
-            $priority = isset($this->listeners[$eventName])
-                ? max(array_keys($this->listeners[$eventName])) + 1
-                : 1;
-        } elseif ($priority === 'last') {
-            $priority = isset($this->listeners[$eventName])
-                ? min(array_keys($this->listeners[$eventName])) - 1
-                : -1;
-        }
-
-        $this->listeners[$eventName][$priority][] = $listener;
-        unset($this->sorted[$eventName]);
-    }
-
-    public function once($eventName, callable $listener, $priority = 0)
-    {
-        $onceListener = function (
-            EventInterface $event,
-            $eventName
-        ) use (&$onceListener, $eventName, $listener, $priority) {
-            $this->removeListener($eventName, $onceListener);
-            $listener($event, $eventName, $this);
-        };
-
-        $this->on($eventName, $onceListener, $priority);
-    }
-
-    public function removeListener($eventName, callable $listener)
-    {
-        if (empty($this->listeners[$eventName])) {
-            return;
-        }
-
-        foreach ($this->listeners[$eventName] as $priority => $listeners) {
-            if (false !== ($key = array_search($listener, $listeners, true))) {
-                unset(
-                    $this->listeners[$eventName][$priority][$key],
-                    $this->sorted[$eventName]
-                );
-            }
-        }
-    }
-
-    public function listeners($eventName = null)
-    {
-        // Return all events in a sorted priority order
-        if ($eventName === null) {
-            foreach (array_keys($this->listeners) as $eventName) {
-                if (empty($this->sorted[$eventName])) {
-                    $this->listeners($eventName);
-                }
-            }
-            return $this->sorted;
-        }
-
-        // Return the listeners for a specific event, sorted in priority order
-        if (empty($this->sorted[$eventName])) {
-            $this->sorted[$eventName] = [];
-            if (isset($this->listeners[$eventName])) {
-                krsort($this->listeners[$eventName], SORT_NUMERIC);
-                foreach ($this->listeners[$eventName] as $listeners) {
-                    foreach ($listeners as $listener) {
-                        $this->sorted[$eventName][] = $listener;
-                    }
-                }
-            }
-        }
-
-        return $this->sorted[$eventName];
-    }
-
-    public function hasListeners($eventName)
-    {
-        return !empty($this->listeners[$eventName]);
-    }
-
-    public function emit($eventName, EventInterface $event)
-    {
-        if (isset($this->listeners[$eventName])) {
-            foreach ($this->listeners($eventName) as $listener) {
-                $listener($event, $eventName);
-                if ($event->isPropagationStopped()) {
-                    break;
-                }
-            }
-        }
-
-        return $event;
-    }
-
-    public function attach(SubscriberInterface $subscriber)
-    {
-        foreach ($subscriber->getEvents() as $eventName => $listeners) {
-            if (is_array($listeners[0])) {
-                foreach ($listeners as $listener) {
-                    $this->on(
-                        $eventName,
-                        [$subscriber, $listener[0]],
-                        isset($listener[1]) ? $listener[1] : 0
-                    );
-                }
-            } else {
-                $this->on(
-                    $eventName,
-                    [$subscriber, $listeners[0]],
-                    isset($listeners[1]) ? $listeners[1] : 0
-                );
-            }
-        }
-    }
-
-    public function detach(SubscriberInterface $subscriber)
-    {
-        foreach ($subscriber->getEvents() as $eventName => $listener) {
-            $this->removeListener($eventName, [$subscriber, $listener[0]]);
-        }
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Event/EmitterInterface.php b/core/vendor/guzzlehttp/guzzle/src/Event/EmitterInterface.php
deleted file mode 100644
index 9783efd15..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Event/EmitterInterface.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-namespace GuzzleHttp\Event;
-
-/**
- * Guzzle event emitter.
- */
-interface EmitterInterface
-{
-    /**
-     * Binds a listener to a specific event.
-     *
-     * @param string     $eventName Name of the event to bind to.
-     * @param callable   $listener  Listener to invoke when triggered.
-     * @param int|string $priority  The higher this value, the earlier an event
-     *     listener will be triggered in the chain (defaults to 0). You can
-     *     pass "first" or "last" to dynamically specify the event priority
-     *     based on the current event priorities associated with the given
-     *     event name in the emitter. Use "first" to set the priority to the
-     *     current highest priority plus one. Use "last" to set the priority to
-     *     the current lowest event priority minus one.
-     */
-    public function on($eventName, callable $listener, $priority = 0);
-
-    /**
-     * Binds a listener to a specific event. After the listener is triggered
-     * once, it is removed as a listener.
-     *
-     * @param string   $eventName Name of the event to bind to.
-     * @param callable $listener  Listener to invoke when triggered.
-     * @param int      $priority  The higher this value, the earlier an event
-     *     listener will be triggered in the chain (defaults to 0)
-     */
-    public function once($eventName, callable $listener, $priority = 0);
-
-    /**
-     * Removes an event listener from the specified event.
-     *
-     * @param string   $eventName The event to remove a listener from
-     * @param callable $listener  The listener to remove
-     */
-    public function removeListener($eventName, callable $listener);
-
-    /**
-     * Gets the listeners of a specific event or all listeners if no event is
-     * specified.
-     *
-     * @param string $eventName The name of the event. Pass null (the default)
-     *     to retrieve all listeners.
-     *
-     * @return array The event listeners for the specified event, or all event
-     *   listeners by event name. The format of the array when retrieving a
-     *   specific event list is an array of callables. The format of the array
-     *   when retrieving all listeners is an associative array of arrays of
-     *   callables.
-     */
-    public function listeners($eventName = null);
-
-    /**
-     * Checks if the emitter has listeners by the given name.
-     *
-     * @param string $eventName The name of the event to check.
-     *
-     * @return bool
-     */
-    public function hasListeners($eventName);
-
-    /**
-     * Emits an event to all registered listeners.
-     *
-     * Each event that is bound to the emitted eventName receives a
-     * EventInterface, the name of the event, and the event emitter.
-     *
-     * @param string         $eventName The name of the event to dispatch.
-     * @param EventInterface $event     The event to pass to the event handlers/listeners.
-     *
-     * @return EventInterface Returns the provided event object
-     */
-    public function emit($eventName, EventInterface $event);
-
-    /**
-     * Attaches an event subscriber.
-     *
-     * The subscriber is asked for all the events it is interested in and added
-     * as an event listener for each event.
-     *
-     * @param SubscriberInterface $subscriber Subscriber to attach.
-     */
-    public function attach(SubscriberInterface $subscriber);
-
-    /**
-     * Detaches an event subscriber.
-     *
-     * @param SubscriberInterface $subscriber Subscriber to detach.
-     */
-    public function detach(SubscriberInterface $subscriber);
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Event/EndEvent.php b/core/vendor/guzzlehttp/guzzle/src/Event/EndEvent.php
deleted file mode 100644
index c89432b02..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Event/EndEvent.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-namespace GuzzleHttp\Event;
-
-/**
- * A terminal event that is emitted when a request transaction has ended.
- *
- * This event is emitted for both successful responses and responses that
- * encountered an exception. You need to check if an exception is present
- * in your listener to know the difference.
- *
- * You MAY intercept the response associated with the event if needed, but keep
- * in mind that the "complete" event will not be triggered as a result.
- */
-class EndEvent extends AbstractTransferEvent
-{
-    /**
-     * Get the exception that was encountered (if any).
-     *
-     * This method should be used to check if the request was sent successfully
-     * or if it encountered errors.
-     *
-     * @return \Exception|null
-     */
-    public function getException()
-    {
-        return $this->transaction->exception;
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Event/ErrorEvent.php b/core/vendor/guzzlehttp/guzzle/src/Event/ErrorEvent.php
deleted file mode 100644
index 7432134d0..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Event/ErrorEvent.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-namespace GuzzleHttp\Event;
-
-use GuzzleHttp\Exception\RequestException;
-
-/**
- * Event emitted when an error occurs while sending a request.
- *
- * This event MAY be emitted multiple times. You MAY intercept the exception
- * and inject a response into the event to rescue the request using the
- * intercept() method of the event.
- *
- * This event allows the request to be retried using the "retry" method of the
- * event.
- */
-class ErrorEvent extends AbstractRetryableEvent
-{
-    /**
-     * Get the exception that was encountered
-     *
-     * @return RequestException
-     */
-    public function getException()
-    {
-        return $this->transaction->exception;
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Event/EventInterface.php b/core/vendor/guzzlehttp/guzzle/src/Event/EventInterface.php
deleted file mode 100644
index 97247e84c..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Event/EventInterface.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-namespace GuzzleHttp\Event;
-
-/**
- * Base event interface used when dispatching events to listeners using an
- * event emitter.
- */
-interface EventInterface
-{
-    /**
-     * Returns whether or not stopPropagation was called on the event.
-     *
-     * @return bool
-     * @see Event::stopPropagation
-     */
-    public function isPropagationStopped();
-
-    /**
-     * Stops the propagation of the event, preventing subsequent listeners
-     * registered to the same event from being invoked.
-     */
-    public function stopPropagation();
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Event/HasEmitterInterface.php b/core/vendor/guzzlehttp/guzzle/src/Event/HasEmitterInterface.php
deleted file mode 100644
index a1a861249..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Event/HasEmitterInterface.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-namespace GuzzleHttp\Event;
-
-/**
- * Holds an event emitter
- */
-interface HasEmitterInterface
-{
-    /**
-     * Get the event emitter of the object
-     *
-     * @return EmitterInterface
-     */
-    public function getEmitter();
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Event/HasEmitterTrait.php b/core/vendor/guzzlehttp/guzzle/src/Event/HasEmitterTrait.php
deleted file mode 100644
index 8e36ce385..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Event/HasEmitterTrait.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-namespace GuzzleHttp\Event;
-
-/**
- * Trait that implements the methods of HasEmitterInterface
- */
-trait HasEmitterTrait
-{
-    /** @var EmitterInterface */
-    private $emitter;
-
-    public function getEmitter()
-    {
-        if (!$this->emitter) {
-            $this->emitter = new Emitter();
-        }
-
-        return $this->emitter;
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Event/ListenerAttacherTrait.php b/core/vendor/guzzlehttp/guzzle/src/Event/ListenerAttacherTrait.php
deleted file mode 100644
index 407dc92dd..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Event/ListenerAttacherTrait.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-namespace GuzzleHttp\Event;
-
-/**
- * Trait that provides methods for extract event listeners specified in an array
- * and attaching them to an emitter owned by the object or one of its direct
- * dependencies.
- */
-trait ListenerAttacherTrait
-{
-    /**
-     * Attaches event listeners and properly sets their priorities and whether
-     * or not they are are only executed once.
-     *
-     * @param HasEmitterInterface $object    Object that has the event emitter.
-     * @param array               $listeners Array of hashes representing event
-     *                                       event listeners. Each item contains
-     *                                       "name", "fn", "priority", & "once".
-     */
-    private function attachListeners(HasEmitterInterface $object, array $listeners)
-    {
-        $emitter = $object->getEmitter();
-        foreach ($listeners as $el) {
-            if ($el['once']) {
-                $emitter->once($el['name'], $el['fn'], $el['priority']);
-            } else {
-                $emitter->on($el['name'], $el['fn'], $el['priority']);
-            }
-        }
-    }
-
-    /**
-     * Extracts the allowed events from the provided array, and ignores anything
-     * else in the array. The event listener must be specified as a callable or
-     * as an array of event listener data ("name", "fn", "priority", "once").
-     *
-     * @param array $source Array containing callables or hashes of data to be
-     *                      prepared as event listeners.
-     * @param array $events Names of events to look for in the provided $source
-     *                      array. Other keys are ignored.
-     * @return array
-     */
-    private function prepareListeners(array $source, array $events)
-    {
-        $listeners = [];
-        foreach ($events as $name) {
-            if (isset($source[$name])) {
-                $this->buildListener($name, $source[$name], $listeners);
-            }
-        }
-
-        return $listeners;
-    }
-
-    /**
-     * Creates a complete event listener definition from the provided array of
-     * listener data. Also works recursively if more than one listeners are
-     * contained in the provided array.
-     *
-     * @param string         $name      Name of the event the listener is for.
-     * @param array|callable $data      Event listener data to prepare.
-     * @param array          $listeners Array of listeners, passed by reference.
-     *
-     * @throws \InvalidArgumentException if the event data is malformed.
-     */
-    private function buildListener($name, $data, &$listeners)
-    {
-        static $defaults = ['priority' => 0, 'once' => false];
-
-        // If a callable is provided, normalize it to the array format.
-        if (is_callable($data)) {
-            $data = ['fn' => $data];
-        }
-
-        // Prepare the listener and add it to the array, recursively.
-        if (isset($data['fn'])) {
-            $data['name'] = $name;
-            $listeners[] = $data + $defaults;
-        } elseif (is_array($data)) {
-            foreach ($data as $listenerData) {
-                $this->buildListener($name, $listenerData, $listeners);
-            }
-        } else {
-            throw new \InvalidArgumentException('Each event listener must be a '
-                . 'callable or an associative array containing a "fn" key.');
-        }
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Event/ProgressEvent.php b/core/vendor/guzzlehttp/guzzle/src/Event/ProgressEvent.php
deleted file mode 100644
index 3fd0de4ac..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Event/ProgressEvent.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-namespace GuzzleHttp\Event;
-
-use GuzzleHttp\Transaction;
-
-/**
- * Event object emitted when upload or download progress is made.
- *
- * You can access the progress values using their corresponding public
- * properties:
- *
- * - $downloadSize: The number of bytes that will be downloaded (if known)
- * - $downloaded: The number of bytes that have been downloaded
- * - $uploadSize: The number of bytes that will be uploaded (if known)
- * - $uploaded: The number of bytes that have been uploaded
- */
-class ProgressEvent extends AbstractRequestEvent
-{
-    /** @var int Amount of data to be downloaded */
-    public $downloadSize;
-
-    /** @var int Amount of data that has been downloaded */
-    public $downloaded;
-
-    /** @var int Amount of data to upload */
-    public $uploadSize;
-
-    /** @var int Amount of data that has been uploaded */
-    public $uploaded;
-
-    /**
-     * @param Transaction $transaction  Transaction being sent.
-     * @param int         $downloadSize Amount of data to download (if known)
-     * @param int         $downloaded   Amount of data that has been downloaded
-     * @param int         $uploadSize   Amount of data to upload (if known)
-     * @param int         $uploaded     Amount of data that had been uploaded
-     */
-    public function __construct(
-        Transaction $transaction,
-        $downloadSize,
-        $downloaded,
-        $uploadSize,
-        $uploaded
-    ) {
-        parent::__construct($transaction);
-        $this->downloadSize = $downloadSize;
-        $this->downloaded = $downloaded;
-        $this->uploadSize = $uploadSize;
-        $this->uploaded = $uploaded;
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Event/RequestEvents.php b/core/vendor/guzzlehttp/guzzle/src/Event/RequestEvents.php
deleted file mode 100644
index f51d42065..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Event/RequestEvents.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-namespace GuzzleHttp\Event;
-
-/**
- * Contains methods used to manage the request event lifecycle.
- */
-final class RequestEvents
-{
-    // Generic event priorities
-    const EARLY = 10000;
-    const LATE = -10000;
-
-    // "before" priorities
-    const PREPARE_REQUEST = -100;
-    const SIGN_REQUEST = -10000;
-
-    // "complete" and "error" response priorities
-    const VERIFY_RESPONSE = 100;
-    const REDIRECT_RESPONSE = 200;
-
-    /**
-     * Converts an array of event options into a formatted array of valid event
-     * configuration.
-     *
-     * @param array $options Event array to convert
-     * @param array $events  Event names to convert in the options array.
-     * @param mixed $handler Event handler to utilize
-     *
-     * @return array
-     * @throws \InvalidArgumentException if the event config is invalid
-     * @internal
-     */
-    public static function convertEventArray(
-        array $options,
-        array $events,
-        $handler
-    ) {
-        foreach ($events as $name) {
-            if (!isset($options[$name])) {
-                $options[$name] = [$handler];
-            } elseif (is_callable($options[$name])) {
-                $options[$name] = [$options[$name], $handler];
-            } elseif (is_array($options[$name])) {
-                if (isset($options[$name]['fn'])) {
-                    $options[$name] = [$options[$name], $handler];
-                } else {
-                    $options[$name][] = $handler;
-                }
-            } else {
-                throw new \InvalidArgumentException('Invalid event format');
-            }
-        }
-
-        return $options;
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Event/SubscriberInterface.php b/core/vendor/guzzlehttp/guzzle/src/Event/SubscriberInterface.php
deleted file mode 100644
index 33d770213..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Event/SubscriberInterface.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-namespace GuzzleHttp\Event;
-
-/**
- * SubscriberInterface provides an array of events to an
- * EventEmitterInterface when it is registered. The emitter then binds the
- * listeners specified by the EventSubscriber.
- *
- * This interface is based on the SubscriberInterface of the Symfony.
- * @link https://github.com/symfony/symfony/tree/master/src/Symfony/Component/EventDispatcher
- */
-interface SubscriberInterface
-{
-    /**
-     * Returns an array of event names this subscriber wants to listen to.
-     *
-     * The returned array keys MUST map to an event name. Each array value
-     * MUST be an array in which the first element is the name of a function
-     * on the EventSubscriber OR an array of arrays in the aforementioned
-     * format. The second element in the array is optional, and if specified,
-     * designates the event priority.
-     *
-     * For example, the following are all valid:
-     *
-     *  - ['eventName' => ['methodName']]
-     *  - ['eventName' => ['methodName', $priority]]
-     *  - ['eventName' => [['methodName'], ['otherMethod']]
-     *  - ['eventName' => [['methodName'], ['otherMethod', $priority]]
-     *  - ['eventName' => [['methodName', $priority], ['otherMethod', $priority]]
-     *
-     * @return array
-     */
-    public function getEvents();
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Exception/ConnectException.php b/core/vendor/guzzlehttp/guzzle/src/Exception/ConnectException.php
index a91c5a68e..d33b0cc19 100644
--- a/core/vendor/guzzlehttp/guzzle/src/Exception/ConnectException.php
+++ b/core/vendor/guzzlehttp/guzzle/src/Exception/ConnectException.php
@@ -1,4 +1,37 @@
 <?php
 namespace GuzzleHttp\Exception;
 
-class ConnectException extends RequestException {}
+use Psr\Http\Message\RequestInterface;
+
+/**
+ * Exception thrown when a connection cannot be established.
+ *
+ * Note that no response is present for a ConnectException
+ */
+class ConnectException extends RequestException
+{
+    public function __construct(
+        $message,
+        RequestInterface $request,
+        \Exception $previous = null,
+        array $handlerContext = []
+    ) {
+        parent::__construct($message, $request, null, $previous, $handlerContext);
+    }
+
+    /**
+     * @return null
+     */
+    public function getResponse()
+    {
+        return null;
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasResponse()
+    {
+        return false;
+    }
+}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Exception/CouldNotRewindStreamException.php b/core/vendor/guzzlehttp/guzzle/src/Exception/CouldNotRewindStreamException.php
deleted file mode 100644
index fbe2dcd7c..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Exception/CouldNotRewindStreamException.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-namespace GuzzleHttp\Exception;
-
-class CouldNotRewindStreamException extends RequestException {}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Exception/GuzzleException.php b/core/vendor/guzzlehttp/guzzle/src/Exception/GuzzleException.php
new file mode 100644
index 000000000..c82998e0d
--- /dev/null
+++ b/core/vendor/guzzlehttp/guzzle/src/Exception/GuzzleException.php
@@ -0,0 +1,4 @@
+<?php
+namespace GuzzleHttp\Exception;
+
+interface GuzzleException {}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Exception/ParseException.php b/core/vendor/guzzlehttp/guzzle/src/Exception/ParseException.php
deleted file mode 100644
index e593e3d5e..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Exception/ParseException.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-namespace GuzzleHttp\Exception;
-
-use GuzzleHttp\Message\ResponseInterface;
-
-/**
- * Exception when a client is unable to parse the response body as XML or JSON
- */
-class ParseException extends TransferException
-{
-    /** @var ResponseInterface */
-    private $response;
-
-    public function __construct(
-        $message = '',
-        ResponseInterface $response = null,
-        \Exception $previous = null
-    ) {
-        parent::__construct($message, 0, $previous);
-        $this->response = $response;
-    }
-    /**
-     * Get the associated response
-     *
-     * @return ResponseInterface|null
-     */
-    public function getResponse()
-    {
-        return $this->response;
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Exception/RequestException.php b/core/vendor/guzzlehttp/guzzle/src/Exception/RequestException.php
index f81d24836..23dd02c42 100644
--- a/core/vendor/guzzlehttp/guzzle/src/Exception/RequestException.php
+++ b/core/vendor/guzzlehttp/guzzle/src/Exception/RequestException.php
@@ -1,11 +1,9 @@
 <?php
 namespace GuzzleHttp\Exception;
 
-use GuzzleHttp\Message\RequestInterface;
-use GuzzleHttp\Message\ResponseInterface;
-use GuzzleHttp\Ring\Exception\ConnectException;
-use GuzzleHttp\Exception\ConnectException as HttpConnectException;
-use GuzzleHttp\Ring\Future\FutureInterface;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
+use GuzzleHttp\Promise\PromiseInterface;
 
 /**
  * HTTP Request exception
@@ -18,23 +16,28 @@ class RequestException extends TransferException
     /** @var ResponseInterface */
     private $response;
 
+    /** @var array */
+    private $handlerContext;
+
     public function __construct(
         $message,
         RequestInterface $request,
         ResponseInterface $response = null,
-        \Exception $previous = null
+        \Exception $previous = null,
+        array $handlerContext = []
     ) {
         // Set the code of the exception if the response is set and not future.
-        $code = $response && !($response instanceof FutureInterface)
+        $code = $response && !($response instanceof PromiseInterface)
             ? $response->getStatusCode()
             : 0;
         parent::__construct($message, $code, $previous);
         $this->request = $request;
         $this->response = $response;
+        $this->handlerContext = $handlerContext;
     }
 
     /**
-     * Wrap non-RequesExceptions with a RequestException
+     * Wrap non-RequestExceptions with a RequestException
      *
      * @param RequestInterface $request
      * @param \Exception       $e
@@ -43,13 +46,9 @@ class RequestException extends TransferException
      */
     public static function wrapException(RequestInterface $request, \Exception $e)
     {
-        if ($e instanceof RequestException) {
-            return $e;
-        } elseif ($e instanceof ConnectException) {
-            return new HttpConnectException($e->getMessage(), $request, null, $e);
-        } else {
-            return new RequestException($e->getMessage(), $request, null, $e);
-        }
+        return $e instanceof RequestException
+            ? $e
+            : new RequestException($e->getMessage(), $request, null, $e);
     }
 
     /**
@@ -58,16 +57,24 @@ class RequestException extends TransferException
      * @param RequestInterface  $request  Request
      * @param ResponseInterface $response Response received
      * @param \Exception        $previous Previous exception
+     * @param array             $ctx      Optional handler context.
      *
      * @return self
      */
     public static function create(
         RequestInterface $request,
         ResponseInterface $response = null,
-        \Exception $previous = null
+        \Exception $previous = null,
+        array $ctx = []
     ) {
         if (!$response) {
-            return new self('Error completing request', $request, null, $previous);
+            return new self(
+                'Error completing request',
+                $request,
+                null,
+                $previous,
+                $ctx
+            );
         }
 
         $level = floor($response->getStatusCode() / 100);
@@ -82,11 +89,12 @@ class RequestException extends TransferException
             $className = __CLASS__;
         }
 
-        $message = $label . ' [url] ' . $request->getUrl()
+        $message = $label . ' [url] ' . $request->getUri()
+            . ' [http method] ' . $request->getMethod()
             . ' [status code] ' . $response->getStatusCode()
             . ' [reason phrase] ' . $response->getReasonPhrase();
 
-        return new $className($message, $request, $response, $previous);
+        return new $className($message, $request, $response, $previous, $ctx);
     }
 
     /**
@@ -118,4 +126,19 @@ class RequestException extends TransferException
     {
         return $this->response !== null;
     }
+
+    /**
+     * Get contextual information about the error from the underlying handler.
+     *
+     * The contents of this array will vary depending on which handler you are
+     * using. It may also be just an empty array. Relying on this data will
+     * couple you to a specific handler, but can give more debug information
+     * when needed.
+     *
+     * @return array
+     */
+    public function getHandlerContext()
+    {
+        return $this->handlerContext;
+    }
 }
diff --git a/core/vendor/guzzlehttp/streams/src/Exception/SeekException.php b/core/vendor/guzzlehttp/guzzle/src/Exception/SeekException.php
similarity index 75%
rename from core/vendor/guzzlehttp/streams/src/Exception/SeekException.php
rename to core/vendor/guzzlehttp/guzzle/src/Exception/SeekException.php
index 3f6d5ebad..a77c28926 100644
--- a/core/vendor/guzzlehttp/streams/src/Exception/SeekException.php
+++ b/core/vendor/guzzlehttp/guzzle/src/Exception/SeekException.php
@@ -1,12 +1,12 @@
 <?php
-namespace GuzzleHttp\Stream\Exception;
+namespace GuzzleHttp\Exception;
 
-use GuzzleHttp\Stream\StreamInterface;
+use Psr\Http\Message\StreamInterface;
 
 /**
  * Exception thrown when a seek fails on a stream.
  */
-class SeekException extends \RuntimeException
+class SeekException extends \RuntimeException implements GuzzleException
 {
     private $stream;
 
diff --git a/core/vendor/guzzlehttp/guzzle/src/Exception/StateException.php b/core/vendor/guzzlehttp/guzzle/src/Exception/StateException.php
deleted file mode 100644
index a7652a384..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Exception/StateException.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-namespace GuzzleHttp\Exception;
-
-class StateException extends TransferException {};
diff --git a/core/vendor/guzzlehttp/guzzle/src/Exception/TransferException.php b/core/vendor/guzzlehttp/guzzle/src/Exception/TransferException.php
index 92d7de691..b92071ca2 100644
--- a/core/vendor/guzzlehttp/guzzle/src/Exception/TransferException.php
+++ b/core/vendor/guzzlehttp/guzzle/src/Exception/TransferException.php
@@ -1,4 +1,4 @@
 <?php
 namespace GuzzleHttp\Exception;
 
-class TransferException extends \RuntimeException {}
+class TransferException extends \RuntimeException implements GuzzleException {}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Exception/XmlParseException.php b/core/vendor/guzzlehttp/guzzle/src/Exception/XmlParseException.php
deleted file mode 100644
index a4a1a0af4..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Exception/XmlParseException.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-namespace GuzzleHttp\Exception;
-
-use GuzzleHttp\Message\ResponseInterface;
-
-/**
- * Exception when a client is unable to parse the response body as XML
- */
-class XmlParseException extends ParseException
-{
-    /** @var \LibXMLError */
-    protected $error;
-
-    public function __construct(
-        $message = '',
-        ResponseInterface $response = null,
-        \Exception $previous = null,
-        \LibXMLError $error = null
-    ) {
-        parent::__construct($message, $response, $previous);
-        $this->error = $error;
-    }
-
-    /**
-     * Get the associated error
-     *
-     * @return \LibXMLError|null
-     */
-    public function getError()
-    {
-        return $this->error;
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Handler/CurlFactory.php b/core/vendor/guzzlehttp/guzzle/src/Handler/CurlFactory.php
new file mode 100644
index 000000000..dcf374d8e
--- /dev/null
+++ b/core/vendor/guzzlehttp/guzzle/src/Handler/CurlFactory.php
@@ -0,0 +1,507 @@
+<?php
+namespace GuzzleHttp\Handler;
+
+use GuzzleHttp\Exception\RequestException;
+use GuzzleHttp\Exception\ConnectException;
+use GuzzleHttp\Promise\FulfilledPromise;
+use GuzzleHttp\Promise\RejectedPromise;
+use GuzzleHttp\Psr7;
+use GuzzleHttp\Psr7\LazyOpenStream;
+use Psr\Http\Message\RequestInterface;
+
+/**
+ * Creates curl resources from a request
+ */
+class CurlFactory implements CurlFactoryInterface
+{
+    /** @var array */
+    private $handles;
+
+    /** @var int Total number of idle handles to keep in cache */
+    private $maxHandles;
+
+    /**
+     * @param int $maxHandles Maximum number of idle handles.
+     */
+    public function __construct($maxHandles)
+    {
+        $this->maxHandles = $maxHandles;
+    }
+
+    public function create(RequestInterface $request, array $options)
+    {
+        $easy = new EasyHandle;
+        $easy->request = $request;
+        $easy->options = $options;
+        $conf = $this->getDefaultConf($easy);
+        $this->applyMethod($easy, $conf);
+        $this->applyHandlerOptions($easy, $conf);
+        $this->applyHeaders($easy, $conf);
+        unset($conf['_headers']);
+
+        if (isset($options['curl']['body_as_string'])) {
+            $options['_body_as_string'] = $options['curl']['body_as_string'];
+            unset($options['curl']['body_as_string']);
+        }
+
+        // Add handler options from the request configuration options
+        if (isset($options['curl'])) {
+            $conf += $options['curl'];
+        }
+
+        $conf[CURLOPT_HEADERFUNCTION] = $this->createHeaderFn($easy);
+        $easy->handle = $this->handles
+            ? array_pop($this->handles)
+            : curl_init();
+        curl_setopt_array($easy->handle, $conf);
+
+        return $easy;
+    }
+
+    public function release(EasyHandle $easy)
+    {
+        $resource = $easy->handle;
+        unset($easy->handle);
+
+        if (count($this->handles) >= $this->maxHandles) {
+            curl_close($resource);
+        } else {
+            // Remove all callback functions as they can hold onto references
+            // and are not cleaned up by curl_reset. Using curl_setopt_array
+            // does not work for some reason, so removing each one
+            // individually.
+            curl_setopt($resource, CURLOPT_HEADERFUNCTION, null);
+            curl_setopt($resource, CURLOPT_READFUNCTION, null);
+            curl_setopt($resource, CURLOPT_WRITEFUNCTION, null);
+            curl_setopt($resource, CURLOPT_PROGRESSFUNCTION, null);
+            curl_reset($resource);
+            $this->handles[] = $resource;
+        }
+    }
+
+    /**
+     * Completes a cURL transaction, either returning a response promise or a
+     * rejected promise.
+     *
+     * @param callable             $handler
+     * @param EasyHandle           $easy
+     * @param CurlFactoryInterface $factory Dictates how the handle is released
+     *
+     * @return \GuzzleHttp\Promise\PromiseInterface
+     */
+    public static function finish(
+        callable $handler,
+        EasyHandle $easy,
+        CurlFactoryInterface $factory
+    ) {
+        if (!$easy->response || $easy->errno) {
+            return self::finishError($handler, $easy, $factory);
+        }
+
+        // Return the response if it is present and there is no error.
+        $factory->release($easy);
+
+        // Rewind the body of the response if possible.
+        $body = $easy->response->getBody();
+        if ($body->isSeekable()) {
+            $body->rewind();
+        }
+
+        return new FulfilledPromise($easy->response);
+    }
+
+    private static function finishError(
+        callable $handler,
+        EasyHandle $easy,
+        CurlFactoryInterface $factory
+    ) {
+        // Get error information and release the handle to the factory.
+        $ctx = [
+            'errno' => $easy->errno,
+            'error' => curl_error($easy->handle),
+        ] + curl_getinfo($easy->handle);
+        $factory->release($easy);
+
+        // Retry when nothing is present or when curl failed to rewind.
+        if (empty($easy->options['_err_message'])
+            && (!$easy->errno || $easy->errno == 65)
+        ) {
+            return self::retryFailedRewind($handler, $easy, $ctx);
+        }
+
+        return self::createRejection($easy, $ctx);
+    }
+
+    private static function createRejection(EasyHandle $easy, array $ctx)
+    {
+        static $connectionErrors = [
+            CURLE_OPERATION_TIMEOUTED  => true,
+            CURLE_COULDNT_RESOLVE_HOST => true,
+            CURLE_COULDNT_CONNECT      => true,
+            CURLE_SSL_CONNECT_ERROR    => true,
+            CURLE_GOT_NOTHING          => true,
+        ];
+
+        // If an exception was encountered during the onHeaders event, then
+        // return a rejected promise that wraps that exception.
+        if ($easy->onHeadersException) {
+            return new RejectedPromise(
+                new RequestException(
+                    'An error was encountered during the on_headers event',
+                    $easy->request,
+                    $easy->response,
+                    $easy->onHeadersException,
+                    $ctx
+                )
+            );
+        }
+
+        $message = sprintf(
+            'cURL error %s: %s (%s)',
+            $ctx['errno'],
+            $ctx['error'],
+            'see http://curl.haxx.se/libcurl/c/libcurl-errors.html'
+        );
+
+        // Create a connection exception if it was a specific error code.
+        $error = isset($connectionErrors[$easy->errno])
+            ? new ConnectException($message, $easy->request, null, $ctx)
+            : new RequestException($message, $easy->request, $easy->response, null, $ctx);
+
+        return new RejectedPromise($error);
+    }
+
+    private function getDefaultConf(EasyHandle $easy)
+    {
+        $conf = [
+            '_headers'             => $easy->request->getHeaders(),
+            CURLOPT_CUSTOMREQUEST  => $easy->request->getMethod(),
+            CURLOPT_URL            => (string) $easy->request->getUri(),
+            CURLOPT_RETURNTRANSFER => false,
+            CURLOPT_HEADER         => false,
+            CURLOPT_CONNECTTIMEOUT => 150,
+        ];
+
+        if (defined('CURLOPT_PROTOCOLS')) {
+            $conf[CURLOPT_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
+        }
+
+        $version = $easy->request->getProtocolVersion();
+        if ($version == 1.1) {
+            $conf[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_1_1;
+        } elseif ($version == 2.0) {
+            $conf[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_2_0;
+        } else {
+            $conf[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_1_0;
+        }
+
+        return $conf;
+    }
+
+    private function applyMethod(EasyHandle $easy, array &$conf)
+    {
+        $body = $easy->request->getBody();
+        $size = $body->getSize();
+
+        if ($size === null || $size > 0) {
+            $this->applyBody($easy->request, $easy->options, $conf);
+            return;
+        }
+
+        $method = $easy->request->getMethod();
+        if ($method === 'PUT' || $method === 'POST') {
+            // See http://tools.ietf.org/html/rfc7230#section-3.3.2
+            if (!$easy->request->hasHeader('Content-Length')) {
+                $conf[CURLOPT_HTTPHEADER][] = 'Content-Length: 0';
+            }
+        } elseif ($method === 'HEAD') {
+            $conf[CURLOPT_NOBODY] = true;
+            unset(
+                $conf[CURLOPT_WRITEFUNCTION],
+                $conf[CURLOPT_READFUNCTION],
+                $conf[CURLOPT_FILE],
+                $conf[CURLOPT_INFILE]
+            );
+        }
+    }
+
+    private function applyBody(RequestInterface $request, array $options, array &$conf)
+    {
+        $size = $request->hasHeader('Content-Length')
+            ? (int) $request->getHeaderLine('Content-Length')
+            : null;
+
+        // Send the body as a string if the size is less than 1MB OR if the
+        // [curl][body_as_string] request value is set.
+        if (($size !== null && $size < 1000000) ||
+            !empty($options['_body_as_string'])
+        ) {
+            $conf[CURLOPT_POSTFIELDS] = (string) $request->getBody();
+            // Don't duplicate the Content-Length header
+            $this->removeHeader('Content-Length', $conf);
+            $this->removeHeader('Transfer-Encoding', $conf);
+        } else {
+            $conf[CURLOPT_UPLOAD] = true;
+            if ($size !== null) {
+                $conf[CURLOPT_INFILESIZE] = $size;
+                $this->removeHeader('Content-Length', $conf);
+            }
+            $body = $request->getBody();
+            $conf[CURLOPT_READFUNCTION] = function ($ch, $fd, $length) use ($body) {
+                return $body->read($length);
+            };
+        }
+
+        // If the Expect header is not present, prevent curl from adding it
+        if (!$request->hasHeader('Expect')) {
+            $conf[CURLOPT_HTTPHEADER][] = 'Expect:';
+        }
+
+        // cURL sometimes adds a content-type by default. Prevent this.
+        if (!$request->hasHeader('Content-Type')) {
+            $conf[CURLOPT_HTTPHEADER][] = 'Content-Type:';
+        }
+    }
+
+    private function applyHeaders(EasyHandle $easy, array &$conf)
+    {
+        foreach ($conf['_headers'] as $name => $values) {
+            foreach ($values as $value) {
+                $conf[CURLOPT_HTTPHEADER][] = "$name: $value";
+            }
+        }
+
+        // Remove the Accept header if one was not set
+        if (!$easy->request->hasHeader('Accept')) {
+            $conf[CURLOPT_HTTPHEADER][] = 'Accept:';
+        }
+    }
+
+    /**
+     * Remove a header from the options array.
+     *
+     * @param string $name    Case-insensitive header to remove
+     * @param array  $options Array of options to modify
+     */
+    private function removeHeader($name, array &$options)
+    {
+        foreach (array_keys($options['_headers']) as $key) {
+            if (!strcasecmp($key, $name)) {
+                unset($options['_headers'][$key]);
+                return;
+            }
+        }
+    }
+
+    private function applyHandlerOptions(EasyHandle $easy, array &$conf)
+    {
+        $options = $easy->options;
+        if (isset($options['verify'])) {
+            if ($options['verify'] === false) {
+                unset($conf[CURLOPT_CAINFO]);
+                $conf[CURLOPT_SSL_VERIFYHOST] = 0;
+                $conf[CURLOPT_SSL_VERIFYPEER] = false;
+            } else {
+                $conf[CURLOPT_SSL_VERIFYHOST] = 2;
+                $conf[CURLOPT_SSL_VERIFYPEER] = true;
+                if (is_string($options['verify'])) {
+                    $conf[CURLOPT_CAINFO] = $options['verify'];
+                    if (!file_exists($options['verify'])) {
+                        throw new \InvalidArgumentException(
+                            "SSL CA bundle not found: {$options['verify']}"
+                        );
+                    }
+                }
+            }
+        }
+
+        if (!empty($options['decode_content'])) {
+            $accept = $easy->request->getHeaderLine('Accept-Encoding');
+            if ($accept) {
+                $conf[CURLOPT_ENCODING] = $accept;
+            } else {
+                $conf[CURLOPT_ENCODING] = '';
+                // Don't let curl send the header over the wire
+                $conf[CURLOPT_HTTPHEADER][] = 'Accept-Encoding:';
+            }
+        }
+
+        if (isset($options['sink'])) {
+            $sink = $options['sink'];
+            if (!is_string($sink)) {
+                $sink = \GuzzleHttp\Psr7\stream_for($sink);
+            } elseif (!is_dir(dirname($sink))) {
+                // Ensure that the directory exists before failing in curl.
+                throw new \RuntimeException(sprintf(
+                    'Directory %s does not exist for sink value of %s',
+                    dirname($sink),
+                    $sink
+                ));
+            } else {
+                $sink = new LazyOpenStream($sink, 'w+');
+            }
+            $easy->sink = $sink;
+            $conf[CURLOPT_WRITEFUNCTION] = function ($ch, $write) use ($sink) {
+                return $sink->write($write);
+            };
+        } else {
+            // Use a default temp stream if no sink was set.
+            $conf[CURLOPT_FILE] = fopen('php://temp', 'w+');
+            $easy->sink = Psr7\stream_for($conf[CURLOPT_FILE]);
+        }
+
+        if (isset($options['timeout'])) {
+            $conf[CURLOPT_TIMEOUT_MS] = $options['timeout'] * 1000;
+        }
+
+        if (isset($options['connect_timeout'])) {
+            $conf[CURLOPT_CONNECTTIMEOUT_MS] = $options['connect_timeout'] * 1000;
+        }
+
+        if (isset($options['proxy'])) {
+            if (!is_array($options['proxy'])) {
+                $conf[CURLOPT_PROXY] = $options['proxy'];
+            } elseif ($scheme = $easy->request->getUri()->getScheme()) {
+                if (isset($options['proxy'][$scheme])) {
+                    $conf[CURLOPT_PROXY] = $options['proxy'][$scheme];
+                }
+            }
+        }
+
+        if (isset($options['cert'])) {
+            $cert = $options['cert'];
+            if (is_array($cert)) {
+                $conf[CURLOPT_SSLCERTPASSWD] = $cert[1];
+                $cert = $cert[0];
+            }
+            if (!file_exists($cert)) {
+                throw new \InvalidArgumentException(
+                    "SSL certificate not found: {$cert}"
+                );
+            }
+            $conf[CURLOPT_SSLCERT] = $cert;
+        }
+
+        if (isset($options['ssl_key'])) {
+            $sslKey = $options['ssl_key'];
+            if (is_array($sslKey)) {
+                $conf[CURLOPT_SSLKEYPASSWD] = $sslKey[1];
+                $sslKey = $sslKey[0];
+            }
+            if (!file_exists($sslKey)) {
+                throw new \InvalidArgumentException(
+                    "SSL private key not found: {$sslKey}"
+                );
+            }
+            $conf[CURLOPT_SSLKEY] = $sslKey;
+        }
+
+        if (isset($options['progress'])) {
+            $progress = $options['progress'];
+            if (!is_callable($progress)) {
+                throw new \InvalidArgumentException(
+                    'progress client option must be callable'
+                );
+            }
+            $conf[CURLOPT_NOPROGRESS] = false;
+            $conf[CURLOPT_PROGRESSFUNCTION] = function () use ($progress) {
+                $args = func_get_args();
+                // PHP 5.5 pushed the handle onto the start of the args
+                if (is_resource($args[0])) {
+                    array_shift($args);
+                }
+                call_user_func_array($progress, $args);
+            };
+        }
+
+        if (!empty($options['debug'])) {
+            $conf[CURLOPT_STDERR] = \GuzzleHttp\debug_resource($options['debug']);
+            $conf[CURLOPT_VERBOSE] = true;
+        }
+    }
+
+    /**
+     * This function ensures that a response was set on a transaction. If one
+     * was not set, then the request is retried if possible. This error
+     * typically means you are sending a payload, curl encountered a
+     * "Connection died, retrying a fresh connect" error, tried to rewind the
+     * stream, and then encountered a "necessary data rewind wasn't possible"
+     * error, causing the request to be sent through curl_multi_info_read()
+     * without an error status.
+     */
+    private static function retryFailedRewind(
+        callable $handler,
+        EasyHandle $easy,
+        array $ctx
+    ) {
+        try {
+            // Only rewind if the body has been read from.
+            $body = $easy->request->getBody();
+            if ($body->tell() > 0) {
+                $body->rewind();
+            }
+        } catch (\RuntimeException $e) {
+            $ctx['error'] = 'The connection unexpectedly failed without '
+                . 'providing an error. The request would have been retried, '
+                . 'but attempting to rewind the request body failed. '
+                . 'Exception: ' . $e;
+            return self::createRejection($easy, $ctx);
+        }
+
+        // Retry no more than 3 times before giving up.
+        if (!isset($easy->options['_curl_retries'])) {
+            $easy->options['_curl_retries'] = 1;
+        } elseif ($easy->options['_curl_retries'] == 2) {
+            $ctx['error'] = 'The cURL request was retried 3 times '
+                . 'and did not succeed. The most likely reason for the failure '
+                . 'is that cURL was unable to rewind the body of the request '
+                . 'and subsequent retries resulted in the same error. Turn on '
+                . 'the debug option to see what went wrong. See '
+                . 'https://bugs.php.net/bug.php?id=47204 for more information.';
+            return self::createRejection($easy, $ctx);
+        } else {
+            $easy->options['_curl_retries']++;
+        }
+
+        return $handler($easy->request, $easy->options);
+    }
+
+    private function createHeaderFn(EasyHandle $easy)
+    {
+        if (!isset($easy->options['on_headers'])) {
+            $onHeaders = null;
+        } elseif (!is_callable($easy->options['on_headers'])) {
+            throw new \InvalidArgumentException('on_headers must be callable');
+        } else {
+            $onHeaders = $easy->options['on_headers'];
+        }
+
+        return function ($ch, $h) use (
+            $onHeaders,
+            $easy,
+            &$startingResponse
+        ) {
+            $value = trim($h);
+            if ($value === '') {
+                $startingResponse = true;
+                $easy->createResponse();
+                if ($onHeaders) {
+                    try {
+                        $onHeaders($easy->response);
+                    } catch (\Exception $e) {
+                        // Associate the exception with the handle and trigger
+                        // a curl header write error by returning 0.
+                        $easy->onHeadersException = $e;
+                        return -1;
+                    }
+                }
+            } elseif ($startingResponse) {
+                $startingResponse = false;
+                $easy->headers = [$value];
+            } else {
+                $easy->headers[] = $value;
+            }
+            return strlen($h);
+        };
+    }
+}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Handler/CurlFactoryInterface.php b/core/vendor/guzzlehttp/guzzle/src/Handler/CurlFactoryInterface.php
new file mode 100644
index 000000000..b0fc23685
--- /dev/null
+++ b/core/vendor/guzzlehttp/guzzle/src/Handler/CurlFactoryInterface.php
@@ -0,0 +1,27 @@
+<?php
+namespace GuzzleHttp\Handler;
+
+use Psr\Http\Message\RequestInterface;
+
+interface CurlFactoryInterface
+{
+    /**
+     * Creates a cURL handle resource.
+     *
+     * @param RequestInterface $request Request
+     * @param array            $options Transfer options
+     *
+     * @return EasyHandle
+     * @throws \RuntimeException when an option cannot be applied
+     */
+    public function create(RequestInterface $request, array $options);
+
+    /**
+     * Release an easy handle, allowing it to be reused or closed.
+     *
+     * This function must call unset on the easy handle's "handle" property.
+     *
+     * @param EasyHandle $easy
+     */
+    public function release(EasyHandle $easy);
+}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Handler/CurlHandler.php b/core/vendor/guzzlehttp/guzzle/src/Handler/CurlHandler.php
new file mode 100644
index 000000000..43577da66
--- /dev/null
+++ b/core/vendor/guzzlehttp/guzzle/src/Handler/CurlHandler.php
@@ -0,0 +1,45 @@
+<?php
+namespace GuzzleHttp\Handler;
+
+use GuzzleHttp\Psr7;
+use Psr\Http\Message\RequestInterface;
+
+/**
+ * HTTP handler that uses cURL easy handles as a transport layer.
+ *
+ * When using the CurlHandler, custom curl options can be specified as an
+ * associative array of curl option constants mapping to values in the
+ * **curl** key of the "client" key of the request.
+ */
+class CurlHandler
+{
+    /** @var CurlFactoryInterface */
+    private $factory;
+
+    /**
+     * Accepts an associative array of options:
+     *
+     * - factory: Optional curl factory used to create cURL handles.
+     *
+     * @param array $options Array of options to use with the handler
+     */
+    public function __construct(array $options = [])
+    {
+        $this->factory = isset($options['handle_factory'])
+            ? $options['handle_factory']
+            : new CurlFactory(3);
+    }
+
+    public function __invoke(RequestInterface $request, array $options)
+    {
+        if (isset($options['delay'])) {
+            usleep($options['delay'] * 1000);
+        }
+
+        $easy = $this->factory->create($request, $options);
+        curl_exec($easy->handle);
+        $easy->errno = curl_errno($easy->handle);
+
+        return CurlFactory::finish($this, $easy, $this->factory);
+    }
+}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php b/core/vendor/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php
new file mode 100644
index 000000000..417850b44
--- /dev/null
+++ b/core/vendor/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php
@@ -0,0 +1,197 @@
+<?php
+namespace GuzzleHttp\Handler;
+
+use GuzzleHttp\Promise as P;
+use GuzzleHttp\Promise\Promise;
+use GuzzleHttp\Psr7;
+use Psr\Http\Message\RequestInterface;
+
+/**
+ * Returns an asynchronous response using curl_multi_* functions.
+ *
+ * When using the CurlMultiHandler, custom curl options can be specified as an
+ * associative array of curl option constants mapping to values in the
+ * **curl** key of the provided request options.
+ *
+ * @property resource $_mh Internal use only. Lazy loaded multi-handle.
+ */
+class CurlMultiHandler
+{
+    /** @var CurlFactoryInterface */
+    private $factory;
+    private $selectTimeout;
+    private $active;
+    private $handles = [];
+    private $delays = [];
+
+    /**
+     * This handler accepts the following options:
+     *
+     * - handle_factory: An optional factory  used to create curl handles
+     * - select_timeout: Optional timeout (in seconds) to block before timing
+     *   out while selecting curl handles. Defaults to 1 second.
+     *
+     * @param array $options
+     */
+    public function __construct(array $options = [])
+    {
+        $this->factory = isset($options['handle_factory'])
+            ? $options['handle_factory'] : new CurlFactory(50);
+        $this->selectTimeout = isset($options['select_timeout'])
+            ? $options['select_timeout'] : 1;
+    }
+
+    public function __get($name)
+    {
+        if ($name === '_mh') {
+            return $this->_mh = curl_multi_init();
+        }
+
+        throw new \BadMethodCallException();
+    }
+
+    public function __destruct()
+    {
+        if (isset($this->_mh)) {
+            curl_multi_close($this->_mh);
+            unset($this->_mh);
+        }
+    }
+
+    public function __invoke(RequestInterface $request, array $options)
+    {
+        $easy = $this->factory->create($request, $options);
+        $id = (int) $easy->handle;
+
+        $promise = new Promise(
+            [$this, 'execute'],
+            function () use ($id) { return $this->cancel($id); }
+        );
+
+        $this->addRequest(['easy' => $easy, 'deferred' => $promise]);
+
+        return $promise;
+    }
+
+    /**
+     * Ticks the curl event loop.
+     */
+    public function tick()
+    {
+        // Add any delayed handles if needed.
+        if ($this->delays) {
+            $currentTime = microtime(true);
+            foreach ($this->delays as $id => $delay) {
+                if ($currentTime >= $delay) {
+                    unset($this->delays[$id]);
+                    curl_multi_add_handle(
+                        $this->_mh,
+                        $this->handles[$id]['easy']->handle
+                    );
+                }
+            }
+        }
+
+        // Step through the task queue which may add additional requests.
+        P\queue()->run();
+
+        if ($this->active &&
+            curl_multi_select($this->_mh, $this->selectTimeout) === -1
+        ) {
+            // Perform a usleep if a select returns -1.
+            // See: https://bugs.php.net/bug.php?id=61141
+            usleep(250);
+        }
+
+        while (curl_multi_exec($this->_mh, $this->active) === CURLM_CALL_MULTI_PERFORM);
+
+        $this->processMessages();
+    }
+
+    /**
+     * Runs until all outstanding connections have completed.
+     */
+    public function execute()
+    {
+        $queue = P\queue();
+
+        while ($this->handles || !$queue->isEmpty()) {
+            // If there are no transfers, then sleep for the next delay
+            if (!$this->active && $this->delays) {
+                usleep($this->timeToNext());
+            }
+            $this->tick();
+        }
+    }
+
+    private function addRequest(array $entry)
+    {
+        $easy = $entry['easy'];
+        $id = (int) $easy->handle;
+        $this->handles[$id] = $entry;
+        if (empty($easy->options['delay'])) {
+            curl_multi_add_handle($this->_mh, $easy->handle);
+        } else {
+            $this->delays[$id] = microtime(true) + ($easy->options['delay'] / 1000);
+        }
+    }
+
+    /**
+     * Cancels a handle from sending and removes references to it.
+     *
+     * @param int $id Handle ID to cancel and remove.
+     *
+     * @return bool True on success, false on failure.
+     */
+    private function cancel($id)
+    {
+        // Cannot cancel if it has been processed.
+        if (!isset($this->handles[$id])) {
+            return false;
+        }
+
+        $handle = $this->handles[$id]['easy']->handle;
+        unset($this->delays[$id], $this->handles[$id]);
+        curl_multi_remove_handle($this->_mh, $handle);
+        curl_close($handle);
+
+        return true;
+    }
+
+    private function processMessages()
+    {
+        while ($done = curl_multi_info_read($this->_mh)) {
+            $id = (int) $done['handle'];
+            curl_multi_remove_handle($this->_mh, $done['handle']);
+
+            if (!isset($this->handles[$id])) {
+                // Probably was cancelled.
+                continue;
+            }
+
+            $entry = $this->handles[$id];
+            unset($this->handles[$id], $this->delays[$id]);
+            $entry['easy']->errno = $done['result'];
+            $entry['deferred']->resolve(
+                CurlFactory::finish(
+                    $this,
+                    $entry['easy'],
+                    $this->factory
+                )
+            );
+        }
+    }
+
+    private function timeToNext()
+    {
+        $currentTime = microtime(true);
+        $nextTime = PHP_INT_MAX;
+        foreach ($this->delays as $time) {
+            if ($time < $nextTime) {
+                $nextTime = $time;
+            }
+        }
+
+        return max(0, $currentTime - $nextTime);
+    }
+}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Handler/EasyHandle.php b/core/vendor/guzzlehttp/guzzle/src/Handler/EasyHandle.php
new file mode 100644
index 000000000..35228f009
--- /dev/null
+++ b/core/vendor/guzzlehttp/guzzle/src/Handler/EasyHandle.php
@@ -0,0 +1,87 @@
+<?php
+namespace GuzzleHttp\Handler;
+
+use GuzzleHttp\Psr7\Response;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\StreamInterface;
+
+/**
+ * Represents a cURL easy handle and the data it populates.
+ *
+ * @internal
+ */
+final class EasyHandle
+{
+    /** @var resource cURL resource */
+    public $handle;
+
+    /** @var StreamInterface Where data is being written */
+    public $sink;
+
+    /** @var array Received HTTP headers so far */
+    public $headers = [];
+
+    /** @var ResponseInterface Received response (if any) */
+    public $response;
+
+    /** @var RequestInterface Request being sent */
+    public $request;
+
+    /** @var array Request options */
+    public $options = [];
+
+    /** @var int cURL error number (if any) */
+    public $errno = 0;
+
+    /** @var \Exception Exception during on_headers (if any) */
+    public $onHeadersException;
+
+    /**
+     * Attach a response to the easy handle based on the received headers.
+     *
+     * @throws \RuntimeException if no headers have been received.
+     */
+    public function createResponse()
+    {
+        if (empty($this->headers)) {
+            throw new \RuntimeException('No headers have been received');
+        }
+
+        // HTTP-version SP status-code SP reason-phrase
+        $startLine = explode(' ', array_shift($this->headers), 3);
+        $headers = \GuzzleHttp\headers_from_lines($this->headers);
+        $normalizedKeys = \GuzzleHttp\normalize_header_keys($headers);
+
+        if (!empty($this->options['decode_content'])
+            && isset($normalizedKeys['content-encoding'])
+        ) {
+            unset($headers[$normalizedKeys['content-encoding']]);
+            if (isset($normalizedKeys['content-length'])) {
+                $bodyLength = (int) $this->sink->getSize();
+                if ($bodyLength) {
+                    $headers[$normalizedKeys['content-length']] = $bodyLength;
+                } else {
+                    unset($headers[$normalizedKeys['content-length']]);
+                }
+            }
+        }
+
+        // Attach a response to the easy handle with the parsed headers.
+        $this->response = new Response(
+            $startLine[1],
+            $headers,
+            $this->sink,
+            substr($startLine[0], 5),
+            isset($startLine[2]) ? (int) $startLine[2] : null
+        );
+    }
+
+    public function __get($name)
+    {
+        $msg = $name === 'handle'
+            ? 'The EasyHandle has been released'
+            : 'Invalid property: ' . $name;
+        throw new \BadMethodCallException($msg);
+    }
+}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Handler/MockHandler.php b/core/vendor/guzzlehttp/guzzle/src/Handler/MockHandler.php
new file mode 100644
index 000000000..9854546eb
--- /dev/null
+++ b/core/vendor/guzzlehttp/guzzle/src/Handler/MockHandler.php
@@ -0,0 +1,152 @@
+<?php
+namespace GuzzleHttp\Handler;
+
+use GuzzleHttp\HandlerStack;
+use GuzzleHttp\Promise\PromiseInterface;
+use GuzzleHttp\Promise\RejectedPromise;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
+
+/**
+ * Handler that returns responses or throw exceptions from a queue.
+ */
+class MockHandler implements \Countable
+{
+    private $queue;
+    private $lastRequest;
+    private $lastOptions;
+    private $onFulfilled;
+    private $onRejected;
+
+    /**
+     * Creates a new MockHandler that uses the default handler stack list of
+     * middlewares.
+     *
+     * @param array $queue Array of responses, callables, or exceptions.
+     * @param callable $onFulfilled Callback to invoke when the return value is fulfilled.
+     * @param callable $onRejected  Callback to invoke when the return value is rejected.
+     *
+     * @return MockHandler
+     */
+    public static function createWithMiddleware(
+        array $queue = null,
+        callable $onFulfilled = null,
+        callable $onRejected = null
+    ) {
+        return HandlerStack::create(new self($queue, $onFulfilled, $onRejected));
+    }
+
+    /**
+     * The passed in value must be an array of
+     * {@see Psr7\Http\Message\ResponseInterface} objects, Exceptions,
+     * callables, or Promises.
+     *
+     * @param array $queue
+     * @param callable $onFulfilled Callback to invoke when the return value is fulfilled.
+     * @param callable $onRejected  Callback to invoke when the return value is rejected.
+     */
+    public function __construct(
+        array $queue = null,
+        callable $onFulfilled = null,
+        callable $onRejected = null
+    ) {
+        $this->onFulfilled = $onFulfilled;
+        $this->onRejected = $onRejected;
+
+        if ($queue) {
+            call_user_func_array([$this, 'append'], $queue);
+        }
+    }
+
+    public function __invoke(RequestInterface $request, array $options)
+    {
+        if (!$this->queue) {
+            throw new \OutOfBoundsException('Mock queue is empty');
+        }
+
+        if (isset($options['delay'])) {
+            usleep($options['delay'] * 1000);
+        }
+
+        $this->lastRequest = $request;
+        $this->lastOptions = $options;
+        $response = array_shift($this->queue);
+
+        if (is_callable($response)) {
+            $response = $response($request, $options);
+        }
+
+        $response = $response instanceof \Exception
+            ? new RejectedPromise($response)
+            : \GuzzleHttp\Promise\promise_for($response);
+
+        if (!$this->onFulfilled && !$this->onRejected) {
+            return $response;
+        }
+
+        return $response->then(
+            function ($value) {
+                if ($this->onFulfilled) {
+                    call_user_func($this->onFulfilled, $value);
+                }
+                return $value;
+            },
+            function ($reason) {
+                if ($this->onRejected) {
+                    call_user_func($this->onRejected, $reason);
+                }
+                return new RejectedPromise($reason);
+            }
+        );
+    }
+
+    /**
+     * Adds one or more variadic requests, exceptions, callables, or promises
+     * to the queue.
+     */
+    public function append()
+    {
+        foreach (func_get_args() as $value) {
+            if ($value instanceof ResponseInterface
+                || $value instanceof \Exception
+                || $value instanceof PromiseInterface
+                || is_callable($value)
+            ) {
+                $this->queue[] = $value;
+            } else {
+                throw new \InvalidArgumentException('Expected a response or '
+                    . 'exception. Found ' . \GuzzleHttp\describe_type($value));
+            }
+        }
+    }
+
+    /**
+     * Get the last received request.
+     *
+     * @return RequestInterface
+     */
+    public function getLastRequest()
+    {
+        return $this->lastRequest;
+    }
+
+    /**
+     * Get the last received request options.
+     *
+     * @return RequestInterface
+     */
+    public function getLastOptions()
+    {
+        return $this->lastOptions;
+    }
+
+    /**
+     * Returns the number of remaining items in the queue.
+     *
+     * @return int
+     */
+    public function count()
+    {
+        return count($this->queue);
+    }
+}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Handler/Proxy.php b/core/vendor/guzzlehttp/guzzle/src/Handler/Proxy.php
new file mode 100644
index 000000000..9bd76d251
--- /dev/null
+++ b/core/vendor/guzzlehttp/guzzle/src/Handler/Proxy.php
@@ -0,0 +1,54 @@
+<?php
+namespace GuzzleHttp\Handler;
+
+use Psr\Http\Message\RequestInterface;
+
+/**
+ * Provides basic proxies for handlers.
+ */
+class Proxy
+{
+    /**
+     * Sends synchronous requests to a specific handler while sending all other
+     * requests to another handler.
+     *
+     * @param callable $default Handler used for normal responses
+     * @param callable $sync    Handler used for synchronous responses.
+     *
+     * @return callable Returns the composed handler.
+     */
+    public static function wrapSync(
+        callable $default,
+        callable $sync
+    ) {
+        return function (RequestInterface $request, array $options) use ($default, $sync) {
+            return empty($options['sync'])
+                ? $default($request, $options)
+                : $sync($request, $options);
+        };
+    }
+
+    /**
+     * Sends streaming requests to a streaming compatible handler while sending
+     * all other requests to a default handler.
+     *
+     * This, for example, could be useful for taking advantage of the
+     * performance benefits of curl while still supporting true streaming
+     * through the StreamHandler.
+     *
+     * @param callable $default   Handler used for non-streaming responses
+     * @param callable $streaming Handler used for streaming responses
+     *
+     * @return callable Returns the composed handler.
+     */
+    public static function wrapStreaming(
+        callable $default,
+        callable $streaming
+    ) {
+        return function (RequestInterface $request, array $options) use ($default, $streaming) {
+            return empty($options['stream'])
+                ? $default($request, $options)
+                : $streaming($request, $options);
+        };
+    }
+}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Handler/StreamHandler.php b/core/vendor/guzzlehttp/guzzle/src/Handler/StreamHandler.php
new file mode 100644
index 000000000..b94d1b7b6
--- /dev/null
+++ b/core/vendor/guzzlehttp/guzzle/src/Handler/StreamHandler.php
@@ -0,0 +1,411 @@
+<?php
+namespace GuzzleHttp\Handler;
+
+use GuzzleHttp\Exception\RequestException;
+use GuzzleHttp\Exception\ConnectException;
+use GuzzleHttp\Promise\FulfilledPromise;
+use GuzzleHttp\Promise\RejectedPromise;
+use GuzzleHttp\Promise\PromiseInterface;
+use GuzzleHttp\Psr7;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\StreamInterface;
+
+/**
+ * HTTP handler that uses PHP's HTTP stream wrapper.
+ */
+class StreamHandler
+{
+    private $lastHeaders = [];
+
+    /**
+     * Sends an HTTP request.
+     *
+     * @param RequestInterface $request Request to send.
+     * @param array            $options Request transfer options.
+     *
+     * @return PromiseInterface
+     */
+    public function __invoke(RequestInterface $request, array $options)
+    {
+        // Sleep if there is a delay specified.
+        if (isset($options['delay'])) {
+            usleep($options['delay'] * 1000);
+        }
+
+        try {
+            // Does not support the expect header.
+            $request = $request->withoutHeader('Expect');
+            $stream = $this->createStream($request, $options);
+            return $this->createResponse($request, $options, $stream);
+        } catch (\InvalidArgumentException $e) {
+            throw $e;
+        } catch (\Exception $e) {
+            // Determine if the error was a networking error.
+            $message = $e->getMessage();
+            // This list can probably get more comprehensive.
+            if (strpos($message, 'getaddrinfo') // DNS lookup failed
+                || strpos($message, 'Connection refused')
+                || strpos($message, "couldn't connect to host") // error on HHVM
+            ) {
+                $e = new ConnectException($e->getMessage(), $request, $e);
+            }
+            return new RejectedPromise(
+                RequestException::wrapException($request, $e)
+            );
+        }
+    }
+
+    private function createResponse(
+        RequestInterface $request,
+        array $options,
+        $stream
+    ) {
+        $hdrs = $this->lastHeaders;
+        $this->lastHeaders = [];
+        $parts = explode(' ', array_shift($hdrs), 3);
+        $ver = explode('/', $parts[0])[1];
+        $status = $parts[1];
+        $reason = isset($parts[2]) ? $parts[2] : null;
+        $headers = \GuzzleHttp\headers_from_lines($hdrs);
+        list ($stream, $headers) = $this->checkDecode($options, $headers, $stream);
+        $stream = Psr7\stream_for($stream);
+        $sink = $this->createSink($stream, $options);
+        $response = new Psr7\Response($status, $headers, $sink, $ver, $reason);
+
+        if (isset($options['on_headers'])) {
+            try {
+                $options['on_headers']($response);
+            } catch (\Exception $e) {
+                $msg = 'An error was encountered during the on_headers event';
+                $ex = new RequestException($msg, $request, $response, $e);
+                return new RejectedPromise($ex);
+            }
+        }
+
+        if ($sink !== $stream) {
+            $this->drain($stream, $sink);
+        }
+
+        return new FulfilledPromise($response);
+    }
+
+    private function createSink(StreamInterface $stream, array $options)
+    {
+        if (!empty($options['stream'])) {
+            return $stream;
+        }
+
+        $sink = isset($options['sink'])
+            ? $options['sink']
+            : fopen('php://temp', 'r+');
+
+        return is_string($sink)
+            ? new Psr7\Stream(Psr7\try_fopen($sink, 'r+'))
+            : Psr7\stream_for($sink);
+    }
+
+    private function checkDecode(array $options, array $headers, $stream)
+    {
+        // Automatically decode responses when instructed.
+        if (!empty($options['decode_content'])) {
+            $normalizedKeys = \GuzzleHttp\normalize_header_keys($headers);
+            if (isset($normalizedKeys['content-encoding'])) {
+                $encoding = $headers[$normalizedKeys['content-encoding']];
+                if ($encoding[0] == 'gzip' || $encoding[0] == 'deflate') {
+                    $stream = new Psr7\InflateStream(
+                        Psr7\stream_for($stream)
+                    );
+                    // Remove content-encoding header
+                    unset($headers[$normalizedKeys['content-encoding']]);
+                    // Fix content-length header
+                    if (isset($normalizedKeys['content-length'])) {
+                        $length = (int) $stream->getSize();
+                        if ($length == 0) {
+                            unset($headers[$normalizedKeys['content-length']]);
+                        } else {
+                            $headers[$normalizedKeys['content-length']] = [$length];
+                        }
+                    }
+                }
+            }
+        }
+
+        return [$stream, $headers];
+    }
+
+    /**
+     * Drains the source stream into the "sink" client option.
+     *
+     * @param StreamInterface $source
+     * @param StreamInterface $sink
+     *
+     * @return StreamInterface
+     * @throws \RuntimeException when the sink option is invalid.
+     */
+    private function drain(StreamInterface $source, StreamInterface $sink)
+    {
+        Psr7\copy_to_stream($source, $sink);
+        $sink->seek(0);
+        $source->close();
+
+        return $sink;
+    }
+
+    /**
+     * Create a resource and check to ensure it was created successfully
+     *
+     * @param callable $callback Callable that returns stream resource
+     *
+     * @return resource
+     * @throws \RuntimeException on error
+     */
+    private function createResource(callable $callback)
+    {
+        $errors = null;
+        set_error_handler(function ($_, $msg, $file, $line) use (&$errors) {
+            $errors[] = [
+                'message' => $msg,
+                'file'    => $file,
+                'line'    => $line
+            ];
+            return true;
+        });
+
+        $resource = $callback();
+        restore_error_handler();
+
+        if (!$resource) {
+            $message = 'Error creating resource: ';
+            foreach ($errors as $err) {
+                foreach ($err as $key => $value) {
+                    $message .= "[$key] $value" . PHP_EOL;
+                }
+            }
+            throw new \RuntimeException(trim($message));
+        }
+
+        return $resource;
+    }
+
+    private function createStream(RequestInterface $request, array $options)
+    {
+        static $methods;
+        if (!$methods) {
+            $methods = array_flip(get_class_methods(__CLASS__));
+        }
+
+        // HTTP/1.1 streams using the PHP stream wrapper require a
+        // Connection: close header
+        if ($request->getProtocolVersion() == '1.1'
+            && !$request->hasHeader('Connection')
+        ) {
+            $request = $request->withHeader('Connection', 'close');
+        }
+
+        // Ensure SSL is verified by default
+        if (!isset($options['verify'])) {
+            $options['verify'] = true;
+        }
+
+        $params = [];
+        $context = $this->getDefaultContext($request, $options);
+
+        if (isset($options['on_headers']) && !is_callable($options['on_headers'])) {
+            throw new \InvalidArgumentException('on_headers must be callable');
+        }
+
+        if (!empty($options)) {
+            foreach ($options as $key => $value) {
+                $method = "add_{$key}";
+                if (isset($methods[$method])) {
+                    $this->{$method}($request, $context, $value, $params);
+                }
+            }
+        }
+
+        if (isset($options['stream_context'])) {
+            if (!is_array($options['stream_context'])) {
+                throw new \InvalidArgumentException('stream_context must be an array');
+            }
+            $context = array_replace_recursive(
+                $context,
+                $options['stream_context']
+            );
+        }
+
+        $context = $this->createResource(
+            function () use ($context, $params) {
+                return stream_context_create($context, $params);
+            }
+        );
+
+        return $this->createResource(
+            function () use ($request, &$http_response_header, $context) {
+                $resource = fopen($request->getUri(), 'r', null, $context);
+                $this->lastHeaders = $http_response_header;
+                return $resource;
+            }
+        );
+    }
+
+    private function getDefaultContext(RequestInterface $request)
+    {
+        $headers = '';
+        foreach ($request->getHeaders() as $name => $value) {
+            foreach ($value as $val) {
+                $headers .= "$name: $val\r\n";
+            }
+        }
+
+        $context = [
+            'http' => [
+                'method'           => $request->getMethod(),
+                'header'           => $headers,
+                'protocol_version' => $request->getProtocolVersion(),
+                'ignore_errors'    => true,
+                'follow_location'  => 0,
+            ],
+        ];
+
+        $body = (string) $request->getBody();
+
+        if (!empty($body)) {
+            $context['http']['content'] = $body;
+            // Prevent the HTTP handler from adding a Content-Type header.
+            if (!$request->hasHeader('Content-Type')) {
+                $context['http']['header'] .= "Content-Type:\r\n";
+            }
+        }
+
+        $context['http']['header'] = rtrim($context['http']['header']);
+
+        return $context;
+    }
+
+    private function add_proxy(RequestInterface $request, &$options, $value, &$params)
+    {
+        if (!is_array($value)) {
+            $options['http']['proxy'] = $value;
+        } else {
+            $scheme = $request->getUri()->getScheme();
+            if (isset($value[$scheme])) {
+                $options['http']['proxy'] = $value[$scheme];
+            }
+        }
+    }
+
+    private function add_timeout(RequestInterface $request, &$options, $value, &$params)
+    {
+        $options['http']['timeout'] = $value;
+    }
+
+    private function add_verify(RequestInterface $request, &$options, $value, &$params)
+    {
+        if ($value === true) {
+            // PHP 5.6 or greater will find the system cert by default. When
+            // < 5.6, use the Guzzle bundled cacert.
+            if (PHP_VERSION_ID < 50600) {
+                $options['ssl']['cafile'] = \GuzzleHttp\default_ca_bundle();
+            }
+        } elseif (is_string($value)) {
+            $options['ssl']['cafile'] = $value;
+            if (!file_exists($value)) {
+                throw new \RuntimeException("SSL CA bundle not found: $value");
+            }
+        } elseif ($value === false) {
+            $options['ssl']['verify_peer'] = false;
+            return;
+        } else {
+            throw new \InvalidArgumentException('Invalid verify request option');
+        }
+
+        $options['ssl']['verify_peer'] = true;
+        $options['ssl']['allow_self_signed'] = false;
+    }
+
+    private function add_cert(RequestInterface $request, &$options, $value, &$params)
+    {
+        if (is_array($value)) {
+            $options['ssl']['passphrase'] = $value[1];
+            $value = $value[0];
+        }
+
+        if (!file_exists($value)) {
+            throw new \RuntimeException("SSL certificate not found: {$value}");
+        }
+
+        $options['ssl']['local_cert'] = $value;
+    }
+
+    private function add_progress(RequestInterface $request, &$options, $value, &$params)
+    {
+        $this->addNotification(
+            $params,
+            function ($code, $a, $b, $c, $transferred, $total) use ($value) {
+                if ($code == STREAM_NOTIFY_PROGRESS) {
+                    $value($total, $transferred, null, null);
+                }
+            }
+        );
+    }
+
+    private function add_debug(RequestInterface $request, &$options, $value, &$params)
+    {
+        if ($value === false) {
+            return;
+        }
+
+        static $map = [
+            STREAM_NOTIFY_CONNECT       => 'CONNECT',
+            STREAM_NOTIFY_AUTH_REQUIRED => 'AUTH_REQUIRED',
+            STREAM_NOTIFY_AUTH_RESULT   => 'AUTH_RESULT',
+            STREAM_NOTIFY_MIME_TYPE_IS  => 'MIME_TYPE_IS',
+            STREAM_NOTIFY_FILE_SIZE_IS  => 'FILE_SIZE_IS',
+            STREAM_NOTIFY_REDIRECTED    => 'REDIRECTED',
+            STREAM_NOTIFY_PROGRESS      => 'PROGRESS',
+            STREAM_NOTIFY_FAILURE       => 'FAILURE',
+            STREAM_NOTIFY_COMPLETED     => 'COMPLETED',
+            STREAM_NOTIFY_RESOLVE       => 'RESOLVE',
+        ];
+        static $args = ['severity', 'message', 'message_code',
+            'bytes_transferred', 'bytes_max'];
+
+        $value = \GuzzleHttp\debug_resource($value);
+        $ident = $request->getMethod() . ' ' . $request->getUri();
+        $this->addNotification(
+            $params,
+            function () use ($ident, $value, $map, $args) {
+                $passed = func_get_args();
+                $code = array_shift($passed);
+                fprintf($value, '<%s> [%s] ', $ident, $map[$code]);
+                foreach (array_filter($passed) as $i => $v) {
+                    fwrite($value, $args[$i] . ': "' . $v . '" ');
+                }
+                fwrite($value, "\n");
+            }
+        );
+    }
+
+    private function addNotification(array &$params, callable $notify)
+    {
+        // Wrap the existing function if needed.
+        if (!isset($params['notification'])) {
+            $params['notification'] = $notify;
+        } else {
+            $params['notification'] = $this->callArray([
+                $params['notification'],
+                $notify
+            ]);
+        }
+    }
+
+    private function callArray(array $functions)
+    {
+        return function () use ($functions) {
+            $args = func_get_args();
+            foreach ($functions as $fn) {
+                call_user_func_array($fn, $args);
+            }
+        };
+    }
+}
diff --git a/core/vendor/guzzlehttp/guzzle/src/HandlerStack.php b/core/vendor/guzzlehttp/guzzle/src/HandlerStack.php
new file mode 100644
index 000000000..f85184953
--- /dev/null
+++ b/core/vendor/guzzlehttp/guzzle/src/HandlerStack.php
@@ -0,0 +1,272 @@
+<?php
+namespace GuzzleHttp;
+
+use Psr\Http\Message\RequestInterface;
+
+/**
+ * Creates a composed Guzzle handler function by stacking middlewares on top of
+ * an HTTP handler function.
+ */
+class HandlerStack
+{
+    /** @var callable */
+    private $handler;
+
+    /** @var array */
+    private $stack = [];
+
+    /** @var callable|null */
+    private $cached;
+
+    /**
+     * Creates a default handler stack that can be used by clients.
+     *
+     * The returned handler will wrap the provided handler or use the most
+     * appropriate default handler for you system. The returned HandlerStack has
+     * support for cookies, redirects, HTTP error exceptions, and preparing a body
+     * before sending.
+     *
+     * The returned handler stack can be passed to a client in the "handler"
+     * option.
+     *
+     * @param callable $handler HTTP handler function to use with the stack. If no
+     *                          handler is provided, the best handler for your
+     *                          system will be utilized.
+     *
+     * @return HandlerStack
+     */
+    public static function create(callable $handler = null)
+    {
+        $stack = new self($handler ?: choose_handler());
+        $stack->push(Middleware::httpErrors(), 'http_errors');
+        $stack->push(Middleware::redirect(), 'allow_redirects');
+        $stack->push(Middleware::cookies(), 'cookies');
+        $stack->push(Middleware::prepareBody(), 'prepare_body');
+
+        return $stack;
+    }
+
+    /**
+     * @param callable $handler Underlying HTTP handler.
+     */
+    public function __construct(callable $handler = null)
+    {
+        $this->handler = $handler;
+    }
+
+    /**
+     * Invokes the handler stack as a composed handler
+     *
+     * @param RequestInterface $request
+     * @param array            $options
+     */
+    public function __invoke(RequestInterface $request, array $options)
+    {
+        if (!$this->cached) {
+            $this->cached = $this->resolve();
+        }
+
+        $handler = $this->cached;
+        return $handler($request, $options);
+    }
+
+    /**
+     * Dumps a string representation of the stack.
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        $depth = 0;
+        $stack = [];
+        if ($this->handler) {
+            $stack[] = "0) Handler: " . $this->debugCallable($this->handler);
+        }
+
+        $result = '';
+        foreach (array_reverse($this->stack) as $tuple) {
+            $depth++;
+            $str = "{$depth}) Name: '{$tuple[1]}', ";
+            $str .= "Function: " . $this->debugCallable($tuple[0]);
+            $result = "> {$str}\n{$result}";
+            $stack[] = $str;
+        }
+
+        foreach (array_keys($stack) as $k) {
+            $result .= "< {$stack[$k]}\n";
+        }
+
+        return $result;
+    }
+
+    /**
+     * Set the HTTP handler that actually returns a promise.
+     *
+     * @param callable $handler Accepts a request and array of options and
+     *                          returns a Promise.
+     */
+    public function setHandler(callable $handler)
+    {
+        $this->handler = $handler;
+        $this->cached = null;
+    }
+
+    /**
+     * Returns true if the builder has a handler.
+     *
+     * @return bool
+     */
+    public function hasHandler()
+    {
+        return (bool) $this->handler;
+    }
+
+    /**
+     * Unshift a middleware to the bottom of the stack.
+     *
+     * @param callable $middleware Middleware function
+     * @param string   $name       Name to register for this middleware.
+     */
+    public function unshift(callable $middleware, $name = null)
+    {
+        array_unshift($this->stack, [$middleware, $name]);
+        $this->cached = null;
+    }
+
+    /**
+     * Push a middleware to the top of the stack.
+     *
+     * @param callable $middleware Middleware function
+     * @param string   $name       Name to register for this middleware.
+     */
+    public function push(callable $middleware, $name = '')
+    {
+        $this->stack[] = [$middleware, $name];
+        $this->cached = null;
+    }
+
+    /**
+     * Add a middleware before another middleware by name.
+     *
+     * @param string   $findName   Middleware to find
+     * @param callable $middleware Middleware function
+     * @param string   $withName   Name to register for this middleware.
+     */
+    public function before($findName, callable $middleware, $withName = '')
+    {
+        $this->splice($findName, $withName, $middleware, true);
+    }
+
+    /**
+     * Add a middleware after another middleware by name.
+     *
+     * @param string   $findName   Middleware to find
+     * @param callable $middleware Middleware function
+     * @param string   $withName   Name to register for this middleware.
+     */
+    public function after($findName, callable $middleware, $withName = '')
+    {
+        $this->splice($findName, $withName, $middleware, false);
+    }
+
+    /**
+     * Remove a middleware by instance or name from the stack.
+     *
+     * @param callable|string $remove Middleware to remove by instance or name.
+     */
+    public function remove($remove)
+    {
+        $this->cached = null;
+        $idx = is_callable($remove) ? 0 : 1;
+        $this->stack = array_values(array_filter(
+            $this->stack,
+            function ($tuple) use ($idx, $remove) {
+                return $tuple[$idx] !== $remove;
+            }
+        ));
+    }
+
+    /**
+     * Compose the middleware and handler into a single callable function.
+     *
+     * @return callable
+     */
+    public function resolve()
+    {
+        if (!($prev = $this->handler)) {
+            throw new \LogicException('No handler has been specified');
+        }
+
+        foreach (array_reverse($this->stack) as $fn) {
+            $prev = $fn[0]($prev);
+        }
+
+        return $prev;
+    }
+
+    /**
+     * @param $name
+     * @return int
+     */
+    private function findByName($name)
+    {
+        foreach ($this->stack as $k => $v) {
+            if ($v[1] === $name) {
+                return $k;
+            }
+        }
+
+        throw new \InvalidArgumentException("Middleware not found: $name");
+    }
+
+    /**
+     * Splices a function into the middleware list at a specific position.
+     *
+     * @param          $findName
+     * @param          $withName
+     * @param callable $middleware
+     * @param          $before
+     */
+    private function splice($findName, $withName, callable $middleware, $before)
+    {
+        $this->cached = null;
+        $idx = $this->findByName($findName);
+        $tuple = [$middleware, $withName];
+
+        if ($before) {
+            if ($idx === 0) {
+                array_unshift($this->stack, $tuple);
+            } else {
+                $replacement = [$tuple, $this->stack[$idx]];
+                array_splice($this->stack, $idx, 1, $replacement);
+            }
+        } elseif ($idx === count($this->stack) - 1) {
+            $this->stack[] = $tuple;
+        } else {
+            $replacement = [$this->stack[$idx], $tuple];
+            array_splice($this->stack, $idx, 1, $replacement);
+        }
+    }
+
+    /**
+     * Provides a debug string for a given callable.
+     *
+     * @param array|callable $fn Function to write as a string.
+     *
+     * @return string
+     */
+    private function debugCallable($fn)
+    {
+        if (is_string($fn)) {
+            return "callable({$fn})";
+        }
+
+        if (is_array($fn)) {
+            return is_string($fn[0])
+                ? "callable({$fn[0]}::{$fn[1]})"
+                : "callable(['" . get_class($fn[0]) . "', '{$fn[1]}'])";
+        }
+
+        return 'callable(' . spl_object_hash($fn) . ')';
+    }
+}
diff --git a/core/vendor/guzzlehttp/guzzle/src/HasDataTrait.php b/core/vendor/guzzlehttp/guzzle/src/HasDataTrait.php
deleted file mode 100644
index 020dfc9ab..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/HasDataTrait.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-namespace GuzzleHttp;
-
-/**
- * Trait implementing ToArrayInterface, \ArrayAccess, \Countable,
- * \IteratorAggregate, and some path style methods.
- */
-trait HasDataTrait
-{
-    /** @var array */
-    protected $data = [];
-
-    public function getIterator()
-    {
-        return new \ArrayIterator($this->data);
-    }
-
-    public function offsetGet($offset)
-    {
-        return isset($this->data[$offset]) ? $this->data[$offset] : null;
-    }
-
-    public function offsetSet($offset, $value)
-    {
-        $this->data[$offset] = $value;
-    }
-
-    public function offsetExists($offset)
-    {
-        return isset($this->data[$offset]);
-    }
-
-    public function offsetUnset($offset)
-    {
-        unset($this->data[$offset]);
-    }
-
-    public function toArray()
-    {
-        return $this->data;
-    }
-
-    public function count()
-    {
-        return count($this->data);
-    }
-
-    /**
-     * Get a value from the collection using a path syntax to retrieve nested
-     * data.
-     *
-     * @param string $path Path to traverse and retrieve a value from
-     *
-     * @return mixed|null
-     */
-    public function getPath($path)
-    {
-        return Utils::getPath($this->data, $path);
-    }
-
-    /**
-     * Set a value into a nested array key. Keys will be created as needed to
-     * set the value.
-     *
-     * @param string $path  Path to set
-     * @param mixed  $value Value to set at the key
-     *
-     * @throws \RuntimeException when trying to setPath using a nested path
-     *     that travels through a scalar value
-     */
-    public function setPath($path, $value)
-    {
-        Utils::setPath($this->data, $path, $value);
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Message/AbstractMessage.php b/core/vendor/guzzlehttp/guzzle/src/Message/AbstractMessage.php
deleted file mode 100644
index 0c675758d..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Message/AbstractMessage.php
+++ /dev/null
@@ -1,253 +0,0 @@
-<?php
-namespace GuzzleHttp\Message;
-
-use GuzzleHttp\Stream\StreamInterface;
-
-abstract class AbstractMessage implements MessageInterface
-{
-    /** @var array HTTP header collection */
-    private $headers = [];
-
-    /** @var array mapping a lowercase header name to its name over the wire */
-    private $headerNames = [];
-
-    /** @var StreamInterface Message body */
-    private $body;
-
-    /** @var string HTTP protocol version of the message */
-    private $protocolVersion = '1.1';
-
-    public function __toString()
-    {
-        return static::getStartLineAndHeaders($this)
-            . "\r\n\r\n" . $this->getBody();
-    }
-
-    public function getProtocolVersion()
-    {
-        return $this->protocolVersion;
-    }
-
-    public function getBody()
-    {
-        return $this->body;
-    }
-
-    public function setBody(StreamInterface $body = null)
-    {
-        if ($body === null) {
-            // Setting a null body will remove the body of the request
-            $this->removeHeader('Content-Length');
-            $this->removeHeader('Transfer-Encoding');
-        }
-
-        $this->body = $body;
-    }
-
-    public function addHeader($header, $value)
-    {
-        if (is_array($value)) {
-            $current = array_merge($this->getHeaderAsArray($header), $value);
-        } else {
-            $current = $this->getHeaderAsArray($header);
-            $current[] = (string) $value;
-        }
-
-        $this->setHeader($header, $current);
-    }
-
-    public function addHeaders(array $headers)
-    {
-        foreach ($headers as $name => $header) {
-            $this->addHeader($name, $header);
-        }
-    }
-
-    public function getHeader($header)
-    {
-        $name = strtolower($header);
-        return isset($this->headers[$name])
-            ? implode(', ', $this->headers[$name])
-            : '';
-    }
-
-    public function getHeaderAsArray($header)
-    {
-        $name = strtolower($header);
-        return isset($this->headers[$name]) ? $this->headers[$name] : [];
-    }
-
-    public function getHeaders()
-    {
-        $headers = [];
-        foreach ($this->headers as $name => $values) {
-            $headers[$this->headerNames[$name]] = $values;
-        }
-
-        return $headers;
-    }
-
-    public function setHeader($header, $value)
-    {
-        $header = trim($header);
-        $name = strtolower($header);
-        $this->headerNames[$name] = $header;
-
-        if (is_array($value)) {
-            foreach ($value as &$v) {
-                $v = trim($v);
-            }
-            $this->headers[$name] = $value;
-        } else {
-            $this->headers[$name] = [trim($value)];
-        }
-    }
-
-    public function setHeaders(array $headers)
-    {
-        $this->headers = $this->headerNames = [];
-        foreach ($headers as $key => $value) {
-            $this->setHeader($key, $value);
-        }
-    }
-
-    public function hasHeader($header)
-    {
-        return isset($this->headers[strtolower($header)]);
-    }
-
-    public function removeHeader($header)
-    {
-        $name = strtolower($header);
-        unset($this->headers[$name], $this->headerNames[$name]);
-    }
-
-    /**
-     * Parse an array of header values containing ";" separated data into an
-     * array of associative arrays representing the header key value pair
-     * data of the header. When a parameter does not contain a value, but just
-     * contains a key, this function will inject a key with a '' string value.
-     *
-     * @param MessageInterface $message That contains the header
-     * @param string           $header  Header to retrieve from the message
-     *
-     * @return array Returns the parsed header values.
-     */
-    public static function parseHeader(MessageInterface $message, $header)
-    {
-        static $trimmed = "\"'  \n\t\r";
-        $params = $matches = [];
-
-        foreach (self::normalizeHeader($message, $header) as $val) {
-            $part = [];
-            foreach (preg_split('/;(?=([^"]*"[^"]*")*[^"]*$)/', $val) as $kvp) {
-                if (preg_match_all('/<[^>]+>|[^=]+/', $kvp, $matches)) {
-                    $m = $matches[0];
-                    if (isset($m[1])) {
-                        $part[trim($m[0], $trimmed)] = trim($m[1], $trimmed);
-                    } else {
-                        $part[] = trim($m[0], $trimmed);
-                    }
-                }
-            }
-            if ($part) {
-                $params[] = $part;
-            }
-        }
-
-        return $params;
-    }
-
-    /**
-     * Converts an array of header values that may contain comma separated
-     * headers into an array of headers with no comma separated values.
-     *
-     * @param MessageInterface $message That contains the header
-     * @param string              $header  Header to retrieve from the message
-     *
-     * @return array Returns the normalized header field values.
-     */
-    public static function normalizeHeader(MessageInterface $message, $header)
-    {
-        $h = $message->getHeaderAsArray($header);
-        for ($i = 0, $total = count($h); $i < $total; $i++) {
-            if (strpos($h[$i], ',') === false) {
-                continue;
-            }
-            foreach (preg_split('/,(?=([^"]*"[^"]*")*[^"]*$)/', $h[$i]) as $v) {
-                $h[] = trim($v);
-            }
-            unset($h[$i]);
-        }
-
-        return $h;
-    }
-
-    /**
-     * Gets the start-line and headers of a message as a string
-     *
-     * @param MessageInterface $message
-     *
-     * @return string
-     */
-    public static function getStartLineAndHeaders(MessageInterface $message)
-    {
-        return static::getStartLine($message)
-            . self::getHeadersAsString($message);
-    }
-
-    /**
-     * Gets the headers of a message as a string
-     *
-     * @param MessageInterface $message
-     *
-     * @return string
-     */
-    public static function getHeadersAsString(MessageInterface $message)
-    {
-        $result  = '';
-        foreach ($message->getHeaders() as $name => $values) {
-            $result .= "\r\n{$name}: " . implode(', ', $values);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Gets the start line of a message
-     *
-     * @param MessageInterface $message
-     *
-     * @return string
-     * @throws \InvalidArgumentException
-     */
-    public static function getStartLine(MessageInterface $message)
-    {
-        if ($message instanceof RequestInterface) {
-            return trim($message->getMethod() . ' '
-                . $message->getResource())
-                . ' HTTP/' . $message->getProtocolVersion();
-        } elseif ($message instanceof ResponseInterface) {
-            return 'HTTP/' . $message->getProtocolVersion() . ' '
-                . $message->getStatusCode() . ' '
-                . $message->getReasonPhrase();
-        } else {
-            throw new \InvalidArgumentException('Unknown message type');
-        }
-    }
-
-    /**
-     * Accepts and modifies the options provided to the message in the
-     * constructor.
-     *
-     * Can be overridden in subclasses as necessary.
-     *
-     * @param array $options Options array passed by reference.
-     */
-    protected function handleOptions(array &$options)
-    {
-        if (isset($options['protocol_version'])) {
-            $this->protocolVersion = $options['protocol_version'];
-        }
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Message/AppliesHeadersInterface.php b/core/vendor/guzzlehttp/guzzle/src/Message/AppliesHeadersInterface.php
deleted file mode 100644
index ca42f20f3..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Message/AppliesHeadersInterface.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-namespace GuzzleHttp\Message;
-
-/**
- * Applies headers to a request.
- *
- * This interface can be used with Guzzle streams to apply body specific
- * headers to a request during the PREPARE_REQUEST priority of the before event
- *
- * NOTE: a body that implements this interface will prevent a default
- * content-type from being added to a request during the before event. If you
- * want a default content-type to be added, then it will need to be done
- * manually (e.g., using {@see GuzzleHttp\Mimetypes}).
- */
-interface AppliesHeadersInterface
-{
-    /**
-     * Apply headers to a request appropriate for the current state of the
-     * object.
-     *
-     * @param RequestInterface $request Request
-     */
-    public function applyRequestHeaders(RequestInterface $request);
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Message/FutureResponse.php b/core/vendor/guzzlehttp/guzzle/src/Message/FutureResponse.php
deleted file mode 100644
index 5e5037e1b..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Message/FutureResponse.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-namespace GuzzleHttp\Message;
-
-use GuzzleHttp\Ring\Future\MagicFutureTrait;
-use GuzzleHttp\Ring\Future\FutureInterface;
-use GuzzleHttp\Stream\StreamInterface;
-
-/**
- * Represents a response that has not been fulfilled.
- *
- * When created, you must provide a function that is used to dereference the
- * future result and return it's value. The function has no arguments and MUST
- * return an instance of a {@see GuzzleHttp\Message\ResponseInterface} object.
- *
- * You can optionally provide a function in the constructor that can be used to
- * cancel the future from completing if possible. This function has no
- * arguments and returns a boolean value representing whether or not the
- * response could be cancelled.
- *
- * @property ResponseInterface $_value
- */
-class FutureResponse implements ResponseInterface, FutureInterface
-{
-    use MagicFutureTrait;
-
-    /**
-     * Returns a FutureResponse that wraps another future.
-     *
-     * @param FutureInterface $future      Future to wrap with a new future
-     * @param callable        $onFulfilled Invoked when the future fulfilled
-     * @param callable        $onRejected  Invoked when the future rejected
-     * @param callable        $onProgress  Invoked when the future progresses
-     *
-     * @return FutureResponse
-     */
-    public static function proxy(
-        FutureInterface $future,
-        callable $onFulfilled = null,
-        callable $onRejected = null,
-        callable $onProgress = null
-    ) {
-        return new FutureResponse(
-            $future->then($onFulfilled, $onRejected, $onProgress),
-            [$future, 'wait'],
-            [$future, 'cancel']
-        );
-    }
-
-    public function getStatusCode()
-    {
-        return $this->_value->getStatusCode();
-    }
-
-    public function setStatusCode($code)
-    {
-        $this->_value->setStatusCode($code);
-    }
-
-    public function getReasonPhrase()
-    {
-        return $this->_value->getReasonPhrase();
-    }
-
-    public function setReasonPhrase($phrase)
-    {
-        $this->_value->setReasonPhrase($phrase);
-    }
-
-    public function getEffectiveUrl()
-    {
-        return $this->_value->getEffectiveUrl();
-    }
-
-    public function setEffectiveUrl($url)
-    {
-        $this->_value->setEffectiveUrl($url);
-    }
-
-    public function json(array $config = [])
-    {
-        return $this->_value->json($config);
-    }
-
-    public function xml(array $config = [])
-    {
-        return $this->_value->xml($config);
-    }
-
-    public function __toString()
-    {
-        try {
-            return $this->_value->__toString();
-        } catch (\Exception $e) {
-            trigger_error($e->getMessage(), E_USER_WARNING);
-            return '';
-        }
-    }
-
-    public function getProtocolVersion()
-    {
-        return $this->_value->getProtocolVersion();
-    }
-
-    public function setBody(StreamInterface $body = null)
-    {
-        $this->_value->setBody($body);
-    }
-
-    public function getBody()
-    {
-        return $this->_value->getBody();
-    }
-
-    public function getHeaders()
-    {
-        return $this->_value->getHeaders();
-    }
-
-    public function getHeader($header)
-    {
-        return $this->_value->getHeader($header);
-    }
-
-    public function getHeaderAsArray($header)
-    {
-        return $this->_value->getHeaderAsArray($header);
-    }
-
-    public function hasHeader($header)
-    {
-        return $this->_value->hasHeader($header);
-    }
-
-    public function removeHeader($header)
-    {
-        $this->_value->removeHeader($header);
-    }
-
-    public function addHeader($header, $value)
-    {
-        $this->_value->addHeader($header, $value);
-    }
-
-    public function addHeaders(array $headers)
-    {
-        $this->_value->addHeaders($headers);
-    }
-
-    public function setHeader($header, $value)
-    {
-        $this->_value->setHeader($header, $value);
-    }
-
-    public function setHeaders(array $headers)
-    {
-        $this->_value->setHeaders($headers);
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Message/MessageFactory.php b/core/vendor/guzzlehttp/guzzle/src/Message/MessageFactory.php
deleted file mode 100644
index 85984e2dd..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Message/MessageFactory.php
+++ /dev/null
@@ -1,364 +0,0 @@
-<?php
-namespace GuzzleHttp\Message;
-
-use GuzzleHttp\Cookie\CookieJar;
-use GuzzleHttp\Cookie\CookieJarInterface;
-use GuzzleHttp\Event\ListenerAttacherTrait;
-use GuzzleHttp\Post\PostBody;
-use GuzzleHttp\Post\PostFile;
-use GuzzleHttp\Post\PostFileInterface;
-use GuzzleHttp\Query;
-use GuzzleHttp\Stream\Stream;
-use GuzzleHttp\Subscriber\Cookie;
-use GuzzleHttp\Subscriber\HttpError;
-use GuzzleHttp\Subscriber\Redirect;
-use GuzzleHttp\Url;
-use \InvalidArgumentException as Iae;
-
-/**
- * Default HTTP request factory used to create Request and Response objects.
- */
-class MessageFactory implements MessageFactoryInterface
-{
-    use ListenerAttacherTrait;
-
-    /** @var HttpError */
-    private $errorPlugin;
-
-    /** @var Redirect */
-    private $redirectPlugin;
-
-    /** @var array */
-    private $customOptions;
-
-    /** @var array Request options passed through to request Config object */
-    private static $configMap = [
-        'connect_timeout' => 1, 'timeout' => 1, 'verify' => 1, 'ssl_key' => 1,
-        'cert' => 1, 'proxy' => 1, 'debug' => 1, 'save_to' => 1, 'stream' => 1,
-        'expect' => 1, 'future' => 1
-    ];
-
-    /** @var array Default allow_redirects request option settings  */
-    private static $defaultRedirect = [
-        'max'       => 5,
-        'strict'    => false,
-        'referer'   => false,
-        'protocols' => ['http', 'https']
-    ];
-
-    /**
-     * @param array $customOptions Associative array of custom request option
-     *                             names mapping to functions used to apply
-     *                             the option. The function accepts the request
-     *                             and the option value to apply.
-     */
-    public function __construct(array $customOptions = [])
-    {
-        $this->errorPlugin = new HttpError();
-        $this->redirectPlugin = new Redirect();
-        $this->customOptions = $customOptions;
-    }
-
-    public function createResponse(
-        $statusCode,
-        array $headers = [],
-        $body = null,
-        array $options = []
-    ) {
-        if (null !== $body) {
-            $body = Stream::factory($body);
-        }
-
-        return new Response($statusCode, $headers, $body, $options);
-    }
-
-    public function createRequest($method, $url, array $options = [])
-    {
-        // Handle the request protocol version option that needs to be
-        // specified in the request constructor.
-        if (isset($options['version'])) {
-            $options['config']['protocol_version'] = $options['version'];
-            unset($options['version']);
-        }
-
-        $request = new Request($method, $url, [], null,
-            isset($options['config']) ? $options['config'] : []);
-
-        unset($options['config']);
-
-        // Use a POST body by default
-        if ($method == 'POST'
-            && !isset($options['body'])
-            && !isset($options['json'])
-        ) {
-            $options['body'] = [];
-        }
-
-        if ($options) {
-            $this->applyOptions($request, $options);
-        }
-
-        return $request;
-    }
-
-    /**
-     * Create a request or response object from an HTTP message string
-     *
-     * @param string $message Message to parse
-     *
-     * @return RequestInterface|ResponseInterface
-     * @throws \InvalidArgumentException if unable to parse a message
-     */
-    public function fromMessage($message)
-    {
-        static $parser;
-        if (!$parser) {
-            $parser = new MessageParser();
-        }
-
-        // Parse a response
-        if (strtoupper(substr($message, 0, 4)) == 'HTTP') {
-            $data = $parser->parseResponse($message);
-            return $this->createResponse(
-                $data['code'],
-                $data['headers'],
-                $data['body'] === '' ? null : $data['body'],
-                $data
-            );
-        }
-
-        // Parse a request
-        if (!($data = ($parser->parseRequest($message)))) {
-            throw new \InvalidArgumentException('Unable to parse request');
-        }
-
-        return $this->createRequest(
-            $data['method'],
-            Url::buildUrl($data['request_url']),
-            [
-                'headers' => $data['headers'],
-                'body' => $data['body'] === '' ? null : $data['body'],
-                'config' => [
-                    'protocol_version' => $data['protocol_version']
-                ]
-            ]
-        );
-    }
-
-    /**
-     * Apply POST fields and files to a request to attempt to give an accurate
-     * representation.
-     *
-     * @param RequestInterface $request Request to update
-     * @param array            $body    Body to apply
-     */
-    protected function addPostData(RequestInterface $request, array $body)
-    {
-        static $fields = ['string' => true, 'array' => true, 'NULL' => true,
-            'boolean' => true, 'double' => true, 'integer' => true];
-
-        $post = new PostBody();
-        foreach ($body as $key => $value) {
-            if (isset($fields[gettype($value)])) {
-                $post->setField($key, $value);
-            } elseif ($value instanceof PostFileInterface) {
-                $post->addFile($value);
-            } else {
-                $post->addFile(new PostFile($key, $value));
-            }
-        }
-
-        if ($request->getHeader('Content-Type') == 'multipart/form-data') {
-            $post->forceMultipartUpload(true);
-        }
-
-        $request->setBody($post);
-    }
-
-    protected function applyOptions(
-        RequestInterface $request,
-        array $options = []
-    ) {
-        $config = $request->getConfig();
-        $emitter = $request->getEmitter();
-
-        foreach ($options as $key => $value) {
-
-            if (isset(self::$configMap[$key])) {
-                $config[$key] = $value;
-                continue;
-            }
-
-            switch ($key) {
-
-            case 'allow_redirects':
-
-                if ($value === false) {
-                    continue;
-                }
-
-                if ($value === true) {
-                    $value = self::$defaultRedirect;
-                } elseif (!is_array($value)) {
-                    throw new Iae('allow_redirects must be true, false, or array');
-                } else {
-                    // Merge the default settings with the provided settings
-                    $value += self::$defaultRedirect;
-                }
-
-                $config['redirect'] = $value;
-                $emitter->attach($this->redirectPlugin);
-                break;
-
-            case 'decode_content':
-
-                if ($value === false) {
-                    continue;
-                }
-
-                $config['decode_content'] = true;
-                if ($value !== true) {
-                    $request->setHeader('Accept-Encoding', $value);
-                }
-                break;
-
-            case 'headers':
-
-                if (!is_array($value)) {
-                    throw new Iae('header value must be an array');
-                }
-                foreach ($value as $k => $v) {
-                    $request->setHeader($k, $v);
-                }
-                break;
-
-            case 'exceptions':
-
-                if ($value === true) {
-                    $emitter->attach($this->errorPlugin);
-                }
-                break;
-
-            case 'body':
-
-                if (is_array($value)) {
-                    $this->addPostData($request, $value);
-                } elseif ($value !== null) {
-                    $request->setBody(Stream::factory($value));
-                }
-                break;
-
-            case 'auth':
-
-                if (!$value) {
-                    continue;
-                }
-
-                if (is_array($value)) {
-                    $type = isset($value[2]) ? strtolower($value[2]) : 'basic';
-                } else {
-                    $type = strtolower($value);
-                }
-
-                $config['auth'] = $value;
-
-                if ($type == 'basic') {
-                    $request->setHeader(
-                        'Authorization',
-                        'Basic ' . base64_encode("$value[0]:$value[1]")
-                    );
-                } elseif ($type == 'digest') {
-                    // @todo: Do not rely on curl
-                    $config->setPath('curl/' . CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);
-                    $config->setPath('curl/' . CURLOPT_USERPWD, "$value[0]:$value[1]");
-                }
-                break;
-
-            case 'query':
-
-                if ($value instanceof Query) {
-                    $original = $request->getQuery();
-                    // Do not overwrite existing query string variables by
-                    // overwriting the object with the query string data passed
-                    // in the URL
-                    $value->overwriteWith($original->toArray());
-                    $request->setQuery($value);
-                } elseif (is_array($value)) {
-                    // Do not overwrite existing query string variables
-                    $query = $request->getQuery();
-                    foreach ($value as $k => $v) {
-                        if (!isset($query[$k])) {
-                            $query[$k] = $v;
-                        }
-                    }
-                } else {
-                    throw new Iae('query must be an array or Query object');
-                }
-                break;
-
-            case 'cookies':
-
-                if ($value === true) {
-                    static $cookie = null;
-                    if (!$cookie) {
-                        $cookie = new Cookie();
-                    }
-                    $emitter->attach($cookie);
-                } elseif (is_array($value)) {
-                    $emitter->attach(
-                        new Cookie(CookieJar::fromArray($value, $request->getHost()))
-                    );
-                } elseif ($value instanceof CookieJarInterface) {
-                    $emitter->attach(new Cookie($value));
-                } elseif ($value !== false) {
-                    throw new Iae('cookies must be an array, true, or CookieJarInterface');
-                }
-                break;
-
-            case 'events':
-
-                if (!is_array($value)) {
-                    throw new Iae('events must be an array');
-                }
-
-                $this->attachListeners($request,
-                    $this->prepareListeners(
-                        $value,
-                        ['before', 'complete', 'error', 'progress', 'end']
-                    )
-                );
-                break;
-
-            case 'subscribers':
-
-                if (!is_array($value)) {
-                    throw new Iae('subscribers must be an array');
-                }
-
-                foreach ($value as $subscribers) {
-                    $emitter->attach($subscribers);
-                }
-                break;
-
-            case 'json':
-
-                $request->setBody(Stream::factory(json_encode($value)));
-                if (!$request->hasHeader('Content-Type')) {
-                    $request->setHeader('Content-Type', 'application/json');
-                }
-                break;
-
-            default:
-
-                // Check for custom handler functions.
-                if (isset($this->customOptions[$key])) {
-                    $fn = $this->customOptions[$key];
-                    $fn($request, $value);
-                    continue;
-                }
-
-                throw new Iae("No method can handle the {$key} config key");
-            }
-        }
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Message/MessageFactoryInterface.php b/core/vendor/guzzlehttp/guzzle/src/Message/MessageFactoryInterface.php
deleted file mode 100644
index 57c43e5cd..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Message/MessageFactoryInterface.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-namespace GuzzleHttp\Message;
-
-use GuzzleHttp\Url;
-
-/**
- * Request and response factory
- */
-interface MessageFactoryInterface
-{
-    /**
-     * Creates a response
-     *
-     * @param string $statusCode HTTP status code
-     * @param array  $headers    Response headers
-     * @param mixed  $body       Response body
-     * @param array  $options    Response options
-     *     - protocol_version: HTTP protocol version
-     *     - header_factory: Factory used to create headers
-     *     - And any other options used by a concrete message implementation
-     *
-     * @return ResponseInterface
-     */
-    public function createResponse(
-        $statusCode,
-        array $headers = [],
-        $body = null,
-        array $options = []
-    );
-
-    /**
-     * Create a new request based on the HTTP method.
-     *
-     * This method accepts an associative array of request options. Below is a
-     * brief description of each parameter. See
-     * http://docs.guzzlephp.org/clients.html#request-options for a much more
-     * in-depth description of each parameter.
-     *
-     * - headers: Associative array of headers to add to the request
-     * - body: string|resource|array|StreamInterface request body to send
-     * - json: mixed Uploads JSON encoded data using an application/json Content-Type header.
-     * - query: Associative array of query string values to add to the request
-     * - auth: array|string HTTP auth settings (user, pass[, type="basic"])
-     * - version: The HTTP protocol version to use with the request
-     * - cookies: true|false|CookieJarInterface To enable or disable cookies
-     * - allow_redirects: true|false|array Controls HTTP redirects
-     * - save_to: string|resource|StreamInterface Where the response is saved
-     * - events: Associative array of event names to callables or arrays
-     * - subscribers: Array of event subscribers to add to the request
-     * - exceptions: Specifies whether or not exceptions are thrown for HTTP protocol errors
-     * - timeout: Timeout of the request in seconds. Use 0 to wait indefinitely
-     * - connect_timeout: Number of seconds to wait while trying to connect. (0 to wait indefinitely)
-     * - verify: SSL validation. True/False or the path to a PEM file
-     * - cert: Path a SSL cert or array of (path, pwd)
-     * - ssl_key: Path to a private SSL key or array of (path, pwd)
-     * - proxy: Specify an HTTP proxy or hash of protocols to proxies
-     * - debug: Set to true or a resource to view handler specific debug info
-     * - stream: Set to true to stream a response body rather than download it all up front
-     * - expect: true/false/integer Controls the "Expect: 100-Continue" header
-     * - config: Associative array of request config collection options
-     * - decode_content: true/false/string to control decoding content-encoding responses
-     *
-     * @param string     $method  HTTP method (GET, POST, PUT, etc.)
-     * @param string|Url $url     HTTP URL to connect to
-     * @param array      $options Array of options to apply to the request
-     *
-     * @return RequestInterface
-     * @link http://docs.guzzlephp.org/clients.html#request-options
-     */
-    public function createRequest($method, $url, array $options = []);
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Message/MessageInterface.php b/core/vendor/guzzlehttp/guzzle/src/Message/MessageInterface.php
deleted file mode 100644
index b2b472b6e..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Message/MessageInterface.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-namespace GuzzleHttp\Message;
-
-use GuzzleHttp\Stream\StreamInterface;
-
-/**
- * Request and response message interface
- */
-interface MessageInterface
-{
-    /**
-     * Get a string representation of the message
-     *
-     * @return string
-     */
-    public function __toString();
-
-    /**
-     * Get the HTTP protocol version of the message
-     *
-     * @return string
-     */
-    public function getProtocolVersion();
-
-    /**
-     * Sets the body of the message.
-     *
-     * The body MUST be a StreamInterface object. Setting the body to null MUST
-     * remove the existing body.
-     *
-     * @param StreamInterface|null $body Body.
-     */
-    public function setBody(StreamInterface $body = null);
-
-    /**
-     * Get the body of the message
-     *
-     * @return StreamInterface|null
-     */
-    public function getBody();
-
-    /**
-     * Gets all message headers.
-     *
-     * The keys represent the header name as it will be sent over the wire, and
-     * each value is an array of strings associated with the header.
-     *
-     *     // Represent the headers as a string
-     *     foreach ($message->getHeaders() as $name => $values) {
-     *         echo $name . ": " . implode(", ", $values);
-     *     }
-     *
-     * @return array Returns an associative array of the message's headers.
-     */
-    public function getHeaders();
-
-    /**
-     * Retrieve a header by the given case-insensitive name.
-     *
-     * @param string $header Case-insensitive header name.
-     *
-     * @return string
-     */
-    public function getHeader($header);
-
-    /**
-     * Retrieves a header by the given case-insensitive name as an array of strings.
-     *
-     * @param string $header Case-insensitive header name.
-     *
-     * @return string[]
-     */
-    public function getHeaderAsArray($header);
-
-    /**
-     * Checks if a header exists by the given case-insensitive name.
-     *
-     * @param string $header Case-insensitive header name.
-     *
-     * @return bool Returns true if any header names match the given header
-     *     name using a case-insensitive string comparison. Returns false if
-     *     no matching header name is found in the message.
-     */
-    public function hasHeader($header);
-
-    /**
-     * Remove a specific header by case-insensitive name.
-     *
-     * @param string $header Case-insensitive header name.
-     */
-    public function removeHeader($header);
-
-    /**
-     * Appends a header value to any existing values associated with the
-     * given header name.
-     *
-     * @param string $header Header name to add
-     * @param string $value  Value of the header
-     */
-    public function addHeader($header, $value);
-
-    /**
-     * Merges in an associative array of headers.
-     *
-     * Each array key MUST be a string representing the case-insensitive name
-     * of a header. Each value MUST be either a string or an array of strings.
-     * For each value, the value is appended to any existing header of the same
-     * name, or, if a header does not already exist by the given name, then the
-     * header is added.
-     *
-     * @param array $headers Associative array of headers to add to the message
-     */
-    public function addHeaders(array $headers);
-
-    /**
-     * Sets a header, replacing any existing values of any headers with the
-     * same case-insensitive name.
-     *
-     * The header values MUST be a string or an array of strings.
-     *
-     * @param string       $header Header name
-     * @param string|array $value  Header value(s)
-     */
-    public function setHeader($header, $value);
-
-    /**
-     * Sets headers, replacing any headers that have already been set on the
-     * message.
-     *
-     * The array keys MUST be a string. The array values must be either a
-     * string or an array of strings.
-     *
-     * @param array $headers Headers to set.
-     */
-    public function setHeaders(array $headers);
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Message/MessageParser.php b/core/vendor/guzzlehttp/guzzle/src/Message/MessageParser.php
deleted file mode 100644
index c3cc195e3..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Message/MessageParser.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-namespace GuzzleHttp\Message;
-
-/**
- * Request and response parser used by Guzzle
- */
-class MessageParser
-{
-    /**
-     * Parse an HTTP request message into an associative array of parts.
-     *
-     * @param string $message HTTP request to parse
-     *
-     * @return array|bool Returns false if the message is invalid
-     */
-    public function parseRequest($message)
-    {
-        if (!($parts = $this->parseMessage($message))) {
-            return false;
-        }
-
-        // Parse the protocol and protocol version
-        if (isset($parts['start_line'][2])) {
-            $startParts = explode('/', $parts['start_line'][2]);
-            $protocol = strtoupper($startParts[0]);
-            $version = isset($startParts[1]) ? $startParts[1] : '1.1';
-        } else {
-            $protocol = 'HTTP';
-            $version = '1.1';
-        }
-
-        $parsed = [
-            'method'   => strtoupper($parts['start_line'][0]),
-            'protocol' => $protocol,
-            'protocol_version' => $version,
-            'headers'  => $parts['headers'],
-            'body'     => $parts['body']
-        ];
-
-        $parsed['request_url'] = $this->getUrlPartsFromMessage(
-            (isset($parts['start_line'][1]) ? $parts['start_line'][1] : ''), $parsed);
-
-        return $parsed;
-    }
-
-    /**
-     * Parse an HTTP response message into an associative array of parts.
-     *
-     * @param string $message HTTP response to parse
-     *
-     * @return array|bool Returns false if the message is invalid
-     */
-    public function parseResponse($message)
-    {
-        if (!($parts = $this->parseMessage($message))) {
-            return false;
-        }
-
-        list($protocol, $version) = explode('/', trim($parts['start_line'][0]));
-
-        return [
-            'protocol'         => $protocol,
-            'protocol_version' => $version,
-            'code'             => $parts['start_line'][1],
-            'reason_phrase'    => isset($parts['start_line'][2]) ? $parts['start_line'][2] : '',
-            'headers'          => $parts['headers'],
-            'body'             => $parts['body']
-        ];
-    }
-
-    /**
-     * Parse a message into parts
-     *
-     * @param string $message Message to parse
-     *
-     * @return array|bool
-     */
-    private function parseMessage($message)
-    {
-        if (!$message) {
-            return false;
-        }
-
-        $startLine = null;
-        $headers = [];
-        $body = '';
-
-        // Iterate over each line in the message, accounting for line endings
-        $lines = preg_split('/(\\r?\\n)/', $message, -1, PREG_SPLIT_DELIM_CAPTURE);
-        for ($i = 0, $totalLines = count($lines); $i < $totalLines; $i += 2) {
-
-            $line = $lines[$i];
-
-            // If two line breaks were encountered, then this is the end of body
-            if (empty($line)) {
-                if ($i < $totalLines - 1) {
-                    $body = implode('', array_slice($lines, $i + 2));
-                }
-                break;
-            }
-
-            // Parse message headers
-            if (!$startLine) {
-                $startLine = explode(' ', $line, 3);
-            } elseif (strpos($line, ':')) {
-                $parts = explode(':', $line, 2);
-                $key = trim($parts[0]);
-                $value = isset($parts[1]) ? trim($parts[1]) : '';
-                if (!isset($headers[$key])) {
-                    $headers[$key] = $value;
-                } elseif (!is_array($headers[$key])) {
-                    $headers[$key] = [$headers[$key], $value];
-                } else {
-                    $headers[$key][] = $value;
-                }
-            }
-        }
-
-        return [
-            'start_line' => $startLine,
-            'headers'    => $headers,
-            'body'       => $body
-        ];
-    }
-
-    /**
-     * Create URL parts from HTTP message parts
-     *
-     * @param string $requestUrl Associated URL
-     * @param array  $parts      HTTP message parts
-     *
-     * @return array
-     */
-    private function getUrlPartsFromMessage($requestUrl, array $parts)
-    {
-        // Parse the URL information from the message
-        $urlParts = ['path' => $requestUrl, 'scheme' => 'http'];
-
-        // Check for the Host header
-        if (isset($parts['headers']['Host'])) {
-            $urlParts['host'] = $parts['headers']['Host'];
-        } elseif (isset($parts['headers']['host'])) {
-            $urlParts['host'] = $parts['headers']['host'];
-        } else {
-            $urlParts['host'] = null;
-        }
-
-        if (false === strpos($urlParts['host'], ':')) {
-            $urlParts['port'] = '';
-        } else {
-            $hostParts = explode(':', $urlParts['host']);
-            $urlParts['host'] = trim($hostParts[0]);
-            $urlParts['port'] = (int) trim($hostParts[1]);
-            if ($urlParts['port'] == 443) {
-                $urlParts['scheme'] = 'https';
-            }
-        }
-
-        // Check if a query is present
-        $path = $urlParts['path'];
-        $qpos = strpos($path, '?');
-        if ($qpos) {
-            $urlParts['query'] = substr($path, $qpos + 1);
-            $urlParts['path'] = substr($path, 0, $qpos);
-        } else {
-            $urlParts['query'] = '';
-        }
-
-        return $urlParts;
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Message/Request.php b/core/vendor/guzzlehttp/guzzle/src/Message/Request.php
deleted file mode 100644
index 4dbe32e64..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Message/Request.php
+++ /dev/null
@@ -1,195 +0,0 @@
-<?php
-namespace GuzzleHttp\Message;
-
-use GuzzleHttp\Collection;
-use GuzzleHttp\Event\HasEmitterTrait;
-use GuzzleHttp\Subscriber\Prepare;
-use GuzzleHttp\Url;
-
-/**
- * HTTP request class to send requests
- */
-class Request extends AbstractMessage implements RequestInterface
-{
-    use HasEmitterTrait;
-
-    /** @var Url HTTP Url */
-    private $url;
-
-    /** @var string HTTP method */
-    private $method;
-
-    /** @var Collection Transfer options */
-    private $transferOptions;
-
-    /**
-     * @param string           $method  HTTP method
-     * @param string|Url       $url     HTTP URL to connect to. The URI scheme,
-     *   host header, and URI are parsed from the full URL. If query string
-     *   parameters are present they will be parsed as well.
-     * @param array|Collection $headers HTTP headers
-     * @param mixed            $body    Body to send with the request
-     * @param array            $options Array of options to use with the request
-     *     - emitter: Event emitter to use with the request
-     */
-    public function __construct(
-        $method,
-        $url,
-        $headers = [],
-        $body = null,
-        array $options = []
-    ) {
-        $this->setUrl($url);
-        $this->method = strtoupper($method);
-        $this->handleOptions($options);
-        $this->transferOptions = new Collection($options);
-        $this->addPrepareEvent();
-
-        if ($body !== null) {
-            $this->setBody($body);
-        }
-
-        if ($headers) {
-            foreach ($headers as $key => $value) {
-                $this->setHeader($key, $value);
-            }
-        }
-    }
-
-    public function __clone()
-    {
-        if ($this->emitter) {
-            $this->emitter = clone $this->emitter;
-        }
-        $this->transferOptions = clone $this->transferOptions;
-        $this->url = clone $this->url;
-    }
-
-    public function setUrl($url)
-    {
-        $this->url = $url instanceof Url ? $url : Url::fromString($url);
-        $this->updateHostHeaderFromUrl();
-    }
-
-    public function getUrl()
-    {
-        return (string) $this->url;
-    }
-
-    public function setQuery($query)
-    {
-        $this->url->setQuery($query);
-    }
-
-    public function getQuery()
-    {
-        return $this->url->getQuery();
-    }
-
-    public function setMethod($method)
-    {
-        $this->method = strtoupper($method);
-    }
-
-    public function getMethod()
-    {
-        return $this->method;
-    }
-
-    public function getScheme()
-    {
-        return $this->url->getScheme();
-    }
-
-    public function setScheme($scheme)
-    {
-        $this->url->setScheme($scheme);
-    }
-
-    public function getPort()
-    {
-        return $this->url->getPort();
-    }
-
-    public function setPort($port)
-    {
-        $this->url->setPort($port);
-        $this->updateHostHeaderFromUrl();
-    }
-
-    public function getHost()
-    {
-        return $this->url->getHost();
-    }
-
-    public function setHost($host)
-    {
-        $this->url->setHost($host);
-        $this->updateHostHeaderFromUrl();
-    }
-
-    public function getPath()
-    {
-        return '/' . ltrim($this->url->getPath(), '/');
-    }
-
-    public function setPath($path)
-    {
-        $this->url->setPath($path);
-    }
-
-    public function getResource()
-    {
-        $resource = $this->getPath();
-        if ($query = (string) $this->url->getQuery()) {
-            $resource .= '?' . $query;
-        }
-
-        return $resource;
-    }
-
-    public function getConfig()
-    {
-        return $this->transferOptions;
-    }
-
-    protected function handleOptions(array &$options)
-    {
-        parent::handleOptions($options);
-        // Use a custom emitter if one is specified, and remove it from
-        // options that are exposed through getConfig()
-        if (isset($options['emitter'])) {
-            $this->emitter = $options['emitter'];
-            unset($options['emitter']);
-        }
-    }
-
-    /**
-     * Adds a subscriber that ensures a request's body is prepared before
-     * sending.
-     */
-    private function addPrepareEvent()
-    {
-        static $subscriber;
-        if (!$subscriber) {
-            $subscriber = new Prepare();
-        }
-
-        $this->getEmitter()->attach($subscriber);
-    }
-
-    private function updateHostHeaderFromUrl()
-    {
-        $port = $this->url->getPort();
-        $scheme = $this->url->getScheme();
-        if ($host = $this->url->getHost()) {
-            if (($port == 80 && $scheme == 'http') ||
-                ($port == 443 && $scheme == 'https')
-            ) {
-                $this->setHeader('Host', $host);
-            } else {
-                $this->setHeader('Host', "{$host}:{$port}");
-            }
-        }
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Message/RequestInterface.php b/core/vendor/guzzlehttp/guzzle/src/Message/RequestInterface.php
deleted file mode 100644
index f6a69d1e1..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Message/RequestInterface.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-namespace GuzzleHttp\Message;
-
-use GuzzleHttp\Event\HasEmitterInterface;
-use GuzzleHttp\Query;
-
-/**
- * Generic HTTP request interface
- */
-interface RequestInterface extends MessageInterface, HasEmitterInterface
-{
-    /**
-     * Sets the request URL.
-     *
-     * The URL MUST be a string, or an object that implements the
-     * `__toString()` method.
-     *
-     * @param string $url Request URL.
-     *
-     * @throws \InvalidArgumentException If the URL is invalid.
-     */
-    public function setUrl($url);
-
-    /**
-     * Gets the request URL as a string.
-     *
-     * @return string Returns the URL as a string.
-     */
-    public function getUrl();
-
-    /**
-     * Get the resource part of the the request, including the path, query
-     * string, and fragment.
-     *
-     * @return string
-     */
-    public function getResource();
-
-    /**
-     * Get the collection of key value pairs that will be used as the query
-     * string in the request.
-     *
-     * @return Query
-     */
-    public function getQuery();
-
-    /**
-     * Set the query string used by the request
-     *
-     * @param array|Query $query Query to set
-     */
-    public function setQuery($query);
-
-    /**
-     * Get the HTTP method of the request.
-     *
-     * @return string
-     */
-    public function getMethod();
-
-    /**
-     * Set the HTTP method of the request.
-     *
-     * @param string $method HTTP method
-     */
-    public function setMethod($method);
-
-    /**
-     * Get the URI scheme of the request (http, https, etc.).
-     *
-     * @return string
-     */
-    public function getScheme();
-
-    /**
-     * Set the URI scheme of the request (http, https, etc.).
-     *
-     * @param string $scheme Scheme to set
-     */
-    public function setScheme($scheme);
-
-    /**
-     * Get the port scheme of the request (e.g., 80, 443, etc.).
-     *
-     * @return int
-     */
-    public function getPort();
-
-    /**
-     * Set the port of the request.
-     *
-     * Setting a port modifies the Host header of a request as necessary.
-     *
-     * @param int $port Port to set
-     */
-    public function setPort($port);
-
-    /**
-     * Get the host of the request.
-     *
-     * @return string
-     */
-    public function getHost();
-
-    /**
-     * Set the host of the request including an optional port.
-     *
-     * Including a port in the host argument will explicitly change the port of
-     * the request. If no port is found, the default port of the current
-     * request scheme will be utilized.
-     *
-     * @param string $host Host to set (e.g. www.yahoo.com, www.yahoo.com:80)
-     */
-    public function setHost($host);
-
-    /**
-     * Get the path of the request (e.g. '/', '/index.html').
-     *
-     * @return string
-     */
-    public function getPath();
-
-    /**
-     * Set the path of the request (e.g. '/', '/index.html').
-     *
-     * @param string|array $path Path to set or array of segments to implode
-     */
-    public function setPath($path);
-
-    /**
-     * Get the request's configuration options.
-     *
-     * @return \GuzzleHttp\Collection
-     */
-    public function getConfig();
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Message/Response.php b/core/vendor/guzzlehttp/guzzle/src/Message/Response.php
deleted file mode 100644
index 42e10e64e..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Message/Response.php
+++ /dev/null
@@ -1,208 +0,0 @@
-<?php
-namespace GuzzleHttp\Message;
-
-use GuzzleHttp\Exception\ParseException;
-use GuzzleHttp\Exception\XmlParseException;
-use GuzzleHttp\Stream\StreamInterface;
-use GuzzleHttp\Utils;
-
-/**
- * Guzzle HTTP response object
- */
-class Response extends AbstractMessage implements ResponseInterface
-{
-    /** @var array Mapping of status codes to reason phrases */
-    private static $statusTexts = [
-        100 => 'Continue',
-        101 => 'Switching Protocols',
-        102 => 'Processing',
-        200 => 'OK',
-        201 => 'Created',
-        202 => 'Accepted',
-        203 => 'Non-Authoritative Information',
-        204 => 'No Content',
-        205 => 'Reset Content',
-        206 => 'Partial Content',
-        207 => 'Multi-Status',
-        208 => 'Already Reported',
-        226 => 'IM Used',
-        300 => 'Multiple Choices',
-        301 => 'Moved Permanently',
-        302 => 'Found',
-        303 => 'See Other',
-        304 => 'Not Modified',
-        305 => 'Use Proxy',
-        307 => 'Temporary Redirect',
-        308 => 'Permanent Redirect',
-        400 => 'Bad Request',
-        401 => 'Unauthorized',
-        402 => 'Payment Required',
-        403 => 'Forbidden',
-        404 => 'Not Found',
-        405 => 'Method Not Allowed',
-        406 => 'Not Acceptable',
-        407 => 'Proxy Authentication Required',
-        408 => 'Request Timeout',
-        409 => 'Conflict',
-        410 => 'Gone',
-        411 => 'Length Required',
-        412 => 'Precondition Failed',
-        413 => 'Request Entity Too Large',
-        414 => 'Request-URI Too Long',
-        415 => 'Unsupported Media Type',
-        416 => 'Requested Range Not Satisfiable',
-        417 => 'Expectation Failed',
-        422 => 'Unprocessable Entity',
-        423 => 'Locked',
-        424 => 'Failed Dependency',
-        425 => 'Reserved for WebDAV advanced collections expired proposal',
-        426 => 'Upgrade required',
-        428 => 'Precondition Required',
-        429 => 'Too Many Requests',
-        431 => 'Request Header Fields Too Large',
-        500 => 'Internal Server Error',
-        501 => 'Not Implemented',
-        502 => 'Bad Gateway',
-        503 => 'Service Unavailable',
-        504 => 'Gateway Timeout',
-        505 => 'HTTP Version Not Supported',
-        506 => 'Variant Also Negotiates (Experimental)',
-        507 => 'Insufficient Storage',
-        508 => 'Loop Detected',
-        510 => 'Not Extended',
-        511 => 'Network Authentication Required',
-    ];
-
-    /** @var string The reason phrase of the response (human readable code) */
-    private $reasonPhrase;
-
-    /** @var string The status code of the response */
-    private $statusCode;
-
-    /** @var string The effective URL that returned this response */
-    private $effectiveUrl;
-
-    /**
-     * @param int|string      $statusCode The response status code (e.g. 200)
-     * @param array           $headers    The response headers
-     * @param StreamInterface $body       The body of the response
-     * @param array           $options    Response message options
-     *     - reason_phrase: Set a custom reason phrase
-     *     - protocol_version: Set a custom protocol version
-     */
-    public function __construct(
-        $statusCode,
-        array $headers = [],
-        StreamInterface $body = null,
-        array $options = []
-    ) {
-        $this->statusCode = (int) $statusCode;
-        $this->handleOptions($options);
-
-        // Assume a reason phrase if one was not applied as an option
-        if (!$this->reasonPhrase &&
-            isset(self::$statusTexts[$this->statusCode])
-        ) {
-            $this->reasonPhrase = self::$statusTexts[$this->statusCode];
-        }
-
-        if ($headers) {
-            $this->setHeaders($headers);
-        }
-
-        if ($body) {
-            $this->setBody($body);
-        }
-    }
-
-    public function getStatusCode()
-    {
-        return $this->statusCode;
-    }
-
-    public function setStatusCode($code)
-    {
-        return $this->statusCode = (int) $code;
-    }
-
-    public function getReasonPhrase()
-    {
-        return $this->reasonPhrase;
-    }
-
-    public function setReasonPhrase($phrase)
-    {
-        return $this->reasonPhrase = $phrase;
-    }
-
-    public function json(array $config = [])
-    {
-        try {
-            return Utils::jsonDecode(
-                (string) $this->getBody(),
-                isset($config['object']) ? !$config['object'] : true,
-                512,
-                isset($config['big_int_strings']) ? JSON_BIGINT_AS_STRING : 0
-            );
-        } catch (\InvalidArgumentException $e) {
-            throw new ParseException(
-                $e->getMessage(),
-                $this
-            );
-        }
-    }
-
-    public function xml(array $config = [])
-    {
-        $disableEntities = libxml_disable_entity_loader(true);
-        $internalErrors = libxml_use_internal_errors(true);
-
-        try {
-            // Allow XML to be retrieved even if there is no response body
-            $xml = new \SimpleXMLElement(
-                (string) $this->getBody() ?: '<root />',
-                isset($config['libxml_options']) ? $config['libxml_options'] : LIBXML_NONET,
-                false,
-                isset($config['ns']) ? $config['ns'] : '',
-                isset($config['ns_is_prefix']) ? $config['ns_is_prefix'] : false
-            );
-            libxml_disable_entity_loader($disableEntities);
-            libxml_use_internal_errors($internalErrors);
-        } catch (\Exception $e) {
-            libxml_disable_entity_loader($disableEntities);
-            libxml_use_internal_errors($internalErrors);
-            throw new XmlParseException(
-                'Unable to parse response body into XML: ' . $e->getMessage(),
-                $this,
-                $e,
-                (libxml_get_last_error()) ?: null
-            );
-        }
-
-        return $xml;
-    }
-
-    public function getEffectiveUrl()
-    {
-        return $this->effectiveUrl;
-    }
-
-    public function setEffectiveUrl($url)
-    {
-        $this->effectiveUrl = $url;
-    }
-
-    /**
-     * Accepts and modifies the options provided to the response in the
-     * constructor.
-     *
-     * @param array $options Options array passed by reference.
-     */
-    protected function handleOptions(array &$options = [])
-    {
-        parent::handleOptions($options);
-        if (isset($options['reason_phrase'])) {
-            $this->reasonPhrase = $options['reason_phrase'];
-        }
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Message/ResponseInterface.php b/core/vendor/guzzlehttp/guzzle/src/Message/ResponseInterface.php
deleted file mode 100644
index c0ae9be93..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Message/ResponseInterface.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-namespace GuzzleHttp\Message;
-
-/**
- * Represents an HTTP response message.
- */
-interface ResponseInterface extends MessageInterface
-{
-    /**
-     * Gets the response Status-Code.
-     *
-     * The Status-Code is a 3-digit integer result code of the server's attempt
-     * to understand and satisfy the request.
-     *
-     * @return int Status code.
-     */
-    public function getStatusCode();
-
-    /**
-     * Sets the status code of this response.
-     *
-     * @param int $code The 3-digit integer result code to set.
-     */
-    public function setStatusCode($code);
-
-    /**
-     * Gets the response Reason-Phrase, a short textual description of the
-     * Status-Code.
-     *
-     * Because a Reason-Phrase is not a required element in response
-     * Status-Line, the Reason-Phrase value MAY be null. Implementations MAY
-     * choose to return the default RFC 2616 recommended reason phrase for the
-     * response's Status-Code.
-     *
-     * @return string|null Reason phrase, or null if unknown.
-     */
-    public function getReasonPhrase();
-
-    /**
-     * Sets the Reason-Phrase of the response.
-     *
-     * If no Reason-Phrase is specified, implementations MAY choose to default
-     * to the RFC 2616 recommended reason phrase for the response's Status-Code.
-     *
-     * @param string $phrase The Reason-Phrase to set.
-     */
-    public function setReasonPhrase($phrase);
-
-    /**
-     * Get the effective URL that resulted in this response (e.g. the last
-     * redirect URL).
-     *
-     * @return string
-     */
-    public function getEffectiveUrl();
-
-    /**
-     * Set the effective URL that resulted in this response (e.g. the last
-     * redirect URL).
-     *
-     * @param string $url Effective URL
-     */
-    public function setEffectiveUrl($url);
-
-    /**
-     * Parse the JSON response body and return the JSON decoded data.
-     *
-     * @param array $config Associative array of configuration settings used
-     *     to control how the JSON data is parsed. Concrete implementations MAY
-     *     add further configuration settings as needed, but they MUST implement
-     *     functionality for the following options:
-     *
-     *     - object: Set to true to parse JSON objects as PHP objects rather
-     *       than associative arrays. Defaults to false.
-     *     - big_int_strings: When set to true, large integers are converted to
-     *       strings rather than floats. Defaults to false.
-     *
-     *     Implementations are free to add further configuration settings as
-     *     needed.
-     *
-     * @return mixed Returns the JSON decoded data based on the provided
-     *     parse settings.
-     * @throws \RuntimeException if the response body is not in JSON format
-     */
-    public function json(array $config = []);
-
-    /**
-     * Parse the XML response body and return a \SimpleXMLElement.
-     *
-     * In order to prevent XXE attacks, this method disables loading external
-     * entities. If you rely on external entities, then you must parse the
-     * XML response manually by accessing the response body directly.
-     *
-     * @param array $config Associative array of configuration settings used
-     *     to control how the XML is parsed. Concrete implementations MAY add
-     *     further configuration settings as needed, but they MUST implement
-     *     functionality for the following options:
-     *
-     *     - ns: Set to a string to represent the namespace prefix or URI
-     *     - ns_is_prefix: Set to true to specify that the NS is a prefix rather
-     *       than a URI (defaults to false).
-     *     - libxml_options: Bitwise OR of the libxml option constants
-     *       listed at http://php.net/manual/en/libxml.constants.php
-     *       (defaults to LIBXML_NONET)
-     *
-     * @return \SimpleXMLElement
-     * @throws \RuntimeException if the response body is not in XML format
-     * @link http://websec.io/2012/08/27/Preventing-XXE-in-PHP.html
-     */
-    public function xml(array $config = []);
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/MessageFormatter.php b/core/vendor/guzzlehttp/guzzle/src/MessageFormatter.php
new file mode 100644
index 000000000..6b090a977
--- /dev/null
+++ b/core/vendor/guzzlehttp/guzzle/src/MessageFormatter.php
@@ -0,0 +1,182 @@
+<?php
+namespace GuzzleHttp;
+
+use Psr\Http\Message\MessageInterface;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
+
+/**
+ * Formats log messages using variable substitutions for requests, responses,
+ * and other transactional data.
+ *
+ * The following variable substitutions are supported:
+ *
+ * - {request}:        Full HTTP request message
+ * - {response}:       Full HTTP response message
+ * - {ts}:             ISO 8601 date in GMT
+ * - {date_iso_8601}   ISO 8601 date in GMT
+ * - {date_common_log} Apache common log date using the configured timezone.
+ * - {host}:           Host of the request
+ * - {method}:         Method of the request
+ * - {uri}:            URI of the request
+ * - {host}:           Host of the request
+ * - {version}:        Protocol version
+ * - {target}:         Request target of the request (path + query + fragment)
+ * - {hostname}:       Hostname of the machine that sent the request
+ * - {code}:           Status code of the response (if available)
+ * - {phrase}:         Reason phrase of the response  (if available)
+ * - {error}:          Any error messages (if available)
+ * - {req_header_*}:   Replace `*` with the lowercased name of a request header to add to the message
+ * - {res_header_*}:   Replace `*` with the lowercased name of a response header to add to the message
+ * - {req_headers}:    Request headers
+ * - {res_headers}:    Response headers
+ * - {req_body}:       Request body
+ * - {res_body}:       Response body
+ */
+class MessageFormatter
+{
+    /**
+     * Apache Common Log Format.
+     * @link http://httpd.apache.org/docs/2.4/logs.html#common
+     * @var string
+     */
+    const CLF = "{hostname} {req_header_User-Agent} - [{date_common_log}] \"{method} {target} HTTP/{version}\" {code} {res_header_Content-Length}";
+    const DEBUG = ">>>>>>>>\n{request}\n<<<<<<<<\n{response}\n--------\n{error}";
+    const SHORT = '[{ts}] "{method} {target} HTTP/{version}" {code}';
+
+    /** @var string Template used to format log messages */
+    private $template;
+
+    /**
+     * @param string $template Log message template
+     */
+    public function __construct($template = self::CLF)
+    {
+        $this->template = $template ?: self::CLF;
+    }
+
+    /**
+     * Returns a formatted message string.
+     *
+     * @param RequestInterface  $request  Request that was sent
+     * @param ResponseInterface $response Response that was received
+     * @param \Exception        $error    Exception that was received
+     *
+     * @return string
+     */
+    public function format(
+        RequestInterface $request,
+        ResponseInterface $response = null,
+        \Exception $error = null
+    ) {
+        $cache = [];
+
+        return preg_replace_callback(
+            '/{\s*([A-Za-z_\-\.0-9]+)\s*}/',
+            function (array $matches) use ($request, $response, $error, &$cache) {
+
+                if (isset($cache[$matches[1]])) {
+                    return $cache[$matches[1]];
+                }
+
+                $result = '';
+                switch ($matches[1]) {
+                    case 'request':
+                        $result = Psr7\str($request);
+                        break;
+                    case 'response':
+                        $result = $response ? Psr7\str($response) : '';
+                        break;
+                    case 'req_headers':
+                        $result = trim($request->getMethod()
+                                . ' ' . $request->getRequestTarget())
+                            . ' HTTP/' . $request->getProtocolVersion() . "\r\n"
+                            . $this->headers($request);
+                        break;
+                    case 'res_headers':
+                        $result = $response ?
+                            sprintf(
+                                'HTTP/%s %d %s',
+                                $response->getProtocolVersion(),
+                                $response->getStatusCode(),
+                                $response->getReasonPhrase()
+                            ) . "\r\n" . $this->headers($response)
+                            : 'NULL';
+                        break;
+                    case 'req_body':
+                        $result = $request->getBody();
+                        break;
+                    case 'res_body':
+                        $result = $response ? $response->getBody() : 'NULL';
+                        break;
+                    case 'ts':
+                    case 'date_iso_8601':
+                        $result = gmdate('c');
+                        break;
+                    case 'date_common_log':
+                        $result = date('d/M/Y:H:i:s O');
+                        break;
+                    case 'method':
+                        $result = $request->getMethod();
+                        break;
+                    case 'version':
+                        $result = $request->getProtocolVersion();
+                        break;
+                    case 'uri':
+                    case 'url':
+                        $result = $request->getUri();
+                        break;
+                    case 'target':
+                        $result = $request->getRequestTarget();
+                        break;
+                    case 'req_version':
+                        $result = $request->getProtocolVersion();
+                        break;
+                    case 'res_version':
+                        $result = $response
+                            ? $response->getProtocolVersion()
+                            : 'NULL';
+                        break;
+                    case 'host':
+                        $result = $request->getHeaderLine('Host');
+                        break;
+                    case 'hostname':
+                        $result = gethostname();
+                        break;
+                    case 'code':
+                        $result = $response ? $response->getStatusCode() : 'NULL';
+                        break;
+                    case 'phrase':
+                        $result = $response ? $response->getReasonPhrase() : 'NULL';
+                        break;
+                    case 'error':
+                        $result = $error ? $error->getMessage() : 'NULL';
+                        break;
+                    default:
+                        // handle prefixed dynamic headers
+                        if (strpos($matches[1], 'req_header_') === 0) {
+                            $result = $request->getHeaderLine(substr($matches[1], 11));
+                        } elseif (strpos($matches[1], 'res_header_') === 0) {
+                            $result = $response
+                                ? $response->getHeaderLine(substr($matches[1], 11))
+                                : 'NULL';
+                        }
+                }
+
+                $cache[$matches[1]] = $result;
+                return $result;
+            },
+            $this->template
+        );
+    }
+
+    private function headers(MessageInterface $message)
+    {
+        $result = '';
+        foreach ($message->getHeaders() as $name => $values) {
+            $result .= $name . ': ' . implode(', ', $values) . "\r\n";
+        }
+
+        return trim($result);
+    }
+}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Middleware.php b/core/vendor/guzzlehttp/guzzle/src/Middleware.php
new file mode 100644
index 000000000..2f165f39a
--- /dev/null
+++ b/core/vendor/guzzlehttp/guzzle/src/Middleware.php
@@ -0,0 +1,253 @@
+<?php
+namespace GuzzleHttp;
+
+use GuzzleHttp\Cookie\CookieJarInterface;
+use GuzzleHttp\Exception\ClientException;
+use GuzzleHttp\Exception\RequestException;
+use GuzzleHttp\Exception\ServerException;
+use GuzzleHttp\Promise\RejectedPromise;
+use GuzzleHttp\Psr7;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Log\LoggerInterface;
+use Psr\Log\LogLevel;
+
+/**
+ * Functions used to create and wrap handlers with handler middleware.
+ */
+final class Middleware
+{
+    /**
+     * Middleware that adds cookies to requests.
+     *
+     * The options array must be set to a CookieJarInterface in order to use
+     * cookies. This is typically handled for you by a client.
+     *
+     * @return callable Returns a function that accepts the next handler.
+     */
+    public static function cookies()
+    {
+        return function (callable $handler) {
+            return function ($request, array $options) use ($handler) {
+                if (empty($options['cookies'])) {
+                    return $handler($request, $options);
+                } elseif (!($options['cookies'] instanceof CookieJarInterface)) {
+                    throw new \InvalidArgumentException('cookies must be an instance of GuzzleHttp\Cookie\CookieJarInterface');
+                }
+                $cookieJar = $options['cookies'];
+                $request = $cookieJar->withCookieHeader($request);
+                return $handler($request, $options)
+                    ->then(function ($response) use ($cookieJar, $request) {
+                        $cookieJar->extractCookies($request, $response);
+                        return $response;
+                    }
+                );
+            };
+        };
+    }
+
+    /**
+     * Middleware that throws exceptions for 4xx or 5xx responses when the
+     * "http_error" request option is set to true.
+     *
+     * @return callable Returns a function that accepts the next handler.
+     */
+    public static function httpErrors()
+    {
+        return function (callable $handler) {
+            return function ($request, array $options) use ($handler) {
+                if (empty($options['http_errors'])) {
+                    return $handler($request, $options);
+                }
+                return $handler($request, $options)->then(
+                    function (ResponseInterface $response) use ($request, $handler) {
+                        $code = $response->getStatusCode();
+                        if ($code < 400) {
+                            return $response;
+                        }
+                        throw $code > 499
+                            ? new ServerException("Server error: $code", $request, $response)
+                            : new ClientException("Client error: $code", $request, $response);
+                    }
+                );
+            };
+        };
+    }
+
+    /**
+     * Middleware that pushes history data to an ArrayAccess container.
+     *
+     * @param array $container Container to hold the history (by reference).
+     *
+     * @return callable Returns a function that accepts the next handler.
+     */
+    public static function history(array &$container)
+    {
+        return function (callable $handler) use (&$container) {
+            return function ($request, array $options) use ($handler, &$container) {
+                return $handler($request, $options)->then(
+                    function ($value) use ($request, &$container, $options) {
+                        $container[] = [
+                            'request'  => $request,
+                            'response' => $value,
+                            'error'    => null,
+                            'options'  => $options
+                        ];
+                        return $value;
+                    },
+                    function ($reason) use ($request, &$container, $options) {
+                        $container[] = [
+                            'request'  => $request,
+                            'response' => null,
+                            'error'    => $reason,
+                            'options'  => $options
+                        ];
+                        return new RejectedPromise($reason);
+                    }
+                );
+            };
+        };
+    }
+
+    /**
+     * Middleware that invokes a callback before and after sending a request.
+     *
+     * The provided listener cannot modify or alter the response. It simply
+     * "taps" into the chain to be notified before returning the promise. The
+     * before listener accepts a request and options array, and the after
+     * listener accepts a request, options array, and response promise.
+     *
+     * @param callable $before Function to invoke before forwarding the request.
+     * @param callable $after  Function invoked after forwarding.
+     *
+     * @return callable Returns a function that accepts the next handler.
+     */
+    public static function tap(callable $before = null, callable $after = null)
+    {
+        return function (callable $handler) use ($before, $after) {
+            return function ($request, array $options) use ($handler, $before, $after) {
+                if ($before) {
+                    $before($request, $options);
+                }
+                $response = $handler($request, $options);
+                if ($after) {
+                    $after($request, $options, $response);
+                }
+                return $response;
+            };
+        };
+    }
+
+    /**
+     * Middleware that handles request redirects.
+     *
+     * @return callable Returns a function that accepts the next handler.
+     */
+    public static function redirect()
+    {
+        return function (callable $handler) {
+            return new RedirectMiddleware($handler);
+        };
+    }
+
+    /**
+     * Middleware that retries requests based on the boolean result of
+     * invoking the provided "decider" function.
+     *
+     * If no delay function is provided, a simple implementation of exponential
+     * backoff will be utilized.
+     *
+     * @param callable $decider Function that accepts the number of retries,
+     *                          a request, [response], and [exception] and
+     *                          returns true if the request is to be retried.
+     * @param callable $delay   Function that accepts the number of retries and
+     *                          returns the number of milliseconds to delay.
+     *
+     * @return callable Returns a function that accepts the next handler.
+     */
+    public static function retry(callable $decider, callable $delay = null)
+    {
+        return function (callable $handler) use ($decider, $delay) {
+            return new RetryMiddleware($decider, $handler, $delay);
+        };
+    }
+
+    /**
+     * Middleware that logs requests, responses, and errors using a message
+     * formatter.
+     *
+     * @param LoggerInterface  $logger Logs messages.
+     * @param MessageFormatter $formatter Formatter used to create message strings.
+     * @param string           $logLevel Level at which to log requests.
+     *
+     * @return callable Returns a function that accepts the next handler.
+     */
+    public static function log(LoggerInterface $logger, MessageFormatter $formatter, $logLevel = LogLevel::INFO)
+    {
+        return function (callable $handler) use ($logger, $formatter, $logLevel) {
+            return function ($request, array $options) use ($handler, $logger, $formatter, $logLevel) {
+                return $handler($request, $options)->then(
+                    function ($response) use ($logger, $request, $formatter, $logLevel) {
+                        $message = $formatter->format($request, $response);
+                        $logger->log($logLevel, $message);
+                        return $response;
+                    },
+                    function ($reason) use ($logger, $request, $formatter) {
+                        $response = $reason instanceof RequestException
+                            ? $reason->getResponse()
+                            : null;
+                        $message = $formatter->format($request, $response, $reason);
+                        $logger->notice($message);
+                        return \GuzzleHttp\Promise\rejection_for($reason);
+                    }
+                );
+            };
+        };
+    }
+
+    /**
+     * This middleware adds a default content-type if possible, a default
+     * content-length or transfer-encoding header, and the expect header.
+     *
+     * @return callable
+     */
+    public static function prepareBody()
+    {
+        return function (callable $handler) {
+            return new PrepareBodyMiddleware($handler);
+        };
+    }
+
+    /**
+     * Middleware that applies a map function to the request before passing to
+     * the next handler.
+     *
+     * @param callable $fn Function that accepts a RequestInterface and returns
+     *                     a RequestInterface.
+     * @return callable
+     */
+    public static function mapRequest(callable $fn)
+    {
+        return function (callable $handler) use ($fn) {
+            return function ($request, array $options) use ($handler, $fn) {
+                return $handler($fn($request), $options);
+            };
+        };
+    }
+
+    /**
+     * Middleware that applies a map function to the resolved promise's
+     * response.
+     *
+     * @param callable $fn Function that accepts a ResponseInterface and
+     *                     returns a ResponseInterface.
+     * @return callable
+     */
+    public static function mapResponse(callable $fn)
+    {
+        return function (callable $handler) use ($fn) {
+            return function ($request, array $options) use ($handler, $fn) {
+                return $handler($request, $options)->then($fn);
+            };
+        };
+    }
+}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Mimetypes.php b/core/vendor/guzzlehttp/guzzle/src/Mimetypes.php
deleted file mode 100644
index 66ac63cfa..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Mimetypes.php
+++ /dev/null
@@ -1,963 +0,0 @@
-<?php
-namespace GuzzleHttp;
-
-/**
- * Provides mappings of file extensions to mimetypes
- * @link http://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x/conf/mime.types
- */
-class Mimetypes
-{
-    /** @var self */
-    protected static $instance;
-
-    /** @var array Mapping of extension to mimetype */
-    protected $mimetypes = array(
-        '3dml' => 'text/vnd.in3d.3dml',
-        '3g2' => 'video/3gpp2',
-        '3gp' => 'video/3gpp',
-        '7z' => 'application/x-7z-compressed',
-        'aab' => 'application/x-authorware-bin',
-        'aac' => 'audio/x-aac',
-        'aam' => 'application/x-authorware-map',
-        'aas' => 'application/x-authorware-seg',
-        'abw' => 'application/x-abiword',
-        'ac' => 'application/pkix-attr-cert',
-        'acc' => 'application/vnd.americandynamics.acc',
-        'ace' => 'application/x-ace-compressed',
-        'acu' => 'application/vnd.acucobol',
-        'acutc' => 'application/vnd.acucorp',
-        'adp' => 'audio/adpcm',
-        'aep' => 'application/vnd.audiograph',
-        'afm' => 'application/x-font-type1',
-        'afp' => 'application/vnd.ibm.modcap',
-        'ahead' => 'application/vnd.ahead.space',
-        'ai' => 'application/postscript',
-        'aif' => 'audio/x-aiff',
-        'aifc' => 'audio/x-aiff',
-        'aiff' => 'audio/x-aiff',
-        'air' => 'application/vnd.adobe.air-application-installer-package+zip',
-        'ait' => 'application/vnd.dvb.ait',
-        'ami' => 'application/vnd.amiga.ami',
-        'apk' => 'application/vnd.android.package-archive',
-        'application' => 'application/x-ms-application',
-        'apr' => 'application/vnd.lotus-approach',
-        'asa' => 'text/plain',
-        'asax' => 'application/octet-stream',
-        'asc' => 'application/pgp-signature',
-        'ascx' => 'text/plain',
-        'asf' => 'video/x-ms-asf',
-        'ashx' => 'text/plain',
-        'asm' => 'text/x-asm',
-        'asmx' => 'text/plain',
-        'aso' => 'application/vnd.accpac.simply.aso',
-        'asp' => 'text/plain',
-        'aspx' => 'text/plain',
-        'asx' => 'video/x-ms-asf',
-        'atc' => 'application/vnd.acucorp',
-        'atom' => 'application/atom+xml',
-        'atomcat' => 'application/atomcat+xml',
-        'atomsvc' => 'application/atomsvc+xml',
-        'atx' => 'application/vnd.antix.game-component',
-        'au' => 'audio/basic',
-        'avi' => 'video/x-msvideo',
-        'aw' => 'application/applixware',
-        'axd' => 'text/plain',
-        'azf' => 'application/vnd.airzip.filesecure.azf',
-        'azs' => 'application/vnd.airzip.filesecure.azs',
-        'azw' => 'application/vnd.amazon.ebook',
-        'bat' => 'application/x-msdownload',
-        'bcpio' => 'application/x-bcpio',
-        'bdf' => 'application/x-font-bdf',
-        'bdm' => 'application/vnd.syncml.dm+wbxml',
-        'bed' => 'application/vnd.realvnc.bed',
-        'bh2' => 'application/vnd.fujitsu.oasysprs',
-        'bin' => 'application/octet-stream',
-        'bmi' => 'application/vnd.bmi',
-        'bmp' => 'image/bmp',
-        'book' => 'application/vnd.framemaker',
-        'box' => 'application/vnd.previewsystems.box',
-        'boz' => 'application/x-bzip2',
-        'bpk' => 'application/octet-stream',
-        'btif' => 'image/prs.btif',
-        'bz' => 'application/x-bzip',
-        'bz2' => 'application/x-bzip2',
-        'c' => 'text/x-c',
-        'c11amc' => 'application/vnd.cluetrust.cartomobile-config',
-        'c11amz' => 'application/vnd.cluetrust.cartomobile-config-pkg',
-        'c4d' => 'application/vnd.clonk.c4group',
-        'c4f' => 'application/vnd.clonk.c4group',
-        'c4g' => 'application/vnd.clonk.c4group',
-        'c4p' => 'application/vnd.clonk.c4group',
-        'c4u' => 'application/vnd.clonk.c4group',
-        'cab' => 'application/vnd.ms-cab-compressed',
-        'car' => 'application/vnd.curl.car',
-        'cat' => 'application/vnd.ms-pki.seccat',
-        'cc' => 'text/x-c',
-        'cct' => 'application/x-director',
-        'ccxml' => 'application/ccxml+xml',
-        'cdbcmsg' => 'application/vnd.contact.cmsg',
-        'cdf' => 'application/x-netcdf',
-        'cdkey' => 'application/vnd.mediastation.cdkey',
-        'cdmia' => 'application/cdmi-capability',
-        'cdmic' => 'application/cdmi-container',
-        'cdmid' => 'application/cdmi-domain',
-        'cdmio' => 'application/cdmi-object',
-        'cdmiq' => 'application/cdmi-queue',
-        'cdx' => 'chemical/x-cdx',
-        'cdxml' => 'application/vnd.chemdraw+xml',
-        'cdy' => 'application/vnd.cinderella',
-        'cer' => 'application/pkix-cert',
-        'cfc' => 'application/x-coldfusion',
-        'cfm' => 'application/x-coldfusion',
-        'cgm' => 'image/cgm',
-        'chat' => 'application/x-chat',
-        'chm' => 'application/vnd.ms-htmlhelp',
-        'chrt' => 'application/vnd.kde.kchart',
-        'cif' => 'chemical/x-cif',
-        'cii' => 'application/vnd.anser-web-certificate-issue-initiation',
-        'cil' => 'application/vnd.ms-artgalry',
-        'cla' => 'application/vnd.claymore',
-        'class' => 'application/java-vm',
-        'clkk' => 'application/vnd.crick.clicker.keyboard',
-        'clkp' => 'application/vnd.crick.clicker.palette',
-        'clkt' => 'application/vnd.crick.clicker.template',
-        'clkw' => 'application/vnd.crick.clicker.wordbank',
-        'clkx' => 'application/vnd.crick.clicker',
-        'clp' => 'application/x-msclip',
-        'cmc' => 'application/vnd.cosmocaller',
-        'cmdf' => 'chemical/x-cmdf',
-        'cml' => 'chemical/x-cml',
-        'cmp' => 'application/vnd.yellowriver-custom-menu',
-        'cmx' => 'image/x-cmx',
-        'cod' => 'application/vnd.rim.cod',
-        'com' => 'application/x-msdownload',
-        'conf' => 'text/plain',
-        'cpio' => 'application/x-cpio',
-        'cpp' => 'text/x-c',
-        'cpt' => 'application/mac-compactpro',
-        'crd' => 'application/x-mscardfile',
-        'crl' => 'application/pkix-crl',
-        'crt' => 'application/x-x509-ca-cert',
-        'cryptonote' => 'application/vnd.rig.cryptonote',
-        'cs' => 'text/plain',
-        'csh' => 'application/x-csh',
-        'csml' => 'chemical/x-csml',
-        'csp' => 'application/vnd.commonspace',
-        'css' => 'text/css',
-        'cst' => 'application/x-director',
-        'csv' => 'text/csv',
-        'cu' => 'application/cu-seeme',
-        'curl' => 'text/vnd.curl',
-        'cww' => 'application/prs.cww',
-        'cxt' => 'application/x-director',
-        'cxx' => 'text/x-c',
-        'dae' => 'model/vnd.collada+xml',
-        'daf' => 'application/vnd.mobius.daf',
-        'dataless' => 'application/vnd.fdsn.seed',
-        'davmount' => 'application/davmount+xml',
-        'dcr' => 'application/x-director',
-        'dcurl' => 'text/vnd.curl.dcurl',
-        'dd2' => 'application/vnd.oma.dd2+xml',
-        'ddd' => 'application/vnd.fujixerox.ddd',
-        'deb' => 'application/x-debian-package',
-        'def' => 'text/plain',
-        'deploy' => 'application/octet-stream',
-        'der' => 'application/x-x509-ca-cert',
-        'dfac' => 'application/vnd.dreamfactory',
-        'dic' => 'text/x-c',
-        'dir' => 'application/x-director',
-        'dis' => 'application/vnd.mobius.dis',
-        'dist' => 'application/octet-stream',
-        'distz' => 'application/octet-stream',
-        'djv' => 'image/vnd.djvu',
-        'djvu' => 'image/vnd.djvu',
-        'dll' => 'application/x-msdownload',
-        'dmg' => 'application/octet-stream',
-        'dms' => 'application/octet-stream',
-        'dna' => 'application/vnd.dna',
-        'doc' => 'application/msword',
-        'docm' => 'application/vnd.ms-word.document.macroenabled.12',
-        'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-        'dot' => 'application/msword',
-        'dotm' => 'application/vnd.ms-word.template.macroenabled.12',
-        'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
-        'dp' => 'application/vnd.osgi.dp',
-        'dpg' => 'application/vnd.dpgraph',
-        'dra' => 'audio/vnd.dra',
-        'dsc' => 'text/prs.lines.tag',
-        'dssc' => 'application/dssc+der',
-        'dtb' => 'application/x-dtbook+xml',
-        'dtd' => 'application/xml-dtd',
-        'dts' => 'audio/vnd.dts',
-        'dtshd' => 'audio/vnd.dts.hd',
-        'dump' => 'application/octet-stream',
-        'dvi' => 'application/x-dvi',
-        'dwf' => 'model/vnd.dwf',
-        'dwg' => 'image/vnd.dwg',
-        'dxf' => 'image/vnd.dxf',
-        'dxp' => 'application/vnd.spotfire.dxp',
-        'dxr' => 'application/x-director',
-        'ecelp4800' => 'audio/vnd.nuera.ecelp4800',
-        'ecelp7470' => 'audio/vnd.nuera.ecelp7470',
-        'ecelp9600' => 'audio/vnd.nuera.ecelp9600',
-        'ecma' => 'application/ecmascript',
-        'edm' => 'application/vnd.novadigm.edm',
-        'edx' => 'application/vnd.novadigm.edx',
-        'efif' => 'application/vnd.picsel',
-        'ei6' => 'application/vnd.pg.osasli',
-        'elc' => 'application/octet-stream',
-        'eml' => 'message/rfc822',
-        'emma' => 'application/emma+xml',
-        'eol' => 'audio/vnd.digital-winds',
-        'eot' => 'application/vnd.ms-fontobject',
-        'eps' => 'application/postscript',
-        'epub' => 'application/epub+zip',
-        'es3' => 'application/vnd.eszigno3+xml',
-        'esf' => 'application/vnd.epson.esf',
-        'et3' => 'application/vnd.eszigno3+xml',
-        'etx' => 'text/x-setext',
-        'exe' => 'application/x-msdownload',
-        'exi' => 'application/exi',
-        'ext' => 'application/vnd.novadigm.ext',
-        'ez' => 'application/andrew-inset',
-        'ez2' => 'application/vnd.ezpix-album',
-        'ez3' => 'application/vnd.ezpix-package',
-        'f' => 'text/x-fortran',
-        'f4v' => 'video/x-f4v',
-        'f77' => 'text/x-fortran',
-        'f90' => 'text/x-fortran',
-        'fbs' => 'image/vnd.fastbidsheet',
-        'fcs' => 'application/vnd.isac.fcs',
-        'fdf' => 'application/vnd.fdf',
-        'fe_launch' => 'application/vnd.denovo.fcselayout-link',
-        'fg5' => 'application/vnd.fujitsu.oasysgp',
-        'fgd' => 'application/x-director',
-        'fh' => 'image/x-freehand',
-        'fh4' => 'image/x-freehand',
-        'fh5' => 'image/x-freehand',
-        'fh7' => 'image/x-freehand',
-        'fhc' => 'image/x-freehand',
-        'fig' => 'application/x-xfig',
-        'fli' => 'video/x-fli',
-        'flo' => 'application/vnd.micrografx.flo',
-        'flv' => 'video/x-flv',
-        'flw' => 'application/vnd.kde.kivio',
-        'flx' => 'text/vnd.fmi.flexstor',
-        'fly' => 'text/vnd.fly',
-        'fm' => 'application/vnd.framemaker',
-        'fnc' => 'application/vnd.frogans.fnc',
-        'for' => 'text/x-fortran',
-        'fpx' => 'image/vnd.fpx',
-        'frame' => 'application/vnd.framemaker',
-        'fsc' => 'application/vnd.fsc.weblaunch',
-        'fst' => 'image/vnd.fst',
-        'ftc' => 'application/vnd.fluxtime.clip',
-        'fti' => 'application/vnd.anser-web-funds-transfer-initiation',
-        'fvt' => 'video/vnd.fvt',
-        'fxp' => 'application/vnd.adobe.fxp',
-        'fxpl' => 'application/vnd.adobe.fxp',
-        'fzs' => 'application/vnd.fuzzysheet',
-        'g2w' => 'application/vnd.geoplan',
-        'g3' => 'image/g3fax',
-        'g3w' => 'application/vnd.geospace',
-        'gac' => 'application/vnd.groove-account',
-        'gdl' => 'model/vnd.gdl',
-        'geo' => 'application/vnd.dynageo',
-        'gex' => 'application/vnd.geometry-explorer',
-        'ggb' => 'application/vnd.geogebra.file',
-        'ggt' => 'application/vnd.geogebra.tool',
-        'ghf' => 'application/vnd.groove-help',
-        'gif' => 'image/gif',
-        'gim' => 'application/vnd.groove-identity-message',
-        'gmx' => 'application/vnd.gmx',
-        'gnumeric' => 'application/x-gnumeric',
-        'gph' => 'application/vnd.flographit',
-        'gqf' => 'application/vnd.grafeq',
-        'gqs' => 'application/vnd.grafeq',
-        'gram' => 'application/srgs',
-        'gre' => 'application/vnd.geometry-explorer',
-        'grv' => 'application/vnd.groove-injector',
-        'grxml' => 'application/srgs+xml',
-        'gsf' => 'application/x-font-ghostscript',
-        'gtar' => 'application/x-gtar',
-        'gtm' => 'application/vnd.groove-tool-message',
-        'gtw' => 'model/vnd.gtw',
-        'gv' => 'text/vnd.graphviz',
-        'gxt' => 'application/vnd.geonext',
-        'h' => 'text/x-c',
-        'h261' => 'video/h261',
-        'h263' => 'video/h263',
-        'h264' => 'video/h264',
-        'hal' => 'application/vnd.hal+xml',
-        'hbci' => 'application/vnd.hbci',
-        'hdf' => 'application/x-hdf',
-        'hh' => 'text/x-c',
-        'hlp' => 'application/winhlp',
-        'hpgl' => 'application/vnd.hp-hpgl',
-        'hpid' => 'application/vnd.hp-hpid',
-        'hps' => 'application/vnd.hp-hps',
-        'hqx' => 'application/mac-binhex40',
-        'hta' => 'application/octet-stream',
-        'htc' => 'text/html',
-        'htke' => 'application/vnd.kenameaapp',
-        'htm' => 'text/html',
-        'html' => 'text/html',
-        'hvd' => 'application/vnd.yamaha.hv-dic',
-        'hvp' => 'application/vnd.yamaha.hv-voice',
-        'hvs' => 'application/vnd.yamaha.hv-script',
-        'i2g' => 'application/vnd.intergeo',
-        'icc' => 'application/vnd.iccprofile',
-        'ice' => 'x-conference/x-cooltalk',
-        'icm' => 'application/vnd.iccprofile',
-        'ico' => 'image/x-icon',
-        'ics' => 'text/calendar',
-        'ief' => 'image/ief',
-        'ifb' => 'text/calendar',
-        'ifm' => 'application/vnd.shana.informed.formdata',
-        'iges' => 'model/iges',
-        'igl' => 'application/vnd.igloader',
-        'igm' => 'application/vnd.insors.igm',
-        'igs' => 'model/iges',
-        'igx' => 'application/vnd.micrografx.igx',
-        'iif' => 'application/vnd.shana.informed.interchange',
-        'imp' => 'application/vnd.accpac.simply.imp',
-        'ims' => 'application/vnd.ms-ims',
-        'in' => 'text/plain',
-        'ini' => 'text/plain',
-        'ipfix' => 'application/ipfix',
-        'ipk' => 'application/vnd.shana.informed.package',
-        'irm' => 'application/vnd.ibm.rights-management',
-        'irp' => 'application/vnd.irepository.package+xml',
-        'iso' => 'application/octet-stream',
-        'itp' => 'application/vnd.shana.informed.formtemplate',
-        'ivp' => 'application/vnd.immervision-ivp',
-        'ivu' => 'application/vnd.immervision-ivu',
-        'jad' => 'text/vnd.sun.j2me.app-descriptor',
-        'jam' => 'application/vnd.jam',
-        'jar' => 'application/java-archive',
-        'java' => 'text/x-java-source',
-        'jisp' => 'application/vnd.jisp',
-        'jlt' => 'application/vnd.hp-jlyt',
-        'jnlp' => 'application/x-java-jnlp-file',
-        'joda' => 'application/vnd.joost.joda-archive',
-        'jpe' => 'image/jpeg',
-        'jpeg' => 'image/jpeg',
-        'jpg' => 'image/jpeg',
-        'jpgm' => 'video/jpm',
-        'jpgv' => 'video/jpeg',
-        'jpm' => 'video/jpm',
-        'js' => 'text/javascript',
-        'json' => 'application/json',
-        'kar' => 'audio/midi',
-        'karbon' => 'application/vnd.kde.karbon',
-        'kfo' => 'application/vnd.kde.kformula',
-        'kia' => 'application/vnd.kidspiration',
-        'kml' => 'application/vnd.google-earth.kml+xml',
-        'kmz' => 'application/vnd.google-earth.kmz',
-        'kne' => 'application/vnd.kinar',
-        'knp' => 'application/vnd.kinar',
-        'kon' => 'application/vnd.kde.kontour',
-        'kpr' => 'application/vnd.kde.kpresenter',
-        'kpt' => 'application/vnd.kde.kpresenter',
-        'ksp' => 'application/vnd.kde.kspread',
-        'ktr' => 'application/vnd.kahootz',
-        'ktx' => 'image/ktx',
-        'ktz' => 'application/vnd.kahootz',
-        'kwd' => 'application/vnd.kde.kword',
-        'kwt' => 'application/vnd.kde.kword',
-        'lasxml' => 'application/vnd.las.las+xml',
-        'latex' => 'application/x-latex',
-        'lbd' => 'application/vnd.llamagraphics.life-balance.desktop',
-        'lbe' => 'application/vnd.llamagraphics.life-balance.exchange+xml',
-        'les' => 'application/vnd.hhe.lesson-player',
-        'lha' => 'application/octet-stream',
-        'link66' => 'application/vnd.route66.link66+xml',
-        'list' => 'text/plain',
-        'list3820' => 'application/vnd.ibm.modcap',
-        'listafp' => 'application/vnd.ibm.modcap',
-        'log' => 'text/plain',
-        'lostxml' => 'application/lost+xml',
-        'lrf' => 'application/octet-stream',
-        'lrm' => 'application/vnd.ms-lrm',
-        'ltf' => 'application/vnd.frogans.ltf',
-        'lvp' => 'audio/vnd.lucent.voice',
-        'lwp' => 'application/vnd.lotus-wordpro',
-        'lzh' => 'application/octet-stream',
-        'm13' => 'application/x-msmediaview',
-        'm14' => 'application/x-msmediaview',
-        'm1v' => 'video/mpeg',
-        'm21' => 'application/mp21',
-        'm2a' => 'audio/mpeg',
-        'm2v' => 'video/mpeg',
-        'm3a' => 'audio/mpeg',
-        'm3u' => 'audio/x-mpegurl',
-        'm3u8' => 'application/vnd.apple.mpegurl',
-        'm4a' => 'audio/mp4',
-        'm4u' => 'video/vnd.mpegurl',
-        'm4v' => 'video/mp4',
-        'ma' => 'application/mathematica',
-        'mads' => 'application/mads+xml',
-        'mag' => 'application/vnd.ecowin.chart',
-        'maker' => 'application/vnd.framemaker',
-        'man' => 'text/troff',
-        'mathml' => 'application/mathml+xml',
-        'mb' => 'application/mathematica',
-        'mbk' => 'application/vnd.mobius.mbk',
-        'mbox' => 'application/mbox',
-        'mc1' => 'application/vnd.medcalcdata',
-        'mcd' => 'application/vnd.mcd',
-        'mcurl' => 'text/vnd.curl.mcurl',
-        'mdb' => 'application/x-msaccess',
-        'mdi' => 'image/vnd.ms-modi',
-        'me' => 'text/troff',
-        'mesh' => 'model/mesh',
-        'meta4' => 'application/metalink4+xml',
-        'mets' => 'application/mets+xml',
-        'mfm' => 'application/vnd.mfmp',
-        'mgp' => 'application/vnd.osgeo.mapguide.package',
-        'mgz' => 'application/vnd.proteus.magazine',
-        'mid' => 'audio/midi',
-        'midi' => 'audio/midi',
-        'mif' => 'application/vnd.mif',
-        'mime' => 'message/rfc822',
-        'mj2' => 'video/mj2',
-        'mjp2' => 'video/mj2',
-        'mlp' => 'application/vnd.dolby.mlp',
-        'mmd' => 'application/vnd.chipnuts.karaoke-mmd',
-        'mmf' => 'application/vnd.smaf',
-        'mmr' => 'image/vnd.fujixerox.edmics-mmr',
-        'mny' => 'application/x-msmoney',
-        'mobi' => 'application/x-mobipocket-ebook',
-        'mods' => 'application/mods+xml',
-        'mov' => 'video/quicktime',
-        'movie' => 'video/x-sgi-movie',
-        'mp2' => 'audio/mpeg',
-        'mp21' => 'application/mp21',
-        'mp2a' => 'audio/mpeg',
-        'mp3' => 'audio/mpeg',
-        'mp4' => 'video/mp4',
-        'mp4a' => 'audio/mp4',
-        'mp4s' => 'application/mp4',
-        'mp4v' => 'video/mp4',
-        'mpc' => 'application/vnd.mophun.certificate',
-        'mpe' => 'video/mpeg',
-        'mpeg' => 'video/mpeg',
-        'mpg' => 'video/mpeg',
-        'mpg4' => 'video/mp4',
-        'mpga' => 'audio/mpeg',
-        'mpkg' => 'application/vnd.apple.installer+xml',
-        'mpm' => 'application/vnd.blueice.multipass',
-        'mpn' => 'application/vnd.mophun.application',
-        'mpp' => 'application/vnd.ms-project',
-        'mpt' => 'application/vnd.ms-project',
-        'mpy' => 'application/vnd.ibm.minipay',
-        'mqy' => 'application/vnd.mobius.mqy',
-        'mrc' => 'application/marc',
-        'mrcx' => 'application/marcxml+xml',
-        'ms' => 'text/troff',
-        'mscml' => 'application/mediaservercontrol+xml',
-        'mseed' => 'application/vnd.fdsn.mseed',
-        'mseq' => 'application/vnd.mseq',
-        'msf' => 'application/vnd.epson.msf',
-        'msh' => 'model/mesh',
-        'msi' => 'application/x-msdownload',
-        'msl' => 'application/vnd.mobius.msl',
-        'msty' => 'application/vnd.muvee.style',
-        'mts' => 'model/vnd.mts',
-        'mus' => 'application/vnd.musician',
-        'musicxml' => 'application/vnd.recordare.musicxml+xml',
-        'mvb' => 'application/x-msmediaview',
-        'mwf' => 'application/vnd.mfer',
-        'mxf' => 'application/mxf',
-        'mxl' => 'application/vnd.recordare.musicxml',
-        'mxml' => 'application/xv+xml',
-        'mxs' => 'application/vnd.triscape.mxs',
-        'mxu' => 'video/vnd.mpegurl',
-        'n-gage' => 'application/vnd.nokia.n-gage.symbian.install',
-        'n3' => 'text/n3',
-        'nb' => 'application/mathematica',
-        'nbp' => 'application/vnd.wolfram.player',
-        'nc' => 'application/x-netcdf',
-        'ncx' => 'application/x-dtbncx+xml',
-        'ngdat' => 'application/vnd.nokia.n-gage.data',
-        'nlu' => 'application/vnd.neurolanguage.nlu',
-        'nml' => 'application/vnd.enliven',
-        'nnd' => 'application/vnd.noblenet-directory',
-        'nns' => 'application/vnd.noblenet-sealer',
-        'nnw' => 'application/vnd.noblenet-web',
-        'npx' => 'image/vnd.net-fpx',
-        'nsf' => 'application/vnd.lotus-notes',
-        'oa2' => 'application/vnd.fujitsu.oasys2',
-        'oa3' => 'application/vnd.fujitsu.oasys3',
-        'oas' => 'application/vnd.fujitsu.oasys',
-        'obd' => 'application/x-msbinder',
-        'oda' => 'application/oda',
-        'odb' => 'application/vnd.oasis.opendocument.database',
-        'odc' => 'application/vnd.oasis.opendocument.chart',
-        'odf' => 'application/vnd.oasis.opendocument.formula',
-        'odft' => 'application/vnd.oasis.opendocument.formula-template',
-        'odg' => 'application/vnd.oasis.opendocument.graphics',
-        'odi' => 'application/vnd.oasis.opendocument.image',
-        'odm' => 'application/vnd.oasis.opendocument.text-master',
-        'odp' => 'application/vnd.oasis.opendocument.presentation',
-        'ods' => 'application/vnd.oasis.opendocument.spreadsheet',
-        'odt' => 'application/vnd.oasis.opendocument.text',
-        'oga' => 'audio/ogg',
-        'ogg' => 'audio/ogg',
-        'ogv' => 'video/ogg',
-        'ogx' => 'application/ogg',
-        'onepkg' => 'application/onenote',
-        'onetmp' => 'application/onenote',
-        'onetoc' => 'application/onenote',
-        'onetoc2' => 'application/onenote',
-        'opf' => 'application/oebps-package+xml',
-        'oprc' => 'application/vnd.palm',
-        'org' => 'application/vnd.lotus-organizer',
-        'osf' => 'application/vnd.yamaha.openscoreformat',
-        'osfpvg' => 'application/vnd.yamaha.openscoreformat.osfpvg+xml',
-        'otc' => 'application/vnd.oasis.opendocument.chart-template',
-        'otf' => 'application/x-font-otf',
-        'otg' => 'application/vnd.oasis.opendocument.graphics-template',
-        'oth' => 'application/vnd.oasis.opendocument.text-web',
-        'oti' => 'application/vnd.oasis.opendocument.image-template',
-        'otp' => 'application/vnd.oasis.opendocument.presentation-template',
-        'ots' => 'application/vnd.oasis.opendocument.spreadsheet-template',
-        'ott' => 'application/vnd.oasis.opendocument.text-template',
-        'oxt' => 'application/vnd.openofficeorg.extension',
-        'p' => 'text/x-pascal',
-        'p10' => 'application/pkcs10',
-        'p12' => 'application/x-pkcs12',
-        'p7b' => 'application/x-pkcs7-certificates',
-        'p7c' => 'application/pkcs7-mime',
-        'p7m' => 'application/pkcs7-mime',
-        'p7r' => 'application/x-pkcs7-certreqresp',
-        'p7s' => 'application/pkcs7-signature',
-        'p8' => 'application/pkcs8',
-        'pas' => 'text/x-pascal',
-        'paw' => 'application/vnd.pawaafile',
-        'pbd' => 'application/vnd.powerbuilder6',
-        'pbm' => 'image/x-portable-bitmap',
-        'pcf' => 'application/x-font-pcf',
-        'pcl' => 'application/vnd.hp-pcl',
-        'pclxl' => 'application/vnd.hp-pclxl',
-        'pct' => 'image/x-pict',
-        'pcurl' => 'application/vnd.curl.pcurl',
-        'pcx' => 'image/x-pcx',
-        'pdb' => 'application/vnd.palm',
-        'pdf' => 'application/pdf',
-        'pfa' => 'application/x-font-type1',
-        'pfb' => 'application/x-font-type1',
-        'pfm' => 'application/x-font-type1',
-        'pfr' => 'application/font-tdpfr',
-        'pfx' => 'application/x-pkcs12',
-        'pgm' => 'image/x-portable-graymap',
-        'pgn' => 'application/x-chess-pgn',
-        'pgp' => 'application/pgp-encrypted',
-        'php' => 'text/x-php',
-        'phps' => 'application/x-httpd-phps',
-        'pic' => 'image/x-pict',
-        'pkg' => 'application/octet-stream',
-        'pki' => 'application/pkixcmp',
-        'pkipath' => 'application/pkix-pkipath',
-        'plb' => 'application/vnd.3gpp.pic-bw-large',
-        'plc' => 'application/vnd.mobius.plc',
-        'plf' => 'application/vnd.pocketlearn',
-        'pls' => 'application/pls+xml',
-        'pml' => 'application/vnd.ctc-posml',
-        'png' => 'image/png',
-        'pnm' => 'image/x-portable-anymap',
-        'portpkg' => 'application/vnd.macports.portpkg',
-        'pot' => 'application/vnd.ms-powerpoint',
-        'potm' => 'application/vnd.ms-powerpoint.template.macroenabled.12',
-        'potx' => 'application/vnd.openxmlformats-officedocument.presentationml.template',
-        'ppam' => 'application/vnd.ms-powerpoint.addin.macroenabled.12',
-        'ppd' => 'application/vnd.cups-ppd',
-        'ppm' => 'image/x-portable-pixmap',
-        'pps' => 'application/vnd.ms-powerpoint',
-        'ppsm' => 'application/vnd.ms-powerpoint.slideshow.macroenabled.12',
-        'ppsx' => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
-        'ppt' => 'application/vnd.ms-powerpoint',
-        'pptm' => 'application/vnd.ms-powerpoint.presentation.macroenabled.12',
-        'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
-        'pqa' => 'application/vnd.palm',
-        'prc' => 'application/x-mobipocket-ebook',
-        'pre' => 'application/vnd.lotus-freelance',
-        'prf' => 'application/pics-rules',
-        'ps' => 'application/postscript',
-        'psb' => 'application/vnd.3gpp.pic-bw-small',
-        'psd' => 'image/vnd.adobe.photoshop',
-        'psf' => 'application/x-font-linux-psf',
-        'pskcxml' => 'application/pskc+xml',
-        'ptid' => 'application/vnd.pvi.ptid1',
-        'pub' => 'application/x-mspublisher',
-        'pvb' => 'application/vnd.3gpp.pic-bw-var',
-        'pwn' => 'application/vnd.3m.post-it-notes',
-        'pya' => 'audio/vnd.ms-playready.media.pya',
-        'pyv' => 'video/vnd.ms-playready.media.pyv',
-        'qam' => 'application/vnd.epson.quickanime',
-        'qbo' => 'application/vnd.intu.qbo',
-        'qfx' => 'application/vnd.intu.qfx',
-        'qps' => 'application/vnd.publishare-delta-tree',
-        'qt' => 'video/quicktime',
-        'qwd' => 'application/vnd.quark.quarkxpress',
-        'qwt' => 'application/vnd.quark.quarkxpress',
-        'qxb' => 'application/vnd.quark.quarkxpress',
-        'qxd' => 'application/vnd.quark.quarkxpress',
-        'qxl' => 'application/vnd.quark.quarkxpress',
-        'qxt' => 'application/vnd.quark.quarkxpress',
-        'ra' => 'audio/x-pn-realaudio',
-        'ram' => 'audio/x-pn-realaudio',
-        'rar' => 'application/x-rar-compressed',
-        'ras' => 'image/x-cmu-raster',
-        'rb' => 'text/plain',
-        'rcprofile' => 'application/vnd.ipunplugged.rcprofile',
-        'rdf' => 'application/rdf+xml',
-        'rdz' => 'application/vnd.data-vision.rdz',
-        'rep' => 'application/vnd.businessobjects',
-        'res' => 'application/x-dtbresource+xml',
-        'resx' => 'text/xml',
-        'rgb' => 'image/x-rgb',
-        'rif' => 'application/reginfo+xml',
-        'rip' => 'audio/vnd.rip',
-        'rl' => 'application/resource-lists+xml',
-        'rlc' => 'image/vnd.fujixerox.edmics-rlc',
-        'rld' => 'application/resource-lists-diff+xml',
-        'rm' => 'application/vnd.rn-realmedia',
-        'rmi' => 'audio/midi',
-        'rmp' => 'audio/x-pn-realaudio-plugin',
-        'rms' => 'application/vnd.jcp.javame.midlet-rms',
-        'rnc' => 'application/relax-ng-compact-syntax',
-        'roff' => 'text/troff',
-        'rp9' => 'application/vnd.cloanto.rp9',
-        'rpss' => 'application/vnd.nokia.radio-presets',
-        'rpst' => 'application/vnd.nokia.radio-preset',
-        'rq' => 'application/sparql-query',
-        'rs' => 'application/rls-services+xml',
-        'rsd' => 'application/rsd+xml',
-        'rss' => 'application/rss+xml',
-        'rtf' => 'application/rtf',
-        'rtx' => 'text/richtext',
-        's' => 'text/x-asm',
-        'saf' => 'application/vnd.yamaha.smaf-audio',
-        'sbml' => 'application/sbml+xml',
-        'sc' => 'application/vnd.ibm.secure-container',
-        'scd' => 'application/x-msschedule',
-        'scm' => 'application/vnd.lotus-screencam',
-        'scq' => 'application/scvp-cv-request',
-        'scs' => 'application/scvp-cv-response',
-        'scurl' => 'text/vnd.curl.scurl',
-        'sda' => 'application/vnd.stardivision.draw',
-        'sdc' => 'application/vnd.stardivision.calc',
-        'sdd' => 'application/vnd.stardivision.impress',
-        'sdkd' => 'application/vnd.solent.sdkm+xml',
-        'sdkm' => 'application/vnd.solent.sdkm+xml',
-        'sdp' => 'application/sdp',
-        'sdw' => 'application/vnd.stardivision.writer',
-        'see' => 'application/vnd.seemail',
-        'seed' => 'application/vnd.fdsn.seed',
-        'sema' => 'application/vnd.sema',
-        'semd' => 'application/vnd.semd',
-        'semf' => 'application/vnd.semf',
-        'ser' => 'application/java-serialized-object',
-        'setpay' => 'application/set-payment-initiation',
-        'setreg' => 'application/set-registration-initiation',
-        'sfd-hdstx' => 'application/vnd.hydrostatix.sof-data',
-        'sfs' => 'application/vnd.spotfire.sfs',
-        'sgl' => 'application/vnd.stardivision.writer-global',
-        'sgm' => 'text/sgml',
-        'sgml' => 'text/sgml',
-        'sh' => 'application/x-sh',
-        'shar' => 'application/x-shar',
-        'shf' => 'application/shf+xml',
-        'sig' => 'application/pgp-signature',
-        'silo' => 'model/mesh',
-        'sis' => 'application/vnd.symbian.install',
-        'sisx' => 'application/vnd.symbian.install',
-        'sit' => 'application/x-stuffit',
-        'sitx' => 'application/x-stuffitx',
-        'skd' => 'application/vnd.koan',
-        'skm' => 'application/vnd.koan',
-        'skp' => 'application/vnd.koan',
-        'skt' => 'application/vnd.koan',
-        'sldm' => 'application/vnd.ms-powerpoint.slide.macroenabled.12',
-        'sldx' => 'application/vnd.openxmlformats-officedocument.presentationml.slide',
-        'slt' => 'application/vnd.epson.salt',
-        'sm' => 'application/vnd.stepmania.stepchart',
-        'smf' => 'application/vnd.stardivision.math',
-        'smi' => 'application/smil+xml',
-        'smil' => 'application/smil+xml',
-        'snd' => 'audio/basic',
-        'snf' => 'application/x-font-snf',
-        'so' => 'application/octet-stream',
-        'spc' => 'application/x-pkcs7-certificates',
-        'spf' => 'application/vnd.yamaha.smaf-phrase',
-        'spl' => 'application/x-futuresplash',
-        'spot' => 'text/vnd.in3d.spot',
-        'spp' => 'application/scvp-vp-response',
-        'spq' => 'application/scvp-vp-request',
-        'spx' => 'audio/ogg',
-        'src' => 'application/x-wais-source',
-        'sru' => 'application/sru+xml',
-        'srx' => 'application/sparql-results+xml',
-        'sse' => 'application/vnd.kodak-descriptor',
-        'ssf' => 'application/vnd.epson.ssf',
-        'ssml' => 'application/ssml+xml',
-        'st' => 'application/vnd.sailingtracker.track',
-        'stc' => 'application/vnd.sun.xml.calc.template',
-        'std' => 'application/vnd.sun.xml.draw.template',
-        'stf' => 'application/vnd.wt.stf',
-        'sti' => 'application/vnd.sun.xml.impress.template',
-        'stk' => 'application/hyperstudio',
-        'stl' => 'application/vnd.ms-pki.stl',
-        'str' => 'application/vnd.pg.format',
-        'stw' => 'application/vnd.sun.xml.writer.template',
-        'sub' => 'image/vnd.dvb.subtitle',
-        'sus' => 'application/vnd.sus-calendar',
-        'susp' => 'application/vnd.sus-calendar',
-        'sv4cpio' => 'application/x-sv4cpio',
-        'sv4crc' => 'application/x-sv4crc',
-        'svc' => 'application/vnd.dvb.service',
-        'svd' => 'application/vnd.svd',
-        'svg' => 'image/svg+xml',
-        'svgz' => 'image/svg+xml',
-        'swa' => 'application/x-director',
-        'swf' => 'application/x-shockwave-flash',
-        'swi' => 'application/vnd.aristanetworks.swi',
-        'sxc' => 'application/vnd.sun.xml.calc',
-        'sxd' => 'application/vnd.sun.xml.draw',
-        'sxg' => 'application/vnd.sun.xml.writer.global',
-        'sxi' => 'application/vnd.sun.xml.impress',
-        'sxm' => 'application/vnd.sun.xml.math',
-        'sxw' => 'application/vnd.sun.xml.writer',
-        't' => 'text/troff',
-        'tao' => 'application/vnd.tao.intent-module-archive',
-        'tar' => 'application/x-tar',
-        'tcap' => 'application/vnd.3gpp2.tcap',
-        'tcl' => 'application/x-tcl',
-        'teacher' => 'application/vnd.smart.teacher',
-        'tei' => 'application/tei+xml',
-        'teicorpus' => 'application/tei+xml',
-        'tex' => 'application/x-tex',
-        'texi' => 'application/x-texinfo',
-        'texinfo' => 'application/x-texinfo',
-        'text' => 'text/plain',
-        'tfi' => 'application/thraud+xml',
-        'tfm' => 'application/x-tex-tfm',
-        'thmx' => 'application/vnd.ms-officetheme',
-        'tif' => 'image/tiff',
-        'tiff' => 'image/tiff',
-        'tmo' => 'application/vnd.tmobile-livetv',
-        'torrent' => 'application/x-bittorrent',
-        'tpl' => 'application/vnd.groove-tool-template',
-        'tpt' => 'application/vnd.trid.tpt',
-        'tr' => 'text/troff',
-        'tra' => 'application/vnd.trueapp',
-        'trm' => 'application/x-msterminal',
-        'tsd' => 'application/timestamped-data',
-        'tsv' => 'text/tab-separated-values',
-        'ttc' => 'application/x-font-ttf',
-        'ttf' => 'application/x-font-ttf',
-        'ttl' => 'text/turtle',
-        'twd' => 'application/vnd.simtech-mindmapper',
-        'twds' => 'application/vnd.simtech-mindmapper',
-        'txd' => 'application/vnd.genomatix.tuxedo',
-        'txf' => 'application/vnd.mobius.txf',
-        'txt' => 'text/plain',
-        'u32' => 'application/x-authorware-bin',
-        'udeb' => 'application/x-debian-package',
-        'ufd' => 'application/vnd.ufdl',
-        'ufdl' => 'application/vnd.ufdl',
-        'umj' => 'application/vnd.umajin',
-        'unityweb' => 'application/vnd.unity',
-        'uoml' => 'application/vnd.uoml+xml',
-        'uri' => 'text/uri-list',
-        'uris' => 'text/uri-list',
-        'urls' => 'text/uri-list',
-        'ustar' => 'application/x-ustar',
-        'utz' => 'application/vnd.uiq.theme',
-        'uu' => 'text/x-uuencode',
-        'uva' => 'audio/vnd.dece.audio',
-        'uvd' => 'application/vnd.dece.data',
-        'uvf' => 'application/vnd.dece.data',
-        'uvg' => 'image/vnd.dece.graphic',
-        'uvh' => 'video/vnd.dece.hd',
-        'uvi' => 'image/vnd.dece.graphic',
-        'uvm' => 'video/vnd.dece.mobile',
-        'uvp' => 'video/vnd.dece.pd',
-        'uvs' => 'video/vnd.dece.sd',
-        'uvt' => 'application/vnd.dece.ttml+xml',
-        'uvu' => 'video/vnd.uvvu.mp4',
-        'uvv' => 'video/vnd.dece.video',
-        'uvva' => 'audio/vnd.dece.audio',
-        'uvvd' => 'application/vnd.dece.data',
-        'uvvf' => 'application/vnd.dece.data',
-        'uvvg' => 'image/vnd.dece.graphic',
-        'uvvh' => 'video/vnd.dece.hd',
-        'uvvi' => 'image/vnd.dece.graphic',
-        'uvvm' => 'video/vnd.dece.mobile',
-        'uvvp' => 'video/vnd.dece.pd',
-        'uvvs' => 'video/vnd.dece.sd',
-        'uvvt' => 'application/vnd.dece.ttml+xml',
-        'uvvu' => 'video/vnd.uvvu.mp4',
-        'uvvv' => 'video/vnd.dece.video',
-        'uvvx' => 'application/vnd.dece.unspecified',
-        'uvx' => 'application/vnd.dece.unspecified',
-        'vcd' => 'application/x-cdlink',
-        'vcf' => 'text/x-vcard',
-        'vcg' => 'application/vnd.groove-vcard',
-        'vcs' => 'text/x-vcalendar',
-        'vcx' => 'application/vnd.vcx',
-        'vis' => 'application/vnd.visionary',
-        'viv' => 'video/vnd.vivo',
-        'vor' => 'application/vnd.stardivision.writer',
-        'vox' => 'application/x-authorware-bin',
-        'vrml' => 'model/vrml',
-        'vsd' => 'application/vnd.visio',
-        'vsf' => 'application/vnd.vsf',
-        'vss' => 'application/vnd.visio',
-        'vst' => 'application/vnd.visio',
-        'vsw' => 'application/vnd.visio',
-        'vtu' => 'model/vnd.vtu',
-        'vxml' => 'application/voicexml+xml',
-        'w3d' => 'application/x-director',
-        'wad' => 'application/x-doom',
-        'wav' => 'audio/x-wav',
-        'wax' => 'audio/x-ms-wax',
-        'wbmp' => 'image/vnd.wap.wbmp',
-        'wbs' => 'application/vnd.criticaltools.wbs+xml',
-        'wbxml' => 'application/vnd.wap.wbxml',
-        'wcm' => 'application/vnd.ms-works',
-        'wdb' => 'application/vnd.ms-works',
-        'weba' => 'audio/webm',
-        'webm' => 'video/webm',
-        'webp' => 'image/webp',
-        'wg' => 'application/vnd.pmi.widget',
-        'wgt' => 'application/widget',
-        'wks' => 'application/vnd.ms-works',
-        'wm' => 'video/x-ms-wm',
-        'wma' => 'audio/x-ms-wma',
-        'wmd' => 'application/x-ms-wmd',
-        'wmf' => 'application/x-msmetafile',
-        'wml' => 'text/vnd.wap.wml',
-        'wmlc' => 'application/vnd.wap.wmlc',
-        'wmls' => 'text/vnd.wap.wmlscript',
-        'wmlsc' => 'application/vnd.wap.wmlscriptc',
-        'wmv' => 'video/x-ms-wmv',
-        'wmx' => 'video/x-ms-wmx',
-        'wmz' => 'application/x-ms-wmz',
-        'woff' => 'application/x-font-woff',
-        'wpd' => 'application/vnd.wordperfect',
-        'wpl' => 'application/vnd.ms-wpl',
-        'wps' => 'application/vnd.ms-works',
-        'wqd' => 'application/vnd.wqd',
-        'wri' => 'application/x-mswrite',
-        'wrl' => 'model/vrml',
-        'wsdl' => 'application/wsdl+xml',
-        'wspolicy' => 'application/wspolicy+xml',
-        'wtb' => 'application/vnd.webturbo',
-        'wvx' => 'video/x-ms-wvx',
-        'x32' => 'application/x-authorware-bin',
-        'x3d' => 'application/vnd.hzn-3d-crossword',
-        'xap' => 'application/x-silverlight-app',
-        'xar' => 'application/vnd.xara',
-        'xbap' => 'application/x-ms-xbap',
-        'xbd' => 'application/vnd.fujixerox.docuworks.binder',
-        'xbm' => 'image/x-xbitmap',
-        'xdf' => 'application/xcap-diff+xml',
-        'xdm' => 'application/vnd.syncml.dm+xml',
-        'xdp' => 'application/vnd.adobe.xdp+xml',
-        'xdssc' => 'application/dssc+xml',
-        'xdw' => 'application/vnd.fujixerox.docuworks',
-        'xenc' => 'application/xenc+xml',
-        'xer' => 'application/patch-ops-error+xml',
-        'xfdf' => 'application/vnd.adobe.xfdf',
-        'xfdl' => 'application/vnd.xfdl',
-        'xht' => 'application/xhtml+xml',
-        'xhtml' => 'application/xhtml+xml',
-        'xhvml' => 'application/xv+xml',
-        'xif' => 'image/vnd.xiff',
-        'xla' => 'application/vnd.ms-excel',
-        'xlam' => 'application/vnd.ms-excel.addin.macroenabled.12',
-        'xlc' => 'application/vnd.ms-excel',
-        'xlm' => 'application/vnd.ms-excel',
-        'xls' => 'application/vnd.ms-excel',
-        'xlsb' => 'application/vnd.ms-excel.sheet.binary.macroenabled.12',
-        'xlsm' => 'application/vnd.ms-excel.sheet.macroenabled.12',
-        'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-        'xlt' => 'application/vnd.ms-excel',
-        'xltm' => 'application/vnd.ms-excel.template.macroenabled.12',
-        'xltx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
-        'xlw' => 'application/vnd.ms-excel',
-        'xml' => 'application/xml',
-        'xo' => 'application/vnd.olpc-sugar',
-        'xop' => 'application/xop+xml',
-        'xpi' => 'application/x-xpinstall',
-        'xpm' => 'image/x-xpixmap',
-        'xpr' => 'application/vnd.is-xpr',
-        'xps' => 'application/vnd.ms-xpsdocument',
-        'xpw' => 'application/vnd.intercon.formnet',
-        'xpx' => 'application/vnd.intercon.formnet',
-        'xsl' => 'application/xml',
-        'xslt' => 'application/xslt+xml',
-        'xsm' => 'application/vnd.syncml+xml',
-        'xspf' => 'application/xspf+xml',
-        'xul' => 'application/vnd.mozilla.xul+xml',
-        'xvm' => 'application/xv+xml',
-        'xvml' => 'application/xv+xml',
-        'xwd' => 'image/x-xwindowdump',
-        'xyz' => 'chemical/x-xyz',
-        'yaml' => 'text/yaml',
-        'yang' => 'application/yang',
-        'yin' => 'application/yin+xml',
-        'yml' => 'text/yaml',
-        'zaz' => 'application/vnd.zzazz.deck+xml',
-        'zip' => 'application/zip',
-        'zir' => 'application/vnd.zul',
-        'zirz' => 'application/vnd.zul',
-        'zmm' => 'application/vnd.handheld-entertainment+xml'
-    );
-
-    /**
-     * Get a singleton instance of the class
-     *
-     * @return self
-     * @codeCoverageIgnore
-     */
-    public static function getInstance()
-    {
-        if (!self::$instance) {
-            self::$instance = new self();
-        }
-
-        return self::$instance;
-    }
-
-    /**
-     * Get a mimetype value from a file extension
-     *
-     * @param string $extension File extension
-     *
-     * @return string|null
-     *
-     */
-    public function fromExtension($extension)
-    {
-        $extension = strtolower($extension);
-
-        return isset($this->mimetypes[$extension])
-            ? $this->mimetypes[$extension]
-            : null;
-    }
-
-    /**
-     * Get a mimetype from a filename
-     *
-     * @param string $filename Filename to generate a mimetype from
-     *
-     * @return string|null
-     */
-    public function fromFilename($filename)
-    {
-        return $this->fromExtension(pathinfo($filename, PATHINFO_EXTENSION));
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Pool.php b/core/vendor/guzzlehttp/guzzle/src/Pool.php
index 49d9940fe..bc41d6e6b 100644
--- a/core/vendor/guzzlehttp/guzzle/src/Pool.php
+++ b/core/vendor/guzzlehttp/guzzle/src/Pool.php
@@ -1,97 +1,81 @@
 <?php
 namespace GuzzleHttp;
 
-use GuzzleHttp\Event\BeforeEvent;
-use GuzzleHttp\Event\RequestEvents;
-use GuzzleHttp\Message\RequestInterface;
-use GuzzleHttp\Message\ResponseInterface;
-use GuzzleHttp\Ring\Core;
-use GuzzleHttp\Ring\Future\FutureInterface;
-use GuzzleHttp\Event\ListenerAttacherTrait;
-use GuzzleHttp\Event\EndEvent;
-use React\Promise\Deferred;
-use React\Promise\FulfilledPromise;
-use React\Promise\PromiseInterface;
-use React\Promise\RejectedPromise;
+use GuzzleHttp\Promise\PromisorInterface;
+use Psr\Http\Message\RequestInterface;
+use GuzzleHttp\Promise\EachPromise;
 
 /**
  * Sends and iterator of requests concurrently using a capped pool size.
  *
- * The Pool object implements FutureInterface, meaning it can be used later
- * when necessary, the requests provided to the pool can be cancelled, and
- * you can check the state of the pool to know if it has been dereferenced
- * (sent) or has been cancelled.
+ * The pool will read from an iterator until it is cancelled or until the
+ * iterator is consumed. When a request is yielded, the request is sent after
+ * applying the "request_options" request options (if provided in the ctor).
  *
- * When sending the pool, keep in mind that no results are returned: callers
- * are expected to handle results asynchronously using Guzzle's event system.
- * When requests complete, more are added to the pool to ensure that the
- * requested pool size is always filled as much as possible.
- *
- * IMPORTANT: Do not provide a pool size greater that what the utilized
- * underlying RingPHP handler can support. This will result is extremely poor
- * performance.
+ * When a function is yielded by the iterator, the function is provided the
+ * "request_options" array that should be merged on top of any existing
+ * options, and the function MUST then return a wait-able promise.
  */
-class Pool implements FutureInterface
+class Pool implements PromisorInterface
 {
-    use ListenerAttacherTrait;
-
-    /** @var \GuzzleHttp\ClientInterface */
-    private $client;
-
-    /** @var \Iterator Yields requests */
-    private $iter;
-
-    /** @var Deferred */
-    private $deferred;
-
-    /** @var PromiseInterface */
-    private $promise;
-
-    private $waitQueue = [];
-    private $eventListeners = [];
-    private $poolSize;
-    private $isRealized = false;
+    /** @var EachPromise */
+    private $each;
 
     /**
-     * The option values for 'before', 'complete', 'error' and 'end' can be a
-     * callable, an associative array containing event data, or an array of
-     * event data arrays. Event data arrays contain the following keys:
-     *
-     * - fn: callable to invoke that receives the event
-     * - priority: Optional event priority (defaults to 0)
-     * - once: Set to true so that the event is removed after it is triggered
-     *
      * @param ClientInterface $client   Client used to send the requests.
-     * @param array|\Iterator $requests Requests to send in parallel
-     * @param array           $options  Associative array of options
-     *     - pool_size: (callable|int)   Maximum number of requests to send
-     *                                   concurrently, or a callback that receives
-     *                                   the current queue size and returns the
-     *                                   number of new requests to send
-     *     - before:    (callable|array) Receives a BeforeEvent
-     *     - complete:  (callable|array) Receives a CompleteEvent
-     *     - error:     (callable|array) Receives a ErrorEvent
-     *     - end:       (callable|array) Receives an EndEvent
+     * @param array|\Iterator $requests Requests or functions that return
+     *                                  requests to send concurrently.
+     * @param array           $config   Associative array of options
+     *     - concurrency: (int) Maximum number of requests to send concurrently
+     *     - options: Array of request options to apply to each request.
+     *     - fulfilled: (callable) Function to invoke when a request completes.
+     *     - rejected: (callable) Function to invoke when a request is rejected.
      */
     public function __construct(
         ClientInterface $client,
         $requests,
-        array $options = []
+        array $config = []
     ) {
-        $this->client = $client;
-        $this->iter = $this->coerceIterable($requests);
-        $this->deferred = new Deferred();
-        $this->promise = $this->deferred->promise();
-        $this->poolSize = isset($options['pool_size'])
-            ? $options['pool_size'] : 25;
-        $this->eventListeners = $this->prepareListeners(
-            $options,
-            ['before', 'complete', 'error', 'end']
-        );
+        // Backwards compatibility.
+        if (isset($config['pool_size'])) {
+            $config['concurrency'] = $config['pool_size'];
+        } elseif (!isset($config['concurrency'])) {
+            $config['concurrency'] = 25;
+        }
+
+        if (isset($config['options'])) {
+            $opts = $config['options'];
+            unset($config['options']);
+        } else {
+            $opts = [];
+        }
+
+        $iterable = \GuzzleHttp\Promise\iter_for($requests);
+        $requests = function () use ($iterable, $client, $opts) {
+            foreach ($iterable as $rfn) {
+                if ($rfn instanceof RequestInterface) {
+                    yield $client->sendAsync($rfn, $opts);
+                } elseif (is_callable($rfn)) {
+                    yield $rfn($opts);
+                } else {
+                    throw new \InvalidArgumentException('Each value yielded by '
+                        . 'the iterator must be a Psr7\Http\Message\RequestInterface '
+                        . 'or a callable that returns a promise that fulfills '
+                        . 'with a Psr7\Message\Http\ResponseInterface object.');
+                }
+            }
+        };
+
+        $this->each = new EachPromise($requests(), $config);
+    }
+
+    public function promise()
+    {
+        return $this->each->promise();
     }
 
     /**
-     * Sends multiple requests in parallel and returns an array of responses
+     * Sends multiple requests concurrently and returns an array of responses
      * and exceptions that uses the same ordering as the provided requests.
      *
      * IMPORTANT: This method keeps every request and response in memory, and
@@ -99,11 +83,12 @@ class Pool implements FutureInterface
      * indeterminate number of requests concurrently.
      *
      * @param ClientInterface $client   Client used to send the requests
-     * @param array|\Iterator $requests Requests to send in parallel
+     * @param array|\Iterator $requests Requests to send concurrently.
      * @param array           $options  Passes through the options available in
      *                                  {@see GuzzleHttp\Pool::__construct}
      *
-     * @return BatchResults Returns a container for the results.
+     * @return array Returns an array containing the response or an exception
+     *               in the same order that the requests were sent.
      * @throws \InvalidArgumentException if the event format is incorrect.
      */
     public static function batch(
@@ -111,223 +96,28 @@ class Pool implements FutureInterface
         $requests,
         array $options = []
     ) {
-        $hash = new \SplObjectStorage();
-        foreach ($requests as $request) {
-            $hash->attach($request);
-        }
+        $res = [];
+        self::cmpCallback($options, 'fulfilled', $res);
+        self::cmpCallback($options, 'rejected', $res);
+        $pool = new static($client, $requests, $options);
+        $pool->promise()->wait();
+        ksort($res);
 
-        // In addition to the normally run events when requests complete, add
-        // and event to continuously track the results of transfers in the hash.
-        (new self($client, $requests, RequestEvents::convertEventArray(
-            $options,
-            ['end'],
-            [
-                'priority' => RequestEvents::LATE,
-                'fn'       => function (EndEvent $e) use ($hash) {
-                    $hash[$e->getRequest()] = $e->getException()
-                        ? $e->getException()
-                        : $e->getResponse();
-                }
-            ]
-        )))->wait();
-
-        return new BatchResults($hash);
+        return $res;
     }
 
-    /**
-     * Creates a Pool and immediately sends the requests.
-     *
-     * @param ClientInterface $client   Client used to send the requests
-     * @param array|\Iterator $requests Requests to send in parallel
-     * @param array           $options  Passes through the options available in
-     *                                  {@see GuzzleHttp\Pool::__construct}
-     */
-    public static function send(
-        ClientInterface $client,
-        $requests,
-        array $options = []
-    ) {
-        $pool = new self($client, $requests, $options);
-        $pool->wait();
-    }
-
-    private function getPoolSize()
+    private static function cmpCallback(array &$options, $name, array &$results)
     {
-        return is_callable($this->poolSize)
-            ? call_user_func($this->poolSize, count($this->waitQueue))
-            : $this->poolSize;
-    }
-
-    /**
-     * Add as many requests as possible up to the current pool limit.
-     */
-    private function addNextRequests()
-    {
-        $limit = max($this->getPoolSize() - count($this->waitQueue), 0);
-        while ($limit--) {
-            if (!$this->addNextRequest()) {
-                break;
-            }
+        if (!isset($options[$name])) {
+            $options[$name] = function ($v, $k) use (&$results) {
+                $results[$k] = $v;
+            };
+        } else {
+            $currentFn = $options[$name];
+            $options[$name] = function ($v, $k) use (&$results, $currentFn) {
+                $currentFn($v, $k);
+                $results[$k] = $v;
+            };
         }
     }
-
-    public function wait()
-    {
-        if ($this->isRealized) {
-            return false;
-        }
-
-        // Seed the pool with N number of requests.
-        $this->addNextRequests();
-
-        // Stop if the pool was cancelled while transferring requests.
-        if ($this->isRealized) {
-            return false;
-        }
-
-        // Wait on any outstanding FutureResponse objects.
-        while ($response = array_pop($this->waitQueue)) {
-            try {
-                $response->wait();
-            } catch (\Exception $e) {
-                // Eat exceptions because they should be handled asynchronously
-            }
-            $this->addNextRequests();
-        }
-
-        // Clean up no longer needed state.
-        $this->isRealized = true;
-        $this->waitQueue = $this->eventListeners = [];
-        $this->client = $this->iter = null;
-        $this->deferred->resolve(true);
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * Attempt to cancel all outstanding requests (requests that are queued for
-     * dereferencing). Returns true if all outstanding requests can be
-     * cancelled.
-     *
-     * @return bool
-     */
-    public function cancel()
-    {
-        if ($this->isRealized) {
-            return false;
-        }
-
-        $success = $this->isRealized = true;
-        foreach ($this->waitQueue as $response) {
-            if (!$response->cancel()) {
-                $success = false;
-            }
-        }
-
-        return $success;
-    }
-
-    /**
-     * Returns a promise that is invoked when the pool completed. There will be
-     * no passed value.
-     *
-     * {@inheritdoc}
-     */
-    public function then(
-        callable $onFulfilled = null,
-        callable $onRejected = null,
-        callable $onProgress = null
-    ) {
-        return $this->promise->then($onFulfilled, $onRejected, $onProgress);
-    }
-
-    public function promise()
-    {
-        return $this->promise;
-    }
-
-    private function coerceIterable($requests)
-    {
-        if ($requests instanceof \Iterator) {
-            return $requests;
-        } elseif (is_array($requests)) {
-            return new \ArrayIterator($requests);
-        }
-
-        throw new \InvalidArgumentException('Expected Iterator or array. '
-            . 'Found ' . Core::describeType($requests));
-    }
-
-    /**
-     * Adds the next request to pool and tracks what requests need to be
-     * dereferenced when completing the pool.
-     */
-    private function addNextRequest()
-    {
-        add_next:
-
-        if ($this->isRealized || !$this->iter || !$this->iter->valid()) {
-            return false;
-        }
-
-        $request = $this->iter->current();
-        $this->iter->next();
-
-        if (!($request instanceof RequestInterface)) {
-            throw new \InvalidArgumentException(sprintf(
-                'All requests in the provided iterator must implement '
-                . 'RequestInterface. Found %s',
-                Core::describeType($request)
-            ));
-        }
-
-        // Be sure to use "lazy" futures, meaning they do not send right away.
-        $request->getConfig()->set('future', 'lazy');
-        $hash = spl_object_hash($request);
-        $this->attachListeners($request, $this->eventListeners);
-        $request->getEmitter()->on('before', [$this, '_trackRetries'], RequestEvents::EARLY);
-        $response = $this->client->send($request);
-        $this->waitQueue[$hash] = $response;
-        $promise = $response->promise();
-
-        // Don't recursively call itself for completed or rejected responses.
-        if ($promise instanceof FulfilledPromise
-            || $promise instanceof RejectedPromise
-        ) {
-            try {
-                $this->finishResponse($request, $response->wait(), $hash);
-            } catch (\Exception $e) {
-                $this->finishResponse($request, $e, $hash);
-            }
-            goto add_next;
-        }
-
-        // Use this function for both resolution and rejection.
-        $thenFn = function ($value) use ($request, $hash) {
-            $this->finishResponse($request, $value, $hash);
-            if (!$request->getConfig()->get('_pool_retries')) {
-                $this->addNextRequests();
-            }
-        };
-
-        $promise->then($thenFn, $thenFn);
-
-        return true;
-    }
-
-    public function _trackRetries(BeforeEvent $e)
-    {
-        $e->getRequest()->getConfig()->set('_pool_retries', $e->getRetryCount());
-    }
-
-    private function finishResponse($request, $value, $hash)
-    {
-        unset($this->waitQueue[$hash]);
-        $result = $value instanceof ResponseInterface
-            ? ['request' => $request, 'response' => $value, 'error' => null]
-            : ['request' => $request, 'response' => null, 'error' => $value];
-        $this->deferred->progress($result);
-    }
 }
diff --git a/core/vendor/guzzlehttp/guzzle/src/Post/MultipartBody.php b/core/vendor/guzzlehttp/guzzle/src/Post/MultipartBody.php
deleted file mode 100644
index 1149e6235..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Post/MultipartBody.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-namespace GuzzleHttp\Post;
-
-use GuzzleHttp\Stream\AppendStream;
-use GuzzleHttp\Stream\Stream;
-use GuzzleHttp\Stream\StreamDecoratorTrait;
-use GuzzleHttp\Stream\StreamInterface;
-
-/**
- * Stream that when read returns bytes for a streaming multipart/form-data body
- */
-class MultipartBody implements StreamInterface
-{
-    use StreamDecoratorTrait;
-
-    private $boundary;
-
-    /**
-     * @param array  $fields   Associative array of field names to values where
-     *                         each value is a string or array of strings.
-     * @param array  $files    Associative array of PostFileInterface objects
-     * @param string $boundary You can optionally provide a specific boundary
-     * @throws \InvalidArgumentException
-     */
-    public function __construct(
-        array $fields = [],
-        array $files = [],
-        $boundary = null
-    ) {
-        $this->boundary = $boundary ?: uniqid();
-        $this->stream = $this->createStream($fields, $files);
-    }
-
-    /**
-     * Get the boundary
-     *
-     * @return string
-     */
-    public function getBoundary()
-    {
-        return $this->boundary;
-    }
-
-    public function isWritable()
-    {
-        return false;
-    }
-
-    /**
-     * Get the string needed to transfer a POST field
-     */
-    private function getFieldString($name, $value)
-    {
-        return sprintf(
-            "--%s\r\nContent-Disposition: form-data; name=\"%s\"\r\n\r\n%s\r\n",
-            $this->boundary,
-            $name,
-            $value
-        );
-    }
-
-    /**
-     * Get the headers needed before transferring the content of a POST file
-     */
-    private function getFileHeaders(PostFileInterface $file)
-    {
-        $headers = '';
-        foreach ($file->getHeaders() as $key => $value) {
-            $headers .= "{$key}: {$value}\r\n";
-        }
-
-        return "--{$this->boundary}\r\n" . trim($headers) . "\r\n\r\n";
-    }
-
-    /**
-     * Create the aggregate stream that will be used to upload the POST data
-     */
-    protected function createStream(array $fields, array $files)
-    {
-        $stream = new AppendStream();
-
-        foreach ($fields as $name => $fieldValues) {
-            foreach ((array) $fieldValues as $value) {
-                $stream->addStream(
-                    Stream::factory($this->getFieldString($name, $value))
-                );
-            }
-        }
-
-        foreach ($files as $file) {
-
-            if (!$file instanceof PostFileInterface) {
-                throw new \InvalidArgumentException('All POST fields must '
-                    . 'implement PostFieldInterface');
-            }
-
-            $stream->addStream(
-                Stream::factory($this->getFileHeaders($file))
-            );
-            $stream->addStream($file->getContent());
-            $stream->addStream(Stream::factory("\r\n"));
-        }
-
-        // Add the trailing boundary with CRLF
-        $stream->addStream(Stream::factory("--{$this->boundary}--\r\n"));
-
-        return $stream;
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Post/PostBody.php b/core/vendor/guzzlehttp/guzzle/src/Post/PostBody.php
deleted file mode 100644
index ed14d1f70..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Post/PostBody.php
+++ /dev/null
@@ -1,287 +0,0 @@
-<?php
-namespace GuzzleHttp\Post;
-
-use GuzzleHttp\Message\RequestInterface;
-use GuzzleHttp\Stream\Exception\CannotAttachException;
-use GuzzleHttp\Stream\StreamInterface;
-use GuzzleHttp\Stream\Stream;
-use GuzzleHttp\Query;
-
-/**
- * Holds POST fields and files and creates a streaming body when read methods
- * are called on the object.
- */
-class PostBody implements PostBodyInterface
-{
-    /** @var StreamInterface */
-    private $body;
-
-    /** @var callable */
-    private $aggregator;
-
-    private $fields = [];
-
-    /** @var PostFileInterface[] */
-    private $files = [];
-    private $forceMultipart = false;
-    private $detached = false;
-
-    /**
-     * Applies request headers to a request based on the POST state
-     *
-     * @param RequestInterface $request Request to update
-     */
-    public function applyRequestHeaders(RequestInterface $request)
-    {
-        if ($this->files || $this->forceMultipart) {
-            $request->setHeader(
-                'Content-Type',
-                'multipart/form-data; boundary=' . $this->getBody()->getBoundary()
-            );
-        } elseif ($this->fields && !$request->hasHeader('Content-Type')) {
-            $request->setHeader(
-                'Content-Type',
-                'application/x-www-form-urlencoded'
-            );
-        }
-
-        if ($size = $this->getSize()) {
-            $request->setHeader('Content-Length', $size);
-        }
-    }
-
-    public function forceMultipartUpload($force)
-    {
-        $this->forceMultipart = $force;
-    }
-
-    public function setAggregator(callable $aggregator)
-    {
-        $this->aggregator = $aggregator;
-    }
-
-    public function setField($name, $value)
-    {
-        $this->fields[$name] = $value;
-        $this->mutate();
-    }
-
-    public function replaceFields(array $fields)
-    {
-        $this->fields = $fields;
-        $this->mutate();
-    }
-
-    public function getField($name)
-    {
-        return isset($this->fields[$name]) ? $this->fields[$name] : null;
-    }
-
-    public function removeField($name)
-    {
-        unset($this->fields[$name]);
-        $this->mutate();
-    }
-
-    public function getFields($asString = false)
-    {
-        if (!$asString) {
-            return $this->fields;
-        }
-
-        $query = new Query($this->fields);
-        $query->setEncodingType(Query::RFC1738);
-        $query->setAggregator($this->getAggregator());
-
-        return (string) $query;
-    }
-
-    public function hasField($name)
-    {
-        return isset($this->fields[$name]);
-    }
-
-    public function getFile($name)
-    {
-        foreach ($this->files as $file) {
-            if ($file->getName() == $name) {
-                return $file;
-            }
-        }
-
-        return null;
-    }
-
-    public function getFiles()
-    {
-        return $this->files;
-    }
-
-    public function addFile(PostFileInterface $file)
-    {
-        $this->files[] = $file;
-        $this->mutate();
-    }
-
-    public function clearFiles()
-    {
-        $this->files = [];
-        $this->mutate();
-    }
-
-    /**
-     * Returns the numbers of fields + files
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->files) + count($this->fields);
-    }
-
-    public function __toString()
-    {
-        return (string) $this->getBody();
-    }
-
-    public function getContents($maxLength = -1)
-    {
-        return $this->getBody()->getContents();
-    }
-
-    public function close()
-    {
-        $this->detach();
-    }
-
-    public function detach()
-    {
-        $this->detached = true;
-        $this->fields = $this->files = [];
-
-        if ($this->body) {
-            $this->body->close();
-            $this->body = null;
-        }
-    }
-
-    public function attach($stream)
-    {
-        throw new CannotAttachException();
-    }
-
-    public function eof()
-    {
-        return $this->getBody()->eof();
-    }
-
-    public function tell()
-    {
-        return $this->body ? $this->body->tell() : 0;
-    }
-
-    public function isSeekable()
-    {
-        return true;
-    }
-
-    public function isReadable()
-    {
-        return true;
-    }
-
-    public function isWritable()
-    {
-        return false;
-    }
-
-    public function getSize()
-    {
-        return $this->getBody()->getSize();
-    }
-
-    public function seek($offset, $whence = SEEK_SET)
-    {
-        return $this->getBody()->seek($offset, $whence);
-    }
-
-    public function read($length)
-    {
-        return $this->getBody()->read($length);
-    }
-
-    public function write($string)
-    {
-        return false;
-    }
-
-    public function getMetadata($key = null)
-    {
-        return $key ? null : [];
-    }
-
-    /**
-     * Return a stream object that is built from the POST fields and files.
-     *
-     * If one has already been created, the previously created stream will be
-     * returned.
-     */
-    private function getBody()
-    {
-        if ($this->body) {
-            return $this->body;
-        } elseif ($this->files || $this->forceMultipart) {
-            return $this->body = $this->createMultipart();
-        } elseif ($this->fields) {
-            return $this->body = $this->createUrlEncoded();
-        } else {
-            return $this->body = Stream::factory();
-        }
-    }
-
-    /**
-     * Get the aggregator used to join multi-valued field parameters
-     *
-     * @return callable
-     */
-    final protected function getAggregator()
-    {
-        if (!$this->aggregator) {
-            $this->aggregator = Query::phpAggregator();
-        }
-
-        return $this->aggregator;
-    }
-
-    /**
-     * Creates a multipart/form-data body stream
-     *
-     * @return MultipartBody
-     */
-    private function createMultipart()
-    {
-        // Flatten the nested query string values using the correct aggregator
-        return new MultipartBody(
-            call_user_func($this->getAggregator(), $this->fields),
-            $this->files
-        );
-    }
-
-    /**
-     * Creates an application/x-www-form-urlencoded stream body
-     *
-     * @return StreamInterface
-     */
-    private function createUrlEncoded()
-    {
-        return Stream::factory($this->getFields(true));
-    }
-
-    /**
-     * Get rid of any cached data
-     */
-    private function mutate()
-    {
-        $this->body = null;
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Post/PostBodyInterface.php b/core/vendor/guzzlehttp/guzzle/src/Post/PostBodyInterface.php
deleted file mode 100644
index c2ec9a62c..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Post/PostBodyInterface.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-namespace GuzzleHttp\Post;
-
-use GuzzleHttp\Message\AppliesHeadersInterface;
-use GuzzleHttp\Stream\StreamInterface;
-
-/**
- * Represents a POST body that is sent as either a multipart/form-data stream
- * or application/x-www-urlencoded stream.
- */
-interface PostBodyInterface extends StreamInterface, \Countable, AppliesHeadersInterface
-{
-    /**
-     * Set a specific field
-     *
-     * @param string       $name  Name of the field to set
-     * @param string|array $value Value to set
-     */
-    public function setField($name, $value);
-
-    /**
-     * Set the aggregation strategy that will be used to turn multi-valued
-     * fields into a string.
-     *
-     * The aggregation function accepts a deeply nested array of query string
-     * values and returns a flattened associative array of key value pairs.
-     *
-     * @param callable $aggregator
-     */
-    public function setAggregator(callable $aggregator);
-
-    /**
-     * Set to true to force a multipart upload even if there are no files.
-     *
-     * @param bool $force Set to true to force multipart uploads or false to
-     *     remove this flag.
-     */
-    public function forceMultipartUpload($force);
-
-    /**
-     * Replace all existing form fields with an array of fields
-     *
-     * @param array $fields Associative array of fields to set
-     */
-    public function replaceFields(array $fields);
-
-    /**
-     * Get a specific field by name
-     *
-     * @param string $name Name of the POST field to retrieve
-     *
-     * @return string|null
-     */
-    public function getField($name);
-
-    /**
-     * Remove a field by name
-     *
-     * @param string $name Name of the field to remove
-     */
-    public function removeField($name);
-
-    /**
-     * Returns an associative array of names to values or a query string.
-     *
-     * @param bool $asString Set to true to retrieve the fields as a query
-     *     string.
-     *
-     * @return array|string
-     */
-    public function getFields($asString = false);
-
-    /**
-     * Returns true if a field is set
-     *
-     * @param string $name Name of the field to set
-     *
-     * @return bool
-     */
-    public function hasField($name);
-
-    /**
-     * Get all of the files
-     *
-     * @return array Returns an array of PostFileInterface objects
-     */
-    public function getFiles();
-
-    /**
-     * Get a POST file by name.
-     *
-     * @param string $name Name of the POST file to retrieve
-     *
-     * @return PostFileInterface|null
-     */
-    public function getFile($name);
-
-    /**
-     * Add a file to the POST
-     *
-     * @param PostFileInterface $file File to add
-     */
-    public function addFile(PostFileInterface $file);
-
-    /**
-     * Remove all files from the collection
-     */
-    public function clearFiles();
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Post/PostFile.php b/core/vendor/guzzlehttp/guzzle/src/Post/PostFile.php
deleted file mode 100644
index e102c0243..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Post/PostFile.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-namespace GuzzleHttp\Post;
-
-use GuzzleHttp\Mimetypes;
-use GuzzleHttp\Stream\StreamInterface;
-use GuzzleHttp\Stream\Stream;
-
-/**
- * Post file upload
- */
-class PostFile implements PostFileInterface
-{
-    private $name;
-    private $filename;
-    private $content;
-    private $headers = [];
-
-    /**
-     * @param string          $name     Name of the form field
-     * @param mixed           $content  Data to send
-     * @param string|null     $filename Filename content-disposition attribute
-     * @param array           $headers  Array of headers to set on the file
-     *                                  (can override any default headers)
-     * @throws \RuntimeException when filename is not passed or can't be determined
-     */
-    public function __construct(
-        $name,
-        $content,
-        $filename = null,
-        array $headers = []
-    ) {
-        $this->headers = $headers;
-        $this->name = $name;
-        $this->prepareContent($content);
-        $this->prepareFilename($filename);
-        $this->prepareDefaultHeaders();
-    }
-
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    public function getFilename()
-    {
-        return $this->filename;
-    }
-
-    public function getContent()
-    {
-        return $this->content;
-    }
-
-    public function getHeaders()
-    {
-        return $this->headers;
-    }
-
-    /**
-     * Prepares the contents of a POST file.
-     *
-     * @param mixed $content Content of the POST file
-     */
-    private function prepareContent($content)
-    {
-        $this->content = $content;
-
-        if (!($this->content instanceof StreamInterface)) {
-            $this->content = Stream::factory($this->content);
-        } elseif ($this->content instanceof MultipartBody) {
-            if (!$this->hasHeader('Content-Disposition')) {
-                $disposition = 'form-data; name="' . $this->name .'"';
-                $this->headers['Content-Disposition'] = $disposition;
-            }
-
-            if (!$this->hasHeader('Content-Type')) {
-                $this->headers['Content-Type'] = sprintf(
-                    "multipart/form-data; boundary=%s",
-                    $this->content->getBoundary()
-                );
-            }
-        }
-    }
-
-    /**
-     * Applies a file name to the POST file based on various checks.
-     *
-     * @param string|null $filename Filename to apply (or null to guess)
-     */
-    private function prepareFilename($filename)
-    {
-        $this->filename = $filename;
-
-        if (!$this->filename) {
-            $this->filename = $this->content->getMetadata('uri');
-        }
-
-        if (!$this->filename || substr($this->filename, 0, 6) === 'php://') {
-            $this->filename = $this->name;
-        }
-    }
-
-    /**
-     * Applies default Content-Disposition and Content-Type headers if needed.
-     */
-    private function prepareDefaultHeaders()
-    {
-        // Set a default content-disposition header if one was no provided
-        if (!$this->hasHeader('Content-Disposition')) {
-            $this->headers['Content-Disposition'] = sprintf(
-                'form-data; name="%s"; filename="%s"',
-                $this->name,
-                basename($this->filename)
-            );
-        }
-
-        // Set a default Content-Type if one was not supplied
-        if (!$this->hasHeader('Content-Type')) {
-            $this->headers['Content-Type'] = Mimetypes::getInstance()
-                ->fromFilename($this->filename) ?: 'text/plain';
-        }
-    }
-
-    /**
-     * Check if a specific header exists on the POST file by name.
-     *
-     * @param string $name Case-insensitive header to check
-     *
-     * @return bool
-     */
-    private function hasHeader($name)
-    {
-        return isset(array_change_key_case($this->headers)[strtolower($name)]);
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Post/PostFileInterface.php b/core/vendor/guzzlehttp/guzzle/src/Post/PostFileInterface.php
deleted file mode 100644
index 2e816c088..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Post/PostFileInterface.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-namespace GuzzleHttp\Post;
-
-use GuzzleHttp\Stream\StreamInterface;
-
-/**
- * Post file upload interface
- */
-interface PostFileInterface
-{
-    /**
-     * Get the name of the form field
-     *
-     * @return string
-     */
-    public function getName();
-
-    /**
-     * Get the full path to the file
-     *
-     * @return string
-     */
-    public function getFilename();
-
-    /**
-     * Get the content
-     *
-     * @return StreamInterface
-     */
-    public function getContent();
-
-    /**
-     * Gets all POST file headers.
-     *
-     * The keys represent the header name as it will be sent over the wire, and
-     * each value is a string.
-     *
-     * @return array Returns an associative array of the file's headers.
-     */
-    public function getHeaders();
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/PrepareBodyMiddleware.php b/core/vendor/guzzlehttp/guzzle/src/PrepareBodyMiddleware.php
new file mode 100644
index 000000000..e6d176b61
--- /dev/null
+++ b/core/vendor/guzzlehttp/guzzle/src/PrepareBodyMiddleware.php
@@ -0,0 +1,112 @@
+<?php
+namespace GuzzleHttp;
+
+use GuzzleHttp\Promise\PromiseInterface;
+use GuzzleHttp\Psr7;
+use Psr\Http\Message\RequestInterface;
+
+/**
+ * Prepares requests that contain a body, adding the Content-Length,
+ * Content-Type, and Expect headers.
+ */
+class PrepareBodyMiddleware
+{
+    /** @var callable  */
+    private $nextHandler;
+
+    /** @var array */
+    private static $skipMethods = ['GET' => true, 'HEAD' => true];
+
+    /**
+     * @param callable $nextHandler Next handler to invoke.
+     */
+    public function __construct(callable $nextHandler)
+    {
+        $this->nextHandler = $nextHandler;
+    }
+
+    /**
+     * @param RequestInterface $request
+     * @param array            $options
+     *
+     * @return PromiseInterface
+     */
+    public function __invoke(RequestInterface $request, array $options)
+    {
+        $fn = $this->nextHandler;
+
+        // Don't do anything if the request has no body.
+        if (isset(self::$skipMethods[$request->getMethod()])
+            || $request->getBody()->getSize() === 0
+        ) {
+            return $fn($request, $options);
+        }
+
+        $modify = [];
+
+        // Add a default content-type if possible.
+        if (!$request->hasHeader('Content-Type')) {
+            if ($uri = $request->getBody()->getMetadata('uri')) {
+                if ($type = Psr7\mimetype_from_filename($uri)) {
+                    $modify['set_headers']['Content-Type'] = $type;
+                }
+            }
+        }
+
+        // Add a default content-length or transfer-encoding header.
+        if (!isset(self::$skipMethods[$request->getMethod()])
+            && !$request->hasHeader('Content-Length')
+            && !$request->hasHeader('Transfer-Encoding')
+        ) {
+            $size = $request->getBody()->getSize();
+            if ($size !== null) {
+                $modify['set_headers']['Content-Length'] = $size;
+            } else {
+                $modify['set_headers']['Transfer-Encoding'] = 'chunked';
+            }
+        }
+
+        // Add the expect header if needed.
+        $this->addExpectHeader($request, $options, $modify);
+
+        return $fn(Psr7\modify_request($request, $modify), $options);
+    }
+
+    private function addExpectHeader(
+        RequestInterface $request,
+        array $options,
+        array &$modify
+    ) {
+        // Determine if the Expect header should be used
+        if ($request->hasHeader('Expect')) {
+            return;
+        }
+
+        $expect = isset($options['expect']) ? $options['expect'] : null;
+
+        // Return if disabled or if you're not using HTTP/1.1 or HTTP/2.0
+        if ($expect === false || $request->getProtocolVersion() < 1.1) {
+            return;
+        }
+
+        // The expect header is unconditionally enabled
+        if ($expect === true) {
+            $modify['set_headers']['Expect'] = '100-Continue';
+            return;
+        }
+
+        // By default, send the expect header when the payload is > 1mb
+        if ($expect === null) {
+            $expect = 1048576;
+        }
+
+        // Always add if the body cannot be rewound, the size cannot be
+        // determined, or the size is greater than the cutoff threshold
+        $body = $request->getBody();
+        $size = $body->getSize();
+
+        if ($size === null || $size >= (int) $expect || !$body->isSeekable()) {
+            $modify['set_headers']['Expect'] = '100-Continue';
+        }
+    }
+}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Query.php b/core/vendor/guzzlehttp/guzzle/src/Query.php
deleted file mode 100644
index d053def6e..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Query.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-namespace GuzzleHttp;
-
-/**
- * Manages query string variables and can aggregate them into a string
- */
-class Query extends Collection
-{
-    const RFC3986 = 'RFC3986';
-    const RFC1738 = 'RFC1738';
-
-    /** @var callable Encoding function */
-    private $encoding = 'rawurlencode';
-    /** @var callable */
-    private $aggregator;
-
-    /**
-     * Parse a query string into a Query object
-     *
-     * $urlEncoding is used to control how the query string is parsed and how
-     * it is ultimately serialized. The value can be set to one of the
-     * following:
-     *
-     * - true: (default) Parse query strings using RFC 3986 while still
-     *   converting "+" to " ".
-     * - false: Disables URL decoding of the input string and URL encoding when
-     *   the query string is serialized.
-     * - 'RFC3986': Use RFC 3986 URL encoding/decoding
-     * - 'RFC1738': Use RFC 1738 URL encoding/decoding
-     *
-     * @param string      $query       Query string to parse
-     * @param bool|string $urlEncoding Controls how the input string is decoded
-     *                                 and encoded.
-     * @return self
-     */
-    public static function fromString($query, $urlEncoding = true)
-    {
-        static $qp;
-        if (!$qp) {
-            $qp = new QueryParser();
-        }
-
-        $q = new static();
-
-        if ($urlEncoding !== true) {
-            $q->setEncodingType($urlEncoding);
-        }
-
-        $qp->parseInto($q, $query, $urlEncoding);
-
-        return $q;
-    }
-
-    /**
-     * Convert the query string parameters to a query string string
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        if (!$this->data) {
-            return '';
-        }
-
-        // The default aggregator is statically cached
-        static $defaultAggregator;
-
-        if (!$this->aggregator) {
-            if (!$defaultAggregator) {
-                $defaultAggregator = self::phpAggregator();
-            }
-            $this->aggregator = $defaultAggregator;
-        }
-
-        $result = '';
-        $aggregator = $this->aggregator;
-        $encoder = $this->encoding;
-
-        foreach ($aggregator($this->data) as $key => $values) {
-            foreach ($values as $value) {
-                if ($result) {
-                    $result .= '&';
-                }
-                $result .= $encoder($key);
-                if ($value !== null) {
-                    $result .= '=' . $encoder($value);
-                }
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Controls how multi-valued query string parameters are aggregated into a
-     * string.
-     *
-     *     $query->setAggregator($query::duplicateAggregator());
-     *
-     * @param callable $aggregator Callable used to convert a deeply nested
-     *     array of query string variables into a flattened array of key value
-     *     pairs. The callable accepts an array of query data and returns a
-     *     flattened array of key value pairs where each value is an array of
-     *     strings.
-     */
-    public function setAggregator(callable $aggregator)
-    {
-        $this->aggregator = $aggregator;
-    }
-
-    /**
-     * Specify how values are URL encoded
-     *
-     * @param string|bool $type One of 'RFC1738', 'RFC3986', or false to disable encoding
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function setEncodingType($type)
-    {
-        switch ($type) {
-            case self::RFC3986:
-                $this->encoding = 'rawurlencode';
-                break;
-            case self::RFC1738:
-                $this->encoding = 'urlencode';
-                break;
-            case false:
-                $this->encoding = function ($v) { return $v; };
-                break;
-            default:
-                throw new \InvalidArgumentException('Invalid URL encoding type');
-        }
-    }
-
-    /**
-     * Query string aggregator that does not aggregate nested query string
-     * values and allows duplicates in the resulting array.
-     *
-     * Example: http://test.com?q=1&q=2
-     *
-     * @return callable
-     */
-    public static function duplicateAggregator()
-    {
-        return function (array $data) {
-            return self::walkQuery($data, '', function ($key, $prefix) {
-                return is_int($key) ? $prefix : "{$prefix}[{$key}]";
-            });
-        };
-    }
-
-    /**
-     * Aggregates nested query string variables using the same technique as
-     * ``http_build_query()``.
-     *
-     * @param bool $numericIndices Pass false to not include numeric indices
-     *     when multi-values query string parameters are present.
-     *
-     * @return callable
-     */
-    public static function phpAggregator($numericIndices = true)
-    {
-        return function (array $data) use ($numericIndices) {
-            return self::walkQuery(
-                $data,
-                '',
-                function ($key, $prefix) use ($numericIndices) {
-                    return !$numericIndices && is_int($key)
-                        ? "{$prefix}[]"
-                        : "{$prefix}[{$key}]";
-                }
-            );
-        };
-    }
-
-    /**
-     * Easily create query aggregation functions by providing a key prefix
-     * function to this query string array walker.
-     *
-     * @param array    $query     Query string to walk
-     * @param string   $keyPrefix Key prefix (start with '')
-     * @param callable $prefixer  Function used to create a key prefix
-     *
-     * @return array
-     */
-    public static function walkQuery(array $query, $keyPrefix, callable $prefixer)
-    {
-        $result = [];
-        foreach ($query as $key => $value) {
-            if ($keyPrefix) {
-                $key = $prefixer($key, $keyPrefix);
-            }
-            if (is_array($value)) {
-                $result += self::walkQuery($value, $key, $prefixer);
-            } elseif (isset($result[$key])) {
-                $result[$key][] = $value;
-            } else {
-                $result[$key] = array($value);
-            }
-        }
-
-        return $result;
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/QueryParser.php b/core/vendor/guzzlehttp/guzzle/src/QueryParser.php
deleted file mode 100644
index 90727cc6c..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/QueryParser.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-namespace GuzzleHttp;
-
-/**
- * Parses query strings into a Query object.
- *
- * While parsing, the parser will attempt to determine the most appropriate
- * query string aggregator to use when serializing the parsed query string
- * object back into a string. The hope is that parsing then serializing a
- * query string should be a lossless operation.
- *
- * @internal Use Query::fromString()
- */
-class QueryParser
-{
-    private $duplicates;
-    private $numericIndices;
-
-    /**
-     * Parse a query string into a Query object.
-     *
-     * @param Query       $query       Query object to populate
-     * @param string      $str         Query string to parse
-     * @param bool|string $urlEncoding How the query string is encoded
-     */
-    public function parseInto(Query $query, $str, $urlEncoding = true)
-    {
-        if ($str === '') {
-            return;
-        }
-
-        $result = [];
-        $this->duplicates = false;
-        $this->numericIndices = true;
-        $decoder = self::getDecoder($urlEncoding);
-
-        foreach (explode('&', $str) as $kvp) {
-
-            $parts = explode('=', $kvp, 2);
-            $key = $decoder($parts[0]);
-            $value = isset($parts[1]) ? $decoder($parts[1]) : null;
-
-            // Special handling needs to be taken for PHP nested array syntax
-            if (strpos($key, '[') !== false) {
-                $this->parsePhpValue($key, $value, $result);
-                continue;
-            }
-
-            if (!isset($result[$key])) {
-                $result[$key] = $value;
-            } else {
-                $this->duplicates = true;
-                if (!is_array($result[$key])) {
-                    $result[$key] = [$result[$key]];
-                }
-                $result[$key][] = $value;
-            }
-        }
-
-        $query->replace($result);
-
-        if (!$this->numericIndices) {
-            $query->setAggregator(Query::phpAggregator(false));
-        } elseif ($this->duplicates) {
-            $query->setAggregator(Query::duplicateAggregator());
-        }
-    }
-
-    /**
-     * Returns a callable that is used to URL decode query keys and values.
-     *
-     * @param string|bool $type One of true, false, RFC3986, and RFC1738
-     *
-     * @return callable|string
-     */
-    private static function getDecoder($type)
-    {
-        if ($type === true) {
-            return function ($value) {
-                return rawurldecode(str_replace('+', ' ', $value));
-            };
-        } elseif ($type == Query::RFC3986) {
-            return 'rawurldecode';
-        } elseif ($type == Query::RFC1738) {
-            return 'urldecode';
-        } else {
-            return function ($str) { return $str; };
-        }
-    }
-
-    /**
-     * Parses a PHP style key value pair.
-     *
-     * @param string      $key    Key to parse (e.g., "foo[a][b]")
-     * @param string|null $value  Value to set
-     * @param array       $result Result to modify by reference
-     */
-    private function parsePhpValue($key, $value, array &$result)
-    {
-        $node =& $result;
-        $keyBuffer = '';
-
-        for ($i = 0, $t = strlen($key); $i < $t; $i++) {
-            switch ($key[$i]) {
-                case '[':
-                    if ($keyBuffer) {
-                        $this->prepareNode($node, $keyBuffer);
-                        $node =& $node[$keyBuffer];
-                        $keyBuffer = '';
-                    }
-                    break;
-                case ']':
-                    $k = $this->cleanKey($node, $keyBuffer);
-                    $this->prepareNode($node, $k);
-                    $node =& $node[$k];
-                    $keyBuffer = '';
-                    break;
-                default:
-                    $keyBuffer .= $key[$i];
-                    break;
-            }
-        }
-
-        if (isset($node)) {
-            $this->duplicates = true;
-            $node[] = $value;
-        } else {
-            $node = $value;
-        }
-    }
-
-    /**
-     * Prepares a value in the array at the given key.
-     *
-     * If the key already exists, the key value is converted into an array.
-     *
-     * @param array  $node Result node to modify
-     * @param string $key  Key to add or modify in the node
-     */
-    private function prepareNode(&$node, $key)
-    {
-        if (!isset($node[$key])) {
-            $node[$key] = null;
-        } elseif (!is_array($node[$key])) {
-            $node[$key] = [$node[$key]];
-        }
-    }
-
-    /**
-     * Returns the appropriate key based on the node and key.
-     */
-    private function cleanKey($node, $key)
-    {
-        if ($key === '') {
-            $key = $node ? (string) count($node) : 0;
-            // Found a [] key, so track this to ensure that we disable numeric
-            // indexing of keys in the resolved query aggregator.
-            $this->numericIndices = false;
-        }
-
-        return $key;
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/RedirectMiddleware.php b/core/vendor/guzzlehttp/guzzle/src/RedirectMiddleware.php
new file mode 100644
index 000000000..374931d96
--- /dev/null
+++ b/core/vendor/guzzlehttp/guzzle/src/RedirectMiddleware.php
@@ -0,0 +1,198 @@
+<?php
+namespace GuzzleHttp;
+
+use GuzzleHttp\Exception\BadResponseException;
+use GuzzleHttp\Exception\TooManyRedirectsException;
+use GuzzleHttp\Promise\PromiseInterface;
+use GuzzleHttp\Psr7;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\UriInterface;
+
+/**
+ * Request redirect middleware.
+ *
+ * Apply this middleware like other middleware using
+ * {@see GuzzleHttp\Middleware::redirect()}.
+ */
+class RedirectMiddleware
+{
+    public static $defaultSettings = [
+        'max'       => 5,
+        'protocols' => ['http', 'https'],
+        'strict'    => false,
+        'referer'   => false
+    ];
+
+    /** @var callable  */
+    private $nextHandler;
+
+    /**
+     * @param callable $nextHandler Next handler to invoke.
+     */
+    public function __construct(callable $nextHandler)
+    {
+        $this->nextHandler = $nextHandler;
+    }
+
+    /**
+     * @param RequestInterface $request
+     * @param array            $options
+     *
+     * @return PromiseInterface
+     */
+    public function __invoke(RequestInterface $request, array $options)
+    {
+        $fn = $this->nextHandler;
+
+        if (empty($options['allow_redirects'])) {
+            return $fn($request, $options);
+        }
+
+        if ($options['allow_redirects'] === true) {
+            $options['allow_redirects'] = self::$defaultSettings;
+        } elseif (!is_array($options['allow_redirects'])) {
+            throw new \InvalidArgumentException('allow_redirects must be true, false, or array');
+        } else {
+            // Merge the default settings with the provided settings
+            $options['allow_redirects'] += self::$defaultSettings;
+        }
+
+        if (empty($options['allow_redirects']['max'])) {
+            return $fn($request, $options);
+        }
+
+        return $fn($request, $options)
+            ->then(function (ResponseInterface $response) use ($request, $options) {
+                return $this->checkRedirect($request, $options, $response);
+            });
+    }
+
+    /**
+     * @param RequestInterface  $request
+     * @param array             $options
+     * @param ResponseInterface|PromiseInterface $response
+     *
+     * @return ResponseInterface|PromiseInterface
+     */
+    public function checkRedirect(
+        RequestInterface $request,
+        array $options,
+        ResponseInterface $response
+    ) {
+        if (substr($response->getStatusCode(), 0, 1) != '3'
+            || !$response->hasHeader('Location')
+        ) {
+            return $response;
+        }
+
+        $this->guardMax($request, $options);
+        $nextRequest = $this->modifyRequest($request, $options, $response);
+
+        if (isset($options['allow_redirects']['on_redirect'])) {
+            call_user_func(
+                $options['allow_redirects']['on_redirect'],
+                $request,
+                $response,
+                $nextRequest->getUri()
+            );
+        }
+
+        return $this($nextRequest, $options);
+    }
+
+    private function guardMax(RequestInterface $request, array &$options)
+    {
+        $current = isset($options['__redirect_count'])
+            ? $options['__redirect_count']
+            : 0;
+        $options['__redirect_count'] = $current + 1;
+        $max = $options['allow_redirects']['max'];
+
+        if ($options['__redirect_count'] > $max) {
+            throw new TooManyRedirectsException(
+                "Will not follow more than {$max} redirects",
+                $request
+            );
+        }
+    }
+
+    /**
+     * @param RequestInterface  $request
+     * @param array             $options
+     * @param ResponseInterface $response
+     *
+     * @return RequestInterface
+     */
+    public function modifyRequest(
+        RequestInterface $request,
+        array $options,
+        ResponseInterface $response
+    ) {
+        // Request modifications to apply.
+        $modify = [];
+        $protocols = $options['allow_redirects']['protocols'];
+
+        // Use a GET request if this is an entity enclosing request and we are
+        // not forcing RFC compliance, but rather emulating what all browsers
+        // would do.
+        $statusCode = $response->getStatusCode();
+        if ($statusCode == 303 ||
+            ($statusCode <= 302 && $request->getBody() && !$options['allow_redirects']['strict'])
+        ) {
+            $modify['method'] = 'GET';
+            $modify['body'] = '';
+        }
+
+        $modify['uri'] = $this->redirectUri($request, $response, $protocols);
+        Psr7\rewind_body($request);
+
+        // Add the Referer header if it is told to do so and only
+        // add the header if we are not redirecting from https to http.
+        if ($options['allow_redirects']['referer']
+            && $modify['uri']->getScheme() === $request->getUri()->getScheme()
+        ) {
+            $uri = $request->getUri()->withUserInfo('', '');
+            $modify['set_headers']['Referer'] = (string) $uri;
+        } else {
+            $modify['remove_headers'][] = 'Referer';
+        }
+
+        return Psr7\modify_request($request, $modify);
+    }
+
+    /**
+     * Set the appropriate URL on the request based on the location header
+     *
+     * @param RequestInterface  $request
+     * @param ResponseInterface $response
+     * @param array             $protocols
+     *
+     * @return UriInterface
+     */
+    private function redirectUri(
+        RequestInterface $request,
+        ResponseInterface $response,
+        array $protocols
+    ) {
+        $location = Psr7\Uri::resolve(
+            $request->getUri(),
+            $response->getHeaderLine('Location')
+        );
+
+        // Ensure that the redirect URI is allowed based on the protocols.
+        if (!in_array($location->getScheme(), $protocols)) {
+            throw new BadResponseException(
+                sprintf(
+                    'Redirect URI, %s, does not use one of the allowed redirect protocols: %s',
+                    $location,
+                    implode(', ', $protocols)
+                ),
+                $request,
+                $response
+            );
+        }
+
+        return $location;
+    }
+}
diff --git a/core/vendor/guzzlehttp/guzzle/src/RequestFsm.php b/core/vendor/guzzlehttp/guzzle/src/RequestFsm.php
deleted file mode 100644
index b37c190d4..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/RequestFsm.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-namespace GuzzleHttp;
-
-use GuzzleHttp\Event\BeforeEvent;
-use GuzzleHttp\Event\ErrorEvent;
-use GuzzleHttp\Event\CompleteEvent;
-use GuzzleHttp\Event\EndEvent;
-use GuzzleHttp\Exception\StateException;
-use GuzzleHttp\Exception\RequestException;
-use GuzzleHttp\Message\FutureResponse;
-use GuzzleHttp\Message\MessageFactoryInterface;
-use GuzzleHttp\Ring\Future\FutureInterface;
-
-/**
- * Responsible for transitioning requests through lifecycle events.
- */
-class RequestFsm
-{
-    private $handler;
-    private $mf;
-    private $maxTransitions;
-
-    public function __construct(
-        callable $handler,
-        MessageFactoryInterface $messageFactory,
-        $maxTransitions = 200
-    ) {
-        $this->mf = $messageFactory;
-        $this->maxTransitions = $maxTransitions;
-        $this->handler = $handler;
-    }
-
-    /**
-     * Runs the state machine until a terminal state is entered or the
-     * optionally supplied $finalState is entered.
-     *
-     * @param Transaction $trans      Transaction being transitioned.
-     *
-     * @throws \Exception if a terminal state throws an exception.
-     */
-    public function __invoke(Transaction $trans)
-    {
-        $trans->_transitionCount = 0;
-
-        if (!$trans->state) {
-            $trans->state = 'before';
-        }
-
-        transition:
-
-        if (++$trans->_transitionCount > $this->maxTransitions) {
-            throw new StateException("Too many state transitions were "
-                . "encountered ({$trans->_transitionCount}). This likely "
-                . "means that a combination of event listeners are in an "
-                . "infinite loop.");
-        }
-
-        switch ($trans->state) {
-            case 'before': goto before;
-            case 'complete': goto complete;
-            case 'error': goto error;
-            case 'retry': goto retry;
-            case 'send': goto send;
-            case 'end': goto end;
-            default: throw new StateException("Invalid state: {$trans->state}");
-        }
-
-        before: {
-            try {
-                $trans->request->getEmitter()->emit('before', new BeforeEvent($trans));
-                $trans->state = 'send';
-                if ((bool) $trans->response) {
-                    $trans->state = 'complete';
-                }
-            } catch (\Exception $e) {
-                $trans->state = 'error';
-                $trans->exception = $e;
-            }
-            goto transition;
-        }
-
-        complete: {
-            try {
-                if ($trans->response instanceof FutureInterface) {
-                    // Futures will have their own end events emitted when
-                    // dereferenced.
-                    return;
-                }
-                $trans->state = 'end';
-                $trans->response->setEffectiveUrl($trans->request->getUrl());
-                $trans->request->getEmitter()->emit('complete', new CompleteEvent($trans));
-            } catch (\Exception $e) {
-                $trans->state = 'error';
-                $trans->exception = $e;
-            }
-            goto transition;
-        }
-
-        error: {
-            try {
-                // Convert non-request exception to a wrapped exception
-                $trans->exception = RequestException::wrapException(
-                    $trans->request, $trans->exception
-                );
-                $trans->state = 'end';
-                $trans->request->getEmitter()->emit('error', new ErrorEvent($trans));
-                // An intercepted request (not retried) transitions to complete
-                if (!$trans->exception && $trans->state !== 'retry') {
-                    $trans->state = 'complete';
-                }
-            } catch (\Exception $e) {
-                $trans->state = 'end';
-                $trans->exception = $e;
-            }
-            goto transition;
-        }
-
-        retry: {
-            $trans->retries++;
-            $trans->response = null;
-            $trans->exception = null;
-            $trans->state = 'before';
-            goto transition;
-        }
-
-        send: {
-            $fn = $this->handler;
-            $trans->response = FutureResponse::proxy(
-                $fn(RingBridge::prepareRingRequest($trans)),
-                function ($value) use ($trans) {
-                    RingBridge::completeRingResponse($trans, $value, $this->mf, $this);
-                    $this($trans);
-                    return $trans->response;
-                }
-            );
-            return;
-        }
-
-        end: {
-            $trans->request->getEmitter()->emit('end', new EndEvent($trans));
-            // Throw exceptions in the terminal event if the exception
-            // was not handled by an "end" event listener.
-            if ($trans->exception) {
-                if (!($trans->exception instanceof RequestException)) {
-                    $trans->exception = RequestException::wrapException(
-                        $trans->request, $trans->exception
-                    );
-                }
-                throw $trans->exception;
-            }
-        }
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/RequestOptions.php b/core/vendor/guzzlehttp/guzzle/src/RequestOptions.php
new file mode 100644
index 000000000..e142b3f2c
--- /dev/null
+++ b/core/vendor/guzzlehttp/guzzle/src/RequestOptions.php
@@ -0,0 +1,226 @@
+<?php
+namespace GuzzleHttp;
+
+/**
+ * This class contains a list of built-in Guzzle request options.
+ *
+ * More documentation for each option can be found at http://guzzlephp.org/.
+ *
+ * @link http://docs.guzzlephp.org/en/v6/request-options.html
+ */
+final class RequestOptions
+{
+    /**
+     * allow_redirects: (bool|array) Controls redirect behavior. Pass false
+     * to disable redirects, pass true to enable redirects, pass an
+     * associative to provide custom redirect settings. Defaults to "false".
+     * This option only works if your handler has the RedirectMiddleware. When
+     * passing an associative array, you can provide the following key value
+     * pairs:
+     *
+     * - max: (int, default=5) maximum number of allowed redirects.
+     * - strict: (bool, default=false) Set to true to use strict redirects
+     *   meaning redirect POST requests with POST requests vs. doing what most
+     *   browsers do which is redirect POST requests with GET requests
+     * - referer: (bool, default=true) Set to false to disable the Referer
+     *   header.
+     * - protocols: (array, default=['http', 'https']) Allowed redirect
+     *   protocols.
+     * - on_redirect: (callable) PHP callable that is invoked when a redirect
+     *   is encountered. The callable is invoked with the request, the redirect
+     *   response that was received, and the effective URI. Any return value
+     *   from the on_redirect function is ignored.
+     */
+    const ALLOW_REDIRECTS = 'allow_redirects';
+
+    /**
+     * auth: (array) Pass an array of HTTP authentication parameters to use
+     * with the request. The array must contain the username in index [0],
+     * the password in index [1], and you can optionally provide a built-in
+     * authentication type in index [2]. Pass null to disable authentication
+     * for a request.
+     */
+    const AUTH = 'auth';
+
+    /**
+     * body: (string|null|callable|iterator|object) Body to send in the
+     * request.
+     */
+    const BODY = 'body';
+
+    /**
+     * cert: (string|array) Set to a string to specify the path to a file
+     * containing a PEM formatted SSL client side certificate. If a password
+     * is required, then set cert to an array containing the path to the PEM
+     * file in the first array element followed by the certificate password
+     * in the second array element.
+     */
+    const CERT = 'cert';
+
+    /**
+     * cookies: (bool|GuzzleHttp\Cookie\CookieJarInterface, default=false)
+     * Specifies whether or not cookies are used in a request or what cookie
+     * jar to use or what cookies to send. This option only works if your
+     * handler has the `cookie` middleware. Valid values are `false` and
+     * an instance of {@see GuzzleHttp\Cookie\CookieJarInterface}.
+     */
+    const COOKIES = 'cookies';
+
+    /**
+     * connect_timeout: (float, default=0) Float describing the number of
+     * seconds to wait while trying to connect to a server. Use 0 to wait
+     * indefinitely (the default behavior).
+     */
+    const CONNECT_TIMEOUT = 'connect_timeout';
+
+    /**
+     * debug: (bool|resource) Set to true or set to a PHP stream returned by
+     * fopen()  enable debug output with the HTTP handler used to send a
+     * request.
+     */
+    const DEBUG = 'debug';
+
+    /**
+     * decode_content: (bool, default=true) Specify whether or not
+     * Content-Encoding responses (gzip, deflate, etc.) are automatically
+     * decoded.
+     */
+    const DECODE_CONTENT = 'decode_content';
+
+    /**
+     * delay: (int) The amount of time to delay before sending in milliseconds.
+     */
+    const DELAY = 'delay';
+
+    /**
+     * expect: (bool|integer) Controls the behavior of the
+     * "Expect: 100-Continue" header.
+     *
+     * Set to `true` to enable the "Expect: 100-Continue" header for all
+     * requests that sends a body. Set to `false` to disable the
+     * "Expect: 100-Continue" header for all requests. Set to a number so that
+     * the size of the payload must be greater than the number in order to send
+     * the Expect header. Setting to a number will send the Expect header for
+     * all requests in which the size of the payload cannot be determined or
+     * where the body is not rewindable.
+     *
+     * By default, Guzzle will add the "Expect: 100-Continue" header when the
+     * size of the body of a request is greater than 1 MB and a request is
+     * using HTTP/1.1.
+     */
+    const EXPECT = 'expect';
+
+    /**
+     * form_params: (array) Associative array of form field names to values
+     * where each value is a string or array of strings. Sets the Content-Type
+     * header to application/x-www-form-urlencoded when no Content-Type header
+     * is already present.
+     */
+    const FORM_PARAMS = 'form_params';
+
+    /**
+     * headers: (array) Associative array of HTTP headers. Each value MUST be
+     * a string or array of strings.
+     */
+    const HEADERS = 'headers';
+
+    /**
+     * http_errors: (bool, default=true) Set to false to disable exceptions
+     * when a non- successful HTTP response is received. By default,
+     * exceptions will be thrown for 4xx and 5xx responses. This option only
+     * works if your handler has the `httpErrors` middleware.
+     */
+    const HTTP_ERRORS = 'http_errors';
+
+    /**
+     * json: (mixed) Adds JSON data to a request. The provided value is JSON
+     * encoded and a Content-Type header of application/json will be added to
+     * the request if no Content-Type header is already present.
+     */
+    const JSON = 'json';
+
+    /**
+     * multipart: (array) Array of associative arrays, each containing a
+     * required "name" key mapping to the form field, name, a required
+     * "contents" key mapping to a StreamInterface|resource|string, an
+     * optional "headers" associative array of custom headers, and an
+     * optional "filename" key mapping to a string to send as the filename in
+     * the part. If no "filename" key is present, then no "filename" attribute
+     * will be added to the part.
+     */
+    const MULTIPART = 'multipart';
+
+    /**
+     * progress: (callable) Defines a function to invoke when transfer
+     * progress is made. The function accepts the following positional
+     * arguments: the total number of bytes expected to be downloaded, the
+     * number of bytes downloaded so far, the number of bytes expected to be
+     * uploaded, the number of bytes uploaded so far.
+     */
+    const PROGRESS = 'progress';
+
+    /**
+     * proxy: (string|array) Pass a string to specify an HTTP proxy, or an
+     * array to specify different proxies for different protocols (where the
+     * key is the protocol and the value is a proxy string).
+     */
+    const PROXY = 'proxy';
+
+    /**
+     * query: (array|string) Associative array of query string values to add
+     * to the request. This option uses PHP's http_build_query() to create
+     * the string representation. Pass a string value if you need more
+     * control than what this method provides
+     */
+    const QUERY = 'query';
+
+    /**
+     * sink: (resource|string|StreamInterface) Where the data of the
+     * response is written to. Defaults to a PHP temp stream. Providing a
+     * string will write data to a file by the given name.
+     */
+    const SINK = 'sink';
+
+    /**
+     * synchronous: (bool) Set to true to inform HTTP handlers that you intend
+     * on waiting on the response. This can be useful for optimizations. Note
+     * that a promise is still returned if you are using one of the async
+     * client methods.
+     */
+    const SYNCHRONOUS = 'synchronous';
+
+    /**
+     * ssl_key: (array|string) Specify the path to a file containing a private
+     * SSL key in PEM format. If a password is required, then set to an array
+     * containing the path to the SSL key in the first array element followed
+     * by the password required for the certificate in the second element.
+     */
+    const SSL_KEY = 'ssl_key';
+
+    /**
+     * stream: Set to true to attempt to stream a response rather than
+     * download it all up-front.
+     */
+    const STREAM = 'stream';
+
+    /**
+     * verify: (bool|string, default=true) Describes the SSL certificate
+     * verification behavior of a request. Set to true to enable SSL
+     * certificate verification using the system CA bundle when available
+     * (the default). Set to false to disable certificate verification (this
+     * is insecure!). Set to a string to provide the path to a CA bundle on
+     * disk to enable verification using a custom certificate.
+     */
+    const VERIFY = 'verify';
+
+    /**
+     * timeout: (float, default=0) Float describing the timeout of the
+     * request in seconds. Use 0 to wait indefinitely (the default behavior).
+     */
+    const TIMEOUT = 'timeout';
+
+    /**
+     * version: (float) Specifies the HTTP protocol version to attempt to use.
+     */
+    const VERSION = 'version';
+}
diff --git a/core/vendor/guzzlehttp/guzzle/src/RetryMiddleware.php b/core/vendor/guzzlehttp/guzzle/src/RetryMiddleware.php
new file mode 100644
index 000000000..4b95a1474
--- /dev/null
+++ b/core/vendor/guzzlehttp/guzzle/src/RetryMiddleware.php
@@ -0,0 +1,111 @@
+<?php
+namespace GuzzleHttp;
+
+use GuzzleHttp\Promise\PromiseInterface;
+use GuzzleHttp\Promise\RejectedPromise;
+use GuzzleHttp\Psr7;
+use Psr\Http\Message\RequestInterface;
+
+/**
+ * Middleware that retries requests based on the boolean result of
+ * invoking the provided "decider" function.
+ */
+class RetryMiddleware
+{
+    /** @var callable  */
+    private $nextHandler;
+
+    /** @var callable */
+    private $decider;
+
+    /**
+     * @param callable $decider     Function that accepts the number of retries,
+     *                              a request, [response], and [exception] and
+     *                              returns true if the request is to be
+     *                              retried.
+     * @param callable $nextHandler Next handler to invoke.
+     * @param callable $delay       Function that accepts the number of retries
+     *                              and returns the number of milliseconds to
+     *                              delay.
+     */
+    public function __construct(
+        callable $decider,
+        callable $nextHandler,
+        callable $delay = null
+    ) {
+        $this->decider = $decider;
+        $this->nextHandler = $nextHandler;
+        $this->delay = $delay ?: __CLASS__ . '::exponentialDelay';
+    }
+
+    /**
+     * Default exponential backoff delay function.
+     *
+     * @param $retries
+     *
+     * @return int
+     */
+    public static function exponentialDelay($retries)
+    {
+        return (int) pow(2, $retries - 1);
+    }
+
+    /**
+     * @param RequestInterface $request
+     * @param array            $options
+     *
+     * @return PromiseInterface
+     */
+    public function __invoke(RequestInterface $request, array $options)
+    {
+        if (!isset($options['retries'])) {
+            $options['retries'] = 0;
+        }
+
+        $fn = $this->nextHandler;
+        return $fn($request, $options)
+            ->then(
+                $this->onFulfilled($request, $options),
+                $this->onRejected($request, $options)
+            );
+    }
+
+    private function onFulfilled(RequestInterface $req, array $options)
+    {
+        return function ($value) use ($req, $options) {
+            if (!call_user_func(
+                $this->decider,
+                $options['retries'],
+                $req,
+                $value,
+                null
+            )) {
+                return $value;
+            }
+            return $this->doRetry($req, $options);
+        };
+    }
+
+    private function onRejected(RequestInterface $req, array $options)
+    {
+        return function ($reason) use ($req, $options) {
+            if (!call_user_func(
+                $this->decider,
+                $options['retries'],
+                $req,
+                null,
+                $reason
+            )) {
+                return new RejectedPromise($reason);
+            }
+            return $this->doRetry($req, $options);
+        };
+    }
+
+    private function doRetry(RequestInterface $request, array $options)
+    {
+        $options['delay'] = call_user_func($this->delay, ++$options['retries']);
+
+        return $this($request, $options);
+    }
+}
diff --git a/core/vendor/guzzlehttp/guzzle/src/RingBridge.php b/core/vendor/guzzlehttp/guzzle/src/RingBridge.php
deleted file mode 100644
index bc6841d42..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/RingBridge.php
+++ /dev/null
@@ -1,165 +0,0 @@
-<?php
-namespace GuzzleHttp;
-
-use GuzzleHttp\Message\MessageFactoryInterface;
-use GuzzleHttp\Message\RequestInterface;
-use GuzzleHttp\Event\ProgressEvent;
-use GuzzleHttp\Message\Request;
-use GuzzleHttp\Ring\Core;
-use GuzzleHttp\Stream\Stream;
-use GuzzleHttp\Exception\RequestException;
-
-/**
- * Provides the bridge between Guzzle requests and responses and Guzzle Ring.
- */
-class RingBridge
-{
-    /**
-     * Creates a Ring request from a request object.
-     *
-     * This function does not hook up the "then" and "progress" events that
-     * would be required for actually sending a Guzzle request through a
-     * RingPHP handler.
-     *
-     * @param RequestInterface $request Request to convert.
-     *
-     * @return array Converted Guzzle Ring request.
-     */
-    public static function createRingRequest(RequestInterface $request)
-    {
-        $options = $request->getConfig()->toArray();
-        $url = $request->getUrl();
-        // No need to calculate the query string twice (in URL and query).
-        $qs = ($pos = strpos($url, '?')) ? substr($url, $pos + 1) : null;
-
-        return [
-            'scheme'       => $request->getScheme(),
-            'http_method'  => $request->getMethod(),
-            'url'          => $url,
-            'uri'          => $request->getPath(),
-            'headers'      => $request->getHeaders(),
-            'body'         => $request->getBody(),
-            'version'      => $request->getProtocolVersion(),
-            'client'       => $options,
-            'query_string' => $qs,
-            'future'       => isset($options['future']) ? $options['future'] : false
-        ];
-    }
-
-    /**
-     * Creates a Ring request from a request object AND prepares the callbacks.
-     *
-     * @param Transaction $trans Transaction to update.
-     *
-     * @return array Converted Guzzle Ring request.
-     */
-    public static function prepareRingRequest(Transaction $trans)
-    {
-        // Clear out the transaction state when initiating.
-        $trans->exception = null;
-        $request = self::createRingRequest($trans->request);
-
-        // Emit progress events if any progress listeners are registered.
-        if ($trans->request->getEmitter()->hasListeners('progress')) {
-            $emitter = $trans->request->getEmitter();
-            $request['client']['progress'] = function ($a, $b, $c, $d) use ($trans, $emitter) {
-                $emitter->emit('progress', new ProgressEvent($trans, $a, $b, $c, $d));
-            };
-        }
-
-        return $request;
-    }
-
-    /**
-     * Handles the process of processing a response received from a ring
-     * handler. The created response is added to the transaction, and the
-     * transaction stat is set appropriately.
-     *
-     * @param Transaction             $trans          Owns request and response.
-     * @param array                   $response       Ring response array
-     * @param MessageFactoryInterface $messageFactory Creates response objects.
-     */
-    public static function completeRingResponse(
-        Transaction $trans,
-        array $response,
-        MessageFactoryInterface $messageFactory
-    ) {
-        $trans->state = 'complete';
-        $trans->transferInfo = isset($response['transfer_stats'])
-            ? $response['transfer_stats'] : [];
-
-        if (!empty($response['status'])) {
-            $options = [];
-            if (isset($response['version'])) {
-                $options['protocol_version'] = $response['version'];
-            }
-            if (isset($response['reason'])) {
-                $options['reason_phrase'] = $response['reason'];
-            }
-            $trans->response = $messageFactory->createResponse(
-                $response['status'],
-                isset($response['headers']) ? $response['headers'] : [],
-                isset($response['body']) ? $response['body'] : null,
-                $options
-            );
-            if (isset($response['effective_url'])) {
-                $trans->response->setEffectiveUrl($response['effective_url']);
-            }
-        } elseif (empty($response['error'])) {
-            // When nothing was returned, then we need to add an error.
-            $response['error'] = self::getNoRingResponseException($trans->request);
-        }
-
-        if (isset($response['error'])) {
-            $trans->state = 'error';
-            $trans->exception = $response['error'];
-        }
-    }
-
-    /**
-     * Creates a Guzzle request object using a ring request array.
-     *
-     * @param array $request Ring request
-     *
-     * @return Request
-     * @throws \InvalidArgumentException for incomplete requests.
-     */
-    public static function fromRingRequest(array $request)
-    {
-        $options = [];
-        if (isset($request['version'])) {
-            $options['protocol_version'] = $request['version'];
-        }
-
-        if (!isset($request['http_method'])) {
-            throw new \InvalidArgumentException('No http_method');
-        }
-
-        return new Request(
-            $request['http_method'],
-            Core::url($request),
-            isset($request['headers']) ? $request['headers'] : [],
-            isset($request['body']) ? Stream::factory($request['body']) : null,
-            $options
-        );
-    }
-
-    /**
-     * Get an exception that can be used when a RingPHP handler does not
-     * populate a response.
-     *
-     * @param RequestInterface $request
-     *
-     * @return RequestException
-     */
-    public static function getNoRingResponseException(RequestInterface $request)
-    {
-        $message = <<<EOT
-Sending the request did not return a response, exception, or populate the
-transaction with a response. This is most likely due to an incorrectly
-implemented RingPHP handler. If you are simply trying to mock responses,
-then it is recommended to use the GuzzleHttp\Ring\Client\MockHandler.
-EOT;
-        return new RequestException($message, $request);
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Subscriber/Cookie.php b/core/vendor/guzzlehttp/guzzle/src/Subscriber/Cookie.php
deleted file mode 100644
index cacabb66d..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Subscriber/Cookie.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-namespace GuzzleHttp\Subscriber;
-
-use GuzzleHttp\Cookie\CookieJar;
-use GuzzleHttp\Cookie\CookieJarInterface;
-use GuzzleHttp\Event\BeforeEvent;
-use GuzzleHttp\Event\CompleteEvent;
-use GuzzleHttp\Event\RequestEvents;
-use GuzzleHttp\Event\SubscriberInterface;
-
-/**
- * Adds, extracts, and persists cookies between HTTP requests
- */
-class Cookie implements SubscriberInterface
-{
-    /** @var CookieJarInterface */
-    private $cookieJar;
-
-    /**
-     * @param CookieJarInterface $cookieJar Cookie jar used to hold cookies
-     */
-    public function __construct(CookieJarInterface $cookieJar = null)
-    {
-        $this->cookieJar = $cookieJar ?: new CookieJar();
-    }
-
-    public function getEvents()
-    {
-        // Fire the cookie plugin complete event before redirecting
-        return [
-            'before'   => ['onBefore'],
-            'complete' => ['onComplete', RequestEvents::REDIRECT_RESPONSE + 10]
-        ];
-    }
-
-    /**
-     * Get the cookie cookieJar
-     *
-     * @return CookieJarInterface
-     */
-    public function getCookieJar()
-    {
-        return $this->cookieJar;
-    }
-
-    public function onBefore(BeforeEvent $event)
-    {
-        $this->cookieJar->addCookieHeader($event->getRequest());
-    }
-
-    public function onComplete(CompleteEvent $event)
-    {
-        $this->cookieJar->extractCookies(
-            $event->getRequest(),
-            $event->getResponse()
-        );
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Subscriber/History.php b/core/vendor/guzzlehttp/guzzle/src/Subscriber/History.php
deleted file mode 100644
index 5cf06119f..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Subscriber/History.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<?php
-namespace GuzzleHttp\Subscriber;
-
-use GuzzleHttp\Event\CompleteEvent;
-use GuzzleHttp\Event\ErrorEvent;
-use GuzzleHttp\Event\RequestEvents;
-use GuzzleHttp\Event\SubscriberInterface;
-use GuzzleHttp\Message\RequestInterface;
-use GuzzleHttp\Message\ResponseInterface;
-
-/**
- * Maintains a list of requests and responses sent using a request or client
- */
-class History implements SubscriberInterface, \IteratorAggregate, \Countable
-{
-    /** @var int The maximum number of requests to maintain in the history */
-    private $limit;
-
-    /** @var array Requests and responses that have passed through the plugin */
-    private $transactions = [];
-
-    public function __construct($limit = 10)
-    {
-        $this->limit = $limit;
-    }
-
-    public function getEvents()
-    {
-        return [
-            'complete' => ['onComplete', RequestEvents::EARLY],
-            'error'    => ['onError', RequestEvents::EARLY],
-        ];
-    }
-
-    /**
-     * Convert to a string that contains all request and response headers
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        $lines = array();
-        foreach ($this->transactions as $entry) {
-            $response = isset($entry['response']) ? $entry['response'] : '';
-            $lines[] = '> ' . trim($entry['sent_request'])
-                . "\n\n< " . trim($response) . "\n";
-        }
-
-        return implode("\n", $lines);
-    }
-
-    public function onComplete(CompleteEvent $event)
-    {
-        $this->add($event->getRequest(), $event->getResponse());
-    }
-
-    public function onError(ErrorEvent $event)
-    {
-        // Only track when no response is present, meaning this didn't ever
-        // emit a complete event
-        if (!$event->getResponse()) {
-            $this->add($event->getRequest());
-        }
-    }
-
-    /**
-     * Returns an Iterator that yields associative array values where each
-     * associative array contains the following key value pairs:
-     *
-     * - request: Representing the actual request that was received.
-     * - sent_request: A clone of the request that will not be mutated.
-     * - response: The response that was received (if available).
-     *
-     * @return \Iterator
-     */
-    public function getIterator()
-    {
-        return new \ArrayIterator($this->transactions);
-    }
-
-    /**
-     * Get all of the requests sent through the plugin.
-     *
-     * Requests can be modified after they are logged by the history
-     * subscriber. By default this method will return the actual request
-     * instances that were received. Pass true to this method if you wish to
-     * get copies of the requests that represent the request state when it was
-     * initially logged by the history subscriber.
-     *
-     * @param bool $asSent Set to true to get clones of the requests that have
-     *                     not been mutated since the request was received by
-     *                     the history subscriber.
-     *
-     * @return RequestInterface[]
-     */
-    public function getRequests($asSent = false)
-    {
-        return array_map(function ($t) use ($asSent) {
-            return $asSent ? $t['sent_request'] : $t['request'];
-        }, $this->transactions);
-    }
-
-    /**
-     * Get the number of requests in the history
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->transactions);
-    }
-
-    /**
-     * Get the last request sent.
-     *
-     * Requests can be modified after they are logged by the history
-     * subscriber. By default this method will return the actual request
-     * instance that was received. Pass true to this method if you wish to get
-     * a copy of the request that represents the request state when it was
-     * initially logged by the history subscriber.
-     *
-     * @param bool $asSent Set to true to get a clone of the last request that
-     *                     has not been mutated since the request was received
-     *                     by the history subscriber.
-     *
-     * @return RequestInterface
-     */
-    public function getLastRequest($asSent = false)
-    {
-        return $asSent
-            ? end($this->transactions)['sent_request']
-            : end($this->transactions)['request'];
-    }
-
-    /**
-     * Get the last response in the history
-     *
-     * @return ResponseInterface|null
-     */
-    public function getLastResponse()
-    {
-        return end($this->transactions)['response'];
-    }
-
-    /**
-     * Clears the history
-     */
-    public function clear()
-    {
-        $this->transactions = array();
-    }
-
-    /**
-     * Add a request to the history
-     *
-     * @param RequestInterface  $request  Request to add
-     * @param ResponseInterface $response Response of the request
-     */
-    private function add(
-        RequestInterface $request,
-        ResponseInterface $response = null
-    ) {
-        $this->transactions[] = [
-            'request'      => $request,
-            'sent_request' => clone $request,
-            'response'     => $response
-        ];
-        if (count($this->transactions) > $this->limit) {
-            array_shift($this->transactions);
-        }
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Subscriber/HttpError.php b/core/vendor/guzzlehttp/guzzle/src/Subscriber/HttpError.php
deleted file mode 100644
index ed9de5bcc..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Subscriber/HttpError.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-namespace GuzzleHttp\Subscriber;
-
-use GuzzleHttp\Event\CompleteEvent;
-use GuzzleHttp\Event\RequestEvents;
-use GuzzleHttp\Event\SubscriberInterface;
-use GuzzleHttp\Exception\RequestException;
-
-/**
- * Throws exceptions when a 4xx or 5xx response is received
- */
-class HttpError implements SubscriberInterface
-{
-    public function getEvents()
-    {
-        return ['complete' => ['onComplete', RequestEvents::VERIFY_RESPONSE]];
-    }
-
-    /**
-     * Throw a RequestException on an HTTP protocol error
-     *
-     * @param CompleteEvent $event Emitted event
-     * @throws RequestException
-     */
-    public function onComplete(CompleteEvent $event)
-    {
-        $code = (string) $event->getResponse()->getStatusCode();
-        // Throw an exception for an unsuccessful response
-        if ($code[0] >= 4) {
-            throw RequestException::create(
-                $event->getRequest(),
-                $event->getResponse()
-            );
-        }
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Subscriber/Mock.php b/core/vendor/guzzlehttp/guzzle/src/Subscriber/Mock.php
deleted file mode 100644
index 39a3c442d..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Subscriber/Mock.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-namespace GuzzleHttp\Subscriber;
-
-use GuzzleHttp\Event\RequestEvents;
-use GuzzleHttp\Event\SubscriberInterface;
-use GuzzleHttp\Event\BeforeEvent;
-use GuzzleHttp\Exception\RequestException;
-use GuzzleHttp\Message\MessageFactory;
-use GuzzleHttp\Message\ResponseInterface;
-
-/**
- * Queues mock responses or exceptions and delivers mock responses or
- * exceptions in a fifo order.
- */
-class Mock implements SubscriberInterface, \Countable
-{
-    /** @var array Array of mock responses / exceptions */
-    private $queue = [];
-
-    /** @var bool Whether or not to consume an entity body when mocking */
-    private $readBodies;
-
-    /** @var MessageFactory */
-    private $factory;
-
-    /**
-     * @param array $items      Array of responses or exceptions to queue
-     * @param bool  $readBodies Set to false to not consume the entity body of
-     *                          a request when a mock is served.
-     */
-    public function __construct(array $items = [], $readBodies = true)
-    {
-        $this->factory = new MessageFactory();
-        $this->readBodies = $readBodies;
-        $this->addMultiple($items);
-    }
-
-    public function getEvents()
-    {
-        // Fire the event last, after signing
-        return ['before' => ['onBefore', RequestEvents::SIGN_REQUEST - 10]];
-    }
-
-    /**
-     * @throws \OutOfBoundsException|\Exception
-     */
-    public function onBefore(BeforeEvent $event)
-    {
-        if (!$item = array_shift($this->queue)) {
-            throw new \OutOfBoundsException('Mock queue is empty');
-        } elseif ($item instanceof RequestException) {
-            throw $item;
-        }
-
-        // Emulate reading a response body
-        $request = $event->getRequest();
-        if ($this->readBodies && $request->getBody()) {
-            while (!$request->getBody()->eof()) {
-                $request->getBody()->read(8096);
-            }
-        }
-
-        $event->intercept($item);
-    }
-
-    public function count()
-    {
-        return count($this->queue);
-    }
-
-    /**
-     * Add a response to the end of the queue
-     *
-     * @param string|ResponseInterface $response Response or path to response file
-     *
-     * @return self
-     * @throws \InvalidArgumentException if a string or Response is not passed
-     */
-    public function addResponse($response)
-    {
-        if (is_string($response)) {
-            $response = file_exists($response)
-                ? $this->factory->fromMessage(file_get_contents($response))
-                : $this->factory->fromMessage($response);
-        } elseif (!($response instanceof ResponseInterface)) {
-            throw new \InvalidArgumentException('Response must a message '
-                . 'string, response object, or path to a file');
-        }
-
-        $this->queue[] = $response;
-
-        return $this;
-    }
-
-    /**
-     * Add an exception to the end of the queue
-     *
-     * @param RequestException $e Exception to throw when the request is executed
-     *
-     * @return self
-     */
-    public function addException(RequestException $e)
-    {
-        $this->queue[] = $e;
-
-        return $this;
-    }
-
-    /**
-     * Add multiple items to the queue
-     *
-     * @param array $items Items to add
-     */
-    public function addMultiple(array $items)
-    {
-        foreach ($items as $item) {
-            if ($item instanceof RequestException) {
-                $this->addException($item);
-            } else {
-                $this->addResponse($item);
-            }
-        }
-    }
-
-    /**
-     * Clear the queue
-     */
-    public function clearQueue()
-    {
-        $this->queue = [];
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Subscriber/Prepare.php b/core/vendor/guzzlehttp/guzzle/src/Subscriber/Prepare.php
deleted file mode 100644
index b5ed4e260..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Subscriber/Prepare.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-namespace GuzzleHttp\Subscriber;
-
-use GuzzleHttp\Event\BeforeEvent;
-use GuzzleHttp\Event\RequestEvents;
-use GuzzleHttp\Event\SubscriberInterface;
-use GuzzleHttp\Message\AppliesHeadersInterface;
-use GuzzleHttp\Message\RequestInterface;
-use GuzzleHttp\Mimetypes;
-use GuzzleHttp\Stream\StreamInterface;
-
-/**
- * Prepares requests with a body before sending
- *
- * **Request Options**
- *
- * - expect: Set to true to enable the "Expect: 100-Continue" header for a
- *   request that send a body. Set to false to disable "Expect: 100-Continue".
- *   Set to a number so that the size of the payload must be greater than the
- *   number in order to send the Expect header. Setting to a number will send
- *   the Expect header for all requests in which the size of the payload cannot
- *   be determined or where the body is not rewindable.
- */
-class Prepare implements SubscriberInterface
-{
-    public function getEvents()
-    {
-        return ['before' => ['onBefore', RequestEvents::PREPARE_REQUEST]];
-    }
-
-    public function onBefore(BeforeEvent $event)
-    {
-        $request = $event->getRequest();
-
-        // Set the appropriate Content-Type for a request if one is not set and
-        // there are form fields
-        if (!($body = $request->getBody())) {
-            return;
-        }
-
-        $this->addContentLength($request, $body);
-
-        if ($body instanceof AppliesHeadersInterface) {
-            // Synchronize the body with the request headers
-            $body->applyRequestHeaders($request);
-        } elseif (!$request->hasHeader('Content-Type')) {
-            $this->addContentType($request, $body);
-        }
-
-        $this->addExpectHeader($request, $body);
-    }
-
-    private function addContentType(
-        RequestInterface $request,
-        StreamInterface $body
-    ) {
-        if (!($uri = $body->getMetadata('uri'))) {
-            return;
-        }
-
-        // Guess the content-type based on the stream's "uri" metadata value.
-        // The file extension is used to determine the appropriate mime-type.
-        if ($contentType = Mimetypes::getInstance()->fromFilename($uri)) {
-            $request->setHeader('Content-Type', $contentType);
-        }
-    }
-
-    private function addContentLength(
-        RequestInterface $request,
-        StreamInterface $body
-    ) {
-        // Set the Content-Length header if it can be determined, and never
-        // send a Transfer-Encoding: chunked and Content-Length header in
-        // the same request.
-        if ($request->hasHeader('Content-Length')) {
-            // Remove transfer-encoding if content-length is set.
-            $request->removeHeader('Transfer-Encoding');
-            return;
-        }
-
-        if ($request->hasHeader('Transfer-Encoding')) {
-            return;
-        }
-
-        if (null !== ($size = $body->getSize())) {
-            $request->setHeader('Content-Length', $size);
-            $request->removeHeader('Transfer-Encoding');
-        } elseif ('1.1' == $request->getProtocolVersion()) {
-            // Use chunked Transfer-Encoding if there is no determinable
-            // content-length header and we're using HTTP/1.1.
-            $request->setHeader('Transfer-Encoding', 'chunked');
-            $request->removeHeader('Content-Length');
-        }
-    }
-
-    private function addExpectHeader(
-        RequestInterface $request,
-        StreamInterface $body
-    ) {
-        // Determine if the Expect header should be used
-        if ($request->hasHeader('Expect')) {
-            return;
-        }
-
-        $expect = $request->getConfig()['expect'];
-
-        // Return if disabled or if you're not using HTTP/1.1
-        if ($expect === false || $request->getProtocolVersion() !== '1.1') {
-            return;
-        }
-
-        // The expect header is unconditionally enabled
-        if ($expect === true) {
-            $request->setHeader('Expect', '100-Continue');
-            return;
-        }
-
-        // By default, send the expect header when the payload is > 1mb
-        if ($expect === null) {
-            $expect = 1048576;
-        }
-
-        // Always add if the body cannot be rewound, the size cannot be
-        // determined, or the size is greater than the cutoff threshold
-        $size = $body->getSize();
-        if ($size === null || $size >= (int) $expect || !$body->isSeekable()) {
-            $request->setHeader('Expect', '100-Continue');
-        }
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Subscriber/Redirect.php b/core/vendor/guzzlehttp/guzzle/src/Subscriber/Redirect.php
deleted file mode 100644
index ff992268b..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Subscriber/Redirect.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-namespace GuzzleHttp\Subscriber;
-
-use GuzzleHttp\Event\CompleteEvent;
-use GuzzleHttp\Event\RequestEvents;
-use GuzzleHttp\Event\SubscriberInterface;
-use GuzzleHttp\Exception\BadResponseException;
-use GuzzleHttp\Exception\CouldNotRewindStreamException;
-use GuzzleHttp\Exception\TooManyRedirectsException;
-use GuzzleHttp\Message\RequestInterface;
-use GuzzleHttp\Message\ResponseInterface;
-use GuzzleHttp\Url;
-
-/**
- * Subscriber used to implement HTTP redirects.
- *
- * **Request options**
- *
- * - redirect: Associative array containing the 'max', 'strict', and 'referer'
- *   keys.
- *
- *   - max: Maximum number of redirects allowed per-request
- *   - strict: You can use strict redirects by setting this value to ``true``.
- *     Strict redirects adhere to strict RFC compliant redirection (e.g.,
- *     redirect POST with POST) vs doing what most clients do (e.g., redirect
- *     POST request with a GET request).
- *   - referer: Set to true to automatically add the "Referer" header when a
- *     redirect request is sent.
- *   - protocols: Array of allowed protocols. Defaults to 'http' and 'https'.
- *     When a redirect attempts to utilize a protocol that is not white listed,
- *     an exception is thrown.
- */
-class Redirect implements SubscriberInterface
-{
-    public function getEvents()
-    {
-        return ['complete' => ['onComplete', RequestEvents::REDIRECT_RESPONSE]];
-    }
-
-    /**
-     * Rewind the entity body of the request if needed
-     *
-     * @param RequestInterface $redirectRequest
-     * @throws CouldNotRewindStreamException
-     */
-    public static function rewindEntityBody(RequestInterface $redirectRequest)
-    {
-        // Rewind the entity body of the request if needed
-        if ($body = $redirectRequest->getBody()) {
-            // Only rewind the body if some of it has been read already, and
-            // throw an exception if the rewind fails
-            if ($body->tell() && !$body->seek(0)) {
-                throw new CouldNotRewindStreamException(
-                    'Unable to rewind the non-seekable request body after redirecting',
-                    $redirectRequest
-                );
-            }
-        }
-    }
-
-    /**
-     * Called when a request receives a redirect response
-     *
-     * @param CompleteEvent $event Event emitted
-     * @throws TooManyRedirectsException
-     */
-    public function onComplete(CompleteEvent $event)
-    {
-        $response = $event->getResponse();
-
-        if (substr($response->getStatusCode(), 0, 1) != '3'
-            || !$response->hasHeader('Location')
-        ) {
-            return;
-        }
-
-        $request = $event->getRequest();
-        $config = $request->getConfig();
-
-        // Increment the redirect and initialize the redirect state.
-        if ($redirectCount = $config['redirect_count']) {
-            $config['redirect_count'] = ++$redirectCount;
-        } else {
-            $config['redirect_scheme'] = $request->getScheme();
-            $config['redirect_count'] = $redirectCount = 1;
-        }
-
-        $max = $config->getPath('redirect/max') ?: 5;
-
-        if ($redirectCount > $max) {
-            throw new TooManyRedirectsException(
-                "Will not follow more than {$redirectCount} redirects",
-                $request
-            );
-        }
-
-        $this->modifyRedirectRequest($request, $response);
-        $event->retry();
-    }
-
-    private function modifyRedirectRequest(
-        RequestInterface $request,
-        ResponseInterface $response
-    ) {
-        $config = $request->getConfig();
-        $protocols = $config->getPath('redirect/protocols') ?: ['http', 'https'];
-
-        // Use a GET request if this is an entity enclosing request and we are
-        // not forcing RFC compliance, but rather emulating what all browsers
-        // would do.
-        $statusCode = $response->getStatusCode();
-        if ($statusCode == 303 ||
-            ($statusCode <= 302 && $request->getBody() && !$config->getPath('redirect/strict'))
-        ) {
-            $request->setMethod('GET');
-            $request->setBody(null);
-        }
-
-        $previousUrl = $request->getUrl();
-        $this->setRedirectUrl($request, $response, $protocols);
-        $this->rewindEntityBody($request);
-
-        // Add the Referer header if it is told to do so and only
-        // add the header if we are not redirecting from https to http.
-        if ($config->getPath('redirect/referer')
-            && ($request->getScheme() == 'https' || $request->getScheme() == $config['redirect_scheme'])
-        ) {
-            $url = Url::fromString($previousUrl);
-            $url->setUsername(null);
-            $url->setPassword(null);
-            $request->setHeader('Referer', (string) $url);
-        } else {
-            $request->removeHeader('Referer');
-        }
-    }
-
-    /**
-     * Set the appropriate URL on the request based on the location header
-     *
-     * @param RequestInterface  $request
-     * @param ResponseInterface $response
-     * @param array             $protocols
-     */
-    private function setRedirectUrl(
-        RequestInterface $request,
-        ResponseInterface $response,
-        array $protocols
-    ) {
-        $location = $response->getHeader('Location');
-        $location = Url::fromString($location);
-
-        // Combine location with the original URL if it is not absolute.
-        if (!$location->isAbsolute()) {
-            $originalUrl = Url::fromString($request->getUrl());
-            // Remove query string parameters and just take what is present on
-            // the redirect Location header
-            $originalUrl->getQuery()->clear();
-            $location = $originalUrl->combine($location);
-        }
-
-        // Ensure that the redirect URL is allowed based on the protocols.
-        if (!in_array($location->getScheme(), $protocols)) {
-            throw new BadResponseException(
-                sprintf(
-                    'Redirect URL, %s, does not use one of the allowed redirect protocols: %s',
-                    $location,
-                    implode(', ', $protocols)
-                ),
-                $request,
-                $response
-            );
-        }
-
-        $request->setUrl($location);
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/ToArrayInterface.php b/core/vendor/guzzlehttp/guzzle/src/ToArrayInterface.php
deleted file mode 100644
index d57c0229a..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/ToArrayInterface.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-namespace GuzzleHttp;
-
-/**
- * An object that can be represented as an array
- */
-interface ToArrayInterface
-{
-    /**
-     * Get the array representation of an object
-     *
-     * @return array
-     */
-    public function toArray();
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Transaction.php b/core/vendor/guzzlehttp/guzzle/src/Transaction.php
deleted file mode 100644
index 30a3f9469..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Transaction.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-namespace GuzzleHttp;
-
-use GuzzleHttp\Message\RequestInterface;
-use GuzzleHttp\Message\ResponseInterface;
-
-/**
- * Represents the relationship between a client, request, and response.
- *
- * You can access the request, response, and client using their corresponding
- * public properties.
- */
-class Transaction
-{
-    /**
-     * HTTP client used to transfer the request.
-     *
-     * @var ClientInterface
-     */
-    public $client;
-
-    /**
-     * The request that is being sent.
-     *
-     * @var RequestInterface
-     */
-    public $request;
-
-    /**
-     * The response associated with the transaction. A response will not be
-     * present when a networking error occurs or an error occurs before sending
-     * the request.
-     *
-     * @var ResponseInterface|null
-     */
-    public $response;
-
-    /**
-     * Exception associated with the transaction. If this exception is present
-     * when processing synchronous or future commands, then it is thrown. When
-     * intercepting a failed transaction, you MUST set this value to null in
-     * order to prevent the exception from being thrown.
-     *
-     * @var \Exception
-     */
-    public $exception;
-
-    /**
-     * Associative array of handler specific transfer statistics and custom
-     * key value pair information. When providing similar information, handlers
-     * should follow the same key value pair naming conventions as PHP's
-     * curl_getinfo() (http://php.net/manual/en/function.curl-getinfo.php).
-     *
-     * @var array
-     */
-    public $transferInfo = [];
-
-    /**
-     * The number of transaction retries.
-     *
-     * @var int
-     */
-    public $retries = 0;
-
-    /**
-     * The transaction's current state.
-     *
-     * @var string
-     */
-    public $state;
-
-    /**
-     * Whether or not this is a future transaction. This value should not be
-     * changed after the future is constructed.
-     *
-     * @var bool
-     */
-    public $future;
-
-    /**
-     * The number of state transitions that this transaction has been through.
-     *
-     * @var int
-     * @internal This is for internal use only. If you modify this, then you
-     *           are asking for trouble.
-     */
-    public $_transitionCount = 0;
-
-    /**
-     * @param ClientInterface  $client  Client that is used to send the requests
-     * @param RequestInterface $request Request to send
-     * @param bool             $future  Whether or not this is a future request.
-     */
-    public function __construct(
-        ClientInterface $client,
-        RequestInterface $request,
-        $future = false
-    ) {
-        $this->client = $client;
-        $this->request = $request;
-        $this->_future = $future;
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Url.php b/core/vendor/guzzlehttp/guzzle/src/Url.php
deleted file mode 100644
index a81bad2f0..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Url.php
+++ /dev/null
@@ -1,595 +0,0 @@
-<?php
-namespace GuzzleHttp;
-
-use GuzzleHttp\Ring\Core;
-
-/**
- * Parses and generates URLs based on URL parts
- */
-class Url
-{
-    private $scheme;
-    private $host;
-    private $port;
-    private $username;
-    private $password;
-    private $path = '';
-    private $fragment;
-    private static $defaultPorts = ['http' => 80, 'https' => 443, 'ftp' => 21];
-    private static $pathPattern = '/[^a-zA-Z0-9\-\._~!\$&\'\(\)\*\+,;=%:@\/]+|%(?![A-Fa-f0-9]{2})/';
-    private static $queryPattern = '/[^a-zA-Z0-9\-\._~!\$\'\(\)\*\+,;%:@\/\?=&]+|%(?![A-Fa-f0-9]{2})/';
-    /** @var Query|string Query part of the URL */
-    private $query;
-
-    /**
-     * Factory method to create a new URL from a URL string
-     *
-     * @param string $url Full URL used to create a Url object
-     *
-     * @return Url
-     * @throws \InvalidArgumentException
-     */
-    public static function fromString($url)
-    {
-        static $defaults = ['scheme' => null, 'host' => null,
-            'path' => null, 'port' => null, 'query' => null,
-            'user' => null, 'pass' => null, 'fragment' => null];
-
-        if (false === ($parts = parse_url($url))) {
-            throw new \InvalidArgumentException('Unable to parse malformed '
-                . 'url: ' . $url);
-        }
-
-        $parts += $defaults;
-
-        // Convert the query string into a Query object
-        if ($parts['query'] || 0 !== strlen($parts['query'])) {
-            $parts['query'] = Query::fromString($parts['query']);
-        }
-
-        return new static($parts['scheme'], $parts['host'], $parts['user'],
-            $parts['pass'], $parts['port'], $parts['path'], $parts['query'],
-            $parts['fragment']);
-    }
-
-    /**
-     * Build a URL from parse_url parts. The generated URL will be a relative
-     * URL if a scheme or host are not provided.
-     *
-     * @param array $parts Array of parse_url parts
-     *
-     * @return string
-     */
-    public static function buildUrl(array $parts)
-    {
-        $url = $scheme = '';
-
-        if (!empty($parts['scheme'])) {
-            $scheme = $parts['scheme'];
-            $url .= $scheme . ':';
-        }
-
-        if (!empty($parts['host'])) {
-            $url .= '//';
-            if (isset($parts['user'])) {
-                $url .= $parts['user'];
-                if (isset($parts['pass'])) {
-                    $url .= ':' . $parts['pass'];
-                }
-                $url .=  '@';
-            }
-
-            $url .= $parts['host'];
-
-            // Only include the port if it is not the default port of the scheme
-            if (isset($parts['port']) &&
-                (!isset(self::$defaultPorts[$scheme]) ||
-                 $parts['port'] != self::$defaultPorts[$scheme])
-            ) {
-                $url .= ':' . $parts['port'];
-            }
-        }
-
-        // Add the path component if present
-        if (isset($parts['path']) && strlen($parts['path'])) {
-            // Always ensure that the path begins with '/' if set and something
-            // is before the path
-            if (!empty($parts['host']) && $parts['path'][0] != '/') {
-                $url .= '/';
-            }
-            $url .= $parts['path'];
-        }
-
-        // Add the query string if present
-        if (isset($parts['query'])) {
-            $queryStr = (string) $parts['query'];
-            if ($queryStr || $queryStr === '0') {
-                $url .= '?' . $queryStr;
-            }
-        }
-
-        // Ensure that # is only added to the url if fragment contains anything.
-        if (isset($parts['fragment'])) {
-            $url .= '#' . $parts['fragment'];
-        }
-
-        return $url;
-    }
-
-    /**
-     * Create a new URL from URL parts
-     *
-     * @param string             $scheme   Scheme of the URL
-     * @param string             $host     Host of the URL
-     * @param string             $username Username of the URL
-     * @param string             $password Password of the URL
-     * @param int                $port     Port of the URL
-     * @param string             $path     Path of the URL
-     * @param Query|array|string $query    Query string of the URL
-     * @param string             $fragment Fragment of the URL
-     */
-    public function __construct(
-        $scheme,
-        $host,
-        $username = null,
-        $password = null,
-        $port = null,
-        $path = null,
-        $query = null,
-        $fragment = null
-    ) {
-        $this->scheme = $scheme;
-        $this->host = $host;
-        $this->port = $port;
-        $this->username = $username;
-        $this->password = $password;
-        $this->fragment = $fragment;
-
-        if ($query) {
-            $this->setQuery($query);
-        }
-
-        $this->setPath($path);
-    }
-
-    /**
-     * Clone the URL
-     */
-    public function __clone()
-    {
-        if ($this->query instanceof Query) {
-            $this->query = clone $this->query;
-        }
-    }
-
-    /**
-     * Returns the URL as a URL string
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return static::buildUrl($this->getParts());
-    }
-
-    /**
-     * Get the parts of the URL as an array
-     *
-     * @return array
-     */
-    public function getParts()
-    {
-        return array(
-            'scheme'   => $this->scheme,
-            'user'     => $this->username,
-            'pass'     => $this->password,
-            'host'     => $this->host,
-            'port'     => $this->port,
-            'path'     => $this->path,
-            'query'    => $this->query,
-            'fragment' => $this->fragment,
-        );
-    }
-
-    /**
-     * Set the host of the request.
-     *
-     * @param string $host Host to set (e.g. www.yahoo.com, yahoo.com)
-     *
-     * @return Url
-     */
-    public function setHost($host)
-    {
-        if (strpos($host, ':') === false) {
-            $this->host = $host;
-        } else {
-            list($host, $port) = explode(':', $host);
-            $this->host = $host;
-            $this->setPort($port);
-        }
-    }
-
-    /**
-     * Get the host part of the URL
-     *
-     * @return string
-     */
-    public function getHost()
-    {
-        return $this->host;
-    }
-
-    /**
-     * Set the scheme part of the URL (http, https, ftp, etc.)
-     *
-     * @param string $scheme Scheme to set
-     */
-    public function setScheme($scheme)
-    {
-        // Remove the default port if one is specified
-        if ($this->port
-            && isset(self::$defaultPorts[$this->scheme])
-            && self::$defaultPorts[$this->scheme] == $this->port
-        ) {
-            $this->port = null;
-        }
-
-        $this->scheme = $scheme;
-    }
-
-    /**
-     * Get the scheme part of the URL
-     *
-     * @return string
-     */
-    public function getScheme()
-    {
-        return $this->scheme;
-    }
-
-    /**
-     * Set the port part of the URL
-     *
-     * @param int $port Port to set
-     */
-    public function setPort($port)
-    {
-        $this->port = $port;
-    }
-
-    /**
-     * Get the port part of the URl.
-     *
-     * If no port was set, this method will return the default port for the
-     * scheme of the URI.
-     *
-     * @return int|null
-     */
-    public function getPort()
-    {
-        if ($this->port) {
-            return $this->port;
-        } elseif (isset(self::$defaultPorts[$this->scheme])) {
-            return self::$defaultPorts[$this->scheme];
-        }
-
-        return null;
-    }
-
-    /**
-     * Set the path part of the URL.
-     *
-     * The provided URL is URL encoded as necessary.
-     *
-     * @param string $path Path string to set
-     */
-    public function setPath($path)
-    {
-        $this->path = self::encodePath($path);
-    }
-
-    /**
-     * Removes dot segments from a URL
-     * @link http://tools.ietf.org/html/rfc3986#section-5.2.4
-     */
-    public function removeDotSegments()
-    {
-        static $noopPaths = ['' => true, '/' => true, '*' => true];
-        static $ignoreSegments = ['.' => true, '..' => true];
-
-        if (isset($noopPaths[$this->path])) {
-            return;
-        }
-
-        $results = [];
-        $segments = $this->getPathSegments();
-        foreach ($segments as $segment) {
-            if ($segment == '..') {
-                array_pop($results);
-            } elseif (!isset($ignoreSegments[$segment])) {
-                $results[] = $segment;
-            }
-        }
-
-        $newPath = implode('/', $results);
-
-        // Add the leading slash if necessary
-        if (substr($this->path, 0, 1) === '/' &&
-            substr($newPath, 0, 1) !== '/'
-        ) {
-            $newPath = '/' . $newPath;
-        }
-
-        // Add the trailing slash if necessary
-        if ($newPath != '/' && isset($ignoreSegments[end($segments)])) {
-            $newPath .= '/';
-        }
-
-        $this->path = $newPath;
-    }
-
-    /**
-     * Add a relative path to the currently set path.
-     *
-     * @param string $relativePath Relative path to add
-     */
-    public function addPath($relativePath)
-    {
-        if ($relativePath != '/' &&
-            is_string($relativePath) &&
-            strlen($relativePath) > 0
-        ) {
-            // Add a leading slash if needed
-            if ($relativePath[0] !== '/' &&
-                substr($this->path, -1, 1) !== '/'
-            ) {
-                $relativePath = '/' . $relativePath;
-            }
-
-            $this->setPath($this->path . $relativePath);
-        }
-    }
-
-    /**
-     * Get the path part of the URL
-     *
-     * @return string
-     */
-    public function getPath()
-    {
-        return $this->path;
-    }
-
-    /**
-     * Get the path segments of the URL as an array
-     *
-     * @return array
-     */
-    public function getPathSegments()
-    {
-        return explode('/', $this->path);
-    }
-
-    /**
-     * Set the password part of the URL
-     *
-     * @param string $password Password to set
-     */
-    public function setPassword($password)
-    {
-        $this->password = $password;
-    }
-
-    /**
-     * Get the password part of the URL
-     *
-     * @return null|string
-     */
-    public function getPassword()
-    {
-        return $this->password;
-    }
-
-    /**
-     * Set the username part of the URL
-     *
-     * @param string $username Username to set
-     */
-    public function setUsername($username)
-    {
-        $this->username = $username;
-    }
-
-    /**
-     * Get the username part of the URl
-     *
-     * @return null|string
-     */
-    public function getUsername()
-    {
-        return $this->username;
-    }
-
-    /**
-     * Get the query part of the URL as a Query object
-     *
-     * @return Query
-     */
-    public function getQuery()
-    {
-        // Convert the query string to a query object if not already done.
-        if (!$this->query instanceof Query) {
-            $this->query = $this->query === null
-                ? new Query()
-                : Query::fromString($this->query);
-        }
-
-        return $this->query;
-    }
-
-    /**
-     * Set the query part of the URL.
-     *
-     * You may provide a query string as a string and pass $rawString as true
-     * to provide a query string that is not parsed until a call to getQuery()
-     * is made. Setting a raw query string will still encode invalid characters
-     * in a query string.
-     *
-     * @param Query|string|array $query Query string value to set. Can
-     *     be a string that will be parsed into a Query object, an array
-     *     of key value pairs, or a Query object.
-     * @param bool $rawString Set to true when providing a raw query string.
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function setQuery($query, $rawString = false)
-    {
-        if ($query instanceof Query) {
-            $this->query = $query;
-        } elseif (is_string($query)) {
-            if (!$rawString) {
-                $this->query = Query::fromString($query);
-            } else {
-                // Ensure the query does not have illegal characters.
-                $this->query = preg_replace_callback(
-                    self::$queryPattern,
-                    [__CLASS__, 'encodeMatch'],
-                    $query
-                );
-            }
-
-        } elseif (is_array($query)) {
-            $this->query = new Query($query);
-        } else {
-            throw new \InvalidArgumentException('Query must be a Query, '
-                . 'array, or string. Got ' . Core::describeType($query));
-        }
-    }
-
-    /**
-     * Get the fragment part of the URL
-     *
-     * @return null|string
-     */
-    public function getFragment()
-    {
-        return $this->fragment;
-    }
-
-    /**
-     * Set the fragment part of the URL
-     *
-     * @param string $fragment Fragment to set
-     */
-    public function setFragment($fragment)
-    {
-        $this->fragment = $fragment;
-    }
-
-    /**
-     * Check if this is an absolute URL
-     *
-     * @return bool
-     */
-    public function isAbsolute()
-    {
-        return $this->scheme && $this->host;
-    }
-
-    /**
-     * Combine the URL with another URL and return a new URL instance.
-     *
-     * Follows the rules specific in RFC 3986 section 5.4.
-     *
-     * @param string $url Relative URL to combine with
-     *
-     * @return Url
-     * @throws \InvalidArgumentException
-     * @link http://tools.ietf.org/html/rfc3986#section-5.4
-     */
-    public function combine($url)
-    {
-        $url = static::fromString($url);
-
-        // Use the more absolute URL as the base URL
-        if (!$this->isAbsolute() && $url->isAbsolute()) {
-            $url = $url->combine($this);
-        }
-
-        $parts = $url->getParts();
-
-        // Passing a URL with a scheme overrides everything
-        if ($parts['scheme']) {
-            return clone $url;
-        }
-
-        // Setting a host overrides the entire rest of the URL
-        if ($parts['host']) {
-            return new static(
-                $this->scheme,
-                $parts['host'],
-                $parts['user'],
-                $parts['pass'],
-                $parts['port'],
-                $parts['path'],
-                $parts['query'] instanceof Query
-                    ? clone $parts['query']
-                    : $parts['query'],
-                $parts['fragment']
-            );
-        }
-
-        if (!$parts['path'] && $parts['path'] !== '0') {
-            // The relative URL has no path, so check if it is just a query
-            $path = $this->path ?: '';
-            $query = $parts['query'] ?: $this->query;
-        } else {
-            $query = $parts['query'];
-            if ($parts['path'][0] == '/' || !$this->path) {
-                // Overwrite the existing path if the rel path starts with "/"
-                $path = $parts['path'];
-            } else {
-                // If the relative URL does not have a path or the base URL
-                // path does not end in a "/" then overwrite the existing path
-                // up to the last "/"
-                $path = substr($this->path, 0, strrpos($this->path, '/') + 1) . $parts['path'];
-            }
-        }
-
-        $result = new self(
-            $this->scheme,
-            $this->host,
-            $this->username,
-            $this->password,
-            $this->port,
-            $path,
-            $query instanceof Query ? clone $query : $query,
-            $parts['fragment']
-        );
-
-        if ($path) {
-            $result->removeDotSegments();
-        }
-
-        return $result;
-    }
-
-    /**
-     * Encodes the path part of a URL without double-encoding percent-encoded
-     * key value pairs.
-     *
-     * @param string $path Path to encode
-     *
-     * @return string
-     */
-    public static function encodePath($path)
-    {
-        static $cb = [__CLASS__, 'encodeMatch'];
-        return preg_replace_callback(self::$pathPattern, $cb, $path);
-    }
-
-    private static function encodeMatch(array $match)
-    {
-        return rawurlencode($match[0]);
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/Utils.php b/core/vendor/guzzlehttp/guzzle/src/Utils.php
deleted file mode 100644
index 285fe30ba..000000000
--- a/core/vendor/guzzlehttp/guzzle/src/Utils.php
+++ /dev/null
@@ -1,145 +0,0 @@
-<?php
-namespace GuzzleHttp;
-
-/**
- * Utility methods used throughout Guzzle.
- */
-final class Utils
-{
-    /**
-     * Gets a value from an array using a path syntax to retrieve nested data.
-     *
-     * This method does not allow for keys that contain "/". You must traverse
-     * the array manually or using something more advanced like JMESPath to
-     * work with keys that contain "/".
-     *
-     *     // Get the bar key of a set of nested arrays.
-     *     // This is equivalent to $collection['foo']['baz']['bar'] but won't
-     *     // throw warnings for missing keys.
-     *     GuzzleHttp\get_path($data, 'foo/baz/bar');
-     *
-     * @param array  $data Data to retrieve values from
-     * @param string $path Path to traverse and retrieve a value from
-     *
-     * @return mixed|null
-     */
-    public static function getPath($data, $path)
-    {
-        $path = explode('/', $path);
-
-        while (null !== ($part = array_shift($path))) {
-            if (!is_array($data) || !isset($data[$part])) {
-                return null;
-            }
-            $data = $data[$part];
-        }
-
-        return $data;
-    }
-
-    /**
-     * Set a value in a nested array key. Keys will be created as needed to set
-     * the value.
-     *
-     * This function does not support keys that contain "/" or "[]" characters
-     * because these are special tokens used when traversing the data structure.
-     * A value may be prepended to an existing array by using "[]" as the final
-     * key of a path.
-     *
-     *     GuzzleHttp\get_path($data, 'foo/baz'); // null
-     *     GuzzleHttp\set_path($data, 'foo/baz/[]', 'a');
-     *     GuzzleHttp\set_path($data, 'foo/baz/[]', 'b');
-     *     GuzzleHttp\get_path($data, 'foo/baz');
-     *     // Returns ['a', 'b']
-     *
-     * @param array  $data  Data to modify by reference
-     * @param string $path  Path to set
-     * @param mixed  $value Value to set at the key
-     *
-     * @throws \RuntimeException when trying to setPath using a nested path
-     *     that travels through a scalar value.
-     */
-    public static function setPath(&$data, $path, $value)
-    {
-        $current =& $data;
-        $queue = explode('/', $path);
-        while (null !== ($key = array_shift($queue))) {
-            if (!is_array($current)) {
-                throw new \RuntimeException("Trying to setPath {$path}, but "
-                    . "{$key} is set and is not an array");
-            } elseif (!$queue) {
-                if ($key == '[]') {
-                    $current[] = $value;
-                } else {
-                    $current[$key] = $value;
-                }
-            } elseif (isset($current[$key])) {
-                $current =& $current[$key];
-            } else {
-                $current[$key] = [];
-                $current =& $current[$key];
-            }
-        }
-    }
-
-    /**
-     * Expands a URI template
-     *
-     * @param string $template  URI template
-     * @param array  $variables Template variables
-     *
-     * @return string
-     */
-    public static function uriTemplate($template, array $variables)
-    {
-        if (function_exists('\\uri_template')) {
-            return \uri_template($template, $variables);
-        }
-
-        static $uriTemplate;
-        if (!$uriTemplate) {
-            $uriTemplate = new UriTemplate();
-        }
-
-        return $uriTemplate->expand($template, $variables);
-    }
-
-    /**
-     * Wrapper for JSON decode that implements error detection with helpful
-     * error messages.
-     *
-     * @param string $json    JSON data to parse
-     * @param bool $assoc     When true, returned objects will be converted
-     *                        into associative arrays.
-     * @param int    $depth   User specified recursion depth.
-     * @param int    $options Bitmask of JSON decode options.
-     *
-     * @return mixed
-     * @throws \InvalidArgumentException if the JSON cannot be parsed.
-     * @link http://www.php.net/manual/en/function.json-decode.php
-     */
-    public static function jsonDecode($json, $assoc = false, $depth = 512, $options = 0)
-    {
-        static $jsonErrors = [
-            JSON_ERROR_DEPTH => 'JSON_ERROR_DEPTH - Maximum stack depth exceeded',
-            JSON_ERROR_STATE_MISMATCH => 'JSON_ERROR_STATE_MISMATCH - Underflow or the modes mismatch',
-            JSON_ERROR_CTRL_CHAR => 'JSON_ERROR_CTRL_CHAR - Unexpected control character found',
-            JSON_ERROR_SYNTAX => 'JSON_ERROR_SYNTAX - Syntax error, malformed JSON',
-            JSON_ERROR_UTF8 => 'JSON_ERROR_UTF8 - Malformed UTF-8 characters, possibly incorrectly encoded'
-        ];
-
-        $data = \json_decode($json, $assoc, $depth, $options);
-
-        if (JSON_ERROR_NONE !== json_last_error()) {
-            $last = json_last_error();
-            throw new \InvalidArgumentException(
-                'Unable to parse JSON data: '
-                . (isset($jsonErrors[$last])
-                    ? $jsonErrors[$last]
-                    : 'Unknown error')
-            );
-        }
-
-        return $data;
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/src/functions.php b/core/vendor/guzzlehttp/guzzle/src/functions.php
new file mode 100644
index 000000000..f5ff1fcb2
--- /dev/null
+++ b/core/vendor/guzzlehttp/guzzle/src/functions.php
@@ -0,0 +1,225 @@
+<?php
+namespace GuzzleHttp;
+
+use GuzzleHttp\Handler\CurlHandler;
+use GuzzleHttp\Handler\CurlMultiHandler;
+use GuzzleHttp\Handler\Proxy;
+use GuzzleHttp\Handler\StreamHandler;
+use Psr\Http\Message\StreamInterface;
+
+/**
+ * Expands a URI template
+ *
+ * @param string $template  URI template
+ * @param array  $variables Template variables
+ *
+ * @return string
+ */
+function uri_template($template, array $variables)
+{
+    if (extension_loaded('uri_template')) {
+        // @codeCoverageIgnoreStart
+        return \uri_template($template, $variables);
+        // @codeCoverageIgnoreEnd
+    }
+
+    static $uriTemplate;
+    if (!$uriTemplate) {
+        $uriTemplate = new UriTemplate();
+    }
+
+    return $uriTemplate->expand($template, $variables);
+}
+
+/**
+ * Debug function used to describe the provided value type and class.
+ *
+ * @param mixed $input
+ *
+ * @return string Returns a string containing the type of the variable and
+ *                if a class is provided, the class name.
+ */
+function describe_type($input)
+{
+    switch (gettype($input)) {
+        case 'object':
+            return 'object(' . get_class($input) . ')';
+        case 'array':
+            return 'array(' . count($input) . ')';
+        default:
+            ob_start();
+            var_dump($input);
+            // normalize float vs double
+            return str_replace('double(', 'float(', rtrim(ob_get_clean()));
+    }
+}
+
+/**
+ * Parses an array of header lines into an associative array of headers.
+ *
+ * @param array $lines Header lines array of strings in the following
+ *                     format: "Name: Value"
+ * @return array
+ */
+function headers_from_lines($lines)
+{
+    $headers = [];
+
+    foreach ($lines as $line) {
+        $parts = explode(':', $line, 2);
+        $headers[trim($parts[0])][] = isset($parts[1])
+            ? trim($parts[1])
+            : null;
+    }
+
+    return $headers;
+}
+
+/**
+ * Returns a debug stream based on the provided variable.
+ *
+ * @param mixed $value Optional value
+ *
+ * @return resource
+ */
+function debug_resource($value = null)
+{
+    if (is_resource($value)) {
+        return $value;
+    } elseif (defined('STDOUT')) {
+        return STDOUT;
+    }
+
+    return fopen('php://output', 'w');
+}
+
+/**
+ * Chooses and creates a default handler to use based on the environment.
+ *
+ * The returned handler is not wrapped by any default middlewares.
+ *
+ * @throws \RuntimeException if no viable Handler is available.
+ * @return callable Returns the best handler for the given system.
+ */
+function choose_handler()
+{
+    $handler = null;
+    if (extension_loaded('curl')) {
+        $handler = Proxy::wrapSync(new CurlMultiHandler(), new CurlHandler());
+    }
+
+    if (ini_get('allow_url_fopen')) {
+        $handler = $handler
+            ? Proxy::wrapStreaming($handler, new StreamHandler())
+            : new StreamHandler();
+    } elseif (!$handler) {
+        throw new \RuntimeException('GuzzleHttp requires cURL, the '
+            . 'allow_url_fopen ini setting, or a custom HTTP handler.');
+    }
+
+    return $handler;
+}
+
+/**
+ * Get the default User-Agent string to use with Guzzle
+ *
+ * @return string
+ */
+function default_user_agent()
+{
+    static $defaultAgent = '';
+
+    if (!$defaultAgent) {
+        $defaultAgent = 'GuzzleHttp/' . Client::VERSION;
+        if (extension_loaded('curl')) {
+            $defaultAgent .= ' curl/' . \curl_version()['version'];
+        }
+        $defaultAgent .= ' PHP/' . PHP_VERSION;
+    }
+
+    return $defaultAgent;
+}
+
+/**
+ * Returns the default cacert bundle for the current system.
+ *
+ * First, the openssl.cafile and curl.cainfo php.ini settings are checked.
+ * If those settings are not configured, then the common locations for
+ * bundles found on Red Hat, CentOS, Fedora, Ubuntu, Debian, FreeBSD, OS X
+ * and Windows are checked. If any of these file locations are found on
+ * disk, they will be utilized.
+ *
+ * Note: the result of this function is cached for subsequent calls.
+ *
+ * @return string
+ * @throws \RuntimeException if no bundle can be found.
+ */
+function default_ca_bundle()
+{
+    static $cached = null;
+    static $cafiles = [
+        // Red Hat, CentOS, Fedora (provided by the ca-certificates package)
+        '/etc/pki/tls/certs/ca-bundle.crt',
+        // Ubuntu, Debian (provided by the ca-certificates package)
+        '/etc/ssl/certs/ca-certificates.crt',
+        // FreeBSD (provided by the ca_root_nss package)
+        '/usr/local/share/certs/ca-root-nss.crt',
+        // OS X provided by homebrew (using the default path)
+        '/usr/local/etc/openssl/cert.pem',
+        // Windows?
+        'C:\\windows\\system32\\curl-ca-bundle.crt',
+        'C:\\windows\\curl-ca-bundle.crt',
+    ];
+
+    if ($cached) {
+        return $cached;
+    }
+
+    if ($ca = ini_get('openssl.cafile')) {
+        return $cached = $ca;
+    }
+
+    if ($ca = ini_get('curl.cainfo')) {
+        return $cached = $ca;
+    }
+
+    foreach ($cafiles as $filename) {
+        if (file_exists($filename)) {
+            return $cached = $filename;
+        }
+    }
+
+    throw new \RuntimeException(<<< EOT
+No system CA bundle could be found in any of the the common system locations.
+PHP versions earlier than 5.6 are not properly configured to use the system's
+CA bundle by default. In order to verify peer certificates, you will need to
+supply the path on disk to a certificate bundle to the 'verify' request
+option: http://docs.guzzlephp.org/en/latest/clients.html#verify. If you do not
+need a specific certificate bundle, then Mozilla provides a commonly used CA
+bundle which can be downloaded here (provided by the maintainer of cURL):
+https://raw.githubusercontent.com/bagder/ca-bundle/master/ca-bundle.crt. Once
+you have a CA bundle available on disk, you can set the 'openssl.cafile' PHP
+ini setting to point to the path to the file, allowing you to omit the 'verify'
+request option. See http://curl.haxx.se/docs/sslcerts.html for more
+information.
+EOT
+    );
+}
+
+/**
+ * Creates an associative array of lowercase header names to the actual
+ * header casing.
+ *
+ * @param array $headers
+ *
+ * @return array
+ */
+function normalize_header_keys(array $headers)
+{
+    $result = [];
+    foreach (array_keys($headers) as $key) {
+        $result[strtolower($key)] = $key;
+    }
+
+    return $result;
+}
diff --git a/core/vendor/guzzlehttp/guzzle/src/functions_include.php b/core/vendor/guzzlehttp/guzzle/src/functions_include.php
new file mode 100644
index 000000000..a93393acc
--- /dev/null
+++ b/core/vendor/guzzlehttp/guzzle/src/functions_include.php
@@ -0,0 +1,6 @@
+<?php
+
+// Don't redefine the functions if included multiple times.
+if (!function_exists('GuzzleHttp\uri_template')) {
+    require __DIR__ . '/functions.php';
+}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/BatchResultsTest.php b/core/vendor/guzzlehttp/guzzle/tests/BatchResultsTest.php
deleted file mode 100644
index 080d44c01..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/BatchResultsTest.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests;
-
-use GuzzleHttp\BatchResults;
-
-/**
- * @covers \GuzzleHttp\BatchResults
- */
-class BatchResultsTest extends \PHPUnit_Framework_TestCase
-{
-    public function testExposesResults()
-    {
-        $a = new \stdClass();
-        $b = new \stdClass();
-        $c = new \stdClass();
-        $hash = new \SplObjectStorage();
-        $hash[$a] = '1';
-        $hash[$b] = '2';
-        $hash[$c] = new \Exception('foo');
-
-        $batch = new BatchResults($hash);
-        $this->assertCount(3, $batch);
-        $this->assertEquals([$a, $b, $c], $batch->getKeys());
-        $this->assertEquals([$hash[$c]], $batch->getFailures());
-        $this->assertEquals(['1', '2'], $batch->getSuccessful());
-        $this->assertEquals('1', $batch->getResult($a));
-        $this->assertNull($batch->getResult(new \stdClass()));
-        $this->assertTrue(isset($batch[0]));
-        $this->assertFalse(isset($batch[10]));
-        $this->assertEquals('1', $batch[0]);
-        $this->assertEquals('2', $batch[1]);
-        $this->assertNull($batch[100]);
-        $this->assertInstanceOf('Exception', $batch[2]);
-
-        $results = iterator_to_array($batch);
-        $this->assertEquals(['1', '2', $hash[$c]], $results);
-    }
-
-    /**
-     * @expectedException \RuntimeException
-     */
-    public function testCannotSetByIndex()
-    {
-        $hash = new \SplObjectStorage();
-        $batch = new BatchResults($hash);
-        $batch[10] = 'foo';
-    }
-
-    /**
-     * @expectedException \RuntimeException
-     */
-    public function testCannotUnsetByIndex()
-    {
-        $hash = new \SplObjectStorage();
-        $batch = new BatchResults($hash);
-        unset($batch[10]);
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/ClientTest.php b/core/vendor/guzzlehttp/guzzle/tests/ClientTest.php
deleted file mode 100644
index 913e535b8..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/ClientTest.php
+++ /dev/null
@@ -1,624 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests;
-
-use GuzzleHttp\Client;
-use GuzzleHttp\Event\BeforeEvent;
-use GuzzleHttp\Event\ErrorEvent;
-use GuzzleHttp\Message\MessageFactory;
-use GuzzleHttp\Message\Response;
-use GuzzleHttp\Exception\RequestException;
-use GuzzleHttp\Query;
-use GuzzleHttp\Ring\Client\MockHandler;
-use GuzzleHttp\Ring\Future\FutureArray;
-use GuzzleHttp\Subscriber\History;
-use GuzzleHttp\Subscriber\Mock;
-use GuzzleHttp\Url;
-use React\Promise\Deferred;
-
-/**
- * @covers GuzzleHttp\Client
- */
-class ClientTest extends \PHPUnit_Framework_TestCase
-{
-    /** @callable */
-    private $ma;
-
-    public function setup()
-    {
-        $this->ma = function () {
-            throw new \RuntimeException('Should not have been called.');
-        };
-    }
-
-    public function testProvidesDefaultUserAgent()
-    {
-        $ua = Client::getDefaultUserAgent();
-        $this->assertEquals(1, preg_match('#^Guzzle/.+ curl/.+ PHP/.+$#', $ua));
-    }
-
-    public function testUsesDefaultDefaultOptions()
-    {
-        $client = new Client();
-        $this->assertTrue($client->getDefaultOption('allow_redirects'));
-        $this->assertTrue($client->getDefaultOption('exceptions'));
-        $this->assertTrue($client->getDefaultOption('verify'));
-    }
-
-    public function testUsesProvidedDefaultOptions()
-    {
-        $client = new Client([
-            'defaults' => [
-                'allow_redirects' => false,
-                'query' => ['foo' => 'bar']
-            ]
-        ]);
-        $this->assertFalse($client->getDefaultOption('allow_redirects'));
-        $this->assertTrue($client->getDefaultOption('exceptions'));
-        $this->assertTrue($client->getDefaultOption('verify'));
-        $this->assertEquals(['foo' => 'bar'], $client->getDefaultOption('query'));
-    }
-
-    public function testCanSpecifyBaseUrl()
-    {
-        $this->assertSame('', (new Client())->getBaseUrl());
-        $this->assertEquals('http://foo', (new Client([
-            'base_url' => 'http://foo'
-        ]))->getBaseUrl());
-    }
-
-    public function testCanSpecifyBaseUrlUriTemplate()
-    {
-        $client = new Client(['base_url' => ['http://foo.com/{var}/', ['var' => 'baz']]]);
-        $this->assertEquals('http://foo.com/baz/', $client->getBaseUrl());
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     */
-    public function testValidatesUriTemplateValue()
-    {
-        new Client(['base_url' => ['http://foo.com/']]);
-    }
-
-    /**
-     * @expectedException \Exception
-     * @expectedExceptionMessage Foo
-     */
-    public function testCanSpecifyHandler()
-    {
-        $client = new Client(['handler' => function () {
-                throw new \Exception('Foo');
-            }]);
-        $client->get('http://httpbin.org');
-    }
-
-    /**
-     * @expectedException \Exception
-     * @expectedExceptionMessage Foo
-     */
-    public function testCanSpecifyHandlerAsAdapter()
-    {
-        $client = new Client(['adapter' => function () {
-            throw new \Exception('Foo');
-        }]);
-        $client->get('http://httpbin.org');
-    }
-
-    /**
-     * @expectedException \Exception
-     * @expectedExceptionMessage Foo
-     */
-    public function testCanSpecifyMessageFactory()
-    {
-        $factory = $this->getMockBuilder('GuzzleHttp\Message\MessageFactoryInterface')
-            ->setMethods(['createRequest'])
-            ->getMockForAbstractClass();
-        $factory->expects($this->once())
-            ->method('createRequest')
-            ->will($this->throwException(new \Exception('Foo')));
-        $client = new Client(['message_factory' => $factory]);
-        $client->get();
-    }
-
-    public function testCanSpecifyEmitter()
-    {
-        $emitter = $this->getMockBuilder('GuzzleHttp\Event\EmitterInterface')
-            ->setMethods(['listeners'])
-            ->getMockForAbstractClass();
-        $emitter->expects($this->once())
-            ->method('listeners')
-            ->will($this->returnValue('foo'));
-
-        $client = new Client(['emitter' => $emitter]);
-        $this->assertEquals('foo', $client->getEmitter()->listeners());
-    }
-
-    public function testAddsDefaultUserAgentHeaderWithDefaultOptions()
-    {
-        $client = new Client(['defaults' => ['allow_redirects' => false]]);
-        $this->assertFalse($client->getDefaultOption('allow_redirects'));
-        $this->assertEquals(
-            ['User-Agent' => Client::getDefaultUserAgent()],
-            $client->getDefaultOption('headers')
-        );
-    }
-
-    public function testAddsDefaultUserAgentHeaderWithoutDefaultOptions()
-    {
-        $client = new Client();
-        $this->assertEquals(
-            ['User-Agent' => Client::getDefaultUserAgent()],
-            $client->getDefaultOption('headers')
-        );
-    }
-
-    private function getRequestClient()
-    {
-        $client = $this->getMockBuilder('GuzzleHttp\Client')
-            ->setMethods(['send'])
-            ->getMock();
-        $client->expects($this->once())
-            ->method('send')
-            ->will($this->returnArgument(0));
-
-        return $client;
-    }
-
-    public function requestMethodProvider()
-    {
-        return [
-            ['GET', false],
-            ['HEAD', false],
-            ['DELETE', false],
-            ['OPTIONS', false],
-            ['POST', 'foo'],
-            ['PUT', 'foo'],
-            ['PATCH', 'foo']
-        ];
-    }
-
-    /**
-     * @dataProvider requestMethodProvider
-     */
-    public function testClientProvidesMethodShortcut($method, $body)
-    {
-        $client = $this->getRequestClient();
-        if ($body) {
-            $request = $client->{$method}('http://foo.com', [
-                'headers' => ['X-Baz' => 'Bar'],
-                'body' => $body,
-                'query' => ['a' => 'b']
-            ]);
-        } else {
-            $request = $client->{$method}('http://foo.com', [
-                'headers' => ['X-Baz' => 'Bar'],
-                'query' => ['a' => 'b']
-            ]);
-        }
-        $this->assertEquals($method, $request->getMethod());
-        $this->assertEquals('Bar', $request->getHeader('X-Baz'));
-        $this->assertEquals('a=b', $request->getQuery());
-        if ($body) {
-            $this->assertEquals($body, $request->getBody());
-        }
-    }
-
-    public function testClientMergesDefaultOptionsWithRequestOptions()
-    {
-        $f = $this->getMockBuilder('GuzzleHttp\Message\MessageFactoryInterface')
-            ->setMethods(array('createRequest'))
-            ->getMockForAbstractClass();
-
-        $o = null;
-        // Intercept the creation
-        $f->expects($this->once())
-            ->method('createRequest')
-            ->will($this->returnCallback(
-                function ($method, $url, array $options = []) use (&$o) {
-                    $o = $options;
-                    return (new MessageFactory())->createRequest($method, $url, $options);
-                }
-            ));
-
-        $client = new Client([
-            'message_factory' => $f,
-            'defaults' => [
-                'headers' => ['Foo' => 'Bar'],
-                'query' => ['baz' => 'bam'],
-                'exceptions' => false
-            ]
-        ]);
-
-        $request = $client->createRequest('GET', 'http://foo.com?a=b', [
-            'headers' => ['Hi' => 'there', '1' => 'one'],
-            'allow_redirects' => false,
-            'query' => ['t' => 1]
-        ]);
-
-        $this->assertFalse($o['allow_redirects']);
-        $this->assertFalse($o['exceptions']);
-        $this->assertEquals('Bar', $request->getHeader('Foo'));
-        $this->assertEquals('there', $request->getHeader('Hi'));
-        $this->assertEquals('one', $request->getHeader('1'));
-        $this->assertEquals('a=b&baz=bam&t=1', $request->getQuery());
-    }
-
-    public function testClientMergesDefaultHeadersCaseInsensitively()
-    {
-        $client = new Client(['defaults' => ['headers' => ['Foo' => 'Bar']]]);
-        $request = $client->createRequest('GET', 'http://foo.com?a=b', [
-            'headers' => ['foo' => 'custom', 'user-agent' => 'test']
-        ]);
-        $this->assertEquals('test', $request->getHeader('User-Agent'));
-        $this->assertEquals('custom', $request->getHeader('Foo'));
-    }
-
-    public function testCanOverrideDefaultOptionWithNull()
-    {
-        $client = new Client(['defaults' => ['proxy' => 'invalid!']]);
-        $request = $client->createRequest('GET', 'http://foo.com?a=b', [
-            'proxy' => null
-        ]);
-        $this->assertFalse($request->getConfig()->hasKey('proxy'));
-    }
-
-    public function testDoesNotOverwriteExistingUA()
-    {
-        $client = new Client(['defaults' => [
-            'headers' => ['User-Agent' => 'test']
-        ]]);
-        $this->assertEquals(
-            ['User-Agent' => 'test'],
-            $client->getDefaultOption('headers')
-        );
-    }
-
-    public function testUsesBaseUrlWhenNoUrlIsSet()
-    {
-        $client = new Client(['base_url' => 'http://www.foo.com/baz?bam=bar']);
-        $this->assertEquals(
-            'http://www.foo.com/baz?bam=bar',
-            $client->createRequest('GET')->getUrl()
-        );
-    }
-
-    public function testUsesBaseUrlCombinedWithProvidedUrl()
-    {
-        $client = new Client(['base_url' => 'http://www.foo.com/baz?bam=bar']);
-        $this->assertEquals(
-            'http://www.foo.com/bar/bam',
-            $client->createRequest('GET', 'bar/bam')->getUrl()
-        );
-    }
-
-    public function testFalsyPathsAreCombinedWithBaseUrl()
-    {
-        $client = new Client(['base_url' => 'http://www.foo.com/baz?bam=bar']);
-        $this->assertEquals(
-            'http://www.foo.com/0',
-            $client->createRequest('GET', '0')->getUrl()
-        );
-    }
-
-    public function testUsesBaseUrlCombinedWithProvidedUrlViaUriTemplate()
-    {
-        $client = new Client(['base_url' => 'http://www.foo.com/baz?bam=bar']);
-        $this->assertEquals(
-            'http://www.foo.com/bar/123',
-            $client->createRequest('GET', ['bar/{bam}', ['bam' => '123']])->getUrl()
-        );
-    }
-
-    public function testSettingAbsoluteUrlOverridesBaseUrl()
-    {
-        $client = new Client(['base_url' => 'http://www.foo.com/baz?bam=bar']);
-        $this->assertEquals(
-            'http://www.foo.com/foo',
-            $client->createRequest('GET', '/foo')->getUrl()
-        );
-    }
-
-    public function testSettingAbsoluteUriTemplateOverridesBaseUrl()
-    {
-        $client = new Client(['base_url' => 'http://www.foo.com/baz?bam=bar']);
-        $this->assertEquals(
-            'http://goo.com/1',
-            $client->createRequest(
-                'GET',
-                ['http://goo.com/{bar}', ['bar' => '1']]
-            )->getUrl()
-        );
-    }
-
-    public function testCanSetRelativeUrlStartingWithHttp()
-    {
-        $client = new Client(['base_url' => 'http://www.foo.com']);
-        $this->assertEquals(
-            'http://www.foo.com/httpfoo',
-            $client->createRequest('GET', 'httpfoo')->getUrl()
-        );
-    }
-
-    public function testClientSendsRequests()
-    {
-        $mock = new MockHandler(['status' => 200, 'headers' => []]);
-        $client = new Client(['handler' => $mock]);
-        $response = $client->get('http://test.com');
-        $this->assertEquals(200, $response->getStatusCode());
-        $this->assertEquals('http://test.com', $response->getEffectiveUrl());
-    }
-
-    public function testSendingRequestCanBeIntercepted()
-    {
-        $response = new Response(200);
-        $client = new Client(['handler' => $this->ma]);
-        $client->getEmitter()->on(
-            'before',
-            function (BeforeEvent $e) use ($response) {
-                $e->intercept($response);
-            }
-        );
-        $this->assertSame($response, $client->get('http://test.com'));
-        $this->assertEquals('http://test.com', $response->getEffectiveUrl());
-    }
-
-    /**
-     * @expectedException \GuzzleHttp\Exception\RequestException
-     * @expectedExceptionMessage Argument 1 passed to GuzzleHttp\Message\FutureResponse::proxy() must implement interface GuzzleHttp\Ring\Future\FutureInterface
-     */
-    public function testEnsuresResponseIsPresentAfterSending()
-    {
-        $handler = function () {};
-        $client = new Client(['handler' => $handler]);
-        $client->get('http://httpbin.org');
-    }
-
-    /**
-     * @expectedException \GuzzleHttp\Exception\RequestException
-     * @expectedExceptionMessage Waiting did not resolve future
-     */
-    public function testEnsuresResponseIsPresentAfterDereferencing()
-    {
-        $deferred = new Deferred();
-        $handler = new MockHandler(function () use ($deferred) {
-            return new FutureArray(
-                $deferred->promise(),
-                function () {}
-            );
-        });
-        $client = new Client(['handler' => $handler]);
-        $response = $client->get('http://httpbin.org');
-        $response->wait();
-    }
-
-    public function testClientHandlesErrorsDuringBeforeSend()
-    {
-        $client = new Client();
-        $client->getEmitter()->on('before', function ($e) {
-            throw new \Exception('foo');
-        });
-        $client->getEmitter()->on('error', function (ErrorEvent $e) {
-            $e->intercept(new Response(200));
-        });
-        $this->assertEquals(
-            200,
-            $client->get('http://test.com')->getStatusCode()
-        );
-    }
-
-    /**
-     * @expectedException \GuzzleHttp\Exception\RequestException
-     * @expectedExceptionMessage foo
-     */
-    public function testClientHandlesErrorsDuringBeforeSendAndThrowsIfUnhandled()
-    {
-        $client = new Client();
-        $client->getEmitter()->on('before', function (BeforeEvent $e) {
-            throw new RequestException('foo', $e->getRequest());
-        });
-        $client->get('http://httpbin.org');
-    }
-
-    /**
-     * @expectedException \GuzzleHttp\Exception\RequestException
-     * @expectedExceptionMessage foo
-     */
-    public function testClientWrapsExceptions()
-    {
-        $client = new Client();
-        $client->getEmitter()->on('before', function (BeforeEvent $e) {
-            throw new \Exception('foo');
-        });
-        $client->get('http://httpbin.org');
-    }
-
-    public function testCanInjectResponseForFutureError()
-    {
-        $calledFuture = false;
-        $deferred = new Deferred();
-        $future = new FutureArray(
-            $deferred->promise(),
-            function () use ($deferred, &$calledFuture) {
-                $calledFuture = true;
-                $deferred->resolve(['error' => new \Exception('Noo!')]);
-            }
-        );
-        $mock = new MockHandler($future);
-        $client = new Client(['handler' => $mock]);
-        $called = 0;
-        $response = $client->get('http://localhost:123/foo', [
-            'future' => true,
-            'events' => [
-                'error' => function (ErrorEvent $e) use (&$called) {
-                    $called++;
-                    $e->intercept(new Response(200));
-                }
-            ]
-        ]);
-        $this->assertEquals(0, $called);
-        $this->assertInstanceOf('GuzzleHttp\Message\FutureResponse', $response);
-        $this->assertEquals(200, $response->getStatusCode());
-        $this->assertTrue($calledFuture);
-        $this->assertEquals(1, $called);
-    }
-
-    public function testCanReturnFutureResults()
-    {
-        $called = false;
-        $deferred = new Deferred();
-        $future = new FutureArray(
-            $deferred->promise(),
-            function () use ($deferred, &$called) {
-                $called = true;
-                $deferred->resolve(['status' => 201, 'headers' => []]);
-            }
-        );
-        $mock = new MockHandler($future);
-        $client = new Client(['handler' => $mock]);
-        $response = $client->get('http://localhost:123/foo', ['future' => true]);
-        $this->assertFalse($called);
-        $this->assertInstanceOf('GuzzleHttp\Message\FutureResponse', $response);
-        $this->assertEquals(201, $response->getStatusCode());
-        $this->assertTrue($called);
-    }
-
-    public function testThrowsExceptionsWhenDereferenced()
-    {
-        $calledFuture = false;
-        $deferred = new Deferred();
-        $future = new FutureArray(
-            $deferred->promise(),
-            function () use ($deferred, &$calledFuture) {
-                $calledFuture = true;
-                $deferred->resolve(['error' => new \Exception('Noop!')]);
-            }
-        );
-        $client = new Client(['handler' => new MockHandler($future)]);
-        try {
-            $res = $client->get('http://localhost:123/foo', ['future' => true]);
-            $res->wait();
-            $this->fail('Did not throw');
-        } catch (RequestException $e) {
-            $this->assertEquals(1, $calledFuture);
-        }
-    }
-
-    /**
-     * @expectedExceptionMessage Noo!
-     * @expectedException \GuzzleHttp\Exception\RequestException
-     */
-    public function testThrowsExceptionsSynchronously()
-    {
-        $client = new Client([
-            'handler' => new MockHandler(['error' => new \Exception('Noo!')])
-        ]);
-        $client->get('http://localhost:123/foo');
-    }
-
-    public function testCanSetDefaultValues()
-    {
-        $client = new Client(['foo' => 'bar']);
-        $client->setDefaultOption('headers/foo', 'bar');
-        $this->assertNull($client->getDefaultOption('foo'));
-        $this->assertEquals('bar', $client->getDefaultOption('headers/foo'));
-    }
-
-    public function testSendsAllInParallel()
-    {
-        $client = new Client();
-        $client->getEmitter()->attach(new Mock([
-            new Response(200),
-            new Response(201),
-            new Response(202),
-        ]));
-        $history = new History();
-        $client->getEmitter()->attach($history);
-
-        $requests = [
-            $client->createRequest('GET', 'http://test.com'),
-            $client->createRequest('POST', 'http://test.com'),
-            $client->createRequest('PUT', 'http://test.com')
-        ];
-
-        $client->sendAll($requests);
-        $requests = array_map(function($r) {
-            return $r->getMethod();
-        }, $history->getRequests());
-        $this->assertContains('GET', $requests);
-        $this->assertContains('POST', $requests);
-        $this->assertContains('PUT', $requests);
-    }
-
-    public function testCanDisableAuthPerRequest()
-    {
-        $client = new Client(['defaults' => ['auth' => 'foo']]);
-        $request = $client->createRequest('GET', 'http://test.com');
-        $this->assertEquals('foo', $request->getConfig()['auth']);
-        $request = $client->createRequest('GET', 'http://test.com', ['auth' => null]);
-        $this->assertFalse($request->getConfig()->hasKey('auth'));
-    }
-
-    public function testUsesProxyEnvironmentVariables()
-    {
-        $http = getenv('HTTP_PROXY');
-        $https = getenv('HTTPS_PROXY');
-
-        $client = new Client();
-        $this->assertNull($client->getDefaultOption('proxy'));
-
-        putenv('HTTP_PROXY=127.0.0.1');
-        $client = new Client();
-        $this->assertEquals(
-            ['http' => '127.0.0.1'],
-            $client->getDefaultOption('proxy')
-        );
-
-        putenv('HTTPS_PROXY=127.0.0.2');
-        $client = new Client();
-        $this->assertEquals(
-            ['http' => '127.0.0.1', 'https' => '127.0.0.2'],
-            $client->getDefaultOption('proxy')
-        );
-
-        putenv("HTTP_PROXY=$http");
-        putenv("HTTPS_PROXY=$https");
-    }
-
-    public function testReturnsFutureForErrorWhenRequested()
-    {
-        $client = new Client(['handler' => new MockHandler(['status' => 404])]);
-        $request = $client->createRequest('GET', 'http://localhost:123/foo', [
-            'future' => true
-        ]);
-        $res = $client->send($request);
-        $this->assertInstanceOf('GuzzleHttp\Message\FutureResponse', $res);
-        try {
-            $res->wait();
-            $this->fail('did not throw');
-        } catch (RequestException $e) {
-            $this->assertContains('404', $e->getMessage());
-        }
-    }
-
-    public function testReturnsFutureForResponseWhenRequested()
-    {
-        $client = new Client(['handler' => new MockHandler(['status' => 200])]);
-        $request = $client->createRequest('GET', 'http://localhost:123/foo', [
-            'future' => true
-        ]);
-        $res = $client->send($request);
-        $this->assertInstanceOf('GuzzleHttp\Message\FutureResponse', $res);
-        $this->assertEquals(200, $res->getStatusCode());
-    }
-
-    public function testCanUseUrlWithCustomQuery()
-    {
-        $client = new Client();
-        $url = Url::fromString('http://foo.com/bar');
-        $query = new Query(['baz' => '123%20']);
-        $query->setEncodingType(false);
-        $url->setQuery($query);
-        $r = $client->createRequest('GET', $url);
-        $this->assertEquals('http://foo.com/bar?baz=123%20', $r->getUrl());
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/CollectionTest.php b/core/vendor/guzzlehttp/guzzle/tests/CollectionTest.php
deleted file mode 100644
index d137947db..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/CollectionTest.php
+++ /dev/null
@@ -1,416 +0,0 @@
-<?php
-
-namespace GuzzleHttp\Tests;
-
-use GuzzleHttp\Collection;
-
-class CollectionTest extends \PHPUnit_Framework_TestCase
-{
-    /** @var Collection */
-    protected $coll;
-
-    protected function setUp()
-    {
-        $this->coll = new Collection();
-    }
-
-    public function testConstructorCanBeCalledWithNoParams()
-    {
-        $this->coll = new Collection();
-        $p = $this->coll->toArray();
-        $this->assertEmpty($p, '-> Collection must be empty when no data is passed');
-    }
-
-    public function testConstructorCanBeCalledWithParams()
-    {
-        $testData = array(
-            'test' => 'value',
-            'test_2' => 'value2'
-        );
-        $this->coll = new Collection($testData);
-        $this->assertEquals($this->coll->toArray(), $testData);
-        $this->assertEquals($this->coll->toArray(), $this->coll->toArray());
-    }
-
-    public function testImplementsIteratorAggregate()
-    {
-        $this->coll->set('key', 'value');
-        $this->assertInstanceOf('ArrayIterator', $this->coll->getIterator());
-        $this->assertEquals(1, count($this->coll));
-        $total = 0;
-        foreach ($this->coll as $key => $value) {
-            $this->assertEquals('key', $key);
-            $this->assertEquals('value', $value);
-            $total++;
-        }
-        $this->assertEquals(1, $total);
-    }
-
-    public function testCanAddValuesToExistingKeysByUsingArray()
-    {
-        $this->coll->add('test', 'value1');
-        $this->assertEquals($this->coll->toArray(), array('test' => 'value1'));
-        $this->coll->add('test', 'value2');
-        $this->assertEquals($this->coll->toArray(), array('test' => array('value1', 'value2')));
-        $this->coll->add('test', 'value3');
-        $this->assertEquals($this->coll->toArray(), array('test' => array('value1', 'value2', 'value3')));
-    }
-
-    public function testHandlesMergingInDisparateDataSources()
-    {
-        $params = array(
-            'test' => 'value1',
-            'test2' => 'value2',
-            'test3' => array('value3', 'value4')
-        );
-        $this->coll->merge($params);
-        $this->assertEquals($this->coll->toArray(), $params);
-        $this->coll->merge(new Collection(['test4' => 'hi']));
-        $this->assertEquals(
-            $this->coll->toArray(),
-            $params + ['test4' => 'hi']
-        );
-    }
-
-    public function testCanClearAllDataOrSpecificKeys()
-    {
-        $this->coll->merge(array(
-            'test' => 'value1',
-            'test2' => 'value2'
-        ));
-
-        // Clear a specific parameter by name
-        $this->coll->remove('test');
-
-        $this->assertEquals($this->coll->toArray(), array(
-            'test2' => 'value2'
-        ));
-
-        // Clear all parameters
-        $this->coll->clear();
-
-        $this->assertEquals($this->coll->toArray(), array());
-    }
-
-    public function testProvidesKeys()
-    {
-        $this->assertEquals(array(), $this->coll->getKeys());
-        $this->coll->merge(array(
-            'test1' => 'value1',
-            'test2' => 'value2'
-        ));
-        $this->assertEquals(array('test1', 'test2'), $this->coll->getKeys());
-        // Returns the cached array previously returned
-        $this->assertEquals(array('test1', 'test2'), $this->coll->getKeys());
-        $this->coll->remove('test1');
-        $this->assertEquals(array('test2'), $this->coll->getKeys());
-        $this->coll->add('test3', 'value3');
-        $this->assertEquals(array('test2', 'test3'), $this->coll->getKeys());
-    }
-
-    public function testChecksIfHasKey()
-    {
-        $this->assertFalse($this->coll->hasKey('test'));
-        $this->coll->add('test', 'value');
-        $this->assertEquals(true, $this->coll->hasKey('test'));
-        $this->coll->add('test2', 'value2');
-        $this->assertEquals(true, $this->coll->hasKey('test'));
-        $this->assertEquals(true, $this->coll->hasKey('test2'));
-        $this->assertFalse($this->coll->hasKey('testing'));
-        $this->assertEquals(false, $this->coll->hasKey('AB-C', 'junk'));
-    }
-
-    public function testChecksIfHasValue()
-    {
-        $this->assertFalse($this->coll->hasValue('value'));
-        $this->coll->add('test', 'value');
-        $this->assertEquals('test', $this->coll->hasValue('value'));
-        $this->coll->add('test2', 'value2');
-        $this->assertEquals('test', $this->coll->hasValue('value'));
-        $this->assertEquals('test2', $this->coll->hasValue('value2'));
-        $this->assertFalse($this->coll->hasValue('val'));
-    }
-
-    public function testImplementsCount()
-    {
-        $data = new Collection();
-        $this->assertEquals(0, $data->count());
-        $data->add('key', 'value');
-        $this->assertEquals(1, count($data));
-        $data->add('key', 'value2');
-        $this->assertEquals(1, count($data));
-        $data->add('key_2', 'value3');
-        $this->assertEquals(2, count($data));
-    }
-
-    public function testAddParamsByMerging()
-    {
-        $params = array(
-            'test' => 'value1',
-            'test2' => 'value2',
-            'test3' => array('value3', 'value4')
-        );
-
-        // Add some parameters
-        $this->coll->merge($params);
-
-        // Add more parameters by merging them in
-        $this->coll->merge(array(
-            'test' => 'another',
-            'different_key' => 'new value'
-        ));
-
-        $this->assertEquals(array(
-            'test' => array('value1', 'another'),
-            'test2' => 'value2',
-            'test3' => array('value3', 'value4'),
-            'different_key' => 'new value'
-        ), $this->coll->toArray());
-    }
-
-    public function testAllowsFunctionalFilter()
-    {
-        $this->coll->merge(array(
-            'fruit' => 'apple',
-            'number' => 'ten',
-            'prepositions' => array('about', 'above', 'across', 'after'),
-            'same_number' => 'ten'
-        ));
-
-        $filtered = $this->coll->filter(function ($key, $value) {
-            return $value == 'ten';
-        });
-
-        $this->assertNotSame($filtered, $this->coll);
-
-        $this->assertEquals(array(
-            'number' => 'ten',
-            'same_number' => 'ten'
-        ), $filtered->toArray());
-    }
-
-    public function testAllowsFunctionalMapping()
-    {
-        $this->coll->merge(array(
-            'number_1' => 1,
-            'number_2' => 2,
-            'number_3' => 3
-        ));
-
-        $mapped = $this->coll->map(function ($key, $value) {
-            return $value * $value;
-        });
-
-        $this->assertNotSame($mapped, $this->coll);
-
-        $this->assertEquals(array(
-            'number_1' => 1,
-            'number_2' => 4,
-            'number_3' => 9
-        ), $mapped->toArray());
-    }
-
-    public function testImplementsArrayAccess()
-    {
-        $this->coll->merge(array(
-            'k1' => 'v1',
-            'k2' => 'v2'
-        ));
-
-        $this->assertTrue($this->coll->offsetExists('k1'));
-        $this->assertFalse($this->coll->offsetExists('Krull'));
-
-        $this->coll->offsetSet('k3', 'v3');
-        $this->assertEquals('v3', $this->coll->offsetGet('k3'));
-        $this->assertEquals('v3', $this->coll->get('k3'));
-
-        $this->coll->offsetUnset('k1');
-        $this->assertFalse($this->coll->offsetExists('k1'));
-    }
-
-    public function testCanReplaceAllData()
-    {
-        $this->coll->replace(array('a' => '123'));
-        $this->assertEquals(array('a' => '123'), $this->coll->toArray());
-    }
-
-    public function testPreparesFromConfig()
-    {
-        $c = Collection::fromConfig(array(
-            'a' => '123',
-            'base_url' => 'http://www.test.com/'
-        ), array(
-            'a' => 'xyz',
-            'b' => 'lol'
-        ), array('a'));
-
-        $this->assertInstanceOf('GuzzleHttp\Collection', $c);
-        $this->assertEquals(array(
-            'a' => '123',
-            'b' => 'lol',
-            'base_url' => 'http://www.test.com/'
-        ), $c->toArray());
-
-        try {
-            $c = Collection::fromConfig(array(), array(), array('a'));
-            $this->fail('Exception not throw when missing config');
-        } catch (\InvalidArgumentException $e) {
-        }
-    }
-
-    function falseyDataProvider()
-    {
-        return array(
-            array(false, false),
-            array(null, null),
-            array('', ''),
-            array(array(), array()),
-            array(0, 0),
-        );
-    }
-
-    /**
-     * @dataProvider falseyDataProvider
-     */
-    public function testReturnsCorrectData($a, $b)
-    {
-        $c = new Collection(array('value' => $a));
-        $this->assertSame($b, $c->get('value'));
-    }
-
-    public function testRetrievesNestedKeysUsingPath()
-    {
-        $data = array(
-            'foo' => 'bar',
-            'baz' => array(
-                'mesa' => array(
-                    'jar' => 'jar'
-                )
-            )
-        );
-        $collection = new Collection($data);
-        $this->assertEquals('bar', $collection->getPath('foo'));
-        $this->assertEquals('jar', $collection->getPath('baz/mesa/jar'));
-        $this->assertNull($collection->getPath('wewewf'));
-        $this->assertNull($collection->getPath('baz/mesa/jar/jar'));
-    }
-
-    public function testFalseyKeysStillDescend()
-    {
-        $collection = new Collection(array(
-            '0' => array(
-                'a' => 'jar'
-            ),
-            1 => 'other'
-        ));
-        $this->assertEquals('jar', $collection->getPath('0/a'));
-        $this->assertEquals('other', $collection->getPath('1'));
-    }
-
-    public function getPathProvider()
-    {
-        $data = array(
-            'foo' => 'bar',
-            'baz' => array(
-                'mesa' => array(
-                    'jar' => 'jar',
-                    'array' => array('a', 'b', 'c')
-                ),
-                'bar' => array(
-                    'baz' => 'bam',
-                    'array' => array('d', 'e', 'f')
-                )
-            ),
-            'bam' => array(
-                array('foo' => 1),
-                array('foo' => 2),
-                array('array' => array('h', 'i'))
-            )
-        );
-        $c = new Collection($data);
-
-        return array(
-            // Simple path selectors
-            array($c, 'foo', 'bar'),
-            array($c, 'baz', $data['baz']),
-            array($c, 'bam', $data['bam']),
-            array($c, 'baz/mesa', $data['baz']['mesa']),
-            array($c, 'baz/mesa/jar', 'jar'),
-            // Does not barf on missing keys
-            array($c, 'fefwfw', null),
-            array($c, 'baz/mesa/array', $data['baz']['mesa']['array'])
-        );
-    }
-
-    /**
-     * @dataProvider getPathProvider
-     */
-    public function testGetPath(Collection $c, $path, $expected, $separator = '/')
-    {
-        $this->assertEquals($expected, $c->getPath($path, $separator));
-    }
-
-    public function testOverridesSettings()
-    {
-        $c = new Collection(array('foo' => 1, 'baz' => 2, 'bar' => 3));
-        $c->overwriteWith(array('foo' => 10, 'bar' => 300));
-        $this->assertEquals(array('foo' => 10, 'baz' => 2, 'bar' => 300), $c->toArray());
-    }
-
-    public function testOverwriteWithCollection()
-    {
-        $c = new Collection(array('foo' => 1, 'baz' => 2, 'bar' => 3));
-        $b = new Collection(array('foo' => 10, 'bar' => 300));
-        $c->overwriteWith($b);
-        $this->assertEquals(array('foo' => 10, 'baz' => 2, 'bar' => 300), $c->toArray());
-    }
-
-    public function testOverwriteWithTraversable()
-    {
-        $c = new Collection(array('foo' => 1, 'baz' => 2, 'bar' => 3));
-        $b = new Collection(array('foo' => 10, 'bar' => 300));
-        $c->overwriteWith($b->getIterator());
-        $this->assertEquals(array('foo' => 10, 'baz' => 2, 'bar' => 300), $c->toArray());
-    }
-
-    public function testCanSetNestedPathValueThatDoesNotExist()
-    {
-        $c = new Collection(array());
-        $c->setPath('foo/bar/baz/123', 'hi');
-        $this->assertEquals('hi', $c['foo']['bar']['baz']['123']);
-    }
-
-    public function testCanSetNestedPathValueThatExists()
-    {
-        $c = new Collection(array('foo' => array('bar' => 'test')));
-        $c->setPath('foo/bar', 'hi');
-        $this->assertEquals('hi', $c['foo']['bar']);
-    }
-
-    /**
-     * @expectedException \RuntimeException
-     */
-    public function testVerifiesNestedPathIsValidAtExactLevel()
-    {
-        $c = new Collection(array('foo' => 'bar'));
-        $c->setPath('foo/bar', 'hi');
-        $this->assertEquals('hi', $c['foo']['bar']);
-    }
-
-    /**
-     * @expectedException \RuntimeException
-     */
-    public function testVerifiesThatNestedPathIsValidAtAnyLevel()
-    {
-        $c = new Collection(array('foo' => 'bar'));
-        $c->setPath('foo/bar/baz', 'test');
-    }
-
-    public function testCanAppendToNestedPathValues()
-    {
-        $c = new Collection();
-        $c->setPath('foo/bar/[]', 'a');
-        $c->setPath('foo/bar/[]', 'b');
-        $this->assertEquals(['a', 'b'], $c['foo']['bar']);
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/Cookie/CookieJarTest.php b/core/vendor/guzzlehttp/guzzle/tests/Cookie/CookieJarTest.php
deleted file mode 100644
index 1360419d9..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/Cookie/CookieJarTest.php
+++ /dev/null
@@ -1,339 +0,0 @@
-<?php
-
-namespace GuzzleHttp\Tests\CookieJar;
-
-use GuzzleHttp\Cookie\CookieJar;
-use GuzzleHttp\Cookie\SetCookie;
-use GuzzleHttp\Message\Request;
-use GuzzleHttp\Message\Response;
-
-/**
- * @covers GuzzleHttp\Cookie\CookieJar
- */
-class CookieJarTest extends \PHPUnit_Framework_TestCase
-{
-    /** @var CookieJar */
-    private $jar;
-
-    public function setUp()
-    {
-        $this->jar = new CookieJar();
-    }
-
-    protected function getTestCookies()
-    {
-        return [
-            new SetCookie(['Name' => 'foo',  'Value' => 'bar', 'Domain' => 'foo.com', 'Path' => '/',    'Discard' => true]),
-            new SetCookie(['Name' => 'test', 'Value' => '123', 'Domain' => 'baz.com', 'Path' => '/foo', 'Expires' => 2]),
-            new SetCookie(['Name' => 'you',  'Value' => '123', 'Domain' => 'bar.com', 'Path' => '/boo', 'Expires' => time() + 1000])
-        ];
-    }
-
-    public function testQuotesBadCookieValues()
-    {
-        $this->assertEquals('foo', CookieJar::getCookieValue('foo'));
-        $this->assertEquals('"foo,bar"', CookieJar::getCookieValue('foo,bar'));
-    }
-
-    public function testCreatesFromArray()
-    {
-        $jar = CookieJar::fromArray([
-            'foo' => 'bar',
-            'baz' => 'bam'
-        ], 'example.com');
-        $this->assertCount(2, $jar);
-    }
-
-    /**
-     * Provides test data for cookie cookieJar retrieval
-     */
-    public function getCookiesDataProvider()
-    {
-        return [
-            [['foo', 'baz', 'test', 'muppet', 'googoo'], '', '', '', false],
-            [['foo', 'baz', 'muppet', 'googoo'], '', '', '', true],
-            [['googoo'], 'www.example.com', '', '', false],
-            [['muppet', 'googoo'], 'test.y.example.com', '', '', false],
-            [['foo', 'baz'], 'example.com', '', '', false],
-            [['muppet'], 'x.y.example.com', '/acme/', '', false],
-            [['muppet'], 'x.y.example.com', '/acme/test/', '', false],
-            [['googoo'], 'x.y.example.com', '/test/acme/test/', '', false],
-            [['foo', 'baz'], 'example.com', '', '', false],
-            [['baz'], 'example.com', '', 'baz', false],
-        ];
-    }
-
-    public function testStoresAndRetrievesCookies()
-    {
-        $cookies = $this->getTestCookies();
-        foreach ($cookies as $cookie) {
-            $this->assertTrue($this->jar->setCookie($cookie));
-        }
-
-        $this->assertEquals(3, count($this->jar));
-        $this->assertEquals(3, count($this->jar->getIterator()));
-        $this->assertEquals($cookies, $this->jar->getIterator()->getArrayCopy());
-    }
-
-    public function testRemovesTemporaryCookies()
-    {
-        $cookies = $this->getTestCookies();
-        foreach ($this->getTestCookies() as $cookie) {
-            $this->jar->setCookie($cookie);
-        }
-        $this->jar->clearSessionCookies();
-        $this->assertEquals(
-            [$cookies[1], $cookies[2]],
-            $this->jar->getIterator()->getArrayCopy()
-        );
-    }
-
-    public function testRemovesSelectively()
-    {
-        foreach ($this->getTestCookies() as $cookie) {
-            $this->jar->setCookie($cookie);
-        }
-
-        // Remove foo.com cookies
-        $this->jar->clear('foo.com');
-        $this->assertEquals(2, count($this->jar));
-        // Try again, removing no further cookies
-        $this->jar->clear('foo.com');
-        $this->assertEquals(2, count($this->jar));
-
-        // Remove bar.com cookies with path of /boo
-        $this->jar->clear('bar.com', '/boo');
-        $this->assertEquals(1, count($this->jar));
-
-        // Remove cookie by name
-        $this->jar->clear(null, null, 'test');
-        $this->assertEquals(0, count($this->jar));
-    }
-
-    public function testDoesNotAddIncompleteCookies()
-    {
-        $this->assertEquals(false, $this->jar->setCookie(new SetCookie()));
-        $this->assertFalse($this->jar->setCookie(new SetCookie(array(
-            'Name' => 'foo'
-        ))));
-        $this->assertFalse($this->jar->setCookie(new SetCookie(array(
-            'Name' => false
-        ))));
-        $this->assertFalse($this->jar->setCookie(new SetCookie(array(
-            'Name' => true
-        ))));
-        $this->assertFalse($this->jar->setCookie(new SetCookie(array(
-            'Name'   => 'foo',
-            'Domain' => 'foo.com'
-        ))));
-    }
-
-    public function testDoesAddValidCookies()
-    {
-        $this->assertTrue($this->jar->setCookie(new SetCookie(array(
-            'Name'   => 'foo',
-            'Domain' => 'foo.com',
-            'Value'  => 0
-        ))));
-        $this->assertTrue($this->jar->setCookie(new SetCookie(array(
-            'Name'   => 'foo',
-            'Domain' => 'foo.com',
-            'Value'  => 0.0
-        ))));
-        $this->assertTrue($this->jar->setCookie(new SetCookie(array(
-            'Name'   => 'foo',
-            'Domain' => 'foo.com',
-            'Value'  => '0'
-        ))));
-    }
-
-    public function testOverwritesCookiesThatAreOlderOrDiscardable()
-    {
-        $t = time() + 1000;
-        $data = array(
-            'Name'    => 'foo',
-            'Value'   => 'bar',
-            'Domain'  => '.example.com',
-            'Path'    => '/',
-            'Max-Age' => '86400',
-            'Secure'  => true,
-            'Discard' => true,
-            'Expires' => $t
-        );
-
-        // Make sure that the discard cookie is overridden with the non-discard
-        $this->assertTrue($this->jar->setCookie(new SetCookie($data)));
-        $this->assertEquals(1, count($this->jar));
-
-        $data['Discard'] = false;
-        $this->assertTrue($this->jar->setCookie(new SetCookie($data)));
-        $this->assertEquals(1, count($this->jar));
-
-        $c = $this->jar->getIterator()->getArrayCopy();
-        $this->assertEquals(false, $c[0]->getDiscard());
-
-        // Make sure it doesn't duplicate the cookie
-        $this->jar->setCookie(new SetCookie($data));
-        $this->assertEquals(1, count($this->jar));
-
-        // Make sure the more future-ful expiration date supersede the other
-        $data['Expires'] = time() + 2000;
-        $this->assertTrue($this->jar->setCookie(new SetCookie($data)));
-        $this->assertEquals(1, count($this->jar));
-        $c = $this->jar->getIterator()->getArrayCopy();
-        $this->assertNotEquals($t, $c[0]->getExpires());
-    }
-
-    public function testOverwritesCookiesThatHaveChanged()
-    {
-        $t = time() + 1000;
-        $data = array(
-            'Name'    => 'foo',
-            'Value'   => 'bar',
-            'Domain'  => '.example.com',
-            'Path'    => '/',
-            'Max-Age' => '86400',
-            'Secure'  => true,
-            'Discard' => true,
-            'Expires' => $t
-        );
-
-        // Make sure that the discard cookie is overridden with the non-discard
-        $this->assertTrue($this->jar->setCookie(new SetCookie($data)));
-
-        $data['Value'] = 'boo';
-        $this->assertTrue($this->jar->setCookie(new SetCookie($data)));
-        $this->assertEquals(1, count($this->jar));
-
-        // Changing the value plus a parameter also must overwrite the existing one
-        $data['Value'] = 'zoo';
-        $data['Secure'] = false;
-        $this->assertTrue($this->jar->setCookie(new SetCookie($data)));
-        $this->assertEquals(1, count($this->jar));
-
-        $c = $this->jar->getIterator()->getArrayCopy();
-        $this->assertEquals('zoo', $c[0]->getValue());
-    }
-
-    public function testAddsCookiesFromResponseWithRequest()
-    {
-        $response = new Response(200, array(
-            'Set-Cookie' => "fpc=d=.Hm.yh4.1XmJWjJfs4orLQzKzPImxklQoxXSHOZATHUSEFciRueW_7704iYUtsXNEXq0M92Px2glMdWypmJ7HIQl6XIUvrZimWjQ3vIdeuRbI.FNQMAfcxu_XN1zSx7l.AcPdKL6guHc2V7hIQFhnjRW0rxm2oHY1P4bGQxFNz7f.tHm12ZD3DbdMDiDy7TBXsuP4DM-&v=2; expires=Fri, 02-Mar-2019 02:17:40 GMT;"
-        ));
-        $request = new Request('GET', 'http://www.example.com');
-        $this->jar->extractCookies($request, $response);
-        $this->assertEquals(1, count($this->jar));
-    }
-
-    public function getMatchingCookiesDataProvider()
-    {
-        return array(
-            array('https://example.com', 'foo=bar; baz=foobar'),
-            array('http://example.com', ''),
-            array('https://example.com:8912', 'foo=bar; baz=foobar'),
-            array('https://foo.example.com', 'foo=bar; baz=foobar'),
-            array('http://foo.example.com/test/acme/', 'googoo=gaga')
-        );
-    }
-
-    /**
-     * @dataProvider getMatchingCookiesDataProvider
-     */
-    public function testReturnsCookiesMatchingRequests($url, $cookies)
-    {
-        $bag = [
-            new SetCookie([
-                'Name'    => 'foo',
-                'Value'   => 'bar',
-                'Domain'  => 'example.com',
-                'Path'    => '/',
-                'Max-Age' => '86400',
-                'Secure'  => true
-            ]),
-            new SetCookie([
-                'Name'    => 'baz',
-                'Value'   => 'foobar',
-                'Domain'  => 'example.com',
-                'Path'    => '/',
-                'Max-Age' => '86400',
-                'Secure'  => true
-            ]),
-            new SetCookie([
-                'Name'    => 'test',
-                'Value'   => '123',
-                'Domain'  => 'www.foobar.com',
-                'Path'    => '/path/',
-                'Discard' => true
-            ]),
-            new SetCookie([
-                'Name'    => 'muppet',
-                'Value'   => 'cookie_monster',
-                'Domain'  => '.y.example.com',
-                'Path'    => '/acme/',
-                'Expires' => time() + 86400
-            ]),
-            new SetCookie([
-                'Name'    => 'googoo',
-                'Value'   => 'gaga',
-                'Domain'  => '.example.com',
-                'Path'    => '/test/acme/',
-                'Max-Age' => 1500
-            ])
-        ];
-
-        foreach ($bag as $cookie) {
-            $this->jar->setCookie($cookie);
-        }
-
-        $request = new Request('GET', $url);
-        $this->jar->addCookieHeader($request);
-        $this->assertEquals($cookies, $request->getHeader('Cookie'));
-    }
-
-    /**
-     * @expectedException \RuntimeException
-     * @expectedExceptionMessage Invalid cookie: Cookie name must not cannot invalid characters:
-     */
-    public function testThrowsExceptionWithStrictMode()
-    {
-        $a = new CookieJar(true);
-        $a->setCookie(new SetCookie(['Name' => "abc\n", 'Value' => 'foo', 'Domain' => 'bar']));
-    }
-
-    public function testDeletesCookiesByName()
-    {
-        $cookies = $this->getTestCookies();
-        $cookies[] = new SetCookie([
-            'Name' => 'other',
-            'Value' => '123',
-            'Domain' => 'bar.com',
-            'Path' => '/boo',
-            'Expires' => time() + 1000
-        ]);
-        $jar = new CookieJar();
-        foreach ($cookies as $cookie) {
-            $jar->setCookie($cookie);
-        }
-        $this->assertCount(4, $jar);
-        $jar->clear('bar.com', '/boo', 'other');
-        $this->assertCount(3, $jar);
-        $names = array_map(function (SetCookie $c) {
-            return $c->getName();
-        }, $jar->getIterator()->getArrayCopy());
-        $this->assertEquals(['foo', 'test', 'you'], $names);
-    }
-
-    public function testCanConvertToAndLoadFromArray()
-    {
-        $jar = new CookieJar(true);
-        foreach ($this->getTestCookies() as $cookie) {
-            $jar->setCookie($cookie);
-        }
-        $this->assertCount(3, $jar);
-        $arr = $jar->toArray();
-        $this->assertCount(3, $arr);
-        $newCookieJar = new CookieJar(false, $arr);
-        $this->assertCount(3, $newCookieJar);
-        $this->assertSame($jar->toArray(), $newCookieJar->toArray());
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/Cookie/FileCookieJarTest.php b/core/vendor/guzzlehttp/guzzle/tests/Cookie/FileCookieJarTest.php
deleted file mode 100644
index 1d1133715..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/Cookie/FileCookieJarTest.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests\CookieJar;
-
-use GuzzleHttp\Cookie\FileCookieJar;
-use GuzzleHttp\Cookie\SetCookie;
-
-/**
- * @covers GuzzleHttp\Cookie\FileCookieJar
- */
-class FileCookieJarTest extends \PHPUnit_Framework_TestCase
-{
-    private $file;
-
-    public function setUp()
-    {
-        $this->file = tempnam('/tmp', 'file-cookies');
-    }
-
-    /**
-     * @expectedException \RuntimeException
-     */
-    public function testValidatesCookieFile()
-    {
-        file_put_contents($this->file, 'true');
-        new FileCookieJar($this->file);
-    }
-
-    public function testLoadsFromFileFile()
-    {
-        $jar = new FileCookieJar($this->file);
-        $this->assertEquals([], $jar->getIterator()->getArrayCopy());
-        unlink($this->file);
-    }
-
-    public function testPersistsToFileFile()
-    {
-        $jar = new FileCookieJar($this->file);
-        $jar->setCookie(new SetCookie([
-            'Name'    => 'foo',
-            'Value'   => 'bar',
-            'Domain'  => 'foo.com',
-            'Expires' => time() + 1000
-        ]));
-        $jar->setCookie(new SetCookie([
-            'Name'    => 'baz',
-            'Value'   => 'bar',
-            'Domain'  => 'foo.com',
-            'Expires' => time() + 1000
-        ]));
-        $jar->setCookie(new SetCookie([
-            'Name'    => 'boo',
-            'Value'   => 'bar',
-            'Domain'  => 'foo.com',
-        ]));
-
-        $this->assertEquals(3, count($jar));
-        unset($jar);
-
-        // Make sure it wrote to the file
-        $contents = file_get_contents($this->file);
-        $this->assertNotEmpty($contents);
-
-        // Load the cookieJar from the file
-        $jar = new FileCookieJar($this->file);
-
-        // Weeds out temporary and session cookies
-        $this->assertEquals(2, count($jar));
-        unset($jar);
-        unlink($this->file);
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/Cookie/SessionCookieJarTest.php b/core/vendor/guzzlehttp/guzzle/tests/Cookie/SessionCookieJarTest.php
deleted file mode 100644
index ccc6d4eeb..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/Cookie/SessionCookieJarTest.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-namespace GuzzleHttp\Tests\CookieJar;
-
-use GuzzleHttp\Cookie\SessionCookieJar;
-use GuzzleHttp\Cookie\SetCookie;
-
-/**
- * @covers GuzzleHttp\Cookie\SessionCookieJar
- */
-class SessionCookieJarTest extends \PHPUnit_Framework_TestCase
-{
-    private $sessionVar;
-
-    public function setUp()
-    {
-        $this->sessionVar = 'sessionKey';
-
-        if (!isset($_SESSION)) {
-            $_SESSION = array();
-        }
-    }
-
-    /**
-     * @expectedException \RuntimeException
-     */
-    public function testValidatesCookieSession()
-    {
-        $_SESSION[$this->sessionVar] = 'true';
-        new SessionCookieJar($this->sessionVar);
-    }
-
-    public function testLoadsFromSession()
-    {
-        $jar = new SessionCookieJar($this->sessionVar);
-        $this->assertEquals([], $jar->getIterator()->getArrayCopy());
-        unset($_SESSION[$this->sessionVar]);
-    }
-
-    public function testPersistsToSession()
-    {
-        $jar = new SessionCookieJar($this->sessionVar);
-        $jar->setCookie(new SetCookie([
-            'Name'    => 'foo',
-            'Value'   => 'bar',
-            'Domain'  => 'foo.com',
-            'Expires' => time() + 1000
-        ]));
-        $jar->setCookie(new SetCookie([
-            'Name'    => 'baz',
-            'Value'   => 'bar',
-            'Domain'  => 'foo.com',
-            'Expires' => time() + 1000
-        ]));
-        $jar->setCookie(new SetCookie([
-            'Name'    => 'boo',
-            'Value'   => 'bar',
-            'Domain'  => 'foo.com',
-        ]));
-
-        $this->assertEquals(3, count($jar));
-        unset($jar);
-
-        // Make sure it wrote to the sessionVar in $_SESSION
-        $contents = $_SESSION[$this->sessionVar];
-        $this->assertNotEmpty($contents);
-
-        // Load the cookieJar from the file
-        $jar = new SessionCookieJar($this->sessionVar);
-
-        // Weeds out temporary and session cookies
-        $this->assertEquals(2, count($jar));
-        unset($jar);
-        unset($_SESSION[$this->sessionVar]);
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/Cookie/SetCookieTest.php b/core/vendor/guzzlehttp/guzzle/tests/Cookie/SetCookieTest.php
deleted file mode 100644
index 3ddd08201..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/Cookie/SetCookieTest.php
+++ /dev/null
@@ -1,364 +0,0 @@
-<?php
-
-namespace GuzzleHttp\Tests\CookieJar;
-
-use GuzzleHttp\Cookie\SetCookie;
-
-/**
- * @covers GuzzleHttp\Cookie\SetCookie
- */
-class SetCookieTest extends \PHPUnit_Framework_TestCase
-{
-    public function testInitializesDefaultValues()
-    {
-        $cookie = new SetCookie();
-        $this->assertEquals('/', $cookie->getPath());
-    }
-
-    public function testConvertsDateTimeMaxAgeToUnixTimestamp()
-    {
-        $cookie = new SetCookie(['Expires' => 'November 20, 1984']);
-        $this->assertInternalType('integer', $cookie->getExpires());
-    }
-
-    public function testAddsExpiresBasedOnMaxAge()
-    {
-        $t = time();
-        $cookie = new SetCookie(['Max-Age' => 100]);
-        $this->assertEquals($t + 100, $cookie->getExpires());
-    }
-
-    public function testHoldsValues()
-    {
-        $t = time();
-        $data = array(
-            'Name'     => 'foo',
-            'Value'    => 'baz',
-            'Path'     => '/bar',
-            'Domain'   => 'baz.com',
-            'Expires'  => $t,
-            'Max-Age'  => 100,
-            'Secure'   => true,
-            'Discard'  => true,
-            'HttpOnly' => true,
-            'foo'      => 'baz',
-            'bar'      => 'bam'
-        );
-
-        $cookie = new SetCookie($data);
-        $this->assertEquals($data, $cookie->toArray());
-
-        $this->assertEquals('foo', $cookie->getName());
-        $this->assertEquals('baz', $cookie->getValue());
-        $this->assertEquals('baz.com', $cookie->getDomain());
-        $this->assertEquals('/bar', $cookie->getPath());
-        $this->assertEquals($t, $cookie->getExpires());
-        $this->assertEquals(100, $cookie->getMaxAge());
-        $this->assertTrue($cookie->getSecure());
-        $this->assertTrue($cookie->getDiscard());
-        $this->assertTrue($cookie->getHttpOnly());
-        $this->assertEquals('baz', $cookie->toArray()['foo']);
-        $this->assertEquals('bam', $cookie->toArray()['bar']);
-
-        $cookie->setName('a');
-        $cookie->setValue('b');
-        $cookie->setPath('c');
-        $cookie->setDomain('bar.com');
-        $cookie->setExpires(10);
-        $cookie->setMaxAge(200);
-        $cookie->setSecure(false);
-        $cookie->setHttpOnly(false);
-        $cookie->setDiscard(false);
-
-        $this->assertEquals('a', $cookie->getName());
-        $this->assertEquals('b', $cookie->getValue());
-        $this->assertEquals('c', $cookie->getPath());
-        $this->assertEquals('bar.com', $cookie->getDomain());
-        $this->assertEquals(10, $cookie->getExpires());
-        $this->assertEquals(200, $cookie->getMaxAge());
-        $this->assertFalse($cookie->getSecure());
-        $this->assertFalse($cookie->getDiscard());
-        $this->assertFalse($cookie->getHttpOnly());
-    }
-
-    public function testDeterminesIfExpired()
-    {
-        $c = new SetCookie();
-        $c->setExpires(10);
-        $this->assertTrue($c->isExpired());
-        $c->setExpires(time() + 10000);
-        $this->assertFalse($c->isExpired());
-    }
-
-    public function testMatchesDomain()
-    {
-        $cookie = new SetCookie();
-        $this->assertTrue($cookie->matchesDomain('baz.com'));
-
-        $cookie->setDomain('baz.com');
-        $this->assertTrue($cookie->matchesDomain('baz.com'));
-        $this->assertFalse($cookie->matchesDomain('bar.com'));
-
-        $cookie->setDomain('.baz.com');
-        $this->assertTrue($cookie->matchesDomain('.baz.com'));
-        $this->assertTrue($cookie->matchesDomain('foo.baz.com'));
-        $this->assertFalse($cookie->matchesDomain('baz.bar.com'));
-        $this->assertTrue($cookie->matchesDomain('baz.com'));
-
-        $cookie->setDomain('.127.0.0.1');
-        $this->assertTrue($cookie->matchesDomain('127.0.0.1'));
-
-        $cookie->setDomain('127.0.0.1');
-        $this->assertTrue($cookie->matchesDomain('127.0.0.1'));
-
-        $cookie->setDomain('.com.');
-        $this->assertFalse($cookie->matchesDomain('baz.com'));
-
-        $cookie->setDomain('.local');
-        $this->assertTrue($cookie->matchesDomain('example.local'));
-    }
-
-    public function testMatchesPath()
-    {
-        $cookie = new SetCookie();
-        $this->assertTrue($cookie->matchesPath('/foo'));
-
-        $cookie->setPath('/foo');
-        $this->assertTrue($cookie->matchesPath('/foo'));
-        $this->assertTrue($cookie->matchesPath('/foo/bar'));
-        $this->assertFalse($cookie->matchesPath('/bar'));
-    }
-
-    public function cookieValidateProvider()
-    {
-        return array(
-            array('foo', 'baz', 'bar', true),
-            array('0', '0', '0', true),
-            array('', 'baz', 'bar', 'The cookie name must not be empty'),
-            array('foo', '', 'bar', 'The cookie value must not be empty'),
-            array('foo', 'baz', '', 'The cookie domain must not be empty'),
-            array("foo\r", 'baz', '0', 'Cookie name must not cannot invalid characters: =,; \t\r\n\013\014'),
-        );
-    }
-
-    /**
-     * @dataProvider cookieValidateProvider
-     */
-    public function testValidatesCookies($name, $value, $domain, $result)
-    {
-        $cookie = new SetCookie(array(
-            'Name'   => $name,
-            'Value'  => $value,
-            'Domain' => $domain
-        ));
-        $this->assertSame($result, $cookie->validate());
-    }
-
-    public function testDoesNotMatchIp()
-    {
-        $cookie = new SetCookie(['Domain' => '192.168.16.']);
-        $this->assertFalse($cookie->matchesDomain('192.168.16.121'));
-    }
-
-    public function testConvertsToString()
-    {
-        $t = 1382916008;
-        $cookie = new SetCookie([
-            'Name' => 'test',
-            'Value' => '123',
-            'Domain' => 'foo.com',
-            'Expires' => $t,
-            'Path' => '/abc',
-            'HttpOnly' => true,
-            'Secure' => true
-        ]);
-        $this->assertEquals(
-            'test=123; Domain=foo.com; Path=/abc; Expires=Sun, 27 Oct 2013 23:20:08 GMT; Secure; HttpOnly',
-            (string) $cookie
-        );
-    }
-
-    /**
-     * Provides the parsed information from a cookie
-     *
-     * @return array
-     */
-    public function cookieParserDataProvider()
-    {
-        return array(
-            array(
-                'ASIHTTPRequestTestCookie=This+is+the+value; expires=Sat, 26-Jul-2008 17:00:42 GMT; path=/tests; domain=allseeing-i.com; PHPSESSID=6c951590e7a9359bcedde25cda73e43c; path=/";',
-                array(
-                    'Domain' => 'allseeing-i.com',
-                    'Path' => '/',
-                    'PHPSESSID' => '6c951590e7a9359bcedde25cda73e43c',
-                    'Max-Age' => NULL,
-                    'Expires' => 'Sat, 26-Jul-2008 17:00:42 GMT',
-                    'Secure' => NULL,
-                    'Discard' => NULL,
-                    'Name' => 'ASIHTTPRequestTestCookie',
-                    'Value' => 'This+is+the+value',
-                    'HttpOnly' => false
-                )
-            ),
-            array('', []),
-            array('foo', []),
-            // Test setting a blank value for a cookie
-            array(array(
-                'foo=', 'foo =', 'foo =;', 'foo= ;', 'foo =', 'foo= '),
-                array(
-                    'Name' => 'foo',
-                    'Value' => '',
-                    'Discard' => null,
-                    'Domain' => null,
-                    'Expires' => null,
-                    'Max-Age' => null,
-                    'Path' => '/',
-                    'Secure' => null,
-                    'HttpOnly' => false
-                )
-            ),
-            // Test setting a value and removing quotes
-            array(array(
-                'foo=1', 'foo =1', 'foo =1;', 'foo=1 ;', 'foo =1', 'foo= 1', 'foo = 1 ;', 'foo="1"', 'foo="1";', 'foo= "1";'),
-                array(
-                    'Name' => 'foo',
-                    'Value' => '1',
-                    'Discard' => null,
-                    'Domain' => null,
-                    'Expires' => null,
-                    'Max-Age' => null,
-                    'Path' => '/',
-                    'Secure' => null,
-                    'HttpOnly' => false
-                )
-            ),
-            // Some of the following tests are based on http://framework.zend.com/svn/framework/standard/trunk/tests/Zend/Http/CookieTest.php
-            array(
-                'justacookie=foo; domain=example.com',
-                array(
-                    'Name' => 'justacookie',
-                    'Value' => 'foo',
-                    'Domain' => 'example.com',
-                    'Discard' => null,
-                    'Expires' => null,
-                    'Max-Age' => null,
-                    'Path' => '/',
-                    'Secure' => null,
-                    'HttpOnly' => false
-                )
-            ),
-            array(
-                'expires=tomorrow; secure; path=/Space Out/; expires=Tue, 21-Nov-2006 08:33:44 GMT; domain=.example.com',
-                array(
-                    'Name' => 'expires',
-                    'Value' => 'tomorrow',
-                    'Domain' => '.example.com',
-                    'Path' => '/Space Out/',
-                    'Expires' => 'Tue, 21-Nov-2006 08:33:44 GMT',
-                    'Discard' => null,
-                    'Secure' => true,
-                    'Max-Age' => null,
-                    'HttpOnly' => false
-                )
-            ),
-            array(
-                'domain=unittests; expires=Tue, 21-Nov-2006 08:33:44 GMT; domain=example.com; path=/some value/',
-                array(
-                    'Name' => 'domain',
-                    'Value' => 'unittests',
-                    'Domain' => 'example.com',
-                    'Path' => '/some value/',
-                    'Expires' => 'Tue, 21-Nov-2006 08:33:44 GMT',
-                    'Secure' => false,
-                    'Discard' => null,
-                    'Max-Age' => null,
-                    'HttpOnly' => false
-                )
-            ),
-            array(
-                'path=indexAction; path=/; domain=.foo.com; expires=Tue, 21-Nov-2006 08:33:44 GMT',
-                array(
-                    'Name' => 'path',
-                    'Value' => 'indexAction',
-                    'Domain' => '.foo.com',
-                    'Path' => '/',
-                    'Expires' => 'Tue, 21-Nov-2006 08:33:44 GMT',
-                    'Secure' => false,
-                    'Discard' => null,
-                    'Max-Age' => null,
-                    'HttpOnly' => false
-                )
-            ),
-            array(
-                'secure=sha1; secure; SECURE; domain=some.really.deep.domain.com; version=1; Max-Age=86400',
-                array(
-                    'Name' => 'secure',
-                    'Value' => 'sha1',
-                    'Domain' => 'some.really.deep.domain.com',
-                    'Path' => '/',
-                    'Secure' => true,
-                    'Discard' => null,
-                    'Expires' => time() + 86400,
-                    'Max-Age' => 86400,
-                    'HttpOnly' => false,
-                    'version' => '1'
-                )
-            ),
-            array(
-                'PHPSESSID=123456789+abcd%2Cef; secure; discard; domain=.localdomain; path=/foo/baz; expires=Tue, 21-Nov-2006 08:33:44 GMT;',
-                array(
-                    'Name' => 'PHPSESSID',
-                    'Value' => '123456789+abcd%2Cef',
-                    'Domain' => '.localdomain',
-                    'Path' => '/foo/baz',
-                    'Expires' => 'Tue, 21-Nov-2006 08:33:44 GMT',
-                    'Secure' => true,
-                    'Discard' => true,
-                    'Max-Age' => null,
-                    'HttpOnly' => false
-                )
-            ),
-        );
-    }
-
-    /**
-     * @dataProvider cookieParserDataProvider
-     */
-    public function testParseCookie($cookie, $parsed)
-    {
-        foreach ((array) $cookie as $v) {
-            $c = SetCookie::fromString($v);
-            $p = $c->toArray();
-
-            if (isset($p['Expires'])) {
-                // Remove expires values from the assertion if they are relatively equal
-                if (abs($p['Expires'] != strtotime($parsed['Expires'])) < 40) {
-                    unset($p['Expires']);
-                    unset($parsed['Expires']);
-                }
-            }
-
-            if (!empty($parsed)) {
-                foreach ($parsed as $key => $value) {
-                    $this->assertEquals($parsed[$key], $p[$key], 'Comparing ' . $key . ' ' . var_export($value, true) . ' : ' . var_export($parsed, true) . ' | ' . var_export($p, true));
-                }
-                foreach ($p as $key => $value) {
-                    $this->assertEquals($p[$key], $parsed[$key], 'Comparing ' . $key . ' ' . var_export($value, true) . ' : ' . var_export($parsed, true) . ' | ' . var_export($p, true));
-                }
-            } else {
-                $this->assertEquals([
-                    'Name' => null,
-                    'Value' => null,
-                    'Domain' => null,
-                    'Path' => '/',
-                    'Max-Age' => null,
-                    'Expires' => null,
-                    'Secure' => false,
-                    'Discard' => false,
-                    'HttpOnly' => false,
-                ], $p);
-            }
-        }
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/Event/AbstractEventTest.php b/core/vendor/guzzlehttp/guzzle/tests/Event/AbstractEventTest.php
deleted file mode 100644
index b8c06f152..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/Event/AbstractEventTest.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests\Event;
-
-class AbstractEventTest extends \PHPUnit_Framework_TestCase
-{
-    public function testStopsPropagation()
-    {
-        $e = $this->getMockBuilder('GuzzleHttp\Event\AbstractEvent')
-            ->getMockForAbstractClass();
-        $this->assertFalse($e->isPropagationStopped());
-        $e->stopPropagation();
-        $this->assertTrue($e->isPropagationStopped());
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/Event/AbstractRequestEventTest.php b/core/vendor/guzzlehttp/guzzle/tests/Event/AbstractRequestEventTest.php
deleted file mode 100644
index 50536c582..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/Event/AbstractRequestEventTest.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests\Event;
-
-use GuzzleHttp\Client;
-use GuzzleHttp\Transaction;
-use GuzzleHttp\Message\Request;
-
-/**
- * @covers GuzzleHttp\Event\AbstractRequestEvent
- */
-class AbstractRequestEventTest extends \PHPUnit_Framework_TestCase
-{
-    public function testHasTransactionMethods()
-    {
-        $t = new Transaction(new Client(), new Request('GET', '/'));
-        $e = $this->getMockBuilder('GuzzleHttp\Event\AbstractRequestEvent')
-            ->setConstructorArgs([$t])
-            ->getMockForAbstractClass();
-        $this->assertSame($t->client, $e->getClient());
-        $this->assertSame($t->request, $e->getRequest());
-    }
-
-    public function testHasTransaction()
-    {
-        $t = new Transaction(new Client(), new Request('GET', '/'));
-        $e = $this->getMockBuilder('GuzzleHttp\Event\AbstractRequestEvent')
-            ->setConstructorArgs([$t])
-            ->getMockForAbstractClass();
-        $r = new \ReflectionMethod($e, 'getTransaction');
-        $r->setAccessible(true);
-        $this->assertSame($t, $r->invoke($e));
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/Event/AbstractRetryableEventTest.php b/core/vendor/guzzlehttp/guzzle/tests/Event/AbstractRetryableEventTest.php
deleted file mode 100644
index 6a39d8bb0..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/Event/AbstractRetryableEventTest.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests\Event;
-
-use GuzzleHttp\Client;
-use GuzzleHttp\Transaction;
-use GuzzleHttp\Message\Request;
-
-/**
- * @covers GuzzleHttp\Event\AbstractRetryableEvent
- */
-class AbstractRetryableEventTest extends \PHPUnit_Framework_TestCase
-{
-    public function testCanRetry()
-    {
-        $t = new Transaction(new Client(), new Request('GET', '/'));
-        $t->transferInfo = ['foo' => 'bar'];
-        $e = $this->getMockBuilder('GuzzleHttp\Event\AbstractRetryableEvent')
-            ->setConstructorArgs([$t])
-            ->getMockForAbstractClass();
-        $e->retry();
-        $this->assertTrue($e->isPropagationStopped());
-        $this->assertEquals('retry', $t->state);
-    }
-
-    public function testCanRetryAfterDelay()
-    {
-        $t = new Transaction(new Client(), new Request('GET', '/'));
-        $t->transferInfo = ['foo' => 'bar'];
-        $e = $this->getMockBuilder('GuzzleHttp\Event\AbstractRetryableEvent')
-            ->setConstructorArgs([$t])
-            ->getMockForAbstractClass();
-        $e->retry(10);
-        $this->assertTrue($e->isPropagationStopped());
-        $this->assertEquals('retry', $t->state);
-        $this->assertEquals(10, $t->request->getConfig()->get('delay'));
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/Event/AbstractTransferEventTest.php b/core/vendor/guzzlehttp/guzzle/tests/Event/AbstractTransferEventTest.php
deleted file mode 100644
index 5313c8e7f..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/Event/AbstractTransferEventTest.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests\Event;
-
-use GuzzleHttp\Client;
-use GuzzleHttp\Message\Response;
-use GuzzleHttp\Transaction;
-use GuzzleHttp\Message\Request;
-
-/**
- * @covers GuzzleHttp\Event\AbstractTransferEvent
- */
-class AbstractTransferEventTest extends \PHPUnit_Framework_TestCase
-{
-    public function testHasStats()
-    {
-        $t = new Transaction(new Client(), new Request('GET', '/'));
-        $t->transferInfo = ['foo' => 'bar'];
-        $e = $this->getMockBuilder('GuzzleHttp\Event\AbstractTransferEvent')
-            ->setConstructorArgs([$t])
-            ->getMockForAbstractClass();
-        $this->assertNull($e->getTransferInfo('baz'));
-        $this->assertEquals('bar', $e->getTransferInfo('foo'));
-        $this->assertEquals($t->transferInfo, $e->getTransferInfo());
-    }
-
-    public function testHasResponse()
-    {
-        $t = new Transaction(new Client(), new Request('GET', '/'));
-        $t->response = new Response(200);
-        $e = $this->getMockBuilder('GuzzleHttp\Event\AbstractTransferEvent')
-            ->setConstructorArgs([$t])
-            ->getMockForAbstractClass();
-        $this->assertTrue($e->hasResponse());
-        $this->assertSame($t->response, $e->getResponse());
-    }
-
-    public function testCanInterceptWithResponse()
-    {
-        $t = new Transaction(new Client(), new Request('GET', '/'));
-        $r = new Response(200);
-        $e = $this->getMockBuilder('GuzzleHttp\Event\AbstractTransferEvent')
-            ->setConstructorArgs([$t])
-            ->getMockForAbstractClass();
-        $e->intercept($r);
-        $this->assertSame($t->response, $r);
-        $this->assertSame($t->response, $e->getResponse());
-        $this->assertTrue($e->isPropagationStopped());
-    }
-
-    public function testReturnsNumberOfRetries()
-    {
-        $t = new Transaction(new Client(), new Request('GET', '/'));
-        $t->retries = 2;
-        $e = $this->getMockBuilder('GuzzleHttp\Event\AbstractTransferEvent')
-            ->setConstructorArgs([$t])
-            ->getMockForAbstractClass();
-        $this->assertEquals(2, $e->getRetryCount());
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/Event/BeforeEventTest.php b/core/vendor/guzzlehttp/guzzle/tests/Event/BeforeEventTest.php
deleted file mode 100644
index 469e4e251..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/Event/BeforeEventTest.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests\Event;
-
-use GuzzleHttp\Transaction;
-use GuzzleHttp\Client;
-use GuzzleHttp\Event\BeforeEvent;
-use GuzzleHttp\Message\Request;
-use GuzzleHttp\Message\Response;
-
-/**
- * @covers GuzzleHttp\Event\BeforeEvent
- */
-class BeforeEventTest extends \PHPUnit_Framework_TestCase
-{
-    public function testInterceptsWithEvent()
-    {
-        $t = new Transaction(new Client(), new Request('GET', '/'));
-        $t->exception = new \Exception('foo');
-        $e = new BeforeEvent($t);
-        $response = new Response(200);
-        $e->intercept($response);
-        $this->assertTrue($e->isPropagationStopped());
-        $this->assertSame($t->response, $response);
-        $this->assertNull($t->exception);
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/Event/EmitterTest.php b/core/vendor/guzzlehttp/guzzle/tests/Event/EmitterTest.php
deleted file mode 100644
index 5b7061bc6..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/Event/EmitterTest.php
+++ /dev/null
@@ -1,363 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests\Event;
-
-use GuzzleHttp\Event\Emitter;
-use GuzzleHttp\Event\EventInterface;
-use GuzzleHttp\Event\SubscriberInterface;
-
-/**
- * @link https://github.com/symfony/symfony/blob/master/src/Symfony/Component/EventDispatcher/Tests/EventDispatcherTest.php Based on this test.
- */
-class EmitterTest extends \PHPUnit_Framework_TestCase
-{
-    /* Some pseudo events */
-    const preFoo = 'pre.foo';
-    const postFoo = 'post.foo';
-    const preBar = 'pre.bar';
-    const postBar = 'post.bar';
-
-    /** @var Emitter */
-    private $emitter;
-    private $listener;
-
-    protected function setUp()
-    {
-        $this->emitter = new Emitter();
-        $this->listener = new TestEventListener();
-    }
-
-    protected function tearDown()
-    {
-        $this->emitter = null;
-        $this->listener = null;
-    }
-
-    public function testInitialState()
-    {
-        $this->assertEquals(array(), $this->emitter->listeners());
-    }
-
-    public function testAddListener()
-    {
-        $this->emitter->on('pre.foo', array($this->listener, 'preFoo'));
-        $this->emitter->on('post.foo', array($this->listener, 'postFoo'));
-        $this->assertTrue($this->emitter->hasListeners(self::preFoo));
-        $this->assertTrue($this->emitter->hasListeners(self::preFoo));
-        $this->assertCount(1, $this->emitter->listeners(self::postFoo));
-        $this->assertCount(1, $this->emitter->listeners(self::postFoo));
-        $this->assertCount(2, $this->emitter->listeners());
-    }
-
-    public function testGetListenersSortsByPriority()
-    {
-        $listener1 = new TestEventListener();
-        $listener2 = new TestEventListener();
-        $listener3 = new TestEventListener();
-        $listener1->name = '1';
-        $listener2->name = '2';
-        $listener3->name = '3';
-
-        $this->emitter->on('pre.foo', array($listener1, 'preFoo'), -10);
-        $this->emitter->on('pre.foo', array($listener2, 'preFoo'), 10);
-        $this->emitter->on('pre.foo', array($listener3, 'preFoo'));
-
-        $expected = array(
-            array($listener2, 'preFoo'),
-            array($listener3, 'preFoo'),
-            array($listener1, 'preFoo'),
-        );
-
-        $this->assertSame($expected, $this->emitter->listeners('pre.foo'));
-    }
-
-    public function testGetAllListenersSortsByPriority()
-    {
-        $listener1 = new TestEventListener();
-        $listener2 = new TestEventListener();
-        $listener3 = new TestEventListener();
-        $listener4 = new TestEventListener();
-        $listener5 = new TestEventListener();
-        $listener6 = new TestEventListener();
-
-        $this->emitter->on('pre.foo', [$listener1, 'preFoo'], -10);
-        $this->emitter->on('pre.foo', [$listener2, 'preFoo']);
-        $this->emitter->on('pre.foo', [$listener3, 'preFoo'], 10);
-        $this->emitter->on('post.foo', [$listener4, 'preFoo'], -10);
-        $this->emitter->on('post.foo', [$listener5, 'preFoo']);
-        $this->emitter->on('post.foo', [$listener6, 'preFoo'], 10);
-
-        $expected = [
-            'pre.foo'  => [[$listener3, 'preFoo'], [$listener2, 'preFoo'], [$listener1, 'preFoo']],
-            'post.foo' => [[$listener6, 'preFoo'], [$listener5, 'preFoo'], [$listener4, 'preFoo']],
-        ];
-
-        $this->assertSame($expected, $this->emitter->listeners());
-    }
-
-    public function testDispatch()
-    {
-        $this->emitter->on('pre.foo', array($this->listener, 'preFoo'));
-        $this->emitter->on('post.foo', array($this->listener, 'postFoo'));
-        $this->emitter->emit(self::preFoo, $this->getEvent());
-        $this->assertTrue($this->listener->preFooInvoked);
-        $this->assertFalse($this->listener->postFooInvoked);
-        $this->assertInstanceOf('GuzzleHttp\Event\EventInterface', $this->emitter->emit(self::preFoo, $this->getEvent()));
-        $event = $this->getEvent();
-        $return = $this->emitter->emit(self::preFoo, $event);
-        $this->assertSame($event, $return);
-    }
-
-    public function testDispatchForClosure()
-    {
-        $invoked = 0;
-        $listener = function () use (&$invoked) {
-            $invoked++;
-        };
-        $this->emitter->on('pre.foo', $listener);
-        $this->emitter->on('post.foo', $listener);
-        $this->emitter->emit(self::preFoo, $this->getEvent());
-        $this->assertEquals(1, $invoked);
-    }
-
-    public function testStopEventPropagation()
-    {
-        $otherListener = new TestEventListener();
-
-        // postFoo() stops the propagation, so only one listener should
-        // be executed
-        // Manually set priority to enforce $this->listener to be called first
-        $this->emitter->on('post.foo', array($this->listener, 'postFoo'), 10);
-        $this->emitter->on('post.foo', array($otherListener, 'preFoo'));
-        $this->emitter->emit(self::postFoo, $this->getEvent());
-        $this->assertTrue($this->listener->postFooInvoked);
-        $this->assertFalse($otherListener->postFooInvoked);
-    }
-
-    public function testDispatchByPriority()
-    {
-        $invoked = array();
-        $listener1 = function () use (&$invoked) {
-            $invoked[] = '1';
-        };
-        $listener2 = function () use (&$invoked) {
-            $invoked[] = '2';
-        };
-        $listener3 = function () use (&$invoked) {
-            $invoked[] = '3';
-        };
-        $this->emitter->on('pre.foo', $listener1, -10);
-        $this->emitter->on('pre.foo', $listener2);
-        $this->emitter->on('pre.foo', $listener3, 10);
-        $this->emitter->emit(self::preFoo, $this->getEvent());
-        $this->assertEquals(array('3', '2', '1'), $invoked);
-    }
-
-    public function testRemoveListener()
-    {
-        $this->emitter->on('pre.bar', [$this->listener, 'preFoo']);
-        $this->assertNotEmpty($this->emitter->listeners(self::preBar));
-        $this->emitter->removeListener('pre.bar', [$this->listener, 'preFoo']);
-        $this->assertEmpty($this->emitter->listeners(self::preBar));
-        $this->emitter->removeListener('notExists', [$this->listener, 'preFoo']);
-    }
-
-    public function testAddSubscriber()
-    {
-        $eventSubscriber = new TestEventSubscriber();
-        $this->emitter->attach($eventSubscriber);
-        $this->assertNotEmpty($this->emitter->listeners(self::preFoo));
-        $this->assertNotEmpty($this->emitter->listeners(self::postFoo));
-    }
-
-    public function testAddSubscriberWithMultiple()
-    {
-        $eventSubscriber = new TestEventSubscriberWithMultiple();
-        $this->emitter->attach($eventSubscriber);
-        $listeners = $this->emitter->listeners('pre.foo');
-        $this->assertNotEmpty($this->emitter->listeners(self::preFoo));
-        $this->assertCount(2, $listeners);
-    }
-
-    public function testAddSubscriberWithPriorities()
-    {
-        $eventSubscriber = new TestEventSubscriber();
-        $this->emitter->attach($eventSubscriber);
-
-        $eventSubscriber = new TestEventSubscriberWithPriorities();
-        $this->emitter->attach($eventSubscriber);
-
-        $listeners = $this->emitter->listeners('pre.foo');
-        $this->assertNotEmpty($this->emitter->listeners(self::preFoo));
-        $this->assertCount(2, $listeners);
-        $this->assertInstanceOf('GuzzleHttp\Tests\Event\TestEventSubscriberWithPriorities', $listeners[0][0]);
-    }
-
-    public function testdetach()
-    {
-        $eventSubscriber = new TestEventSubscriber();
-        $this->emitter->attach($eventSubscriber);
-        $this->assertNotEmpty($this->emitter->listeners(self::preFoo));
-        $this->assertNotEmpty($this->emitter->listeners(self::postFoo));
-        $this->emitter->detach($eventSubscriber);
-        $this->assertEmpty($this->emitter->listeners(self::preFoo));
-        $this->assertEmpty($this->emitter->listeners(self::postFoo));
-    }
-
-    public function testdetachWithPriorities()
-    {
-        $eventSubscriber = new TestEventSubscriberWithPriorities();
-        $this->emitter->attach($eventSubscriber);
-        $this->assertNotEmpty($this->emitter->listeners(self::preFoo));
-        $this->assertNotEmpty($this->emitter->listeners(self::postFoo));
-        $this->emitter->detach($eventSubscriber);
-        $this->assertEmpty($this->emitter->listeners(self::preFoo));
-        $this->assertEmpty($this->emitter->listeners(self::postFoo));
-    }
-
-    public function testEventReceivesEventNameAsArgument()
-    {
-        $listener = new TestWithDispatcher();
-        $this->emitter->on('test', array($listener, 'foo'));
-        $this->assertNull($listener->name);
-        $this->emitter->emit('test', $this->getEvent());
-        $this->assertEquals('test', $listener->name);
-    }
-
-    /**
-     * @see https://bugs.php.net/bug.php?id=62976
-     *
-     * This bug affects:
-     *  - The PHP 5.3 branch for versions < 5.3.18
-     *  - The PHP 5.4 branch for versions < 5.4.8
-     *  - The PHP 5.5 branch is not affected
-     */
-    public function testWorkaroundForPhpBug62976()
-    {
-        $dispatcher = new Emitter();
-        $dispatcher->on('bug.62976', new CallableClass());
-        $dispatcher->removeListener('bug.62976', function () {});
-        $this->assertNotEmpty($dispatcher->listeners('bug.62976'));
-    }
-
-    public function testRegistersEventsOnce()
-    {
-        $this->emitter->once('pre.foo', array($this->listener, 'preFoo'));
-        $this->emitter->on('pre.foo', array($this->listener, 'preFoo'));
-        $this->assertCount(2, $this->emitter->listeners(self::preFoo));
-        $this->emitter->emit(self::preFoo, $this->getEvent());
-        $this->assertTrue($this->listener->preFooInvoked);
-        $this->assertCount(1, $this->emitter->listeners(self::preFoo));
-    }
-
-    public function testReturnsEmptyArrayForNonExistentEvent()
-    {
-        $this->assertEquals([], $this->emitter->listeners('doesnotexist'));
-    }
-
-    public function testCanAddFirstAndLastListeners()
-    {
-        $b = '';
-        $this->emitter->on('foo', function () use (&$b) { $b .= 'a'; }, 'first'); // 1
-        $this->emitter->on('foo', function () use (&$b) { $b .= 'b'; }, 'last');  // 0
-        $this->emitter->on('foo', function () use (&$b) { $b .= 'c'; }, 'first'); // 2
-        $this->emitter->on('foo', function () use (&$b) { $b .= 'd'; }, 'first'); // 3
-        $this->emitter->on('foo', function () use (&$b) { $b .= 'e'; }, 'first'); // 4
-        $this->emitter->on('foo', function () use (&$b) { $b .= 'f'; });          // 0
-        $this->emitter->emit('foo', $this->getEvent());
-        $this->assertEquals('edcabf', $b);
-    }
-
-    /**
-     * @return \GuzzleHttp\Event\EventInterface
-     */
-    private function getEvent()
-    {
-        return $this->getMockBuilder('GuzzleHttp\Event\AbstractEvent')
-            ->getMockForAbstractClass();
-    }
-}
-
-class CallableClass
-{
-    public function __invoke()
-    {
-    }
-}
-
-class TestEventListener
-{
-    public $preFooInvoked = false;
-    public $postFooInvoked = false;
-
-    /* Listener methods */
-
-    public function preFoo(EventInterface $e)
-    {
-        $this->preFooInvoked = true;
-    }
-
-    public function postFoo(EventInterface $e)
-    {
-        $this->postFooInvoked = true;
-
-        $e->stopPropagation();
-    }
-
-    /**
-     * @expectedException \PHPUnit_Framework_Error_Deprecated
-     */
-    public function testHasDeprecatedAddListener()
-    {
-        $emitter = new Emitter();
-        $emitter->addListener('foo', function () {});
-    }
-
-    /**
-     * @expectedException \PHPUnit_Framework_Error_Deprecated
-     */
-    public function testHasDeprecatedAddSubscriber()
-    {
-        $emitter = new Emitter();
-        $emitter->addSubscriber('foo', new TestEventSubscriber());
-    }
-}
-
-class TestWithDispatcher
-{
-    public $name;
-
-    public function foo(EventInterface $e, $name)
-    {
-        $this->name = $name;
-    }
-}
-
-class TestEventSubscriber extends TestEventListener implements SubscriberInterface
-{
-    public function getEvents()
-    {
-        return [
-            'pre.foo' => ['preFoo'],
-            'post.foo' => ['postFoo']
-        ];
-    }
-}
-
-class TestEventSubscriberWithPriorities extends TestEventListener implements SubscriberInterface
-{
-    public function getEvents()
-    {
-        return [
-            'pre.foo' => ['preFoo', 10],
-            'post.foo' => ['postFoo']
-        ];
-    }
-}
-
-class TestEventSubscriberWithMultiple extends TestEventListener implements SubscriberInterface
-{
-    public function getEvents()
-    {
-        return ['pre.foo' => [['preFoo', 10],['preFoo', 20]]];
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/Event/ErrorEventTest.php b/core/vendor/guzzlehttp/guzzle/tests/Event/ErrorEventTest.php
deleted file mode 100644
index e91b7f0c3..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/Event/ErrorEventTest.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests\Event;
-
-use GuzzleHttp\Transaction;
-use GuzzleHttp\Client;
-use GuzzleHttp\Event\ErrorEvent;
-use GuzzleHttp\Exception\RequestException;
-use GuzzleHttp\Message\Request;
-
-/**
- * @covers GuzzleHttp\Event\ErrorEvent
- */
-class ErrorEventTest extends \PHPUnit_Framework_TestCase
-{
-    public function testInterceptsWithEvent()
-    {
-        $t = new Transaction(new Client(), new Request('GET', '/'));
-        $except = new RequestException('foo', $t->request);
-        $t->exception = $except;
-        $e = new ErrorEvent($t);
-        $this->assertSame($e->getException(), $t->exception);
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/Event/HasEmitterTraitTest.php b/core/vendor/guzzlehttp/guzzle/tests/Event/HasEmitterTraitTest.php
deleted file mode 100644
index 470991871..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/Event/HasEmitterTraitTest.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests\Event;
-
-use GuzzleHttp\Event\HasEmitterInterface;
-use GuzzleHttp\Event\HasEmitterTrait;
-
-class AbstractHasEmitter implements HasEmitterInterface
-{
-    use HasEmitterTrait;
-}
-
-/**
- * @covers GuzzleHttp\Event\HasEmitterTrait
- */
-class HasEmitterTraitTest extends \PHPUnit_Framework_TestCase
-{
-    public function testHelperAttachesSubscribers()
-    {
-        $mock = $this->getMockBuilder('GuzzleHttp\Tests\Event\AbstractHasEmitter')
-            ->getMockForAbstractClass();
-
-        $result = $mock->getEmitter();
-        $this->assertInstanceOf('GuzzleHttp\Event\EmitterInterface', $result);
-        $result2 = $mock->getEmitter();
-        $this->assertSame($result, $result2);
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/Event/ListenerAttacherTraitTest.php b/core/vendor/guzzlehttp/guzzle/tests/Event/ListenerAttacherTraitTest.php
deleted file mode 100644
index c066788bc..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/Event/ListenerAttacherTraitTest.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests\Event;
-
-use GuzzleHttp\Event\HasEmitterInterface;
-use GuzzleHttp\Event\HasEmitterTrait;
-use GuzzleHttp\Event\ListenerAttacherTrait;
-
-class ObjectWithEvents implements HasEmitterInterface
-{
-    use HasEmitterTrait, ListenerAttacherTrait;
-
-    public $listeners = [];
-
-    public function __construct(array $args = [])
-    {
-        $this->listeners = $this->prepareListeners($args, ['foo', 'bar']);
-        $this->attachListeners($this, $this->listeners);
-    }
-}
-
-class ListenerAttacherTraitTest extends \PHPUnit_Framework_TestCase
-{
-    public function testRegistersEvents()
-    {
-        $fn = function () {};
-        $o = new ObjectWithEvents([
-            'foo' => $fn,
-            'bar' => $fn,
-        ]);
-
-        $this->assertEquals([
-            ['name' => 'foo', 'fn' => $fn, 'priority' => 0, 'once' => false],
-            ['name' => 'bar', 'fn' => $fn, 'priority' => 0, 'once' => false],
-        ], $o->listeners);
-
-        $this->assertCount(1, $o->getEmitter()->listeners('foo'));
-        $this->assertCount(1, $o->getEmitter()->listeners('bar'));
-    }
-
-    public function testRegistersEventsWithPriorities()
-    {
-        $fn = function () {};
-        $o = new ObjectWithEvents([
-            'foo' => ['fn' => $fn, 'priority' => 99, 'once' => true],
-            'bar' => ['fn' => $fn, 'priority' => 50],
-        ]);
-
-        $this->assertEquals([
-            ['name' => 'foo', 'fn' => $fn, 'priority' => 99, 'once' => true],
-            ['name' => 'bar', 'fn' => $fn, 'priority' => 50, 'once' => false],
-        ], $o->listeners);
-    }
-
-    public function testRegistersMultipleEvents()
-    {
-        $fn = function () {};
-        $eventArray = [['fn' => $fn], ['fn' => $fn]];
-        $o = new ObjectWithEvents([
-            'foo' => $eventArray,
-            'bar' => $eventArray,
-        ]);
-
-        $this->assertEquals([
-            ['name' => 'foo', 'fn' => $fn, 'priority' => 0, 'once' => false],
-            ['name' => 'foo', 'fn' => $fn, 'priority' => 0, 'once' => false],
-            ['name' => 'bar', 'fn' => $fn, 'priority' => 0, 'once' => false],
-            ['name' => 'bar', 'fn' => $fn, 'priority' => 0, 'once' => false],
-        ], $o->listeners);
-
-        $this->assertCount(2, $o->getEmitter()->listeners('foo'));
-        $this->assertCount(2, $o->getEmitter()->listeners('bar'));
-    }
-
-    public function testRegistersEventsWithOnce()
-    {
-        $called = 0;
-        $fn = function () use (&$called) { $called++; };
-        $o = new ObjectWithEvents(['foo' => ['fn' => $fn, 'once' => true]]);
-        $ev = $this->getMock('GuzzleHttp\Event\EventInterface');
-        $o->getEmitter()->emit('foo', $ev);
-        $o->getEmitter()->emit('foo', $ev);
-        $this->assertEquals(1, $called);
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     */
-    public function testValidatesEvents()
-    {
-        $o = new ObjectWithEvents(['foo' => 'bar']);
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/Event/ProgressEventTest.php b/core/vendor/guzzlehttp/guzzle/tests/Event/ProgressEventTest.php
deleted file mode 100644
index 664f8b6bb..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/Event/ProgressEventTest.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests\Event;
-
-use GuzzleHttp\Client;
-use GuzzleHttp\Event\ProgressEvent;
-use GuzzleHttp\Message\Request;
-use GuzzleHttp\Transaction;
-
-/**
- * @covers GuzzleHttp\Event\ProgressEvent
- */
-class ProgressEventTest extends \PHPUnit_Framework_TestCase
-{
-    public function testContainsNumbers()
-    {
-        $t = new Transaction(new Client(), new Request('GET', 'http://a.com'));
-        $p = new ProgressEvent($t, 2, 1, 3, 0);
-        $this->assertSame($t->request, $p->getRequest());
-        $this->assertSame($t->client, $p->getClient());
-        $this->assertEquals(2, $p->downloadSize);
-        $this->assertEquals(1, $p->downloaded);
-        $this->assertEquals(3, $p->uploadSize);
-        $this->assertEquals(0, $p->uploaded);
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/Event/RequestEventsTest.php b/core/vendor/guzzlehttp/guzzle/tests/Event/RequestEventsTest.php
deleted file mode 100644
index b3b96660f..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/Event/RequestEventsTest.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests\Event;
-
-use GuzzleHttp\Event\RequestEvents;
-
-/**
- * @covers GuzzleHttp\Event\RequestEvents
- */
-class RequestEventsTest extends \PHPUnit_Framework_TestCase
-{
-    public function prepareEventProvider()
-    {
-        $cb = function () {};
-
-        return [
-            [[], ['complete'], $cb, ['complete' => [$cb]]],
-            [
-                ['complete' => $cb],
-                ['complete'],
-                $cb,
-                ['complete' => [$cb, $cb]]
-            ],
-            [
-                ['prepare' => []],
-                ['error', 'foo'],
-                $cb,
-                [
-                    'prepare' => [],
-                    'error'   => [$cb],
-                    'foo'     => [$cb]
-                ]
-            ],
-            [
-                ['prepare' => []],
-                ['prepare'],
-                $cb,
-                [
-                    'prepare' => [$cb]
-                ]
-            ],
-            [
-                ['prepare' => ['fn' => $cb]],
-                ['prepare'], $cb,
-                [
-                    'prepare' => [
-                        ['fn' => $cb],
-                        $cb
-                    ]
-                ]
-            ],
-        ];
-    }
-
-    /**
-     * @dataProvider prepareEventProvider
-     */
-    public function testConvertsEventArrays(
-        array $in,
-        array $events,
-        $add,
-        array $out
-    ) {
-        $result = RequestEvents::convertEventArray($in, $events, $add);
-        $this->assertEquals($out, $result);
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     */
-    public function testValidatesEventFormat()
-    {
-        RequestEvents::convertEventArray(['foo' => false], ['foo'], []);
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/Exception/ParseExceptionTest.php b/core/vendor/guzzlehttp/guzzle/tests/Exception/ParseExceptionTest.php
deleted file mode 100644
index 4ff9bfb6c..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/Exception/ParseExceptionTest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace GuzzleHttp\Tests\Event;
-
-use GuzzleHttp\Exception\ParseException;
-use GuzzleHttp\Message\Response;
-
-/**
- * @covers GuzzleHttp\Exception\ParseException
- */
-class ParseExceptionTest extends \PHPUnit_Framework_TestCase
-{
-    public function testHasResponse()
-    {
-        $res = new Response(200);
-        $e = new ParseException('foo', $res);
-        $this->assertSame($res, $e->getResponse());
-        $this->assertEquals('foo', $e->getMessage());
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/Exception/RequestExceptionTest.php b/core/vendor/guzzlehttp/guzzle/tests/Exception/RequestExceptionTest.php
deleted file mode 100644
index bea9077bf..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/Exception/RequestExceptionTest.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests\Event;
-
-use GuzzleHttp\Exception\RequestException;
-use GuzzleHttp\Message\Request;
-use GuzzleHttp\Message\Response;
-use GuzzleHttp\Ring\Exception\ConnectException;
-
-/**
- * @covers GuzzleHttp\Exception\RequestException
- */
-class RequestExceptionTest extends \PHPUnit_Framework_TestCase
-{
-    public function testHasRequestAndResponse()
-    {
-        $req = new Request('GET', '/');
-        $res = new Response(200);
-        $e = new RequestException('foo', $req, $res);
-        $this->assertSame($req, $e->getRequest());
-        $this->assertSame($res, $e->getResponse());
-        $this->assertTrue($e->hasResponse());
-        $this->assertEquals('foo', $e->getMessage());
-    }
-
-    public function testCreatesGenerateException()
-    {
-        $e = RequestException::create(new Request('GET', '/'));
-        $this->assertEquals('Error completing request', $e->getMessage());
-        $this->assertInstanceOf('GuzzleHttp\Exception\RequestException', $e);
-    }
-
-    public function testCreatesClientErrorResponseException()
-    {
-        $e = RequestException::create(new Request('GET', '/'), new Response(400));
-        $this->assertEquals(
-            'Client error response [url] / [status code] 400 [reason phrase] Bad Request',
-            $e->getMessage()
-        );
-        $this->assertInstanceOf('GuzzleHttp\Exception\ClientException', $e);
-    }
-
-    public function testCreatesServerErrorResponseException()
-    {
-        $e = RequestException::create(new Request('GET', '/'), new Response(500));
-        $this->assertEquals(
-            'Server error response [url] / [status code] 500 [reason phrase] Internal Server Error',
-            $e->getMessage()
-        );
-        $this->assertInstanceOf('GuzzleHttp\Exception\ServerException', $e);
-    }
-
-    public function testCreatesGenericErrorResponseException()
-    {
-        $e = RequestException::create(new Request('GET', '/'), new Response(600));
-        $this->assertEquals(
-            'Unsuccessful response [url] / [status code] 600 [reason phrase] ',
-            $e->getMessage()
-        );
-        $this->assertInstanceOf('GuzzleHttp\Exception\RequestException', $e);
-    }
-
-    public function testHasStatusCodeAsExceptionCode() {
-        $e = RequestException::create(new Request('GET', '/'), new Response(442));
-        $this->assertEquals(442, $e->getCode());
-    }
-
-    public function testWrapsRequestExceptions()
-    {
-        $e = new \Exception('foo');
-        $r = new Request('GET', 'http://www.oo.com');
-        $ex = RequestException::wrapException($r, $e);
-        $this->assertInstanceOf('GuzzleHttp\Exception\RequestException', $ex);
-        $this->assertSame($e, $ex->getPrevious());
-    }
-
-    public function testWrapsConnectExceptions()
-    {
-        $e = new ConnectException('foo');
-        $r = new Request('GET', 'http://www.oo.com');
-        $ex = RequestException::wrapException($r, $e);
-        $this->assertInstanceOf('GuzzleHttp\Exception\ConnectException', $ex);
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/Exception/XmlParseExceptionTest.php b/core/vendor/guzzlehttp/guzzle/tests/Exception/XmlParseExceptionTest.php
deleted file mode 100644
index 51b97425e..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/Exception/XmlParseExceptionTest.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace GuzzleHttp\tests\Exception;
-
-use GuzzleHttp\Exception\XmlParseException;
-
-/**
- * @covers GuzzleHttp\Exception\XmlParseException
- */
-class XmlParseExceptionTest extends \PHPUnit_Framework_TestCase
-{
-    public function testHasError()
-    {
-        $error = new \LibXMLError();
-        $e = new XmlParseException('foo', null, null, $error);
-        $this->assertSame($error, $e->getError());
-        $this->assertEquals('foo', $e->getMessage());
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/IntegrationTest.php b/core/vendor/guzzlehttp/guzzle/tests/IntegrationTest.php
deleted file mode 100644
index e26c64d9f..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/IntegrationTest.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests;
-
-use GuzzleHttp\Client;
-use GuzzleHttp\Event\AbstractTransferEvent;
-use GuzzleHttp\Event\CompleteEvent;
-use GuzzleHttp\Event\EndEvent;
-use GuzzleHttp\Event\ErrorEvent;
-use GuzzleHttp\Exception\RequestException;
-use GuzzleHttp\Message\Response;
-use GuzzleHttp\Pool;
-
-class IntegrationTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @issue https://github.com/guzzle/guzzle/issues/867
-     */
-    public function testDoesNotFailInEventSystemForNetworkError()
-    {
-        $c = new Client();
-        $r = $c->createRequest(
-            'GET',
-            Server::$url,
-            [
-                'timeout'         => 1,
-                'connect_timeout' => 1,
-                'proxy'           => 'http://127.0.0.1:123/foo'
-            ]
-        );
-
-        $events = [];
-        $fn = function(AbstractTransferEvent $event) use (&$events) {
-            $events[] = [
-                get_class($event),
-                $event->hasResponse(),
-                $event->getResponse()
-            ];
-        };
-
-        $pool = new Pool($c, [$r], [
-            'error'    => $fn,
-            'end'      => $fn
-        ]);
-
-        $pool->wait();
-
-        $this->assertCount(2, $events);
-        $this->assertEquals('GuzzleHttp\Event\ErrorEvent', $events[0][0]);
-        $this->assertFalse($events[0][1]);
-        $this->assertNull($events[0][2]);
-
-        $this->assertEquals('GuzzleHttp\Event\EndEvent', $events[1][0]);
-        $this->assertFalse($events[1][1]);
-        $this->assertNull($events[1][2]);
-    }
-
-    /**
-     * @issue https://github.com/guzzle/guzzle/issues/866
-     */
-    public function testProperyGetsTransferStats()
-    {
-        $transfer = [];
-        Server::enqueue([new Response(200)]);
-        $c = new Client();
-        $response = $c->get(Server::$url . '/foo', [
-            'events' => [
-                'end' => function (EndEvent $e) use (&$transfer) {
-                    $transfer = $e->getTransferInfo();
-                }
-            ]
-        ]);
-        $this->assertEquals(Server::$url . '/foo', $response->getEffectiveUrl());
-        $this->assertNotEmpty($transfer);
-        $this->assertArrayHasKey('url', $transfer);
-    }
-
-    public function testNestedFutureResponsesAreResolvedWhenSending()
-    {
-        $c = new Client();
-        $total = 3;
-        Server::enqueue([
-            new Response(200),
-            new Response(201),
-            new Response(202)
-        ]);
-        $c->getEmitter()->on(
-            'complete',
-            function (CompleteEvent $e) use (&$total) {
-                if (--$total) {
-                    $e->retry();
-                }
-            }
-        );
-        $response = $c->get(Server::$url);
-        $this->assertEquals(202, $response->getStatusCode());
-        $this->assertEquals('GuzzleHttp\Message\Response', get_class($response));
-    }
-
-    public function testNestedFutureErrorsAreResolvedWhenSending()
-    {
-        $c = new Client();
-        $total = 3;
-        Server::enqueue([
-            new Response(500),
-            new Response(501),
-            new Response(502)
-        ]);
-        $c->getEmitter()->on(
-            'error',
-            function (ErrorEvent $e) use (&$total) {
-                if (--$total) {
-                    $e->retry();
-                }
-            }
-        );
-        try {
-            $c->get(Server::$url);
-            $this->fail('Did not throw!');
-        } catch (RequestException $e) {
-            $this->assertEquals(502, $e->getResponse()->getStatusCode());
-        }
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/Message/AbstractMessageTest.php b/core/vendor/guzzlehttp/guzzle/tests/Message/AbstractMessageTest.php
deleted file mode 100644
index f02a576f5..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/Message/AbstractMessageTest.php
+++ /dev/null
@@ -1,269 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests\Message;
-
-use GuzzleHttp\Message\AbstractMessage;
-use GuzzleHttp\Message\Request;
-use GuzzleHttp\Message\Response;
-use GuzzleHttp\Stream\Stream;
-
-/**
- * @covers \GuzzleHttp\Message\AbstractMessage
- */
-class AbstractMessageTest extends \PHPUnit_Framework_TestCase
-{
-    public function testHasProtocolVersion()
-    {
-        $m = new Request('GET', '/');
-        $this->assertEquals(1.1, $m->getProtocolVersion());
-    }
-
-    public function testHasHeaders()
-    {
-        $m = new Request('GET', 'http://foo.com');
-        $this->assertFalse($m->hasHeader('foo'));
-        $m->addHeader('foo', 'bar');
-        $this->assertTrue($m->hasHeader('foo'));
-    }
-
-    public function testInitializesMessageWithProtocolVersionOption()
-    {
-        $m = new Request('GET', '/', [], null, [
-            'protocol_version' => '10'
-        ]);
-        $this->assertEquals(10, $m->getProtocolVersion());
-    }
-
-    public function testHasBody()
-    {
-        $m = new Request('GET', 'http://foo.com');
-        $this->assertNull($m->getBody());
-        $s = Stream::factory('test');
-        $m->setBody($s);
-        $this->assertSame($s, $m->getBody());
-        $this->assertFalse($m->hasHeader('Content-Length'));
-    }
-
-    public function testCanRemoveBodyBySettingToNullAndRemovesCommonBodyHeaders()
-    {
-        $m = new Request('GET', 'http://foo.com');
-        $m->setBody(Stream::factory('foo'));
-        $m->setHeader('Content-Length', 3);
-        $m->setHeader('Transfer-Encoding', 'chunked');
-        $m->setBody(null);
-        $this->assertNull($m->getBody());
-        $this->assertFalse($m->hasHeader('Content-Length'));
-        $this->assertFalse($m->hasHeader('Transfer-Encoding'));
-    }
-
-    public function testCastsToString()
-    {
-        $m = new Request('GET', 'http://foo.com');
-        $m->setHeader('foo', 'bar');
-        $m->setBody(Stream::factory('baz'));
-        $this->assertEquals("GET / HTTP/1.1\r\nHost: foo.com\r\nfoo: bar\r\n\r\nbaz", (string) $m);
-    }
-
-    public function parseParamsProvider()
-    {
-        $res1 = array(
-            array(
-                '<http:/.../front.jpeg>',
-                'rel' => 'front',
-                'type' => 'image/jpeg',
-            ),
-            array(
-                '<http://.../back.jpeg>',
-                'rel' => 'back',
-                'type' => 'image/jpeg',
-            ),
-        );
-
-        return array(
-            array(
-                '<http:/.../front.jpeg>; rel="front"; type="image/jpeg", <http://.../back.jpeg>; rel=back; type="image/jpeg"',
-                $res1
-            ),
-            array(
-                '<http:/.../front.jpeg>; rel="front"; type="image/jpeg",<http://.../back.jpeg>; rel=back; type="image/jpeg"',
-                $res1
-            ),
-            array(
-                'foo="baz"; bar=123, boo, test="123", foobar="foo;bar"',
-                array(
-                    array('foo' => 'baz', 'bar' => '123'),
-                    array('boo'),
-                    array('test' => '123'),
-                    array('foobar' => 'foo;bar')
-                )
-            ),
-            array(
-                '<http://.../side.jpeg?test=1>; rel="side"; type="image/jpeg",<http://.../side.jpeg?test=2>; rel=side; type="image/jpeg"',
-                array(
-                    array('<http://.../side.jpeg?test=1>', 'rel' => 'side', 'type' => 'image/jpeg'),
-                    array('<http://.../side.jpeg?test=2>', 'rel' => 'side', 'type' => 'image/jpeg')
-                )
-            ),
-            array(
-                '',
-                array()
-            )
-        );
-    }
-
-    /**
-     * @dataProvider parseParamsProvider
-     */
-    public function testParseParams($header, $result)
-    {
-        $request = new Request('GET', '/', ['foo' => $header]);
-        $this->assertEquals($result, Request::parseHeader($request, 'foo'));
-    }
-
-    public function testAddsHeadersWhenNotPresent()
-    {
-        $h = new Request('GET', 'http://foo.com');
-        $h->addHeader('foo', 'bar');
-        $this->assertInternalType('string', $h->getHeader('foo'));
-        $this->assertEquals('bar', $h->getHeader('foo'));
-    }
-
-    public function testAddsHeadersWhenPresentSameCase()
-    {
-        $h = new Request('GET', 'http://foo.com');
-        $h->addHeader('foo', 'bar');
-        $h->addHeader('foo', 'baz');
-        $this->assertEquals('bar, baz', $h->getHeader('foo'));
-        $this->assertEquals(['bar', 'baz'], $h->getHeaderAsArray('foo'));
-    }
-
-    public function testAddsMultipleHeaders()
-    {
-        $h = new Request('GET', 'http://foo.com');
-        $h->addHeaders([
-            'foo' => ' bar',
-            'baz' => [' bam ', 'boo']
-        ]);
-        $this->assertEquals([
-            'foo' => ['bar'],
-            'baz' => ['bam', 'boo'],
-            'Host' => ['foo.com']
-        ], $h->getHeaders());
-    }
-
-    public function testAddsHeadersWhenPresentDifferentCase()
-    {
-        $h = new Request('GET', 'http://foo.com');
-        $h->addHeader('Foo', 'bar');
-        $h->addHeader('fOO', 'baz');
-        $this->assertEquals('bar, baz', $h->getHeader('foo'));
-    }
-
-    public function testAddsHeadersWithArray()
-    {
-        $h = new Request('GET', 'http://foo.com');
-        $h->addHeader('Foo', ['bar', 'baz']);
-        $this->assertEquals('bar, baz', $h->getHeader('foo'));
-    }
-
-    public function testGetHeadersReturnsAnArrayOfOverTheWireHeaderValues()
-    {
-        $h = new Request('GET', 'http://foo.com');
-        $h->addHeader('foo', 'bar');
-        $h->addHeader('Foo', 'baz');
-        $h->addHeader('boO', 'test');
-        $result = $h->getHeaders();
-        $this->assertInternalType('array', $result);
-        $this->assertArrayHasKey('Foo', $result);
-        $this->assertArrayNotHasKey('foo', $result);
-        $this->assertArrayHasKey('boO', $result);
-        $this->assertEquals(['bar', 'baz'], $result['Foo']);
-        $this->assertEquals(['test'], $result['boO']);
-    }
-
-    public function testSetHeaderOverwritesExistingValues()
-    {
-        $h = new Request('GET', 'http://foo.com');
-        $h->setHeader('foo', 'bar');
-        $this->assertEquals('bar', $h->getHeader('foo'));
-        $h->setHeader('Foo', 'baz');
-        $this->assertEquals('baz', $h->getHeader('foo'));
-        $this->assertArrayHasKey('Foo', $h->getHeaders());
-    }
-
-    public function testSetHeaderOverwritesExistingValuesUsingHeaderArray()
-    {
-        $h = new Request('GET', 'http://foo.com');
-        $h->setHeader('foo', ['bar']);
-        $this->assertEquals('bar', $h->getHeader('foo'));
-    }
-
-    public function testSetHeaderOverwritesExistingValuesUsingArray()
-    {
-        $h = new Request('GET', 'http://foo.com');
-        $h->setHeader('foo', ['bar']);
-        $this->assertEquals('bar', $h->getHeader('foo'));
-    }
-
-    public function testSetHeadersOverwritesAllHeaders()
-    {
-        $h = new Request('GET', 'http://foo.com');
-        $h->setHeader('foo', 'bar');
-        $h->setHeaders(['foo' => 'a', 'boo' => 'b']);
-        $this->assertEquals(['foo' => ['a'], 'boo' => ['b']], $h->getHeaders());
-    }
-
-    public function testChecksIfCaseInsensitiveHeaderIsPresent()
-    {
-        $h = new Request('GET', 'http://foo.com');
-        $h->setHeader('foo', 'bar');
-        $this->assertTrue($h->hasHeader('foo'));
-        $this->assertTrue($h->hasHeader('Foo'));
-        $h->setHeader('fOo', 'bar');
-        $this->assertTrue($h->hasHeader('Foo'));
-    }
-
-    public function testRemovesHeaders()
-    {
-        $h = new Request('GET', 'http://foo.com');
-        $h->setHeader('foo', 'bar');
-        $h->removeHeader('foo');
-        $this->assertFalse($h->hasHeader('foo'));
-        $h->setHeader('Foo', 'bar');
-        $h->removeHeader('FOO');
-        $this->assertFalse($h->hasHeader('foo'));
-    }
-
-    public function testReturnsCorrectTypeWhenMissing()
-    {
-        $h = new Request('GET', 'http://foo.com');
-        $this->assertInternalType('string', $h->getHeader('foo'));
-        $this->assertInternalType('array', $h->getHeaderAsArray('foo'));
-    }
-
-    public function testSetsIntegersAndFloatsAsHeaders()
-    {
-        $h = new Request('GET', 'http://foo.com');
-        $h->setHeader('foo', 10);
-        $h->setHeader('bar', 10.5);
-        $h->addHeader('foo', 10);
-        $h->addHeader('bar', 10.5);
-        $this->assertSame('10, 10', $h->getHeader('foo'));
-        $this->assertSame('10.5, 10.5', $h->getHeader('bar'));
-    }
-
-    public function testGetsResponseStartLine()
-    {
-        $m = new Response(200);
-        $this->assertEquals('HTTP/1.1 200 OK', Response::getStartLine($m));
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     */
-    public function testThrowsWhenMessageIsUnknown()
-    {
-        $m = $this->getMockBuilder('GuzzleHttp\Message\AbstractMessage')
-            ->getMockForAbstractClass();
-        AbstractMessage::getStartLine($m);
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/Message/FutureResponseTest.php b/core/vendor/guzzlehttp/guzzle/tests/Message/FutureResponseTest.php
deleted file mode 100644
index 771631d56..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/Message/FutureResponseTest.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests\Message;
-
-use GuzzleHttp\Message\FutureResponse;
-use GuzzleHttp\Message\Response;
-use GuzzleHttp\Stream\Stream;
-use React\Promise\Deferred;
-use GuzzleHttp\Tests\Subscriber\MockTest;
-
-class FutureResponseTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @expectedException \RuntimeException
-     * @expectedExceptionMessage Class has no foo property
-     */
-    public function testValidatesMagicMethod()
-    {
-        $f = MockTest::createFuture(function () {});
-        $f->foo;
-    }
-
-    public function testDoesTheSameAsResponseWhenDereferenced()
-    {
-        $str = Stream::factory('foo');
-        $response = new Response(200, ['Foo' => 'bar'], $str);
-        $future = MockTest::createFuture(function () use ($response) {
-            return $response;
-        });
-        $this->assertFalse($this->readAttribute($future, 'isRealized'));
-        $this->assertEquals(200, $future->getStatusCode());
-        $this->assertTrue($this->readAttribute($future, 'isRealized'));
-        // Deref again does nothing.
-        $future->wait();
-        $this->assertTrue($this->readAttribute($future, 'isRealized'));
-        $this->assertEquals('bar', $future->getHeader('Foo'));
-        $this->assertEquals(['bar'], $future->getHeaderAsarray('Foo'));
-        $this->assertSame($response->getHeaders(), $future->getHeaders());
-        $this->assertSame(
-            $response->getBody(),
-            $future->getBody()
-        );
-        $this->assertSame(
-            $response->getProtocolVersion(),
-            $future->getProtocolVersion()
-        );
-        $this->assertSame(
-            $response->getEffectiveUrl(),
-            $future->getEffectiveUrl()
-        );
-        $future->setEffectiveUrl('foo');
-        $this->assertEquals('foo', $response->getEffectiveUrl());
-        $this->assertSame(
-            $response->getReasonPhrase(),
-            $future->getReasonPhrase()
-        );
-
-        $this->assertTrue($future->hasHeader('foo'));
-
-        $future->removeHeader('Foo');
-        $this->assertFalse($future->hasHeader('foo'));
-        $this->assertFalse($response->hasHeader('foo'));
-
-        $future->setBody(Stream::factory('true'));
-        $this->assertEquals('true', (string) $response->getBody());
-        $this->assertTrue($future->json());
-        $this->assertSame((string) $response, (string) $future);
-
-        $future->setBody(Stream::factory('<a><b>c</b></a>'));
-        $this->assertEquals('c', (string) $future->xml()->b);
-
-        $future->addHeader('a', 'b');
-        $this->assertEquals('b', $future->getHeader('a'));
-
-        $future->addHeaders(['a' => '2']);
-        $this->assertEquals('b, 2', $future->getHeader('a'));
-
-        $future->setHeader('a', '2');
-        $this->assertEquals('2', $future->getHeader('a'));
-
-        $future->setHeaders(['a' => '3']);
-        $this->assertEquals(['a' => ['3']], $future->getHeaders());
-    }
-
-    public function testCanDereferenceManually()
-    {
-        $response = new Response(200, ['Foo' => 'bar']);
-        $future = MockTest::createFuture(function () use ($response) {
-            return $response;
-        });
-        $this->assertSame($response, $future->wait());
-        $this->assertTrue($this->readAttribute($future, 'isRealized'));
-    }
-
-    public function testCanCancel()
-    {
-        $c = false;
-        $deferred = new Deferred();
-        $future = new FutureResponse(
-            $deferred->promise(),
-            function () {},
-            function () use (&$c) {
-                $c = true;
-                return true;
-            }
-        );
-
-        $this->assertFalse($this->readAttribute($future, 'isRealized'));
-        $future->cancel();
-        $this->assertTrue($this->readAttribute($future, 'isRealized'));
-        $future->cancel();
-    }
-
-    public function testCanCancelButReturnsFalseForNoCancelFunction()
-    {
-        $future = MockTest::createFuture(function () {});
-        $future->cancel();
-        $this->assertTrue($this->readAttribute($future, 'isRealized'));
-    }
-
-    /**
-     * @expectedException \GuzzleHttp\Ring\Exception\CancelledFutureAccessException
-     */
-    public function testAccessingCancelledResponseThrows()
-    {
-        $future = MockTest::createFuture(function () {});
-        $future->cancel();
-        $future->getStatusCode();
-    }
-
-    public function testExceptionInToStringTriggersError()
-    {
-        $future = MockTest::createFuture(function () {
-            throw new \Exception('foo');
-        });
-        $err = '';
-        set_error_handler(function () use (&$err) {
-            $err = func_get_args()[1];
-        });
-        echo $future;
-        restore_error_handler();
-        $this->assertContains('foo', $err);
-    }
-
-    public function testProxiesSetters()
-    {
-        $str = Stream::factory('foo');
-        $response = new Response(200, ['Foo' => 'bar'], $str);
-        $future = MockTest::createFuture(function () use ($response) {
-            return $response;
-        });
-
-        $future->setStatusCode(202);
-        $this->assertEquals(202, $future->getStatusCode());
-        $this->assertEquals(202, $response->getStatusCode());
-
-        $future->setReasonPhrase('foo');
-        $this->assertEquals('foo', $future->getReasonPhrase());
-        $this->assertEquals('foo', $response->getReasonPhrase());
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/Message/MessageFactoryTest.php b/core/vendor/guzzlehttp/guzzle/tests/Message/MessageFactoryTest.php
deleted file mode 100644
index aa2e45e02..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/Message/MessageFactoryTest.php
+++ /dev/null
@@ -1,601 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests\Message;
-
-use GuzzleHttp\Client;
-use GuzzleHttp\Message\RequestInterface;
-use GuzzleHttp\Post\PostFile;
-use GuzzleHttp\Message\Response;
-use GuzzleHttp\Message\MessageFactory;
-use GuzzleHttp\Subscriber\Cookie;
-use GuzzleHttp\Cookie\CookieJar;
-use GuzzleHttp\Query;
-use GuzzleHttp\Stream\Stream;
-use GuzzleHttp\Subscriber\History;
-use GuzzleHttp\Subscriber\Mock;
-
-/**
- * @covers GuzzleHttp\Message\MessageFactory
- */
-class MessageFactoryTest extends \PHPUnit_Framework_TestCase
-{
-    public function testCreatesResponses()
-    {
-        $f = new MessageFactory();
-        $response = $f->createResponse(200, ['foo' => 'bar'], 'test', [
-            'protocol_version' => 1.0
-        ]);
-        $this->assertEquals(200, $response->getStatusCode());
-        $this->assertEquals(['foo' => ['bar']], $response->getHeaders());
-        $this->assertEquals('test', $response->getBody());
-        $this->assertEquals(1.0, $response->getProtocolVersion());
-    }
-
-    public function testCreatesRequestFromMessage()
-    {
-        $f = new MessageFactory();
-        $req = $f->fromMessage("GET / HTTP/1.1\r\nBaz: foo\r\n\r\n");
-        $this->assertEquals('GET', $req->getMethod());
-        $this->assertEquals('/', $req->getPath());
-        $this->assertEquals('foo', $req->getHeader('Baz'));
-        $this->assertNull($req->getBody());
-    }
-
-    public function testCreatesRequestFromMessageWithBody()
-    {
-        $req = (new MessageFactory())->fromMessage("GET / HTTP/1.1\r\nBaz: foo\r\n\r\ntest");
-        $this->assertEquals('test', $req->getBody());
-    }
-
-    public function testCreatesRequestWithPostBody()
-    {
-        $req = (new MessageFactory())->createRequest('GET', 'http://www.foo.com', ['body' => ['abc' => '123']]);
-        $this->assertEquals('abc=123', $req->getBody());
-    }
-
-    public function testCreatesRequestWithPostBodyScalars()
-    {
-        $req = (new MessageFactory())->createRequest(
-            'GET',
-            'http://www.foo.com',
-            ['body' => [
-                'abc' => true,
-                '123' => false,
-                'foo' => null,
-                'baz' => 10,
-                'bam' => 1.5,
-                'boo' => [1]]
-            ]
-        );
-        $this->assertEquals(
-            'abc=1&123=&foo&baz=10&bam=1.5&boo%5B0%5D=1',
-            (string) $req->getBody()
-        );
-    }
-
-    public function testCreatesRequestWithPostBodyAndPostFiles()
-    {
-        $pf = fopen(__FILE__, 'r');
-        $pfi = new PostFile('ghi', 'abc', __FILE__);
-        $req = (new MessageFactory())->createRequest('GET', 'http://www.foo.com', [
-            'body' => [
-                'abc' => '123',
-                'def' => $pf,
-                'ghi' => $pfi
-            ]
-        ]);
-        $this->assertInstanceOf('GuzzleHttp\Post\PostBody', $req->getBody());
-        $s = (string) $req;
-        $this->assertContains('testCreatesRequestWithPostBodyAndPostFiles', $s);
-        $this->assertContains('multipart/form-data', $s);
-        $this->assertTrue(in_array($pfi, $req->getBody()->getFiles(), true));
-    }
-
-    public function testCreatesResponseFromMessage()
-    {
-        $response = (new MessageFactory())->fromMessage("HTTP/1.1 200 OK\r\nContent-Length: 4\r\n\r\ntest");
-        $this->assertEquals(200, $response->getStatusCode());
-        $this->assertEquals('OK', $response->getReasonPhrase());
-        $this->assertEquals('4', $response->getHeader('Content-Length'));
-        $this->assertEquals('test', $response->getBody(true));
-    }
-
-    public function testCanCreateHeadResponses()
-    {
-        $response = (new MessageFactory())->fromMessage("HTTP/1.1 200 OK\r\nContent-Length: 4\r\n\r\n");
-        $this->assertEquals(200, $response->getStatusCode());
-        $this->assertEquals('OK', $response->getReasonPhrase());
-        $this->assertEquals(null, $response->getBody());
-        $this->assertEquals('4', $response->getHeader('Content-Length'));
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     */
-    public function testFactoryRequiresMessageForRequest()
-    {
-        (new MessageFactory())->fromMessage('');
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage foo
-     */
-    public function testValidatesOptionsAreImplemented()
-    {
-        (new MessageFactory())->createRequest('GET', 'http://test.com', ['foo' => 'bar']);
-    }
-
-    public function testOptionsAddsRequestOptions()
-    {
-        $request = (new MessageFactory())->createRequest(
-            'GET', 'http://test.com', ['config' => ['baz' => 'bar']]
-        );
-        $this->assertEquals('bar', $request->getConfig()->get('baz'));
-    }
-
-    public function testCanDisableRedirects()
-    {
-        $request = (new MessageFactory())->createRequest('GET', '/', ['allow_redirects' => false]);
-        $this->assertEmpty($request->getEmitter()->listeners('complete'));
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     */
-    public function testValidatesRedirects()
-    {
-        (new MessageFactory())->createRequest('GET', '/', ['allow_redirects' => 'foo']);
-    }
-
-    public function testCanEnableStrictRedirectsAndSpecifyMax()
-    {
-        $request = (new MessageFactory())->createRequest('GET', '/', [
-            'allow_redirects' => ['max' => 10, 'strict' => true]
-        ]);
-        $this->assertTrue($request->getConfig()['redirect']['strict']);
-        $this->assertEquals(10, $request->getConfig()['redirect']['max']);
-    }
-
-    public function testCanAddCookiesFromHash()
-    {
-        $request = (new MessageFactory())->createRequest('GET', 'http://www.test.com/', [
-            'cookies' => ['Foo' => 'Bar']
-        ]);
-        $cookies = null;
-        foreach ($request->getEmitter()->listeners('before') as $l) {
-            if ($l[0] instanceof Cookie) {
-                $cookies = $l[0];
-                break;
-            }
-        }
-        if (!$cookies) {
-            $this->fail('Did not add cookie listener');
-        } else {
-            $this->assertCount(1, $cookies->getCookieJar());
-        }
-    }
-
-    public function testAddsCookieUsingTrue()
-    {
-        $factory = new MessageFactory();
-        $request1 = $factory->createRequest('GET', '/', ['cookies' => true]);
-        $request2 = $factory->createRequest('GET', '/', ['cookies' => true]);
-        $listeners = function ($r) {
-            return array_filter($r->getEmitter()->listeners('before'), function ($l) {
-                return $l[0] instanceof Cookie;
-            });
-        };
-        $this->assertSame($listeners($request1), $listeners($request2));
-    }
-
-    public function testAddsCookieFromCookieJar()
-    {
-        $jar = new CookieJar();
-        $request = (new MessageFactory())->createRequest('GET', '/', ['cookies' => $jar]);
-        foreach ($request->getEmitter()->listeners('before') as $l) {
-            if ($l[0] instanceof Cookie) {
-                $this->assertSame($jar, $l[0]->getCookieJar());
-            }
-        }
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     */
-    public function testValidatesCookies()
-    {
-        (new MessageFactory())->createRequest('GET', '/', ['cookies' => 'baz']);
-    }
-
-    public function testCanAddQuery()
-    {
-        $request = (new MessageFactory())->createRequest('GET', 'http://foo.com', [
-            'query' => ['Foo' => 'Bar']
-        ]);
-        $this->assertEquals('Bar', $request->getQuery()->get('Foo'));
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     */
-    public function testValidatesQuery()
-    {
-        (new MessageFactory())->createRequest('GET', 'http://foo.com', [
-            'query' => 'foo'
-        ]);
-    }
-
-    public function testCanSetDefaultQuery()
-    {
-        $request = (new MessageFactory())->createRequest('GET', 'http://foo.com?test=abc', [
-            'query' => ['Foo' => 'Bar', 'test' => 'def']
-        ]);
-        $this->assertEquals('Bar', $request->getQuery()->get('Foo'));
-        $this->assertEquals('abc', $request->getQuery()->get('test'));
-    }
-
-    public function testCanSetDefaultQueryWithObject()
-    {
-        $request = (new MessageFactory)->createRequest(
-            'GET',
-            'http://foo.com?test=abc', [
-                'query' => new Query(['Foo' => 'Bar', 'test' => 'def'])
-            ]
-        );
-        $this->assertEquals('Bar', $request->getQuery()->get('Foo'));
-        $this->assertEquals('abc', $request->getQuery()->get('test'));
-    }
-
-    public function testCanAddBasicAuth()
-    {
-        $request = (new MessageFactory())->createRequest('GET', 'http://foo.com', [
-            'auth' => ['michael', 'test']
-        ]);
-        $this->assertTrue($request->hasHeader('Authorization'));
-    }
-
-    public function testCanAddDigestAuth()
-    {
-        $request = (new MessageFactory())->createRequest('GET', 'http://foo.com', [
-            'auth' => ['michael', 'test', 'digest']
-        ]);
-        $this->assertEquals('michael:test', $request->getConfig()->getPath('curl/' . CURLOPT_USERPWD));
-        $this->assertEquals(CURLAUTH_DIGEST, $request->getConfig()->getPath('curl/' . CURLOPT_HTTPAUTH));
-    }
-
-    public function testCanDisableAuth()
-    {
-        $request = (new MessageFactory())->createRequest('GET', 'http://foo.com', [
-            'auth' => false
-        ]);
-        $this->assertFalse($request->hasHeader('Authorization'));
-    }
-
-    public function testCanSetCustomAuth()
-    {
-        $request = (new MessageFactory())->createRequest('GET', 'http://foo.com', [
-            'auth' => 'foo'
-        ]);
-        $this->assertEquals('foo', $request->getConfig()['auth']);
-    }
-
-    public function testCanAddEvents()
-    {
-        $foo = null;
-        $client = new Client();
-        $client->getEmitter()->attach(new Mock([new Response(200)]));
-        $client->get('http://test.com', [
-            'events' => [
-                'before' => function () use (&$foo) { $foo = true; }
-            ]
-        ]);
-        $this->assertTrue($foo);
-    }
-
-    public function testCanAddEventsWithPriority()
-    {
-        $foo = null;
-        $client = new Client();
-        $client->getEmitter()->attach(new Mock(array(new Response(200))));
-        $request = $client->createRequest('GET', 'http://test.com', [
-            'events' => [
-                'before' => [
-                    'fn' => function () use (&$foo) { $foo = true; },
-                    'priority' => 123
-                ]
-            ]
-        ]);
-        $client->send($request);
-        $this->assertTrue($foo);
-        $l = $this->readAttribute($request->getEmitter(), 'listeners');
-        $this->assertArrayHasKey(123, $l['before']);
-    }
-
-    public function testCanAddEventsOnce()
-    {
-        $foo = 0;
-        $client = new Client();
-        $client->getEmitter()->attach(new Mock([
-            new Response(200),
-            new Response(200),
-        ]));
-        $fn = function () use (&$foo) { ++$foo; };
-        $request = $client->createRequest('GET', 'http://test.com', [
-            'events' => ['before' => ['fn' => $fn, 'once' => true]]
-        ]);
-        $client->send($request);
-        $this->assertEquals(1, $foo);
-        $client->send($request);
-        $this->assertEquals(1, $foo);
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     */
-    public function testValidatesEventContainsFn()
-    {
-        $client = new Client(['base_url' => 'http://test.com']);
-        $client->createRequest('GET', '/', ['events' => ['before' => ['foo' => 'bar']]]);
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     */
-    public function testValidatesEventIsArray()
-    {
-        $client = new Client(['base_url' => 'http://test.com']);
-        $client->createRequest('GET', '/', ['events' => ['before' => '123']]);
-    }
-
-    public function testCanAddSubscribers()
-    {
-        $mock = new Mock([new Response(200)]);
-        $client = new Client();
-        $client->getEmitter()->attach($mock);
-        $request = $client->get('http://test.com', ['subscribers' => [$mock]]);
-    }
-
-    public function testCanDisableExceptions()
-    {
-        $client = new Client();
-        $this->assertEquals(500, $client->get('http://test.com', [
-            'subscribers' => [new Mock([new Response(500)])],
-            'exceptions' => false
-        ])->getStatusCode());
-    }
-
-    public function testCanChangeSaveToLocation()
-    {
-        $saveTo = Stream::factory();
-        $request = (new MessageFactory())->createRequest('GET', '/', ['save_to' => $saveTo]);
-        $this->assertSame($saveTo, $request->getConfig()->get('save_to'));
-    }
-
-    public function testCanSetProxy()
-    {
-        $request = (new MessageFactory())->createRequest('GET', '/', ['proxy' => '192.168.16.121']);
-        $this->assertEquals('192.168.16.121', $request->getConfig()->get('proxy'));
-    }
-
-    public function testCanSetHeadersOption()
-    {
-        $request = (new MessageFactory())->createRequest('GET', '/', ['headers' => ['Foo' => 'Bar']]);
-        $this->assertEquals('Bar', (string) $request->getHeader('Foo'));
-    }
-
-    public function testCanSetHeaders()
-    {
-        $request = (new MessageFactory())->createRequest('GET', '/', [
-            'headers' => ['Foo' => ['Baz', 'Bar'], 'Test' => '123']
-        ]);
-        $this->assertEquals('Baz, Bar', $request->getHeader('Foo'));
-        $this->assertEquals('123', $request->getHeader('Test'));
-    }
-
-    public function testCanSetTimeoutOption()
-    {
-        $request = (new MessageFactory())->createRequest('GET', '/', ['timeout' => 1.5]);
-        $this->assertEquals(1.5, $request->getConfig()->get('timeout'));
-    }
-
-    public function testCanSetConnectTimeoutOption()
-    {
-        $request = (new MessageFactory())->createRequest('GET', '/', ['connect_timeout' => 1.5]);
-        $this->assertEquals(1.5, $request->getConfig()->get('connect_timeout'));
-    }
-
-    public function testCanSetDebug()
-    {
-        $request = (new MessageFactory())->createRequest('GET', '/', ['debug' => true]);
-        $this->assertTrue($request->getConfig()->get('debug'));
-    }
-
-    public function testCanSetVerifyToOff()
-    {
-        $request = (new MessageFactory())->createRequest('GET', '/', ['verify' => false]);
-        $this->assertFalse($request->getConfig()->get('verify'));
-    }
-
-    public function testCanSetVerifyToOn()
-    {
-        $request = (new MessageFactory())->createRequest('GET', '/', ['verify' => true]);
-        $this->assertTrue($request->getConfig()->get('verify'));
-    }
-
-    public function testCanSetVerifyToPath()
-    {
-        $request = (new MessageFactory())->createRequest('GET', '/', ['verify' => '/foo.pem']);
-        $this->assertEquals('/foo.pem', $request->getConfig()->get('verify'));
-    }
-
-    public function inputValidation()
-    {
-        return array_map(function ($option) { return array($option); }, array(
-            'headers', 'events', 'subscribers', 'params'
-        ));
-    }
-
-    /**
-     * @dataProvider inputValidation
-     * @expectedException \InvalidArgumentException
-     */
-    public function testValidatesInput($option)
-    {
-        (new MessageFactory())->createRequest('GET', '/', [$option => 'foo']);
-    }
-
-    public function testCanAddSslKey()
-    {
-        $request = (new MessageFactory())->createRequest('GET', '/', ['ssl_key' => '/foo.pem']);
-        $this->assertEquals('/foo.pem', $request->getConfig()->get('ssl_key'));
-    }
-
-    public function testCanAddSslKeyPassword()
-    {
-        $request = (new MessageFactory())->createRequest('GET', '/', ['ssl_key' => ['/foo.pem', 'bar']]);
-        $this->assertEquals(['/foo.pem', 'bar'], $request->getConfig()->get('ssl_key'));
-    }
-
-    public function testCanAddSslCert()
-    {
-        $request = (new MessageFactory())->createRequest('GET', '/', ['cert' => '/foo.pem']);
-        $this->assertEquals('/foo.pem', $request->getConfig()->get('cert'));
-    }
-
-    public function testCanAddSslCertPassword()
-    {
-        $request = (new MessageFactory())->createRequest('GET', '/', ['cert' => ['/foo.pem', 'bar']]);
-        $this->assertEquals(['/foo.pem', 'bar'], $request->getConfig()->get('cert'));
-    }
-
-    public function testCreatesBodyWithoutZeroString()
-    {
-        $request = (new MessageFactory())->createRequest('PUT', 'http://test.com', ['body' => '0']);
-        $this->assertSame('0', (string) $request->getBody());
-    }
-
-    public function testCanSetProtocolVersion()
-    {
-        $request = (new MessageFactory())->createRequest('GET', 'http://t.com', ['version' => 1.0]);
-        $this->assertEquals(1.0, $request->getProtocolVersion());
-    }
-
-    public function testCanAddJsonData()
-    {
-        $request = (new MessageFactory())->createRequest('PUT', 'http://f.com', [
-            'json' => ['foo' => 'bar']
-        ]);
-        $this->assertEquals(
-            'application/json',
-            $request->getHeader('Content-Type')
-        );
-        $this->assertEquals('{"foo":"bar"}', (string) $request->getBody());
-    }
-
-    public function testCanAddJsonDataToAPostRequest()
-    {
-        $request = (new MessageFactory())->createRequest('POST', 'http://f.com', [
-            'json' => ['foo' => 'bar']
-        ]);
-        $this->assertEquals(
-            'application/json',
-            $request->getHeader('Content-Type')
-        );
-        $this->assertEquals('{"foo":"bar"}', (string) $request->getBody());
-    }
-
-    public function testCanAddJsonDataAndNotOverwriteContentType()
-    {
-        $request = (new MessageFactory())->createRequest('PUT', 'http://f.com', [
-            'headers' => ['Content-Type' => 'foo'],
-            'json' => null
-        ]);
-        $this->assertEquals('foo', $request->getHeader('Content-Type'));
-        $this->assertEquals('null', (string) $request->getBody());
-    }
-
-    public function testCanUseCustomRequestOptions()
-    {
-        $c = false;
-        $f = new MessageFactory([
-            'foo' => function (RequestInterface $request, $value) use (&$c) {
-                $c = true;
-                $this->assertEquals('bar', $value);
-            }
-        ]);
-
-        $f->createRequest('PUT', 'http://f.com', [
-            'headers' => ['Content-Type' => 'foo'],
-            'foo' => 'bar'
-        ]);
-
-        $this->assertTrue($c);
-    }
-
-    /**
-     * @ticket https://github.com/guzzle/guzzle/issues/706
-     */
-    public function testDoesNotApplyPostBodyRightAway()
-    {
-        $request = (new MessageFactory())->createRequest('POST', 'http://f.cn', [
-            'body' => ['foo' => ['bar', 'baz']]
-        ]);
-        $this->assertEquals('', $request->getHeader('Content-Type'));
-        $this->assertEquals('', $request->getHeader('Content-Length'));
-        $request->getBody()->setAggregator(Query::duplicateAggregator());
-        $request->getBody()->applyRequestHeaders($request);
-        $this->assertEquals('foo=bar&foo=baz', $request->getBody());
-    }
-
-    public function testCanForceMultipartUploadWithContentType()
-    {
-        $client = new Client();
-        $client->getEmitter()->attach(new Mock([new Response(200)]));
-        $history = new History();
-        $client->getEmitter()->attach($history);
-        $client->post('http://foo.com', [
-            'headers' => ['Content-Type' => 'multipart/form-data'],
-            'body'    => ['foo' => 'bar']
-        ]);
-        $this->assertContains(
-            'multipart/form-data; boundary=',
-            $history->getLastRequest()->getHeader('Content-Type')
-        );
-        $this->assertContains(
-            "Content-Disposition: form-data; name=\"foo\"\r\n\r\nbar",
-            (string) $history->getLastRequest()->getBody()
-        );
-    }
-
-    public function testDecodeDoesNotForceAcceptHeader()
-    {
-        $request = (new MessageFactory())->createRequest('POST', 'http://f.cn', [
-            'decode_content' => true
-        ]);
-        $this->assertEquals('', $request->getHeader('Accept-Encoding'));
-        $this->assertTrue($request->getConfig()->get('decode_content'));
-    }
-
-    public function testDecodeCanAddAcceptHeader()
-    {
-        $request = (new MessageFactory())->createRequest('POST', 'http://f.cn', [
-            'decode_content' => 'gzip'
-        ]);
-        $this->assertEquals('gzip', $request->getHeader('Accept-Encoding'));
-        $this->assertTrue($request->getConfig()->get('decode_content'));
-    }
-
-    public function testCanDisableDecoding()
-    {
-        $request = (new MessageFactory())->createRequest('POST', 'http://f.cn', [
-            'decode_content' => false
-        ]);
-        $this->assertEquals('', $request->getHeader('Accept-Encoding'));
-        $this->assertNull($request->getConfig()->get('decode_content'));
-    }
-}
-
-class ExtendedFactory extends MessageFactory
-{
-    protected function add_foo() {}
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/Message/MessageParserTest.php b/core/vendor/guzzlehttp/guzzle/tests/Message/MessageParserTest.php
deleted file mode 100644
index 0bcc9430f..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/Message/MessageParserTest.php
+++ /dev/null
@@ -1,276 +0,0 @@
-<?php
-
-namespace GuzzleHttp\Tests\Message;
-
-use GuzzleHttp\Message\MessageParser;
-
-/**
- * @covers \GuzzleHttp\Message\MessageParser
- */
-class MessageParserTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @dataProvider requestProvider
-     */
-    public function testParsesRequests($message, $parts)
-    {
-        $parser = new MessageParser();
-        $this->compareRequestResults($parts, $parser->parseRequest($message));
-    }
-
-    /**
-     * @dataProvider responseProvider
-     */
-    public function testParsesResponses($message, $parts)
-    {
-        $parser = new MessageParser();
-        $this->compareResponseResults($parts, $parser->parseResponse($message));
-    }
-
-    public function testParsesRequestsWithMissingProtocol()
-    {
-        $parser = new MessageParser();
-        $parts = $parser->parseRequest("GET /\r\nHost: Foo.com\r\n\r\n");
-        $this->assertEquals('GET', $parts['method']);
-        $this->assertEquals('HTTP', $parts['protocol']);
-        $this->assertEquals('1.1', $parts['protocol_version']);
-    }
-
-    public function testParsesRequestsWithMissingVersion()
-    {
-        $parser = new MessageParser();
-        $parts = $parser->parseRequest("GET / HTTP\r\nHost: Foo.com\r\n\r\n");
-        $this->assertEquals('GET', $parts['method']);
-        $this->assertEquals('HTTP', $parts['protocol']);
-        $this->assertEquals('1.1', $parts['protocol_version']);
-    }
-
-    public function testParsesResponsesWithMissingReasonPhrase()
-    {
-        $parser = new MessageParser();
-        $parts = $parser->parseResponse("HTTP/1.1 200\r\n\r\n");
-        $this->assertEquals('200', $parts['code']);
-        $this->assertEquals('', $parts['reason_phrase']);
-        $this->assertEquals('HTTP', $parts['protocol']);
-        $this->assertEquals('1.1', $parts['protocol_version']);
-    }
-
-    public function requestProvider()
-    {
-        $auth = base64_encode('michael:foo');
-
-        return array(
-
-            // Empty request
-            array('', false),
-
-            // Converts casing of request. Does not require host header.
-            array("GET / HTTP/1.1\r\n\r\n", array(
-                'method'   => 'GET',
-                'protocol' => 'HTTP',
-                'protocol_version' => '1.1',
-                'request_url' => array(
-                    'scheme' => 'http',
-                    'host'   => '',
-                    'port'   => '',
-                    'path'   => '/',
-                    'query'  => ''
-                ),
-                'headers' => array(),
-                'body'    => ''
-            )),
-            // Path and query string, multiple header values per header and case sensitive storage
-            array("HEAD /path?query=foo HTTP/1.0\r\nHost: example.com\r\nX-Foo: foo\r\nx-foo: Bar\r\nX-Foo: foo\r\nX-Foo: Baz\r\n\r\n", array(
-                'method'   => 'HEAD',
-                'protocol' => 'HTTP',
-                'protocol_version' => '1.0',
-                'request_url' => array(
-                    'scheme' => 'http',
-                    'host'   => 'example.com',
-                    'port'   => '',
-                    'path'   => '/path',
-                    'query'  => 'query=foo'
-                ),
-                'headers' => array(
-                    'Host'  => 'example.com',
-                    'X-Foo' => array('foo', 'foo', 'Baz'),
-                    'x-foo' => 'Bar'
-                ),
-                'body'    => ''
-            )),
-            // Includes a body
-            array("PUT / HTTP/1.0\r\nhost: example.com:443\r\nContent-Length: 4\r\n\r\ntest", array(
-                'method'   => 'PUT',
-                'protocol' => 'HTTP',
-                'protocol_version' => '1.0',
-                'request_url' => array(
-                    'scheme' => 'https',
-                    'host'   => 'example.com',
-                    'port'   => '443',
-                    'path'   => '/',
-                    'query'  => ''
-                ),
-                'headers' => array(
-                    'host'           => 'example.com:443',
-                    'Content-Length' => '4'
-                ),
-                'body' => 'test'
-            )),
-            // Includes Authorization headers
-            array("GET / HTTP/1.1\r\nHost: example.com:8080\r\nAuthorization: Basic {$auth}\r\n\r\n", array(
-                'method'   => 'GET',
-                'protocol' => 'HTTP',
-                'protocol_version' => '1.1',
-                'request_url' => array(
-                    'scheme' => 'http',
-                    'host'   => 'example.com',
-                    'port'   => '8080',
-                    'path'   => '/',
-                    'query'  => ''
-                ),
-                'headers' => array(
-                    'Host'           => 'example.com:8080',
-                    'Authorization' => "Basic {$auth}"
-                ),
-                'body' => ''
-            )),
-            // Include authorization header
-            array("GET / HTTP/1.1\r\nHost: example.com:8080\r\nauthorization: Basic {$auth}\r\n\r\n", array(
-                'method'   => 'GET',
-                'protocol' => 'HTTP',
-                'protocol_version' => '1.1',
-                'request_url' => array(
-                    'scheme' => 'http',
-                    'host'   => 'example.com',
-                    'port'   => '8080',
-                    'path'   => '/',
-                    'query'  => ''
-                ),
-                'headers' => array(
-                    'Host'           => 'example.com:8080',
-                    'authorization' => "Basic {$auth}"
-                ),
-                'body' => ''
-            )),
-        );
-    }
-
-    public function responseProvider()
-    {
-        return array(
-            // Empty request
-            array('', false),
-
-            array("HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n", array(
-                'protocol'      => 'HTTP',
-                'protocol_version'       => '1.1',
-                'code'          => '200',
-                'reason_phrase' => 'OK',
-                'headers'       => array(
-                    'Content-Length' => 0
-                ),
-                'body'          => ''
-            )),
-            array("HTTP/1.0 400 Bad Request\r\nContent-Length: 0\r\n\r\n", array(
-                'protocol'      => 'HTTP',
-                'protocol_version'       => '1.0',
-                'code'          => '400',
-                'reason_phrase' => 'Bad Request',
-                'headers'       => array(
-                    'Content-Length' => 0
-                ),
-                'body'          => ''
-            )),
-            array("HTTP/1.0 100 Continue\r\n\r\n", array(
-                'protocol'      => 'HTTP',
-                'protocol_version'       => '1.0',
-                'code'          => '100',
-                'reason_phrase' => 'Continue',
-                'headers'       => array(),
-                'body'          => ''
-            )),
-            array("HTTP/1.1 204 No Content\r\nX-Foo: foo\r\nx-foo: Bar\r\nX-Foo: foo\r\n\r\n", array(
-                'protocol'      => 'HTTP',
-                'protocol_version'       => '1.1',
-                'code'          => '204',
-                'reason_phrase' => 'No Content',
-                'headers'       => array(
-                    'X-Foo' => array('foo', 'foo'),
-                    'x-foo' => 'Bar'
-                ),
-                'body'          => ''
-            )),
-            array("HTTP/1.1 200 Ok that is great!\r\nContent-Length: 4\r\n\r\nTest", array(
-                'protocol'      => 'HTTP',
-                'protocol_version'       => '1.1',
-                'code'          => '200',
-                'reason_phrase' => 'Ok that is great!',
-                'headers'       => array(
-                    'Content-Length' => 4
-                ),
-                'body'          => 'Test'
-            )),
-        );
-    }
-
-    public function compareRequestResults($result, $expected)
-    {
-        if (!$result) {
-            $this->assertFalse($expected);
-            return;
-        }
-
-        $this->assertEquals($result['method'], $expected['method']);
-        $this->assertEquals($result['protocol'], $expected['protocol']);
-        $this->assertEquals($result['protocol_version'], $expected['protocol_version']);
-        $this->assertEquals($result['request_url'], $expected['request_url']);
-        $this->assertEquals($result['body'], $expected['body']);
-        $this->compareHttpHeaders($result['headers'], $expected['headers']);
-    }
-
-    public function compareResponseResults($result, $expected)
-    {
-        if (!$result) {
-            $this->assertFalse($expected);
-            return;
-        }
-
-        $this->assertEquals($result['protocol'], $expected['protocol']);
-        $this->assertEquals($result['protocol_version'], $expected['protocol_version']);
-        $this->assertEquals($result['code'], $expected['code']);
-        $this->assertEquals($result['reason_phrase'], $expected['reason_phrase']);
-        $this->assertEquals($result['body'], $expected['body']);
-        $this->compareHttpHeaders($result['headers'], $expected['headers']);
-    }
-
-    protected function normalizeHeaders($headers)
-    {
-        $normalized = array();
-        foreach ($headers as $key => $value) {
-            $key = strtolower($key);
-            if (!isset($normalized[$key])) {
-                $normalized[$key] = $value;
-            } elseif (!is_array($normalized[$key])) {
-                $normalized[$key] = array($value);
-            } else {
-                $normalized[$key][] = $value;
-            }
-        }
-
-        foreach ($normalized as $key => &$value) {
-            if (is_array($value)) {
-                sort($value);
-            }
-        }
-
-        return $normalized;
-    }
-
-    public function compareHttpHeaders($result, $expected)
-    {
-        // Aggregate all headers case-insensitively
-        $result = $this->normalizeHeaders($result);
-        $expected = $this->normalizeHeaders($expected);
-        $this->assertEquals($result, $expected);
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/Message/RequestTest.php b/core/vendor/guzzlehttp/guzzle/tests/Message/RequestTest.php
deleted file mode 100644
index a6241a429..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/Message/RequestTest.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-
-namespace GuzzleHttp\Tests\Message;
-
-use GuzzleHttp\Event\Emitter;
-use GuzzleHttp\Message\Request;
-use GuzzleHttp\Query;
-use GuzzleHttp\Stream\Stream;
-
-/**
- * @covers GuzzleHttp\Message\Request
- */
-class RequestTest extends \PHPUnit_Framework_TestCase
-{
-    public function testConstructorInitializesMessage()
-    {
-        $r = new Request('PUT', '/test', ['test' => '123'], Stream::factory('foo'));
-        $this->assertEquals('PUT', $r->getMethod());
-        $this->assertEquals('/test', $r->getUrl());
-        $this->assertEquals('123', $r->getHeader('test'));
-        $this->assertEquals('foo', $r->getBody());
-    }
-
-    public function testConstructorInitializesMessageWithProtocolVersion()
-    {
-        $r = new Request('GET', '', [], null, ['protocol_version' => 10]);
-        $this->assertEquals(10, $r->getProtocolVersion());
-    }
-
-    public function testConstructorInitializesMessageWithEmitter()
-    {
-        $e = new Emitter();
-        $r = new Request('GET', '', [], null, ['emitter' => $e]);
-        $this->assertSame($r->getEmitter(), $e);
-    }
-
-    public function testCloneIsDeep()
-    {
-        $r = new Request('GET', '/test', ['foo' => 'baz'], Stream::factory('foo'));
-        $r2 = clone $r;
-
-        $this->assertNotSame($r->getEmitter(), $r2->getEmitter());
-        $this->assertEquals('foo', $r2->getBody());
-
-        $r->getConfig()->set('test', 123);
-        $this->assertFalse($r2->getConfig()->hasKey('test'));
-
-        $r->setPath('/abc');
-        $this->assertEquals('/test', $r2->getPath());
-    }
-
-    public function testCastsToString()
-    {
-        $r = new Request('GET', 'http://test.com/test', ['foo' => 'baz'], Stream::factory('body'));
-        $s = explode("\r\n", (string) $r);
-        $this->assertEquals("GET /test HTTP/1.1", $s[0]);
-        $this->assertContains('Host: test.com', $s);
-        $this->assertContains('foo: baz', $s);
-        $this->assertContains('', $s);
-        $this->assertContains('body', $s);
-    }
-
-    public function testSettingUrlOverridesHostHeaders()
-    {
-        $r = new Request('GET', 'http://test.com/test');
-        $r->setUrl('https://baz.com/bar');
-        $this->assertEquals('baz.com', $r->getHost());
-        $this->assertEquals('baz.com', $r->getHeader('Host'));
-        $this->assertEquals('/bar', $r->getPath());
-        $this->assertEquals('https', $r->getScheme());
-    }
-
-    public function testQueryIsMutable()
-    {
-        $r = new Request('GET', 'http://www.foo.com?baz=bar');
-        $this->assertEquals('baz=bar', $r->getQuery());
-        $this->assertInstanceOf('GuzzleHttp\Query', $r->getQuery());
-        $r->getQuery()->set('hi', 'there');
-        $this->assertEquals('/?baz=bar&hi=there', $r->getResource());
-    }
-
-    public function testQueryCanChange()
-    {
-        $r = new Request('GET', 'http://www.foo.com?baz=bar');
-        $r->setQuery(new Query(['foo' => 'bar']));
-        $this->assertEquals('foo=bar', $r->getQuery());
-    }
-
-    public function testCanChangeMethod()
-    {
-        $r = new Request('GET', 'http://www.foo.com');
-        $r->setMethod('put');
-        $this->assertEquals('PUT', $r->getMethod());
-    }
-
-    public function testCanChangeSchemeWithPort()
-    {
-        $r = new Request('GET', 'http://www.foo.com:80');
-        $r->setScheme('https');
-        $this->assertEquals('https://www.foo.com', $r->getUrl());
-    }
-
-    public function testCanChangeScheme()
-    {
-        $r = new Request('GET', 'http://www.foo.com');
-        $r->setScheme('https');
-        $this->assertEquals('https://www.foo.com', $r->getUrl());
-    }
-
-    public function testCanChangeHost()
-    {
-        $r = new Request('GET', 'http://www.foo.com:222');
-        $r->setHost('goo');
-        $this->assertEquals('http://goo:222', $r->getUrl());
-        $this->assertEquals('goo:222', $r->getHeader('host'));
-        $r->setHost('goo:80');
-        $this->assertEquals('http://goo', $r->getUrl());
-        $this->assertEquals('goo', $r->getHeader('host'));
-    }
-
-    public function testCanChangePort()
-    {
-        $r = new Request('GET', 'http://www.foo.com:222');
-        $this->assertSame(222, $r->getPort());
-        $this->assertEquals('www.foo.com', $r->getHost());
-        $this->assertEquals('www.foo.com:222', $r->getHeader('host'));
-        $r->setPort(80);
-        $this->assertSame(80, $r->getPort());
-        $this->assertEquals('www.foo.com', $r->getHost());
-        $this->assertEquals('www.foo.com', $r->getHeader('host'));
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/Message/ResponseTest.php b/core/vendor/guzzlehttp/guzzle/tests/Message/ResponseTest.php
deleted file mode 100644
index bbae24a17..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/Message/ResponseTest.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-
-namespace GuzzleHttp\Tests\Message;
-
-use GuzzleHttp\Exception\XmlParseException;
-use GuzzleHttp\Message\Response;
-use GuzzleHttp\Stream\Stream;
-
-/**
- * @covers GuzzleHttp\Message\Response
- */
-class ResponseTest extends \PHPUnit_Framework_TestCase
-{
-    public function testCanProvideCustomStatusCodeAndReasonPhrase()
-    {
-        $response = new Response(999, [], null, ['reason_phrase' => 'hi!']);
-        $this->assertEquals(999, $response->getStatusCode());
-        $this->assertEquals('hi!', $response->getReasonPhrase());
-    }
-
-    public function testConvertsToString()
-    {
-        $response = new Response(200);
-        $this->assertEquals("HTTP/1.1 200 OK\r\n\r\n", (string) $response);
-        // Add another header
-        $response = new Response(200, ['X-Test' => 'Guzzle']);
-        $this->assertEquals("HTTP/1.1 200 OK\r\nX-Test: Guzzle\r\n\r\n", (string) $response);
-        $response = new Response(200, ['Content-Length' => 4], Stream::factory('test'));
-        $this->assertEquals("HTTP/1.1 200 OK\r\nContent-Length: 4\r\n\r\ntest", (string) $response);
-    }
-
-    public function testConvertsToStringAndSeeksToByteZero()
-    {
-        $response = new Response(200);
-        $s = Stream::factory('foo');
-        $s->read(1);
-        $response->setBody($s);
-        $this->assertEquals("HTTP/1.1 200 OK\r\n\r\nfoo", (string) $response);
-    }
-
-    public function testParsesJsonResponses()
-    {
-        $json = '{"foo": "bar"}';
-        $response = new Response(200, [], Stream::factory($json));
-        $this->assertEquals(['foo' => 'bar'], $response->json());
-        $this->assertEquals(json_decode($json), $response->json(['object' => true]));
-
-        $response = new Response(200);
-        $this->assertEquals(null, $response->json());
-    }
-
-    /**
-     * @expectedException \GuzzleHttp\Exception\ParseException
-     * @expectedExceptionMessage Unable to parse JSON data: JSON_ERROR_SYNTAX - Syntax error, malformed JSON
-     */
-    public function testThrowsExceptionWhenFailsToParseJsonResponse()
-    {
-        $response = new Response(200, [], Stream::factory('{"foo": "'));
-        $response->json();
-    }
-
-    public function testParsesXmlResponses()
-    {
-        $response = new Response(200, [], Stream::factory('<abc><foo>bar</foo></abc>'));
-        $this->assertEquals('bar', (string) $response->xml()->foo);
-        // Always return a SimpleXMLElement from the xml method
-        $response = new Response(200);
-        $this->assertEmpty((string) $response->xml()->foo);
-    }
-
-    /**
-     * @expectedException \GuzzleHttp\Exception\XmlParseException
-     * @expectedExceptionMessage Unable to parse response body into XML: String could not be parsed as XML
-     */
-    public function testThrowsExceptionWhenFailsToParseXmlResponse()
-    {
-        $response = new Response(200, [], Stream::factory('<abc'));
-        try {
-            $response->xml();
-        } catch (XmlParseException $e) {
-            $xmlParseError = $e->getError();
-            $this->assertInstanceOf('\LibXMLError', $xmlParseError);
-            $this->assertContains("Couldn't find end of Start Tag abc line 1", $xmlParseError->message);
-            throw $e;
-        }
-    }
-
-    public function testHasEffectiveUrl()
-    {
-        $r = new Response(200);
-        $this->assertNull($r->getEffectiveUrl());
-        $r->setEffectiveUrl('http://www.test.com');
-        $this->assertEquals('http://www.test.com', $r->getEffectiveUrl());
-    }
-
-    public function testPreventsComplexExternalEntities()
-    {
-        $xml = '<?xml version="1.0"?><!DOCTYPE scan[<!ENTITY test SYSTEM "php://filter/read=convert.base64-encode/resource=ResponseTest.php">]><scan>&test;</scan>';
-        $response = new Response(200, [], Stream::factory($xml));
-
-        $oldCwd = getcwd();
-        chdir(__DIR__);
-        try {
-            $xml = $response->xml();
-            chdir($oldCwd);
-            $this->markTestIncomplete('Did not throw the expected exception! XML resolved as: ' . $xml->asXML());
-        } catch (\Exception $e) {
-            chdir($oldCwd);
-        }
-    }
-
-    public function testStatusAndReasonAreMutable()
-    {
-        $response = new Response(200);
-        $response->setStatusCode(201);
-        $this->assertEquals(201, $response->getStatusCode());
-        $response->setReasonPhrase('Foo');
-        $this->assertEquals('Foo', $response->getReasonPhrase());
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/MimetypesTest.php b/core/vendor/guzzlehttp/guzzle/tests/MimetypesTest.php
deleted file mode 100644
index a18ec3813..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/MimetypesTest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace GuzzleHttp\Tests;
-
-use GuzzleHttp\Mimetypes;
-
-/**
- * @covers GuzzleHttp\Mimetypes
- */
-class MimetypesTest extends \PHPUnit_Framework_TestCase
-{
-    public function testGetsFromExtension()
-    {
-        $this->assertEquals('text/x-php', Mimetypes::getInstance()->fromExtension('php'));
-    }
-
-    public function testGetsFromFilename()
-    {
-        $this->assertEquals('text/x-php', Mimetypes::getInstance()->fromFilename(__FILE__));
-    }
-
-    public function testGetsFromCaseInsensitiveFilename()
-    {
-        $this->assertEquals('text/x-php', Mimetypes::getInstance()->fromFilename(strtoupper(__FILE__)));
-    }
-
-    public function testReturnsNullWhenNoMatchFound()
-    {
-        $this->assertNull(Mimetypes::getInstance()->fromExtension('foobar'));
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/PoolTest.php b/core/vendor/guzzlehttp/guzzle/tests/PoolTest.php
deleted file mode 100644
index b5f02add8..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/PoolTest.php
+++ /dev/null
@@ -1,319 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests;
-
-use GuzzleHttp\Client;
-use GuzzleHttp\Event\RequestEvents;
-use GuzzleHttp\Pool;
-use GuzzleHttp\Ring\Client\MockHandler;
-use GuzzleHttp\Ring\Future\FutureArray;
-use GuzzleHttp\Subscriber\History;
-use GuzzleHttp\Event\BeforeEvent;
-use GuzzleHttp\Event\CompleteEvent;
-use GuzzleHttp\Event\ErrorEvent;
-use GuzzleHttp\Event\EndEvent;
-use GuzzleHttp\Message\Response;
-use GuzzleHttp\Subscriber\Mock;
-use React\Promise\Deferred;
-
-class PoolTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @expectedException \InvalidArgumentException
-     */
-    public function testValidatesIterable()
-    {
-        new Pool(new Client(), 'foo');
-    }
-
-    public function testCanControlPoolSizeAndClient()
-    {
-        $c = new Client();
-        $p = new Pool($c, [], ['pool_size' => 10]);
-        $this->assertSame($c, $this->readAttribute($p, 'client'));
-        $this->assertEquals(10, $this->readAttribute($p, 'poolSize'));
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     */
-    public function testValidatesEachElement()
-    {
-        $c = new Client();
-        $requests = ['foo'];
-        $p = new Pool($c, new \ArrayIterator($requests));
-        $p->wait();
-    }
-
-    public function testSendsAndRealizesFuture()
-    {
-        $c = $this->getClient();
-        $p = new Pool($c, [$c->createRequest('GET', 'http://foo.com')]);
-        $this->assertTrue($p->wait());
-        $this->assertFalse($p->wait());
-        $this->assertTrue($this->readAttribute($p, 'isRealized'));
-        $this->assertFalse($p->cancel());
-    }
-
-    public function testSendsManyRequestsInCappedPool()
-    {
-        $c = $this->getClient();
-        $p = new Pool($c, [$c->createRequest('GET', 'http://foo.com')]);
-        $this->assertTrue($p->wait());
-        $this->assertFalse($p->wait());
-    }
-
-    public function testSendsRequestsThatHaveNotBeenRealized()
-    {
-        $c = $this->getClient();
-        $p = new Pool($c, [$c->createRequest('GET', 'http://foo.com')]);
-        $this->assertTrue($p->wait());
-        $this->assertFalse($p->wait());
-        $this->assertFalse($p->cancel());
-    }
-
-    public function testCancelsInFlightRequests()
-    {
-        $c = $this->getClient();
-        $h = new History();
-        $c->getEmitter()->attach($h);
-        $p = new Pool($c, [
-            $c->createRequest('GET', 'http://foo.com'),
-            $c->createRequest('GET', 'http://foo.com', [
-                'events' => [
-                    'before' => [
-                        'fn' => function () use (&$p) {
-                            $this->assertTrue($p->cancel());
-                        },
-                        'priority' => RequestEvents::EARLY
-                    ]
-                ]
-            ])
-        ]);
-        ob_start();
-        $p->wait();
-        $contents = ob_get_clean();
-        $this->assertEquals(1, count($h));
-        $this->assertEquals('Cancelling', $contents);
-    }
-
-    private function getClient()
-    {
-        $deferred = new Deferred();
-        $future = new FutureArray(
-            $deferred->promise(),
-            function() use ($deferred) {
-                $deferred->resolve(['status' => 200, 'headers' => []]);
-            }, function () {
-                echo 'Cancelling';
-            }
-        );
-
-        return new Client(['handler' => new MockHandler($future)]);
-    }
-
-    public function testBatchesRequests()
-    {
-        $client = new Client(['handler' => function () {
-            throw new \RuntimeException('No network access');
-        }]);
-
-        $responses = [
-            new Response(301, ['Location' => 'http://foo.com/bar']),
-            new Response(200),
-            new Response(200),
-            new Response(404)
-        ];
-
-        $client->getEmitter()->attach(new Mock($responses));
-        $requests = [
-            $client->createRequest('GET', 'http://foo.com/baz'),
-            $client->createRequest('HEAD', 'http://httpbin.org/get'),
-            $client->createRequest('PUT', 'http://httpbin.org/put'),
-        ];
-
-        $a = $b = $c = $d = 0;
-        $result = Pool::batch($client, $requests, [
-            'before'   => function (BeforeEvent $e) use (&$a) { $a++; },
-            'complete' => function (CompleteEvent $e) use (&$b) { $b++; },
-            'error'    => function (ErrorEvent $e) use (&$c) { $c++; },
-            'end'      => function (EndEvent $e) use (&$d) { $d++; }
-        ]);
-
-        $this->assertEquals(4, $a);
-        $this->assertEquals(2, $b);
-        $this->assertEquals(1, $c);
-        $this->assertEquals(3, $d);
-        $this->assertCount(3, $result);
-        $this->assertInstanceOf('GuzzleHttp\BatchResults', $result);
-
-        // The first result is actually the second (redirect) response.
-        $this->assertSame($responses[1], $result[0]);
-        // The second result is a 1:1 request:response map
-        $this->assertSame($responses[2], $result[1]);
-        // The third entry is the 404 RequestException
-        $this->assertSame($responses[3], $result[2]->getResponse());
-    }
-
-    public function testBatchesRequestsWithDynamicPoolSize()
-    {
-        $client = new Client(['handler' => function () {
-            throw new \RuntimeException('No network access');
-        }]);
-
-        $responses = [
-            new Response(301, ['Location' => 'http://foo.com/bar']),
-            new Response(200),
-            new Response(200),
-            new Response(404)
-        ];
-
-        $client->getEmitter()->attach(new Mock($responses));
-        $requests = [
-            $client->createRequest('GET', 'http://foo.com/baz'),
-            $client->createRequest('HEAD', 'http://httpbin.org/get'),
-            $client->createRequest('PUT', 'http://httpbin.org/put'),
-        ];
-
-        $a = $b = $c = $d = 0;
-        $result = Pool::batch($client, $requests, [
-            'before'    => function (BeforeEvent $e) use (&$a) { $a++; },
-            'complete'  => function (CompleteEvent $e) use (&$b) { $b++; },
-            'error'     => function (ErrorEvent $e) use (&$c) { $c++; },
-            'end'       => function (EndEvent $e) use (&$d) { $d++; },
-            'pool_size' => function ($queueSize) {
-                static $options = [1, 2, 1];
-                static $queued  = 0;
-
-                $this->assertEquals(
-                    $queued,
-                    $queueSize,
-                    'The number of queued requests should be equal to the sum of pool sizes so far.'
-                );
-
-                $next    = array_shift($options);
-                $queued += $next;
-
-                return $next;
-            }
-        ]);
-
-        $this->assertEquals(4, $a);
-        $this->assertEquals(2, $b);
-        $this->assertEquals(1, $c);
-        $this->assertEquals(3, $d);
-        $this->assertCount(3, $result);
-        $this->assertInstanceOf('GuzzleHttp\BatchResults', $result);
-
-        // The first result is actually the second (redirect) response.
-        $this->assertSame($responses[1], $result[0]);
-        // The second result is a 1:1 request:response map
-        $this->assertSame($responses[2], $result[1]);
-        // The third entry is the 404 RequestException
-        $this->assertSame($responses[3], $result[2]->getResponse());
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Each event listener must be a callable or
-     */
-    public function testBatchValidatesTheEventFormat()
-    {
-        $client = new Client();
-        $requests = [$client->createRequest('GET', 'http://foo.com/baz')];
-        Pool::batch($client, $requests, ['complete' => 'foo']);
-    }
-
-    public function testEmitsProgress()
-    {
-        $client = new Client(['handler' => function () {
-            throw new \RuntimeException('No network access');
-        }]);
-
-        $responses = [new Response(200), new Response(404)];
-        $client->getEmitter()->attach(new Mock($responses));
-        $requests = [
-            $client->createRequest('GET', 'http://foo.com/baz'),
-            $client->createRequest('HEAD', 'http://httpbin.org/get')
-        ];
-
-        $pool = new Pool($client, $requests);
-        $count = 0;
-        $thenned = null;
-        $pool->then(
-            function ($value) use (&$thenned) {
-                $thenned = $value;
-            },
-            null,
-            function ($result) use (&$count, $requests) {
-                $this->assertSame($requests[$count], $result['request']);
-                if ($count == 0) {
-                    $this->assertNull($result['error']);
-                    $this->assertEquals(200, $result['response']->getStatusCode());
-                } else {
-                    $this->assertInstanceOf(
-                        'GuzzleHttp\Exception\ClientException',
-                        $result['error']
-                    );
-                }
-                $count++;
-            }
-        );
-
-        $pool->wait();
-        $this->assertEquals(2, $count);
-        $this->assertEquals(true, $thenned);
-    }
-
-    public function testDoesNotThrowInErrorEvent()
-    {
-        $client = new Client();
-        $responses = [new Response(404)];
-        $client->getEmitter()->attach(new Mock($responses));
-        $requests = [$client->createRequest('GET', 'http://foo.com/baz')];
-        $result = Pool::batch($client, $requests);
-        $this->assertCount(1, $result);
-        $this->assertInstanceOf('GuzzleHttp\Exception\ClientException', $result[0]);
-    }
-
-    public function testHasSendMethod()
-    {
-        $client = new Client();
-        $responses = [new Response(404)];
-        $history = new History();
-        $client->getEmitter()->attach($history);
-        $client->getEmitter()->attach(new Mock($responses));
-        $requests = [$client->createRequest('GET', 'http://foo.com/baz')];
-        Pool::send($client, $requests);
-        $this->assertCount(1, $history);
-    }
-
-    public function testDoesNotInfinitelyRecurse()
-    {
-        $client = new Client(['handler' => function () {
-            throw new \RuntimeException('No network access');
-        }]);
-
-        $last = null;
-        $client->getEmitter()->on(
-            'before',
-            function (BeforeEvent $e) use (&$last) {
-                $e->intercept(new Response(200));
-                if (function_exists('xdebug_get_stack_depth')) {
-                    if ($last) {
-                        $this->assertEquals($last, xdebug_get_stack_depth());
-                    } else {
-                        $last = xdebug_get_stack_depth();
-                    }
-                }
-            }
-        );
-
-        $requests = [];
-        for ($i = 0; $i < 100; $i++) {
-            $requests[] = $client->createRequest('GET', 'http://foo.com');
-        }
-
-        $pool = new Pool($client, $requests);
-        $pool->wait();
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/Post/MultipartBodyTest.php b/core/vendor/guzzlehttp/guzzle/tests/Post/MultipartBodyTest.php
deleted file mode 100644
index 4b3b39164..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/Post/MultipartBodyTest.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests\Post;
-
-use GuzzleHttp\Post\MultipartBody;
-use GuzzleHttp\Post\PostFile;
-
-/**
- * @covers GuzzleHttp\Post\MultipartBody
- */
-class MultipartBodyTest extends \PHPUnit_Framework_TestCase
-{
-    protected function getTestBody()
-    {
-        return new MultipartBody(['foo' => 'bar'], [
-            new PostFile('foo', 'abc', 'foo.txt')
-        ], 'abcdef');
-    }
-
-    public function testConstructorAddsFieldsAndFiles()
-    {
-        $b = $this->getTestBody();
-        $this->assertEquals('abcdef', $b->getBoundary());
-        $c = (string) $b;
-        $this->assertContains("--abcdef\r\nContent-Disposition: form-data; name=\"foo\"\r\n\r\nbar\r\n", $c);
-        $this->assertContains("--abcdef\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"foo.txt\"\r\n"
-            . "Content-Type: text/plain\r\n\r\nabc\r\n--abcdef--", $c);
-    }
-
-    public function testDoesNotModifyFieldFormat()
-    {
-        $m = new MultipartBody(['foo+baz' => 'bar+bam %20 boo'], [
-            new PostFile('foo+bar', 'abc %20 123', 'foo.txt')
-        ], 'abcdef');
-        $this->assertContains('name="foo+baz"', (string) $m);
-        $this->assertContains('name="foo+bar"', (string) $m);
-        $this->assertContains('bar+bam %20 boo', (string) $m);
-        $this->assertContains('abc %20 123', (string) $m);
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     */
-    public function testConstructorValidatesFiles()
-    {
-        new MultipartBody([], ['bar']);
-    }
-
-    public function testConstructorCanCreateBoundary()
-    {
-        $b = new MultipartBody();
-        $this->assertNotNull($b->getBoundary());
-    }
-
-    public function testWrapsStreamMethods()
-    {
-        $b = $this->getTestBody();
-        $this->assertFalse($b->write('foo'));
-        $this->assertFalse($b->isWritable());
-        $this->assertTrue($b->isReadable());
-        $this->assertTrue($b->isSeekable());
-        $this->assertEquals(0, $b->tell());
-    }
-
-    public function testCanDetachFieldsAndFiles()
-    {
-        $b = $this->getTestBody();
-        $b->detach();
-        $b->close();
-        $this->assertEquals('', (string) $b);
-    }
-
-    public function testIsSeekableReturnsTrueIfAllAreSeekable()
-    {
-        $s = $this->getMockBuilder('GuzzleHttp\Stream\StreamInterface')
-            ->setMethods(['isSeekable', 'isReadable'])
-            ->getMockForAbstractClass();
-        $s->expects($this->once())
-            ->method('isSeekable')
-            ->will($this->returnValue(false));
-        $s->expects($this->once())
-            ->method('isReadable')
-            ->will($this->returnValue(true));
-        $p = new PostFile('foo', $s, 'foo.php');
-        $b = new MultipartBody([], [$p]);
-        $this->assertFalse($b->isSeekable());
-        $this->assertFalse($b->seek(10));
-    }
-
-    public function testReadsFromBuffer()
-    {
-        $b = $this->getTestBody();
-        $c = $b->read(1);
-        $c .= $b->read(1);
-        $c .= $b->read(1);
-        $c .= $b->read(1);
-        $c .= $b->read(1);
-        $this->assertEquals('--abc', $c);
-    }
-
-    public function testCalculatesSize()
-    {
-        $b = $this->getTestBody();
-        $this->assertEquals(strlen($b), $b->getSize());
-    }
-
-    public function testCalculatesSizeAndReturnsNullForUnknown()
-    {
-        $s = $this->getMockBuilder('GuzzleHttp\Stream\StreamInterface')
-            ->setMethods(['getSize', 'isReadable'])
-            ->getMockForAbstractClass();
-        $s->expects($this->once())
-            ->method('getSize')
-            ->will($this->returnValue(null));
-        $s->expects($this->once())
-            ->method('isReadable')
-            ->will($this->returnValue(true));
-        $b = new MultipartBody([], [new PostFile('foo', $s, 'foo.php')]);
-        $this->assertNull($b->getSize());
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/Post/PostBodyTest.php b/core/vendor/guzzlehttp/guzzle/tests/Post/PostBodyTest.php
deleted file mode 100644
index 0283a5ebf..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/Post/PostBodyTest.php
+++ /dev/null
@@ -1,255 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests\Post;
-
-use GuzzleHttp\Message\Request;
-use GuzzleHttp\Post\PostBody;
-use GuzzleHttp\Post\PostFile;
-use GuzzleHttp\Query;
-
-/**
- * @covers GuzzleHttp\Post\PostBody
- */
-class PostBodyTest extends \PHPUnit_Framework_TestCase
-{
-    public function testWrapsBasicStreamFunctionality()
-    {
-        $b = new PostBody();
-        $this->assertTrue($b->isSeekable());
-        $this->assertTrue($b->isReadable());
-        $this->assertFalse($b->isWritable());
-        $this->assertFalse($b->write('foo'));
-    }
-
-    public function testApplyingWithNothingDoesNothing()
-    {
-        $b = new PostBody();
-        $m = new Request('POST', '/');
-        $b->applyRequestHeaders($m);
-        $this->assertFalse($m->hasHeader('Content-Length'));
-        $this->assertFalse($m->hasHeader('Content-Type'));
-    }
-
-    public function testCanForceMultipartUploadsWhenApplying()
-    {
-        $b = new PostBody();
-        $b->forceMultipartUpload(true);
-        $m = new Request('POST', '/');
-        $b->applyRequestHeaders($m);
-        $this->assertContains(
-            'multipart/form-data',
-            $m->getHeader('Content-Type')
-        );
-    }
-
-    public function testApplyingWithFilesAddsMultipartUpload()
-    {
-        $b = new PostBody();
-        $p = new PostFile('foo', fopen(__FILE__, 'r'));
-        $b->addFile($p);
-        $this->assertEquals([$p], $b->getFiles());
-        $this->assertNull($b->getFile('missing'));
-        $this->assertSame($p, $b->getFile('foo'));
-        $m = new Request('POST', '/');
-        $b->applyRequestHeaders($m);
-        $this->assertContains(
-            'multipart/form-data',
-            $m->getHeader('Content-Type')
-        );
-        $this->assertTrue($m->hasHeader('Content-Length'));
-    }
-
-    public function testApplyingWithFieldsAddsMultipartUpload()
-    {
-        $b = new PostBody();
-        $b->setField('foo', 'bar');
-        $this->assertEquals(['foo' => 'bar'], $b->getFields());
-        $m = new Request('POST', '/');
-        $b->applyRequestHeaders($m);
-        $this->assertContains(
-            'application/x-www-form',
-            $m->getHeader('Content-Type')
-        );
-        $this->assertTrue($m->hasHeader('Content-Length'));
-    }
-
-    public function testMultipartWithNestedFields()
-    {
-        $b = new PostBody();
-        $b->setField('foo', ['bar' => 'baz']);
-        $b->forceMultipartUpload(true);
-        $this->assertEquals(['foo' => ['bar' => 'baz']], $b->getFields());
-        $m = new Request('POST', '/');
-        $b->applyRequestHeaders($m);
-        $this->assertContains(
-            'multipart/form-data',
-            $m->getHeader('Content-Type')
-        );
-        $this->assertTrue($m->hasHeader('Content-Length'));
-        $contents = $b->getContents();
-        $this->assertContains('name="foo[bar]"', $contents);
-        $this->assertNotContains('name="foo"', $contents);
-    }
-
-    public function testCountProvidesFieldsAndFiles()
-    {
-        $b = new PostBody();
-        $b->setField('foo', 'bar');
-        $b->addFile(new PostFile('foo', fopen(__FILE__, 'r')));
-        $this->assertEquals(2, count($b));
-        $b->clearFiles();
-        $b->removeField('foo');
-        $this->assertEquals(0, count($b));
-        $this->assertEquals([], $b->getFiles());
-        $this->assertEquals([], $b->getFields());
-    }
-
-    public function testHasFields()
-    {
-        $b = new PostBody();
-        $b->setField('foo', 'bar');
-        $b->setField('baz', '123');
-        $this->assertEquals('bar', $b->getField('foo'));
-        $this->assertEquals('123', $b->getField('baz'));
-        $this->assertNull($b->getField('ahh'));
-        $this->assertTrue($b->hasField('foo'));
-        $this->assertFalse($b->hasField('test'));
-        $b->replaceFields(['abc' => '123']);
-        $this->assertFalse($b->hasField('foo'));
-        $this->assertTrue($b->hasField('abc'));
-    }
-
-    public function testConvertsFieldsToQueryStyleBody()
-    {
-        $b = new PostBody();
-        $b->setField('foo', 'bar');
-        $b->setField('baz', '123');
-        $this->assertEquals('foo=bar&baz=123', $b);
-        $this->assertEquals(15, $b->getSize());
-        $b->seek(0);
-        $this->assertEquals('foo=bar&baz=123', $b->getContents());
-        $b->seek(0);
-        $this->assertEquals('foo=bar&baz=123', $b->read(1000));
-        $this->assertEquals(15, $b->tell());
-    }
-
-    public function testCanSpecifyQueryAggregator()
-    {
-        $b = new PostBody();
-        $b->setField('foo', ['baz', 'bar']);
-        $this->assertEquals('foo%5B0%5D=baz&foo%5B1%5D=bar', (string) $b);
-        $b = new PostBody();
-        $b->setField('foo', ['baz', 'bar']);
-        $agg = Query::duplicateAggregator();
-        $b->setAggregator($agg);
-        $this->assertEquals('foo=baz&foo=bar', (string) $b);
-    }
-
-    public function testDetachesAndCloses()
-    {
-        $b = new PostBody();
-        $b->setField('foo', 'bar');
-        $b->detach();
-        $b->close();
-        $this->assertEquals('', $b->read(10));
-    }
-
-    public function testDetachesWhenBodyIsPresent()
-    {
-        $b = new PostBody();
-        $b->setField('foo', 'bar');
-        $b->getContents();
-        $b->detach();
-    }
-
-    public function testFlushAndMetadataPlaceholders()
-    {
-        $b = new PostBody();
-        $this->assertEquals([], $b->getMetadata());
-        $this->assertNull($b->getMetadata('foo'));
-    }
-
-    public function testCreatesMultipartUploadWithMultiFields()
-    {
-        $b = new PostBody();
-        $b->setField('testing', ['baz', 'bar']);
-        $b->setField('other', 'hi');
-        $b->setField('third', 'there');
-        $b->addFile(new PostFile('foo', fopen(__FILE__, 'r')));
-        $s = (string) $b;
-        $this->assertContains(file_get_contents(__FILE__), $s);
-        $this->assertContains('testing=bar', $s);
-        $this->assertContains(
-            'Content-Disposition: form-data; name="third"',
-            $s
-        );
-        $this->assertContains(
-            'Content-Disposition: form-data; name="other"',
-            $s
-        );
-    }
-
-    public function testMultipartWithBase64Fields()
-    {
-        $b = new PostBody();
-        $b->setField('foo64', '/xA2JhWEqPcgyLRDdir9WSRi/khpb2Lh3ooqv+5VYoc=');
-        $b->forceMultipartUpload(true);
-        $this->assertEquals(
-            ['foo64' => '/xA2JhWEqPcgyLRDdir9WSRi/khpb2Lh3ooqv+5VYoc='],
-            $b->getFields()
-        );
-        $m = new Request('POST', '/');
-        $b->applyRequestHeaders($m);
-        $this->assertContains(
-            'multipart/form-data',
-            $m->getHeader('Content-Type')
-        );
-        $this->assertTrue($m->hasHeader('Content-Length'));
-        $contents = $b->getContents();
-        $this->assertContains('name="foo64"', $contents);
-        $this->assertContains(
-            '/xA2JhWEqPcgyLRDdir9WSRi/khpb2Lh3ooqv+5VYoc=',
-            $contents
-        );
-    }
-
-    public function testMultipartWithAmpersandInValue()
-    {
-        $b = new PostBody();
-        $b->setField('a', 'b&c=d');
-        $b->forceMultipartUpload(true);
-        $this->assertEquals(['a' => 'b&c=d'], $b->getFields());
-        $m = new Request('POST', '/');
-        $b->applyRequestHeaders($m);
-        $this->assertContains(
-            'multipart/form-data',
-            $m->getHeader('Content-Type')
-        );
-        $this->assertTrue($m->hasHeader('Content-Length'));
-        $contents = $b->getContents();
-        $this->assertContains('name="a"', $contents);
-        $this->assertContains('b&c=d', $contents);
-    }
-
-    /**
-     * @expectedException \GuzzleHttp\Stream\Exception\CannotAttachException
-     */
-    public function testCannotAttach()
-    {
-        $b = new PostBody();
-        $b->attach('foo');
-    }
-
-    public function testDoesNotOverwriteExistingHeaderForUrlencoded()
-    {
-        $m = new Request('POST', 'http://foo.com', [
-            'content-type' => 'application/x-www-form-urlencoded; charset=utf-8'
-        ]);
-        $b = new PostBody();
-        $b->setField('foo', 'bar');
-        $b->applyRequestHeaders($m);
-        $this->assertEquals(
-            'application/x-www-form-urlencoded; charset=utf-8',
-            $m->getHeader('Content-Type')
-        );
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/Post/PostFileTest.php b/core/vendor/guzzlehttp/guzzle/tests/Post/PostFileTest.php
deleted file mode 100644
index 800cee503..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/Post/PostFileTest.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests\Post;
-
-use GuzzleHttp\Post\MultipartBody;
-use GuzzleHttp\Post\PostFile;
-use GuzzleHttp\Stream\Stream;
-
-/**
- * @covers GuzzleHttp\Post\PostFile
- */
-class PostFileTest extends \PHPUnit_Framework_TestCase
-{
-    public function testCreatesFromString()
-    {
-        $p = new PostFile('foo', 'hi', '/path/to/test.php');
-        $this->assertInstanceOf('GuzzleHttp\Post\PostFileInterface', $p);
-        $this->assertEquals('hi', $p->getContent());
-        $this->assertEquals('foo', $p->getName());
-        $this->assertEquals('/path/to/test.php', $p->getFilename());
-        $this->assertEquals(
-            'form-data; name="foo"; filename="test.php"',
-            $p->getHeaders()['Content-Disposition']
-        );
-    }
-
-    public function testGetsFilenameFromMetadata()
-    {
-        $p = new PostFile('foo', fopen(__FILE__, 'r'));
-        $this->assertEquals(__FILE__, $p->getFilename());
-    }
-
-    public function testDefaultsToNameWhenNoFilenameExists()
-    {
-        $p = new PostFile('foo', 'bar');
-        $this->assertEquals('foo', $p->getFilename());
-    }
-
-    public function testCreatesFromMultipartFormData()
-    {
-        $mp = new MultipartBody([], [], 'baz');
-        $p = new PostFile('foo', $mp);
-        $this->assertEquals(
-            'form-data; name="foo"',
-            $p->getHeaders()['Content-Disposition']
-        );
-        $this->assertEquals(
-            'multipart/form-data; boundary=baz',
-            $p->getHeaders()['Content-Type']
-        );
-    }
-
-    public function testCanAddHeaders()
-    {
-        $p = new PostFile('foo', Stream::factory('hi'), 'test.php', [
-            'X-Foo' => '123',
-            'Content-Disposition' => 'bar'
-        ]);
-        $this->assertEquals('bar', $p->getHeaders()['Content-Disposition']);
-        $this->assertEquals('123', $p->getHeaders()['X-Foo']);
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/QueryParserTest.php b/core/vendor/guzzlehttp/guzzle/tests/QueryParserTest.php
deleted file mode 100644
index e9075a80d..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/QueryParserTest.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-namespace GuzzleHttp\Tests;
-
-use GuzzleHttp\Query;
-use GuzzleHttp\QueryParser;
-
-class QueryParserTest extends \PHPUnit_Framework_TestCase
-{
-    public function parseQueryProvider()
-    {
-        return [
-            // Does not need to parse when the string is empty
-            ['', []],
-            // Can parse mult-values items
-            ['q=a&q=b', ['q' => ['a', 'b']]],
-            // Can parse multi-valued items that use numeric indices
-            ['q[0]=a&q[1]=b', ['q' => ['a', 'b']]],
-            // Can parse duplicates and does not include numeric indices
-            ['q[]=a&q[]=b', ['q' => ['a', 'b']]],
-            // Ensures that the value of "q" is an array even though one value
-            ['q[]=a', ['q' => ['a']]],
-            // Does not modify "." to "_" like PHP's parse_str()
-            ['q.a=a&q.b=b', ['q.a' => 'a', 'q.b' => 'b']],
-            // Can decode %20 to " "
-            ['q%20a=a%20b', ['q a' => 'a b']],
-            // Can parse funky strings with no values by assigning each to null
-            ['q&a', ['q' => null, 'a' => null]],
-            // Does not strip trailing equal signs
-            ['data=abc=', ['data' => 'abc=']],
-            // Can store duplicates without affecting other values
-            ['foo=a&foo=b&?µ=c', ['foo' => ['a', 'b'], '?µ' => 'c']],
-            // Sets value to null when no "=" is present
-            ['foo', ['foo' => null]],
-            // Preserves "0" keys.
-            ['0', ['0' => null]],
-            // Sets the value to an empty string when "=" is present
-            ['0=', ['0' => '']],
-            // Preserves falsey keys
-            ['var=0', ['var' => '0']],
-            // Can deeply nest and store duplicate PHP values
-            ['a[b][c]=1&a[b][c]=2', [
-                'a' => ['b' => ['c' => ['1', '2']]]
-            ]],
-            // Can parse PHP style arrays
-            ['a[b]=c&a[d]=e', ['a' => ['b' => 'c', 'd' => 'e']]],
-            // Ensure it doesn't leave things behind with repeated values
-            // Can parse mult-values items
-            ['q=a&q=b&q=c', ['q' => ['a', 'b', 'c']]],
-        ];
-    }
-
-    /**
-     * @dataProvider parseQueryProvider
-     */
-    public function testParsesQueries($input, $output)
-    {
-        $query = Query::fromString($input);
-        $this->assertEquals($output, $query->toArray());
-        // Normalize the input and output
-        $query->setEncodingType(false);
-        $this->assertEquals(rawurldecode($input), (string) $query);
-    }
-
-    public function testConvertsPlusSymbolsToSpacesByDefault()
-    {
-        $query = Query::fromString('var=foo+bar', true);
-        $this->assertEquals('foo bar', $query->get('var'));
-    }
-
-    public function testCanControlDecodingType()
-    {
-        $qp = new QueryParser();
-        $q = new Query();
-        $qp->parseInto($q, 'var=foo+bar', Query::RFC3986);
-        $this->assertEquals('foo+bar', $q->get('var'));
-        $qp->parseInto($q, 'var=foo+bar', Query::RFC1738);
-        $this->assertEquals('foo bar', $q->get('var'));
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/QueryTest.php b/core/vendor/guzzlehttp/guzzle/tests/QueryTest.php
deleted file mode 100644
index 8b9d3448f..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/QueryTest.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-
-namespace GuzzleHttp\Tests;
-
-use GuzzleHttp\Query;
-
-class QueryTest extends \PHPUnit_Framework_TestCase
-{
-    public function testCanCastToString()
-    {
-        $q = new Query(['foo' => 'baz', 'bar' => 'bam boozle']);
-        $this->assertEquals('foo=baz&bar=bam%20boozle', (string) $q);
-    }
-
-    public function testCanDisableUrlEncoding()
-    {
-        $q = new Query(['bar' => 'bam boozle']);
-        $q->setEncodingType(false);
-        $this->assertEquals('bar=bam boozle', (string) $q);
-    }
-
-    public function testCanSpecifyRfc1783UrlEncodingType()
-    {
-        $q = new Query(['bar abc' => 'bam boozle']);
-        $q->setEncodingType(Query::RFC1738);
-        $this->assertEquals('bar+abc=bam+boozle', (string) $q);
-    }
-
-    public function testCanSpecifyRfc3986UrlEncodingType()
-    {
-        $q = new Query(['bar abc' => 'bam boozle', 'ሴ' => 'hi']);
-        $q->setEncodingType(Query::RFC3986);
-        $this->assertEquals('bar%20abc=bam%20boozle&%E1%88%B4=hi', (string) $q);
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     */
-    public function testValidatesEncodingType()
-    {
-        (new Query(['bar' => 'bam boozle']))->setEncodingType('foo');
-    }
-
-    public function testAggregatesMultipleValues()
-    {
-        $q = new Query(['foo' => ['bar', 'baz']]);
-        $this->assertEquals('foo%5B0%5D=bar&foo%5B1%5D=baz', (string) $q);
-    }
-
-    public function testCanSetAggregator()
-    {
-        $q = new Query(['foo' => ['bar', 'baz']]);
-        $q->setAggregator(function (array $data) {
-            return ['foo' => ['barANDbaz']];
-        });
-        $this->assertEquals('foo=barANDbaz', (string) $q);
-    }
-
-    public function testAllowsMultipleValuesPerKey()
-    {
-        $q = new Query();
-        $q->add('facet', 'size');
-        $q->add('facet', 'width');
-        $q->add('facet.field', 'foo');
-        // Use the duplicate aggregator
-        $q->setAggregator($q::duplicateAggregator());
-        $this->assertEquals('facet=size&facet=width&facet.field=foo', (string) $q);
-    }
-
-    public function testAllowsZeroValues()
-    {
-        $query = new Query(array(
-            'foo' => 0,
-            'baz' => '0',
-            'bar' => null,
-            'boo' => false
-        ));
-        $this->assertEquals('foo=0&baz=0&bar&boo=', (string) $query);
-    }
-
-    private $encodeData = [
-        't' => [
-            'v1' => ['a', '1'],
-            'v2' => 'b',
-            'v3' => ['v4' => 'c', 'v5' => 'd']
-        ]
-    ];
-
-    public function testEncodesDuplicateAggregator()
-    {
-        $agg = Query::duplicateAggregator();
-        $result = $agg($this->encodeData);
-        $this->assertEquals(array(
-            't[v1]' => ['a', '1'],
-            't[v2]' => ['b'],
-            't[v3][v4]' => ['c'],
-            't[v3][v5]' => ['d'],
-        ), $result);
-    }
-
-    public function testDuplicateEncodesNoNumericIndices()
-    {
-        $agg = Query::duplicateAggregator();
-        $result = $agg($this->encodeData);
-        $this->assertEquals(array(
-            't[v1]' => ['a', '1'],
-            't[v2]' => ['b'],
-            't[v3][v4]' => ['c'],
-            't[v3][v5]' => ['d'],
-        ), $result);
-    }
-
-    public function testEncodesPhpAggregator()
-    {
-        $agg = Query::phpAggregator();
-        $result = $agg($this->encodeData);
-        $this->assertEquals(array(
-            't[v1][0]' => ['a'],
-            't[v1][1]' => ['1'],
-            't[v2]' => ['b'],
-            't[v3][v4]' => ['c'],
-            't[v3][v5]' => ['d'],
-        ), $result);
-    }
-
-    public function testPhpEncodesNoNumericIndices()
-    {
-        $agg = Query::phpAggregator(false);
-        $result = $agg($this->encodeData);
-        $this->assertEquals(array(
-            't[v1][]' => ['a', '1'],
-            't[v2]' => ['b'],
-            't[v3][v4]' => ['c'],
-            't[v3][v5]' => ['d'],
-        ), $result);
-    }
-
-    public function testCanDisableUrlEncodingDecoding()
-    {
-        $q = Query::fromString('foo=bar+baz boo%20', false);
-        $this->assertEquals('bar+baz boo%20', $q['foo']);
-        $this->assertEquals('foo=bar+baz boo%20', (string) $q);
-    }
-
-    public function testCanChangeUrlEncodingDecodingToRfc1738()
-    {
-        $q = Query::fromString('foo=bar+baz', Query::RFC1738);
-        $this->assertEquals('bar baz', $q['foo']);
-        $this->assertEquals('foo=bar+baz', (string) $q);
-    }
-
-    public function testCanChangeUrlEncodingDecodingToRfc3986()
-    {
-        $q = Query::fromString('foo=bar%20baz', Query::RFC3986);
-        $this->assertEquals('bar baz', $q['foo']);
-        $this->assertEquals('foo=bar%20baz', (string) $q);
-    }
-
-    public function testQueryStringsAllowSlashButDoesNotDecodeWhenDisable()
-    {
-        $q = Query::fromString('foo=bar%2Fbaz&bam=boo%20boo', Query::RFC3986);
-        $q->setEncodingType(false);
-        $this->assertEquals('foo=bar/baz&bam=boo boo', (string) $q);
-    }
-
-    public function testQueryStringsAllowDecodingEncodingCompletelyDisabled()
-    {
-        $q = Query::fromString('foo=bar%2Fbaz&bam=boo boo!', false);
-        $this->assertEquals('foo=bar%2Fbaz&bam=boo boo!', (string) $q);
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/RequestFsmTest.php b/core/vendor/guzzlehttp/guzzle/tests/RequestFsmTest.php
deleted file mode 100644
index dd6768405..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/RequestFsmTest.php
+++ /dev/null
@@ -1,187 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests;
-
-use GuzzleHttp\Exception\RequestException;
-use GuzzleHttp\Message\MessageFactory;
-use GuzzleHttp\Message\Response;
-use GuzzleHttp\RequestFsm;
-use GuzzleHttp\Ring\Future\CompletedFutureArray;
-use GuzzleHttp\Subscriber\Mock;
-use GuzzleHttp\Transaction;
-use GuzzleHttp\Client;
-use GuzzleHttp\Message\Request;
-use GuzzleHttp\Event\BeforeEvent;
-use GuzzleHttp\Event\CompleteEvent;
-use GuzzleHttp\Event\ErrorEvent;
-use GuzzleHttp\Event\EndEvent;
-use GuzzleHttp\Message\FutureResponse;
-use GuzzleHttp\Message\RequestInterface;
-use GuzzleHttp\Event\RequestEvents;
-use React\Promise\Deferred;
-
-class RequestFsmTest extends \PHPUnit_Framework_TestCase
-{
-    private $mf;
-
-    public function setup()
-    {
-        $this->mf = new MessageFactory();
-    }
-
-    public function testEmitsBeforeEventInTransition()
-    {
-        $fsm = new RequestFsm(function () {
-            return new CompletedFutureArray(['status' => 200]);
-        }, $this->mf);
-        $t = new Transaction(new Client(), new Request('GET', 'http://foo.com'));
-        $c = false;
-        $t->request->getEmitter()->on('before', function (BeforeEvent $e) use (&$c) {
-            $c = true;
-        });
-        $fsm($t);
-        $this->assertTrue($c);
-    }
-
-    public function testEmitsCompleteEventInTransition()
-    {
-        $fsm = new RequestFsm(function () {
-            return new CompletedFutureArray(['status' => 200]);
-        }, $this->mf);
-        $t = new Transaction(new Client(), new Request('GET', 'http://foo.com'));
-        $t->response = new Response(200);
-        $t->state = 'complete';
-        $c = false;
-        $t->request->getEmitter()->on('complete', function (CompleteEvent $e) use (&$c) {
-            $c = true;
-        });
-        $fsm($t);
-        $this->assertTrue($c);
-    }
-
-    public function testDoesNotEmitCompleteForFuture()
-    {
-        $fsm = new RequestFsm(function () {
-            return new CompletedFutureArray(['status' => 200]);
-        }, $this->mf);
-        $t = new Transaction(new Client(), new Request('GET', 'http://foo.com'));
-        $deferred = new Deferred();
-        $t->response = new FutureResponse($deferred->promise());
-        $t->state = 'complete';
-        $c = false;
-        $t->request->getEmitter()->on('complete', function (CompleteEvent $e) use (&$c) {
-            $c = true;
-        });
-        $fsm($t);
-        $this->assertFalse($c);
-    }
-
-    public function testTransitionsThroughSuccessfulTransfer()
-    {
-        $client = new Client();
-        $client->getEmitter()->attach(new Mock([new Response(200)]));
-        $request = $client->createRequest('GET', 'http://ewfewwef.com');
-        $this->addListeners($request, $calls);
-        $client->send($request);
-        $this->assertEquals(['before', 'complete', 'end'], $calls);
-    }
-
-    public function testTransitionsThroughErrorsInBefore()
-    {
-        $fsm = new RequestFsm(function () {
-            return new CompletedFutureArray(['status' => 200]);
-        }, $this->mf);
-        $client = new Client();
-        $request = $client->createRequest('GET', 'http://ewfewwef.com');
-        $t = new Transaction($client, $request);
-        $calls = [];
-        $this->addListeners($t->request, $calls);
-        $t->request->getEmitter()->on('before', function (BeforeEvent $e) {
-            throw new \Exception('foo');
-        });
-        try {
-            $fsm($t);
-            $this->fail('did not throw');
-        } catch (RequestException $e) {
-            $this->assertContains('foo', $t->exception->getMessage());
-            $this->assertEquals(['before', 'error', 'end'], $calls);
-        }
-    }
-
-    public function testTransitionsThroughErrorsInComplete()
-    {
-        $client = new Client();
-        $client->getEmitter()->attach(new Mock([new Response(200)]));
-        $request = $client->createRequest('GET', 'http://ewfewwef.com');
-        $this->addListeners($request, $calls);
-        $request->getEmitter()->once('complete', function (CompleteEvent $e) {
-            throw new \Exception('foo');
-        });
-        try {
-            $client->send($request);
-            $this->fail('did not throw');
-        } catch (RequestException $e) {
-            $this->assertContains('foo', $e->getMessage());
-            $this->assertEquals(['before', 'complete', 'error', 'end'], $calls);
-        }
-    }
-
-    public function testTransitionsThroughErrorInterception()
-    {
-        $fsm = new RequestFsm(function () {
-            return new CompletedFutureArray(['status' => 404]);
-        }, $this->mf);
-        $client = new Client();
-        $request = $client->createRequest('GET', 'http://ewfewwef.com');
-        $t = new Transaction($client, $request);
-        $calls = [];
-        $this->addListeners($t->request, $calls);
-        $t->request->getEmitter()->on('error', function (ErrorEvent $e) {
-            $e->intercept(new Response(200));
-        });
-        $fsm($t);
-        $this->assertEquals(200, $t->response->getStatusCode());
-        $this->assertNull($t->exception);
-        $this->assertEquals(['before', 'complete', 'error', 'complete', 'end'], $calls);
-    }
-
-    private function addListeners(RequestInterface $request, &$calls)
-    {
-        $request->getEmitter()->on('before', function (BeforeEvent $e) use (&$calls) {
-            $calls[] = 'before';
-        }, RequestEvents::EARLY);
-        $request->getEmitter()->on('complete', function (CompleteEvent $e) use (&$calls) {
-            $calls[] = 'complete';
-        }, RequestEvents::EARLY);
-        $request->getEmitter()->on('error', function (ErrorEvent $e) use (&$calls) {
-            $calls[] = 'error';
-        }, RequestEvents::EARLY);
-        $request->getEmitter()->on('end', function (EndEvent $e) use (&$calls) {
-            $calls[] = 'end';
-        }, RequestEvents::EARLY);
-    }
-
-    /**
-     * @expectedException \GuzzleHttp\Exception\RequestException
-     * @expectedExceptionMessage Too many state transitions
-     */
-    public function testDetectsInfiniteLoops()
-    {
-        $client = new Client([
-            'fsm' => $fsm = new RequestFsm(
-                function () {
-                    return new CompletedFutureArray(['status' => 200]);
-                },
-                new MessageFactory(),
-                3
-            )
-        ]);
-        $request = $client->createRequest('GET', 'http://foo.com:123');
-        $request->getEmitter()->on('before', function () {
-            throw new \Exception('foo');
-        });
-        $request->getEmitter()->on('error', function ($e) {
-            $e->retry();
-        });
-        $client->send($request);
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/RingBridgeTest.php b/core/vendor/guzzlehttp/guzzle/tests/RingBridgeTest.php
deleted file mode 100644
index dc26a42aa..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/RingBridgeTest.php
+++ /dev/null
@@ -1,195 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests;
-
-use GuzzleHttp\Client;
-use GuzzleHttp\Event\ProgressEvent;
-use GuzzleHttp\Message\MessageFactory;
-use GuzzleHttp\RingBridge;
-use GuzzleHttp\Stream\Stream;
-use GuzzleHttp\Transaction;
-use GuzzleHttp\Message\Request;
-use GuzzleHttp\Message\Response;
-use GuzzleHttp\Ring\Client\MockHandler;
-use GuzzleHttp\Exception\RequestException;
-use GuzzleHttp\Event\ErrorEvent;
-use GuzzleHttp\RequestFsm;
-
-class RingBridgeTest extends \PHPUnit_Framework_TestCase
-{
-    public function testCreatesRingRequests()
-    {
-        $stream = Stream::factory('test');
-        $request = new Request('GET', 'http://httpbin.org/get?a=b', [
-            'test' => 'hello'
-        ], $stream);
-        $request->getConfig()->set('foo', 'bar');
-        $trans = new Transaction(new Client(), $request);
-        $factory = new MessageFactory();
-        $fsm = new RequestFsm(function () {}, new MessageFactory());
-        $r = RingBridge::prepareRingRequest($trans, $factory, $fsm);
-        $this->assertEquals('http', $r['scheme']);
-        $this->assertEquals('1.1', $r['version']);
-        $this->assertEquals('GET', $r['http_method']);
-        $this->assertEquals('http://httpbin.org/get?a=b', $r['url']);
-        $this->assertEquals('/get', $r['uri']);
-        $this->assertEquals('a=b', $r['query_string']);
-        $this->assertEquals([
-            'Host' => ['httpbin.org'],
-            'test' => ['hello']
-        ], $r['headers']);
-        $this->assertSame($stream, $r['body']);
-        $this->assertEquals(['foo' => 'bar'], $r['client']);
-        $this->assertFalse($r['future']);
-    }
-
-    public function testCreatesRingRequestsWithNullQueryString()
-    {
-        $request = new Request('GET', 'http://httpbin.org');
-        $trans = new Transaction(new Client(), $request);
-        $factory = new MessageFactory();
-        $fsm = new RequestFsm(function () {}, new MessageFactory());
-        $r = RingBridge::prepareRingRequest($trans, $factory, $fsm);
-        $this->assertNull($r['query_string']);
-        $this->assertEquals('/', $r['uri']);
-        $this->assertEquals(['Host' => ['httpbin.org']], $r['headers']);
-        $this->assertNull($r['body']);
-        $this->assertEquals([], $r['client']);
-    }
-
-    public function testAddsProgress()
-    {
-        Server::enqueue([new Response(200)]);
-        $client = new Client(['base_url' => Server::$url]);
-        $request = $client->createRequest('GET');
-        $called = false;
-        $request->getEmitter()->on(
-            'progress',
-            function (ProgressEvent $e) use (&$called) {
-                $called = true;
-            }
-        );
-        $this->assertEquals(200, $client->send($request)->getStatusCode());
-        $this->assertTrue($called);
-    }
-
-    public function testGetsResponseProtocolVersionAndEffectiveUrlAndReason()
-    {
-        $client = new Client([
-            'handler' => new MockHandler([
-                'status'  => 200,
-                'reason' => 'test',
-                'headers' => [],
-                'version' => '1.0',
-                'effective_url' => 'http://foo.com'
-            ])
-        ]);
-        $request = $client->createRequest('GET', 'http://foo.com');
-        $response = $client->send($request);
-        $this->assertEquals('1.0', $response->getProtocolVersion());
-        $this->assertEquals('http://foo.com', $response->getEffectiveUrl());
-        $this->assertEquals('test', $response->getReasonPhrase());
-    }
-
-    public function testGetsStreamFromResponse()
-    {
-        $res = fopen('php://temp', 'r+');
-        fwrite($res, 'foo');
-        rewind($res);
-        $client = new Client([
-            'handler' => new MockHandler([
-                'status'  => 200,
-                'headers' => [],
-                'body' => $res
-            ])
-        ]);
-        $request = $client->createRequest('GET', 'http://foo.com');
-        $response = $client->send($request);
-        $this->assertEquals('foo', (string) $response->getBody());
-    }
-
-    public function testEmitsErrorEventOnError()
-    {
-        $client = new Client(['base_url' => 'http://127.0.0.1:123']);
-        $request = $client->createRequest('GET');
-        $called = false;
-        $request->getEmitter()->on('error', function () use (&$called) {
-            $called = true;
-        });
-        $request->getConfig()['timeout'] = 0.001;
-        $request->getConfig()['connect_timeout'] = 0.001;
-        try {
-            $client->send($request);
-            $this->fail('did not throw');
-        } catch (RequestException $e) {
-            $this->assertSame($request, $e->getRequest());
-            $this->assertContains('cURL error', $e->getMessage());
-            $this->assertTrue($called);
-        }
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     */
-    public function testValidatesRingRequest()
-    {
-        RingBridge::fromRingRequest([]);
-    }
-
-    public function testCreatesRequestFromRing()
-    {
-        $request = RingBridge::fromRingRequest([
-            'http_method' => 'GET',
-            'uri' => '/',
-            'headers' => [
-                'foo' => ['bar'],
-                'host' => ['foo.com']
-            ],
-            'body' => 'test',
-            'version' => '1.0'
-        ]);
-        $this->assertEquals('GET', $request->getMethod());
-        $this->assertEquals('http://foo.com/', $request->getUrl());
-        $this->assertEquals('1.0', $request->getProtocolVersion());
-        $this->assertEquals('test', (string) $request->getBody());
-        $this->assertEquals('bar', $request->getHeader('foo'));
-    }
-
-    public function testCanInterceptException()
-    {
-        $client = new Client(['base_url' => 'http://127.0.0.1:123']);
-        $request = $client->createRequest('GET');
-        $called = false;
-        $request->getEmitter()->on(
-            'error',
-            function (ErrorEvent $e) use (&$called) {
-                $called = true;
-                $e->intercept(new Response(200));
-            }
-        );
-        $request->getConfig()['timeout'] = 0.001;
-        $request->getConfig()['connect_timeout'] = 0.001;
-        $this->assertEquals(200, $client->send($request)->getStatusCode());
-        $this->assertTrue($called);
-    }
-
-    public function testCreatesLongException()
-    {
-        $r = new Request('GET', 'http://www.google.com');
-        $e = RingBridge::getNoRingResponseException($r);
-        $this->assertInstanceOf('GuzzleHttp\Exception\RequestException', $e);
-        $this->assertSame($r, $e->getRequest());
-    }
-
-    public function testEnsuresResponseOrExceptionWhenCompletingResponse()
-    {
-        $trans = new Transaction(new Client(), new Request('GET', 'http://f.co'));
-        $f = new MessageFactory();
-        $fsm = new RequestFsm(function () {}, new MessageFactory());
-        try {
-            RingBridge::completeRingResponse($trans, [], $f, $fsm);
-        } catch (RequestException $e) {
-            $this->assertSame($trans->request, $e->getRequest());
-            $this->assertContains('RingPHP', $e->getMessage());
-        }
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/Server.php b/core/vendor/guzzlehttp/guzzle/tests/Server.php
deleted file mode 100644
index 1de20e38b..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/Server.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests;
-
-use GuzzleHttp\Client;
-use GuzzleHttp\Message\MessageFactory;
-use GuzzleHttp\Message\Response;
-use GuzzleHttp\Message\ResponseInterface;
-use GuzzleHttp\RingBridge;
-use GuzzleHttp\Tests\Ring\Client\Server as TestServer;
-
-/**
- * Placeholder for the RingPHP-Client server that makes it easier to use.
- */
-class Server
-{
-    public static $url = 'http://127.0.0.1:8125/';
-    public static $port = 8125;
-
-    /**
-     * Queue an array of responses or a single response on the server.
-     *
-     * Any currently queued responses will be overwritten.  Subsequent requests
-     * on the server will return queued responses in FIFO order.
-     *
-     * @param array $responses Responses to queue.
-     * @throws \Exception
-     */
-    public static function enqueue(array $responses)
-    {
-        static $factory;
-        if (!$factory) {
-            $factory = new MessageFactory();
-        }
-
-        $data = [];
-        foreach ($responses as $response) {
-            // Create the response object from a string
-            if (is_string($response)) {
-                $response = $factory->fromMessage($response);
-            } elseif (!($response instanceof ResponseInterface)) {
-                throw new \Exception('Responses must be strings or Responses');
-            }
-            $data[] = self::convertResponse($response);
-        }
-
-        TestServer::enqueue($data);
-    }
-
-    /**
-     * Get all of the received requests
-     *
-     * @param bool $hydrate Set to TRUE to turn the messages into
-     *      actual {@see RequestInterface} objects.  If $hydrate is FALSE,
-     *      requests will be returned as strings.
-     *
-     * @return array
-     * @throws \RuntimeException
-     */
-    public static function received($hydrate = false)
-    {
-        $response = TestServer::received();
-
-        if ($hydrate) {
-            $c = new Client();
-            $factory = new MessageFactory();
-            $response = array_map(function($message) use ($factory, $c) {
-                return RingBridge::fromRingRequest($message);
-            }, $response);
-        }
-
-        return $response;
-    }
-
-    public static function flush()
-    {
-        TestServer::flush();
-    }
-
-    public static function stop()
-    {
-        TestServer::stop();
-    }
-
-    public static function wait($maxTries = 5)
-    {
-        TestServer::wait($maxTries);
-    }
-
-    public static function start()
-    {
-        TestServer::start();
-    }
-
-    private static function convertResponse(Response $response)
-    {
-        $headers = array_map(function ($h) {
-            return implode(', ', $h);
-        }, $response->getHeaders());
-
-        return [
-            'status'  => $response->getStatusCode(),
-            'reason'  => $response->getReasonPhrase(),
-            'headers' => $headers,
-            'body'    => base64_encode((string) $response->getBody())
-        ];
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/Subscriber/CookieTest.php b/core/vendor/guzzlehttp/guzzle/tests/Subscriber/CookieTest.php
deleted file mode 100644
index bc17e2dc2..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/Subscriber/CookieTest.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests\Subscriber;
-
-use GuzzleHttp\Transaction;
-use GuzzleHttp\Client;
-use GuzzleHttp\Cookie\CookieJar;
-use GuzzleHttp\Event\CompleteEvent;
-use GuzzleHttp\Message\Request;
-use GuzzleHttp\Message\Response;
-use GuzzleHttp\Subscriber\Cookie;
-use GuzzleHttp\Subscriber\History;
-use GuzzleHttp\Subscriber\Mock;
-
-/**
- * @covers GuzzleHttp\Subscriber\Cookie
- */
-class CookieTest extends \PHPUnit_Framework_TestCase
-{
-    public function testExtractsAndStoresCookies()
-    {
-        $request = new Request('GET', '/');
-        $response = new Response(200);
-        $mock = $this->getMockBuilder('GuzzleHttp\Cookie\CookieJar')
-            ->setMethods(array('extractCookies'))
-            ->getMock();
-
-        $mock->expects($this->exactly(1))
-            ->method('extractCookies')
-            ->with($request, $response);
-
-        $plugin = new Cookie($mock);
-        $t = new Transaction(new Client(), $request);
-        $t->response = $response;
-        $plugin->onComplete(new CompleteEvent($t));
-    }
-
-    public function testProvidesCookieJar()
-    {
-        $jar = new CookieJar();
-        $plugin = new Cookie($jar);
-        $this->assertSame($jar, $plugin->getCookieJar());
-    }
-
-    public function testCookiesAreExtractedFromRedirectResponses()
-    {
-        $jar = new CookieJar();
-        $cookie = new Cookie($jar);
-        $history = new History();
-        $mock = new Mock([
-            "HTTP/1.1 302 Moved Temporarily\r\n" .
-            "Set-Cookie: test=583551; Domain=www.foo.com; Expires=Wednesday, 23-Mar-2050 19:49:45 GMT; Path=/\r\n" .
-            "Location: /redirect\r\n\r\n",
-            "HTTP/1.1 200 OK\r\n" .
-            "Content-Length: 0\r\n\r\n",
-            "HTTP/1.1 200 OK\r\n" .
-            "Content-Length: 0\r\n\r\n"
-        ]);
-        $client = new Client(['base_url' => 'http://www.foo.com']);
-        $client->getEmitter()->attach($cookie);
-        $client->getEmitter()->attach($mock);
-        $client->getEmitter()->attach($history);
-
-        $client->get();
-        $request = $client->createRequest('GET', '/');
-        $client->send($request);
-
-        $this->assertEquals('test=583551', $request->getHeader('Cookie'));
-        $requests = $history->getRequests();
-        // Confirm subsequent requests have the cookie.
-        $this->assertEquals('test=583551', $requests[2]->getHeader('Cookie'));
-        // Confirm the redirected request has the cookie.
-        $this->assertEquals('test=583551', $requests[1]->getHeader('Cookie'));
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/Subscriber/HistoryTest.php b/core/vendor/guzzlehttp/guzzle/tests/Subscriber/HistoryTest.php
deleted file mode 100644
index d28e301cd..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/Subscriber/HistoryTest.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests\Subscriber;
-
-use GuzzleHttp\Transaction;
-use GuzzleHttp\Client;
-use GuzzleHttp\Event\CompleteEvent;
-use GuzzleHttp\Event\ErrorEvent;
-use GuzzleHttp\Exception\RequestException;
-use GuzzleHttp\Message\Request;
-use GuzzleHttp\Message\Response;
-use GuzzleHttp\Stream\Stream;
-use GuzzleHttp\Subscriber\History;
-use GuzzleHttp\Subscriber\Mock;
-
-/**
- * @covers GuzzleHttp\Subscriber\History
- */
-class HistoryTest extends \PHPUnit_Framework_TestCase
-{
-    public function testAddsForErrorEvent()
-    {
-        $request = new Request('GET', '/');
-        $response = new Response(400);
-        $t = new Transaction(new Client(), $request);
-        $t->response = $response;
-        $e = new RequestException('foo', $request, $response);
-        $ev = new ErrorEvent($t, $e);
-        $h = new History(2);
-        $h->onError($ev);
-        // Only tracks when no response is present
-        $this->assertEquals([], $h->getRequests());
-    }
-
-    public function testLogsConnectionErrors()
-    {
-        $request = new Request('GET', '/');
-        $t = new Transaction(new Client(), $request);
-        $e = new RequestException('foo', $request);
-        $ev = new ErrorEvent($t, $e);
-        $h = new History();
-        $h->onError($ev);
-        $this->assertEquals([$request], $h->getRequests());
-    }
-
-    public function testMaintainsLimitValue()
-    {
-        $request = new Request('GET', '/');
-        $response = new Response(200);
-        $t = new Transaction(new Client(), $request);
-        $t->response = $response;
-        $ev = new CompleteEvent($t);
-        $h = new History(2);
-        $h->onComplete($ev);
-        $h->onComplete($ev);
-        $h->onComplete($ev);
-        $this->assertEquals(2, count($h));
-        $this->assertSame($request, $h->getLastRequest());
-        $this->assertSame($response, $h->getLastResponse());
-        foreach ($h as $trans) {
-            $this->assertInstanceOf('GuzzleHttp\Message\RequestInterface', $trans['request']);
-            $this->assertInstanceOf('GuzzleHttp\Message\ResponseInterface', $trans['response']);
-        }
-        return $h;
-    }
-
-    /**
-     * @depends testMaintainsLimitValue
-     */
-    public function testClearsHistory($h)
-    {
-        $this->assertEquals(2, count($h));
-        $h->clear();
-        $this->assertEquals(0, count($h));
-    }
-
-    public function testWorksWithMock()
-    {
-        $client = new Client(['base_url' => 'http://localhost/']);
-        $h = new History();
-        $client->getEmitter()->attach($h);
-        $mock = new Mock([new Response(200), new Response(201), new Response(202)]);
-        $client->getEmitter()->attach($mock);
-        $request = $client->createRequest('GET', '/');
-        $client->send($request);
-        $request->setMethod('PUT');
-        $client->send($request);
-        $request->setMethod('POST');
-        $client->send($request);
-        $this->assertEquals(3, count($h));
-
-        $result = implode("\n", array_map(function ($line) {
-            return strpos($line, 'User-Agent') === 0
-                ? 'User-Agent:'
-                : trim($line);
-        }, explode("\n", $h)));
-
-        $this->assertEquals("> GET / HTTP/1.1
-Host: localhost
-User-Agent:
-
-< HTTP/1.1 200 OK
-
-> PUT / HTTP/1.1
-Host: localhost
-User-Agent:
-
-< HTTP/1.1 201 Created
-
-> POST / HTTP/1.1
-Host: localhost
-User-Agent:
-
-< HTTP/1.1 202 Accepted
-", $result);
-    }
-
-    public function testCanCastToString()
-    {
-        $client = new Client(['base_url' => 'http://localhost/']);
-        $h = new History();
-        $client->getEmitter()->attach($h);
-
-        $mock = new Mock(array(
-            new Response(301, array('Location' => '/redirect1', 'Content-Length' => 0)),
-            new Response(307, array('Location' => '/redirect2', 'Content-Length' => 0)),
-            new Response(200, array('Content-Length' => '2'), Stream::factory('HI'))
-        ));
-
-        $client->getEmitter()->attach($mock);
-        $request = $client->createRequest('GET', '/');
-        $client->send($request);
-        $this->assertEquals(3, count($h));
-
-        $h = str_replace("\r", '', $h);
-        $this->assertContains("> GET / HTTP/1.1\nHost: localhost\nUser-Agent:", $h);
-        $this->assertContains("< HTTP/1.1 301 Moved Permanently\nLocation: /redirect1", $h);
-        $this->assertContains("< HTTP/1.1 307 Temporary Redirect\nLocation: /redirect2", $h);
-        $this->assertContains("< HTTP/1.1 200 OK\nContent-Length: 2\n\nHI", $h);
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/Subscriber/HttpErrorTest.php b/core/vendor/guzzlehttp/guzzle/tests/Subscriber/HttpErrorTest.php
deleted file mode 100644
index b0266340c..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/Subscriber/HttpErrorTest.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests\Message;
-
-use GuzzleHttp\Client;
-use GuzzleHttp\Event\CompleteEvent;
-use GuzzleHttp\Message\Request;
-use GuzzleHttp\Message\Response;
-use GuzzleHttp\Subscriber\HttpError;
-use GuzzleHttp\Transaction;
-use GuzzleHttp\Subscriber\Mock;
-
-/**
- * @covers GuzzleHttp\Subscriber\HttpError
- */
-class HttpErrorTest extends \PHPUnit_Framework_TestCase
-{
-    public function testIgnoreSuccessfulRequests()
-    {
-        $event = $this->getEvent();
-        $event->intercept(new Response(200));
-        (new HttpError())->onComplete($event);
-    }
-
-    /**
-     * @expectedException \GuzzleHttp\Exception\ClientException
-     */
-    public function testThrowsClientExceptionOnFailure()
-    {
-        $event = $this->getEvent();
-        $event->intercept(new Response(403));
-        (new HttpError())->onComplete($event);
-    }
-
-    /**
-     * @expectedException \GuzzleHttp\Exception\ServerException
-     */
-    public function testThrowsServerExceptionOnFailure()
-    {
-        $event = $this->getEvent();
-        $event->intercept(new Response(500));
-        (new HttpError())->onComplete($event);
-    }
-
-    private function getEvent()
-    {
-        return new CompleteEvent(new Transaction(new Client(), new Request('PUT', '/')));
-    }
-
-    /**
-     * @expectedException \GuzzleHttp\Exception\ClientException
-     */
-    public function testFullTransaction()
-    {
-        $client = new Client();
-        $client->getEmitter()->attach(new Mock([
-            new Response(403)
-        ]));
-        $client->get('http://httpbin.org');
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/Subscriber/MockTest.php b/core/vendor/guzzlehttp/guzzle/tests/Subscriber/MockTest.php
deleted file mode 100644
index 5e8209396..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/Subscriber/MockTest.php
+++ /dev/null
@@ -1,192 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests\Subscriber;
-
-use GuzzleHttp\Client;
-use GuzzleHttp\Subscriber\Mock;
-use GuzzleHttp\Message\FutureResponse;
-use GuzzleHttp\Transaction;
-use GuzzleHttp\Event\BeforeEvent;
-use GuzzleHttp\Exception\RequestException;
-use GuzzleHttp\Message\MessageFactory;
-use GuzzleHttp\Message\Request;
-use GuzzleHttp\Message\Response;
-use GuzzleHttp\Stream\Stream;
-use React\Promise\Deferred;
-
-/**
- * @covers GuzzleHttp\Subscriber\Mock
- */
-class MockTest extends \PHPUnit_Framework_TestCase
-{
-    public static function createFuture(
-        callable $wait,
-        callable $cancel = null
-    ) {
-        $deferred = new Deferred();
-        return new FutureResponse(
-            $deferred->promise(),
-            function () use ($deferred, $wait) {
-                $deferred->resolve($wait());
-            },
-            $cancel
-        );
-    }
-
-    public function testDescribesSubscribedEvents()
-    {
-        $mock = new Mock();
-        $this->assertInternalType('array', $mock->getEvents());
-    }
-
-    public function testIsCountable()
-    {
-        $plugin = new Mock();
-        $plugin->addResponse((new MessageFactory())->fromMessage("HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n"));
-        $this->assertEquals(1, count($plugin));
-    }
-
-    public function testCanClearQueue()
-    {
-        $plugin = new Mock();
-        $plugin->addResponse((new MessageFactory())->fromMessage("HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n"));
-        $plugin->clearQueue();
-        $this->assertEquals(0, count($plugin));
-    }
-
-    public function testRetrievesResponsesFromFiles()
-    {
-        $tmp = tempnam('/tmp', 'tfile');
-        file_put_contents($tmp, "HTTP/1.1 201 OK\r\nContent-Length: 0\r\n\r\n");
-        $plugin = new Mock();
-        $plugin->addResponse($tmp);
-        unlink($tmp);
-        $this->assertEquals(1, count($plugin));
-        $q = $this->readAttribute($plugin, 'queue');
-        $this->assertEquals(201, $q[0]->getStatusCode());
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     */
-    public function testThrowsExceptionWhenInvalidResponse()
-    {
-        (new Mock())->addResponse(false);
-    }
-
-    public function testAddsMockResponseToRequestFromClient()
-    {
-        $response = new Response(200);
-        $t = new Transaction(new Client(), new Request('GET', '/'));
-        $m = new Mock([$response]);
-        $ev = new BeforeEvent($t);
-        $m->onBefore($ev);
-        $this->assertSame($response, $t->response);
-    }
-
-    /**
-     * @expectedException \OutOfBoundsException
-     */
-    public function testUpdateThrowsExceptionWhenEmpty()
-    {
-        $p = new Mock();
-        $ev = new BeforeEvent(new Transaction(new Client(), new Request('GET', '/')));
-        $p->onBefore($ev);
-    }
-
-    public function testReadsBodiesFromMockedRequests()
-    {
-        $m = new Mock([new Response(200)]);
-        $client = new Client(['base_url' => 'http://test.com']);
-        $client->getEmitter()->attach($m);
-        $body = Stream::factory('foo');
-        $client->put('/', ['body' => $body]);
-        $this->assertEquals(3, $body->tell());
-    }
-
-    public function testCanMockBadRequestExceptions()
-    {
-        $client = new Client(['base_url' => 'http://test.com']);
-        $request = $client->createRequest('GET', '/');
-        $ex = new RequestException('foo', $request);
-        $mock = new Mock([$ex]);
-        $this->assertCount(1, $mock);
-        $request->getEmitter()->attach($mock);
-
-        try {
-            $client->send($request);
-            $this->fail('Did not dequeue an exception');
-        } catch (RequestException $e) {
-            $this->assertSame($e, $ex);
-            $this->assertSame($request, $ex->getRequest());
-        }
-    }
-
-    public function testCanMockFutureResponses()
-    {
-        $client = new Client(['base_url' => 'http://test.com']);
-        $request = $client->createRequest('GET', '/', ['future' => true]);
-        $response = new Response(200);
-        $future = self::createFuture(function () use ($response) {
-            return $response;
-        });
-        $mock = new Mock([$future]);
-        $this->assertCount(1, $mock);
-        $request->getEmitter()->attach($mock);
-        $res = $client->send($request);
-        $this->assertSame($future, $res);
-        $this->assertFalse($this->readAttribute($res, 'isRealized'));
-        $this->assertSame($response, $res->wait());
-    }
-
-    public function testCanMockExceptionFutureResponses()
-    {
-        $client = new Client(['base_url' => 'http://test.com']);
-        $request = $client->createRequest('GET', '/', ['future' => true]);
-        $future = self::createFuture(function () use ($request) {
-            throw new RequestException('foo', $request);
-        });
-
-        $mock = new Mock([$future]);
-        $request->getEmitter()->attach($mock);
-        $response = $client->send($request);
-        $this->assertSame($future, $response);
-        $this->assertFalse($this->readAttribute($response, 'isRealized'));
-
-        try {
-            $response->wait();
-            $this->fail('Did not throw');
-        } catch (RequestException $e) {
-            $this->assertContains('foo', $e->getMessage());
-        }
-    }
-
-    public function testCanMockFailedFutureResponses()
-    {
-        $client = new Client(['base_url' => 'http://test.com']);
-        $request = $client->createRequest('GET', '/', ['future' => true]);
-
-        // The first mock will be a mocked future response.
-        $future = self::createFuture(function () use ($client) {
-            // When dereferenced, we will set a mocked response and send
-            // another request.
-            $client->get('http://httpbin.org', ['events' => [
-                'before' => function (BeforeEvent $e) {
-                    $e->intercept(new Response(404));
-                }
-            ]]);
-        });
-
-        $mock = new Mock([$future]);
-        $request->getEmitter()->attach($mock);
-        $response = $client->send($request);
-        $this->assertSame($future, $response);
-        $this->assertFalse($this->readAttribute($response, 'isRealized'));
-
-        try {
-            $response->wait();
-            $this->fail('Did not throw');
-        } catch (RequestException $e) {
-            $this->assertEquals(404, $e->getResponse()->getStatusCode());
-        }
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/Subscriber/PrepareTest.php b/core/vendor/guzzlehttp/guzzle/tests/Subscriber/PrepareTest.php
deleted file mode 100644
index d07fdb44c..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/Subscriber/PrepareTest.php
+++ /dev/null
@@ -1,213 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests\Message;
-
-use GuzzleHttp\Message\Response;
-use GuzzleHttp\Tests\Server;
-use GuzzleHttp\Transaction;
-use GuzzleHttp\Client;
-use GuzzleHttp\Event\BeforeEvent;
-use GuzzleHttp\Message\Request;
-use GuzzleHttp\Stream\NoSeekStream;
-use GuzzleHttp\Stream\Stream;
-use GuzzleHttp\Subscriber\Prepare;
-
-/**
- * @covers GuzzleHttp\Subscriber\Prepare
- */
-class PrepareTest extends \PHPUnit_Framework_TestCase
-{
-    public function testIgnoresRequestsWithNoBody()
-    {
-        $s = new Prepare();
-        $t = $this->getTrans();
-        $s->onBefore(new BeforeEvent($t));
-        $this->assertFalse($t->request->hasHeader('Expect'));
-    }
-
-    public function testAppliesPostBody()
-    {
-        $s = new Prepare();
-        $t = $this->getTrans();
-        $p = $this->getMockBuilder('GuzzleHttp\Post\PostBody')
-            ->setMethods(['applyRequestHeaders'])
-            ->getMockForAbstractClass();
-        $p->expects($this->once())
-            ->method('applyRequestHeaders');
-        $t->request->setBody($p);
-        $s->onBefore(new BeforeEvent($t));
-    }
-
-    public function testAddsExpectHeaderWithTrue()
-    {
-        $s = new Prepare();
-        $t = $this->getTrans();
-        $t->request->getConfig()->set('expect', true);
-        $t->request->setBody(Stream::factory('foo'));
-        $s->onBefore(new BeforeEvent($t));
-        $this->assertEquals('100-Continue', $t->request->getHeader('Expect'));
-    }
-
-    public function testAddsExpectHeaderBySize()
-    {
-        $s = new Prepare();
-        $t = $this->getTrans();
-        $t->request->getConfig()->set('expect', 2);
-        $t->request->setBody(Stream::factory('foo'));
-        $s->onBefore(new BeforeEvent($t));
-        $this->assertTrue($t->request->hasHeader('Expect'));
-    }
-
-    public function testDoesNotModifyExpectHeaderIfPresent()
-    {
-        $s = new Prepare();
-        $t = $this->getTrans();
-        $t->request->setHeader('Expect', 'foo');
-        $t->request->setBody(Stream::factory('foo'));
-        $s->onBefore(new BeforeEvent($t));
-        $this->assertEquals('foo', $t->request->getHeader('Expect'));
-    }
-
-    public function testDoesAddExpectHeaderWhenSetToFalse()
-    {
-        $s = new Prepare();
-        $t = $this->getTrans();
-        $t->request->getConfig()->set('expect', false);
-        $t->request->setBody(Stream::factory('foo'));
-        $s->onBefore(new BeforeEvent($t));
-        $this->assertFalse($t->request->hasHeader('Expect'));
-    }
-
-    public function testDoesNotAddExpectHeaderBySize()
-    {
-        $s = new Prepare();
-        $t = $this->getTrans();
-        $t->request->getConfig()->set('expect', 10);
-        $t->request->setBody(Stream::factory('foo'));
-        $s->onBefore(new BeforeEvent($t));
-        $this->assertFalse($t->request->hasHeader('Expect'));
-    }
-
-    public function testAddsExpectHeaderForNonSeekable()
-    {
-        $s = new Prepare();
-        $t = $this->getTrans();
-        $t->request->setBody(new NoSeekStream(Stream::factory('foo')));
-        $s->onBefore(new BeforeEvent($t));
-        $this->assertTrue($t->request->hasHeader('Expect'));
-    }
-
-    public function testRemovesContentLengthWhenSendingWithChunked()
-    {
-        $s = new Prepare();
-        $t = $this->getTrans();
-        $t->request->setBody(Stream::factory('foo'));
-        $t->request->setHeader('Transfer-Encoding', 'chunked');
-        $s->onBefore(new BeforeEvent($t));
-        $this->assertFalse($t->request->hasHeader('Content-Length'));
-    }
-
-    public function testUsesProvidedContentLengthAndRemovesXferEncoding()
-    {
-        $s = new Prepare();
-        $t = $this->getTrans();
-        $t->request->setBody(Stream::factory('foo'));
-        $t->request->setHeader('Content-Length', '3');
-        $t->request->setHeader('Transfer-Encoding', 'chunked');
-        $s->onBefore(new BeforeEvent($t));
-        $this->assertEquals(3, $t->request->getHeader('Content-Length'));
-        $this->assertFalse($t->request->hasHeader('Transfer-Encoding'));
-    }
-
-    public function testSetsContentTypeIfPossibleFromStream()
-    {
-        $body = $this->getMockBody();
-        $sub = new Prepare();
-        $t = $this->getTrans();
-        $t->request->setBody($body);
-        $sub->onBefore(new BeforeEvent($t));
-        $this->assertEquals(
-            'image/jpeg',
-            $t->request->getHeader('Content-Type')
-        );
-        $this->assertEquals(4, $t->request->getHeader('Content-Length'));
-    }
-
-    public function testDoesNotOverwriteExistingContentType()
-    {
-        $s = new Prepare();
-        $t = $this->getTrans();
-        $t->request->setBody($this->getMockBody());
-        $t->request->setHeader('Content-Type', 'foo/baz');
-        $s->onBefore(new BeforeEvent($t));
-        $this->assertEquals(
-            'foo/baz',
-            $t->request->getHeader('Content-Type')
-        );
-    }
-
-    public function testSetsContentLengthIfPossible()
-    {
-        $s = new Prepare();
-        $t = $this->getTrans();
-        $t->request->setBody($this->getMockBody());
-        $s->onBefore(new BeforeEvent($t));
-        $this->assertEquals(4, $t->request->getHeader('Content-Length'));
-    }
-
-    public function testSetsTransferEncodingChunkedIfNeeded()
-    {
-        $r = new Request('PUT', '/');
-        $s = $this->getMockBuilder('GuzzleHttp\Stream\StreamInterface')
-            ->setMethods(['getSize'])
-            ->getMockForAbstractClass();
-        $s->expects($this->exactly(2))
-            ->method('getSize')
-            ->will($this->returnValue(null));
-        $r->setBody($s);
-        $t = $this->getTrans($r);
-        $s = new Prepare();
-        $s->onBefore(new BeforeEvent($t));
-        $this->assertEquals('chunked', $r->getHeader('Transfer-Encoding'));
-    }
-
-    public function testContentLengthIntegrationTest()
-    {
-        Server::flush();
-        Server::enqueue([new Response(200)]);
-        $client = new Client(['base_url' => Server::$url]);
-        $this->assertEquals(200, $client->put('/', [
-            'body' => 'test'
-        ])->getStatusCode());
-        $request = Server::received(true)[0];
-        $this->assertEquals('PUT', $request->getMethod());
-        $this->assertEquals('4', $request->getHeader('Content-Length'));
-        $this->assertEquals('test', (string) $request->getBody());
-    }
-
-    private function getTrans($request = null)
-    {
-        return new Transaction(
-            new Client(),
-            $request ?: new Request('PUT', '/')
-        );
-    }
-
-    /**
-     * @return \GuzzleHttp\Stream\StreamInterface
-     */
-    private function getMockBody()
-    {
-        $s = $this->getMockBuilder('GuzzleHttp\Stream\MetadataStreamInterface')
-            ->setMethods(['getMetadata', 'getSize'])
-            ->getMockForAbstractClass();
-        $s->expects($this->any())
-            ->method('getMetadata')
-            ->with('uri')
-            ->will($this->returnValue('/foo/baz/bar.jpg'));
-        $s->expects($this->exactly(2))
-            ->method('getSize')
-            ->will($this->returnValue(4));
-
-        return $s;
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/Subscriber/RedirectTest.php b/core/vendor/guzzlehttp/guzzle/tests/Subscriber/RedirectTest.php
deleted file mode 100644
index 293cfc217..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/Subscriber/RedirectTest.php
+++ /dev/null
@@ -1,288 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests\Plugin\Redirect;
-
-use GuzzleHttp\Client;
-use GuzzleHttp\Subscriber\History;
-use GuzzleHttp\Subscriber\Mock;
-
-/**
- * @covers GuzzleHttp\Subscriber\Redirect
- */
-class RedirectTest extends \PHPUnit_Framework_TestCase
-{
-    public function testRedirectsRequests()
-    {
-        $mock = new Mock();
-        $history = new History();
-        $mock->addMultiple([
-            "HTTP/1.1 301 Moved Permanently\r\nLocation: /redirect1\r\nContent-Length: 0\r\n\r\n",
-            "HTTP/1.1 301 Moved Permanently\r\nLocation: /redirect2\r\nContent-Length: 0\r\n\r\n",
-            "HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n",
-        ]);
-
-        $client = new Client(['base_url' => 'http://test.com']);
-        $client->getEmitter()->attach($history);
-        $client->getEmitter()->attach($mock);
-
-        $request = $client->createRequest('GET', '/foo');
-        // Ensure "end" is called only once
-        $called = 0;
-        $request->getEmitter()->on('end', function () use (&$called) {
-            $called++;
-        });
-        $response = $client->send($request);
-
-        $this->assertEquals(200, $response->getStatusCode());
-        $this->assertContains('/redirect2', $response->getEffectiveUrl());
-
-        // Ensure that two requests were sent
-        $requests = $history->getRequests(true);
-
-        $this->assertEquals('/foo', $requests[0]->getPath());
-        $this->assertEquals('GET', $requests[0]->getMethod());
-        $this->assertEquals('/redirect1', $requests[1]->getPath());
-        $this->assertEquals('GET', $requests[1]->getMethod());
-        $this->assertEquals('/redirect2', $requests[2]->getPath());
-        $this->assertEquals('GET', $requests[2]->getMethod());
-
-        $this->assertEquals(1, $called);
-    }
-
-    /**
-     * @expectedException \GuzzleHttp\Exception\TooManyRedirectsException
-     * @expectedExceptionMessage Will not follow more than
-     */
-    public function testCanLimitNumberOfRedirects()
-    {
-        $mock = new Mock([
-            "HTTP/1.1 301 Moved Permanently\r\nLocation: /redirect1\r\nContent-Length: 0\r\n\r\n",
-            "HTTP/1.1 301 Moved Permanently\r\nLocation: /redirect2\r\nContent-Length: 0\r\n\r\n",
-            "HTTP/1.1 301 Moved Permanently\r\nLocation: /redirect3\r\nContent-Length: 0\r\n\r\n",
-            "HTTP/1.1 301 Moved Permanently\r\nLocation: /redirect4\r\nContent-Length: 0\r\n\r\n",
-            "HTTP/1.1 301 Moved Permanently\r\nLocation: /redirect5\r\nContent-Length: 0\r\n\r\n",
-            "HTTP/1.1 301 Moved Permanently\r\nLocation: /redirect6\r\nContent-Length: 0\r\n\r\n"
-        ]);
-        $client = new Client();
-        $client->getEmitter()->attach($mock);
-        $client->get('http://www.example.com/foo');
-    }
-
-    public function testDefaultBehaviorIsToRedirectWithGetForEntityEnclosingRequests()
-    {
-        $h = new History();
-        $mock = new Mock([
-            "HTTP/1.1 301 Moved Permanently\r\nLocation: /redirect\r\nContent-Length: 0\r\n\r\n",
-            "HTTP/1.1 301 Moved Permanently\r\nLocation: /redirect\r\nContent-Length: 0\r\n\r\n",
-            "HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n",
-        ]);
-        $client = new Client();
-        $client->getEmitter()->attach($mock);
-        $client->getEmitter()->attach($h);
-        $client->post('http://test.com/foo', [
-            'headers' => ['X-Baz' => 'bar'],
-            'body' => 'testing'
-        ]);
-
-        $requests = $h->getRequests(true);
-        $this->assertEquals('POST', $requests[0]->getMethod());
-        $this->assertEquals('GET', $requests[1]->getMethod());
-        $this->assertEquals('bar', (string) $requests[1]->getHeader('X-Baz'));
-        $this->assertEquals('GET', $requests[2]->getMethod());
-    }
-
-    public function testCanRedirectWithStrictRfcCompliance()
-    {
-        $h = new History();
-        $mock = new Mock([
-            "HTTP/1.1 301 Moved Permanently\r\nLocation: /redirect\r\nContent-Length: 0\r\n\r\n",
-            "HTTP/1.1 301 Moved Permanently\r\nLocation: /redirect\r\nContent-Length: 0\r\n\r\n",
-            "HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n",
-        ]);
-        $client = new Client(['base_url' => 'http://test.com']);
-        $client->getEmitter()->attach($mock);
-        $client->getEmitter()->attach($h);
-        $client->post('/foo', [
-            'headers' => ['X-Baz' => 'bar'],
-            'body' => 'testing',
-            'allow_redirects' => ['max' => 10, 'strict' => true]
-        ]);
-
-        $requests = $h->getRequests(true);
-        $this->assertEquals('POST', $requests[0]->getMethod());
-        $this->assertEquals('POST', $requests[1]->getMethod());
-        $this->assertEquals('bar', (string) $requests[1]->getHeader('X-Baz'));
-        $this->assertEquals('POST', $requests[2]->getMethod());
-    }
-
-    public function testRewindsStreamWhenRedirectingIfNeeded()
-    {
-        $h = new History();
-        $mock = new Mock([
-            "HTTP/1.1 301 Moved Permanently\r\nLocation: /redirect\r\nContent-Length: 0\r\n\r\n",
-            "HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n",
-        ]);
-        $client = new Client(['base_url' => 'http://test.com']);
-        $client->getEmitter()->attach($mock);
-        $client->getEmitter()->attach($h);
-
-        $body = $this->getMockBuilder('GuzzleHttp\Stream\StreamInterface')
-            ->setMethods(['seek', 'read', 'eof', 'tell'])
-            ->getMockForAbstractClass();
-        $body->expects($this->once())->method('tell')->will($this->returnValue(1));
-        $body->expects($this->once())->method('seek')->will($this->returnValue(true));
-        $body->expects($this->any())->method('eof')->will($this->returnValue(true));
-        $body->expects($this->any())->method('read')->will($this->returnValue('foo'));
-        $client->post('/foo', [
-            'body' => $body,
-            'allow_redirects' => ['max' => 5, 'strict' => true]
-        ]);
-    }
-
-    /**
-     * @expectedException \GuzzleHttp\Exception\CouldNotRewindStreamException
-     * @expectedExceptionMessage Unable to rewind the non-seekable request body after redirecting
-     */
-    public function testThrowsExceptionWhenStreamCannotBeRewound()
-    {
-        $h = new History();
-        $mock = new Mock([
-            "HTTP/1.1 301 Moved Permanently\r\nLocation: /redirect\r\nContent-Length: 0\r\n\r\n",
-            "HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n",
-        ]);
-        $client = new Client();
-        $client->getEmitter()->attach($mock);
-        $client->getEmitter()->attach($h);
-
-        $body = $this->getMockBuilder('GuzzleHttp\Stream\StreamInterface')
-            ->setMethods(['seek', 'read', 'eof', 'tell'])
-            ->getMockForAbstractClass();
-        $body->expects($this->once())->method('tell')->will($this->returnValue(1));
-        $body->expects($this->once())->method('seek')->will($this->returnValue(false));
-        $body->expects($this->any())->method('eof')->will($this->returnValue(true));
-        $body->expects($this->any())->method('read')->will($this->returnValue('foo'));
-        $client->post('http://example.com/foo', [
-            'body' => $body,
-            'allow_redirects' => ['max' => 10, 'strict' => true]
-        ]);
-    }
-
-    public function testRedirectsCanBeDisabledPerRequest()
-    {
-        $client = new Client(['base_url' => 'http://test.com']);
-        $client->getEmitter()->attach(new Mock([
-            "HTTP/1.1 301 Moved Permanently\r\nLocation: /redirect\r\nContent-Length: 0\r\n\r\n",
-            "HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n",
-        ]));
-        $response = $client->put('/', ['body' => 'test', 'allow_redirects' => false]);
-        $this->assertEquals(301, $response->getStatusCode());
-    }
-
-    public function testCanRedirectWithNoLeadingSlashAndQuery()
-    {
-        $h = new History();
-        $client = new Client(['base_url' => 'http://www.foo.com']);
-        $client->getEmitter()->attach(new Mock([
-            "HTTP/1.1 301 Moved Permanently\r\nLocation: /redirect?foo=bar\r\nContent-Length: 0\r\n\r\n",
-            "HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n",
-        ]));
-        $client->getEmitter()->attach($h);
-        $client->get('?foo=bar');
-        $requests = $h->getRequests(true);
-        $this->assertEquals('http://www.foo.com?foo=bar', $requests[0]->getUrl());
-        $this->assertEquals('http://www.foo.com/redirect?foo=bar', $requests[1]->getUrl());
-    }
-
-    public function testHandlesRedirectsWithSpacesProperly()
-    {
-        $client = new Client(['base_url' => 'http://www.foo.com']);
-        $client->getEmitter()->attach(new Mock([
-            "HTTP/1.1 301 Moved Permanently\r\nLocation: /redirect 1\r\nContent-Length: 0\r\n\r\n",
-            "HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n"
-        ]));
-        $h = new History();
-        $client->getEmitter()->attach($h);
-        $client->get('/foo');
-        $reqs = $h->getRequests(true);
-        $this->assertEquals('/redirect%201', $reqs[1]->getResource());
-    }
-
-    public function testAddsRefererWhenPossible()
-    {
-        $client = new Client(['base_url' => 'http://www.foo.com']);
-        $client->getEmitter()->attach(new Mock([
-            "HTTP/1.1 301 Moved Permanently\r\nLocation: /bar\r\nContent-Length: 0\r\n\r\n",
-            "HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n"
-        ]));
-        $h = new History();
-        $client->getEmitter()->attach($h);
-        $client->get('/foo', ['allow_redirects' => ['max' => 5, 'referer' => true]]);
-        $reqs = $h->getRequests(true);
-        $this->assertEquals('http://www.foo.com/foo', $reqs[1]->getHeader('Referer'));
-    }
-
-    public function testDoesNotAddRefererWhenChangingProtocols()
-    {
-        $client = new Client(['base_url' => 'https://www.foo.com']);
-        $client->getEmitter()->attach(new Mock([
-            "HTTP/1.1 301 Moved Permanently\r\n"
-            . "Location: http://www.foo.com/foo\r\n"
-            . "Content-Length: 0\r\n\r\n",
-            "HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n"
-        ]));
-        $h = new History();
-        $client->getEmitter()->attach($h);
-        $client->get('/foo', ['allow_redirects' => ['max' => 5, 'referer' => true]]);
-        $reqs = $h->getRequests(true);
-        $this->assertFalse($reqs[1]->hasHeader('Referer'));
-    }
-
-    public function testRedirectsWithGetOn303()
-    {
-        $h = new History();
-        $mock = new Mock([
-            "HTTP/1.1 303 Moved Permanently\r\nLocation: /redirect\r\nContent-Length: 0\r\n\r\n",
-            "HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n",
-        ]);
-        $client = new Client();
-        $client->getEmitter()->attach($mock);
-        $client->getEmitter()->attach($h);
-        $client->post('http://test.com/foo', ['body' => 'testing']);
-        $requests = $h->getRequests(true);
-        $this->assertEquals('POST', $requests[0]->getMethod());
-        $this->assertEquals('GET', $requests[1]->getMethod());
-    }
-
-    public function testRelativeLinkBasedLatestRequest()
-    {
-        $client = new Client(['base_url' => 'http://www.foo.com']);
-        $client->getEmitter()->attach(new Mock([
-            "HTTP/1.1 301 Moved Permanently\r\nLocation: http://www.bar.com\r\nContent-Length: 0\r\n\r\n",
-            "HTTP/1.1 301 Moved Permanently\r\nLocation: /redirect\r\nContent-Length: 0\r\n\r\n",
-            "HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n"
-        ]));
-        $response = $client->get('/');
-        $this->assertEquals(
-            'http://www.bar.com/redirect',
-            $response->getEffectiveUrl()
-        );
-    }
-
-    /**
-     * @expectedException \GuzzleHttp\Exception\BadResponseException
-     * @expectedExceptionMessage Redirect URL, https://foo.com/redirect2, does not use one of the allowed redirect protocols: http
-     */
-    public function testThrowsWhenRedirectingToInvalidUrlProtocol()
-    {
-        $mock = new Mock([
-            "HTTP/1.1 301 Moved Permanently\r\nLocation: /redirect1\r\nContent-Length: 0\r\n\r\n",
-            "HTTP/1.1 301 Moved Permanently\r\nLocation: https://foo.com/redirect2\r\nContent-Length: 0\r\n\r\n"
-        ]);
-        $client = new Client();
-        $client->getEmitter()->attach($mock);
-        $client->get('http://www.example.com/foo', [
-            'allow_redirects' => [
-                'protocols' => ['http']
-            ]
-        ]);
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/TransactionTest.php b/core/vendor/guzzlehttp/guzzle/tests/TransactionTest.php
deleted file mode 100644
index 42965b1b5..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/TransactionTest.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests;
-
-use GuzzleHttp\Client;
-use GuzzleHttp\Message\Request;
-use GuzzleHttp\Message\Response;
-use GuzzleHttp\Transaction;
-
-class TransactionTest extends \PHPUnit_Framework_TestCase
-{
-    public function testHoldsData()
-    {
-        $client = new Client();
-        $request = new Request('GET', 'http://www.foo.com');
-        $t = new Transaction($client, $request);
-        $this->assertSame($client, $t->client);
-        $this->assertSame($request, $t->request);
-        $response = new Response(200);
-        $t->response = $response;
-        $this->assertSame($response, $t->response);
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/UriTemplateTest.php b/core/vendor/guzzlehttp/guzzle/tests/UriTemplateTest.php
deleted file mode 100644
index 3f7a7f063..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/UriTemplateTest.php
+++ /dev/null
@@ -1,202 +0,0 @@
-<?php
-
-namespace GuzzleHttp\Tests;
-
-use GuzzleHttp\UriTemplate;
-
-/**
- * @covers GuzzleHttp\UriTemplate
- */
-class UriTemplateTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @return array
-     */
-    public function templateProvider()
-    {
-        $params = array(
-            'var'   => 'value',
-            'hello' => 'Hello World!',
-            'empty' => '',
-            'path'  => '/foo/bar',
-            'x'     => '1024',
-            'y'     => '768',
-            'null'  => null,
-            'list'  => array('red', 'green', 'blue'),
-            'keys'  => array(
-                "semi"  => ';',
-                "dot"   => '.',
-                "comma" => ','
-            ),
-            'empty_keys' => array(),
-        );
-
-        return array_map(function ($t) use ($params) {
-            $t[] = $params;
-            return $t;
-        }, array(
-            array('foo',                 'foo'),
-            array('{var}',               'value'),
-            array('{hello}',             'Hello%20World%21'),
-            array('{+var}',              'value'),
-            array('{+hello}',            'Hello%20World!'),
-            array('{+path}/here',        '/foo/bar/here'),
-            array('here?ref={+path}',    'here?ref=/foo/bar'),
-            array('X{#var}',             'X#value'),
-            array('X{#hello}',           'X#Hello%20World!'),
-            array('map?{x,y}',           'map?1024,768'),
-            array('{x,hello,y}',         '1024,Hello%20World%21,768'),
-            array('{+x,hello,y}',        '1024,Hello%20World!,768'),
-            array('{+path,x}/here',      '/foo/bar,1024/here'),
-            array('{#x,hello,y}',        '#1024,Hello%20World!,768'),
-            array('{#path,x}/here',      '#/foo/bar,1024/here'),
-            array('X{.var}',             'X.value'),
-            array('X{.x,y}',             'X.1024.768'),
-            array('{/var}',              '/value'),
-            array('{/var,x}/here',       '/value/1024/here'),
-            array('{;x,y}',              ';x=1024;y=768'),
-            array('{;x,y,empty}',        ';x=1024;y=768;empty'),
-            array('{?x,y}',              '?x=1024&y=768'),
-            array('{?x,y,empty}',        '?x=1024&y=768&empty='),
-            array('?fixed=yes{&x}',      '?fixed=yes&x=1024'),
-            array('{&x,y,empty}',        '&x=1024&y=768&empty='),
-            array('{var:3}',             'val'),
-            array('{var:30}',            'value'),
-            array('{list}',              'red,green,blue'),
-            array('{list*}',             'red,green,blue'),
-            array('{keys}',              'semi,%3B,dot,.,comma,%2C'),
-            array('{keys*}',             'semi=%3B,dot=.,comma=%2C'),
-            array('{+path:6}/here',      '/foo/b/here'),
-            array('{+list}',             'red,green,blue'),
-            array('{+list*}',            'red,green,blue'),
-            array('{+keys}',             'semi,;,dot,.,comma,,'),
-            array('{+keys*}',            'semi=;,dot=.,comma=,'),
-            array('{#path:6}/here',      '#/foo/b/here'),
-            array('{#list}',             '#red,green,blue'),
-            array('{#list*}',            '#red,green,blue'),
-            array('{#keys}',             '#semi,;,dot,.,comma,,'),
-            array('{#keys*}',            '#semi=;,dot=.,comma=,'),
-            array('X{.var:3}',           'X.val'),
-            array('X{.list}',            'X.red,green,blue'),
-            array('X{.list*}',           'X.red.green.blue'),
-            array('X{.keys}',            'X.semi,%3B,dot,.,comma,%2C'),
-            array('X{.keys*}',           'X.semi=%3B.dot=..comma=%2C'),
-            array('{/var:1,var}',        '/v/value'),
-            array('{/list}',             '/red,green,blue'),
-            array('{/list*}',            '/red/green/blue'),
-            array('{/list*,path:4}',     '/red/green/blue/%2Ffoo'),
-            array('{/keys}',             '/semi,%3B,dot,.,comma,%2C'),
-            array('{/keys*}',            '/semi=%3B/dot=./comma=%2C'),
-            array('{;hello:5}',          ';hello=Hello'),
-            array('{;list}',             ';list=red,green,blue'),
-            array('{;list*}',            ';list=red;list=green;list=blue'),
-            array('{;keys}',             ';keys=semi,%3B,dot,.,comma,%2C'),
-            array('{;keys*}',            ';semi=%3B;dot=.;comma=%2C'),
-            array('{?var:3}',            '?var=val'),
-            array('{?list}',             '?list=red,green,blue'),
-            array('{?list*}',            '?list=red&list=green&list=blue'),
-            array('{?keys}',             '?keys=semi,%3B,dot,.,comma,%2C'),
-            array('{?keys*}',            '?semi=%3B&dot=.&comma=%2C'),
-            array('{&var:3}',            '&var=val'),
-            array('{&list}',             '&list=red,green,blue'),
-            array('{&list*}',            '&list=red&list=green&list=blue'),
-            array('{&keys}',             '&keys=semi,%3B,dot,.,comma,%2C'),
-            array('{&keys*}',            '&semi=%3B&dot=.&comma=%2C'),
-            array('{.null}',            ''),
-            array('{.null,var}',        '.value'),
-            array('X{.empty_keys*}',     'X'),
-            array('X{.empty_keys}',      'X'),
-            // Test that missing expansions are skipped
-            array('test{&missing*}',     'test'),
-            // Test that multiple expansions can be set
-            array('http://{var}/{var:2}{?keys*}', 'http://value/va?semi=%3B&dot=.&comma=%2C'),
-            // Test more complex query string stuff
-            array('http://www.test.com{+path}{?var,keys*}', 'http://www.test.com/foo/bar?var=value&semi=%3B&dot=.&comma=%2C')
-        ));
-    }
-
-    /**
-     * @dataProvider templateProvider
-     */
-    public function testExpandsUriTemplates($template, $expansion, $params)
-    {
-        $uri = new UriTemplate($template);
-        $this->assertEquals($expansion, $uri->expand($template, $params));
-    }
-
-    public function expressionProvider()
-    {
-        return array(
-            array(
-                '{+var*}', array(
-                'operator' => '+',
-                'values'   => array(
-                    array('value' => 'var', 'modifier' => '*')
-                )
-            ),
-            ),
-            array(
-                '{?keys,var,val}', array(
-                'operator' => '?',
-                'values'   => array(
-                    array('value' => 'keys', 'modifier' => ''),
-                    array('value' => 'var', 'modifier' => ''),
-                    array('value' => 'val', 'modifier' => '')
-                )
-            ),
-            ),
-            array(
-                '{+x,hello,y}', array(
-                'operator' => '+',
-                'values'   => array(
-                    array('value' => 'x', 'modifier' => ''),
-                    array('value' => 'hello', 'modifier' => ''),
-                    array('value' => 'y', 'modifier' => '')
-                )
-            )
-            )
-        );
-    }
-
-    /**
-     * @dataProvider expressionProvider
-     */
-    public function testParsesExpressions($exp, $data)
-    {
-        $template = new UriTemplate($exp);
-
-        // Access the config object
-        $class = new \ReflectionClass($template);
-        $method = $class->getMethod('parseExpression');
-        $method->setAccessible(true);
-
-        $exp = substr($exp, 1, -1);
-        $this->assertEquals($data, $method->invokeArgs($template, array($exp)));
-    }
-
-    /**
-     * @ticket https://github.com/guzzle/guzzle/issues/90
-     */
-    public function testAllowsNestedArrayExpansion()
-    {
-        $template = new UriTemplate();
-
-        $result = $template->expand('http://example.com{+path}{/segments}{?query,data*,foo*}', array(
-            'path'     => '/foo/bar',
-            'segments' => array('one', 'two'),
-            'query'    => 'test',
-            'data'     => array(
-                'more' => array('fun', 'ice cream')
-            ),
-            'foo' => array(
-                'baz' => array(
-                    'bar'  => 'fizz',
-                    'test' => 'buzz'
-                ),
-                'bam' => 'boo'
-            )
-        ));
-
-        $this->assertEquals('http://example.com/foo/bar/one,two?query=test&more%5B0%5D=fun&more%5B1%5D=ice%20cream&baz%5Bbar%5D=fizz&baz%5Btest%5D=buzz&bam=boo', $result);
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/UrlTest.php b/core/vendor/guzzlehttp/guzzle/tests/UrlTest.php
deleted file mode 100644
index efd374c1e..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/UrlTest.php
+++ /dev/null
@@ -1,356 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests;
-
-use GuzzleHttp\Query;
-use GuzzleHttp\Url;
-
-/**
- * @covers GuzzleHttp\Url
- */
-class UrlTest extends \PHPUnit_Framework_TestCase
-{
-    const RFC3986_BASE = "http://a/b/c/d;p?q";
-
-    public function testEmptyUrl()
-    {
-        $url = Url::fromString('');
-        $this->assertEquals('', (string) $url);
-    }
-
-    public function testPortIsDeterminedFromScheme()
-    {
-        $this->assertEquals(80, Url::fromString('http://www.test.com/')->getPort());
-        $this->assertEquals(443, Url::fromString('https://www.test.com/')->getPort());
-        $this->assertEquals(21, Url::fromString('ftp://www.test.com/')->getPort());
-        $this->assertEquals(8192, Url::fromString('http://www.test.com:8192/')->getPort());
-        $this->assertEquals(null, Url::fromString('foo://www.test.com/')->getPort());
-    }
-
-    public function testRemovesDefaultPortWhenSettingScheme()
-    {
-        $url = Url::fromString('http://www.test.com/');
-        $url->setPort(80);
-        $url->setScheme('https');
-        $this->assertEquals(443, $url->getPort());
-    }
-
-    public function testCloneCreatesNewInternalObjects()
-    {
-        $u1 = Url::fromString('http://www.test.com/');
-        $u2 = clone $u1;
-        $this->assertNotSame($u1->getQuery(), $u2->getQuery());
-    }
-
-    public function testValidatesUrlPartsInFactory()
-    {
-        $url = Url::fromString('/index.php');
-        $this->assertEquals('/index.php', (string) $url);
-        $this->assertFalse($url->isAbsolute());
-
-        $url = 'http://michael:test@test.com:80/path/123?q=abc#test';
-        $u = Url::fromString($url);
-        $this->assertEquals('http://michael:test@test.com/path/123?q=abc#test', (string) $u);
-        $this->assertTrue($u->isAbsolute());
-    }
-
-    public function testAllowsFalsyUrlParts()
-    {
-        $url = Url::fromString('http://a:50/0?0#0');
-        $this->assertSame('a', $url->getHost());
-        $this->assertEquals(50, $url->getPort());
-        $this->assertSame('/0', $url->getPath());
-        $this->assertEquals('0', (string) $url->getQuery());
-        $this->assertSame('0', $url->getFragment());
-        $this->assertEquals('http://a:50/0?0#0', (string) $url);
-
-        $url = Url::fromString('');
-        $this->assertSame('', (string) $url);
-
-        $url = Url::fromString('0');
-        $this->assertSame('0', (string) $url);
-    }
-
-    public function testBuildsRelativeUrlsWithFalsyParts()
-    {
-        $url = Url::buildUrl(['path' => '/0']);
-        $this->assertSame('/0', $url);
-
-        $url = Url::buildUrl(['path' => '0']);
-        $this->assertSame('0', $url);
-
-        $url = Url::buildUrl(['host' => '', 'path' => '0']);
-        $this->assertSame('0', $url);
-    }
-
-    public function testUrlStoresParts()
-    {
-        $url = Url::fromString('http://test:pass@www.test.com:8081/path/path2/?a=1&b=2#fragment');
-        $this->assertEquals('http', $url->getScheme());
-        $this->assertEquals('test', $url->getUsername());
-        $this->assertEquals('pass', $url->getPassword());
-        $this->assertEquals('www.test.com', $url->getHost());
-        $this->assertEquals(8081, $url->getPort());
-        $this->assertEquals('/path/path2/', $url->getPath());
-        $this->assertEquals('fragment', $url->getFragment());
-        $this->assertEquals('a=1&b=2', (string) $url->getQuery());
-
-        $this->assertEquals(array(
-            'fragment' => 'fragment',
-            'host' => 'www.test.com',
-            'pass' => 'pass',
-            'path' => '/path/path2/',
-            'port' => 8081,
-            'query' => 'a=1&b=2',
-            'scheme' => 'http',
-            'user' => 'test'
-        ), $url->getParts());
-    }
-
-    public function testHandlesPathsCorrectly()
-    {
-        $url = Url::fromString('http://www.test.com');
-        $this->assertEquals('', $url->getPath());
-        $url->setPath('test');
-        $this->assertEquals('test', $url->getPath());
-
-        $url->setPath('/test/123/abc');
-        $this->assertEquals(array('', 'test', '123', 'abc'), $url->getPathSegments());
-
-        $parts = parse_url('http://www.test.com/test');
-        $parts['path'] = '';
-        $this->assertEquals('http://www.test.com', Url::buildUrl($parts));
-        $parts['path'] = 'test';
-        $this->assertEquals('http://www.test.com/test', Url::buildUrl($parts));
-    }
-
-    public function testAddsQueryIfPresent()
-    {
-        $this->assertEquals('?foo=bar', Url::buildUrl(array(
-            'query' => 'foo=bar'
-        )));
-    }
-
-    public function testAddsToPath()
-    {
-        // Does nothing here
-        $url = Url::fromString('http://e.com/base?a=1');
-        $url->addPath(false);
-        $this->assertEquals('http://e.com/base?a=1', $url);
-        $url = Url::fromString('http://e.com/base?a=1');
-        $url->addPath('');
-        $this->assertEquals('http://e.com/base?a=1', $url);
-        $url = Url::fromString('http://e.com/base?a=1');
-        $url->addPath('/');
-        $this->assertEquals('http://e.com/base?a=1', $url);
-        $url = Url::fromString('http://e.com/base');
-        $url->addPath('0');
-        $this->assertEquals('http://e.com/base/0', $url);
-
-        $url = Url::fromString('http://e.com/base?a=1');
-        $url->addPath('relative');
-        $this->assertEquals('http://e.com/base/relative?a=1', $url);
-        $url = Url::fromString('http://e.com/base?a=1');
-        $url->addPath('/relative');
-        $this->assertEquals('http://e.com/base/relative?a=1', $url);
-    }
-
-    /**
-     * URL combination data provider
-     *
-     * @return array
-     */
-    public function urlCombineDataProvider()
-    {
-        return [
-            // Specific test cases
-            ['http://www.example.com/',           'http://www.example.com/', 'http://www.example.com/'],
-            ['http://www.example.com/path',       '/absolute', 'http://www.example.com/absolute'],
-            ['http://www.example.com/path',       '/absolute?q=2', 'http://www.example.com/absolute?q=2'],
-            ['http://www.example.com/',           '?q=1', 'http://www.example.com/?q=1'],
-            ['http://www.example.com/path',       'http://test.com', 'http://test.com'],
-            ['http://www.example.com:8080/path',  'http://test.com', 'http://test.com'],
-            ['http://www.example.com:8080/path',  '?q=2#abc', 'http://www.example.com:8080/path?q=2#abc'],
-            ['http://www.example.com/path',       'http://u:a@www.example.com/', 'http://u:a@www.example.com/'],
-            ['/path?q=2', 'http://www.test.com/', 'http://www.test.com/path?q=2'],
-            ['http://api.flickr.com/services/',   'http://www.flickr.com/services/oauth/access_token', 'http://www.flickr.com/services/oauth/access_token'],
-            ['https://www.example.com/path',      '//foo.com/abc', 'https://foo.com/abc'],
-            ['https://www.example.com/0/',        'relative/foo', 'https://www.example.com/0/relative/foo'],
-            ['',                                  '0', '0'],
-            // RFC 3986 test cases
-            [self::RFC3986_BASE, 'g:h',           'g:h'],
-            [self::RFC3986_BASE, 'g',             'http://a/b/c/g'],
-            [self::RFC3986_BASE, './g',           'http://a/b/c/g'],
-            [self::RFC3986_BASE, 'g/',            'http://a/b/c/g/'],
-            [self::RFC3986_BASE, '/g',            'http://a/g'],
-            [self::RFC3986_BASE, '//g',           'http://g'],
-            [self::RFC3986_BASE, '?y',            'http://a/b/c/d;p?y'],
-            [self::RFC3986_BASE, 'g?y',           'http://a/b/c/g?y'],
-            [self::RFC3986_BASE, '#s',            'http://a/b/c/d;p?q#s'],
-            [self::RFC3986_BASE, 'g#s',           'http://a/b/c/g#s'],
-            [self::RFC3986_BASE, 'g?y#s',         'http://a/b/c/g?y#s'],
-            [self::RFC3986_BASE, ';x',            'http://a/b/c/;x'],
-            [self::RFC3986_BASE, 'g;x',           'http://a/b/c/g;x'],
-            [self::RFC3986_BASE, 'g;x?y#s',       'http://a/b/c/g;x?y#s'],
-            [self::RFC3986_BASE, '',              self::RFC3986_BASE],
-            [self::RFC3986_BASE, '.',             'http://a/b/c/'],
-            [self::RFC3986_BASE, './',            'http://a/b/c/'],
-            [self::RFC3986_BASE, '..',            'http://a/b/'],
-            [self::RFC3986_BASE, '../',           'http://a/b/'],
-            [self::RFC3986_BASE, '../g',          'http://a/b/g'],
-            [self::RFC3986_BASE, '../..',         'http://a/'],
-            [self::RFC3986_BASE, '../../',        'http://a/'],
-            [self::RFC3986_BASE, '../../g',       'http://a/g'],
-            [self::RFC3986_BASE, '../../../g',    'http://a/g'],
-            [self::RFC3986_BASE, '../../../../g', 'http://a/g'],
-            [self::RFC3986_BASE, '/./g',          'http://a/g'],
-            [self::RFC3986_BASE, '/../g',         'http://a/g'],
-            [self::RFC3986_BASE, 'g.',            'http://a/b/c/g.'],
-            [self::RFC3986_BASE, '.g',            'http://a/b/c/.g'],
-            [self::RFC3986_BASE, 'g..',           'http://a/b/c/g..'],
-            [self::RFC3986_BASE, '..g',           'http://a/b/c/..g'],
-            [self::RFC3986_BASE, './../g',        'http://a/b/g'],
-            [self::RFC3986_BASE, 'foo////g',      'http://a/b/c/foo////g'],
-            [self::RFC3986_BASE, './g/.',         'http://a/b/c/g/'],
-            [self::RFC3986_BASE, 'g/./h',         'http://a/b/c/g/h'],
-            [self::RFC3986_BASE, 'g/../h',        'http://a/b/c/h'],
-            [self::RFC3986_BASE, 'g;x=1/./y',     'http://a/b/c/g;x=1/y'],
-            [self::RFC3986_BASE, 'g;x=1/../y',    'http://a/b/c/y'],
-            [self::RFC3986_BASE, 'http:g',        'http:g'],
-        ];
-    }
-
-    /**
-     * @dataProvider urlCombineDataProvider
-     */
-    public function testCombinesUrls($a, $b, $c)
-    {
-        $this->assertEquals($c, (string) Url::fromString($a)->combine($b));
-    }
-
-    public function testHasGettersAndSetters()
-    {
-        $url = Url::fromString('http://www.test.com/');
-        $url->setHost('example.com');
-        $this->assertEquals('example.com', $url->getHost());
-        $url->setPort(8080);
-        $this->assertEquals('8080', $url->getPort());
-        $url->setPath('/foo/bar');
-        $this->assertEquals('/foo/bar', $url->getPath());
-        $url->setPassword('a');
-        $this->assertEquals('a', $url->getPassword());
-        $url->setUsername('b');
-        $this->assertEquals('b', $url->getUsername());
-        $url->setFragment('abc');
-        $this->assertEquals('abc', $url->getFragment());
-        $url->setScheme('https');
-        $this->assertEquals('https', $url->getScheme());
-        $url->setQuery('a=123');
-        $this->assertEquals('a=123', (string) $url->getQuery());
-        $this->assertEquals(
-            'https://b:a@example.com:8080/foo/bar?a=123#abc',
-            (string) $url
-        );
-        $url->setQuery(new Query(['b' => 'boo']));
-        $this->assertEquals('b=boo', $url->getQuery());
-        $this->assertEquals(
-            'https://b:a@example.com:8080/foo/bar?b=boo#abc',
-            (string) $url
-        );
-
-        $url->setQuery('a%20=bar!', true);
-        $this->assertEquals(
-            'https://b:a@example.com:8080/foo/bar?a%20=bar!#abc',
-            (string) $url
-        );
-    }
-
-    public function testSetQueryAcceptsArray()
-    {
-        $url = Url::fromString('http://www.test.com');
-        $url->setQuery(array('a' => 'b'));
-        $this->assertEquals('http://www.test.com?a=b', (string) $url);
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     */
-    public function testQueryMustBeValid()
-    {
-        $url = Url::fromString('http://www.test.com');
-        $url->setQuery(false);
-    }
-
-    public function testDefersParsingAndEncodingQueryUntilNecessary()
-    {
-        $url = Url::fromString('http://www.test.com');
-        // Note that invalid characters are encoded.
-        $url->setQuery('foo#bar/', true);
-        $this->assertEquals('http://www.test.com?foo%23bar/', (string) $url);
-        $this->assertInternalType('string', $this->readAttribute($url, 'query'));
-        $this->assertEquals('foo%23bar%2F', (string) $url->getQuery());
-        $this->assertInstanceOf('GuzzleHttp\Query', $this->readAttribute($url, 'query'));
-    }
-
-    public function urlProvider()
-    {
-        return array(
-            array('/foo/..', '/'),
-            array('//foo//..', '//foo/'),
-            array('/foo//', '/foo//'),
-            array('/foo/../..', '/'),
-            array('/foo/../.', '/'),
-            array('/./foo/..', '/'),
-            array('/./foo', '/foo'),
-            array('/./foo/', '/foo/'),
-            array('*', '*'),
-            array('/foo', '/foo'),
-            array('/abc/123/../foo/', '/abc/foo/'),
-            array('/a/b/c/./../../g', '/a/g'),
-            array('/b/c/./../../g', '/g'),
-            array('/b/c/./../../g', '/g'),
-            array('/c/./../../g', '/g'),
-            array('/./../../g', '/g'),
-            array('foo', 'foo'),
-        );
-    }
-
-    /**
-     * @dataProvider urlProvider
-     */
-    public function testRemoveDotSegments($path, $result)
-    {
-        $url = Url::fromString('http://www.example.com');
-        $url->setPath($path);
-        $url->removeDotSegments();
-        $this->assertEquals($result, $url->getPath());
-    }
-
-    public function testSettingHostWithPortModifiesPort()
-    {
-        $url = Url::fromString('http://www.example.com');
-        $url->setHost('foo:8983');
-        $this->assertEquals('foo', $url->getHost());
-        $this->assertEquals(8983, $url->getPort());
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     */
-    public function testValidatesUrlCanBeParsed()
-    {
-        Url::fromString('foo:////');
-    }
-
-    public function testConvertsSpecialCharsInPathWhenCastingToString()
-    {
-        $url = Url::fromString('http://foo.com/baz bar?a=b');
-        $url->addPath('?');
-        $this->assertEquals('http://foo.com/baz%20bar/%3F?a=b', (string) $url);
-    }
-
-    public function testCorrectlyEncodesPathWithoutDoubleEncoding()
-    {
-        $url = Url::fromString('http://foo.com/baz%20 bar:boo/baz!');
-        $this->assertEquals('/baz%20%20bar:boo/baz!', $url->getPath());
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/UtilsTest.php b/core/vendor/guzzlehttp/guzzle/tests/UtilsTest.php
deleted file mode 100644
index d9bdc071f..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/UtilsTest.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests;
-
-use GuzzleHttp\Utils;
-
-class UtilsTest extends \PHPUnit_Framework_TestCase
-{
-    public function testExpandsTemplate()
-    {
-        $this->assertEquals(
-            'foo/123',
-            Utils::uriTemplate('foo/{bar}', ['bar' => '123'])
-        );
-    }
-
-    public function noBodyProvider()
-    {
-        return [['get'], ['head'], ['delete']];
-    }
-
-    public function testJsonDecodes()
-    {
-        $this->assertTrue(Utils::jsonDecode('true'));
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Unable to parse JSON data: JSON_ERROR_SYNTAX - Syntax error, malformed JSON
-     */
-    public function testJsonDecodesWithErrorMessages()
-    {
-        Utils::jsonDecode('!narf!');
-    }
-}
diff --git a/core/vendor/guzzlehttp/guzzle/tests/bootstrap.php b/core/vendor/guzzlehttp/guzzle/tests/bootstrap.php
deleted file mode 100644
index 8713f9624..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/bootstrap.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-require __DIR__ . '/../vendor/autoload.php';
-require __DIR__ . '/../vendor/guzzlehttp/ringphp/tests/Client/Server.php';
-
-use GuzzleHttp\Tests\Server;
-
-Server::start();
-
-register_shutdown_function(function () {
-    Server::stop();
-});
diff --git a/core/vendor/guzzlehttp/guzzle/tests/perf.php b/core/vendor/guzzlehttp/guzzle/tests/perf.php
deleted file mode 100644
index 6de89c261..000000000
--- a/core/vendor/guzzlehttp/guzzle/tests/perf.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/*
- * Runs a performance test against the node.js server for both serial and
- * parallel requests. Requires PHP 5.5 or greater.
- *
- *     # Basic usage
- *     make perf
- *     # With custom options
- *     REQUESTS=100 PARALLEL=5000 make perf
- */
-
-require __DIR__ . '/bootstrap.php';
-
-use GuzzleHttp\Client;
-use GuzzleHttp\Tests\Server;
-use GuzzleHttp\Ring\Client\CurlMultiHandler;
-use GuzzleHttp\Pool;
-
-// Wait until the server is responding
-Server::wait();
-
-// Get custom make variables
-$total = isset($_SERVER['REQUESTS']) ? $_SERVER['REQUESTS'] : 1000;
-$parallel = isset($_SERVER['PARALLEL']) ? $_SERVER['PARALLEL'] : 100;
-
-$client = new Client(['base_url' => Server::$url]);
-
-$t = microtime(true);
-for ($i = 0; $i < $total; $i++) {
-    $client->get('/guzzle-server/perf');
-}
-$totalTime = microtime(true) - $t;
-$perRequest = ($totalTime / $total) * 1000;
-printf("Serial: %f (%f ms / request) %d total\n",
-    $totalTime, $perRequest, $total);
-
-// Create a generator used to yield batches of requests
-$reqs = function () use ($client, $total) {
-    for ($i = 0; $i < $total; $i++) {
-        yield $client->createRequest('GET', '/guzzle-server/perf');
-    }
-};
-
-$t = microtime(true);
-Pool::send($client, $reqs(), ['parallel' => $parallel]);
-$totalTime = microtime(true) - $t;
-$perRequest = ($totalTime / $total) * 1000;
-printf("Batch:  %f (%f ms / request) %d total with %d in parallel\n",
-    $totalTime, $perRequest, $total, $parallel);
-
-$handler = new CurlMultiHandler(['max_handles' => $parallel]);
-$client = new Client(['handler' => $handler, 'base_url' => Server::$url]);
-$t = microtime(true);
-for ($i = 0; $i < $total; $i++) {
-    $client->get('/guzzle-server/perf');
-}
-unset($client);
-$totalTime = microtime(true) - $t;
-$perRequest = ($totalTime / $total) * 1000;
-printf("Future: %f (%f ms / request) %d total\n",
-    $totalTime, $perRequest, $total);
diff --git a/core/vendor/guzzlehttp/promises/.travis.yml b/core/vendor/guzzlehttp/promises/.travis.yml
new file mode 100644
index 000000000..4f4d2b86b
--- /dev/null
+++ b/core/vendor/guzzlehttp/promises/.travis.yml
@@ -0,0 +1,19 @@
+language: php
+
+php:
+  - 5.5
+  - 5.6
+  - 7.0
+  - hhvm
+
+sudo: false
+
+install:
+  - travis_retry composer install --no-interaction --prefer-source
+
+script: make test
+
+matrix:
+  allow_failures:
+    - php: hhvm
+  fast_finish: true
diff --git a/core/vendor/guzzlehttp/promises/CHANGELOG.md b/core/vendor/guzzlehttp/promises/CHANGELOG.md
new file mode 100644
index 000000000..2376c057d
--- /dev/null
+++ b/core/vendor/guzzlehttp/promises/CHANGELOG.md
@@ -0,0 +1,11 @@
+# CHANGELOG
+
+## 1.0.1 - 2015-06-24
+
+* Updating EachPromise to call next on the underlying promise iterator as late
+  as possible to ensure that generators that generate new requests based on
+  callbacks are not iterated until after callbacks are invoked.
+
+## 1.0.0 - 2015-05-12
+
+* Initial release
diff --git a/core/vendor/guzzlehttp/ringphp/LICENSE b/core/vendor/guzzlehttp/promises/LICENSE
similarity index 94%
rename from core/vendor/guzzlehttp/ringphp/LICENSE
rename to core/vendor/guzzlehttp/promises/LICENSE
index 71d3b783c..581d95f92 100644
--- a/core/vendor/guzzlehttp/ringphp/LICENSE
+++ b/core/vendor/guzzlehttp/promises/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2014 Michael Dowling, https://github.com/mtdowling <mtdowling@gmail.com>
+Copyright (c) 2015 Michael Dowling, https://github.com/mtdowling <mtdowling@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/core/vendor/guzzlehttp/streams/Makefile b/core/vendor/guzzlehttp/promises/Makefile
similarity index 62%
rename from core/vendor/guzzlehttp/streams/Makefile
rename to core/vendor/guzzlehttp/promises/Makefile
index f4d42849e..8d5b3ef95 100644
--- a/core/vendor/guzzlehttp/streams/Makefile
+++ b/core/vendor/guzzlehttp/promises/Makefile
@@ -1,10 +1,4 @@
-all: clean coverage
-
-release: tag
-	git push origin --tags
-
-tag:
-	chag tag --sign --debug CHANGELOG.rst
+all: clean test
 
 test:
 	vendor/bin/phpunit
diff --git a/core/vendor/guzzlehttp/promises/README.md b/core/vendor/guzzlehttp/promises/README.md
new file mode 100644
index 000000000..c6780abd2
--- /dev/null
+++ b/core/vendor/guzzlehttp/promises/README.md
@@ -0,0 +1,501 @@
+# Guzzle Promises
+
+[Promises/A+](https://promisesaplus.com/) implementation that handles promise
+chaining and resolution iteratively, allowing for "infinite" promise chaining
+while keeping the stack size constant. Read [this blog post](https://blog.domenic.me/youre-missing-the-point-of-promises/)
+for a general introduction to promises.
+
+- [Features](#features)
+- [Quick start](#quick-start)
+- [Synchronous wait](#synchronous-wait)
+- [Cancellation](#cancellation)
+- [API](#api)
+  - [Promise](#promise)
+  - [FulfilledPromise](#fulfilledpromise)
+  - [RejectedPromise](#rejectedpromise)
+- [Promise interop](#promise-interop)
+- [Implementation notes](#implementation-notes)
+
+
+# Features
+
+- [Promises/A+](https://promisesaplus.com/) implementation.
+- Promise resolution and chaining is handled iteratively, allowing for
+  "infinite" promise chaining.
+- Promises have a synchronous `wait` method.
+- Promises can be cancelled.
+- Works with any object that has a `then` function.
+- C# style async/await coroutine promises using
+  `GuzzleHttp\Promise\coroutine()`.
+
+
+# Quick start
+
+A *promise* represents the eventual result of an asynchronous operation. The
+primary way of interacting with a promise is through its `then` method, which
+registers callbacks to receive either a promise's eventual value or the reason
+why the promise cannot be fulfilled.
+
+
+## Callbacks
+
+Callbacks are registered with the `then` method by providing an optional 
+`$onFulfilled` followed by an optional `$onRejected` function.
+
+
+```php
+use GuzzleHttp\Promise\Promise;
+
+$promise = new Promise();
+$promise->then(
+    // $onFulfilled
+    function ($value) {
+        echo 'The promise was fulfilled.';
+    },
+    // $onRejected
+    function ($reason) {
+        echo 'The promise was rejected.';
+    }
+);
+```
+
+*Resolving* a promise means that you either fulfill a promise with a *value* or
+reject a promise with a *reason*. Resolving a promises triggers callbacks
+registered with the promises's `then` method. These callbacks are triggered
+only once and in the order in which they were added.
+
+
+## Resolving a promise
+
+Promises are fulfilled using the `resolve($value)` method. Resolving a promise
+with any value other than a `GuzzleHttp\Promise\RejectedPromise` will trigger
+all of the onFulfilled callbacks (resolving a promise with a rejected promise
+will reject the promise and trigger the `$onRejected` callbacks).
+
+```php
+use GuzzleHttp\Promise\Promise;
+
+$promise = new Promise();
+$promise
+    ->then(function ($value) {
+        // Return a value and don't break the chain
+        return "Hello, " . $value;
+    })
+    // This then is executed after the first then and receives the value
+    // returned from the first then.
+    ->then(function ($value) {
+        echo $value;
+    });
+
+// Resolving the promise triggers the $onFulfilled callbacks and outputs
+// "Hello, reader".
+$promise->resolve('reader.');
+```
+
+
+## Promise forwarding
+
+Promises can be chained one after the other. Each then in the chain is a new
+promise. The return value of of a promise is what's forwarded to the next
+promise in the chain. Returning a promise in a `then` callback will cause the
+subsequent promises in the chain to only be fulfilled when the returned promise
+has been fulfilled. The next promise in the chain will be invoked with the
+resolved value of the promise.
+
+```php
+use GuzzleHttp\Promise\Promise;
+
+$promise = new Promise();
+$nextPromise = new Promise();
+
+$promise
+    ->then(function ($value) use ($nextPromise) {
+        echo $value;
+        return $nextPromise;
+    })
+    ->then(function ($value) {
+        echo $value;
+    });
+
+// Triggers the first callback and outputs "A"
+$promise->resolve('A');
+// Triggers the second callback and outputs "B"
+$nextPromise->resolve('B');
+```
+
+## Promise rejection
+
+When a promise is rejected, the `$onRejected` callbacks are invoked with the
+rejection reason.
+
+```php
+use GuzzleHttp\Promise\Promise;
+
+$promise = new Promise();
+$promise->then(null, function ($reason) {
+    echo $reason;
+});
+
+$promise->reject('Error!');
+// Outputs "Error!"
+```
+
+## Rejection forwarding
+
+If an exception is thrown in an `$onRejected` callback, subsequent
+`$onRejected` callbacks are invoked with the thrown exception as the reason.
+
+```php
+use GuzzleHttp\Promise\Promise;
+
+$promise = new Promise();
+$promise->then(null, function ($reason) {
+    throw new \Exception($reason);
+})->then(null, function ($reason) {
+    assert($reason->getMessage() === 'Error!');
+});
+
+$promise->reject('Error!');
+```
+
+You can also forward a rejection down the promise chain by returning a
+`GuzzleHttp\Promise\RejectedPromise` in either an `$onFulfilled` or
+`$onRejected` callback.
+
+```php
+use GuzzleHttp\Promise\Promise;
+use GuzzleHttp\Promise\RejectedPromise;
+
+$promise = new Promise();
+$promise->then(null, function ($reason) {
+    return new RejectedPromise($reason);
+})->then(null, function ($reason) {
+    assert($reason === 'Error!');
+});
+
+$promise->reject('Error!');
+```
+
+If an exception is not thrown in a `$onRejected` callback and the callback
+does not return a rejected promise, downstream `$onFulfilled` callbacks are
+invoked using the value returned from the `$onRejected` callback.
+
+```php
+use GuzzleHttp\Promise\Promise;
+use GuzzleHttp\Promise\RejectedPromise;
+
+$promise = new Promise();
+$promise
+    ->then(null, function ($reason) {
+        return "It's ok";
+    })
+    ->then(function ($value) {
+        assert($value === "It's ok");
+    });
+
+$promise->reject('Error!');
+```
+
+# Synchronous wait
+
+You can synchronously force promises to complete using a promise's `wait`
+method. When creating a promise, you can provide a wait function that is used
+to synchronously force a promise to complete. When a wait function is invoked
+it is expected to deliver a value to the promise or reject the promise. If the
+wait function does not deliver a value, then an exception is thrown. The wait
+function provided to a promise constructor is invoked when the `wait` function
+of the promise is called.
+
+```php
+$promise = new Promise(function () use (&$promise) {
+    $promise->deliver('foo');
+});
+
+// Calling wait will return the value of the promise.
+echo $promise->wait(); // outputs "foo"
+```
+
+If an exception is encountered while invoking the wait function of a promise,
+the promise is rejected with the exception and the exception is thrown.
+
+```php
+$promise = new Promise(function () use (&$promise) {
+    throw new \Exception('foo');
+});
+
+$promise->wait(); // throws the exception.
+```
+
+Calling `wait` on a promise that has been fulfilled will not trigger the wait
+function. It will simply return the previously delivered value.
+
+```php
+$promise = new Promise(function () { die('this is not called!'); });
+$promise->deliver('foo');
+echo $promise->wait(); // outputs "foo"
+```
+
+Calling `wait` on a promise that has been rejected will throw an exception. If
+the rejection reason is an instance of `\Exception` the reason is thrown.
+Otherwise, a `GuzzleHttp\Promise\RejectionException` is thrown and the reason
+can be obtained by calling the `getReason` method of the exception.
+
+```php
+$promise = new Promise();
+$promise->reject('foo');
+$promise->wait();
+```
+
+> PHP Fatal error:  Uncaught exception 'GuzzleHttp\Promise\RejectionException' with message 'The promise was rejected with value: foo'
+
+
+## Unwrapping a promise
+
+When synchronously waiting on a promise, you are joining the state of the
+promise into the current state of execution (i.e., return the value of the
+promise if it was fulfilled or throw an exception if it was rejected). This is
+called "unwrapping" the promise. Waiting on a promise will by default unwrap
+the promise state.
+
+You can force a promise to resolve and *not* unwrap the state of the promise
+by passing `false` to the first argument of the `wait` function:
+
+```php
+$promise = new Promise();
+$promise->reject('foo');
+// This will not throw an exception. It simply ensures the promise has
+// been resolved.
+$promise->wait(false);
+```
+
+When unwrapping a promise, the delivered value of the promise will be waited
+upon until the unwrapped value is not a promise. This means that if you resolve
+promise A with a promise B and unwrap promise A, the value returned by the
+wait function will be the value delivered to promise B.
+
+**Note**: when you do not unwrap the promise, no value is returned.
+
+
+# Cancellation
+
+You can cancel a promise that has not yet been fulfilled using the `cancel()`
+method of a promise. When creating a promise you can provide an optional
+cancel function that when invoked cancels the action of computing a resolution
+of the promise.
+
+
+# API
+
+
+## Promise
+
+When creating a promise object, you can provide an optional `$waitFn` and
+`$cancelFn`. `$waitFn` is a function that is invoked with no arguments and is
+expected to resolve the promise. `$cancelFn` is a function with no arguments
+that is expected to cancel the computation of a promise. It is invoked when the
+`cancel()` method of a promise is called.
+
+```php
+use GuzzleHttp\Promise\Promise;
+
+$promise = new Promise(
+    function () use (&$promise) {
+        $promise->resolve('waited');
+    },
+    function () {
+        // do something that will cancel the promise computation (e.g., close
+        // a socket, cancel a database query, etc...)
+    }
+);
+
+assert('waited' === $promise->wait());
+```
+
+A promise has the following methods:
+
+- `then(callable $onFulfilled, callable $onRejected) : PromiseInterface`
+  
+  Creates a new promise that is fulfilled or rejected when the promise is
+  resolved.
+
+- `wait($unwrap = true) : mixed`
+
+  Synchronously waits on the promise to complete.
+  
+  `$unwrap` controls whether or not the value of the promise is returned for a
+  fulfilled promise or if an exception is thrown if the promise is rejected.
+  This is set to `true` by default.
+
+- `cancel()`
+
+  Attempts to cancel the promise if possible. The promise being cancelled and
+  the parent most ancestor that has not yet been resolved will also be
+  cancelled. Any promises waiting on the cancelled promise to resolve will also
+  be cancelled.
+
+- `getState() : string`
+
+  Returns the state of the promise. One of `pending`, `fulfilled`, or
+  `rejected`.
+
+- `resolve($value)`
+
+  Fulfills the promise with the given `$value`.
+
+- `reject($reason)`
+
+  Rejects the promise with the given `$reason`.
+
+
+## FulfilledPromise
+
+A fulfilled promise can be created to represent a promise that has been
+fulfilled.
+
+```php
+use GuzzleHttp\Promise\FulfilledPromise;
+
+$promise = new FulfilledPromise('value');
+
+// Fulfilled callbacks are immediately invoked.
+$promise->then(function ($value) {
+    echo $value;
+});
+```
+
+
+## RejectedPromise
+
+A rejected promise can be created to represent a promise that has been
+rejected.
+
+```php
+use GuzzleHttp\Promise\RejectedPromise;
+
+$promise = new RejectedPromise('Error');
+
+// Rejected callbacks are immediately invoked.
+$promise->then(null, function ($reason) {
+    echo $reason;
+});
+```
+
+
+# Promise interop
+
+This library works with foreign promises that have a `then` method. This means
+you can use Guzzle promises with [React promises](https://github.com/reactphp/promise)
+for example. When a foreign promise is returned inside of a then method
+callback, promise resolution will occur recursively.
+
+```php
+// Create a React promise
+$deferred = new React\Promise\Deferred();
+$reactPromise = $deferred->promise();
+
+// Create a Guzzle promise that is fulfilled with a React promise.
+$guzzlePromise = new \GuzzleHttp\Promise\Promise();
+$guzzlePromise->then(function ($value) use ($reactPromise) {
+    // Do something something with the value...
+    // Return the React promise
+    return $reactPromise;
+});
+```
+
+Please note that wait and cancel chaining is no longer possible when forwarding
+a foreign promise. You will need to wrap a third-party promise with a Guzzle
+promise in order to utilize wait and cancel functions with foreign promises.
+
+
+## Event Loop Integration
+
+In order to keep the stack size constant, Guzzle promises are resolved
+asynchronously using a task queue. When waiting on promises synchronously, the
+task queue will be automatically run to ensure that the blocking promise and
+any forwarded promises are resolved. When using promises asynchronously in an
+event loop, you will need to run the task queue on each tick of the loop. If
+you do not run the task queue, then promises will not be resolved.
+
+You can run the task queue using the `run()` method of the global task queue
+instance.
+
+```php
+// Get the global task queue
+$queue = \GuzzleHttp\Promise\queue();
+$queue->run();
+```
+
+For example, you could use Guzzle promises with React using a periodic timer:
+
+```php
+$loop = React\EventLoop\Factory::create();
+$loop->addPeriodicTimer(0, [$queue, 'run']);
+```
+
+*TODO*: Perhaps adding a `futureTick()` on each tick would be faster?
+
+
+# Implementation notes
+
+
+## Promise resolution and chaining is handled iteratively
+
+By shuffling pending handlers from one owner to another, promises are
+resolved iteratively, allowing for "infinite" then chaining.
+
+```php
+<?php
+require 'vendor/autoload.php';
+
+use GuzzleHttp\Promise\Promise;
+
+$parent = new Promise();
+$p = $parent;
+
+for ($i = 0; $i < 1000; $i++) {
+    $p = $p->then(function ($v) {
+        // The stack size remains constant (a good thing)
+        echo xdebug_get_stack_depth() . ', ';
+        return $v + 1;
+    });
+}
+
+$parent->resolve(0);
+var_dump($p->wait()); // int(1000)
+
+```
+
+When a promise is fulfilled or rejected with a non-promise value, the promise
+then takes ownership of the handlers of each child promise and delivers values
+down the chain without using recursion.
+
+When a promise is resolved with another promise, the original promise transfers
+all of its pending handlers to the new promise. When the new promise is
+eventually resolved, all of the pending handlers are delivered the forwarded
+value.
+
+
+## A promise is the deferred.
+
+Some promise libraries implement promises using a deferred object to represent
+a computation and a promise object to represent the delivery of the result of
+the computation. This is a nice separation of computation and delivery because
+consumers of the promise cannot modify the value that will be eventually
+delivered.
+
+One side effect of being able to implement promise resolution and chaining
+iteratively is that you need to be able for one promise to reach into the state
+of another promise to shuffle around ownership of handlers. In order to achieve
+this without making the handlers of a promise publicly mutable, a promise is
+also the deferred value, allowing promises of the same parent class to reach
+into and modify the private properties of promises of the same type. While this
+does allow consumers of the value to modify the resolution or rejection of the
+deferred, it is a small price to pay for keeping the stack size constant.
+
+```php
+$promise = new Promise();
+$promise->then(function ($value) { echo $value; });
+// The promise is the deferred value, so you can deliver a value to it.
+$promise->deliver('foo');
+// prints "foo"
+```
diff --git a/core/vendor/guzzlehttp/streams/composer.json b/core/vendor/guzzlehttp/promises/composer.json
similarity index 55%
rename from core/vendor/guzzlehttp/streams/composer.json
rename to core/vendor/guzzlehttp/promises/composer.json
index 6d7034370..e1bad38b4 100644
--- a/core/vendor/guzzlehttp/streams/composer.json
+++ b/core/vendor/guzzlehttp/promises/composer.json
@@ -1,8 +1,8 @@
 {
-    "name": "guzzlehttp/streams",
-    "description": "Provides a simple abstraction over streams of data",
-    "homepage": "http://guzzlephp.org/",
-    "keywords": ["stream", "guzzle"],
+    "name": "guzzlehttp/promises",
+    "type": "library",
+    "description": "Guzzle promises library",
+    "keywords": ["promise"],
     "license": "MIT",
     "authors": [
         {
@@ -12,17 +12,20 @@
         }
     ],
     "require": {
-        "php": ">=5.4.0"
+        "php": ">=5.5.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.0"
     },
     "autoload": {
-        "psr-4": { "GuzzleHttp\\Stream\\": "src/" }
+        "psr-4": {
+            "GuzzleHttp\\Promise\\": "src/"
+        },
+        "files": ["src/functions.php"]
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "3.0-dev"
+            "dev-master": "1.0-dev"
         }
     }
 }
diff --git a/core/vendor/guzzlehttp/guzzle/phpunit.xml.dist b/core/vendor/guzzlehttp/promises/phpunit.xml.dist
similarity index 100%
rename from core/vendor/guzzlehttp/guzzle/phpunit.xml.dist
rename to core/vendor/guzzlehttp/promises/phpunit.xml.dist
diff --git a/core/vendor/guzzlehttp/promises/src/AggregateException.php b/core/vendor/guzzlehttp/promises/src/AggregateException.php
new file mode 100644
index 000000000..6a5690c37
--- /dev/null
+++ b/core/vendor/guzzlehttp/promises/src/AggregateException.php
@@ -0,0 +1,16 @@
+<?php
+namespace GuzzleHttp\Promise;
+
+/**
+ * Exception thrown when too many errors occur in the some() or any() methods.
+ */
+class AggregateException extends RejectionException
+{
+    public function __construct($msg, array $reasons)
+    {
+        parent::__construct(
+            $reasons,
+            sprintf('%s; %d rejected promises', $msg, count($reasons))
+        );
+    }
+}
diff --git a/core/vendor/guzzlehttp/promises/src/CancellationException.php b/core/vendor/guzzlehttp/promises/src/CancellationException.php
new file mode 100644
index 000000000..cb360b805
--- /dev/null
+++ b/core/vendor/guzzlehttp/promises/src/CancellationException.php
@@ -0,0 +1,9 @@
+<?php
+namespace GuzzleHttp\Promise;
+
+/**
+ * Exception that is set as the reason for a promise that has been cancelled.
+ */
+class CancellationException extends RejectionException
+{
+}
diff --git a/core/vendor/guzzlehttp/promises/src/EachPromise.php b/core/vendor/guzzlehttp/promises/src/EachPromise.php
new file mode 100644
index 000000000..855d83378
--- /dev/null
+++ b/core/vendor/guzzlehttp/promises/src/EachPromise.php
@@ -0,0 +1,202 @@
+<?php
+namespace GuzzleHttp\Promise;
+
+/**
+ * Represents a promise that iterates over many promises and invokes
+ * side-effect functions in the process.
+ */
+class EachPromise implements PromisorInterface
+{
+    private $pending = [];
+
+    /** @var \Iterator */
+    private $iterable;
+
+    /** @var callable|int */
+    private $concurrency;
+
+    /** @var callable */
+    private $onFulfilled;
+
+    /** @var callable */
+    private $onRejected;
+
+    /** @var Promise */
+    private $aggregate;
+
+    /**
+     * Configuration hash can include the following key value pairs:
+     *
+     * - fulfilled: (callable) Invoked when a promise fulfills. The function
+     *   is invoked with three arguments: the fulfillment value, the index
+     *   position from the iterable list of the promise, and the aggregate
+     *   promise that manages all of the promises. The aggregate promise may
+     *   be resolved from within the callback to short-circuit the promise.
+     * - rejected: (callable) Invoked when a promise is rejected. The
+     *   function is invoked with three arguments: the rejection reason, the
+     *   index position from the iterable list of the promise, and the
+     *   aggregate promise that manages all of the promises. The aggregate
+     *   promise may be resolved from within the callback to short-circuit
+     *   the promise.
+     * - concurrency: (integer) Pass this configuration option to limit the
+     *   allowed number of outstanding concurrently executing promises,
+     *   creating a capped pool of promises. There is no limit by default.
+     *
+     * @param mixed    $iterable Promises or values to iterate.
+     * @param array    $config   Configuration options
+     */
+    public function __construct($iterable, array $config = [])
+    {
+        $this->iterable = iter_for($iterable);
+
+        if (isset($config['concurrency'])) {
+            $this->concurrency = $config['concurrency'];
+        }
+
+        if (isset($config['fulfilled'])) {
+            $this->onFulfilled = $config['fulfilled'];
+        }
+
+        if (isset($config['rejected'])) {
+            $this->onRejected = $config['rejected'];
+        }
+    }
+
+    public function promise()
+    {
+        if ($this->aggregate) {
+            return $this->aggregate;
+        }
+
+        try {
+            $this->createPromise();
+            $this->iterable->rewind();
+            $this->refillPending();
+        } catch (\Exception $e) {
+            $this->aggregate->reject($e);
+        }
+
+        return $this->aggregate;
+    }
+
+    private function createPromise()
+    {
+        $this->aggregate = new Promise(function () {
+            reset($this->pending);
+            // Consume a potentially fluctuating list of promises while
+            // ensuring that indexes are maintained (precluding array_shift).
+            while ($promise = current($this->pending)) {
+                next($this->pending);
+                $promise->wait();
+                if ($this->aggregate->getState() !== PromiseInterface::PENDING) {
+                    return;
+                }
+            }
+        });
+
+        // Clear the references when the promise is resolved.
+        $clearFn = function () {
+            $this->iterable = $this->concurrency = $this->pending = null;
+            $this->onFulfilled = $this->onRejected = null;
+        };
+
+        $this->aggregate->then($clearFn, $clearFn);
+    }
+
+    private function refillPending()
+    {
+        if (!$this->concurrency) {
+            // Add all pending promises.
+            while ($this->addPending() && $this->advanceIterator());
+            return;
+        }
+
+        // Add only up to N pending promises.
+        $concurrency = is_callable($this->concurrency)
+            ? call_user_func($this->concurrency, count($this->pending))
+            : $this->concurrency;
+        $concurrency = max($concurrency - count($this->pending), 0);
+        // Concurrency may be set to 0 to disallow new promises.
+        if (!$concurrency) {
+            return;
+        }
+        // Add the first pending promise.
+        $this->addPending();
+        // Note this is special handling for concurrency=1 so that we do
+        // not advance the iterator after adding the first promise. This
+        // helps work around issues with generators that might not have the
+        // next value to yield until promise callbacks are called.
+        while (--$concurrency
+            && $this->advanceIterator()
+            && $this->addPending());
+    }
+
+    private function addPending()
+    {
+        if (!$this->iterable || !$this->iterable->valid()) {
+            return false;
+        }
+
+        $promise = promise_for($this->iterable->current());
+        $idx = $this->iterable->key();
+
+        $this->pending[$idx] = $promise->then(
+            function ($value) use ($idx) {
+                if ($this->onFulfilled) {
+                    call_user_func(
+                        $this->onFulfilled, $value, $idx, $this->aggregate
+                    );
+                }
+                $this->step($idx);
+            },
+            function ($reason) use ($idx) {
+                if ($this->onRejected) {
+                    call_user_func(
+                        $this->onRejected, $reason, $idx, $this->aggregate
+                    );
+                }
+                $this->step($idx);
+            }
+        );
+
+        return true;
+    }
+
+    private function advanceIterator()
+    {
+        try {
+            $this->iterable->next();
+            return true;
+        } catch (\Exception $e) {
+            $this->aggregate->reject($e);
+            return false;
+        }
+    }
+
+    private function step($idx)
+    {
+        // If the promise was already resolved, then ignore this step.
+        if ($this->aggregate->getState() !== PromiseInterface::PENDING) {
+            return;
+        }
+
+        unset($this->pending[$idx]);
+        $this->advanceIterator();
+
+        if (!$this->checkIfFinished()) {
+            // Add more pending promises if possible.
+            $this->refillPending();
+        }
+    }
+
+    private function checkIfFinished()
+    {
+        if (!$this->pending && !$this->iterable->valid()) {
+            // Resolve the promise if there's nothing left to do.
+            $this->aggregate->resolve(null);
+            return true;
+        }
+
+        return false;
+    }
+}
diff --git a/core/vendor/guzzlehttp/promises/src/FulfilledPromise.php b/core/vendor/guzzlehttp/promises/src/FulfilledPromise.php
new file mode 100644
index 000000000..559629653
--- /dev/null
+++ b/core/vendor/guzzlehttp/promises/src/FulfilledPromise.php
@@ -0,0 +1,80 @@
+<?php
+namespace GuzzleHttp\Promise;
+
+/**
+ * A promise that has been fulfilled.
+ *
+ * Thenning off of this promise will invoke the onFulfilled callback
+ * immediately and ignore other callbacks.
+ */
+class FulfilledPromise implements PromiseInterface
+{
+    private $value;
+
+    public function __construct($value)
+    {
+        if (method_exists($value, 'then')) {
+            throw new \InvalidArgumentException(
+                'You cannot create a FulfilledPromise with a promise.');
+        }
+
+        $this->value = $value;
+    }
+
+    public function then(
+        callable $onFulfilled = null,
+        callable $onRejected = null
+    ) {
+        // Return itself if there is no onFulfilled function.
+        if (!$onFulfilled) {
+            return $this;
+        }
+
+        $queue = queue();
+        $p = new Promise([$queue, 'run']);
+        $value = $this->value;
+        $queue->add(static function () use ($p, $value, $onFulfilled) {
+            if ($p->getState() === self::PENDING) {
+                try {
+                    $p->resolve($onFulfilled($value));
+                } catch (\Exception $e) {
+                    $p->reject($e);
+                }
+            }
+        });
+
+        return $p;
+    }
+
+    public function otherwise(callable $onRejected)
+    {
+        return $this->then(null, $onRejected);
+    }
+
+    public function wait($unwrap = true, $defaultDelivery = null)
+    {
+        return $unwrap ? $this->value : null;
+    }
+
+    public function getState()
+    {
+        return self::FULFILLED;
+    }
+
+    public function resolve($value)
+    {
+        if ($value !== $this->value) {
+            throw new \LogicException("Cannot resolve a fulfilled promise");
+        }
+    }
+
+    public function reject($reason)
+    {
+        throw new \LogicException("Cannot reject a fulfilled promise");
+    }
+
+    public function cancel()
+    {
+        // pass
+    }
+}
diff --git a/core/vendor/guzzlehttp/promises/src/Promise.php b/core/vendor/guzzlehttp/promises/src/Promise.php
new file mode 100644
index 000000000..c2cf969da
--- /dev/null
+++ b/core/vendor/guzzlehttp/promises/src/Promise.php
@@ -0,0 +1,268 @@
+<?php
+namespace GuzzleHttp\Promise;
+
+/**
+ * Promises/A+ implementation that avoids recursion when possible.
+ *
+ * @link https://promisesaplus.com/
+ */
+class Promise implements PromiseInterface
+{
+    private $state = self::PENDING;
+    private $result;
+    private $cancelFn;
+    private $waitFn;
+    private $waitList;
+    private $handlers = [];
+
+    /**
+     * @param callable $waitFn   Fn that when invoked resolves the promise.
+     * @param callable $cancelFn Fn that when invoked cancels the promise.
+     */
+    public function __construct(
+        callable $waitFn = null,
+        callable $cancelFn = null
+    ) {
+        $this->waitFn = $waitFn;
+        $this->cancelFn = $cancelFn;
+    }
+
+    public function then(
+        callable $onFulfilled = null,
+        callable $onRejected = null
+    ) {
+        if ($this->state === self::PENDING) {
+            $p = new Promise(null, [$this, 'cancel']);
+            $this->handlers[] = [$p, $onFulfilled, $onRejected];
+            $p->waitList = $this->waitList;
+            $p->waitList[] = $this;
+            return $p;
+        }
+
+        // Return a fulfilled promise and immediately invoke any callbacks.
+        if ($this->state === self::FULFILLED) {
+            return $onFulfilled
+                ? promise_for($this->result)->then($onFulfilled)
+                : promise_for($this->result);
+        }
+
+        // It's either cancelled or rejected, so return a rejected promise
+        // and immediately invoke any callbacks.
+        $rejection = rejection_for($this->result);
+        return $onRejected ? $rejection->then(null, $onRejected) : $rejection;
+    }
+
+    public function otherwise(callable $onRejected)
+    {
+        return $this->then(null, $onRejected);
+    }
+
+    public function wait($unwrap = true)
+    {
+        $this->waitIfPending();
+
+        if (!$unwrap) {
+            return null;
+        }
+
+        if ($this->result instanceof PromiseInterface) {
+            return $this->result->wait($unwrap);
+        } elseif ($this->state === self::FULFILLED) {
+            return $this->result;
+        } else {
+            // It's rejected so "unwrap" and throw an exception.
+            throw exception_for($this->result);
+        }
+    }
+
+    public function getState()
+    {
+        return $this->state;
+    }
+
+    public function cancel()
+    {
+        if ($this->state !== self::PENDING) {
+            return;
+        }
+
+        $this->waitFn = $this->waitList = null;
+
+        if ($this->cancelFn) {
+            $fn = $this->cancelFn;
+            $this->cancelFn = null;
+            try {
+                $fn();
+            } catch (\Exception $e) {
+                $this->reject($e);
+            }
+        }
+
+        // Reject the promise only if it wasn't rejected in a then callback.
+        if ($this->state === self::PENDING) {
+            $this->reject(new CancellationException('Promise has been cancelled'));
+        }
+    }
+
+    public function resolve($value)
+    {
+        $this->settle(self::FULFILLED, $value);
+    }
+
+    public function reject($reason)
+    {
+        $this->settle(self::REJECTED, $reason);
+    }
+
+    private function settle($state, $value)
+    {
+        if ($this->state !== self::PENDING) {
+            // Ignore calls with the same resolution.
+            if ($state === $this->state && $value === $this->result) {
+                return;
+            }
+            throw $this->state === $state
+                ? new \LogicException("The promise is already {$state}.")
+                : new \LogicException("Cannot change a {$this->state} promise to {$state}");
+        }
+
+        if ($value === $this) {
+            throw new \LogicException('Cannot fulfill or reject a promise with itself');
+        }
+
+        // Clear out the state of the promise but stash the handlers.
+        $this->state = $state;
+        $this->result = $value;
+        $handlers = $this->handlers;
+        $this->handlers = null;
+        $this->waitList = $this->waitFn = null;
+        $this->cancelFn = null;
+
+        if (!$handlers) {
+            return;
+        }
+
+        // If the value was not a settled promise or a thenable, then resolve
+        // it in the task queue using the correct ID.
+        if (!method_exists($value, 'then')) {
+            $id = $state === self::FULFILLED ? 1 : 2;
+            // It's a success, so resolve the handlers in the queue.
+            queue()->add(static function () use ($id, $value, $handlers) {
+                foreach ($handlers as $handler) {
+                    self::callHandler($id, $value, $handler);
+                }
+            });
+        } elseif ($value instanceof Promise
+            && $value->getState() === self::PENDING
+        ) {
+            // We can just merge our handlers onto the next promise.
+            $value->handlers = array_merge($value->handlers, $handlers);
+        } else {
+            // Resolve the handlers when the forwarded promise is resolved.
+            $value->then(
+                static function ($value) use ($handlers) {
+                    foreach ($handlers as $handler) {
+                        self::callHandler(1, $value, $handler);
+                    }
+                },
+                static function ($reason) use ($handlers) {
+                    foreach ($handlers as $handler) {
+                        self::callHandler(2, $reason, $handler);
+                    }
+                }
+            );
+        }
+    }
+
+    /**
+     * Call a stack of handlers using a specific callback index and value.
+     *
+     * @param int   $index   1 (resolve) or 2 (reject).
+     * @param mixed $value   Value to pass to the callback.
+     * @param array $handler Array of handler data (promise and callbacks).
+     *
+     * @return array Returns the next group to resolve.
+     */
+    private static function callHandler($index, $value, array $handler)
+    {
+        /** @var PromiseInterface $promise */
+        $promise = $handler[0];
+
+        // The promise may have been cancelled or resolved before placing
+        // this thunk in the queue.
+        if ($promise->getState() !== self::PENDING) {
+            return;
+        }
+
+        try {
+            if (isset($handler[$index])) {
+                $promise->resolve($handler[$index]($value));
+            } elseif ($index === 1) {
+                // Forward resolution values as-is.
+                $promise->resolve($value);
+            } else {
+                // Forward rejections down the chain.
+                $promise->reject($value);
+            }
+        } catch (\Exception $reason) {
+            $promise->reject($reason);
+        }
+    }
+
+    private function waitIfPending()
+    {
+        if ($this->state !== self::PENDING) {
+            return;
+        } elseif ($this->waitFn) {
+            $this->invokeWaitFn();
+        } elseif ($this->waitList) {
+            $this->invokeWaitList();
+        } else {
+            // If there's not wait function, then reject the promise.
+            $this->reject('Cannot wait on a promise that has '
+                . 'no internal wait function. You must provide a wait '
+                . 'function when constructing the promise to be able to '
+                . 'wait on a promise.');
+        }
+
+        queue()->run();
+
+        if ($this->state === self::PENDING) {
+            $this->reject('Invoking the wait callback did not resolve the promise');
+        }
+    }
+
+    private function invokeWaitFn()
+    {
+        try {
+            $wfn = $this->waitFn;
+            $this->waitFn = null;
+            $wfn(true);
+        } catch (\Exception $reason) {
+            if ($this->state === self::PENDING) {
+                // The promise has not been resolved yet, so reject the promise
+                // with the exception.
+                $this->reject($reason);
+            } else {
+                // The promise was already resolved, so there's a problem in
+                // the application.
+                throw $reason;
+            }
+        }
+    }
+
+    private function invokeWaitList()
+    {
+        $waitList = $this->waitList;
+        $this->waitList = null;
+
+        foreach ($waitList as $result) {
+            descend:
+            $result->waitIfPending();
+            if ($result->result instanceof Promise) {
+                $result = $result->result;
+                goto descend;
+            }
+        }
+    }
+}
diff --git a/core/vendor/guzzlehttp/promises/src/PromiseInterface.php b/core/vendor/guzzlehttp/promises/src/PromiseInterface.php
new file mode 100644
index 000000000..8f5f4b99b
--- /dev/null
+++ b/core/vendor/guzzlehttp/promises/src/PromiseInterface.php
@@ -0,0 +1,93 @@
+<?php
+namespace GuzzleHttp\Promise;
+
+/**
+ * A promise represents the eventual result of an asynchronous operation.
+ *
+ * The primary way of interacting with a promise is through its then method,
+ * which registers callbacks to receive either a promise’s eventual value or
+ * the reason why the promise cannot be fulfilled.
+ *
+ * @link https://promisesaplus.com/
+ */
+interface PromiseInterface
+{
+    const PENDING = 'pending';
+    const FULFILLED = 'fulfilled';
+    const REJECTED = 'rejected';
+
+    /**
+     * Appends fulfillment and rejection handlers to the promise, and returns
+     * a new promise resolving to the return value of the called handler.
+     *
+     * @param callable $onFulfilled Invoked when the promise fulfills.
+     * @param callable $onRejected  Invoked when the promise is rejected.
+     *
+     * @return PromiseInterface
+     */
+    public function then(
+        callable $onFulfilled = null,
+        callable $onRejected = null
+    );
+
+    /**
+     * Appends a rejection handler callback to the promise, and returns a new
+     * promise resolving to the return value of the callback if it is called,
+     * or to its original fulfillment value if the promise is instead
+     * fulfilled.
+     *
+     * @param callable $onRejected Invoked when the promise is rejected.
+     *
+     * @return PromiseInterface
+     */
+    public function otherwise(callable $onRejected);
+
+    /**
+     * Get the state of the promise ("pending", "rejected", or "fulfilled").
+     *
+     * The three states can be checked against the constants defined on
+     * PromiseInterface: PENDING, FULFILLED, and REJECTED.
+     *
+     * @return string
+     */
+    public function getState();
+
+    /**
+     * Resolve the promise with the given value.
+     *
+     * @param mixed $value
+     * @throws \RuntimeException if the promise is already resolved.
+     */
+    public function resolve($value);
+
+    /**
+     * Reject the promise with the given reason.
+     *
+     * @param mixed $reason
+     * @throws \RuntimeException if the promise is already resolved.
+     */
+    public function reject($reason);
+
+    /**
+     * Cancels the promise if possible.
+     *
+     * @link https://github.com/promises-aplus/cancellation-spec/issues/7
+     */
+    public function cancel();
+
+    /**
+     * Waits until the promise completes if possible.
+     *
+     * Pass $unwrap as true to unwrap the result of the promise, either
+     * returning the resolved value or throwing the rejected exception.
+     *
+     * If the promise cannot be waited on, then the promise will be rejected.
+     *
+     * @param bool $unwrap
+     *
+     * @return mixed
+     * @throws \LogicException if the promise has no wait function or if the
+     *                         promise does not settle after waiting.
+     */
+    public function wait($unwrap = true);
+}
diff --git a/core/vendor/guzzlehttp/promises/src/PromisorInterface.php b/core/vendor/guzzlehttp/promises/src/PromisorInterface.php
new file mode 100644
index 000000000..b07fe32bc
--- /dev/null
+++ b/core/vendor/guzzlehttp/promises/src/PromisorInterface.php
@@ -0,0 +1,15 @@
+<?php
+namespace GuzzleHttp\Promise;
+
+/**
+ * Interface used with classes that return a promise.
+ */
+interface PromisorInterface
+{
+    /**
+     * Returns a promise.
+     *
+     * @return PromiseInterface
+     */
+    public function promise();
+}
diff --git a/core/vendor/guzzlehttp/promises/src/RejectedPromise.php b/core/vendor/guzzlehttp/promises/src/RejectedPromise.php
new file mode 100644
index 000000000..bd499e691
--- /dev/null
+++ b/core/vendor/guzzlehttp/promises/src/RejectedPromise.php
@@ -0,0 +1,84 @@
+<?php
+namespace GuzzleHttp\Promise;
+
+/**
+ * A promise that has been rejected.
+ *
+ * Thenning off of this promise will invoke the onRejected callback
+ * immediately and ignore other callbacks.
+ */
+class RejectedPromise implements PromiseInterface
+{
+    private $reason;
+
+    public function __construct($reason)
+    {
+        if (method_exists($reason, 'then')) {
+            throw new \InvalidArgumentException(
+                'You cannot create a RejectedPromise with a promise.');
+        }
+
+        $this->reason = $reason;
+    }
+
+    public function then(
+        callable $onFulfilled = null,
+        callable $onRejected = null
+    ) {
+        // If there's no onRejected callback then just return self.
+        if (!$onRejected) {
+            return $this;
+        }
+
+        $queue = queue();
+        $reason = $this->reason;
+        $p = new Promise([$queue, 'run']);
+        $queue->add(static function () use ($p, $reason, $onRejected) {
+            if ($p->getState() === self::PENDING) {
+                try {
+                    // Return a resolved promise if onRejected does not throw.
+                    $p->resolve($onRejected($reason));
+                } catch (\Exception $e) {
+                    // onRejected threw, so return a rejected promise.
+                    $p->reject($e);
+                }
+            }
+        });
+
+        return $p;
+    }
+
+    public function otherwise(callable $onRejected)
+    {
+        return $this->then(null, $onRejected);
+    }
+
+    public function wait($unwrap = true, $defaultDelivery = null)
+    {
+        if ($unwrap) {
+            throw exception_for($this->reason);
+        }
+    }
+
+    public function getState()
+    {
+        return self::REJECTED;
+    }
+
+    public function resolve($value)
+    {
+        throw new \LogicException("Cannot resolve a rejected promise");
+    }
+
+    public function reject($reason)
+    {
+        if ($reason !== $this->reason) {
+            throw new \LogicException("Cannot reject a rejected promise");
+        }
+    }
+
+    public function cancel()
+    {
+        // pass
+    }
+}
diff --git a/core/vendor/guzzlehttp/promises/src/RejectionException.php b/core/vendor/guzzlehttp/promises/src/RejectionException.php
new file mode 100644
index 000000000..07c1136da
--- /dev/null
+++ b/core/vendor/guzzlehttp/promises/src/RejectionException.php
@@ -0,0 +1,47 @@
+<?php
+namespace GuzzleHttp\Promise;
+
+/**
+ * A special exception that is thrown when waiting on a rejected promise.
+ *
+ * The reason value is available via the getReason() method.
+ */
+class RejectionException extends \RuntimeException
+{
+    /** @var mixed Rejection reason. */
+    private $reason;
+
+    /**
+     * @param mixed $reason       Rejection reason.
+     * @param string $description Optional description
+     */
+    public function __construct($reason, $description = null)
+    {
+        $this->reason = $reason;
+
+        $message = 'The promise was rejected';
+
+        if ($description) {
+            $message .= ' with reason: ' . $description;
+        } elseif (is_string($reason)
+            || (is_object($reason) && method_exists($reason, '__toString'))
+        ) {
+            $message .= ' with reason: ' . $this->reason;
+        } elseif ($reason instanceof \JsonSerializable) {
+            $message .= ' with reason: '
+                . json_encode($this->reason, JSON_PRETTY_PRINT);
+        }
+
+        parent::__construct($message);
+    }
+
+    /**
+     * Returns the rejection reason.
+     *
+     * @return mixed
+     */
+    public function getReason()
+    {
+        return $this->reason;
+    }
+}
diff --git a/core/vendor/guzzlehttp/promises/src/TaskQueue.php b/core/vendor/guzzlehttp/promises/src/TaskQueue.php
new file mode 100644
index 000000000..502636313
--- /dev/null
+++ b/core/vendor/guzzlehttp/promises/src/TaskQueue.php
@@ -0,0 +1,79 @@
+<?php
+namespace GuzzleHttp\Promise;
+
+/**
+ * A task queue that executes tasks in a FIFO order.
+ *
+ * This task queue class is used to settle promises asynchronously and
+ * maintains a constant stack size. You can use the task queue asynchronously
+ * by calling the `run()` function of the global task queue in an event loop.
+ *
+ *     GuzzleHttp\Promise\queue()->run();
+ */
+class TaskQueue
+{
+    private $enableShutdown = true;
+    private $queue = [];
+
+    public function __construct($withShutdown = true)
+    {
+        if ($withShutdown) {
+            register_shutdown_function(function () {
+                if ($this->enableShutdown) {
+                    // Only run the tasks if an E_ERROR didn't occur.
+                    $err = error_get_last();
+                    if (!$err || ($err['type'] ^ E_ERROR)) {
+                        $this->run();
+                    }
+                }
+            });
+        }
+    }
+
+    /**
+     * Returns true if the queue is empty.
+     *
+     * @return bool
+     */
+    public function isEmpty()
+    {
+        return !$this->queue;
+    }
+
+    /**
+     * Adds a task to the queue that will be executed the next time run is
+     * called.
+     *
+     * @param callable $task
+     */
+    public function add(callable $task)
+    {
+        $this->queue[] = $task;
+    }
+
+    /**
+     * Execute all of the pending task in the queue.
+     */
+    public function run()
+    {
+        while ($task = array_shift($this->queue)) {
+            $task();
+        }
+    }
+
+    /**
+     * The task queue will be run and exhausted by default when the process
+     * exits IFF the exit is not the result of a PHP E_ERROR error.
+     *
+     * You can disable running the automatic shutdown of the queue by calling
+     * this function. If you disable the task queue shutdown process, then you
+     * MUST either run the task queue (as a result of running your event loop
+     * or manually using the run() method) or wait on each outstanding promise.
+     *
+     * Note: This shutdown will occur before any destructors are triggered.
+     */
+    public function disableShutdown()
+    {
+        $this->enableShutdown = false;
+    }
+}
diff --git a/core/vendor/guzzlehttp/promises/src/functions.php b/core/vendor/guzzlehttp/promises/src/functions.php
new file mode 100644
index 000000000..eca27b21c
--- /dev/null
+++ b/core/vendor/guzzlehttp/promises/src/functions.php
@@ -0,0 +1,500 @@
+<?php
+namespace GuzzleHttp\Promise;
+
+// Don't redefine the functions if included multiple times.
+if (function_exists('GuzzleHttp\Promise\promise_for')) {
+    return;
+}
+
+/**
+ * Get the global task queue used for promise resolution.
+ *
+ * This task queue MUST be run in an event loop in order for promises to be
+ * settled asynchronously. It will be automatically run when synchronously
+ * waiting on a promise.
+ *
+ * <code>
+ * while ($eventLoop->isRunning()) {
+ *     GuzzleHttp\Promise\queue()->run();
+ * }
+ * </code>
+ *
+ * @return TaskQueue
+ */
+function queue()
+{
+    static $queue;
+
+    if (!$queue) {
+        $queue = new TaskQueue();
+    }
+
+    return $queue;
+}
+
+/**
+ * Adds a function to run in the task queue when it is next `run()` and returns
+ * a promise that is fulfilled or rejected with the result.
+ *
+ * @param callable $task Task function to run.
+ *
+ * @return PromiseInterface
+ */
+function task(callable $task)
+{
+    $queue = queue();
+    $promise = new Promise([$queue, 'run']);
+    $queue->add(function () use ($task, $promise) {
+        try {
+            $promise->resolve($task());
+        } catch (\Exception $e) {
+            $promise->reject($e);
+        }
+    });
+
+    return $promise;
+}
+
+/**
+ * Creates a promise for a value if the value is not a promise.
+ *
+ * @param mixed $value Promise or value.
+ *
+ * @return PromiseInterface
+ */
+function promise_for($value)
+{
+    if ($value instanceof PromiseInterface) {
+        return $value;
+    }
+
+    // Return a Guzzle promise that shadows the given promise.
+    if (method_exists($value, 'then')) {
+        $wfn = method_exists($value, 'wait') ? [$value, 'wait'] : null;
+        $cfn = method_exists($value, 'cancel') ? [$value, 'cancel'] : null;
+        $promise = new Promise($wfn, $cfn);
+        $value->then([$promise, 'resolve'], [$promise, 'reject']);
+        return $promise;
+    }
+
+    return new FulfilledPromise($value);
+}
+
+/**
+ * Creates a rejected promise for a reason if the reason is not a promise. If
+ * the provided reason is a promise, then it is returned as-is.
+ *
+ * @param mixed $reason Promise or reason.
+ *
+ * @return PromiseInterface
+ */
+function rejection_for($reason)
+{
+    if ($reason instanceof PromiseInterface) {
+        return $reason;
+    }
+
+    return new RejectedPromise($reason);
+}
+
+/**
+ * Create an exception for a rejected promise value.
+ *
+ * @param mixed $reason
+ *
+ * @return \Exception
+ */
+function exception_for($reason)
+{
+    return $reason instanceof \Exception
+        ? $reason
+        : new RejectionException($reason);
+}
+
+/**
+ * Returns an iterator for the given value.
+ *
+ * @param mixed $value
+ *
+ * @return \Iterator
+ */
+function iter_for($value)
+{
+    if ($value instanceof \Iterator) {
+        return $value;
+    } elseif (is_array($value)) {
+        return new \ArrayIterator($value);
+    } else {
+        return new \ArrayIterator([$value]);
+    }
+}
+
+/**
+ * Synchronously waits on a promise to resolve and returns an inspection state
+ * array.
+ *
+ * Returns a state associative array containing a "state" key mapping to a
+ * valid promise state. If the state of the promise is "fulfilled", the array
+ * will contain a "value" key mapping to the fulfilled value of the promise. If
+ * the promise is rejected, the array will contain a "reason" key mapping to
+ * the rejection reason of the promise.
+ *
+ * @param PromiseInterface $promise Promise or value.
+ *
+ * @return array
+ */
+function inspect(PromiseInterface $promise)
+{
+    try {
+        return [
+            'state' => PromiseInterface::FULFILLED,
+            'value' => $promise->wait()
+        ];
+    } catch (RejectionException $e) {
+        return ['state' => 'rejected', 'reason' => $e->getReason()];
+    } catch (\Exception $e) {
+        return ['state' => 'rejected', 'reason' => $e];
+    }
+}
+
+/**
+ * Waits on all of the provided promises, but does not unwrap rejected promises
+ * as thrown exception.
+ *
+ * Returns an array of inspection state arrays.
+ *
+ * @param PromiseInterface[] $promises Traversable of promises to wait upon.
+ *
+ * @return array
+ * @see GuzzleHttp\Promise\inspect for the inspection state array format.
+ */
+function inspect_all($promises)
+{
+    $results = [];
+    foreach ($promises as $key => $promise) {
+        $results[$key] = inspect($promise);
+    }
+
+    return $results;
+}
+
+/**
+ * Waits on all of the provided promises and returns the fulfilled values.
+ *
+ * Returns an array that contains the value of each promise (in the same order
+ * the promises were provided). An exception is thrown if any of the promises
+ * are rejected.
+ *
+ * @param mixed $promises Iterable of PromiseInterface objects to wait on.
+ *
+ * @return array
+ * @throws \Exception on error
+ */
+function unwrap($promises)
+{
+    $results = [];
+    foreach ($promises as $key => $promise) {
+        $results[$key] = $promise->wait();
+    }
+
+    return $results;
+}
+
+/**
+ * Given an array of promises, return a promise that is fulfilled when all the
+ * items in the array are fulfilled.
+ *
+ * The promise's fulfillment value is an array with fulfillment values at
+ * respective positions to the original array. If any promise in the array
+ * rejects, the returned promise is rejected with the rejection reason.
+ *
+ * @param mixed $promises Promises or values.
+ *
+ * @return Promise
+ */
+function all($promises)
+{
+    $results = [];
+    return each(
+        $promises,
+        function ($value, $idx) use (&$results) {
+            $results[$idx] = $value;
+        },
+        function ($reason, $idx, Promise $aggregate) {
+            $aggregate->reject($reason);
+        }
+    )->then(function () use (&$results) {
+        ksort($results);
+        return $results;
+    });
+}
+
+/**
+ * Initiate a competitive race between multiple promises or values (values will
+ * become immediately fulfilled promises).
+ *
+ * When count amount of promises have been fulfilled, the returned promise is
+ * fulfilled with an array that contains the fulfillment values of the winners
+ * in order of resolution.
+ *
+ * This prommise is rejected with a {@see GuzzleHttp\Promise\AggregateException}
+ * if the number of fulfilled promises is less than the desired $count.
+ *
+ * @param int   $count    Total number of promises.
+ * @param mixed $promises Promises or values.
+ *
+ * @return Promise
+ */
+function some($count, $promises)
+{
+    $results = [];
+    $rejections = [];
+
+    return each(
+        $promises,
+        function ($value, $idx, PromiseInterface $p) use (&$results, $count) {
+            if ($p->getState() !== PromiseInterface::PENDING) {
+                return;
+            }
+            $results[$idx] = $value;
+            if (count($results) >= $count) {
+                $p->resolve(null);
+            }
+        },
+        function ($reason) use (&$rejections) {
+            $rejections[] = $reason;
+        }
+    )->then(
+        function () use (&$results, &$rejections, $count) {
+            if (count($results) !== $count) {
+                throw new AggregateException(
+                    'Not enough promises to fulfill count',
+                    $rejections
+                );
+            }
+            ksort($results);
+            return array_values($results);
+        }
+    );
+}
+
+/**
+ * Like some(), with 1 as count. However, if the promise fulfills, the
+ * fulfillment value is not an array of 1 but the value directly.
+ *
+ * @param mixed $promises Promises or values.
+ *
+ * @return PromiseInterface
+ */
+function any($promises)
+{
+    return some(1, $promises)->then(function ($values) { return $values[0]; });
+}
+
+/**
+ * Returns a promise that is fulfilled when all of the provided promises have
+ * been fulfilled or rejected.
+ *
+ * The returned promise is fulfilled with an array of inspection state arrays.
+ *
+ * @param mixed $promises Promises or values.
+ *
+ * @return Promise
+ * @see GuzzleHttp\Promise\inspect for the inspection state array format.
+ */
+function settle($promises)
+{
+    $results = [];
+
+    return each(
+        $promises,
+        function ($value, $idx) use (&$results) {
+            $results[$idx] = ['state' => 'fulfilled', 'value' => $value];
+        },
+        function ($reason, $idx) use (&$results) {
+            $results[$idx] = ['state' => 'rejected', 'reason' => $reason];
+        }
+    )->then(function () use (&$results) {
+        ksort($results);
+        return $results;
+    });
+}
+
+/**
+ * Given an iterator that yields promises or values, returns a promise that is
+ * fulfilled with a null value when the iterator has been consumed or the
+ * aggregate promise has been fulfilled or rejected.
+ *
+ * $onFulfilled is a function that accepts the fulfilled value, iterator
+ * index, and the aggregate promise. The callback can invoke any necessary side
+ * effects and choose to resolve or reject the aggregate promise if needed.
+ *
+ * $onRejected is a function that accepts the rejection reason, iterator
+ * index, and the aggregate promise. The callback can invoke any necessary side
+ * effects and choose to resolve or reject the aggregate promise if needed.
+ *
+ * @param mixed    $iterable    Iterator or array to iterate over.
+ * @param callable $onFulfilled
+ * @param callable $onRejected
+ *
+ * @return Promise
+ */
+function each(
+    $iterable,
+    callable $onFulfilled = null,
+    callable $onRejected = null
+) {
+    return (new EachPromise($iterable, [
+        'fulfilled' => $onFulfilled,
+        'rejected'  => $onRejected
+    ]))->promise();
+}
+
+/**
+ * Like each, but only allows a certain number of outstanding promises at any
+ * given time.
+ *
+ * $concurrency may be an integer or a function that accepts the number of
+ * pending promises and returns a numeric concurrency limit value to allow for
+ * dynamic a concurrency size.
+ *
+ * @param mixed        $iterable
+ * @param int|callable $concurrency
+ * @param callable     $onFulfilled
+ * @param callable     $onRejected
+ *
+ * @return mixed
+ */
+function each_limit(
+    $iterable,
+    $concurrency,
+    callable $onFulfilled = null,
+    callable $onRejected = null
+) {
+    return (new EachPromise($iterable, [
+        'fulfilled'   => $onFulfilled,
+        'rejected'    => $onRejected,
+        'concurrency' => $concurrency
+    ]))->promise();
+}
+
+/**
+ * Like each_limit, but ensures that no promise in the given $iterable argument
+ * is rejected. If any promise is rejected, then the aggregate promise is
+ * rejected with the encountered rejection.
+ *
+ * @param mixed        $iterable
+ * @param int|callable $concurrency
+ * @param callable     $onFulfilled
+ *
+ * @return mixed
+ */
+function each_limit_all(
+    $iterable,
+    $concurrency,
+    callable $onFulfilled = null
+) {
+    return each_limit(
+        $iterable,
+        $concurrency,
+        $onFulfilled,
+        function ($reason, $idx, PromiseInterface $aggregate) {
+            $aggregate->reject($reason);
+        }
+    );
+}
+
+/**
+ * Returns true if a promise is fulfilled.
+ *
+ * @param PromiseInterface $promise
+ *
+ * @return bool
+ */
+function is_fulfilled(PromiseInterface $promise)
+{
+    return $promise->getState() === PromiseInterface::FULFILLED;
+}
+
+/**
+ * Returns true if a promise is rejected.
+ *
+ * @param PromiseInterface $promise
+ *
+ * @return bool
+ */
+function is_rejected(PromiseInterface $promise)
+{
+    return $promise->getState() === PromiseInterface::REJECTED;
+}
+
+/**
+ * Returns true if a promise is fulfilled or rejected.
+ *
+ * @param PromiseInterface $promise
+ *
+ * @return bool
+ */
+function is_settled(PromiseInterface $promise)
+{
+    return $promise->getState() !== PromiseInterface::PENDING;
+}
+
+/**
+ * Creates a promise that is resolved using a generator that yields values or
+ * promises (somewhat similar to C#'s async keyword).
+ *
+ * When called, the coroutine function will start an instance of the generator
+ * and returns a promise that is fulfilled with its final yielded value.
+ *
+ * Control is returned back to the generator when the yielded promise settles.
+ * This can lead to less verbose code when doing lots of sequential async calls
+ * with minimal processing in between.
+ *
+ *     use GuzzleHttp\Promise;
+ *
+ *     function createPromise($value) {
+ *         return new Promise\FulfilledPromise($value);
+ *     }
+ *
+ *     $promise = Promise\coroutine(function () {
+ *         $value = (yield createPromise('a'));
+ *         try {
+ *             $value = (yield createPromise($value . 'b'));
+ *         } catch (\Exception $e) {
+ *             // The promise was rejected.
+ *         }
+ *         yield $value . 'c';
+ *     });
+ *
+ *     // Outputs "abc"
+ *     $promise->then(function ($v) { echo $v; });
+ *
+ * @param callable $generatorFn Generator function to wrap into a promise.
+ *
+ * @return Promise
+ * @link https://github.com/petkaantonov/bluebird/blob/master/API.md#generators inspiration
+ */
+function coroutine(callable $generatorFn)
+{
+    $generator = $generatorFn();
+    return __next_coroutine($generator->current(), $generator)->then();
+}
+
+/** @internal */
+function __next_coroutine($yielded, \Generator $generator)
+{
+    return promise_for($yielded)->then(
+        function ($value) use ($generator) {
+            $nextYield = $generator->send($value);
+            return $generator->valid()
+                ? __next_coroutine($nextYield, $generator)
+                : $value;
+        },
+        function ($reason) use ($generator) {
+            $nextYield = $generator->throw(exception_for($reason));
+            // The throw was caught, so keep iterating on the coroutine
+            return __next_coroutine($nextYield, $generator);
+        }
+    );
+}
diff --git a/core/vendor/guzzlehttp/promises/tests/AggregateExceptionTest.php b/core/vendor/guzzlehttp/promises/tests/AggregateExceptionTest.php
new file mode 100644
index 000000000..eaa77039a
--- /dev/null
+++ b/core/vendor/guzzlehttp/promises/tests/AggregateExceptionTest.php
@@ -0,0 +1,14 @@
+<?php
+namespace GuzzleHttp\Promise\Tests;
+
+use GuzzleHttp\Promise\AggregateException;
+
+class AggregateExceptionTest extends \PHPUnit_Framework_TestCase
+{
+    public function testHasReason()
+    {
+        $e = new AggregateException('foo', ['baz', 'bar']);
+        $this->assertContains('foo', $e->getMessage());
+        $this->assertEquals(['baz', 'bar'], $e->getReason());
+    }
+}
diff --git a/core/vendor/guzzlehttp/promises/tests/EachPromiseTest.php b/core/vendor/guzzlehttp/promises/tests/EachPromiseTest.php
new file mode 100644
index 000000000..b913b3a71
--- /dev/null
+++ b/core/vendor/guzzlehttp/promises/tests/EachPromiseTest.php
@@ -0,0 +1,288 @@
+<?php
+namespace GuzzleHttp\Promise\Tests;
+
+use GuzzleHttp\Promise\RejectedPromise;
+use GuzzleHttp\Promise\FulfilledPromise;
+use GuzzleHttp\Promise\Promise;
+use GuzzleHttp\Promise\PromiseInterface;
+use GuzzleHttp\Promise\EachPromise;
+use GuzzleHttp\Promise as P;
+
+/**
+ * @covers GuzzleHttp\Promise\EachPromise
+ */
+class EachPromiseTest extends \PHPUnit_Framework_TestCase
+{
+    public function testReturnsSameInstance()
+    {
+        $each = new EachPromise([], ['concurrency' => 100]);
+        $this->assertSame($each->promise(), $each->promise());
+    }
+
+    public function testInvokesAllPromises()
+    {
+        $promises = [new Promise(), new Promise(), new Promise()];
+        $called = [];
+        $each = new EachPromise($promises, [
+            'fulfilled' => function ($value) use (&$called) {
+                $called[] = $value;
+            }
+        ]);
+        $p = $each->promise();
+        $promises[0]->resolve('a');
+        $promises[1]->resolve('c');
+        $promises[2]->resolve('b');
+        P\queue()->run();
+        $this->assertEquals(['a', 'c', 'b'], $called);
+        $this->assertEquals(PromiseInterface::FULFILLED, $p->getState());
+    }
+
+    public function testIsWaitable()
+    {
+        $a = new Promise(function () use (&$a) { $a->resolve('a'); });
+        $b = new Promise(function () use (&$b) { $b->resolve('b'); });
+        $called = [];
+        $each = new EachPromise([$a, $b], [
+            'fulfilled' => function ($value) use (&$called) { $called[] = $value; }
+        ]);
+        $p = $each->promise();
+        $this->assertNull($p->wait());
+        $this->assertEquals(PromiseInterface::FULFILLED, $p->getState());
+        $this->assertEquals(['a', 'b'], $called);
+    }
+
+    public function testCanResolveBeforeConsumingAll()
+    {
+        $called = 0;
+        $a = new Promise(function () use (&$a) { $a->resolve('a'); });
+        $b = new Promise(function () { $this->fail(); });
+        $each = new EachPromise([$a, $b], [
+            'fulfilled' => function ($value, $idx, Promise $aggregate) use (&$called) {
+                $this->assertSame($idx, 0);
+                $this->assertEquals('a', $value);
+                $aggregate->resolve(null);
+                $called++;
+            },
+            'rejected' => function (\Exception $reason) {
+                $this->fail($reason->getMessage());
+            }
+        ]);
+        $p = $each->promise();
+        $p->wait();
+        $this->assertNull($p->wait());
+        $this->assertEquals(1, $called);
+        $this->assertEquals(PromiseInterface::FULFILLED, $a->getState());
+        $this->assertEquals(PromiseInterface::PENDING, $b->getState());
+        // Resolving $b has no effect on the aggregate promise.
+        $b->resolve('foo');
+        $this->assertEquals(1, $called);
+    }
+
+    public function testLimitsPendingPromises()
+    {
+        $pending = [new Promise(), new Promise(), new Promise(), new Promise()];
+        $promises = new \ArrayIterator($pending);
+        $each = new EachPromise($promises, ['concurrency' => 2]);
+        $p = $each->promise();
+        $this->assertCount(2, $this->readAttribute($each, 'pending'));
+        $pending[0]->resolve('a');
+        $this->assertCount(2, $this->readAttribute($each, 'pending'));
+        $this->assertTrue($promises->valid());
+        $pending[1]->resolve('b');
+        P\queue()->run();
+        $this->assertCount(2, $this->readAttribute($each, 'pending'));
+        $this->assertTrue($promises->valid());
+        $promises[2]->resolve('c');
+        P\queue()->run();
+        $this->assertCount(1, $this->readAttribute($each, 'pending'));
+        $this->assertEquals(PromiseInterface::PENDING, $p->getState());
+        $promises[3]->resolve('d');
+        P\queue()->run();
+        $this->assertNull($this->readAttribute($each, 'pending'));
+        $this->assertEquals(PromiseInterface::FULFILLED, $p->getState());
+        $this->assertFalse($promises->valid());
+    }
+
+    public function testDynamicallyLimitsPendingPromises()
+    {
+        $calls = [];
+        $pendingFn = function ($count) use (&$calls) {
+            $calls[] = $count;
+            return 2;
+        };
+        $pending = [new Promise(), new Promise(), new Promise(), new Promise()];
+        $promises = new \ArrayIterator($pending);
+        $each = new EachPromise($promises, ['concurrency' => $pendingFn]);
+        $p = $each->promise();
+        $this->assertCount(2, $this->readAttribute($each, 'pending'));
+        $pending[0]->resolve('a');
+        $this->assertCount(2, $this->readAttribute($each, 'pending'));
+        $this->assertTrue($promises->valid());
+        $pending[1]->resolve('b');
+        $this->assertCount(2, $this->readAttribute($each, 'pending'));
+        P\queue()->run();
+        $this->assertTrue($promises->valid());
+        $promises[2]->resolve('c');
+        P\queue()->run();
+        $this->assertCount(1, $this->readAttribute($each, 'pending'));
+        $this->assertEquals(PromiseInterface::PENDING, $p->getState());
+        $promises[3]->resolve('d');
+        P\queue()->run();
+        $this->assertNull($this->readAttribute($each, 'pending'));
+        $this->assertEquals(PromiseInterface::FULFILLED, $p->getState());
+        $this->assertEquals([0, 1, 1, 1], $calls);
+        $this->assertFalse($promises->valid());
+    }
+
+    public function testClearsReferencesWhenResolved()
+    {
+        $called = false;
+        $a = new Promise(function () use (&$a, &$called) {
+            $a->resolve('a');
+            $called = true;
+        });
+        $each = new EachPromise([$a], [
+            'concurrency'       => function () { return 1; },
+            'fulfilled' => function () {},
+            'rejected'  => function () {}
+        ]);
+        $each->promise()->wait();
+        $this->assertNull($this->readAttribute($each, 'onFulfilled'));
+        $this->assertNull($this->readAttribute($each, 'onRejected'));
+        $this->assertNull($this->readAttribute($each, 'iterable'));
+        $this->assertNull($this->readAttribute($each, 'pending'));
+        $this->assertNull($this->readAttribute($each, 'concurrency'));
+        $this->assertTrue($called);
+    }
+
+    public function testCanBeCancelled()
+    {
+        $this->markTestIncomplete();
+    }
+
+    public function testDoesNotBlowStackWithFulfilledPromises()
+    {
+        $pending = [];
+        for ($i = 0; $i < 100; $i++) {
+            $pending[] = new FulfilledPromise($i);
+        }
+        $values = [];
+        $each = new EachPromise($pending, [
+            'fulfilled' => function ($value) use (&$values) {
+                $values[] = $value;
+            }
+        ]);
+        $called = false;
+        $each->promise()->then(function () use (&$called) {
+            $called = true;
+        });
+        $this->assertFalse($called);
+        P\queue()->run();
+        $this->assertTrue($called);
+        $this->assertEquals(range(0, 99), $values);
+    }
+
+    public function testDoesNotBlowStackWithRejectedPromises()
+    {
+        $pending = [];
+        for ($i = 0; $i < 100; $i++) {
+            $pending[] = new RejectedPromise($i);
+        }
+        $values = [];
+        $each = new EachPromise($pending, [
+            'rejected' => function ($value) use (&$values) {
+                $values[] = $value;
+            }
+        ]);
+        $called = false;
+        $each->promise()->then(
+            function () use (&$called) { $called = true; },
+            function () { $this->fail('Should not have rejected.'); }
+        );
+        $this->assertFalse($called);
+        P\queue()->run();
+        $this->assertTrue($called);
+        $this->assertEquals(range(0, 99), $values);
+    }
+
+    public function testReturnsPromiseForWhatever()
+    {
+        $called = [];
+        $arr = ['a', 'b'];
+        $each = new EachPromise($arr, [
+            'fulfilled' => function ($v) use (&$called) { $called[] = $v; }
+        ]);
+        $p = $each->promise();
+        $this->assertNull($p->wait());
+        $this->assertEquals(['a', 'b'], $called);
+    }
+
+    public function testRejectsAggregateWhenNextThrows()
+    {
+        $iter = function () {
+            yield 'a';
+            throw new \Exception('Failure');
+        };
+        $each = new EachPromise($iter());
+        $p = $each->promise();
+        $e = null;
+        $received = null;
+        $p->then(null, function ($reason) use (&$e) { $e = $reason; });
+        P\queue()->run();
+        $this->assertInstanceOf('Exception', $e);
+        $this->assertEquals('Failure', $e->getMessage());
+    }
+
+    public function testDoesNotCallNextOnIteratorUntilNeededWhenWaiting()
+    {
+        $results = [];
+        $values = [10];
+        $remaining = 9;
+        $iter = function () use (&$values) {
+            while ($value = array_pop($values)) {
+                yield $value;
+            }
+        };
+        $each = new EachPromise($iter(), [
+            'concurrency' => 1,
+            'fulfilled' => function ($r) use (&$results, &$values, &$remaining) {
+                $results[] = $r;
+                if ($remaining > 0) {
+                    $values[] = $remaining--;
+                }
+            }
+        ]);
+        $each->promise()->wait();
+        $this->assertEquals(range(10, 1), $results);
+    }
+
+    public function testDoesNotCallNextOnIteratorUntilNeededWhenAsync()
+    {
+        $firstPromise = new Promise();
+        $pending = [$firstPromise];
+        $values = [$firstPromise];
+        $results = [];
+        $remaining = 9;
+        $iter = function () use (&$values) {
+            while ($value = array_pop($values)) {
+                yield $value;
+            }
+        };
+        $each = new EachPromise($iter(), [
+            'concurrency' => 1,
+            'fulfilled' => function ($r) use (&$results, &$values, &$remaining, &$pending) {
+                $results[] = $r;
+                if ($remaining-- > 0) {
+                    $pending[] = $values[] = new Promise();
+                }
+            }
+        ]);
+        $i = 0;
+        $each->promise();
+        while ($promise = array_pop($pending)) {
+            $promise->resolve($i++);
+            P\queue()->run();
+        }
+        $this->assertEquals(range(0, 9), $results);
+    }
+}
diff --git a/core/vendor/guzzlehttp/promises/tests/FulfilledPromiseTest.php b/core/vendor/guzzlehttp/promises/tests/FulfilledPromiseTest.php
new file mode 100644
index 000000000..554c15070
--- /dev/null
+++ b/core/vendor/guzzlehttp/promises/tests/FulfilledPromiseTest.php
@@ -0,0 +1,108 @@
+<?php
+namespace GuzzleHttp\Tests\Promise;
+
+use GuzzleHttp\Promise\Promise;
+use GuzzleHttp\Promise\FulfilledPromise;
+
+/**
+ * @covers GuzzleHttp\Promise\FulfilledPromise
+ */
+class FulfilledPromiseTest extends \PHPUnit_Framework_TestCase
+{
+    public function testReturnsValueWhenWaitedUpon()
+    {
+        $p = new FulfilledPromise('foo');
+        $this->assertEquals('fulfilled', $p->getState());
+        $this->assertEquals('foo', $p->wait(true));
+    }
+
+    public function testCannotCancel()
+    {
+        $p = new FulfilledPromise('foo');
+        $this->assertEquals('fulfilled', $p->getState());
+        $p->cancel();
+        $this->assertEquals('foo', $p->wait());
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @exepctedExceptionMessage Cannot resolve a fulfilled promise
+     */
+    public function testCannotResolve()
+    {
+        $p = new FulfilledPromise('foo');
+        $p->resolve('bar');
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @exepctedExceptionMessage Cannot reject a fulfilled promise
+     */
+    public function testCannotReject()
+    {
+        $p = new FulfilledPromise('foo');
+        $p->reject('bar');
+    }
+
+    public function testCanResolveWithSameValue()
+    {
+        $p = new FulfilledPromise('foo');
+        $p->resolve('foo');
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     */
+    public function testCannotResolveWithPromise()
+    {
+        new FulfilledPromise(new Promise());
+    }
+
+    public function testReturnsSelfWhenNoOnFulfilled()
+    {
+        $p = new FulfilledPromise('a');
+        $this->assertSame($p, $p->then());
+    }
+
+    public function testAsynchronouslyInvokesOnFulfilled()
+    {
+        $p = new FulfilledPromise('a');
+        $r = null;
+        $f = function ($d) use (&$r) { $r = $d; };
+        $p2 = $p->then($f);
+        $this->assertNotSame($p, $p2);
+        $this->assertNull($r);
+        \GuzzleHttp\Promise\queue()->run();
+        $this->assertEquals('a', $r);
+    }
+
+    public function testReturnsNewRejectedWhenOnFulfilledFails()
+    {
+        $p = new FulfilledPromise('a');
+        $f = function () { throw new \Exception('b'); };
+        $p2 = $p->then($f);
+        $this->assertNotSame($p, $p2);
+        try {
+            $p2->wait();
+            $this->fail();
+        } catch (\Exception $e) {
+            $this->assertEquals('b', $e->getMessage());
+        }
+    }
+
+    public function testOtherwiseIsSugarForRejections()
+    {
+        $c = null;
+        $p = new FulfilledPromise('foo');
+        $p->otherwise(function ($v) use (&$c) { $c = $v; });
+        $this->assertNull($c);
+    }
+
+    public function testDoesNotTryToFulfillTwiceDuringTrampoline()
+    {
+        $fp = new FulfilledPromise('a');
+        $t1 = $fp->then(function ($v) { return $v . ' b'; });
+        $t1->resolve('why!');
+        $this->assertEquals('why!', $t1->wait());
+    }
+}
diff --git a/core/vendor/guzzlehttp/promises/tests/NotPromiseInstance.php b/core/vendor/guzzlehttp/promises/tests/NotPromiseInstance.php
new file mode 100644
index 000000000..6288aa88a
--- /dev/null
+++ b/core/vendor/guzzlehttp/promises/tests/NotPromiseInstance.php
@@ -0,0 +1,50 @@
+<?php
+namespace GuzzleHttp\Promise\Tests;
+
+use GuzzleHttp\Promise\Promise;
+use GuzzleHttp\Promise\PromiseInterface;
+
+class NotPromiseInstance extends Thennable implements PromiseInterface
+{
+    private $nextPromise = null;
+
+    public function __construct()
+    {
+        $this->nextPromise = new Promise();
+    }
+
+    public function then(callable $res = null, callable $rej = null)
+    {
+        return $this->nextPromise->then($res, $rej);
+    }
+
+    public function otherwise(callable $onRejected)
+    {
+        return $this->then($onRejected);
+    }
+
+    public function resolve($value)
+    {
+        $this->nextPromise->resolve($value);
+    }
+
+    public function reject($reason)
+    {
+        $this->nextPromise->reject($reason);
+    }
+
+    public function wait($unwrap = true, $defaultResolution = null)
+    {
+
+    }
+
+    public function cancel()
+    {
+
+    }
+
+    public function getState()
+    {
+        return $this->nextPromise->getState();
+    }
+}
diff --git a/core/vendor/guzzlehttp/promises/tests/PromiseTest.php b/core/vendor/guzzlehttp/promises/tests/PromiseTest.php
new file mode 100644
index 000000000..946c62724
--- /dev/null
+++ b/core/vendor/guzzlehttp/promises/tests/PromiseTest.php
@@ -0,0 +1,579 @@
+<?php
+namespace GuzzleHttp\Promise\Tests;
+
+use GuzzleHttp\Promise\CancellationException;
+use GuzzleHttp\Promise as P;
+use GuzzleHttp\Promise\Promise;
+use GuzzleHttp\Promise\RejectedPromise;
+use GuzzleHttp\Promise\RejectionException;
+
+/**
+ * @covers GuzzleHttp\Promise\Promise
+ */
+class PromiseTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage The promise is already fulfilled
+     */
+    public function testCannotResolveNonPendingPromise()
+    {
+        $p = new Promise();
+        $p->resolve('foo');
+        $p->resolve('bar');
+        $this->assertEquals('foo', $p->wait());
+    }
+
+    public function testCanResolveWithSameValue()
+    {
+        $p = new Promise();
+        $p->resolve('foo');
+        $p->resolve('foo');
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Cannot change a fulfilled promise to rejected
+     */
+    public function testCannotRejectNonPendingPromise()
+    {
+        $p = new Promise();
+        $p->resolve('foo');
+        $p->reject('bar');
+        $this->assertEquals('foo', $p->wait());
+    }
+
+    public function testCanRejectWithSameValue()
+    {
+        $p = new Promise();
+        $p->reject('foo');
+        $p->reject('foo');
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Cannot change a fulfilled promise to rejected
+     */
+    public function testCannotRejectResolveWithSameValue()
+    {
+        $p = new Promise();
+        $p->resolve('foo');
+        $p->reject('foo');
+    }
+
+    public function testInvokesWaitFunction()
+    {
+        $p = new Promise(function () use (&$p) { $p->resolve('10'); });
+        $this->assertEquals('10', $p->wait());
+    }
+
+    /**
+     * @expectedException \GuzzleHttp\Promise\RejectionException
+     */
+    public function testRejectsAndThrowsWhenWaitFailsToResolve()
+    {
+        $p = new Promise(function () {});
+        $p->wait();
+    }
+
+    /**
+     * @expectedException \GuzzleHttp\Promise\RejectionException
+     * @expectedExceptionMessage The promise was rejected with reason: foo
+     */
+    public function testThrowsWhenUnwrapIsRejectedWithNonException()
+    {
+        $p = new Promise(function () use (&$p) { $p->reject('foo'); });
+        $p->wait();
+    }
+
+    /**
+     * @expectedException \UnexpectedValueException
+     * @expectedExceptionMessage foo
+     */
+    public function testThrowsWhenUnwrapIsRejectedWithException()
+    {
+        $e = new \UnexpectedValueException('foo');
+        $p = new Promise(function () use (&$p, $e) { $p->reject($e); });
+        $p->wait();
+    }
+
+    public function testDoesNotUnwrapExceptionsWhenDisabled()
+    {
+        $p = new Promise(function () use (&$p) { $p->reject('foo'); });
+        $this->assertEquals('pending', $p->getState());
+        $p->wait(false);
+        $this->assertEquals('rejected', $p->getState());
+    }
+
+    public function testRejectsSelfWhenWaitThrows()
+    {
+        $e = new \UnexpectedValueException('foo');
+        $p = new Promise(function () use ($e) { throw $e; });
+        try {
+            $p->wait();
+            $this->fail();
+        } catch (\UnexpectedValueException $e) {
+            $this->assertEquals('rejected', $p->getState());
+        }
+    }
+
+    public function testWaitsOnNestedPromises()
+    {
+        $p = new Promise(function () use (&$p) { $p->resolve('_'); });
+        $p2 = new Promise(function () use (&$p2) { $p2->resolve('foo'); });
+        $p3 = $p->then(function () use ($p2) { return $p2; });
+        $this->assertSame('foo', $p3->wait());
+    }
+
+    /**
+     * @expectedException \GuzzleHttp\Promise\RejectionException
+     */
+    public function testThrowsWhenWaitingOnPromiseWithNoWaitFunction()
+    {
+        $p = new Promise();
+        $p->wait();
+    }
+
+    public function testThrowsWaitExceptionAfterPromiseIsResolved()
+    {
+        $p = new Promise(function () use (&$p) {
+            $p->reject('Foo!');
+            throw new \Exception('Bar?');
+        });
+
+        try {
+            $p->wait();
+            $this->fail();
+        } catch (\Exception $e) {
+            $this->assertEquals('Bar?', $e->getMessage());
+        }
+    }
+
+    public function testGetsActualWaitValueFromThen()
+    {
+        $p = new Promise(function () use (&$p) { $p->reject('Foo!'); });
+        $p2 = $p->then(null, function ($reason) {
+            return new RejectedPromise([$reason]);
+        });
+
+        try {
+            $p2->wait();
+            $this->fail('Should have thrown');
+        } catch (RejectionException $e) {
+            $this->assertEquals(['Foo!'], $e->getReason());
+        }
+    }
+
+    public function testWaitBehaviorIsBasedOnLastPromiseInChain()
+    {
+        $p3 = new Promise(function () use (&$p3) { $p3->resolve('Whoop'); });
+        $p2 = new Promise(function () use (&$p2, $p3) { $p2->reject($p3); });
+        $p = new Promise(function () use (&$p, $p2) { $p->reject($p2); });
+        $this->assertEquals('Whoop', $p->wait());
+    }
+
+    public function testCannotCancelNonPending()
+    {
+        $p = new Promise();
+        $p->resolve('foo');
+        $p->cancel();
+        $this->assertEquals('fulfilled', $p->getState());
+    }
+
+    /**
+     * @expectedException \GuzzleHttp\Promise\CancellationException
+     */
+    public function testCancelsPromiseWhenNoCancelFunction()
+    {
+        $p = new Promise();
+        $p->cancel();
+        $this->assertEquals('rejected', $p->getState());
+        $p->wait();
+    }
+
+    public function testCancelsPromiseWithCancelFunction()
+    {
+        $called = false;
+        $p = new Promise(null, function () use (&$called) { $called = true; });
+        $p->cancel();
+        $this->assertEquals('rejected', $p->getState());
+        $this->assertTrue($called);
+    }
+
+    public function testCancelsUppermostPendingPromise()
+    {
+        $called = false;
+        $p1 = new Promise(null, function () use (&$called) { $called = true; });
+        $p2 = $p1->then(function () {});
+        $p3 = $p2->then(function () {});
+        $p4 = $p3->then(function () {});
+        $p3->cancel();
+        $this->assertEquals('rejected', $p1->getState());
+        $this->assertEquals('rejected', $p2->getState());
+        $this->assertEquals('rejected', $p3->getState());
+        $this->assertEquals('pending', $p4->getState());
+        $this->assertTrue($called);
+
+        try {
+            $p3->wait();
+            $this->fail();
+        } catch (CancellationException $e) {
+            $this->assertContains('cancelled', $e->getMessage());
+        }
+
+        try {
+            $p4->wait();
+            $this->fail();
+        } catch (CancellationException $e) {
+            $this->assertContains('cancelled', $e->getMessage());
+        }
+
+        $this->assertEquals('rejected', $p4->getState());
+    }
+
+    public function testCancelsChildPromises()
+    {
+        $called1 = $called2 = $called3 = false;
+        $p1 = new Promise(null, function () use (&$called1) { $called1 = true; });
+        $p2 = new Promise(null, function () use (&$called2) { $called2 = true; });
+        $p3 = new Promise(null, function () use (&$called3) { $called3 = true; });
+        $p4 = $p2->then(function () use ($p3) { return $p3; });
+        $p5 = $p4->then(function () { $this->fail(); });
+        $p4->cancel();
+        $this->assertEquals('pending', $p1->getState());
+        $this->assertEquals('rejected', $p2->getState());
+        $this->assertEquals('rejected', $p4->getState());
+        $this->assertEquals('pending', $p5->getState());
+        $this->assertFalse($called1);
+        $this->assertTrue($called2);
+        $this->assertFalse($called3);
+    }
+
+    public function testRejectsPromiseWhenCancelFails()
+    {
+        $called = false;
+        $p = new Promise(null, function () use (&$called) {
+            $called = true;
+            throw new \Exception('e');
+        });
+        $p->cancel();
+        $this->assertEquals('rejected', $p->getState());
+        $this->assertTrue($called);
+        try {
+            $p->wait();
+            $this->fail();
+        } catch (\Exception $e) {
+            $this->assertEquals('e', $e->getMessage());
+        }
+    }
+
+    public function testCreatesPromiseWhenFulfilledAfterThen()
+    {
+        $p = new Promise();
+        $carry = null;
+        $p2 = $p->then(function ($v) use (&$carry) { $carry = $v; });
+        $this->assertNotSame($p, $p2);
+        $p->resolve('foo');
+        P\queue()->run();
+
+        $this->assertEquals('foo', $carry);
+    }
+
+    public function testCreatesPromiseWhenFulfilledBeforeThen()
+    {
+        $p = new Promise();
+        $p->resolve('foo');
+        $carry = null;
+        $p2 = $p->then(function ($v) use (&$carry) { $carry = $v; });
+        $this->assertNotSame($p, $p2);
+        $this->assertNull($carry);
+        \GuzzleHttp\Promise\queue()->run();
+        $this->assertEquals('foo', $carry);
+    }
+
+    public function testCreatesPromiseWhenFulfilledWithNoCallback()
+    {
+        $p = new Promise();
+        $p->resolve('foo');
+        $p2 = $p->then();
+        $this->assertNotSame($p, $p2);
+        $this->assertInstanceOf('GuzzleHttp\Promise\FulfilledPromise', $p2);
+    }
+
+    public function testCreatesPromiseWhenRejectedAfterThen()
+    {
+        $p = new Promise();
+        $carry = null;
+        $p2 = $p->then(null, function ($v) use (&$carry) { $carry = $v; });
+        $this->assertNotSame($p, $p2);
+        $p->reject('foo');
+        P\queue()->run();
+        $this->assertEquals('foo', $carry);
+    }
+
+    public function testCreatesPromiseWhenRejectedBeforeThen()
+    {
+        $p = new Promise();
+        $p->reject('foo');
+        $carry = null;
+        $p2 = $p->then(null, function ($v) use (&$carry) { $carry = $v; });
+        $this->assertNotSame($p, $p2);
+        $this->assertNull($carry);
+        P\queue()->run();
+        $this->assertEquals('foo', $carry);
+    }
+
+    public function testCreatesPromiseWhenRejectedWithNoCallback()
+    {
+        $p = new Promise();
+        $p->reject('foo');
+        $p2 = $p->then();
+        $this->assertNotSame($p, $p2);
+        $this->assertInstanceOf('GuzzleHttp\Promise\RejectedPromise', $p2);
+    }
+
+    public function testInvokesWaitFnsForThens()
+    {
+        $p = new Promise(function () use (&$p) { $p->resolve('a'); });
+        $p2 = $p
+            ->then(function ($v) { return $v . '-1-'; })
+            ->then(function ($v) { return $v . '2'; });
+        $this->assertEquals('a-1-2', $p2->wait());
+    }
+
+    public function testStacksThenWaitFunctions()
+    {
+        $p1 = new Promise(function () use (&$p1) { $p1->resolve('a'); });
+        $p2 = new Promise(function () use (&$p2) { $p2->resolve('b'); });
+        $p3 = new Promise(function () use (&$p3) { $p3->resolve('c'); });
+        $p4 = $p1
+            ->then(function () use ($p2) { return $p2; })
+            ->then(function () use ($p3) { return $p3; });
+        $this->assertEquals('c', $p4->wait());
+    }
+
+    public function testForwardsFulfilledDownChainBetweenGaps()
+    {
+        $p = new Promise();
+        $r = $r2 = null;
+        $p->then(null, null)
+            ->then(function ($v) use (&$r) { $r = $v; return $v . '2'; })
+            ->then(function ($v) use (&$r2) { $r2 = $v; });
+        $p->resolve('foo');
+        P\queue()->run();
+        $this->assertEquals('foo', $r);
+        $this->assertEquals('foo2', $r2);
+    }
+
+    public function testForwardsRejectedPromisesDownChainBetweenGaps()
+    {
+        $p = new Promise();
+        $r = $r2 = null;
+        $p->then(null, null)
+            ->then(null, function ($v) use (&$r) { $r = $v; return $v . '2'; })
+            ->then(function ($v) use (&$r2) { $r2 = $v; });
+        $p->reject('foo');
+        P\queue()->run();
+        $this->assertEquals('foo', $r);
+        $this->assertEquals('foo2', $r2);
+    }
+
+    public function testForwardsThrownPromisesDownChainBetweenGaps()
+    {
+        $e = new \Exception();
+        $p = new Promise();
+        $r = $r2 = null;
+        $p->then(null, null)
+            ->then(null, function ($v) use (&$r, $e) {
+                $r = $v;
+                throw $e;
+            })
+            ->then(
+                null,
+                function ($v) use (&$r2) { $r2 = $v; }
+            );
+        $p->reject('foo');
+        P\queue()->run();
+        $this->assertEquals('foo', $r);
+        $this->assertSame($e, $r2);
+    }
+
+    public function testForwardsReturnedRejectedPromisesDownChainBetweenGaps()
+    {
+        $p = new Promise();
+        $rejected = new RejectedPromise('bar');
+        $r = $r2 = null;
+        $p->then(null, null)
+            ->then(null, function ($v) use (&$r, $rejected) {
+                $r = $v;
+                return $rejected;
+            })
+            ->then(
+                null,
+                function ($v) use (&$r2) { $r2 = $v; }
+            );
+        $p->reject('foo');
+        P\queue()->run();
+        $this->assertEquals('foo', $r);
+        $this->assertEquals('bar', $r2);
+        try {
+            $p->wait();
+        } catch (RejectionException $e) {
+            $this->assertEquals('foo', $e->getReason());
+        }
+    }
+
+    public function testForwardsHandlersToNextPromise()
+    {
+        $p = new Promise();
+        $p2 = new Promise();
+        $resolved = null;
+        $p
+            ->then(function ($v) use ($p2) { return $p2; })
+            ->then(function ($value) use (&$resolved) { $resolved = $value; });
+        $p->resolve('a');
+        $p2->resolve('b');
+        P\queue()->run();
+        $this->assertEquals('b', $resolved);
+    }
+
+    public function testRemovesReferenceFromChildWhenParentWaitedUpon()
+    {
+        $r = null;
+        $p = new Promise(function () use (&$p) { $p->resolve('a'); });
+        $p2 = new Promise(function () use (&$p2) { $p2->resolve('b'); });
+        $pb = $p->then(
+            function ($v) use ($p2, &$r) {
+                $r = $v;
+                return $p2;
+            })
+            ->then(function ($v) { return $v . '.'; });
+        $this->assertEquals('a', $p->wait());
+        $this->assertEquals('b', $p2->wait());
+        $this->assertEquals('b.', $pb->wait());
+        $this->assertEquals('a', $r);
+    }
+
+    public function testForwardsHandlersWhenFulfilledPromiseIsReturned()
+    {
+        $res = [];
+        $p = new Promise();
+        $p2 = new Promise();
+        $p2->resolve('foo');
+        $p2->then(function ($v) use (&$res) { $res[] = 'A:' . $v; });
+        // $res is A:foo
+        $p
+            ->then(function () use ($p2, &$res) { $res[] = 'B'; return $p2; })
+            ->then(function ($v) use (&$res) { $res[] = 'C:' . $v; });
+        $p->resolve('a');
+        $p->then(function ($v) use (&$res) { $res[] = 'D:' . $v; });
+        P\queue()->run();
+        $this->assertEquals(['A:foo', 'B', 'D:a', 'C:foo'], $res);
+    }
+
+    public function testForwardsHandlersWhenRejectedPromiseIsReturned()
+    {
+        $res = [];
+        $p = new Promise();
+        $p2 = new Promise();
+        $p2->reject('foo');
+        $p2->then(null, function ($v) use (&$res) { $res[] = 'A:' . $v; });
+        $p->then(null, function () use ($p2, &$res) { $res[] = 'B'; return $p2; })
+            ->then(null, function ($v) use (&$res) { $res[] = 'C:' . $v; });
+        $p->reject('a');
+        $p->then(null, function ($v) use (&$res) { $res[] = 'D:' . $v; });
+        P\queue()->run();
+        $this->assertEquals(['A:foo', 'B', 'D:a', 'C:foo'], $res);
+    }
+
+    public function testDoesNotForwardRejectedPromise()
+    {
+        $res = [];
+        $p = new Promise();
+        $p2 = new Promise();
+        $p2->cancel();
+        $p2->then(function ($v) use (&$res) { $res[] = "B:$v"; return $v; });
+        $p->then(function ($v) use ($p2, &$res) { $res[] = "B:$v"; return $p2; })
+            ->then(function ($v) use (&$res) { $res[] = 'C:' . $v; });
+        $p->resolve('a');
+        $p->then(function ($v) use (&$res) { $res[] = 'D:' . $v; });
+        P\queue()->run();
+        $this->assertEquals(['B:a', 'D:a'], $res);
+    }
+
+    public function testRecursivelyForwardsWhenOnlyThennable()
+    {
+        $res = [];
+        $p = new Promise();
+        $p2 = new Thennable();
+        $p2->resolve('foo');
+        $p2->then(function ($v) use (&$res) { $res[] = 'A:' . $v; });
+        $p->then(function () use ($p2, &$res) { $res[] = 'B'; return $p2; })
+            ->then(function ($v) use (&$res) { $res[] = 'C:' . $v; });
+        $p->resolve('a');
+        $p->then(function ($v) use (&$res) { $res[] = 'D:' . $v; });
+        P\queue()->run();
+        $this->assertEquals(['A:foo', 'B', 'D:a', 'C:foo'], $res);
+    }
+
+    public function testRecursivelyForwardsWhenNotInstanceOfPromise()
+    {
+        $res = [];
+        $p = new Promise();
+        $p2 = new NotPromiseInstance();
+        $p2->then(function ($v) use (&$res) { $res[] = 'A:' . $v; });
+        $p->then(function () use ($p2, &$res) { $res[] = 'B'; return $p2; })
+            ->then(function ($v) use (&$res) { $res[] = 'C:' . $v; });
+        $p->resolve('a');
+        $p->then(function ($v) use (&$res) { $res[] = 'D:' . $v; });
+        P\queue()->run();
+        $this->assertEquals(['B', 'D:a'], $res);
+        $p2->resolve('foo');
+        P\queue()->run();
+        $this->assertEquals(['B', 'D:a', 'A:foo', 'C:foo'], $res);
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Cannot fulfill or reject a promise with itself
+     */
+    public function testCannotResolveWithSelf()
+    {
+        $p = new Promise();
+        $p->resolve($p);
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Cannot fulfill or reject a promise with itself
+     */
+    public function testCannotRejectWithSelf()
+    {
+        $p = new Promise();
+        $p->reject($p);
+    }
+
+    public function testDoesNotBlowStackWhenWaitingOnNestedThens()
+    {
+        $inner = new Promise(function () use (&$inner) { $inner->resolve(0); });
+        $prev = $inner;
+        for ($i = 1; $i < 100; $i++) {
+            $prev = $prev->then(function ($i) { return $i + 1; });
+        }
+
+        $parent = new Promise(function () use (&$parent, $prev) {
+            $parent->resolve($prev);
+        });
+
+        $this->assertEquals(99, $parent->wait());
+    }
+
+    public function testOtherwiseIsSugarForRejections()
+    {
+        $p = new Promise();
+        $p->reject('foo');
+        $p->otherwise(function ($v) use (&$c) { $c = $v; });
+        P\queue()->run();
+        $this->assertEquals($c, 'foo');
+    }
+}
diff --git a/core/vendor/guzzlehttp/promises/tests/RejectedPromiseTest.php b/core/vendor/guzzlehttp/promises/tests/RejectedPromiseTest.php
new file mode 100644
index 000000000..60f926e92
--- /dev/null
+++ b/core/vendor/guzzlehttp/promises/tests/RejectedPromiseTest.php
@@ -0,0 +1,143 @@
+<?php
+namespace GuzzleHttp\Promise\Tests;
+
+use GuzzleHttp\Promise\Promise;
+use GuzzleHttp\Promise\RejectedPromise;
+
+/**
+ * @covers GuzzleHttp\Promise\RejectedPromise
+ */
+class RejectedPromiseTest extends \PHPUnit_Framework_TestCase
+{
+    public function testThrowsReasonWhenWaitedUpon()
+    {
+        $p = new RejectedPromise('foo');
+        $this->assertEquals('rejected', $p->getState());
+        try {
+            $p->wait(true);
+            $this->fail();
+        } catch (\Exception $e) {
+            $this->assertEquals('rejected', $p->getState());
+            $this->assertContains('foo', $e->getMessage());
+        }
+    }
+
+    public function testCannotCancel()
+    {
+        $p = new RejectedPromise('foo');
+        $p->cancel();
+        $this->assertEquals('rejected', $p->getState());
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @exepctedExceptionMessage Cannot resolve a rejected promise
+     */
+    public function testCannotResolve()
+    {
+        $p = new RejectedPromise('foo');
+        $p->resolve('bar');
+    }
+
+    /**
+     * @expectedException \LogicException
+     * @exepctedExceptionMessage Cannot reject a rejected promise
+     */
+    public function testCannotReject()
+    {
+        $p = new RejectedPromise('foo');
+        $p->reject('bar');
+    }
+
+    public function testCanRejectWithSameValue()
+    {
+        $p = new RejectedPromise('foo');
+        $p->reject('foo');
+    }
+
+    public function testThrowsSpecificException()
+    {
+        $e = new \Exception();
+        $p = new RejectedPromise($e);
+        try {
+            $p->wait(true);
+            $this->fail();
+        } catch (\Exception $e2) {
+            $this->assertSame($e, $e2);
+        }
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     */
+    public function testCannotResolveWithPromise()
+    {
+        new RejectedPromise(new Promise());
+    }
+
+    public function testReturnsSelfWhenNoOnReject()
+    {
+        $p = new RejectedPromise('a');
+        $this->assertSame($p, $p->then());
+    }
+
+    public function testInvokesOnRejectedAsynchronously()
+    {
+        $p = new RejectedPromise('a');
+        $r = null;
+        $f = function ($reason) use (&$r) { $r = $reason; };
+        $p->then(null, $f);
+        $this->assertNull($r);
+        \GuzzleHttp\Promise\queue()->run();
+        $this->assertEquals('a', $r);
+    }
+
+    public function testReturnsNewRejectedWhenOnRejectedFails()
+    {
+        $p = new RejectedPromise('a');
+        $f = function () { throw new \Exception('b'); };
+        $p2 = $p->then(null, $f);
+        $this->assertNotSame($p, $p2);
+        try {
+            $p2->wait();
+            $this->fail();
+        } catch (\Exception $e) {
+            $this->assertEquals('b', $e->getMessage());
+        }
+    }
+
+    public function testWaitingIsNoOp()
+    {
+        $p = new RejectedPromise('a');
+        $p->wait(false);
+    }
+
+    public function testOtherwiseIsSugarForRejections()
+    {
+        $p = new RejectedPromise('foo');
+        $p->otherwise(function ($v) use (&$c) { $c = $v; });
+        \GuzzleHttp\Promise\queue()->run();
+        $this->assertSame('foo', $c);
+    }
+
+    public function testCanResolveThenWithSuccess()
+    {
+        $actual = null;
+        $p = new RejectedPromise('foo');
+        $p->otherwise(function ($v) {
+            return $v . ' bar';
+        })->then(function ($v) use (&$actual) {
+            $actual = $v;
+        });
+        \GuzzleHttp\Promise\queue()->run();
+        $this->assertEquals('foo bar', $actual);
+    }
+
+    public function testDoesNotTryToRejectTwiceDuringTrampoline()
+    {
+        $fp = new RejectedPromise('a');
+        $t1 = $fp->then(null, function ($v) { return $v . ' b'; });
+        $t1->resolve('why!');
+        $this->assertEquals('why!', $t1->wait());
+    }
+}
diff --git a/core/vendor/guzzlehttp/promises/tests/RejectionExceptionTest.php b/core/vendor/guzzlehttp/promises/tests/RejectionExceptionTest.php
new file mode 100644
index 000000000..36c6a88c5
--- /dev/null
+++ b/core/vendor/guzzlehttp/promises/tests/RejectionExceptionTest.php
@@ -0,0 +1,47 @@
+<?php
+namespace GuzzleHttp\Promise\Tests;
+
+use GuzzleHttp\Promise\RejectionException;
+
+class Thing1
+{
+    public function __construct($message)
+    {
+        $this->message = $message;
+    }
+
+    public function __toString()
+    {
+        return $this->message;
+    }
+}
+
+class Thing2 implements \JsonSerializable
+{
+    public function jsonSerialize()
+    {
+        return '{}';
+    }
+}
+
+/**
+ * @covers GuzzleHttp\Promise\RejectionException
+ */
+class RejectionExceptionTest extends \PHPUnit_Framework_TestCase
+{
+    public function testCanGetReasonFromException()
+    {
+        $thing = new Thing1('foo');
+        $e = new RejectionException($thing);
+
+        $this->assertSame($thing, $e->getReason());
+        $this->assertEquals('The promise was rejected with reason: foo', $e->getMessage());
+    }
+
+    public function testCanGetReasonMessageFromJson()
+    {
+        $reason = new Thing2();
+        $e = new RejectionException($reason);
+        $this->assertContains("{}", $e->getMessage());
+    }
+}
diff --git a/core/vendor/guzzlehttp/promises/tests/TaskQueueTest.php b/core/vendor/guzzlehttp/promises/tests/TaskQueueTest.php
new file mode 100644
index 000000000..845b26352
--- /dev/null
+++ b/core/vendor/guzzlehttp/promises/tests/TaskQueueTest.php
@@ -0,0 +1,31 @@
+<?php
+namespace GuzzleHttp\Promise\Test;
+
+use GuzzleHttp\Promise\TaskQueue;
+
+class TaskQueueTest extends \PHPUnit_Framework_TestCase
+{
+    public function testKnowsIfEmpty()
+    {
+        $tq = new TaskQueue(false);
+        $this->assertTrue($tq->isEmpty());
+    }
+
+    public function testKnowsIfFull()
+    {
+        $tq = new TaskQueue(false);
+        $tq->add(function () {});
+        $this->assertFalse($tq->isEmpty());
+    }
+
+    public function testExecutesTasksInOrder()
+    {
+        $tq = new TaskQueue(false);
+        $called = [];
+        $tq->add(function () use (&$called) { $called[] = 'a'; });
+        $tq->add(function () use (&$called) { $called[] = 'b'; });
+        $tq->add(function () use (&$called) { $called[] = 'c'; });
+        $tq->run();
+        $this->assertEquals(['a', 'b', 'c'], $called);
+    }
+}
diff --git a/core/vendor/guzzlehttp/promises/tests/Thennable.php b/core/vendor/guzzlehttp/promises/tests/Thennable.php
new file mode 100644
index 000000000..398954d7d
--- /dev/null
+++ b/core/vendor/guzzlehttp/promises/tests/Thennable.php
@@ -0,0 +1,24 @@
+<?php
+namespace GuzzleHttp\Promise\Tests;
+
+use GuzzleHttp\Promise\Promise;
+
+class Thennable
+{
+    private $nextPromise = null;
+
+    public function __construct()
+    {
+        $this->nextPromise = new Promise();
+    }
+
+    public function then(callable $res = null, callable $rej = null)
+    {
+        return $this->nextPromise->then($res, $rej);
+    }
+
+    public function resolve($value)
+    {
+        $this->nextPromise->resolve($value);
+    }
+}
diff --git a/core/vendor/guzzlehttp/promises/tests/bootstrap.php b/core/vendor/guzzlehttp/promises/tests/bootstrap.php
new file mode 100644
index 000000000..a63d264bf
--- /dev/null
+++ b/core/vendor/guzzlehttp/promises/tests/bootstrap.php
@@ -0,0 +1,4 @@
+<?php
+require __DIR__ . '/../vendor/autoload.php';
+require __DIR__ . '/Thennable.php';
+require __DIR__ . '/NotPromiseInstance.php';
diff --git a/core/vendor/guzzlehttp/promises/tests/functionsTest.php b/core/vendor/guzzlehttp/promises/tests/functionsTest.php
new file mode 100644
index 000000000..8e6fcf4fa
--- /dev/null
+++ b/core/vendor/guzzlehttp/promises/tests/functionsTest.php
@@ -0,0 +1,694 @@
+<?php
+namespace GuzzleHttp\Promise\Tests;
+
+use GuzzleHttp\Promise as P;
+use GuzzleHttp\Promise\FulfilledPromise;
+use GuzzleHttp\Promise\Promise;
+use GuzzleHttp\Promise\RejectedPromise;
+
+class FunctionsTest extends \PHPUnit_Framework_TestCase
+{
+    public function testCreatesPromiseForValue()
+    {
+        $p = \GuzzleHttp\Promise\promise_for('foo');
+        $this->assertInstanceOf('GuzzleHttp\Promise\FulfilledPromise', $p);
+    }
+
+    public function testReturnsPromiseForPromise()
+    {
+        $p = new Promise();
+        $this->assertSame($p, \GuzzleHttp\Promise\promise_for($p));
+    }
+
+    public function testReturnsPromiseForThennable()
+    {
+        $p = new Thennable();
+        $wrapped = \GuzzleHttp\Promise\promise_for($p);
+        $this->assertNotSame($p, $wrapped);
+        $this->assertInstanceOf('GuzzleHttp\Promise\PromiseInterface', $wrapped);
+        $p->resolve('foo');
+        P\queue()->run();
+        $this->assertEquals('foo', $wrapped->wait());
+    }
+
+    public function testReturnsRejection()
+    {
+        $p = \GuzzleHttp\Promise\rejection_for('fail');
+        $this->assertInstanceOf('GuzzleHttp\Promise\RejectedPromise', $p);
+        $this->assertEquals('fail', $this->readAttribute($p, 'reason'));
+    }
+
+    public function testReturnsPromisesAsIsInRejectionFor()
+    {
+        $a = new Promise();
+        $b = \GuzzleHttp\Promise\rejection_for($a);
+        $this->assertSame($a, $b);
+    }
+
+    public function testWaitsOnAllPromisesIntoArray()
+    {
+        $e = new \Exception();
+        $a = new Promise(function () use (&$a) { $a->resolve('a'); });
+        $b = new Promise(function () use (&$b) { $b->reject('b'); });
+        $c = new Promise(function () use (&$c, $e) { $c->reject($e); });
+        $results = \GuzzleHttp\Promise\inspect_all([$a, $b, $c]);
+        $this->assertEquals([
+            ['state' => 'fulfilled', 'value' => 'a'],
+            ['state' => 'rejected', 'reason' => 'b'],
+            ['state' => 'rejected', 'reason' => $e]
+        ], $results);
+    }
+
+    /**
+     * @expectedException \GuzzleHttp\Promise\RejectionException
+     */
+    public function testUnwrapsPromisesWithNoDefaultAndFailure()
+    {
+        $promises = [new FulfilledPromise('a'), new Promise()];
+        \GuzzleHttp\Promise\unwrap($promises);
+    }
+
+    public function testUnwrapsPromisesWithNoDefault()
+    {
+        $promises = [new FulfilledPromise('a')];
+        $this->assertEquals(['a'], \GuzzleHttp\Promise\unwrap($promises));
+    }
+
+    public function testUnwrapsPromisesWithKeys()
+    {
+        $promises = [
+            'foo' => new FulfilledPromise('a'),
+            'bar' => new FulfilledPromise('b'),
+        ];
+        $this->assertEquals([
+            'foo' => 'a',
+            'bar' => 'b'
+        ], \GuzzleHttp\Promise\unwrap($promises));
+    }
+
+    public function testAllAggregatesSortedArray()
+    {
+        $a = new Promise();
+        $b = new Promise();
+        $c = new Promise();
+        $d = \GuzzleHttp\Promise\all([$a, $b, $c]);
+        $b->resolve('b');
+        $a->resolve('a');
+        $c->resolve('c');
+        $d->then(
+            function ($value) use (&$result) { $result = $value; },
+            function ($reason) use (&$result) { $result = $reason; }
+        );
+        P\queue()->run();
+        $this->assertEquals(['a', 'b', 'c'], $result);
+    }
+
+    public function testAllThrowsWhenAnyRejected()
+    {
+        $a = new Promise();
+        $b = new Promise();
+        $c = new Promise();
+        $d = \GuzzleHttp\Promise\all([$a, $b, $c]);
+        $b->resolve('b');
+        $a->reject('fail');
+        $c->resolve('c');
+        $d->then(
+            function ($value) use (&$result) { $result = $value; },
+            function ($reason) use (&$result) { $result = $reason; }
+        );
+        P\queue()->run();
+        $this->assertEquals('fail', $result);
+    }
+
+    public function testSomeAggregatesSortedArrayWithMax()
+    {
+        $a = new Promise();
+        $b = new Promise();
+        $c = new Promise();
+        $d = \GuzzleHttp\Promise\some(2, [$a, $b, $c]);
+        $b->resolve('b');
+        $c->resolve('c');
+        $a->resolve('a');
+        $d->then(function ($value) use (&$result) { $result = $value; });
+        P\queue()->run();
+        $this->assertEquals(['b', 'c'], $result);
+    }
+
+    public function testSomeRejectsWhenTooManyRejections()
+    {
+        $a = new Promise();
+        $b = new Promise();
+        $d = \GuzzleHttp\Promise\some(2, [$a, $b]);
+        $a->reject('bad');
+        $b->resolve('good');
+        P\queue()->run();
+        $this->assertEquals($a::REJECTED, $d->getState());
+        $d->then(null, function ($reason) use (&$called) {
+            $called = $reason;
+        });
+        P\queue()->run();
+        $this->assertInstanceOf('GuzzleHttp\Promise\AggregateException', $called);
+        $this->assertContains('bad', $called->getReason());
+    }
+
+    public function testCanWaitUntilSomeCountIsSatisfied()
+    {
+        $a = new Promise(function () use (&$a) { $a->resolve('a'); });
+        $b = new Promise(function () use (&$b) { $b->resolve('b'); });
+        $c = new Promise(function () use (&$c) { $c->resolve('c'); });
+        $d = \GuzzleHttp\Promise\some(2, [$a, $b, $c]);
+        $this->assertEquals(['a', 'b'], $d->wait());
+    }
+
+    /**
+     * @expectedException \GuzzleHttp\Promise\AggregateException
+     * @expectedExceptionMessage Not enough promises to fulfill count
+     */
+    public function testThrowsIfImpossibleToWaitForSomeCount()
+    {
+        $a = new Promise(function () use (&$a) { $a->resolve('a'); });
+        $d = \GuzzleHttp\Promise\some(2, [$a]);
+        $d->wait();
+    }
+
+    /**
+     * @expectedException \GuzzleHttp\Promise\AggregateException
+     * @expectedExceptionMessage Not enough promises to fulfill count
+     */
+    public function testThrowsIfResolvedWithoutCountTotalResults()
+    {
+        $a = new Promise();
+        $b = new Promise();
+        $d = \GuzzleHttp\Promise\some(3, [$a, $b]);
+        $a->resolve('a');
+        $b->resolve('b');
+        $d->wait();
+    }
+
+    public function testAnyReturnsFirstMatch()
+    {
+        $a = new Promise();
+        $b = new Promise();
+        $c = \GuzzleHttp\Promise\any([$a, $b]);
+        $b->resolve('b');
+        $a->resolve('a');
+        //P\queue()->run();
+        //$this->assertEquals('fulfilled', $c->getState());
+        $c->then(function ($value) use (&$result) { $result = $value; });
+        P\queue()->run();
+        $this->assertEquals('b', $result);
+    }
+
+    public function testSettleFulfillsWithFulfilledAndRejected()
+    {
+        $a = new Promise();
+        $b = new Promise();
+        $c = new Promise();
+        $d = \GuzzleHttp\Promise\settle([$a, $b, $c]);
+        $b->resolve('b');
+        $c->resolve('c');
+        $a->reject('a');
+        P\queue()->run();
+        $this->assertEquals('fulfilled', $d->getState());
+        $d->then(function ($value) use (&$result) { $result = $value; });
+        P\queue()->run();
+        $this->assertEquals([
+            ['state' => 'rejected', 'reason' => 'a'],
+            ['state' => 'fulfilled', 'value' => 'b'],
+            ['state' => 'fulfilled', 'value' => 'c']
+        ], $result);
+    }
+
+    public function testCanInspectFulfilledPromise()
+    {
+        $p = new FulfilledPromise('foo');
+        $this->assertEquals([
+            'state' => 'fulfilled',
+            'value' => 'foo'
+        ], \GuzzleHttp\Promise\inspect($p));
+    }
+
+    public function testCanInspectRejectedPromise()
+    {
+        $p = new RejectedPromise('foo');
+        $this->assertEquals([
+            'state'  => 'rejected',
+            'reason' => 'foo'
+        ], \GuzzleHttp\Promise\inspect($p));
+    }
+
+    public function testCanInspectRejectedPromiseWithNormalException()
+    {
+        $e = new \Exception('foo');
+        $p = new RejectedPromise($e);
+        $this->assertEquals([
+            'state'  => 'rejected',
+            'reason' => $e
+        ], \GuzzleHttp\Promise\inspect($p));
+    }
+
+    public function testCallsEachLimit()
+    {
+        $p = new Promise();
+        $aggregate = \GuzzleHttp\Promise\each_limit($p, 2);
+        $p->resolve('a');
+        P\queue()->run();
+        $this->assertEquals($p::FULFILLED, $aggregate->getState());
+    }
+
+    public function testEachLimitAllRejectsOnFailure()
+    {
+        $p = [new FulfilledPromise('a'), new RejectedPromise('b')];
+        $aggregate = \GuzzleHttp\Promise\each_limit_all($p, 2);
+        P\queue()->run();
+        $this->assertEquals(P\PromiseInterface::REJECTED, $aggregate->getState());
+        $result = \GuzzleHttp\Promise\inspect($aggregate);
+        $this->assertEquals('b', $result['reason']);
+    }
+
+    public function testIterForReturnsIterator()
+    {
+        $iter = new \ArrayIterator();
+        $this->assertSame($iter, \GuzzleHttp\Promise\iter_for($iter));
+    }
+
+    public function testKnowsIfFulfilled()
+    {
+        $p = new FulfilledPromise(null);
+        $this->assertTrue(P\is_fulfilled($p));
+        $this->assertFalse(P\is_rejected($p));
+    }
+
+    public function testKnowsIfRejected()
+    {
+        $p = new RejectedPromise(null);
+        $this->assertTrue(P\is_rejected($p));
+        $this->assertFalse(P\is_fulfilled($p));
+    }
+
+    public function testKnowsIfSettled()
+    {
+        $p = new RejectedPromise(null);
+        $this->assertTrue(P\is_settled($p));
+        $p = new Promise();
+        $this->assertFalse(P\is_settled($p));
+    }
+
+    public function testReturnsTrampoline()
+    {
+        $this->assertInstanceOf('GuzzleHttp\Promise\TaskQueue', P\queue());
+        $this->assertSame(P\queue(), P\queue());
+    }
+
+    public function testCanScheduleThunk()
+    {
+        $tramp = P\queue();
+        $promise = P\task(function () { return 'Hi!'; });
+        $c = null;
+        $promise->then(function ($v) use (&$c) { $c = $v; });
+        $this->assertNull($c);
+        $tramp->run();
+        $this->assertEquals('Hi!', $c);
+    }
+
+    public function testCanScheduleThunkWithRejection()
+    {
+        $tramp = P\queue();
+        $promise = P\task(function () { throw new \Exception('Hi!'); });
+        $c = null;
+        $promise->otherwise(function ($v) use (&$c) { $c = $v; });
+        $this->assertNull($c);
+        $tramp->run();
+        $this->assertEquals('Hi!', $c->getMessage());
+    }
+
+    public function testCanScheduleThunkWithWait()
+    {
+        $tramp = P\queue();
+        $promise = P\task(function () { return 'a'; });
+        $this->assertEquals('a', $promise->wait());
+        $tramp->run();
+    }
+
+    public function testYieldsFromCoroutine()
+    {
+        $promise = P\coroutine(function () {
+            $value = (yield new P\FulfilledPromise('a'));
+            yield  $value . 'b';
+        });
+        $promise->then(function ($value) use (&$result) { $result = $value; });
+        P\queue()->run();
+        $this->assertEquals('ab', $result);
+    }
+
+    public function testCanCatchExceptionsInCoroutine()
+    {
+        $promise = P\coroutine(function () {
+            try {
+                yield new P\RejectedPromise('a');
+                $this->fail('Should have thrown into the coroutine!');
+            } catch (P\RejectionException $e) {
+                $value = (yield new P\FulfilledPromise($e->getReason()));
+                yield  $value . 'b';
+            }
+        });
+        $promise->then(function ($value) use (&$result) { $result = $value; });
+        P\queue()->run();
+        $this->assertEquals(P\PromiseInterface::FULFILLED, $promise->getState());
+        $this->assertEquals('ab', $result);
+    }
+
+    public function testRejectsParentExceptionWhenException()
+    {
+        $promise = P\coroutine(function () {
+            yield new P\FulfilledPromise(0);
+            throw new \Exception('a');
+        });
+        $promise->then(
+            function () { $this->fail(); },
+            function ($reason) use (&$result) { $result = $reason; }
+        );
+        P\queue()->run();
+        $this->assertInstanceOf('Exception', $result);
+        $this->assertEquals('a', $result->getMessage());
+    }
+
+    public function testCanRejectFromRejectionCallback()
+    {
+        $promise = P\coroutine(function () {
+            yield new P\FulfilledPromise(0);
+            yield new P\RejectedPromise('no!');
+        });
+        $promise->then(
+            function () { $this->fail(); },
+            function ($reason) use (&$result) { $result = $reason; }
+        );
+        P\queue()->run();
+        $this->assertInstanceOf('GuzzleHttp\Promise\RejectionException', $result);
+        $this->assertEquals('no!', $result->getReason());
+    }
+
+    public function testCanAsyncReject()
+    {
+        $rej = new P\Promise();
+        $promise = P\coroutine(function () use ($rej) {
+            yield new P\FulfilledPromise(0);
+            yield $rej;
+        });
+        $promise->then(
+            function () { $this->fail(); },
+            function ($reason) use (&$result) { $result = $reason; }
+        );
+        $rej->reject('no!');
+        P\queue()->run();
+        $this->assertInstanceOf('GuzzleHttp\Promise\RejectionException', $result);
+        $this->assertEquals('no!', $result->getReason());
+    }
+
+    public function testCanCatchAndThrowOtherException()
+    {
+        $promise = P\coroutine(function () {
+            try {
+                yield new P\RejectedPromise('a');
+                $this->fail('Should have thrown into the coroutine!');
+            } catch (P\RejectionException $e) {
+                throw new \Exception('foo');
+            }
+        });
+        $promise->otherwise(function ($value) use (&$result) { $result = $value; });
+        P\queue()->run();
+        $this->assertEquals(P\PromiseInterface::REJECTED, $promise->getState());
+        $this->assertContains('foo', $result->getMessage());
+    }
+
+    public function testCanCatchAndYieldOtherException()
+    {
+        $promise = P\coroutine(function () {
+            try {
+                yield new P\RejectedPromise('a');
+                $this->fail('Should have thrown into the coroutine!');
+            } catch (P\RejectionException $e) {
+                yield new P\RejectedPromise('foo');
+            }
+        });
+        $promise->otherwise(function ($value) use (&$result) { $result = $value; });
+        P\queue()->run();
+        $this->assertEquals(P\PromiseInterface::REJECTED, $promise->getState());
+        $this->assertContains('foo', $result->getMessage());
+    }
+
+    public function createLotsOfSynchronousPromise()
+    {
+        return P\coroutine(function () {
+            $value = 0;
+            for ($i = 0; $i < 1000; $i++) {
+                $value = (yield new P\FulfilledPromise($i));
+            }
+            yield $value;
+        });
+    }
+
+    public function testLotsOfSynchronousDoesNotBlowStack()
+    {
+        $promise = $this->createLotsOfSynchronousPromise();
+        $promise->then(function ($v) use (&$r) { $r = $v; });
+        P\queue()->run();
+        $this->assertEquals(999, $r);
+    }
+
+    public function testLotsOfSynchronousWaitDoesNotBlowStack()
+    {
+        $promise = $this->createLotsOfSynchronousPromise();
+        $promise->then(function ($v) use (&$r) { $r = $v; });
+        $this->assertEquals(999, $promise->wait());
+        $this->assertEquals(999, $r);
+    }
+
+    private function createLotsOfFlappingPromise()
+    {
+        return P\coroutine(function () {
+            $value = 0;
+            for ($i = 0; $i < 1000; $i++) {
+                try {
+                    if ($i % 2) {
+                        $value = (yield new P\FulfilledPromise($i));
+                    } else {
+                        $value = (yield new P\RejectedPromise($i));
+                    }
+                } catch (\Exception $e) {
+                    $value = (yield new P\FulfilledPromise($i));
+                }
+            }
+            yield $value;
+        });
+    }
+
+    public function testLotsOfTryCatchingDoesNotBlowStack()
+    {
+        $promise = $this->createLotsOfFlappingPromise();
+        $promise->then(function ($v) use (&$r) { $r = $v; });
+        P\queue()->run();
+        $this->assertEquals(999, $r);
+    }
+
+    public function testLotsOfTryCatchingWaitingDoesNotBlowStack()
+    {
+        $promise = $this->createLotsOfFlappingPromise();
+        $promise->then(function ($v) use (&$r) { $r = $v; });
+        $this->assertEquals(999, $promise->wait());
+        $this->assertEquals(999, $r);
+    }
+
+    public function testAsyncPromisesWithCorrectlyYieldedValues()
+    {
+        $promises = [
+            new P\Promise(),
+            new P\Promise(),
+            new P\Promise()
+        ];
+
+        $promise = P\coroutine(function () use ($promises) {
+            $value = null;
+            $this->assertEquals('skip', (yield new P\FulfilledPromise('skip')));
+            foreach ($promises as $idx => $p) {
+                $value = (yield $p);
+                $this->assertEquals($value, $idx);
+                $this->assertEquals('skip', (yield new P\FulfilledPromise('skip')));
+            }
+            $this->assertEquals('skip', (yield new P\FulfilledPromise('skip')));
+            yield $value;
+        });
+
+        $promises[0]->resolve(0);
+        $promises[1]->resolve(1);
+        $promises[2]->resolve(2);
+
+        $promise->then(function ($v) use (&$r) { $r = $v; });
+        P\queue()->run();
+        $this->assertEquals(2, $r);
+    }
+
+    public function testYieldFinalWaitablePromise()
+    {
+        $p1 = new P\Promise(function () use (&$p1) {
+            $p1->resolve('skip me');
+        });
+        $p2 = new P\Promise(function () use (&$p2) {
+            $p2->resolve('hello!');
+        });
+        $co = P\coroutine(function() use ($p1, $p2) {
+            yield $p1;
+            yield $p2;
+        });
+        P\queue()->run();
+        $this->assertEquals('hello!', $co->wait());
+    }
+
+    public function testCanYieldFinalPendingPromise()
+    {
+        $p1 = new P\Promise();
+        $p2 = new P\Promise();
+        $co = P\coroutine(function() use ($p1, $p2) {
+            yield $p1;
+            yield $p2;
+        });
+        $p1->resolve('a');
+        $p2->resolve('b');
+        $co->then(function ($value) use (&$result) { $result = $value; });
+        P\queue()->run();
+        $this->assertEquals('b', $result);
+    }
+
+    public function testCanNestYieldsAndFailures()
+    {
+        $p1 = new P\Promise();
+        $p2 = new P\Promise();
+        $p3 = new P\Promise();
+        $p4 = new P\Promise();
+        $p5 = new P\Promise();
+        $co = P\coroutine(function() use ($p1, $p2, $p3, $p4, $p5) {
+            try {
+                yield $p1;
+            } catch (\Exception $e) {
+                yield $p2;
+                try {
+                    yield $p3;
+                    yield $p4;
+                } catch (\Exception $e) {
+                    yield $p5;
+                }
+            }
+        });
+        $p1->reject('a');
+        $p2->resolve('b');
+        $p3->resolve('c');
+        $p4->reject('d');
+        $p5->resolve('e');
+        $co->then(function ($value) use (&$result) { $result = $value; });
+        P\queue()->run();
+        $this->assertEquals('e', $result);
+    }
+
+    public function testCanYieldErrorsAndSuccessesWithoutRecursion()
+    {
+        $promises = [];
+        for ($i = 0; $i < 20; $i++) {
+            $promises[] = new P\Promise();
+        }
+
+        $co = P\coroutine(function() use ($promises) {
+            for ($i = 0; $i < 20; $i += 4) {
+                try {
+                    yield $promises[$i];
+                    yield $promises[$i + 1];
+                } catch (\Exception $e) {
+                    yield $promises[$i + 2];
+                    yield $promises[$i + 3];
+                }
+            }
+        });
+
+        for ($i = 0; $i < 20; $i += 4) {
+            $promises[$i]->resolve($i);
+            $promises[$i + 1]->reject($i + 1);
+            $promises[$i + 2]->resolve($i + 2);
+            $promises[$i + 3]->resolve($i + 3);
+        }
+
+        $co->then(function ($value) use (&$result) { $result = $value; });
+        P\queue()->run();
+        $this->assertEquals('19', $result);
+    }
+
+    public function testCanWaitOnPromiseAfterFulfilled()
+    {
+        $f = function () {
+            static $i = 0;
+            $i++;
+            return $p = new P\Promise(function () use (&$p, $i) {
+                $p->resolve($i . '-bar');
+            });
+        };
+
+        $promises = [];
+        for ($i = 0; $i < 20; $i++) {
+            $promises[] = $f();
+        }
+
+        $p = P\coroutine(function () use ($promises) {
+            yield new P\FulfilledPromise('foo!');
+            foreach ($promises as $promise) {
+                yield $promise;
+            }
+        });
+
+        $this->assertEquals('20-bar', $p->wait());
+    }
+
+    public function testCanWaitOnErroredPromises()
+    {
+        $p1 = new P\Promise(function () use (&$p1) { $p1->reject('a'); });
+        $p2 = new P\Promise(function () use (&$p2) { $p2->resolve('b'); });
+        $p3 = new P\Promise(function () use (&$p3) { $p3->resolve('c'); });
+        $p4 = new P\Promise(function () use (&$p4) { $p4->reject('d'); });
+        $p5 = new P\Promise(function () use (&$p5) { $p5->resolve('e'); });
+        $p6 = new P\Promise(function () use (&$p6) { $p6->reject('f'); });
+
+        $co = P\coroutine(function() use ($p1, $p2, $p3, $p4, $p5, $p6) {
+            try {
+                yield $p1;
+            } catch (\Exception $e) {
+                yield $p2;
+                try {
+                    yield $p3;
+                    yield $p4;
+                } catch (\Exception $e) {
+                    yield $p5;
+                    yield $p6;
+                }
+            }
+        });
+
+        $res = P\inspect($co);
+        $this->assertEquals('f', $res['reason']);
+    }
+
+    public function testCoroutineOtherwiseIntegrationTest()
+    {
+        $a = new P\Promise();
+        $b = new P\Promise();
+        $promise = P\coroutine(function () use ($a, $b) {
+            // Execute the pool of commands concurrently, and process errors.
+            yield $a;
+            yield $b;
+        })->otherwise(function (\Exception $e) {
+            // Throw errors from the operations as a specific Multipart error.
+            throw new \OutOfBoundsException('a', 0, $e);
+        });
+        $a->resolve('a');
+        $b->reject('b');
+        $reason = P\inspect($promise)['reason'];
+        $this->assertInstanceOf('OutOfBoundsException', $reason);
+        $this->assertInstanceOf('GuzzleHttp\Promise\RejectionException', $reason->getPrevious());
+    }
+}
diff --git a/core/vendor/guzzlehttp/psr7/.travis.yml b/core/vendor/guzzlehttp/psr7/.travis.yml
new file mode 100644
index 000000000..b88f8da27
--- /dev/null
+++ b/core/vendor/guzzlehttp/psr7/.travis.yml
@@ -0,0 +1,20 @@
+language: php
+
+php:
+  - 5.4
+  - 5.5
+  - 5.6
+  - 7.0
+  - hhvm
+
+sudo: false
+
+install:
+  - travis_retry composer install --no-interaction --prefer-source
+
+script: make test
+
+matrix:
+  allow_failures:
+    - php: hhvm
+  fast_finish: true
diff --git a/core/vendor/guzzlehttp/psr7/CHANGELOG.md b/core/vendor/guzzlehttp/psr7/CHANGELOG.md
new file mode 100644
index 000000000..8f6d8b292
--- /dev/null
+++ b/core/vendor/guzzlehttp/psr7/CHANGELOG.md
@@ -0,0 +1,19 @@
+# CHANGELOG
+
+## 1.1.0 - 2015-06-24
+
+* URIs can now be relative.
+* `multipart/form-data` headers are now overridden case-insensitively.
+* URI paths no longer encode the following characters because they are allowed
+  in URIs: "(", ")", "*", "!", "'"
+* A port is no longer added to a URI when the scheme is missing and no port is
+  present.
+
+## 1.0.0 - 2015-05-19
+
+Initial release.
+
+Currently unsupported:
+
+- `Psr\Http\Message\ServerRequestInterface`
+- `Psr\Http\Message\UploadedFileInterface`
diff --git a/core/vendor/guzzlehttp/streams/LICENSE b/core/vendor/guzzlehttp/psr7/LICENSE
similarity index 94%
rename from core/vendor/guzzlehttp/streams/LICENSE
rename to core/vendor/guzzlehttp/psr7/LICENSE
index 71d3b783c..581d95f92 100644
--- a/core/vendor/guzzlehttp/streams/LICENSE
+++ b/core/vendor/guzzlehttp/psr7/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2014 Michael Dowling, https://github.com/mtdowling <mtdowling@gmail.com>
+Copyright (c) 2015 Michael Dowling, https://github.com/mtdowling <mtdowling@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/core/vendor/guzzlehttp/psr7/Makefile b/core/vendor/guzzlehttp/psr7/Makefile
new file mode 100644
index 000000000..9c210960e
--- /dev/null
+++ b/core/vendor/guzzlehttp/psr7/Makefile
@@ -0,0 +1,13 @@
+all: clean test
+
+test:
+	vendor/bin/phpunit $(TEST)
+
+coverage:
+	vendor/bin/phpunit --coverage-html=artifacts/coverage $(TEST)
+
+view-coverage:
+	open artifacts/coverage/index.html
+
+clean:
+	rm -rf artifacts/*
diff --git a/core/vendor/guzzlehttp/psr7/README.md b/core/vendor/guzzlehttp/psr7/README.md
new file mode 100644
index 000000000..0b30d5ab0
--- /dev/null
+++ b/core/vendor/guzzlehttp/psr7/README.md
@@ -0,0 +1,580 @@
+# PSR-7 Message Implementation
+
+This repository contains a partial [PSR-7](http://www.php-fig.org/psr/psr-7/)
+message implementation, several stream decorators, and some helpful
+functionality like query string parsing.  Currently missing
+ServerRequestInterface and UploadedFileInterface; a pull request for these features is welcome.
+
+
+# Stream implementation
+
+This package comes with a number of stream implementations and stream
+decorators.
+
+
+## AppendStream
+
+`GuzzleHttp\Psr7\AppendStream`
+
+Reads from multiple streams, one after the other.
+
+```php
+use GuzzleHttp\Psr7;
+
+$a = Psr7\stream_for('abc, ');
+$b = Psr7\stream_for('123.');
+$composed = new Psr7\AppendStream([$a, $b]);
+
+$composed->addStream(Psr7\stream_for(' Above all listen to me').
+
+echo $composed(); // abc, 123. Above all listen to me.
+```
+
+
+## BufferStream
+
+`GuzzleHttp\Psr7\BufferStream`
+
+Provides a buffer stream that can be written to to fill a buffer, and read
+from to remove bytes from the buffer.
+
+This stream returns a "hwm" metadata value that tells upstream consumers
+what the configured high water mark of the stream is, or the maximum
+preferred size of the buffer.
+
+```php
+use GuzzleHttp\Psr7;
+
+// When more than 1024 bytes are in the buffer, it will begin returning
+// false to writes. This is an indication that writers should slow down.
+$buffer = new Psr7\BufferStream(1024);
+```
+
+
+## CachingStream
+
+The CachingStream is used to allow seeking over previously read bytes on
+non-seekable streams. This can be useful when transferring a non-seekable
+entity body fails due to needing to rewind the stream (for example, resulting
+from a redirect). Data that is read from the remote stream will be buffered in
+a PHP temp stream so that previously read bytes are cached first in memory,
+then on disk.
+
+```php
+use GuzzleHttp\Psr7;
+
+$original = Psr7\stream_for(fopen('http://www.google.com', 'r'));
+$stream = new Psr7\CachingStream($original);
+
+$stream->read(1024);
+echo $stream->tell();
+// 1024
+
+$stream->seek(0);
+echo $stream->tell();
+// 0
+```
+
+
+## DroppingStream
+
+`GuzzleHttp\Psr7\DroppingStream`
+
+Stream decorator that begins dropping data once the size of the underlying
+stream becomes too full.
+
+```php
+use GuzzleHttp\Psr7;
+
+// Create an empty stream
+$stream = Psr7\stream_for();
+
+// Start dropping data when the stream has more than 10 bytes
+$dropping = new Psr7\DroppingStream($stream, 10);
+
+$stream->write('01234567890123456789');
+echo $stream; // 0123456789
+```
+
+
+## FnStream
+
+`GuzzleHttp\Psr7\FnStream`
+
+Compose stream implementations based on a hash of functions.
+
+Allows for easy testing and extension of a provided stream without needing to
+to create a concrete class for a simple extension point.
+
+```php
+
+use GuzzleHttp\Psr7;
+
+$stream = Psr7\stream_for('hi');
+$fnStream = Psr7\FnStream::decorate($stream, [
+    'rewind' => function () use ($stream) {
+        echo 'About to rewind - ';
+        $stream->rewind();
+        echo 'rewound!';
+    }
+]);
+
+$fnStream->rewind();
+// Outputs: About to rewind - rewound!
+```
+
+
+## InflateStream
+
+`GuzzleHttp\Psr7\InflateStream`
+
+Uses PHP's zlib.inflate filter to inflate deflate or gzipped content.
+
+This stream decorator skips the first 10 bytes of the given stream to remove
+the gzip header, converts the provided stream to a PHP stream resource,
+then appends the zlib.inflate filter. The stream is then converted back
+to a Guzzle stream resource to be used as a Guzzle stream.
+
+
+## LazyOpenStream
+
+`GuzzleHttp\Psr7\LazyOpenStream`
+
+Lazily reads or writes to a file that is opened only after an IO operation
+take place on the stream.
+
+```php
+use GuzzleHttp\Psr7;
+
+$stream = new Psr7\LazyOpenStream('/path/to/file', 'r');
+// The file has not yet been opened...
+
+echo $stream->read(10);
+// The file is opened and read from only when needed.
+```
+
+
+## LimitStream
+
+`GuzzleHttp\Psr7\LimitStream`
+
+LimitStream can be used to read a subset or slice of an existing stream object.
+This can be useful for breaking a large file into smaller pieces to be sent in
+chunks (e.g. Amazon S3's multipart upload API).
+
+```php
+use GuzzleHttp\Psr7;
+
+$original = Psr7\stream_for(fopen('/tmp/test.txt', 'r+'));
+echo $original->getSize();
+// >>> 1048576
+
+// Limit the size of the body to 1024 bytes and start reading from byte 2048
+$stream = new Psr7\LimitStream($original, 1024, 2048);
+echo $stream->getSize();
+// >>> 1024
+echo $stream->tell();
+// >>> 0
+```
+
+
+## MultipartStream
+
+`GuzzleHttp\Psr7\MultipartStream`
+
+Stream that when read returns bytes for a streaming multipart or
+multipart/form-data stream.
+
+
+## NoSeekStream
+
+`GuzzleHttp\Psr7\NoSeekStream`
+
+NoSeekStream wraps a stream and does not allow seeking.
+
+```php
+use GuzzleHttp\Psr7;
+
+$original = Psr7\stream_for('foo');
+$noSeek = new Psr7\NoSeekStream($original);
+
+echo $noSeek->read(3);
+// foo
+var_export($noSeek->isSeekable());
+// false
+$noSeek->seek(0);
+var_export($noSeek->read(3));
+// NULL
+```
+
+
+## PumpStream
+
+`GuzzleHttp\Psr7\PumpStream`
+
+Provides a read only stream that pumps data from a PHP callable.
+
+When invoking the provided callable, the PumpStream will pass the amount of
+data requested to read to the callable. The callable can choose to ignore
+this value and return fewer or more bytes than requested. Any extra data
+returned by the provided callable is buffered internally until drained using
+the read() function of the PumpStream. The provided callable MUST return
+false when there is no more data to read.
+
+
+## Implementing stream decorators
+
+Creating a stream decorator is very easy thanks to the
+`GuzzleHttp\Psr7\StreamDecoratorTrait`. This trait provides methods that
+implement `Psr\Http\Message\StreamInterface` by proxying to an underlying
+stream. Just `use` the `StreamDecoratorTrait` and implement your custom
+methods.
+
+For example, let's say we wanted to call a specific function each time the last
+byte is read from a stream. This could be implemented by overriding the
+`read()` method.
+
+```php
+use Psr\Http\Message\StreamInterface;
+use GuzzleHttp\Psr7\StreamDecoratorTrait;
+
+class EofCallbackStream implements StreamInterface
+{
+    use StreamDecoratorTrait;
+
+    private $callback;
+
+    public function __construct(StreamInterface $stream, callable $cb)
+    {
+        $this->stream = $stream;
+        $this->callback = $cb;
+    }
+
+    public function read($length)
+    {
+        $result = $this->stream->read($length);
+
+        // Invoke the callback when EOF is hit.
+        if ($this->eof()) {
+            call_user_func($this->callback);
+        }
+
+        return $result;
+    }
+}
+```
+
+This decorator could be added to any existing stream and used like so:
+
+```php
+use GuzzleHttp\Psr7;
+
+$original = Psr7\stream_for('foo');
+
+$eofStream = new EofCallbackStream($original, function () {
+    echo 'EOF!';
+});
+
+$eofStream->read(2);
+$eofStream->read(1);
+// echoes "EOF!"
+$eofStream->seek(0);
+$eofStream->read(3);
+// echoes "EOF!"
+```
+
+
+## PHP StreamWrapper
+
+You can use the `GuzzleHttp\Psr7\StreamWrapper` class if you need to use a
+PSR-7 stream as a PHP stream resource.
+
+Use the `GuzzleHttp\Psr7\StreamWrapper::getResource()` method to create a PHP
+stream from a PSR-7 stream.
+
+```php
+use GuzzleHttp\Psr7\StreamWrapper;
+
+$stream = GuzzleHttp\Psr7\stream_for('hello!');
+$resource = StreamWrapper::getResource($stream);
+echo fread($resource, 6); // outputs hello!
+```
+
+
+# Function API
+
+There are various functions available under the `GuzzleHttp\Psr7` namespace.
+
+
+## `function str`
+
+`function str(MessageInterface $message)`
+
+Returns the string representation of an HTTP message.
+
+```php
+$request = new GuzzleHttp\Psr7\Request('GET', 'http://example.com');
+echo GuzzleHttp\Psr7\str($request);
+```
+
+
+## `function uri_for`
+
+`function uri_for($uri)`
+
+This function accepts a string or `Psr\Http\Message\UriInterface` and returns a
+UriInterface for the given value. If the value is already a `UriInterface`, it
+is returned as-is.
+
+```php
+$uri = GuzzleHttp\Psr7\uri_for('http://example.com');
+assert($uri === GuzzleHttp\Psr7\uri_for($uri));
+```
+
+
+## `function stream_for`
+
+`function stream_for($resource = '', array $options = [])`
+
+Create a new stream based on the input type.
+
+Options is an associative array that can contain the following keys:
+
+* - metadata: Array of custom metadata.
+* - size: Size of the stream.
+
+This method accepts the following `$resource` types:
+
+- `Psr\Http\Message\StreamInterface`: Returns the value as-is.
+- `string`: Creates a stream object that uses the given string as the contents.
+- `resource`: Creates a stream object that wraps the given PHP stream resource.
+- `Iterator`: If the provided value implements `Iterator`, then a read-only
+  stream object will be created that wraps the given iterable. Each time the
+  stream is read from, data from the iterator will fill a buffer and will be
+  continuously called until the buffer is equal to the requested read size.
+  Subsequent read calls will first read from the buffer and then call `next`
+  on the underlying iterator until it is exhausted.
+- `object` with `__toString()`: If the object has the `__toString()` method,
+  the object will be cast to a string and then a stream will be returned that
+  uses the string value.
+- `NULL`: When `null` is passed, an empty stream object is returned.
+- `callable` When a callable is passed, a read-only stream object will be
+  created that invokes the given callable. The callable is invoked with the
+  number of suggested bytes to read. The callable can return any number of
+  bytes, but MUST return `false` when there is no more data to return. The
+  stream object that wraps the callable will invoke the callable until the
+  number of requested bytes are available. Any additional bytes will be
+  buffered and used in subsequent reads.
+
+```php
+$stream = GuzzleHttp\Psr7\stream_for('foo');
+$stream = GuzzleHttp\Psr7\stream_for(fopen('/path/to/file', 'r'));
+
+$generator function ($bytes) {
+    for ($i = 0; $i < $bytes; $i++) {
+        yield ' ';
+    }
+}
+
+$stream = GuzzleHttp\Psr7\stream_for($generator(100));
+```
+
+
+## `function parse_header`
+
+`function parse_header($header)`
+
+Parse an array of header values containing ";" separated data into an array of
+associative arrays representing the header key value pair data of the header.
+When a parameter does not contain a value, but just contains a key, this
+function will inject a key with a '' string value.
+
+
+## `function normalize_header`
+
+`function normalize_header($header)`
+
+Converts an array of header values that may contain comma separated headers
+into an array of headers with no comma separated values.
+
+
+## `function modify_request`
+
+`function modify_request(RequestInterface $request, array $changes)`
+
+Clone and modify a request with the given changes. This method is useful for
+reducing the number of clones needed to mutate a message.
+
+The changes can be one of:
+
+- method: (string) Changes the HTTP method.
+- set_headers: (array) Sets the given headers.
+- remove_headers: (array) Remove the given headers.
+- body: (mixed) Sets the given body.
+- uri: (UriInterface) Set the URI.
+- query: (string) Set the query string value of the URI.
+- version: (string) Set the protocol version.
+
+
+## `function rewind_body`
+
+`function rewind_body(MessageInterface $message)`
+
+Attempts to rewind a message body and throws an exception on failure. The body
+of the message will only be rewound if a call to `tell()` returns a value other
+than `0`.
+
+
+## `function try_fopen`
+
+`function try_fopen($filename, $mode)`
+
+Safely opens a PHP stream resource using a filename.
+
+When fopen fails, PHP normally raises a warning. This function adds an error
+handler that checks for errors and throws an exception instead.
+
+
+## `function copy_to_string`
+
+`function copy_to_string(StreamInterface $stream, $maxLen = -1)`
+
+Copy the contents of a stream into a string until the given number of bytes
+have been read.
+
+
+## `function copy_to_stream`
+
+`function copy_to_stream(StreamInterface $source, StreamInterface $dest, $maxLen = -1)`
+
+Copy the contents of a stream into another stream until the given number of
+bytes have been read.
+
+
+## `function hash`
+
+`function hash(StreamInterface $stream, $algo, $rawOutput = false)`
+
+Calculate a hash of a Stream. This method reads the entire stream to calculate
+a rolling hash (based on PHP's hash_init functions).
+
+
+## `function readline`
+
+`function readline(StreamInterface $stream, $maxLength = null)`
+
+Read a line from the stream up to the maximum allowed buffer length.
+
+
+## `function parse_request`
+
+`function parse_request($message)`
+
+Parses a request message string into a request object.
+
+
+## `function parse_response`
+
+`function parse_response($message)`
+
+Parses a response message string into a response object.
+
+
+## `function parse_query`
+
+`function parse_query($str, $urlEncoding = true)`
+
+Parse a query string into an associative array.
+
+If multiple values are found for the same key, the value of that key value pair
+will become an array. This function does not parse nested PHP style arrays into
+an associative array (e.g., `foo[a]=1&foo[b]=2` will be parsed into
+`['foo[a]' => '1', 'foo[b]' => '2']`).
+
+
+## `function build_query`
+
+`function build_query(array $params, $encoding = PHP_QUERY_RFC3986)`
+
+Build a query string from an array of key value pairs.
+
+This function can use the return value of parseQuery() to build a query string.
+This function does not modify the provided keys when an array is encountered
+(like http_build_query would).
+
+
+## `function mimetype_from_filename`
+
+`function mimetype_from_filename($filename)`
+
+Determines the mimetype of a file by looking at its extension.
+
+
+## `function mimetype_from_extension`
+
+`function mimetype_from_extension($extension)`
+
+Maps a file extensions to a mimetype.
+
+
+# Static URI methods
+
+The `GuzzleHttp\Psr7\Uri` class has several static methods to manipulate URIs.
+
+
+## `GuzzleHttp\Psr7\Uri::removeDotSegments`
+
+`public static function removeDotSegments($path) -> UriInterface`
+
+Removes dot segments from a path and returns the new path.
+
+See http://tools.ietf.org/html/rfc3986#section-5.2.4
+
+
+## `GuzzleHttp\Psr7\Uri::resolve`
+
+`public static function resolve(UriInterface $base, $rel) -> UriInterface`
+
+Resolve a base URI with a relative URI and return a new URI.
+
+See http://tools.ietf.org/html/rfc3986#section-5
+
+
+## `GuzzleHttp\Psr7\Uri::withQueryValue`
+
+`public static function withQueryValue(UriInterface $uri, $key, $value) -> UriInterface`
+
+Create a new URI with a specific query string value.
+
+Any existing query string values that exactly match the provided key are
+removed and replaced with the given key value pair.
+
+Note: this function will convert "=" to "%3D" and "&" to "%26".
+
+
+## `GuzzleHttp\Psr7\Uri::withoutQueryValue`
+
+`public static function withoutQueryValue(UriInterface $uri, $key, $value) -> UriInterface`
+
+Create a new URI with a specific query string value removed.
+
+Any existing query string values that exactly match the provided key are
+removed.
+
+Note: this function will convert "=" to "%3D" and "&" to "%26".
+
+
+## `GuzzleHttp\Psr7\Uri::fromParts`
+
+`public static function fromParts(array $parts) -> UriInterface`
+
+Create a `GuzzleHttp\Psr7\Uri` object from a hash of `parse_url` parts.
+
+
+# Not Implemented
+
+A few aspects of PSR-7 are not implemented in this project. A pull request for
+any of these features is welcome:
+
+- `Psr\Http\Message\ServerRequestInterface`
+- `Psr\Http\Message\UploadedFileInterface`
diff --git a/core/vendor/guzzlehttp/psr7/composer.json b/core/vendor/guzzlehttp/psr7/composer.json
new file mode 100644
index 000000000..c1fe18f08
--- /dev/null
+++ b/core/vendor/guzzlehttp/psr7/composer.json
@@ -0,0 +1,35 @@
+{
+    "name": "guzzlehttp/psr7",
+    "type": "library",
+    "description": "PSR-7 message implementation",
+    "keywords": ["message", "stream", "http", "uri"],
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Michael Dowling",
+            "email": "mtdowling@gmail.com",
+            "homepage": "https://github.com/mtdowling"
+        }
+    ],
+    "require": {
+        "php": ">=5.4.0",
+        "psr/http-message": "~1.0"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "~4.0"
+    },
+    "provide": {
+        "psr/http-message-implementation": "1.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "GuzzleHttp\\Psr7\\": "src/"
+        },
+        "files": ["src/functions.php"]
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.0-dev"
+        }
+    }
+}
diff --git a/core/vendor/guzzlehttp/psr7/phpunit.xml.dist b/core/vendor/guzzlehttp/psr7/phpunit.xml.dist
new file mode 100644
index 000000000..500cd53a0
--- /dev/null
+++ b/core/vendor/guzzlehttp/psr7/phpunit.xml.dist
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit bootstrap="./tests/bootstrap.php"
+         colors="true">
+  <testsuites>
+    <testsuite>
+      <directory>tests</directory>
+    </testsuite>
+  </testsuites>
+  <filter>
+    <whitelist>
+      <directory suffix=".php">src</directory>
+      <exclude>
+        <directory suffix="Interface.php">src/</directory>
+      </exclude>
+    </whitelist>
+  </filter>
+</phpunit>
diff --git a/core/vendor/guzzlehttp/streams/src/AppendStream.php b/core/vendor/guzzlehttp/psr7/src/AppendStream.php
similarity index 74%
rename from core/vendor/guzzlehttp/streams/src/AppendStream.php
rename to core/vendor/guzzlehttp/psr7/src/AppendStream.php
index 94bda7173..23039fd79 100644
--- a/core/vendor/guzzlehttp/streams/src/AppendStream.php
+++ b/core/vendor/guzzlehttp/psr7/src/AppendStream.php
@@ -1,7 +1,7 @@
 <?php
-namespace GuzzleHttp\Stream;
+namespace GuzzleHttp\Psr7;
 
-use GuzzleHttp\Stream\Exception\CannotAttachException;
+use Psr\Http\Message\StreamInterface;
 
 /**
  * Reads from multiple streams, one after the other.
@@ -32,7 +32,7 @@ class AppendStream implements StreamInterface
     public function __toString()
     {
         try {
-            $this->seek(0);
+            $this->rewind();
             return $this->getContents();
         } catch (\Exception $e) {
             return '';
@@ -62,7 +62,7 @@ class AppendStream implements StreamInterface
 
     public function getContents()
     {
-        return Utils::copyToString($this);
+        return copy_to_string($this);
     }
 
     /**
@@ -92,11 +92,6 @@ class AppendStream implements StreamInterface
         $this->detached = true;
     }
 
-    public function attach($stream)
-    {
-        throw new CannotAttachException();
-    }
-
     public function tell()
     {
         return $this->pos;
@@ -132,6 +127,11 @@ class AppendStream implements StreamInterface
              $this->streams[$this->current]->eof());
     }
 
+    public function rewind()
+    {
+        $this->seek(0);
+    }
+
     /**
      * Attempts to seek to the given position. Only supports SEEK_SET.
      *
@@ -139,30 +139,31 @@ class AppendStream implements StreamInterface
      */
     public function seek($offset, $whence = SEEK_SET)
     {
-        if (!$this->seekable || $whence !== SEEK_SET) {
-            return false;
+        if (!$this->seekable) {
+            throw new \RuntimeException('This AppendStream is not seekable');
+        } elseif ($whence !== SEEK_SET) {
+            throw new \RuntimeException('The AppendStream can only seek with SEEK_SET');
         }
 
-        $success = true;
         $this->pos = $this->current = 0;
 
         // Rewind each stream
-        foreach ($this->streams as $stream) {
-            if (!$stream->seek(0)) {
-                $success = false;
+        foreach ($this->streams as $i => $stream) {
+            try {
+                $stream->rewind();
+            } catch (\Exception $e) {
+                throw new \RuntimeException('Unable to seek stream '
+                    . $i . ' of the AppendStream', 0, $e);
             }
         }
 
-        if (!$success) {
-            return false;
-        }
-
         // Seek to the actual position by reading from each stream
         while ($this->pos < $offset && !$this->eof()) {
-            $this->read(min(8096, $offset - $this->pos));
+            $result = $this->read(min(8096, $offset - $this->pos));
+            if ($result === '') {
+                break;
+            }
         }
-
-        return $this->pos == $offset;
     }
 
     /**
@@ -175,16 +176,28 @@ class AppendStream implements StreamInterface
         $buffer = '';
         $total = count($this->streams) - 1;
         $remaining = $length;
+        $progressToNext = false;
 
         while ($remaining > 0) {
+
             // Progress to the next stream if needed.
-            if ($this->streams[$this->current]->eof()) {
-                if ($this->current == $total) {
+            if ($progressToNext || $this->streams[$this->current]->eof()) {
+                $progressToNext = false;
+                if ($this->current === $total) {
                     break;
                 }
                 $this->current++;
             }
-            $buffer .= $this->streams[$this->current]->read($remaining);
+
+            $result = $this->streams[$this->current]->read($remaining);
+
+            // Using a loose comparison here to match on '', false, and null
+            if ($result == null) {
+                $progressToNext = true;
+                continue;
+            }
+
+            $buffer .= $result;
             $remaining = $length - strlen($buffer);
         }
 
@@ -210,7 +223,7 @@ class AppendStream implements StreamInterface
 
     public function write($string)
     {
-        return false;
+        throw new \RuntimeException('Cannot write to an AppendStream');
     }
 
     public function getMetadata($key = null)
diff --git a/core/vendor/guzzlehttp/streams/src/BufferStream.php b/core/vendor/guzzlehttp/psr7/src/BufferStream.php
similarity index 89%
rename from core/vendor/guzzlehttp/streams/src/BufferStream.php
rename to core/vendor/guzzlehttp/psr7/src/BufferStream.php
index 0fffbd63a..af4d4c227 100644
--- a/core/vendor/guzzlehttp/streams/src/BufferStream.php
+++ b/core/vendor/guzzlehttp/psr7/src/BufferStream.php
@@ -1,7 +1,7 @@
 <?php
-namespace GuzzleHttp\Stream;
+namespace GuzzleHttp\Psr7;
 
-use GuzzleHttp\Stream\Exception\CannotAttachException;
+use Psr\Http\Message\StreamInterface;
 
 /**
  * Provides a buffer stream that can be written to to fill a buffer, and read
@@ -10,8 +10,6 @@ use GuzzleHttp\Stream\Exception\CannotAttachException;
  * This stream returns a "hwm" metadata value that tells upstream consumers
  * what the configured high water mark of the stream is, or the maximum
  * preferred size of the buffer.
- *
- * @package GuzzleHttp\Stream
  */
 class BufferStream implements StreamInterface
 {
@@ -53,11 +51,6 @@ class BufferStream implements StreamInterface
         $this->close();
     }
 
-    public function attach($stream)
-    {
-        throw new CannotAttachException();
-    }
-
     public function getSize()
     {
         return strlen($this->buffer);
@@ -78,9 +71,14 @@ class BufferStream implements StreamInterface
         return false;
     }
 
+    public function rewind()
+    {
+        $this->seek(0);
+    }
+
     public function seek($offset, $whence = SEEK_SET)
     {
-        return false;
+        throw new \RuntimeException('Cannot seek a BufferStream');
     }
 
     public function eof()
@@ -90,7 +88,7 @@ class BufferStream implements StreamInterface
 
     public function tell()
     {
-        return false;
+        throw new \RuntimeException('Cannot determine the position of a BufferStream');
     }
 
     /**
@@ -120,6 +118,7 @@ class BufferStream implements StreamInterface
     {
         $this->buffer .= $string;
 
+        // TODO: What should happen here?
         if (strlen($this->buffer) >= $this->hwm) {
             return false;
         }
diff --git a/core/vendor/guzzlehttp/streams/src/CachingStream.php b/core/vendor/guzzlehttp/psr7/src/CachingStream.php
similarity index 90%
rename from core/vendor/guzzlehttp/streams/src/CachingStream.php
rename to core/vendor/guzzlehttp/psr7/src/CachingStream.php
index 60bb9056c..8fc9d2a68 100644
--- a/core/vendor/guzzlehttp/streams/src/CachingStream.php
+++ b/core/vendor/guzzlehttp/psr7/src/CachingStream.php
@@ -1,7 +1,7 @@
 <?php
-namespace GuzzleHttp\Stream;
+namespace GuzzleHttp\Psr7;
 
-use GuzzleHttp\Stream\Exception\SeekException;
+use Psr\Http\Message\StreamInterface;
 
 /**
  * Stream decorator that can cache previously read bytes from a sequentially
@@ -36,9 +36,14 @@ class CachingStream implements StreamInterface
         return max($this->stream->getSize(), $this->remoteStream->getSize());
     }
 
+    public function rewind()
+    {
+        $this->seek(0);
+    }
+
     /**
      * {@inheritdoc}
-     * @throws SeekException When seeking with SEEK_END or when seeking
+     * @throws \RuntimeException When seeking with SEEK_END or when seeking
      *     past the total size of the buffer stream
      */
     public function seek($offset, $whence = SEEK_SET)
@@ -48,20 +53,18 @@ class CachingStream implements StreamInterface
         } elseif ($whence == SEEK_CUR) {
             $byte = $offset + $this->tell();
         } else {
-            return false;
+            throw new \RuntimeException('CachingStream::seek() supports SEEK_SET and SEEK_CUR');
         }
 
         // You cannot skip ahead past where you've read from the remote stream
         if ($byte > $this->stream->getSize()) {
-            throw new SeekException(
-                $this,
-                $byte,
+            throw new \RuntimeException(
                 sprintf('Cannot seek to byte %d when the buffered stream only'
                     . ' contains %d bytes', $byte, $this->stream->getSize())
             );
         }
 
-        return $this->stream->seek($byte);
+        $this->stream->seek($byte);
     }
 
     public function read($length)
diff --git a/core/vendor/guzzlehttp/streams/src/DroppingStream.php b/core/vendor/guzzlehttp/psr7/src/DroppingStream.php
similarity index 79%
rename from core/vendor/guzzlehttp/streams/src/DroppingStream.php
rename to core/vendor/guzzlehttp/psr7/src/DroppingStream.php
index 56ee80c12..8935c80d7 100644
--- a/core/vendor/guzzlehttp/streams/src/DroppingStream.php
+++ b/core/vendor/guzzlehttp/psr7/src/DroppingStream.php
@@ -1,5 +1,7 @@
 <?php
-namespace GuzzleHttp\Stream;
+namespace GuzzleHttp\Psr7;
+
+use Psr\Http\Message\StreamInterface;
 
 /**
  * Stream decorator that begins dropping data once the size of the underlying
@@ -25,9 +27,9 @@ class DroppingStream implements StreamInterface
     {
         $diff = $this->maxLength - $this->stream->getSize();
 
-        // Begin returning false when the underlying stream is too large.
+        // Begin returning 0 when the underlying stream is too large.
         if ($diff <= 0) {
-            return false;
+            return 0;
         }
 
         // Write the stream or a subset of the stream if needed.
@@ -35,8 +37,6 @@ class DroppingStream implements StreamInterface
             return $this->stream->write($string);
         }
 
-        $this->stream->write(substr($string, 0, $diff));
-
-        return false;
+        return $this->stream->write(substr($string, 0, $diff));
     }
 }
diff --git a/core/vendor/guzzlehttp/streams/src/FnStream.php b/core/vendor/guzzlehttp/psr7/src/FnStream.php
similarity index 92%
rename from core/vendor/guzzlehttp/streams/src/FnStream.php
rename to core/vendor/guzzlehttp/psr7/src/FnStream.php
index 6b5872d7f..cc9b4453f 100644
--- a/core/vendor/guzzlehttp/streams/src/FnStream.php
+++ b/core/vendor/guzzlehttp/psr7/src/FnStream.php
@@ -1,5 +1,7 @@
 <?php
-namespace GuzzleHttp\Stream;
+namespace GuzzleHttp\Psr7;
+
+use Psr\Http\Message\StreamInterface;
 
 /**
  * Compose stream implementations based on a hash of functions.
@@ -13,7 +15,7 @@ class FnStream implements StreamInterface
     private $methods;
 
     /** @var array Methods that must be implemented in the given array */
-    private static $slots = ['__toString', 'close', 'detach', 'attach',
+    private static $slots = ['__toString', 'close', 'detach', 'rewind',
         'getSize', 'tell', 'eof', 'isSeekable', 'seek', 'isWritable', 'write',
         'isReadable', 'read', 'getContents', 'getMetadata'];
 
@@ -85,11 +87,6 @@ class FnStream implements StreamInterface
         return call_user_func($this->_fn_detach);
     }
 
-    public function attach($stream)
-    {
-        return call_user_func($this->_fn_attach, $stream);
-    }
-
     public function getSize()
     {
         return call_user_func($this->_fn_getSize);
@@ -110,9 +107,14 @@ class FnStream implements StreamInterface
         return call_user_func($this->_fn_isSeekable);
     }
 
+    public function rewind()
+    {
+        call_user_func($this->_fn_rewind);
+    }
+
     public function seek($offset, $whence = SEEK_SET)
     {
-        return call_user_func($this->_fn_seek, $offset, $whence);
+        call_user_func($this->_fn_seek, $offset, $whence);
     }
 
     public function isWritable()
diff --git a/core/vendor/guzzlehttp/streams/src/InflateStream.php b/core/vendor/guzzlehttp/psr7/src/InflateStream.php
similarity index 87%
rename from core/vendor/guzzlehttp/streams/src/InflateStream.php
rename to core/vendor/guzzlehttp/psr7/src/InflateStream.php
index 978af2103..2c8628b07 100644
--- a/core/vendor/guzzlehttp/streams/src/InflateStream.php
+++ b/core/vendor/guzzlehttp/psr7/src/InflateStream.php
@@ -1,5 +1,7 @@
 <?php
-namespace GuzzleHttp\Stream;
+namespace GuzzleHttp\Psr7;
+
+use Psr\Http\Message\StreamInterface;
 
 /**
  * Uses PHP's zlib.inflate filter to inflate deflate or gzipped content.
@@ -20,7 +22,7 @@ class InflateStream implements StreamInterface
     {
         // Skip the first 10 bytes
         $stream = new LimitStream($stream, -1, 10);
-        $resource = GuzzleStreamWrapper::getResource($stream);
+        $resource = StreamWrapper::getResource($stream);
         stream_filter_append($resource, 'zlib.inflate', STREAM_FILTER_READ);
         $this->stream = new Stream($resource);
     }
diff --git a/core/vendor/guzzlehttp/streams/src/LazyOpenStream.php b/core/vendor/guzzlehttp/psr7/src/LazyOpenStream.php
similarity index 84%
rename from core/vendor/guzzlehttp/streams/src/LazyOpenStream.php
rename to core/vendor/guzzlehttp/psr7/src/LazyOpenStream.php
index 6242ee7b5..02cec3af4 100644
--- a/core/vendor/guzzlehttp/streams/src/LazyOpenStream.php
+++ b/core/vendor/guzzlehttp/psr7/src/LazyOpenStream.php
@@ -1,5 +1,7 @@
 <?php
-namespace GuzzleHttp\Stream;
+namespace GuzzleHttp\Psr7;
+
+use Psr\Http\Message\StreamInterface;
 
 /**
  * Lazily reads or writes to a file that is opened only after an IO operation
@@ -32,6 +34,6 @@ class LazyOpenStream implements StreamInterface
      */
     protected function createStream()
     {
-        return Stream::factory(Utils::open($this->filename, $this->mode));
+        return stream_for(try_fopen($this->filename, $this->mode));
     }
 }
diff --git a/core/vendor/guzzlehttp/streams/src/LimitStream.php b/core/vendor/guzzlehttp/psr7/src/LimitStream.php
similarity index 82%
rename from core/vendor/guzzlehttp/streams/src/LimitStream.php
rename to core/vendor/guzzlehttp/psr7/src/LimitStream.php
index e9fad9857..7f2298bcb 100644
--- a/core/vendor/guzzlehttp/streams/src/LimitStream.php
+++ b/core/vendor/guzzlehttp/psr7/src/LimitStream.php
@@ -1,7 +1,8 @@
 <?php
-namespace GuzzleHttp\Stream;
+namespace GuzzleHttp\Psr7;
+
+use Psr\Http\Message\StreamInterface;
 
-use GuzzleHttp\Stream\Exception\SeekException;
 
 /**
  * Decorator used to return only a subset of a stream
@@ -45,12 +46,7 @@ class LimitStream implements StreamInterface
             return false;
         }
 
-        $tell = $this->stream->tell();
-        if ($tell === false) {
-            return false;
-        }
-
-        return $tell >= $this->offset + $this->limit;
+        return $this->stream->tell() >= $this->offset + $this->limit;
     }
 
     /**
@@ -75,7 +71,11 @@ class LimitStream implements StreamInterface
     public function seek($offset, $whence = SEEK_SET)
     {
         if ($whence !== SEEK_SET || $offset < 0) {
-            return false;
+            throw new \RuntimeException(sprintf(
+                'Cannot seek to offset % with whence %s',
+                $offset,
+                $whence
+            ));
         }
 
         $offset += $this->offset;
@@ -86,7 +86,7 @@ class LimitStream implements StreamInterface
             }
         }
 
-        return $this->stream->seek($offset);
+        $this->stream->seek($offset);
     }
 
     /**
@@ -103,8 +103,7 @@ class LimitStream implements StreamInterface
      *
      * @param int $offset Offset to seek to and begin byte limiting from
      *
-     * @return self
-     * @throws SeekException
+     * @throws \RuntimeException if the stream cannot be seeked.
      */
     public function setOffset($offset)
     {
@@ -112,18 +111,16 @@ class LimitStream implements StreamInterface
 
         if ($current !== $offset) {
             // If the stream cannot seek to the offset position, then read to it
-            if (!$this->stream->seek($offset)) {
-                if ($current > $offset) {
-                    throw new SeekException($this, $offset);
-                } else {
-                    $this->stream->read($offset - $current);
-                }
+            if ($this->stream->isSeekable()) {
+                $this->stream->seek($offset);
+            } elseif ($current > $offset) {
+                throw new \RuntimeException("Could not seek to stream offset $offset");
+            } else {
+                $this->stream->read($offset - $current);
             }
         }
 
         $this->offset = $offset;
-
-        return $this;
     }
 
     /**
@@ -132,13 +129,10 @@ class LimitStream implements StreamInterface
      *
      * @param int $limit Number of bytes to allow to be read from the stream.
      *                   Use -1 for no limit.
-     * @return self
      */
     public function setLimit($limit)
     {
         $this->limit = $limit;
-
-        return $this;
     }
 
     public function read($length)
@@ -154,8 +148,8 @@ class LimitStream implements StreamInterface
             // Only return the amount of requested data, ensuring that the byte
             // limit is not exceeded
             return $this->stream->read(min($remaining, $length));
-        } else {
-            return false;
         }
+
+        return '';
     }
 }
diff --git a/core/vendor/guzzlehttp/psr7/src/MessageTrait.php b/core/vendor/guzzlehttp/psr7/src/MessageTrait.php
new file mode 100644
index 000000000..123205cf6
--- /dev/null
+++ b/core/vendor/guzzlehttp/psr7/src/MessageTrait.php
@@ -0,0 +1,158 @@
+<?php
+namespace GuzzleHttp\Psr7;
+
+use Psr\Http\Message\StreamInterface;
+
+/**
+ * Trait implementing functionality common to requests and responses.
+ */
+trait MessageTrait
+{
+    /** @var array Cached HTTP header collection with lowercase key to values */
+    private $headers = [];
+
+    /** @var array Actual key to list of values per header. */
+    private $headerLines = [];
+
+    /** @var string */
+    private $protocol = '1.1';
+
+    /** @var StreamInterface */
+    private $stream;
+
+    public function getProtocolVersion()
+    {
+        return $this->protocol;
+    }
+
+    public function withProtocolVersion($version)
+    {
+        if ($this->protocol === $version) {
+            return $this;
+        }
+
+        $new = clone $this;
+        $new->protocol = $version;
+        return $new;
+    }
+
+    public function getHeaders()
+    {
+        return $this->headerLines;
+    }
+
+    public function hasHeader($header)
+    {
+        return isset($this->headers[strtolower($header)]);
+    }
+
+    public function getHeader($header)
+    {
+        $name = strtolower($header);
+        return isset($this->headers[$name]) ? $this->headers[$name] : [];
+    }
+
+    public function getHeaderLine($header)
+    {
+        return implode(', ', $this->getHeader($header));
+    }
+
+    public function withHeader($header, $value)
+    {
+        $new = clone $this;
+        $header = trim($header);
+        $name = strtolower($header);
+
+        if (!is_array($value)) {
+            $new->headers[$name] = [trim($value)];
+        } else {
+            $new->headers[$name] = $value;
+            foreach ($new->headers[$name] as &$v) {
+                $v = trim($v);
+            }
+        }
+
+        // Remove the header lines.
+        foreach (array_keys($new->headerLines) as $key) {
+            if (strtolower($key) === $name) {
+                unset($new->headerLines[$key]);
+            }
+        }
+
+        // Add the header line.
+        $new->headerLines[$header] = $new->headers[$name];
+
+        return $new;
+    }
+
+    public function withAddedHeader($header, $value)
+    {
+        if (!$this->hasHeader($header)) {
+            return $this->withHeader($header, $value);
+        }
+
+        $new = clone $this;
+        $new->headers[strtolower($header)][] = $value;
+        $new->headerLines[$header][] = $value;
+        return $new;
+    }
+
+    public function withoutHeader($header)
+    {
+        if (!$this->hasHeader($header)) {
+            return $this;
+        }
+
+        $new = clone $this;
+        $name = strtolower($header);
+        unset($new->headers[$name]);
+
+        foreach (array_keys($new->headerLines) as $key) {
+            if (strtolower($key) === $name) {
+                unset($new->headerLines[$key]);
+            }
+        }
+
+        return $new;
+    }
+
+    public function getBody()
+    {
+        if (!$this->stream) {
+            $this->stream = stream_for('');
+        }
+
+        return $this->stream;
+    }
+
+    public function withBody(StreamInterface $body)
+    {
+        if ($body === $this->stream) {
+            return $this;
+        }
+
+        $new = clone $this;
+        $new->stream = $body;
+        return $new;
+    }
+
+    private function setHeaders(array $headers)
+    {
+        $this->headerLines = $this->headers = [];
+        foreach ($headers as $header => $value) {
+            $header = trim($header);
+            $name = strtolower($header);
+            if (!is_array($value)) {
+                $value = trim($value);
+                $this->headers[$name][] = $value;
+                $this->headerLines[$header][] = $value;
+            } else {
+                foreach ($value as $v) {
+                    $v = trim($v);
+                    $this->headers[$name][] = $v;
+                    $this->headerLines[$header][] = $v;
+                }
+            }
+        }
+    }
+}
diff --git a/core/vendor/guzzlehttp/psr7/src/MultipartStream.php b/core/vendor/guzzlehttp/psr7/src/MultipartStream.php
new file mode 100644
index 000000000..fd006ecf8
--- /dev/null
+++ b/core/vendor/guzzlehttp/psr7/src/MultipartStream.php
@@ -0,0 +1,153 @@
+<?php
+namespace GuzzleHttp\Psr7;
+
+use Psr\Http\Message\StreamInterface;
+
+/**
+ * Stream that when read returns bytes for a streaming multipart or
+ * multipart/form-data stream.
+ */
+class MultipartStream implements StreamInterface
+{
+    use StreamDecoratorTrait;
+
+    private $boundary;
+
+    /**
+     * @param array  $elements Array of associative arrays, each containing a
+     *                         required "name" key mapping to the form field,
+     *                         name, a required "contents" key mapping to a
+     *                         StreamInterface/resource/string, an optional
+     *                         "headers" associative array of custom headers,
+     *                         and an optional "filename" key mapping to a
+     *                         string to send as the filename in the part.
+     * @param string $boundary You can optionally provide a specific boundary
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function __construct(array $elements = [], $boundary = null)
+    {
+        $this->boundary = $boundary ?: uniqid();
+        $this->stream = $this->createStream($elements);
+    }
+
+    /**
+     * Get the boundary
+     *
+     * @return string
+     */
+    public function getBoundary()
+    {
+        return $this->boundary;
+    }
+
+    public function isWritable()
+    {
+        return false;
+    }
+
+    /**
+     * Get the headers needed before transferring the content of a POST file
+     */
+    private function getHeaders(array $headers)
+    {
+        $str = '';
+        foreach ($headers as $key => $value) {
+            $str .= "{$key}: {$value}\r\n";
+        }
+
+        return "--{$this->boundary}\r\n" . trim($str) . "\r\n\r\n";
+    }
+
+    /**
+     * Create the aggregate stream that will be used to upload the POST data
+     */
+    protected function createStream(array $elements)
+    {
+        $stream = new AppendStream();
+
+        foreach ($elements as $element) {
+            $this->addElement($stream, $element);
+        }
+
+        // Add the trailing boundary with CRLF
+        $stream->addStream(stream_for("--{$this->boundary}--\r\n"));
+
+        return $stream;
+    }
+
+    private function addElement(AppendStream $stream, array $element)
+    {
+        foreach (['contents', 'name'] as $key) {
+            if (!array_key_exists($key, $element)) {
+                throw new \InvalidArgumentException("A '{$key}' key is required");
+            }
+        }
+
+        $element['contents'] = stream_for($element['contents']);
+
+        if (empty($element['filename'])) {
+            $uri = $element['contents']->getMetadata('uri');
+            if (substr($uri, 0, 6) !== 'php://') {
+                $element['filename'] = $uri;
+            }
+        }
+
+        list($body, $headers) = $this->createElement(
+            $element['name'],
+            $element['contents'],
+            isset($element['filename']) ? $element['filename'] : null,
+            isset($element['headers']) ? $element['headers'] : []
+        );
+
+        $stream->addStream(stream_for($this->getHeaders($headers)));
+        $stream->addStream($body);
+        $stream->addStream(stream_for("\r\n"));
+    }
+
+    /**
+     * @return array
+     */
+    private function createElement($name, $stream, $filename, array $headers)
+    {
+        // Set a default content-disposition header if one was no provided
+        $disposition = $this->getHeader($headers, 'content-disposition');
+        if (!$disposition) {
+            $headers['Content-Disposition'] = $filename
+                ? sprintf('form-data; name="%s"; filename="%s"',
+                    $name,
+                    basename($filename))
+                : "form-data; name=\"{$name}\"";
+        }
+
+        // Set a default content-length header if one was no provided
+        $length = $this->getHeader($headers, 'content-length');
+        if (!$length) {
+            if ($length = $stream->getSize()) {
+                $headers['Content-Length'] = (string) $length;
+            }
+        }
+
+        // Set a default Content-Type if one was not supplied
+        $type = $this->getHeader($headers, 'content-type');
+        if (!$type && $filename) {
+            if ($type = mimetype_from_filename($filename)) {
+                $headers['Content-Type'] = $type;
+            }
+        }
+
+        return [$stream, $headers];
+    }
+
+    private function getHeader(array $headers, $key)
+    {
+        $lowercaseHeader = strtolower($key);
+        foreach ($headers as $k => $v) {
+            if (strtolower($k) === $lowercaseHeader) {
+                return $v;
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/core/vendor/guzzlehttp/streams/src/NoSeekStream.php b/core/vendor/guzzlehttp/psr7/src/NoSeekStream.php
similarity index 67%
rename from core/vendor/guzzlehttp/streams/src/NoSeekStream.php
rename to core/vendor/guzzlehttp/psr7/src/NoSeekStream.php
index 3d42395d7..233221805 100644
--- a/core/vendor/guzzlehttp/streams/src/NoSeekStream.php
+++ b/core/vendor/guzzlehttp/psr7/src/NoSeekStream.php
@@ -1,5 +1,7 @@
 <?php
-namespace GuzzleHttp\Stream;
+namespace GuzzleHttp\Psr7;
+
+use Psr\Http\Message\StreamInterface;
 
 /**
  * Stream decorator that prevents a stream from being seeked
@@ -10,16 +12,11 @@ class NoSeekStream implements StreamInterface
 
     public function seek($offset, $whence = SEEK_SET)
     {
-        return false;
+        throw new \RuntimeException('Cannot seek a NoSeekStream');
     }
 
     public function isSeekable()
     {
         return false;
     }
-
-    public function attach($stream)
-    {
-        $this->stream->attach($stream);
-    }
 }
diff --git a/core/vendor/guzzlehttp/streams/src/PumpStream.php b/core/vendor/guzzlehttp/psr7/src/PumpStream.php
similarity index 90%
rename from core/vendor/guzzlehttp/streams/src/PumpStream.php
rename to core/vendor/guzzlehttp/psr7/src/PumpStream.php
index 996320729..ffb5440da 100644
--- a/core/vendor/guzzlehttp/streams/src/PumpStream.php
+++ b/core/vendor/guzzlehttp/psr7/src/PumpStream.php
@@ -1,7 +1,7 @@
 <?php
-namespace GuzzleHttp\Stream;
+namespace GuzzleHttp\Psr7;
 
-use GuzzleHttp\Stream\Exception\CannotAttachException;
+use Psr\Http\Message\StreamInterface;
 
 /**
  * Provides a read only stream that pumps data from a PHP callable.
@@ -50,7 +50,11 @@ class PumpStream implements StreamInterface
 
     public function __toString()
     {
-        return Utils::copyToString($this);
+        try {
+            return copy_to_string($this);
+        } catch (\Exception $e) {
+            return '';
+        }
     }
 
     public function close()
@@ -64,11 +68,6 @@ class PumpStream implements StreamInterface
         $this->source = null;
     }
 
-    public function attach($stream)
-    {
-        throw new CannotAttachException();
-    }
-
     public function getSize()
     {
         return $this->size;
@@ -89,9 +88,14 @@ class PumpStream implements StreamInterface
         return false;
     }
 
+    public function rewind()
+    {
+        $this->seek(0);
+    }
+
     public function seek($offset, $whence = SEEK_SET)
     {
-        return false;
+        throw new \RuntimeException('Cannot seek a PumpStream');
     }
 
     public function isWritable()
@@ -101,7 +105,7 @@ class PumpStream implements StreamInterface
 
     public function write($string)
     {
-        return false;
+        throw new \RuntimeException('Cannot write to a PumpStream');
     }
 
     public function isReadable()
diff --git a/core/vendor/guzzlehttp/psr7/src/Request.php b/core/vendor/guzzlehttp/psr7/src/Request.php
new file mode 100644
index 000000000..0189b14ce
--- /dev/null
+++ b/core/vendor/guzzlehttp/psr7/src/Request.php
@@ -0,0 +1,149 @@
+<?php
+namespace GuzzleHttp\Psr7;
+
+use InvalidArgumentException;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\StreamInterface;
+use Psr\Http\Message\UriInterface;
+
+/**
+ * PSR-7 request implementation.
+ */
+class Request implements RequestInterface
+{
+    use MessageTrait {
+        withHeader as protected withParentHeader;
+    }
+
+    /** @var string */
+    private $method;
+
+    /** @var null|string */
+    private $requestTarget;
+
+    /** @var null|UriInterface */
+    private $uri;
+
+    /**
+     * @param null|string $method HTTP method for the request.
+     * @param null|string $uri URI for the request.
+     * @param array  $headers Headers for the message.
+     * @param string|resource|StreamInterface $body Message body.
+     * @param string $protocolVersion HTTP protocol version.
+     *
+     * @throws InvalidArgumentException for an invalid URI
+     */
+    public function __construct(
+        $method,
+        $uri,
+        array $headers = [],
+        $body = null,
+        $protocolVersion = '1.1'
+    ) {
+        if (is_string($uri)) {
+            $uri = new Uri($uri);
+        } elseif (!($uri instanceof UriInterface)) {
+            throw new \InvalidArgumentException(
+                'URI must be a string or Psr\Http\Message\UriInterface'
+            );
+        }
+
+        $this->method = strtoupper($method);
+        $this->uri = $uri;
+        $this->setHeaders($headers);
+        $this->protocol = $protocolVersion;
+
+        $host = $uri->getHost();
+        if ($host && !$this->hasHeader('Host')) {
+            $this->updateHostFromUri($host);
+        }
+
+        if ($body) {
+            $this->stream = stream_for($body);
+        }
+    }
+
+    public function getRequestTarget()
+    {
+        if ($this->requestTarget !== null) {
+            return $this->requestTarget;
+        }
+
+        $target = $this->uri->getPath();
+        if ($target == null) {
+            $target = '/';
+        }
+        if ($this->uri->getQuery()) {
+            $target .= '?' . $this->uri->getQuery();
+        }
+
+        return $target;
+    }
+
+    public function withRequestTarget($requestTarget)
+    {
+        if (preg_match('#\s#', $requestTarget)) {
+            throw new InvalidArgumentException(
+                'Invalid request target provided; cannot contain whitespace'
+            );
+        }
+
+        $new = clone $this;
+        $new->requestTarget = $requestTarget;
+        return $new;
+    }
+
+    public function getMethod()
+    {
+        return $this->method;
+    }
+
+    public function withMethod($method)
+    {
+        $new = clone $this;
+        $new->method = strtoupper($method);
+        return $new;
+    }
+
+    public function getUri()
+    {
+        return $this->uri;
+    }
+
+    public function withUri(UriInterface $uri, $preserveHost = false)
+    {
+        if ($uri === $this->uri) {
+            return $this;
+        }
+
+        $new = clone $this;
+        $new->uri = $uri;
+
+        if (!$preserveHost) {
+            if ($host = $uri->getHost()) {
+                $new->updateHostFromUri($host);
+            }
+        }
+
+        return $new;
+    }
+
+    public function withHeader($header, $value)
+    {
+        /** @var Request $newInstance */
+        $newInstance = $this->withParentHeader($header, $value);
+        return $newInstance;
+    }
+
+    private function updateHostFromUri($host)
+    {
+        // Ensure Host is the first header.
+        // See: http://tools.ietf.org/html/rfc7230#section-5.4
+        if ($port = $this->uri->getPort()) {
+            $host .= ':' . $port;
+        }
+
+        $this->headerLines = ['Host' => [$host]] + $this->headerLines;
+        $this->headers = ['host' => [$host]] + $this->headers;
+    }
+}
diff --git a/core/vendor/guzzlehttp/psr7/src/Response.php b/core/vendor/guzzlehttp/psr7/src/Response.php
new file mode 100644
index 000000000..7a7a4698f
--- /dev/null
+++ b/core/vendor/guzzlehttp/psr7/src/Response.php
@@ -0,0 +1,130 @@
+<?php
+namespace GuzzleHttp\Psr7;
+
+use Psr\Http\Message\ResponseInterface;
+
+/**
+ * PSR-7 response implementation.
+ */
+class Response implements ResponseInterface
+{
+    use MessageTrait;
+
+    /** @var array Map of standard HTTP status code/reason phrases */
+    private static $phrases = [
+        100 => 'Continue',
+        101 => 'Switching Protocols',
+        102 => 'Processing',
+        200 => 'OK',
+        201 => 'Created',
+        202 => 'Accepted',
+        203 => 'Non-Authoritative Information',
+        204 => 'No Content',
+        205 => 'Reset Content',
+        206 => 'Partial Content',
+        207 => 'Multi-status',
+        208 => 'Already Reported',
+        300 => 'Multiple Choices',
+        301 => 'Moved Permanently',
+        302 => 'Found',
+        303 => 'See Other',
+        304 => 'Not Modified',
+        305 => 'Use Proxy',
+        306 => 'Switch Proxy',
+        307 => 'Temporary Redirect',
+        400 => 'Bad Request',
+        401 => 'Unauthorized',
+        402 => 'Payment Required',
+        403 => 'Forbidden',
+        404 => 'Not Found',
+        405 => 'Method Not Allowed',
+        406 => 'Not Acceptable',
+        407 => 'Proxy Authentication Required',
+        408 => 'Request Time-out',
+        409 => 'Conflict',
+        410 => 'Gone',
+        411 => 'Length Required',
+        412 => 'Precondition Failed',
+        413 => 'Request Entity Too Large',
+        414 => 'Request-URI Too Large',
+        415 => 'Unsupported Media Type',
+        416 => 'Requested range not satisfiable',
+        417 => 'Expectation Failed',
+        418 => 'I\'m a teapot',
+        422 => 'Unprocessable Entity',
+        423 => 'Locked',
+        424 => 'Failed Dependency',
+        425 => 'Unordered Collection',
+        426 => 'Upgrade Required',
+        428 => 'Precondition Required',
+        429 => 'Too Many Requests',
+        431 => 'Request Header Fields Too Large',
+        500 => 'Internal Server Error',
+        501 => 'Not Implemented',
+        502 => 'Bad Gateway',
+        503 => 'Service Unavailable',
+        504 => 'Gateway Time-out',
+        505 => 'HTTP Version not supported',
+        506 => 'Variant Also Negotiates',
+        507 => 'Insufficient Storage',
+        508 => 'Loop Detected',
+        511 => 'Network Authentication Required',
+    ];
+
+    /** @var null|string */
+    private $reasonPhrase = '';
+
+    /** @var int */
+    private $statusCode = 200;
+
+    /**
+     * @param int    $status  Status code for the response, if any.
+     * @param array  $headers Headers for the response, if any.
+     * @param mixed  $body    Stream body.
+     * @param string $version Protocol version.
+     * @param string $reason  Reason phrase (a default will be used if possible).
+     */
+    public function __construct(
+        $status = 200,
+        array $headers = [],
+        $body = null,
+        $version = '1.1',
+        $reason = null
+    ) {
+        $this->statusCode = (int) $status;
+
+        if ($body) {
+            $this->stream = stream_for($body);
+        }
+
+        $this->setHeaders($headers);
+        if (!$reason && isset(self::$phrases[$this->statusCode])) {
+            $this->reasonPhrase = self::$phrases[$status];
+        } else {
+            $this->reasonPhrase = (string) $reason;
+        }
+
+        $this->protocol = $version;
+    }
+
+    public function getStatusCode()
+    {
+        return $this->statusCode;
+    }
+
+    public function getReasonPhrase()
+    {
+        return $this->reasonPhrase;
+    }
+
+    public function withStatus($code, $reasonPhrase = '')
+    {
+        $new = clone $this;
+        $new->statusCode = (int) $code;
+        if (!$reasonPhrase && isset(self::$phrases[$new->statusCode])) {
+            $reasonPhrase = self::$phrases[$new->statusCode];
+        }
+        $new->reasonPhrase = $reasonPhrase;
+        return $new;
+    }
+}
diff --git a/core/vendor/guzzlehttp/streams/src/Stream.php b/core/vendor/guzzlehttp/psr7/src/Stream.php
similarity index 63%
rename from core/vendor/guzzlehttp/streams/src/Stream.php
rename to core/vendor/guzzlehttp/psr7/src/Stream.php
index 7adbc5e3f..0b0db0110 100644
--- a/core/vendor/guzzlehttp/streams/src/Stream.php
+++ b/core/vendor/guzzlehttp/psr7/src/Stream.php
@@ -1,8 +1,12 @@
 <?php
-namespace GuzzleHttp\Stream;
+namespace GuzzleHttp\Psr7;
+
+use Psr\Http\Message\StreamInterface;
 
 /**
- * PHP stream implementation
+ * PHP stream implementation.
+ *
+ * @var $stream
  */
 class Stream implements StreamInterface
 {
@@ -30,61 +34,6 @@ class Stream implements StreamInterface
         ]
     ];
 
-    /**
-     * Create a new stream based on the input type.
-     *
-     * This factory accepts the same associative array of options as described
-     * in the constructor.
-     *
-     * @param resource|string|StreamInterface $resource Entity body data
-     * @param array                           $options  Additional options
-     *
-     * @return Stream
-     * @throws \InvalidArgumentException if the $resource arg is not valid.
-     */
-    public static function factory($resource = '', array $options = [])
-    {
-        $type = gettype($resource);
-
-        if ($type == 'string') {
-            $stream = fopen('php://temp', 'r+');
-            if ($resource !== '') {
-                fwrite($stream, $resource);
-                fseek($stream, 0);
-            }
-            return new self($stream, $options);
-        }
-
-        if ($type == 'resource') {
-            return new self($resource, $options);
-        }
-
-        if ($resource instanceof StreamInterface) {
-            return $resource;
-        }
-
-        if ($type == 'object' && method_exists($resource, '__toString')) {
-            return self::factory((string) $resource, $options);
-        }
-
-        if (is_callable($resource)) {
-            return new PumpStream($resource, $options);
-        }
-
-        if ($resource instanceof \Iterator) {
-            return new PumpStream(function () use ($resource) {
-                if (!$resource->valid()) {
-                    return false;
-                }
-                $result = $resource->current();
-                $resource->next();
-                return $result;
-            }, $options);
-        }
-
-        throw new \InvalidArgumentException('Invalid resource type: ' . $type);
-    }
-
     /**
      * This constructor accepts an associative array of options.
      *
@@ -113,7 +62,21 @@ class Stream implements StreamInterface
             ? $options['metadata']
             : [];
 
-        $this->attach($stream);
+        $this->stream = $stream;
+        $meta = stream_get_meta_data($this->stream);
+        $this->seekable = $meta['seekable'];
+        $this->readable = isset(self::$readWriteHash['read'][$meta['mode']]);
+        $this->writable = isset(self::$readWriteHash['write'][$meta['mode']]);
+        $this->uri = $this->getMetadata('uri');
+    }
+
+    public function __get($name)
+    {
+        if ($name == 'stream') {
+            throw new \RuntimeException('The stream is detached');
+        }
+
+        throw new \BadMethodCallException('No value for ' . $name);
     }
 
     /**
@@ -126,55 +89,56 @@ class Stream implements StreamInterface
 
     public function __toString()
     {
-        if (!$this->stream) {
+        try {
+            $this->seek(0);
+            return (string) stream_get_contents($this->stream);
+        } catch (\Exception $e) {
             return '';
         }
-
-        $this->seek(0);
-
-        return (string) stream_get_contents($this->stream);
     }
 
     public function getContents()
     {
-        return $this->stream ? stream_get_contents($this->stream) : '';
+        $contents = stream_get_contents($this->stream);
+
+        if ($contents === false) {
+            throw new \RuntimeException('Unable to read stream contents');
+        }
+
+        return $contents;
     }
 
     public function close()
     {
-        if (is_resource($this->stream)) {
-            fclose($this->stream);
+        if (isset($this->stream)) {
+            if (is_resource($this->stream)) {
+                fclose($this->stream);
+            }
+            $this->detach();
         }
-
-        $this->detach();
     }
 
     public function detach()
     {
+        if (!isset($this->stream)) {
+            return null;
+        }
+
         $result = $this->stream;
-        $this->stream = $this->size = $this->uri = null;
+        unset($this->stream);
+        $this->size = $this->uri = null;
         $this->readable = $this->writable = $this->seekable = false;
 
         return $result;
     }
 
-    public function attach($stream)
-    {
-        $this->stream = $stream;
-        $meta = stream_get_meta_data($this->stream);
-        $this->seekable = $meta['seekable'];
-        $this->readable = isset(self::$readWriteHash['read'][$meta['mode']]);
-        $this->writable = isset(self::$readWriteHash['write'][$meta['mode']]);
-        $this->uri = $this->getMetadata('uri');
-    }
-
     public function getSize()
     {
         if ($this->size !== null) {
             return $this->size;
         }
 
-        if (!$this->stream) {
+        if (!isset($this->stream)) {
             return null;
         }
 
@@ -214,39 +178,59 @@ class Stream implements StreamInterface
 
     public function tell()
     {
-        return $this->stream ? ftell($this->stream) : false;
+        $result = ftell($this->stream);
+
+        if ($result === false) {
+            throw new \RuntimeException('Unable to determine stream position');
+        }
+
+        return $result;
     }
 
-    public function setSize($size)
+    public function rewind()
     {
-        $this->size = $size;
-
-        return $this;
+        $this->seek(0);
     }
 
     public function seek($offset, $whence = SEEK_SET)
     {
-        return $this->seekable
-            ? fseek($this->stream, $offset, $whence) === 0
-            : false;
+        if (!$this->seekable) {
+            throw new \RuntimeException('Stream is not seekable');
+        } elseif (fseek($this->stream, $offset, $whence) === -1) {
+            throw new \RuntimeException('Unable to seek to stream position '
+                . $offset . ' with whence ' . var_export($whence, true));
+        }
     }
 
     public function read($length)
     {
-        return $this->readable ? fread($this->stream, $length) : false;
+        if (!$this->readable) {
+            throw new \RuntimeException('Cannot read from non-readable stream');
+        }
+
+        return fread($this->stream, $length);
     }
 
     public function write($string)
     {
+        if (!$this->writable) {
+            throw new \RuntimeException('Cannot write to a non-writable stream');
+        }
+
         // We can't know the size after writing anything
         $this->size = null;
+        $result = fwrite($this->stream, $string);
 
-        return $this->writable ? fwrite($this->stream, $string) : false;
+        if ($result === false) {
+            throw new \RuntimeException('Unable to write to stream');
+        }
+
+        return $result;
     }
 
     public function getMetadata($key = null)
     {
-        if (!$this->stream) {
+        if (!isset($this->stream)) {
             return $key ? null : [];
         } elseif (!$key) {
             return $this->customMetadata + stream_get_meta_data($this->stream);
diff --git a/core/vendor/guzzlehttp/streams/src/StreamDecoratorTrait.php b/core/vendor/guzzlehttp/psr7/src/StreamDecoratorTrait.php
similarity index 83%
rename from core/vendor/guzzlehttp/streams/src/StreamDecoratorTrait.php
rename to core/vendor/guzzlehttp/psr7/src/StreamDecoratorTrait.php
index 39c19c58c..daec6f52e 100644
--- a/core/vendor/guzzlehttp/streams/src/StreamDecoratorTrait.php
+++ b/core/vendor/guzzlehttp/psr7/src/StreamDecoratorTrait.php
@@ -1,6 +1,7 @@
 <?php
-namespace GuzzleHttp\Stream;
-use GuzzleHttp\Stream\Exception\CannotAttachException;
+namespace GuzzleHttp\Psr7;
+
+use Psr\Http\Message\StreamInterface;
 
 /**
  * Stream decorator trait
@@ -19,6 +20,10 @@ trait StreamDecoratorTrait
     /**
      * Magic method used to create a new stream if streams are not added in
      * the constructor of a decorator (e.g., LazyOpenStream).
+     *
+     * @param string $name Name of the property (allows "stream" only).
+     *
+     * @return StreamInterface
      */
     public function __get($name)
     {
@@ -33,7 +38,9 @@ trait StreamDecoratorTrait
     public function __toString()
     {
         try {
-            $this->seek(0);
+            if ($this->isSeekable()) {
+                $this->seek(0);
+            }
             return $this->getContents();
         } catch (\Exception $e) {
             // Really, PHP? https://bugs.php.net/bug.php?id=53648
@@ -45,7 +52,7 @@ trait StreamDecoratorTrait
 
     public function getContents()
     {
-        return Utils::copyToString($this);
+        return copy_to_string($this);
     }
 
     /**
@@ -58,7 +65,7 @@ trait StreamDecoratorTrait
      */
     public function __call($method, array $args)
     {
-        $result = call_user_func_array(array($this->stream, $method), $args);
+        $result = call_user_func_array([$this->stream, $method], $args);
 
         // Always return the wrapped object if the result is a return $this
         return $result === $this->stream ? $this : $result;
@@ -79,11 +86,6 @@ trait StreamDecoratorTrait
         return $this->stream->detach();
     }
 
-    public function attach($stream)
-    {
-        throw new CannotAttachException();
-    }
-
     public function getSize()
     {
         return $this->stream->getSize();
@@ -114,9 +116,14 @@ trait StreamDecoratorTrait
         return $this->stream->isSeekable();
     }
 
+    public function rewind()
+    {
+        $this->seek(0);
+    }
+
     public function seek($offset, $whence = SEEK_SET)
     {
-        return $this->stream->seek($offset, $whence);
+        $this->stream->seek($offset, $whence);
     }
 
     public function read($length)
@@ -137,7 +144,6 @@ trait StreamDecoratorTrait
      */
     protected function createStream()
     {
-        throw new \BadMethodCallException('createStream() not implemented in '
-            . get_class($this));
+        throw new \BadMethodCallException('Not implemented');
     }
 }
diff --git a/core/vendor/guzzlehttp/streams/src/GuzzleStreamWrapper.php b/core/vendor/guzzlehttp/psr7/src/StreamWrapper.php
similarity index 94%
rename from core/vendor/guzzlehttp/streams/src/GuzzleStreamWrapper.php
rename to core/vendor/guzzlehttp/psr7/src/StreamWrapper.php
index 4d049a693..cf7b2232e 100644
--- a/core/vendor/guzzlehttp/streams/src/GuzzleStreamWrapper.php
+++ b/core/vendor/guzzlehttp/psr7/src/StreamWrapper.php
@@ -1,10 +1,12 @@
 <?php
-namespace GuzzleHttp\Stream;
+namespace GuzzleHttp\Psr7;
+
+use Psr\Http\Message\StreamInterface;
 
 /**
  * Converts Guzzle streams into PHP stream resources.
  */
-class GuzzleStreamWrapper
+class StreamWrapper
 {
     /** @var resource */
     public $context;
@@ -87,7 +89,9 @@ class GuzzleStreamWrapper
 
     public function stream_seek($offset, $whence)
     {
-        return $this->stream->seek($offset, $whence);
+        $this->stream->seek($offset, $whence);
+
+        return true;
     }
 
     public function stream_stat()
diff --git a/core/vendor/guzzlehttp/psr7/src/Uri.php b/core/vendor/guzzlehttp/psr7/src/Uri.php
new file mode 100644
index 000000000..58c306672
--- /dev/null
+++ b/core/vendor/guzzlehttp/psr7/src/Uri.php
@@ -0,0 +1,604 @@
+<?php
+namespace GuzzleHttp\Psr7;
+
+use Psr\Http\Message\UriInterface;
+
+/**
+ * Basic PSR-7 URI implementation.
+ *
+ * @link https://github.com/phly/http This class is based upon
+ *     Matthew Weier O'Phinney's URI implementation in phly/http.
+ */
+class Uri implements UriInterface
+{
+    private static $schemes = [
+        'http'  => 80,
+        'https' => 443,
+    ];
+
+    private static $charUnreserved = 'a-zA-Z0-9_\-\.~';
+    private static $charSubDelims = '!\$&\'\(\)\*\+,;=';
+    private static $replaceQuery = ['=' => '%3D', '&' => '%26'];
+
+    /** @var string Uri scheme. */
+    private $scheme = '';
+
+    /** @var string Uri user info. */
+    private $userInfo = '';
+
+    /** @var string Uri host. */
+    private $host = '';
+
+    /** @var int|null Uri port. */
+    private $port;
+
+    /** @var string Uri path. */
+    private $path = '';
+
+    /** @var string Uri query string. */
+    private $query = '';
+
+    /** @var string Uri fragment. */
+    private $fragment = '';
+
+    /**
+     * @param string $uri URI to parse and wrap.
+     */
+    public function __construct($uri = '')
+    {
+        if ($uri != null) {
+            $parts = parse_url($uri);
+            if ($parts === false) {
+                throw new \InvalidArgumentException("Unable to parse URI: $uri");
+            }
+            $this->applyParts($parts);
+        }
+    }
+
+    public function __toString()
+    {
+        return self::createUriString(
+            $this->scheme,
+            $this->getAuthority(),
+            $this->getPath(),
+            $this->query,
+            $this->fragment
+        );
+    }
+
+    /**
+     * Removes dot segments from a path and returns the new path.
+     *
+     * @param string $path
+     *
+     * @return string
+     * @link http://tools.ietf.org/html/rfc3986#section-5.2.4
+     */
+    public static function removeDotSegments($path)
+    {
+        static $noopPaths = ['' => true, '/' => true, '*' => true];
+        static $ignoreSegments = ['.' => true, '..' => true];
+
+        if (isset($noopPaths[$path])) {
+            return $path;
+        }
+
+        $results = [];
+        $segments = explode('/', $path);
+        foreach ($segments as $segment) {
+            if ($segment == '..') {
+                array_pop($results);
+            } elseif (!isset($ignoreSegments[$segment])) {
+                $results[] = $segment;
+            }
+        }
+
+        $newPath = implode('/', $results);
+        // Add the leading slash if necessary
+        if (substr($path, 0, 1) === '/' &&
+            substr($newPath, 0, 1) !== '/'
+        ) {
+            $newPath = '/' . $newPath;
+        }
+
+        // Add the trailing slash if necessary
+        if ($newPath != '/' && isset($ignoreSegments[end($segments)])) {
+            $newPath .= '/';
+        }
+
+        return $newPath;
+    }
+
+    /**
+     * Resolve a base URI with a relative URI and return a new URI.
+     *
+     * @param UriInterface $base Base URI
+     * @param string       $rel  Relative URI
+     *
+     * @return UriInterface
+     */
+    public static function resolve(UriInterface $base, $rel)
+    {
+        if ($rel === null || $rel === '') {
+            return $base;
+        }
+
+        if ($rel instanceof UriInterface) {
+            $relParts = [
+                'scheme'   => $rel->getScheme(),
+                'host'     => $rel->getHost(),
+                'port'     => $rel->getPort(),
+                'path'     => $rel->getPath(),
+                'query'    => $rel->getQuery(),
+                'fragment' => $rel->getFragment()
+            ];
+        } else {
+            $relParts = parse_url($rel) + [
+                'scheme'   => '',
+                'host'     => '',
+                'port'     => '',
+                'path'     => '',
+                'query'    => '',
+                'fragment' => ''
+            ];
+        }
+
+        if (!empty($relParts['scheme']) && !empty($relParts['host'])) {
+            return $rel instanceof UriInterface
+                ? $rel
+                : self::fromParts($relParts);
+        }
+
+        $parts = [
+            'scheme'   => $base->getScheme(),
+            'host'     => $base->getHost(),
+            'port'     => $base->getPort(),
+            'path'     => $base->getPath(),
+            'query'    => $base->getQuery(),
+            'fragment' => $base->getFragment()
+        ];
+
+        if (!empty($relParts['host'])) {
+            $parts['host'] = $relParts['host'];
+            $parts['port'] = $relParts['port'];
+            $parts['path'] = self::removeDotSegments($relParts['path']);
+            $parts['query'] = $relParts['query'];
+            $parts['fragment'] = $relParts['fragment'];
+        } elseif (!empty($relParts['path'])) {
+            if (substr($relParts['path'], 0, 1) == '/') {
+                $parts['path'] = self::removeDotSegments($relParts['path']);
+                $parts['query'] = $relParts['query'];
+                $parts['fragment'] = $relParts['fragment'];
+            } else {
+                if (!empty($parts['host']) && empty($parts['path'])) {
+                    $mergedPath = '/';
+                } else {
+                    $mergedPath = substr($parts['path'], 0, strrpos($parts['path'], '/') + 1);
+                }
+                $parts['path'] = self::removeDotSegments($mergedPath . $relParts['path']);
+                $parts['query'] = $relParts['query'];
+                $parts['fragment'] = $relParts['fragment'];
+            }
+        } elseif (!empty($relParts['query'])) {
+            $parts['query'] = $relParts['query'];
+        } elseif ($relParts['fragment'] != null) {
+            $parts['fragment'] = $relParts['fragment'];
+        }
+
+        return static::fromParts($parts);
+    }
+
+    /**
+     * Create a new URI with a specific query string value removed.
+     *
+     * Any existing query string values that exactly match the provided key are
+     * removed.
+     *
+     * Note: this function will convert "=" to "%3D" and "&" to "%26".
+     *
+     * @param UriInterface $uri URI to use as a base.
+     * @param string       $key Query string key value pair to remove.
+     *
+     * @return UriInterface
+     */
+    public static function withoutQueryValue(UriInterface $uri, $key)
+    {
+        $current = $uri->getQuery();
+        if (!$current) {
+            return $uri;
+        }
+
+        $result = [];
+        foreach (explode('&', $current) as $part) {
+            if (explode('=', $part)[0] !== $key) {
+                $result[] = $part;
+            };
+        }
+
+        return $uri->withQuery(implode('&', $result));
+    }
+
+    /**
+     * Create a new URI with a specific query string value.
+     *
+     * Any existing query string values that exactly match the provided key are
+     * removed and replaced with the given key value pair.
+     *
+     * Note: this function will convert "=" to "%3D" and "&" to "%26".
+     *
+     * @param UriInterface $uri URI to use as a base.
+     * @param string $key   Key to set.
+     * @param string $value Value to set.
+     *
+     * @return UriInterface
+     */
+    public static function withQueryValue(UriInterface $uri, $key, $value)
+    {
+        $current = $uri->getQuery();
+        $key = strtr($key, self::$replaceQuery);
+
+        if (!$current) {
+            $result = [];
+        } else {
+            $result = [];
+            foreach (explode('&', $current) as $part) {
+                if (explode('=', $part)[0] !== $key) {
+                    $result[] = $part;
+                };
+            }
+        }
+
+        if ($value !== null) {
+            $result[] = $key . '=' . strtr($value, self::$replaceQuery);
+        } else {
+            $result[] = $key;
+        }
+
+        return $uri->withQuery(implode('&', $result));
+    }
+
+    /**
+     * Create a URI from a hash of parse_url parts.
+     *
+     * @param array $parts
+     *
+     * @return self
+     */
+    public static function fromParts(array $parts)
+    {
+        $uri = new self();
+        $uri->applyParts($parts);
+        return $uri;
+    }
+
+    public function getScheme()
+    {
+        return $this->scheme;
+    }
+
+    public function getAuthority()
+    {
+        if (empty($this->host)) {
+            return '';
+        }
+
+        $authority = $this->host;
+        if (!empty($this->userInfo)) {
+            $authority = $this->userInfo . '@' . $authority;
+        }
+
+        if ($this->isNonStandardPort($this->scheme, $this->host, $this->port)) {
+            $authority .= ':' . $this->port;
+        }
+
+        return $authority;
+    }
+
+    public function getUserInfo()
+    {
+        return $this->userInfo;
+    }
+
+    public function getHost()
+    {
+        return $this->host;
+    }
+
+    public function getPort()
+    {
+        return $this->port;
+    }
+
+    public function getPath()
+    {
+        return $this->path == null ? '' : $this->path;
+    }
+
+    public function getQuery()
+    {
+        return $this->query;
+    }
+
+    public function getFragment()
+    {
+        return $this->fragment;
+    }
+
+    public function withScheme($scheme)
+    {
+        $scheme = $this->filterScheme($scheme);
+
+        if ($this->scheme === $scheme) {
+            return $this;
+        }
+
+        $new = clone $this;
+        $new->scheme = $scheme;
+        $new->port = $new->filterPort($new->scheme, $new->host, $new->port);
+        return $new;
+    }
+
+    public function withUserInfo($user, $password = null)
+    {
+        $info = $user;
+        if ($password) {
+            $info .= ':' . $password;
+        }
+
+        if ($this->userInfo === $info) {
+            return $this;
+        }
+
+        $new = clone $this;
+        $new->userInfo = $info;
+        return $new;
+    }
+
+    public function withHost($host)
+    {
+        if ($this->host === $host) {
+            return $this;
+        }
+
+        $new = clone $this;
+        $new->host = $host;
+        return $new;
+    }
+
+    public function withPort($port)
+    {
+        $port = $this->filterPort($this->scheme, $this->host, $port);
+
+        if ($this->port === $port) {
+            return $this;
+        }
+
+        $new = clone $this;
+        $new->port = $port;
+        return $new;
+    }
+
+    public function withPath($path)
+    {
+        if (!is_string($path)) {
+            throw new \InvalidArgumentException(
+                'Invalid path provided; must be a string'
+            );
+        }
+
+        $path = $this->filterPath($path);
+
+        if ($this->path === $path) {
+            return $this;
+        }
+
+        $new = clone $this;
+        $new->path = $path;
+        return $new;
+    }
+
+    public function withQuery($query)
+    {
+        if (!is_string($query) && !method_exists($query, '__toString')) {
+            throw new \InvalidArgumentException(
+                'Query string must be a string'
+            );
+        }
+
+        $query = (string) $query;
+        if (substr($query, 0, 1) === '?') {
+            $query = substr($query, 1);
+        }
+
+        $query = $this->filterQueryAndFragment($query);
+
+        if ($this->query === $query) {
+            return $this;
+        }
+
+        $new = clone $this;
+        $new->query = $query;
+        return $new;
+    }
+
+    public function withFragment($fragment)
+    {
+        if (substr($fragment, 0, 1) === '#') {
+            $fragment = substr($fragment, 1);
+        }
+
+        $fragment = $this->filterQueryAndFragment($fragment);
+
+        if ($this->fragment === $fragment) {
+            return $this;
+        }
+
+        $new = clone $this;
+        $new->fragment = $fragment;
+        return $new;
+    }
+
+    /**
+     * Apply parse_url parts to a URI.
+     *
+     * @param $parts Array of parse_url parts to apply.
+     */
+    private function applyParts(array $parts)
+    {
+        $this->scheme = isset($parts['scheme'])
+            ? $this->filterScheme($parts['scheme'])
+            : '';
+        $this->userInfo = isset($parts['user']) ? $parts['user'] : '';
+        $this->host = isset($parts['host']) ? $parts['host'] : '';
+        $this->port = !empty($parts['port'])
+            ? $this->filterPort($this->scheme, $this->host, $parts['port'])
+            : null;
+        $this->path = isset($parts['path'])
+            ? $this->filterPath($parts['path'])
+            : '';
+        $this->query = isset($parts['query'])
+            ? $this->filterQueryAndFragment($parts['query'])
+            : '';
+        $this->fragment = isset($parts['fragment'])
+            ? $this->filterQueryAndFragment($parts['fragment'])
+            : '';
+        if (isset($parts['pass'])) {
+            $this->userInfo .= ':' . $parts['pass'];
+        }
+    }
+
+    /**
+     * Create a URI string from its various parts
+     *
+     * @param string $scheme
+     * @param string $authority
+     * @param string $path
+     * @param string $query
+     * @param string $fragment
+     * @return string
+     */
+    private static function createUriString($scheme, $authority, $path, $query, $fragment)
+    {
+        $uri = '';
+
+        if (!empty($scheme)) {
+            $uri .= $scheme . '://';
+        }
+
+        if (!empty($authority)) {
+            $uri .= $authority;
+        }
+
+        if ($path != null) {
+            // Add a leading slash if necessary.
+            if ($uri && substr($path, 0, 1) !== '/') {
+                $uri .= '/';
+            }
+            $uri .= $path;
+        }
+
+        if ($query != null) {
+            $uri .= '?' . $query;
+        }
+
+        if ($fragment != null) {
+            $uri .= '#' . $fragment;
+        }
+
+        return $uri;
+    }
+
+    /**
+     * Is a given port non-standard for the current scheme?
+     *
+     * @param string $scheme
+     * @param string $host
+     * @param int $port
+     * @return bool
+     */
+    private static function isNonStandardPort($scheme, $host, $port)
+    {
+        if (!$scheme && $port) {
+            return true;
+        }
+
+        if (!$host || !$port) {
+            return false;
+        }
+
+        return !isset(static::$schemes[$scheme]) || $port !== static::$schemes[$scheme];
+    }
+
+    /**
+     * @param string $scheme
+     *
+     * @return string
+     */
+    private function filterScheme($scheme)
+    {
+        $scheme = strtolower($scheme);
+        $scheme = rtrim($scheme, ':/');
+
+        return $scheme;
+    }
+
+    /**
+     * @param string $scheme
+     * @param string $host
+     * @param int $port
+     *
+     * @return int|null
+     *
+     * @throws \InvalidArgumentException If the port is invalid.
+     */
+    private function filterPort($scheme, $host, $port)
+    {
+        if (null !== $port) {
+            $port = (int) $port;
+            if (1 > $port || 0xffff < $port) {
+                throw new \InvalidArgumentException(
+                    sprintf('Invalid port: %d. Must be between 1 and 65535', $port)
+                );
+            }
+        }
+
+        return $this->isNonStandardPort($scheme, $host, $port) ? $port : null;
+    }
+
+    /**
+     * Filters the path of a URI
+     *
+     * @param $path
+     *
+     * @return string
+     */
+    private function filterPath($path)
+    {
+        return preg_replace_callback(
+            '/(?:[^' . self::$charUnreserved . self::$charSubDelims . ':@\/%]+|%(?![A-Fa-f0-9]{2}))/',
+            [$this, 'rawurlencodeMatchZero'],
+            $path
+        );
+    }
+
+    /**
+     * Filters the query string or fragment of a URI.
+     *
+     * @param $str
+     *
+     * @return string
+     */
+    private function filterQueryAndFragment($str)
+    {
+        return preg_replace_callback(
+            '/(?:[^' . self::$charUnreserved . self::$charSubDelims . '%:@\/\?]+|%(?![A-Fa-f0-9]{2}))/',
+            [$this, 'rawurlencodeMatchZero'],
+            $str
+        );
+    }
+
+    private function rawurlencodeMatchZero(array $match)
+    {
+        return rawurlencode($match[0]);
+    }
+}
diff --git a/core/vendor/guzzlehttp/psr7/src/functions.php b/core/vendor/guzzlehttp/psr7/src/functions.php
new file mode 100644
index 000000000..a1cec4178
--- /dev/null
+++ b/core/vendor/guzzlehttp/psr7/src/functions.php
@@ -0,0 +1,799 @@
+<?php
+namespace GuzzleHttp\Psr7;
+
+use Psr\Http\Message\MessageInterface;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\StreamInterface;
+use Psr\Http\Message\UriInterface;
+
+/**
+ * Returns the string representation of an HTTP message.
+ *
+ * @param MessageInterface $message Message to convert to a string.
+ *
+ * @return string
+ */
+function str(MessageInterface $message)
+{
+    if ($message instanceof RequestInterface) {
+        $msg = trim($message->getMethod() . ' '
+                . $message->getRequestTarget())
+            . ' HTTP/' . $message->getProtocolVersion();
+        if (!$message->hasHeader('host')) {
+            $msg .= "\r\nHost: " . $message->getUri()->getHost();
+        }
+    } elseif ($message instanceof ResponseInterface) {
+        $msg = 'HTTP/' . $message->getProtocolVersion() . ' '
+            . $message->getStatusCode() . ' '
+            . $message->getReasonPhrase();
+    } else {
+        throw new \InvalidArgumentException('Unknown message type');
+    }
+
+    foreach ($message->getHeaders() as $name => $values) {
+        $msg .= "\r\n{$name}: " . implode(', ', $values);
+    }
+
+    return "{$msg}\r\n\r\n" . $message->getBody();
+}
+
+/**
+ * Returns a UriInterface for the given value.
+ *
+ * This function accepts a string or {@see Psr\Http\Message\UriInterface} and
+ * returns a UriInterface for the given value. If the value is already a
+ * `UriInterface`, it is returned as-is.
+ *
+ * @param string|UriInterface $uri
+ *
+ * @return UriInterface
+ * @throws \InvalidArgumentException
+ */
+function uri_for($uri)
+{
+    if ($uri instanceof UriInterface) {
+        return $uri;
+    } elseif (is_string($uri)) {
+        return new Uri($uri);
+    }
+
+    throw new \InvalidArgumentException('URI must be a string or UriInterface');
+}
+
+/**
+ * Create a new stream based on the input type.
+ *
+ * Options is an associative array that can contain the following keys:
+ * - metadata: Array of custom metadata.
+ * - size: Size of the stream.
+ *
+ * @param resource|string|StreamInterface $resource Entity body data
+ * @param array                           $options  Additional options
+ *
+ * @return Stream
+ * @throws \InvalidArgumentException if the $resource arg is not valid.
+ */
+function stream_for($resource = '', array $options = [])
+{
+    switch (gettype($resource)) {
+        case 'string':
+            $stream = fopen('php://temp', 'r+');
+            if ($resource !== '') {
+                fwrite($stream, $resource);
+                fseek($stream, 0);
+            }
+            return new Stream($stream, $options);
+        case 'resource':
+            return new Stream($resource, $options);
+        case 'object':
+            if ($resource instanceof StreamInterface) {
+                return $resource;
+            } elseif ($resource instanceof \Iterator) {
+                return new PumpStream(function () use ($resource) {
+                    if (!$resource->valid()) {
+                        return false;
+                    }
+                    $result = $resource->current();
+                    $resource->next();
+                    return $result;
+                }, $options);
+            } elseif (method_exists($resource, '__toString')) {
+                return stream_for((string) $resource, $options);
+            }
+            break;
+        case 'NULL':
+            return new Stream(fopen('php://temp', 'r+'), $options);
+    }
+
+    if (is_callable($resource)) {
+        return new PumpStream($resource, $options);
+    }
+
+    throw new \InvalidArgumentException('Invalid resource type: ' . gettype($resource));
+}
+
+/**
+ * Parse an array of header values containing ";" separated data into an
+ * array of associative arrays representing the header key value pair
+ * data of the header. When a parameter does not contain a value, but just
+ * contains a key, this function will inject a key with a '' string value.
+ *
+ * @param string|array $header Header to parse into components.
+ *
+ * @return array Returns the parsed header values.
+ */
+function parse_header($header)
+{
+    static $trimmed = "\"'  \n\t\r";
+    $params = $matches = [];
+
+    foreach (normalize_header($header) as $val) {
+        $part = [];
+        foreach (preg_split('/;(?=([^"]*"[^"]*")*[^"]*$)/', $val) as $kvp) {
+            if (preg_match_all('/<[^>]+>|[^=]+/', $kvp, $matches)) {
+                $m = $matches[0];
+                if (isset($m[1])) {
+                    $part[trim($m[0], $trimmed)] = trim($m[1], $trimmed);
+                } else {
+                    $part[] = trim($m[0], $trimmed);
+                }
+            }
+        }
+        if ($part) {
+            $params[] = $part;
+        }
+    }
+
+    return $params;
+}
+
+/**
+ * Converts an array of header values that may contain comma separated
+ * headers into an array of headers with no comma separated values.
+ *
+ * @param string|array $header Header to normalize.
+ *
+ * @return array Returns the normalized header field values.
+ */
+function normalize_header($header)
+{
+    if (!is_array($header)) {
+        return array_map('trim', explode(',', $header));
+    }
+
+    $result = [];
+    foreach ($header as $value) {
+        foreach ((array) $value as $v) {
+            if (strpos($v, ',') === false) {
+                $result[] = $v;
+                continue;
+            }
+            foreach (preg_split('/,(?=([^"]*"[^"]*")*[^"]*$)/', $v) as $vv) {
+                $result[] = trim($vv);
+            }
+        }
+    }
+
+    return $result;
+}
+
+/**
+ * Clone and modify a request with the given changes.
+ *
+ * The changes can be one of:
+ * - method: (string) Changes the HTTP method.
+ * - set_headers: (array) Sets the given headers.
+ * - remove_headers: (array) Remove the given headers.
+ * - body: (mixed) Sets the given body.
+ * - uri: (UriInterface) Set the URI.
+ * - query: (string) Set the query string value of the URI.
+ * - version: (string) Set the protocol version.
+ *
+ * @param RequestInterface $request Request to clone and modify.
+ * @param array            $changes Changes to apply.
+ *
+ * @return RequestInterface
+ */
+function modify_request(RequestInterface $request, array $changes)
+{
+    if (!$changes) {
+        return $request;
+    }
+
+    $headers = $request->getHeaders();
+
+    if (!isset($changes['uri'])) {
+        $uri = $request->getUri();
+    } else {
+        // Remove the host header if one is on the URI
+        if ($host = $changes['uri']->getHost()) {
+            $changes['set_headers']['Host'] = $host;
+        }
+        $uri = $changes['uri'];
+    }
+
+    if (!empty($changes['remove_headers'])) {
+        $headers = _caseless_remove($changes['remove_headers'], $headers);
+    }
+
+    if (!empty($changes['set_headers'])) {
+        $headers = _caseless_remove(array_keys($changes['set_headers']), $headers);
+        $headers = $changes['set_headers'] + $headers;
+    }
+
+    if (isset($changes['query'])) {
+        $uri = $uri->withQuery($changes['query']);
+    }
+
+    return new Request(
+        isset($changes['method']) ? $changes['method'] : $request->getMethod(),
+        $uri,
+        $headers,
+        isset($changes['body']) ? $changes['body'] : $request->getBody(),
+        isset($changes['version'])
+            ? $changes['version']
+            : $request->getProtocolVersion()
+    );
+}
+
+/**
+ * Attempts to rewind a message body and throws an exception on failure.
+ *
+ * The body of the message will only be rewound if a call to `tell()` returns a
+ * value other than `0`.
+ *
+ * @param MessageInterface $message Message to rewind
+ *
+ * @throws \RuntimeException
+ */
+function rewind_body(MessageInterface $message)
+{
+    $body = $message->getBody();
+
+    if ($body->tell()) {
+        $body->rewind();
+    }
+}
+
+/**
+ * Safely opens a PHP stream resource using a filename.
+ *
+ * When fopen fails, PHP normally raises a warning. This function adds an
+ * error handler that checks for errors and throws an exception instead.
+ *
+ * @param string $filename File to open
+ * @param string $mode     Mode used to open the file
+ *
+ * @return resource
+ * @throws \RuntimeException if the file cannot be opened
+ */
+function try_fopen($filename, $mode)
+{
+    $ex = null;
+    set_error_handler(function () use ($filename, $mode, &$ex) {
+        $ex = new \RuntimeException(sprintf(
+            'Unable to open %s using mode %s: %s',
+            $filename,
+            $mode,
+            func_get_args()[1]
+        ));
+    });
+
+    $handle = fopen($filename, $mode);
+    restore_error_handler();
+
+    if ($ex) {
+        /** @var $ex \RuntimeException */
+        throw $ex;
+    }
+
+    return $handle;
+}
+
+/**
+ * Copy the contents of a stream into a string until the given number of
+ * bytes have been read.
+ *
+ * @param StreamInterface $stream Stream to read
+ * @param int             $maxLen Maximum number of bytes to read. Pass -1
+ *                                to read the entire stream.
+ * @return string
+ * @throws \RuntimeException on error.
+ */
+function copy_to_string(StreamInterface $stream, $maxLen = -1)
+{
+    $buffer = '';
+
+    if ($maxLen === -1) {
+        while (!$stream->eof()) {
+            $buf = $stream->read(1048576);
+            // Using a loose equality here to match on '' and false.
+            if ($buf == null) {
+                break;
+            }
+            $buffer .= $buf;
+        }
+        return $buffer;
+    }
+
+    $len = 0;
+    while (!$stream->eof() && $len < $maxLen) {
+        $buf = $stream->read($maxLen - $len);
+        // Using a loose equality here to match on '' and false.
+        if ($buf == null) {
+            break;
+        }
+        $buffer .= $buf;
+        $len = strlen($buffer);
+    }
+
+    return $buffer;
+}
+
+/**
+ * Copy the contents of a stream into another stream until the given number
+ * of bytes have been read.
+ *
+ * @param StreamInterface $source Stream to read from
+ * @param StreamInterface $dest   Stream to write to
+ * @param int             $maxLen Maximum number of bytes to read. Pass -1
+ *                                to read the entire stream.
+ *
+ * @throws \RuntimeException on error.
+ */
+function copy_to_stream(
+    StreamInterface $source,
+    StreamInterface $dest,
+    $maxLen = -1
+) {
+    if ($maxLen === -1) {
+        while (!$source->eof()) {
+            if (!$dest->write($source->read(1048576))) {
+                break;
+            }
+        }
+        return;
+    }
+
+    $bytes = 0;
+    while (!$source->eof()) {
+        $buf = $source->read($maxLen - $bytes);
+        if (!($len = strlen($buf))) {
+            break;
+        }
+        $bytes += $len;
+        $dest->write($buf);
+        if ($bytes == $maxLen) {
+            break;
+        }
+    }
+}
+
+/**
+ * Calculate a hash of a Stream
+ *
+ * @param StreamInterface $stream    Stream to calculate the hash for
+ * @param string          $algo      Hash algorithm (e.g. md5, crc32, etc)
+ * @param bool            $rawOutput Whether or not to use raw output
+ *
+ * @return string Returns the hash of the stream
+ * @throws \RuntimeException on error.
+ */
+function hash(
+    StreamInterface $stream,
+    $algo,
+    $rawOutput = false
+) {
+    $pos = $stream->tell();
+
+    if ($pos > 0) {
+        $stream->rewind();
+    }
+
+    $ctx = hash_init($algo);
+    while (!$stream->eof()) {
+        hash_update($ctx, $stream->read(1048576));
+    }
+
+    $out = hash_final($ctx, (bool) $rawOutput);
+    $stream->seek($pos);
+
+    return $out;
+}
+
+/**
+ * Read a line from the stream up to the maximum allowed buffer length
+ *
+ * @param StreamInterface $stream    Stream to read from
+ * @param int             $maxLength Maximum buffer length
+ *
+ * @return string|bool
+ */
+function readline(StreamInterface $stream, $maxLength = null)
+{
+    $buffer = '';
+    $size = 0;
+
+    while (!$stream->eof()) {
+        // Using a loose equality here to match on '' and false.
+        if (null == ($byte = $stream->read(1))) {
+            return $buffer;
+        }
+        $buffer .= $byte;
+        // Break when a new line is found or the max length - 1 is reached
+        if ($byte == PHP_EOL || ++$size == $maxLength - 1) {
+            break;
+        }
+    }
+
+    return $buffer;
+}
+
+/**
+ * Parses a request message string into a request object.
+ *
+ * @param string $message Request message string.
+ *
+ * @return Request
+ */
+function parse_request($message)
+{
+    $data = _parse_message($message);
+    if (!preg_match('/^[a-zA-Z]+\s+\/.*/', $data['start-line'])) {
+        throw new \InvalidArgumentException('Invalid request string');
+    }
+    $parts = explode(' ', $data['start-line'], 3);
+    $version = isset($parts[2]) ? explode('/', $parts[2])[1] : '1.1';
+
+    return new Request(
+        $parts[0],
+        _parse_request_uri($parts[1], $data['headers']),
+        $data['headers'],
+        $data['body'],
+        $version
+    );
+}
+
+/**
+ * Parses a response message string into a response object.
+ *
+ * @param string $message Response message string.
+ *
+ * @return Response
+ */
+function parse_response($message)
+{
+    $data = _parse_message($message);
+    if (!preg_match('/^HTTP\/.* [0-9]{3} .*/', $data['start-line'])) {
+        throw new \InvalidArgumentException('Invalid response string');
+    }
+    $parts = explode(' ', $data['start-line'], 3);
+
+    return new Response(
+        $parts[1],
+        $data['headers'],
+        $data['body'],
+        explode('/', $parts[0])[1],
+        isset($parts[2]) ? $parts[2] : null
+    );
+}
+
+/**
+ * Parse a query string into an associative array.
+ *
+ * If multiple values are found for the same key, the value of that key
+ * value pair will become an array. This function does not parse nested
+ * PHP style arrays into an associative array (e.g., foo[a]=1&foo[b]=2 will
+ * be parsed into ['foo[a]' => '1', 'foo[b]' => '2']).
+ *
+ * @param string      $str         Query string to parse
+ * @param bool|string $urlEncoding How the query string is encoded
+ *
+ * @return array
+ */
+function parse_query($str, $urlEncoding = true)
+{
+    $result = [];
+
+    if ($str === '') {
+        return $result;
+    }
+
+    if ($urlEncoding === true) {
+        $decoder = function ($value) {
+            return rawurldecode(str_replace('+', ' ', $value));
+        };
+    } elseif ($urlEncoding == PHP_QUERY_RFC3986) {
+        $decoder = 'rawurldecode';
+    } elseif ($urlEncoding == PHP_QUERY_RFC1738) {
+        $decoder = 'urldecode';
+    } else {
+        $decoder = function ($str) { return $str; };
+    }
+
+    foreach (explode('&', $str) as $kvp) {
+        $parts = explode('=', $kvp, 2);
+        $key = $decoder($parts[0]);
+        $value = isset($parts[1]) ? $decoder($parts[1]) : null;
+        if (!isset($result[$key])) {
+            $result[$key] = $value;
+        } else {
+            if (!is_array($result[$key])) {
+                $result[$key] = [$result[$key]];
+            }
+            $result[$key][] = $value;
+        }
+    }
+
+    return $result;
+}
+
+/**
+ * Build a query string from an array of key value pairs.
+ *
+ * This function can use the return value of parseQuery() to build a query
+ * string. This function does not modify the provided keys when an array is
+ * encountered (like http_build_query would).
+ *
+ * @param array     $params   Query string parameters.
+ * @param int|false $encoding Set to false to not encode, PHP_QUERY_RFC3986
+ *                            to encode using RFC3986, or PHP_QUERY_RFC1738
+ *                            to encode using RFC1738.
+ * @return string
+ */
+function build_query(array $params, $encoding = PHP_QUERY_RFC3986)
+{
+    if (!$params) {
+        return '';
+    }
+
+    if ($encoding === false) {
+        $encoder = function ($str) { return $str; };
+    } elseif ($encoding == PHP_QUERY_RFC3986) {
+        $encoder = 'rawurlencode';
+    } elseif ($encoding == PHP_QUERY_RFC1738) {
+        $encoder = 'urlencode';
+    } else {
+        throw new \InvalidArgumentException('Invalid type');
+    }
+
+    $qs = '';
+    foreach ($params as $k => $v) {
+        $k = $encoder($k);
+        if (!is_array($v)) {
+            $qs .= $k;
+            if ($v !== null) {
+                $qs .= '=' . $encoder($v);
+            }
+            $qs .= '&';
+        } else {
+            foreach ($v as $vv) {
+                $qs .= $k;
+                if ($vv !== null) {
+                    $qs .= '=' . $encoder($vv);
+                }
+                $qs .= '&';
+            }
+        }
+    }
+
+    return $qs ? (string) substr($qs, 0, -1) : '';
+}
+
+/**
+ * Determines the mimetype of a file by looking at its extension.
+ *
+ * @param $filename
+ *
+ * @return null|string
+ */
+function mimetype_from_filename($filename)
+{
+    return mimetype_from_extension(pathinfo($filename, PATHINFO_EXTENSION));
+}
+
+/**
+ * Maps a file extensions to a mimetype.
+ *
+ * @param $extension string The file extension.
+ *
+ * @return string|null
+ * @link http://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x/conf/mime.types
+ */
+function mimetype_from_extension($extension)
+{
+    static $mimetypes = [
+        '7z' => 'application/x-7z-compressed',
+        'aac' => 'audio/x-aac',
+        'ai' => 'application/postscript',
+        'aif' => 'audio/x-aiff',
+        'asc' => 'text/plain',
+        'asf' => 'video/x-ms-asf',
+        'atom' => 'application/atom+xml',
+        'avi' => 'video/x-msvideo',
+        'bmp' => 'image/bmp',
+        'bz2' => 'application/x-bzip2',
+        'cer' => 'application/pkix-cert',
+        'crl' => 'application/pkix-crl',
+        'crt' => 'application/x-x509-ca-cert',
+        'css' => 'text/css',
+        'csv' => 'text/csv',
+        'cu' => 'application/cu-seeme',
+        'deb' => 'application/x-debian-package',
+        'doc' => 'application/msword',
+        'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+        'dvi' => 'application/x-dvi',
+        'eot' => 'application/vnd.ms-fontobject',
+        'eps' => 'application/postscript',
+        'epub' => 'application/epub+zip',
+        'etx' => 'text/x-setext',
+        'flac' => 'audio/flac',
+        'flv' => 'video/x-flv',
+        'gif' => 'image/gif',
+        'gz' => 'application/gzip',
+        'htm' => 'text/html',
+        'html' => 'text/html',
+        'ico' => 'image/x-icon',
+        'ics' => 'text/calendar',
+        'ini' => 'text/plain',
+        'iso' => 'application/x-iso9660-image',
+        'jar' => 'application/java-archive',
+        'jpe' => 'image/jpeg',
+        'jpeg' => 'image/jpeg',
+        'jpg' => 'image/jpeg',
+        'js' => 'text/javascript',
+        'json' => 'application/json',
+        'latex' => 'application/x-latex',
+        'log' => 'text/plain',
+        'm4a' => 'audio/mp4',
+        'm4v' => 'video/mp4',
+        'mid' => 'audio/midi',
+        'midi' => 'audio/midi',
+        'mov' => 'video/quicktime',
+        'mp3' => 'audio/mpeg',
+        'mp4' => 'video/mp4',
+        'mp4a' => 'audio/mp4',
+        'mp4v' => 'video/mp4',
+        'mpe' => 'video/mpeg',
+        'mpeg' => 'video/mpeg',
+        'mpg' => 'video/mpeg',
+        'mpg4' => 'video/mp4',
+        'oga' => 'audio/ogg',
+        'ogg' => 'audio/ogg',
+        'ogv' => 'video/ogg',
+        'ogx' => 'application/ogg',
+        'pbm' => 'image/x-portable-bitmap',
+        'pdf' => 'application/pdf',
+        'pgm' => 'image/x-portable-graymap',
+        'png' => 'image/png',
+        'pnm' => 'image/x-portable-anymap',
+        'ppm' => 'image/x-portable-pixmap',
+        'ppt' => 'application/vnd.ms-powerpoint',
+        'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+        'ps' => 'application/postscript',
+        'qt' => 'video/quicktime',
+        'rar' => 'application/x-rar-compressed',
+        'ras' => 'image/x-cmu-raster',
+        'rss' => 'application/rss+xml',
+        'rtf' => 'application/rtf',
+        'sgm' => 'text/sgml',
+        'sgml' => 'text/sgml',
+        'svg' => 'image/svg+xml',
+        'swf' => 'application/x-shockwave-flash',
+        'tar' => 'application/x-tar',
+        'tif' => 'image/tiff',
+        'tiff' => 'image/tiff',
+        'torrent' => 'application/x-bittorrent',
+        'ttf' => 'application/x-font-ttf',
+        'txt' => 'text/plain',
+        'wav' => 'audio/x-wav',
+        'webm' => 'video/webm',
+        'wma' => 'audio/x-ms-wma',
+        'wmv' => 'video/x-ms-wmv',
+        'woff' => 'application/x-font-woff',
+        'wsdl' => 'application/wsdl+xml',
+        'xbm' => 'image/x-xbitmap',
+        'xls' => 'application/vnd.ms-excel',
+        'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+        'xml' => 'application/xml',
+        'xpm' => 'image/x-xpixmap',
+        'xwd' => 'image/x-xwindowdump',
+        'yaml' => 'text/yaml',
+        'yml' => 'text/yaml',
+        'zip' => 'application/zip',
+    ];
+
+    $extension = strtolower($extension);
+
+    return isset($mimetypes[$extension])
+        ? $mimetypes[$extension]
+        : null;
+}
+
+/**
+ * Parses an HTTP message into an associative array.
+ *
+ * The array contains the "start-line" key containing the start line of
+ * the message, "headers" key containing an associative array of header
+ * array values, and a "body" key containing the body of the message.
+ *
+ * @param string $message HTTP request or response to parse.
+ *
+ * @return array
+ * @internal
+ */
+function _parse_message($message)
+{
+    if (!$message) {
+        throw new \InvalidArgumentException('Invalid message');
+    }
+
+    // Iterate over each line in the message, accounting for line endings
+    $lines = preg_split('/(\\r?\\n)/', $message, -1, PREG_SPLIT_DELIM_CAPTURE);
+    $result = ['start-line' => array_shift($lines), 'headers' => [], 'body' => ''];
+    array_shift($lines);
+
+    for ($i = 0, $totalLines = count($lines); $i < $totalLines; $i += 2) {
+        $line = $lines[$i];
+        // If two line breaks were encountered, then this is the end of body
+        if (empty($line)) {
+            if ($i < $totalLines - 1) {
+                $result['body'] = implode('', array_slice($lines, $i + 2));
+            }
+            break;
+        }
+        if (strpos($line, ':')) {
+            $parts = explode(':', $line, 2);
+            $key = trim($parts[0]);
+            $value = isset($parts[1]) ? trim($parts[1]) : '';
+            $result['headers'][$key][] = $value;
+        }
+    }
+
+    return $result;
+}
+
+/**
+ * Constructs a URI for an HTTP request message.
+ *
+ * @param string $path    Path from the start-line
+ * @param array  $headers Array of headers (each value an array).
+ *
+ * @return string
+ * @internal
+ */
+function _parse_request_uri($path, array $headers)
+{
+    $hostKey = array_filter(array_keys($headers), function ($k) {
+        return strtolower($k) === 'host';
+    });
+
+    // If no host is found, then a full URI cannot be constructed.
+    if (!$hostKey) {
+        return $path;
+    }
+
+    $host = $headers[reset($hostKey)][0];
+    $scheme = substr($host, -4) === ':443' ? 'https' : 'http';
+
+    return $scheme . '://' . $host . '/' . ltrim($path, '/');
+}
+
+/** @internal */
+function _caseless_remove($keys, array $data)
+{
+    $result = [];
+
+    foreach ($keys as &$key) {
+        $key = strtolower($key);
+    }
+
+    foreach ($data as $k => $v) {
+        if (!in_array(strtolower($k), $keys)) {
+            $result[$k] = $v;
+        }
+    }
+
+    return $result;
+}
diff --git a/core/vendor/guzzlehttp/streams/tests/AppendStreamTest.php b/core/vendor/guzzlehttp/psr7/tests/AppendStreamTest.php
similarity index 69%
rename from core/vendor/guzzlehttp/streams/tests/AppendStreamTest.php
rename to core/vendor/guzzlehttp/psr7/tests/AppendStreamTest.php
index 78798d9f7..3c197dcea 100644
--- a/core/vendor/guzzlehttp/streams/tests/AppendStreamTest.php
+++ b/core/vendor/guzzlehttp/psr7/tests/AppendStreamTest.php
@@ -1,8 +1,8 @@
 <?php
-namespace GuzzleHttp\Tests\Stream;
+namespace GuzzleHttp\Tests\Psr7;
 
-use GuzzleHttp\Stream\AppendStream;
-use GuzzleHttp\Stream\Stream;
+use GuzzleHttp\Psr7\AppendStream;
+use GuzzleHttp\Psr7;
 
 class AppendStreamTest extends \PHPUnit_Framework_TestCase
 {
@@ -13,7 +13,7 @@ class AppendStreamTest extends \PHPUnit_Framework_TestCase
     public function testValidatesStreamsAreReadable()
     {
         $a = new AppendStream();
-        $s = $this->getMockBuilder('GuzzleHttp\Stream\StreamInterface')
+        $s = $this->getMockBuilder('Psr\Http\Message\StreamInterface')
             ->setMethods(['isReadable'])
             ->getMockForAbstractClass();
         $s->expects($this->once())
@@ -22,17 +22,25 @@ class AppendStreamTest extends \PHPUnit_Framework_TestCase
         $a->addStream($s);
     }
 
+    /**
+     * @expectedException \RuntimeException
+     * @expectedExceptionMessage The AppendStream can only seek with SEEK_SET
+     */
     public function testValidatesSeekType()
     {
         $a = new AppendStream();
-        $this->assertFalse($a->seek(100, SEEK_CUR));
+        $a->seek(100, SEEK_CUR);
     }
 
+    /**
+     * @expectedException \RuntimeException
+     * @expectedExceptionMessage Unable to seek stream 0 of the AppendStream
+     */
     public function testTriesToRewindOnSeek()
     {
         $a = new AppendStream();
-        $s = $this->getMockBuilder('GuzzleHttp\Stream\StreamInterface')
-            ->setMethods(['isReadable', 'seek', 'isSeekable'])
+        $s = $this->getMockBuilder('Psr\Http\Message\StreamInterface')
+            ->setMethods(['isReadable', 'rewind', 'isSeekable'])
             ->getMockForAbstractClass();
         $s->expects($this->once())
             ->method('isReadable')
@@ -41,23 +49,24 @@ class AppendStreamTest extends \PHPUnit_Framework_TestCase
             ->method('isSeekable')
             ->will($this->returnValue(true));
         $s->expects($this->once())
-            ->method('seek')
-            ->will($this->returnValue(false));
+            ->method('rewind')
+            ->will($this->throwException(new \RuntimeException()));
         $a->addStream($s);
-        $this->assertFalse($a->seek(10));
+        $a->seek(10);
     }
 
     public function testSeeksToPositionByReading()
     {
         $a = new AppendStream([
-            Stream::factory('foo'),
-            Stream::factory('bar'),
-            Stream::factory('baz'),
+            Psr7\stream_for('foo'),
+            Psr7\stream_for('bar'),
+            Psr7\stream_for('baz'),
         ]);
 
-        $this->assertTrue($a->seek(3));
+        $a->seek(3);
         $this->assertEquals(3, $a->tell());
         $this->assertEquals('bar', $a->read(3));
+
         $a->seek(6);
         $this->assertEquals(6, $a->tell());
         $this->assertEquals('baz', $a->read(3));
@@ -65,10 +74,10 @@ class AppendStreamTest extends \PHPUnit_Framework_TestCase
 
     public function testDetachesEachStream()
     {
-        $s1 = Stream::factory('foo');
-        $s2 = Stream::factory('foo');
+        $s1 = Psr7\stream_for('foo');
+        $s2 = Psr7\stream_for('bar');
         $a = new AppendStream([$s1, $s2]);
-        $this->assertSame('foofoo', (string) $a);
+        $this->assertSame('foobar', (string) $a);
         $a->detach();
         $this->assertSame('', (string) $a);
         $this->assertSame(0, $a->getSize());
@@ -76,19 +85,23 @@ class AppendStreamTest extends \PHPUnit_Framework_TestCase
 
     public function testClosesEachStream()
     {
-        $s1 = Stream::factory('foo');
+        $s1 = Psr7\stream_for('foo');
         $a = new AppendStream([$s1]);
         $a->close();
         $this->assertSame('', (string) $a);
     }
 
+    /**
+     * @expectedExceptionMessage Cannot write to an AppendStream
+     * @expectedException \RuntimeException
+     */
     public function testIsNotWritable()
     {
-        $a = new AppendStream([Stream::factory('foo')]);
+        $a = new AppendStream([Psr7\stream_for('foo')]);
         $this->assertFalse($a->isWritable());
         $this->assertTrue($a->isSeekable());
         $this->assertTrue($a->isReadable());
-        $this->assertFalse($a->write('foo'));
+        $a->write('foo');
     }
 
     public function testDoesNotNeedStreams()
@@ -100,15 +113,16 @@ class AppendStreamTest extends \PHPUnit_Framework_TestCase
     public function testCanReadFromMultipleStreams()
     {
         $a = new AppendStream([
-            Stream::factory('foo'),
-            Stream::factory('bar'),
-            Stream::factory('baz'),
+            Psr7\stream_for('foo'),
+            Psr7\stream_for('bar'),
+            Psr7\stream_for('baz'),
         ]);
         $this->assertFalse($a->eof());
         $this->assertSame(0, $a->tell());
         $this->assertEquals('foo', $a->read(3));
         $this->assertEquals('bar', $a->read(3));
         $this->assertEquals('baz', $a->read(3));
+        $this->assertSame('', $a->read(1));
         $this->assertTrue($a->eof());
         $this->assertSame(9, $a->tell());
         $this->assertEquals('foobarbaz', (string) $a);
@@ -117,12 +131,12 @@ class AppendStreamTest extends \PHPUnit_Framework_TestCase
     public function testCanDetermineSizeFromMultipleStreams()
     {
         $a = new AppendStream([
-            Stream::factory('foo'),
-            Stream::factory('bar')
+            Psr7\stream_for('foo'),
+            Psr7\stream_for('bar')
         ]);
         $this->assertEquals(6, $a->getSize());
 
-        $s = $this->getMockBuilder('GuzzleHttp\Stream\StreamInterface')
+        $s = $this->getMockBuilder('Psr\Http\Message\StreamInterface')
             ->setMethods(['isSeekable', 'isReadable'])
             ->getMockForAbstractClass();
         $s->expects($this->once())
@@ -137,9 +151,12 @@ class AppendStreamTest extends \PHPUnit_Framework_TestCase
 
     public function testCatchesExceptionsWhenCastingToString()
     {
-        $s = $this->getMockBuilder('GuzzleHttp\Stream\StreamInterface')
-            ->setMethods(['read', 'isReadable', 'eof'])
+        $s = $this->getMockBuilder('Psr\Http\Message\StreamInterface')
+            ->setMethods(['isSeekable', 'read', 'isReadable', 'eof'])
             ->getMockForAbstractClass();
+        $s->expects($this->once())
+            ->method('isSeekable')
+            ->will($this->returnValue(true));
         $s->expects($this->once())
             ->method('read')
             ->will($this->throwException(new \RuntimeException('foo')));
@@ -166,13 +183,4 @@ class AppendStreamTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals([], $s->getMetadata());
         $this->assertNull($s->getMetadata('foo'));
     }
-
-    /**
-     * @expectedException \GuzzleHttp\Stream\Exception\CannotAttachException
-     */
-    public function testCannotAttach()
-    {
-        $p = new AppendStream();
-        $p->attach('a');
-    }
 }
diff --git a/core/vendor/guzzlehttp/streams/tests/BufferStreamTest.php b/core/vendor/guzzlehttp/psr7/tests/BufferStreamTest.php
similarity index 83%
rename from core/vendor/guzzlehttp/streams/tests/BufferStreamTest.php
rename to core/vendor/guzzlehttp/psr7/tests/BufferStreamTest.php
index f9bfea21d..0a635d467 100644
--- a/core/vendor/guzzlehttp/streams/tests/BufferStreamTest.php
+++ b/core/vendor/guzzlehttp/psr7/tests/BufferStreamTest.php
@@ -1,7 +1,7 @@
 <?php
-namespace GuzzleHttp\Tests\Stream;
+namespace GuzzleHttp\Tests\Psr7;
 
-use GuzzleHttp\Stream\BufferStream;
+use GuzzleHttp\Psr7\BufferStream;
 
 class BufferStreamTest extends \PHPUnit_Framework_TestCase
 {
@@ -27,6 +27,10 @@ class BufferStreamTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals('', $b->read(10));
     }
 
+    /**
+     * @expectedException \RuntimeException
+     * @expectedExceptionMessage Cannot determine the position of a BufferStream
+     */
     public function testCanCastToStringOrGetContents()
     {
         $b = new BufferStream();
@@ -35,7 +39,7 @@ class BufferStreamTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals('foo', $b->read(3));
         $b->write('bar');
         $this->assertEquals('bazbar', (string) $b);
-        $this->assertFalse($b->tell());
+        $b->tell();
     }
 
     public function testDetachClearsBuffer()
@@ -43,7 +47,6 @@ class BufferStreamTest extends \PHPUnit_Framework_TestCase
         $b = new BufferStream();
         $b->write('foo');
         $b->detach();
-        $this->assertEquals(0, $b->tell());
         $this->assertTrue($b->eof());
         $this->assertEquals(3, $b->write('abc'));
         $this->assertEquals('abc', $b->read(10));
@@ -57,13 +60,4 @@ class BufferStreamTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals('hi hello', (string) $b);
         $this->assertEquals(4, $b->write('test'));
     }
-
-    /**
-     * @expectedException \GuzzleHttp\Stream\Exception\CannotAttachException
-     */
-    public function testCannotAttach()
-    {
-        $p = new BufferStream();
-        $p->attach('a');
-    }
 }
diff --git a/core/vendor/guzzlehttp/streams/tests/CachingStreamTest.php b/core/vendor/guzzlehttp/psr7/tests/CachingStreamTest.php
similarity index 73%
rename from core/vendor/guzzlehttp/streams/tests/CachingStreamTest.php
rename to core/vendor/guzzlehttp/psr7/tests/CachingStreamTest.php
index ea969b3ad..e2ed0a744 100644
--- a/core/vendor/guzzlehttp/streams/tests/CachingStreamTest.php
+++ b/core/vendor/guzzlehttp/psr7/tests/CachingStreamTest.php
@@ -1,24 +1,21 @@
 <?php
-namespace GuzzleHttp\Tests\Stream;
+namespace GuzzleHttp\Tests\Psr7;
 
-use GuzzleHttp\Stream\Stream;
-use GuzzleHttp\Stream\CachingStream;
-use GuzzleHttp\Stream\Utils;
+use GuzzleHttp\Psr7;
+use GuzzleHttp\Psr7\CachingStream;
 
 /**
- * @covers GuzzleHttp\Stream\CachingStream
+ * @covers GuzzleHttp\Psr7\CachingStream
  */
 class CachingStreamTest extends \PHPUnit_Framework_TestCase
 {
     /** @var CachingStream */
     protected $body;
-
-    /** @var Stream */
     protected $decorated;
 
     public function setUp()
     {
-        $this->decorated = Stream::factory('testing');
+        $this->decorated = Psr7\stream_for('testing');
         $this->body = new CachingStream($this->decorated);
     }
 
@@ -30,7 +27,7 @@ class CachingStreamTest extends \PHPUnit_Framework_TestCase
 
     public function testUsesRemoteSizeIfPossible()
     {
-        $body = Stream::factory('test');
+        $body = Psr7\stream_for('test');
         $caching = new CachingStream($body);
         $this->assertEquals(4, $caching->getSize());
     }
@@ -44,15 +41,19 @@ class CachingStreamTest extends \PHPUnit_Framework_TestCase
         $this->body->seek(10);
     }
 
+    /**
+     * @expectedException \RuntimeException
+     * @expectedExceptionMessage CachingStream::seek() supports SEEK_SET and SEEK_CUR
+     */
     public function testCannotUseSeekEnd()
     {
-        $this->assertFalse($this->body->seek(2, SEEK_END));
+        $this->body->seek(2, SEEK_END);
     }
 
     public function testRewindUsesSeek()
     {
-        $a = Stream::factory('foo');
-        $d = $this->getMockBuilder('GuzzleHttp\Stream\CachingStream')
+        $a = Psr7\stream_for('foo');
+        $d = $this->getMockBuilder('GuzzleHttp\Psr7\CachingStream')
             ->setMethods(array('seek'))
             ->setConstructorArgs(array($a))
             ->getMock();
@@ -86,7 +87,7 @@ class CachingStreamTest extends \PHPUnit_Framework_TestCase
 
     public function testSkipsOverwrittenBytes()
     {
-        $decorated = Stream::factory(
+        $decorated = Psr7\stream_for(
             implode("\n", array_map(function ($n) {
                 return str_pad($n, 4, '0', STR_PAD_LEFT);
             }, range(0, 25)))
@@ -94,26 +95,26 @@ class CachingStreamTest extends \PHPUnit_Framework_TestCase
 
         $body = new CachingStream($decorated);
 
-        $this->assertEquals("0000\n", Utils::readline($body));
-        $this->assertEquals("0001\n", Utils::readline($body));
+        $this->assertEquals("0000\n", Psr7\readline($body));
+        $this->assertEquals("0001\n", Psr7\readline($body));
         // Write over part of the body yet to be read, so skip some bytes
         $this->assertEquals(5, $body->write("TEST\n"));
         $this->assertEquals(5, $this->readAttribute($body, 'skipReadBytes'));
         // Read, which skips bytes, then reads
-        $this->assertEquals("0003\n", Utils::readline($body));
+        $this->assertEquals("0003\n", Psr7\readline($body));
         $this->assertEquals(0, $this->readAttribute($body, 'skipReadBytes'));
-        $this->assertEquals("0004\n", Utils::readline($body));
-        $this->assertEquals("0005\n", Utils::readline($body));
+        $this->assertEquals("0004\n", Psr7\readline($body));
+        $this->assertEquals("0005\n", Psr7\readline($body));
 
         // Overwrite part of the cached body (so don't skip any bytes)
         $body->seek(5);
         $this->assertEquals(5, $body->write("ABCD\n"));
         $this->assertEquals(0, $this->readAttribute($body, 'skipReadBytes'));
-        $this->assertEquals("TEST\n", Utils::readline($body));
-        $this->assertEquals("0003\n", Utils::readline($body));
-        $this->assertEquals("0004\n", Utils::readline($body));
-        $this->assertEquals("0005\n", Utils::readline($body));
-        $this->assertEquals("0006\n", Utils::readline($body));
+        $this->assertEquals("TEST\n", Psr7\readline($body));
+        $this->assertEquals("0003\n", Psr7\readline($body));
+        $this->assertEquals("0004\n", Psr7\readline($body));
+        $this->assertEquals("0005\n", Psr7\readline($body));
+        $this->assertEquals("0006\n", Psr7\readline($body));
         $this->assertEquals(5, $body->write("1234\n"));
         $this->assertEquals(5, $this->readAttribute($body, 'skipReadBytes'));
 
@@ -128,7 +129,7 @@ class CachingStreamTest extends \PHPUnit_Framework_TestCase
     public function testClosesBothStreams()
     {
         $s = fopen('php://temp', 'r');
-        $a = Stream::factory($s);
+        $a = Psr7\stream_for($s);
         $d = new CachingStream($a);
         $d->close();
         $this->assertFalse(is_resource($s));
diff --git a/core/vendor/guzzlehttp/streams/tests/DroppingStreamTest.php b/core/vendor/guzzlehttp/psr7/tests/DroppingStreamTest.php
similarity index 77%
rename from core/vendor/guzzlehttp/streams/tests/DroppingStreamTest.php
rename to core/vendor/guzzlehttp/psr7/tests/DroppingStreamTest.php
index bb2cb2204..915b21523 100644
--- a/core/vendor/guzzlehttp/streams/tests/DroppingStreamTest.php
+++ b/core/vendor/guzzlehttp/psr7/tests/DroppingStreamTest.php
@@ -1,8 +1,8 @@
 <?php
-namespace GuzzleHttp\Tests\Stream;
+namespace GuzzleHttp\Tests\Psr7;
 
-use GuzzleHttp\Stream\BufferStream;
-use GuzzleHttp\Stream\DroppingStream;
+use GuzzleHttp\Psr7\BufferStream;
+use GuzzleHttp\Psr7\DroppingStream;
 
 class DroppingStreamTest extends \PHPUnit_Framework_TestCase
 {
@@ -11,7 +11,7 @@ class DroppingStreamTest extends \PHPUnit_Framework_TestCase
         $stream = new BufferStream();
         $drop = new DroppingStream($stream, 5);
         $this->assertEquals(3, $drop->write('hel'));
-        $this->assertFalse($drop->write('lo'));
+        $this->assertEquals(2, $drop->write('lo'));
         $this->assertEquals(5, $drop->getSize());
         $this->assertEquals('hello', $drop->read(5));
         $this->assertEquals(0, $drop->getSize());
@@ -21,6 +21,6 @@ class DroppingStreamTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals('12345', (string) $drop);
         $this->assertEquals(0, $drop->getSize());
         $drop->write('hello');
-        $this->assertFalse($drop->write('test'));
+        $this->assertSame(0, $drop->write('test'));
     }
 }
diff --git a/core/vendor/guzzlehttp/streams/tests/FnStreamTest.php b/core/vendor/guzzlehttp/psr7/tests/FnStreamTest.php
similarity index 90%
rename from core/vendor/guzzlehttp/streams/tests/FnStreamTest.php
rename to core/vendor/guzzlehttp/psr7/tests/FnStreamTest.php
index 6cc336b91..66ae90a04 100644
--- a/core/vendor/guzzlehttp/streams/tests/FnStreamTest.php
+++ b/core/vendor/guzzlehttp/psr7/tests/FnStreamTest.php
@@ -1,11 +1,11 @@
 <?php
-namespace GuzzleHttp\Tests\Stream;
+namespace GuzzleHttp\Tests\Psr7;
 
-use GuzzleHttp\Stream\Stream;
-use GuzzleHttp\Stream\FnStream;
+use GuzzleHttp\Psr7;
+use GuzzleHttp\Psr7\FnStream;
 
 /**
- * @covers GuzzleHttp\Stream\FnStream
+ * @covers GuzzleHttp\Psr7\FnStream
  */
 class FnStreamTest extends \PHPUnit_Framework_TestCase
 {
@@ -50,7 +50,7 @@ class FnStreamTest extends \PHPUnit_Framework_TestCase
 
     public function testDecoratesStream()
     {
-        $a = Stream::factory('foo');
+        $a = Psr7\stream_for('foo');
         $b = FnStream::decorate($a, []);
         $this->assertEquals(3, $b->getSize());
         $this->assertEquals($b->isWritable(), true);
@@ -59,6 +59,7 @@ class FnStreamTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($b->read(3), 'foo');
         $this->assertEquals($b->tell(), 3);
         $this->assertEquals($a->tell(), 3);
+        $this->assertSame('', $a->read(1));
         $this->assertEquals($b->eof(), true);
         $this->assertEquals($a->eof(), true);
         $b->seek(0);
@@ -76,7 +77,7 @@ class FnStreamTest extends \PHPUnit_Framework_TestCase
     public function testDecoratesWithCustomizations()
     {
         $called = false;
-        $a = Stream::factory('foo');
+        $a = Psr7\stream_for('foo');
         $b = FnStream::decorate($a, [
             'read' => function ($len) use (&$called, $a) {
                 $called = true;
diff --git a/core/vendor/guzzlehttp/psr7/tests/FunctionsTest.php b/core/vendor/guzzlehttp/psr7/tests/FunctionsTest.php
new file mode 100644
index 000000000..6675039ab
--- /dev/null
+++ b/core/vendor/guzzlehttp/psr7/tests/FunctionsTest.php
@@ -0,0 +1,574 @@
+<?php
+namespace GuzzleHttp\Tests\Psr7;
+
+use GuzzleHttp\Psr7;
+use GuzzleHttp\Psr7\FnStream;
+use GuzzleHttp\Psr7\NoSeekStream;
+
+class FunctionsTest extends \PHPUnit_Framework_TestCase
+{
+    public function testCopiesToString()
+    {
+        $s = Psr7\stream_for('foobaz');
+        $this->assertEquals('foobaz', Psr7\copy_to_string($s));
+        $s->seek(0);
+        $this->assertEquals('foo', Psr7\copy_to_string($s, 3));
+        $this->assertEquals('baz', Psr7\copy_to_string($s, 3));
+        $this->assertEquals('', Psr7\copy_to_string($s));
+    }
+
+    public function testCopiesToStringStopsWhenReadFails()
+    {
+        $s1 = Psr7\stream_for('foobaz');
+        $s1 = FnStream::decorate($s1, [
+            'read' => function () { return ''; }
+        ]);
+        $result = Psr7\copy_to_string($s1);
+        $this->assertEquals('', $result);
+    }
+
+    public function testCopiesToStream()
+    {
+        $s1 = Psr7\stream_for('foobaz');
+        $s2 = Psr7\stream_for('');
+        Psr7\copy_to_stream($s1, $s2);
+        $this->assertEquals('foobaz', (string) $s2);
+        $s2 = Psr7\stream_for('');
+        $s1->seek(0);
+        Psr7\copy_to_stream($s1, $s2, 3);
+        $this->assertEquals('foo', (string) $s2);
+        Psr7\copy_to_stream($s1, $s2, 3);
+        $this->assertEquals('foobaz', (string) $s2);
+    }
+
+    public function testStopsCopyToStreamWhenWriteFails()
+    {
+        $s1 = Psr7\stream_for('foobaz');
+        $s2 = Psr7\stream_for('');
+        $s2 = FnStream::decorate($s2, ['write' => function () { return 0; }]);
+        Psr7\copy_to_stream($s1, $s2);
+        $this->assertEquals('', (string) $s2);
+    }
+
+    public function testStopsCopyToSteamWhenWriteFailsWithMaxLen()
+    {
+        $s1 = Psr7\stream_for('foobaz');
+        $s2 = Psr7\stream_for('');
+        $s2 = FnStream::decorate($s2, ['write' => function () { return 0; }]);
+        Psr7\copy_to_stream($s1, $s2, 10);
+        $this->assertEquals('', (string) $s2);
+    }
+
+    public function testStopsCopyToSteamWhenReadFailsWithMaxLen()
+    {
+        $s1 = Psr7\stream_for('foobaz');
+        $s1 = FnStream::decorate($s1, ['read' => function () { return ''; }]);
+        $s2 = Psr7\stream_for('');
+        Psr7\copy_to_stream($s1, $s2, 10);
+        $this->assertEquals('', (string) $s2);
+    }
+
+    public function testReadsLines()
+    {
+        $s = Psr7\stream_for("foo\nbaz\nbar");
+        $this->assertEquals("foo\n", Psr7\readline($s));
+        $this->assertEquals("baz\n", Psr7\readline($s));
+        $this->assertEquals("bar", Psr7\readline($s));
+    }
+
+    public function testReadsLinesUpToMaxLength()
+    {
+        $s = Psr7\stream_for("12345\n");
+        $this->assertEquals("123", Psr7\readline($s, 4));
+        $this->assertEquals("45\n", Psr7\readline($s));
+    }
+
+    public function testReadsLineUntilFalseReturnedFromRead()
+    {
+        $s = $this->getMockBuilder('GuzzleHttp\Psr7\Stream')
+            ->setMethods(['read', 'eof'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $s->expects($this->exactly(2))
+            ->method('read')
+            ->will($this->returnCallback(function () {
+                static $c = false;
+                if ($c) {
+                    return false;
+                }
+                $c = true;
+                return 'h';
+            }));
+        $s->expects($this->exactly(2))
+            ->method('eof')
+            ->will($this->returnValue(false));
+        $this->assertEquals("h", Psr7\readline($s));
+    }
+
+    public function testCalculatesHash()
+    {
+        $s = Psr7\stream_for('foobazbar');
+        $this->assertEquals(md5('foobazbar'), Psr7\hash($s, 'md5'));
+    }
+
+    /**
+     * @expectedException \RuntimeException
+     */
+    public function testCalculatesHashThrowsWhenSeekFails()
+    {
+        $s = new NoSeekStream(Psr7\stream_for('foobazbar'));
+        $s->read(2);
+        Psr7\hash($s, 'md5');
+    }
+
+    public function testCalculatesHashSeeksToOriginalPosition()
+    {
+        $s = Psr7\stream_for('foobazbar');
+        $s->seek(4);
+        $this->assertEquals(md5('foobazbar'), Psr7\hash($s, 'md5'));
+        $this->assertEquals(4, $s->tell());
+    }
+
+    public function testOpensFilesSuccessfully()
+    {
+        $r = Psr7\try_fopen(__FILE__, 'r');
+        $this->assertInternalType('resource', $r);
+        fclose($r);
+    }
+
+    /**
+     * @expectedException \RuntimeException
+     * @expectedExceptionMessage Unable to open /path/to/does/not/exist using mode r
+     */
+    public function testThrowsExceptionNotWarning()
+    {
+        Psr7\try_fopen('/path/to/does/not/exist', 'r');
+    }
+
+    public function parseQueryProvider()
+    {
+        return [
+            // Does not need to parse when the string is empty
+            ['', []],
+            // Can parse mult-values items
+            ['q=a&q=b', ['q' => ['a', 'b']]],
+            // Can parse multi-valued items that use numeric indices
+            ['q[0]=a&q[1]=b', ['q[0]' => 'a', 'q[1]' => 'b']],
+            // Can parse duplicates and does not include numeric indices
+            ['q[]=a&q[]=b', ['q[]' => ['a', 'b']]],
+            // Ensures that the value of "q" is an array even though one value
+            ['q[]=a', ['q[]' => 'a']],
+            // Does not modify "." to "_" like PHP's parse_str()
+            ['q.a=a&q.b=b', ['q.a' => 'a', 'q.b' => 'b']],
+            // Can decode %20 to " "
+            ['q%20a=a%20b', ['q a' => 'a b']],
+            // Can parse funky strings with no values by assigning each to null
+            ['q&a', ['q' => null, 'a' => null]],
+            // Does not strip trailing equal signs
+            ['data=abc=', ['data' => 'abc=']],
+            // Can store duplicates without affecting other values
+            ['foo=a&foo=b&?µ=c', ['foo' => ['a', 'b'], '?µ' => 'c']],
+            // Sets value to null when no "=" is present
+            ['foo', ['foo' => null]],
+            // Preserves "0" keys.
+            ['0', ['0' => null]],
+            // Sets the value to an empty string when "=" is present
+            ['0=', ['0' => '']],
+            // Preserves falsey keys
+            ['var=0', ['var' => '0']],
+            ['a[b][c]=1&a[b][c]=2', ['a[b][c]' => ['1', '2']]],
+            ['a[b]=c&a[d]=e', ['a[b]' => 'c', 'a[d]' => 'e']],
+            // Ensure it doesn't leave things behind with repeated values
+            // Can parse mult-values items
+            ['q=a&q=b&q=c', ['q' => ['a', 'b', 'c']]],
+        ];
+    }
+
+    /**
+     * @dataProvider parseQueryProvider
+     */
+    public function testParsesQueries($input, $output)
+    {
+        $result = Psr7\parse_query($input);
+        $this->assertSame($output, $result);
+    }
+
+    public function testDoesNotDecode()
+    {
+        $str = 'foo%20=bar';
+        $data = Psr7\parse_query($str, false);
+        $this->assertEquals(['foo%20' => 'bar'], $data);
+    }
+
+    /**
+     * @dataProvider parseQueryProvider
+     */
+    public function testParsesAndBuildsQueries($input, $output)
+    {
+        $result = Psr7\parse_query($input, false);
+        $this->assertSame($input, Psr7\build_query($result, false));
+    }
+
+    public function testEncodesWithRfc1738()
+    {
+        $str = Psr7\build_query(['foo bar' => 'baz+'], PHP_QUERY_RFC1738);
+        $this->assertEquals('foo+bar=baz%2B', $str);
+    }
+
+    public function testEncodesWithRfc3986()
+    {
+        $str = Psr7\build_query(['foo bar' => 'baz+'], PHP_QUERY_RFC3986);
+        $this->assertEquals('foo%20bar=baz%2B', $str);
+    }
+
+    public function testDoesNotEncode()
+    {
+        $str = Psr7\build_query(['foo bar' => 'baz+'], false);
+        $this->assertEquals('foo bar=baz+', $str);
+    }
+
+    public function testCanControlDecodingType()
+    {
+        $result = Psr7\parse_query('var=foo+bar', PHP_QUERY_RFC3986);
+        $this->assertEquals('foo+bar', $result['var']);
+        $result = Psr7\parse_query('var=foo+bar', PHP_QUERY_RFC1738);
+        $this->assertEquals('foo bar', $result['var']);
+    }
+
+    public function testParsesRequestMessages()
+    {
+        $req = "GET /abc HTTP/1.0\r\nHost: foo.com\r\nFoo: Bar\r\nBaz: Bam\r\nBaz: Qux\r\n\r\nTest";
+        $request = Psr7\parse_request($req);
+        $this->assertEquals('GET', $request->getMethod());
+        $this->assertEquals('/abc', $request->getRequestTarget());
+        $this->assertEquals('1.0', $request->getProtocolVersion());
+        $this->assertEquals('foo.com', $request->getHeaderLine('Host'));
+        $this->assertEquals('Bar', $request->getHeaderLine('Foo'));
+        $this->assertEquals('Bam, Qux', $request->getHeaderLine('Baz'));
+        $this->assertEquals('Test', (string) $request->getBody());
+        $this->assertEquals('http://foo.com/abc', (string) $request->getUri());
+    }
+
+    public function testParsesRequestMessagesWithHttpsScheme()
+    {
+        $req = "PUT /abc?baz=bar HTTP/1.1\r\nHost: foo.com:443\r\n\r\n";
+        $request = Psr7\parse_request($req);
+        $this->assertEquals('PUT', $request->getMethod());
+        $this->assertEquals('/abc?baz=bar', $request->getRequestTarget());
+        $this->assertEquals('1.1', $request->getProtocolVersion());
+        $this->assertEquals('foo.com:443', $request->getHeaderLine('Host'));
+        $this->assertEquals('', (string) $request->getBody());
+        $this->assertEquals('https://foo.com/abc?baz=bar', (string) $request->getUri());
+    }
+
+    public function testParsesRequestMessagesWithUriWhenHostIsNotFirst()
+    {
+        $req = "PUT / HTTP/1.1\r\nFoo: Bar\r\nHost: foo.com\r\n\r\n";
+        $request = Psr7\parse_request($req);
+        $this->assertEquals('PUT', $request->getMethod());
+        $this->assertEquals('/', $request->getRequestTarget());
+        $this->assertEquals('http://foo.com/', (string) $request->getUri());
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     */
+    public function testValidatesRequestMessages()
+    {
+        Psr7\parse_request("HTTP/1.1 200 OK\r\n\r\n");
+    }
+
+    public function testParsesResponseMessages()
+    {
+        $res = "HTTP/1.0 200 OK\r\nFoo: Bar\r\nBaz: Bam\r\nBaz: Qux\r\n\r\nTest";
+        $response = Psr7\parse_response($res);
+        $this->assertEquals(200, $response->getStatusCode());
+        $this->assertEquals('OK', $response->getReasonPhrase());
+        $this->assertEquals('1.0', $response->getProtocolVersion());
+        $this->assertEquals('Bar', $response->getHeaderLine('Foo'));
+        $this->assertEquals('Bam, Qux', $response->getHeaderLine('Baz'));
+        $this->assertEquals('Test', (string) $response->getBody());
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     */
+    public function testValidatesResponseMessages()
+    {
+        Psr7\parse_response("GET / HTTP/1.1\r\n\r\n");
+    }
+
+    public function testDetermineMimetype()
+    {
+        $this->assertNull(Psr7\mimetype_from_extension('not-a-real-extension'));
+        $this->assertEquals(
+            'application/json',
+            Psr7\mimetype_from_extension('json')
+        );
+        $this->assertEquals(
+            'image/jpeg',
+            Psr7\mimetype_from_filename('/tmp/images/IMG034821.JPEG')
+        );
+    }
+
+    public function testCreatesUriForValue()
+    {
+        $this->assertInstanceOf('GuzzleHttp\Psr7\Uri', Psr7\uri_for('/foo'));
+        $this->assertInstanceOf(
+            'GuzzleHttp\Psr7\Uri',
+            Psr7\uri_for(new Psr7\Uri('/foo'))
+        );
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     */
+    public function testValidatesUri()
+    {
+        Psr7\uri_for([]);
+    }
+
+    public function testKeepsPositionOfResource()
+    {
+        $h = fopen(__FILE__, 'r');
+        fseek($h, 10);
+        $stream = Psr7\stream_for($h);
+        $this->assertEquals(10, $stream->tell());
+        $stream->close();
+    }
+
+    public function testCreatesWithFactory()
+    {
+        $stream = Psr7\stream_for('foo');
+        $this->assertInstanceOf('GuzzleHttp\Psr7\Stream', $stream);
+        $this->assertEquals('foo', $stream->getContents());
+        $stream->close();
+    }
+
+    public function testFactoryCreatesFromEmptyString()
+    {
+        $s = Psr7\stream_for();
+        $this->assertInstanceOf('GuzzleHttp\Psr7\Stream', $s);
+    }
+
+    public function testFactoryCreatesFromNull()
+    {
+        $s = Psr7\stream_for(null);
+        $this->assertInstanceOf('GuzzleHttp\Psr7\Stream', $s);
+    }
+
+    public function testFactoryCreatesFromResource()
+    {
+        $r = fopen(__FILE__, 'r');
+        $s = Psr7\stream_for($r);
+        $this->assertInstanceOf('GuzzleHttp\Psr7\Stream', $s);
+        $this->assertSame(file_get_contents(__FILE__), (string) $s);
+    }
+
+    public function testFactoryCreatesFromObjectWithToString()
+    {
+        $r = new HasToString();
+        $s = Psr7\stream_for($r);
+        $this->assertInstanceOf('GuzzleHttp\Psr7\Stream', $s);
+        $this->assertEquals('foo', (string) $s);
+    }
+
+    public function testCreatePassesThrough()
+    {
+        $s = Psr7\stream_for('foo');
+        $this->assertSame($s, Psr7\stream_for($s));
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     */
+    public function testThrowsExceptionForUnknown()
+    {
+        Psr7\stream_for(new \stdClass());
+    }
+
+    public function testReturnsCustomMetadata()
+    {
+        $s = Psr7\stream_for('foo', ['metadata' => ['hwm' => 3]]);
+        $this->assertEquals(3, $s->getMetadata('hwm'));
+        $this->assertArrayHasKey('hwm', $s->getMetadata());
+    }
+
+    public function testCanSetSize()
+    {
+        $s = Psr7\stream_for('', ['size' => 10]);
+        $this->assertEquals(10, $s->getSize());
+    }
+
+    public function testCanCreateIteratorBasedStream()
+    {
+        $a = new \ArrayIterator(['foo', 'bar', '123']);
+        $p = Psr7\stream_for($a);
+        $this->assertInstanceOf('GuzzleHttp\Psr7\PumpStream', $p);
+        $this->assertEquals('foo', $p->read(3));
+        $this->assertFalse($p->eof());
+        $this->assertEquals('b', $p->read(1));
+        $this->assertEquals('a', $p->read(1));
+        $this->assertEquals('r12', $p->read(3));
+        $this->assertFalse($p->eof());
+        $this->assertEquals('3', $p->getContents());
+        $this->assertTrue($p->eof());
+        $this->assertEquals(9, $p->tell());
+    }
+
+    public function testConvertsRequestsToStrings()
+    {
+        $request = new Psr7\Request('PUT', 'http://foo.com/hi?123', [
+            'Baz' => 'bar',
+            'Qux' => ' ipsum'
+        ], 'hello', '1.0');
+        $this->assertEquals(
+            "PUT /hi?123 HTTP/1.0\r\nHost: foo.com\r\nBaz: bar\r\nQux: ipsum\r\n\r\nhello",
+            Psr7\str($request)
+        );
+    }
+
+    public function testConvertsResponsesToStrings()
+    {
+        $response = new Psr7\Response(200, [
+            'Baz' => 'bar',
+            'Qux' => ' ipsum'
+        ], 'hello', '1.0', 'FOO');
+        $this->assertEquals(
+            "HTTP/1.0 200 FOO\r\nBaz: bar\r\nQux: ipsum\r\n\r\nhello",
+            Psr7\str($response)
+        );
+    }
+
+    public function parseParamsProvider()
+    {
+        $res1 = array(
+            array(
+                '<http:/.../front.jpeg>',
+                'rel' => 'front',
+                'type' => 'image/jpeg',
+            ),
+            array(
+                '<http://.../back.jpeg>',
+                'rel' => 'back',
+                'type' => 'image/jpeg',
+            ),
+        );
+        return array(
+            array(
+                '<http:/.../front.jpeg>; rel="front"; type="image/jpeg", <http://.../back.jpeg>; rel=back; type="image/jpeg"',
+                $res1
+            ),
+            array(
+                '<http:/.../front.jpeg>; rel="front"; type="image/jpeg",<http://.../back.jpeg>; rel=back; type="image/jpeg"',
+                $res1
+            ),
+            array(
+                'foo="baz"; bar=123, boo, test="123", foobar="foo;bar"',
+                array(
+                    array('foo' => 'baz', 'bar' => '123'),
+                    array('boo'),
+                    array('test' => '123'),
+                    array('foobar' => 'foo;bar')
+                )
+            ),
+            array(
+                '<http://.../side.jpeg?test=1>; rel="side"; type="image/jpeg",<http://.../side.jpeg?test=2>; rel=side; type="image/jpeg"',
+                array(
+                    array('<http://.../side.jpeg?test=1>', 'rel' => 'side', 'type' => 'image/jpeg'),
+                    array('<http://.../side.jpeg?test=2>', 'rel' => 'side', 'type' => 'image/jpeg')
+                )
+            ),
+            array(
+                '',
+                array()
+            )
+        );
+    }
+    /**
+     * @dataProvider parseParamsProvider
+     */
+    public function testParseParams($header, $result)
+    {
+        $this->assertEquals($result, Psr7\parse_header($header));
+    }
+
+    public function testParsesArrayHeaders()
+    {
+        $header = ['a, b', 'c', 'd, e'];
+        $this->assertEquals(['a', 'b', 'c', 'd', 'e'], Psr7\normalize_header($header));
+    }
+
+    public function testRewindsBody()
+    {
+        $body = Psr7\stream_for('abc');
+        $res = new Psr7\Response(200, [], $body);
+        Psr7\rewind_body($res);
+        $this->assertEquals(0, $body->tell());
+        $body->rewind(1);
+        Psr7\rewind_body($res);
+        $this->assertEquals(0, $body->tell());
+    }
+
+    /**
+     * @expectedException \RuntimeException
+     */
+    public function testThrowsWhenBodyCannotBeRewound()
+    {
+        $body = Psr7\stream_for('abc');
+        $body->read(1);
+        $body = FnStream::decorate($body, [
+            'rewind' => function () { throw new \RuntimeException('a'); }
+        ]);
+        $res = new Psr7\Response(200, [], $body);
+        Psr7\rewind_body($res);
+    }
+
+    public function testCanModifyRequestWithUri()
+    {
+        $r1 = new Psr7\Request('GET', 'http://foo.com');
+        $r2 = Psr7\modify_request($r1, [
+            'uri' => new Psr7\Uri('http://www.foo.com')
+        ]);
+        $this->assertEquals('http://www.foo.com', (string) $r2->getUri());
+        $this->assertEquals('www.foo.com', (string) $r2->getHeaderLine('host'));
+    }
+
+    public function testCanModifyRequestWithCaseInsensitiveHeader()
+    {
+        $r1 = new Psr7\Request('GET', 'http://foo.com', ['User-Agent' => 'foo']);
+        $r2 = Psr7\modify_request($r1, ['set_headers' => ['User-agent' => 'bar']]);
+        $this->assertEquals('bar', $r2->getHeaderLine('User-Agent'));
+        $this->assertEquals('bar', $r2->getHeaderLine('User-agent'));
+    }
+
+    public function testReturnsAsIsWhenNoChanges()
+    {
+        $request = new Psr7\Request('GET', 'http://foo.com');
+        $this->assertSame($request, Psr7\modify_request($request, []));
+    }
+
+    public function testReturnsUriAsIsWhenNoChanges()
+    {
+        $r1 = new Psr7\Request('GET', 'http://foo.com');
+        $r2 = Psr7\modify_request($r1, ['set_headers' => ['foo' => 'bar']]);
+        $this->assertNotSame($r1, $r2);
+        $this->assertEquals('bar', $r2->getHeaderLine('foo'));
+    }
+
+    public function testRemovesHeadersFromMessage()
+    {
+        $r1 = new Psr7\Request('GET', 'http://foo.com', ['foo' => 'bar']);
+        $r2 = Psr7\modify_request($r1, ['remove_headers' => ['foo']]);
+        $this->assertNotSame($r1, $r2);
+        $this->assertFalse($r2->hasHeader('foo'));
+    }
+
+    public function testAddsQueryToUri()
+    {
+        $r1 = new Psr7\Request('GET', 'http://foo.com');
+        $r2 = Psr7\modify_request($r1, ['query' => 'foo=bar']);
+        $this->assertNotSame($r1, $r2);
+        $this->assertEquals('foo=bar', $r2->getUri()->getQuery());
+    }
+}
diff --git a/core/vendor/guzzlehttp/streams/tests/InflateStreamTest.php b/core/vendor/guzzlehttp/psr7/tests/InflateStreamTest.php
similarity index 63%
rename from core/vendor/guzzlehttp/streams/tests/InflateStreamTest.php
rename to core/vendor/guzzlehttp/psr7/tests/InflateStreamTest.php
index ead9356a5..927fc0b7b 100644
--- a/core/vendor/guzzlehttp/streams/tests/InflateStreamTest.php
+++ b/core/vendor/guzzlehttp/psr7/tests/InflateStreamTest.php
@@ -1,15 +1,15 @@
 <?php
-namespace GuzzleHttp\Tests\Stream;
+namespace GuzzleHttp\Tests\Psr7;
 
-use GuzzleHttp\Stream\InflateStream;
-use GuzzleHttp\Stream\Stream;
+use GuzzleHttp\Psr7;
+use GuzzleHttp\Psr7\InflateStream;
 
 class InflateStreamtest extends \PHPUnit_Framework_TestCase
 {
     public function testInflatesStreams()
     {
         $content = gzencode('test');
-        $a = Stream::factory($content);
+        $a = Psr7\stream_for($content);
         $b = new InflateStream($a);
         $this->assertEquals('test', (string) $b);
     }
diff --git a/core/vendor/guzzlehttp/streams/tests/LazyOpenStreamTest.php b/core/vendor/guzzlehttp/psr7/tests/LazyOpenStreamTest.php
similarity index 96%
rename from core/vendor/guzzlehttp/streams/tests/LazyOpenStreamTest.php
rename to core/vendor/guzzlehttp/psr7/tests/LazyOpenStreamTest.php
index 79e0078e8..fdef1423d 100644
--- a/core/vendor/guzzlehttp/streams/tests/LazyOpenStreamTest.php
+++ b/core/vendor/guzzlehttp/psr7/tests/LazyOpenStreamTest.php
@@ -1,7 +1,7 @@
 <?php
-namespace GuzzleHttp\Tests\Stream;
+namespace GuzzleHttp\Tests\Psr7;
 
-use GuzzleHttp\Stream\LazyOpenStream;
+use GuzzleHttp\Psr7\LazyOpenStream;
 
 class LazyOpenStreamTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/core/vendor/guzzlehttp/streams/tests/LimitStreamTest.php b/core/vendor/guzzlehttp/psr7/tests/LimitStreamTest.php
similarity index 61%
rename from core/vendor/guzzlehttp/streams/tests/LimitStreamTest.php
rename to core/vendor/guzzlehttp/psr7/tests/LimitStreamTest.php
index efb1dc58f..2198b7a9b 100644
--- a/core/vendor/guzzlehttp/streams/tests/LimitStreamTest.php
+++ b/core/vendor/guzzlehttp/psr7/tests/LimitStreamTest.php
@@ -1,13 +1,14 @@
 <?php
-namespace GuzzleHttp\Tests\Http;
+namespace GuzzleHttp\Tests\Psr7;
 
-use GuzzleHttp\Stream\FnStream;
-use GuzzleHttp\Stream\Stream;
-use GuzzleHttp\Stream\LimitStream;
-use GuzzleHttp\Stream\NoSeekStream;
+use GuzzleHttp\Psr7;
+use GuzzleHttp\Psr7\FnStream;
+use GuzzleHttp\Psr7\Stream;
+use GuzzleHttp\Psr7\LimitStream;
+use GuzzleHttp\Psr7\NoSeekStream;
 
 /**
- * @covers GuzzleHttp\Stream\LimitStream
+ * @covers GuzzleHttp\Psr7\LimitStream
  */
 class LimitStreamTest extends \PHPUnit_Framework_TestCase
 {
@@ -19,35 +20,52 @@ class LimitStreamTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $this->decorated = Stream::factory(fopen(__FILE__, 'r'));
+        $this->decorated = Psr7\stream_for(fopen(__FILE__, 'r'));
         $this->body = new LimitStream($this->decorated, 10, 3);
     }
 
     public function testReturnsSubset()
     {
-        $body = new LimitStream(Stream::factory('foo'), -1, 1);
+        $body = new LimitStream(Psr7\stream_for('foo'), -1, 1);
         $this->assertEquals('oo', (string) $body);
         $this->assertTrue($body->eof());
         $body->seek(0);
         $this->assertFalse($body->eof());
         $this->assertEquals('oo', $body->read(100));
+        $this->assertSame('', $body->read(1));
         $this->assertTrue($body->eof());
     }
 
     public function testReturnsSubsetWhenCastToString()
     {
-        $body = Stream::factory('foo_baz_bar');
+        $body = Psr7\stream_for('foo_baz_bar');
         $limited = new LimitStream($body, 3, 4);
         $this->assertEquals('baz', (string) $limited);
     }
 
+    /**
+     * @expectedException \RuntimeException
+     * @expectedExceptionMessage Unable to seek to stream position 10 with whence 0
+     */
+    public function testEnsuresPositionCanBeekSeekedTo()
+    {
+        new LimitStream(Psr7\stream_for(''), 0, 10);
+    }
+
     public function testReturnsSubsetOfEmptyBodyWhenCastToString()
     {
-        $body = Stream::factory('');
+        $body = Psr7\stream_for('01234567891234');
         $limited = new LimitStream($body, 0, 10);
         $this->assertEquals('', (string) $limited);
     }
 
+    public function testReturnsSpecificSubsetOBodyWhenCastToString()
+    {
+        $body = Psr7\stream_for('0123456789abcdef');
+        $limited = new LimitStream($body, 3, 10);
+        $this->assertEquals('abc', (string) $limited);
+    }
+
     public function testSeeksWhenConstructed()
     {
         $this->assertEquals(0, $this->body->tell());
@@ -56,26 +74,33 @@ class LimitStreamTest extends \PHPUnit_Framework_TestCase
 
     public function testAllowsBoundedSeek()
     {
-        $this->assertEquals(true, $this->body->seek(100));
+        $this->body->seek(100);
         $this->assertEquals(10, $this->body->tell());
         $this->assertEquals(13, $this->decorated->tell());
-        $this->assertEquals(true, $this->body->seek(0));
+        $this->body->seek(0);
         $this->assertEquals(0, $this->body->tell());
         $this->assertEquals(3, $this->decorated->tell());
-        $this->assertEquals(false, $this->body->seek(-10));
+        try {
+            $this->body->seek(-10);
+            $this->fail();
+        } catch (\RuntimeException $e) {}
         $this->assertEquals(0, $this->body->tell());
         $this->assertEquals(3, $this->decorated->tell());
-        $this->assertEquals(true, $this->body->seek(5));
+        $this->body->seek(5);
         $this->assertEquals(5, $this->body->tell());
         $this->assertEquals(8, $this->decorated->tell());
-        $this->assertEquals(false, $this->body->seek(1000, SEEK_END));
+        // Fail
+        try {
+            $this->body->seek(1000, SEEK_END);
+            $this->fail();
+        } catch (\RuntimeException $e) {}
     }
 
     public function testReadsOnlySubsetOfData()
     {
         $data = $this->body->read(100);
         $this->assertEquals(10, strlen($data));
-        $this->assertFalse($this->body->read(1000));
+        $this->assertSame('', $this->body->read(1000));
 
         $this->body->setOffset(10);
         $newData = $this->body->read(100);
@@ -84,18 +109,26 @@ class LimitStreamTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * @expectedException \GuzzleHttp\Stream\Exception\SeekException
-     * @expectedExceptionMessage Could not seek the stream to position 2
+     * @expectedException \RuntimeException
+     * @expectedExceptionMessage Could not seek to stream offset 2
      */
     public function testThrowsWhenCurrentGreaterThanOffsetSeek()
     {
-        $a = Stream::factory('foo_bar');
+        $a = Psr7\stream_for('foo_bar');
         $b = new NoSeekStream($a);
         $c = new LimitStream($b);
         $a->getContents();
         $c->setOffset(2);
     }
 
+    public function testCanGetContentsWithoutSeeking()
+    {
+        $a = Psr7\stream_for('foo_bar');
+        $b = new NoSeekStream($a);
+        $c = new LimitStream($b);
+        $this->assertEquals('foo_bar', $c->getContents());
+    }
+
     public function testClaimsConsumedWhenReadLimitIsReached()
     {
         $this->assertFalse($this->body->eof());
@@ -110,7 +143,7 @@ class LimitStreamTest extends \PHPUnit_Framework_TestCase
 
     public function testGetContentsIsBasedOnSubset()
     {
-        $body = new LimitStream(Stream::factory('foobazbar'), 3, 3);
+        $body = new LimitStream(Psr7\stream_for('foobazbar'), 3, 3);
         $this->assertEquals('baz', $body->getContents());
     }
 
@@ -126,7 +159,7 @@ class LimitStreamTest extends \PHPUnit_Framework_TestCase
 
     public function testLengthLessOffsetWhenNoLimitSize()
     {
-        $a = Stream::factory('foo_bar');
+        $a = Psr7\stream_for('foo_bar');
         $b = new LimitStream($a, -1, 4);
         $this->assertEquals(3, $b->getSize());
     }
diff --git a/core/vendor/guzzlehttp/psr7/tests/MultipartStreamTest.php b/core/vendor/guzzlehttp/psr7/tests/MultipartStreamTest.php
new file mode 100644
index 000000000..61edb067a
--- /dev/null
+++ b/core/vendor/guzzlehttp/psr7/tests/MultipartStreamTest.php
@@ -0,0 +1,214 @@
+<?php
+namespace GuzzleHttp\Tests;
+
+use GuzzleHttp\Psr7;
+use GuzzleHttp\Psr7\MultipartStream;
+
+class MultipartStreamTest extends \PHPUnit_Framework_TestCase
+{
+    public function testCreatesDefaultBoundary()
+    {
+        $b = new MultipartStream();
+        $this->assertNotEmpty($b->getBoundary());
+    }
+
+    public function testCanProvideBoundary()
+    {
+        $b = new MultipartStream([], 'foo');
+        $this->assertEquals('foo', $b->getBoundary());
+    }
+
+    public function testIsNotWritable()
+    {
+        $b = new MultipartStream();
+        $this->assertFalse($b->isWritable());
+    }
+
+    public function testCanCreateEmptyStream()
+    {
+        $b = new MultipartStream();
+        $boundary = $b->getBoundary();
+        $this->assertSame("--{$boundary}--\r\n", $b->getContents());
+        $this->assertSame(strlen($boundary) + 6, $b->getSize());
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     */
+    public function testValidatesFilesArrayElement()
+    {
+        new MultipartStream([['foo' => 'bar']]);
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     */
+    public function testEnsuresFileHasName()
+    {
+        new MultipartStream([['contents' => 'bar']]);
+    }
+
+    public function testSerializesFields()
+    {
+        $b = new MultipartStream([
+            [
+                'name'     => 'foo',
+                'contents' => 'bar'
+            ],
+            [
+                'name' => 'baz',
+                'contents' => 'bam'
+            ]
+        ], 'boundary');
+        $this->assertEquals(
+            "--boundary\r\nContent-Disposition: form-data; name=\"foo\"\r\nContent-Length: 3\r\n\r\n"
+            . "bar\r\n--boundary\r\nContent-Disposition: form-data; name=\"baz\"\r\nContent-Length: 3"
+            . "\r\n\r\nbam\r\n--boundary--\r\n", (string) $b);
+    }
+
+    public function testSerializesFiles()
+    {
+        $f1 = Psr7\FnStream::decorate(Psr7\stream_for('foo'), [
+            'getMetadata' => function () {
+                return '/foo/bar.txt';
+            }
+        ]);
+
+        $f2 = Psr7\FnStream::decorate(Psr7\stream_for('baz'), [
+            'getMetadata' => function () {
+                return '/foo/baz.jpg';
+            }
+        ]);
+
+        $f3 = Psr7\FnStream::decorate(Psr7\stream_for('bar'), [
+            'getMetadata' => function () {
+                return '/foo/bar.gif';
+            }
+        ]);
+
+        $b = new MultipartStream([
+            [
+                'name'     => 'foo',
+                'contents' => $f1
+            ],
+            [
+                'name' => 'qux',
+                'contents' => $f2
+            ],
+            [
+                'name'     => 'qux',
+                'contents' => $f3
+            ],
+        ], 'boundary');
+
+        $expected = <<<EOT
+--boundary
+Content-Disposition: form-data; name="foo"; filename="bar.txt"
+Content-Length: 3
+Content-Type: text/plain
+
+foo
+--boundary
+Content-Disposition: form-data; name="qux"; filename="baz.jpg"
+Content-Length: 3
+Content-Type: image/jpeg
+
+baz
+--boundary
+Content-Disposition: form-data; name="qux"; filename="bar.gif"
+Content-Length: 3
+Content-Type: image/gif
+
+bar
+--boundary--
+
+EOT;
+
+        $this->assertEquals($expected, str_replace("\r", '', $b));
+    }
+
+    public function testSerializesFilesWithCustomHeaders()
+    {
+        $f1 = Psr7\FnStream::decorate(Psr7\stream_for('foo'), [
+            'getMetadata' => function () {
+                return '/foo/bar.txt';
+            }
+        ]);
+
+        $b = new MultipartStream([
+            [
+                'name' => 'foo',
+                'contents' => $f1,
+                'headers'  => [
+                    'x-foo' => 'bar',
+                    'content-disposition' => 'custom'
+                ]
+            ]
+        ], 'boundary');
+
+        $expected = <<<EOT
+--boundary
+x-foo: bar
+content-disposition: custom
+Content-Length: 3
+Content-Type: text/plain
+
+foo
+--boundary--
+
+EOT;
+
+        $this->assertEquals($expected, str_replace("\r", '', $b));
+    }
+
+    public function testSerializesFilesWithCustomHeadersAndMultipleValues()
+    {
+        $f1 = Psr7\FnStream::decorate(Psr7\stream_for('foo'), [
+            'getMetadata' => function () {
+                return '/foo/bar.txt';
+            }
+        ]);
+
+        $f2 = Psr7\FnStream::decorate(Psr7\stream_for('baz'), [
+            'getMetadata' => function () {
+                return '/foo/baz.jpg';
+            }
+        ]);
+
+        $b = new MultipartStream([
+            [
+                'name'     => 'foo',
+                'contents' => $f1,
+                'headers'  => [
+                    'x-foo' => 'bar',
+                    'content-disposition' => 'custom'
+                ]
+            ],
+            [
+                'name'     => 'foo',
+                'contents' => $f2,
+                'headers'  => ['cOntenT-Type' => 'custom'],
+            ]
+        ], 'boundary');
+
+        $expected = <<<EOT
+--boundary
+x-foo: bar
+content-disposition: custom
+Content-Length: 3
+Content-Type: text/plain
+
+foo
+--boundary
+cOntenT-Type: custom
+Content-Disposition: form-data; name="foo"; filename="baz.jpg"
+Content-Length: 3
+
+baz
+--boundary--
+
+EOT;
+
+        $this->assertEquals($expected, str_replace("\r", '', $b));
+    }
+}
diff --git a/core/vendor/guzzlehttp/psr7/tests/NoSeekStreamTest.php b/core/vendor/guzzlehttp/psr7/tests/NoSeekStreamTest.php
new file mode 100644
index 000000000..a309317bd
--- /dev/null
+++ b/core/vendor/guzzlehttp/psr7/tests/NoSeekStreamTest.php
@@ -0,0 +1,40 @@
+<?php
+namespace GuzzleHttp\Tests\Psr7;
+
+use GuzzleHttp\Psr7;
+use GuzzleHttp\Psr7\NoSeekStream;
+
+/**
+ * @covers GuzzleHttp\Psr7\NoSeekStream
+ * @covers GuzzleHttp\Psr7\StreamDecoratorTrait
+ */
+class NoSeekStreamTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @expectedException \RuntimeException
+     * @expectedExceptionMessage Cannot seek a NoSeekStream
+     */
+    public function testCannotSeek()
+    {
+        $s = $this->getMockBuilder('Psr\Http\Message\StreamInterface')
+            ->setMethods(['isSeekable', 'seek'])
+            ->getMockForAbstractClass();
+        $s->expects($this->never())->method('seek');
+        $s->expects($this->never())->method('isSeekable');
+        $wrapped = new NoSeekStream($s);
+        $this->assertFalse($wrapped->isSeekable());
+        $wrapped->seek(2);
+    }
+
+    /**
+     * @expectedException \RuntimeException
+     * @expectedExceptionMessage Cannot write to a non-writable stream
+     */
+    public function testHandlesClose()
+    {
+        $s = Psr7\stream_for('foo');
+        $wrapped = new NoSeekStream($s);
+        $wrapped->close();
+        $wrapped->write('foo');
+    }
+}
diff --git a/core/vendor/guzzlehttp/streams/tests/PumpStreamTest.php b/core/vendor/guzzlehttp/psr7/tests/PumpStreamTest.php
similarity index 73%
rename from core/vendor/guzzlehttp/streams/tests/PumpStreamTest.php
rename to core/vendor/guzzlehttp/psr7/tests/PumpStreamTest.php
index 2d20ce90c..7358bb6e0 100644
--- a/core/vendor/guzzlehttp/streams/tests/PumpStreamTest.php
+++ b/core/vendor/guzzlehttp/psr7/tests/PumpStreamTest.php
@@ -1,9 +1,9 @@
 <?php
-namespace GuzzleHttp\Tests\Stream;
+namespace GuzzleHttp\Tests\Psr7;
 
-use GuzzleHttp\Stream\LimitStream;
-use GuzzleHttp\Stream\PumpStream;
-use GuzzleHttp\Stream\Stream;
+use GuzzleHttp\Psr7\LimitStream;
+use GuzzleHttp\Psr7\PumpStream;
+use GuzzleHttp\Psr7;
 
 class PumpStreamTest extends \PHPUnit_Framework_TestCase
 {
@@ -21,7 +21,7 @@ class PumpStreamTest extends \PHPUnit_Framework_TestCase
 
     public function testCanReadFromCallable()
     {
-        $p = Stream::factory(function ($size) {
+        $p = Psr7\stream_for(function ($size) {
             return 'a';
         });
         $this->assertEquals('a', $p->read(1));
@@ -33,7 +33,7 @@ class PumpStreamTest extends \PHPUnit_Framework_TestCase
     public function testStoresExcessDataInBuffer()
     {
         $called = [];
-        $p = Stream::factory(function ($size) use (&$called) {
+        $p = Psr7\stream_for(function ($size) use (&$called) {
             $called[] = $size;
             return 'abcdef';
         });
@@ -46,32 +46,27 @@ class PumpStreamTest extends \PHPUnit_Framework_TestCase
 
     public function testInifiniteStreamWrappedInLimitStream()
     {
-        $p = Stream::factory(function () { return 'a'; });
+        $p = Psr7\stream_for(function () { return 'a'; });
         $s = new LimitStream($p, 5);
         $this->assertEquals('aaaaa', (string) $s);
     }
 
     public function testDescribesCapabilities()
     {
-        $p = Stream::factory(function () {});
+        $p = Psr7\stream_for(function () {});
         $this->assertTrue($p->isReadable());
         $this->assertFalse($p->isSeekable());
         $this->assertFalse($p->isWritable());
         $this->assertNull($p->getSize());
-        $this->assertFalse($p->write('aa'));
         $this->assertEquals('', $p->getContents());
         $this->assertEquals('', (string) $p);
         $p->close();
         $this->assertEquals('', $p->read(10));
         $this->assertTrue($p->eof());
-    }
 
-    /**
-     * @expectedException \GuzzleHttp\Stream\Exception\CannotAttachException
-     */
-    public function testCannotAttach()
-    {
-        $p = Stream::factory(function () {});
-        $p->attach('a');
+        try {
+            $this->assertFalse($p->write('aa'));
+            $this->fail();
+        } catch (\RuntimeException $e) {}
     }
 }
diff --git a/core/vendor/guzzlehttp/psr7/tests/RequestTest.php b/core/vendor/guzzlehttp/psr7/tests/RequestTest.php
new file mode 100644
index 000000000..9defe68d9
--- /dev/null
+++ b/core/vendor/guzzlehttp/psr7/tests/RequestTest.php
@@ -0,0 +1,157 @@
+<?php
+namespace GuzzleHttp\Tests\Psr7;
+
+use GuzzleHttp\Psr7\Request;
+use GuzzleHttp\Psr7\Uri;
+
+/**
+ * @covers GuzzleHttp\Psr7\Request
+ */
+class RequestTest extends \PHPUnit_Framework_TestCase
+{
+    public function testRequestUriMayBeString()
+    {
+        $r = new Request('GET', '/');
+        $this->assertEquals('/', (string) $r->getUri());
+    }
+
+    public function testRequestUriMayBeUri()
+    {
+        $uri = new Uri('/');
+        $r = new Request('GET', $uri);
+        $this->assertSame($uri, $r->getUri());
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     */
+    public function testValidateRequestUri()
+    {
+        new Request('GET', true);
+    }
+
+    public function testCanConstructWithBody()
+    {
+        $r = new Request('GET', '/', [], 'baz');
+        $this->assertEquals('baz', (string) $r->getBody());
+    }
+
+    public function testCapitalizesMethod()
+    {
+        $r = new Request('get', '/');
+        $this->assertEquals('GET', $r->getMethod());
+    }
+
+    public function testCapitalizesWithMethod()
+    {
+        $r = new Request('GET', '/');
+        $this->assertEquals('PUT', $r->withMethod('put')->getMethod());
+    }
+
+    public function testWithUri()
+    {
+        $r1 = new Request('GET', '/');
+        $u1 = $r1->getUri();
+        $u2 = new Uri('http://www.example.com');
+        $r2 = $r1->withUri($u2);
+        $this->assertNotSame($r1, $r2);
+        $this->assertSame($u2, $r2->getUri());
+        $this->assertSame($u1, $r1->getUri());
+    }
+
+    public function testSameInstanceWhenSameUri()
+    {
+        $r1 = new Request('GET', 'http://foo.com');
+        $r2 = $r1->withUri($r1->getUri());
+        $this->assertSame($r1, $r2);
+    }
+
+    public function testWithRequestTarget()
+    {
+        $r1 = new Request('GET', '/');
+        $r2 = $r1->withRequestTarget('*');
+        $this->assertEquals('*', $r2->getRequestTarget());
+        $this->assertEquals('/', $r1->getRequestTarget());
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     */
+    public function testRequestTargetDoesNotAllowSpaces()
+    {
+        $r1 = new Request('GET', '/');
+        $r1->withRequestTarget('/foo bar');
+    }
+
+    public function testRequestTargetDefaultsToSlash()
+    {
+        $r1 = new Request('GET', '');
+        $this->assertEquals('/', $r1->getRequestTarget());
+        $r2 = new Request('GET', '*');
+        $this->assertEquals('*', $r2->getRequestTarget());
+        $r3 = new Request('GET', 'http://foo.com/bar baz/');
+        $this->assertEquals('/bar%20baz/', $r3->getRequestTarget());
+    }
+
+    public function testBuildsRequestTarget()
+    {
+        $r1 = new Request('GET', 'http://foo.com/baz?bar=bam');
+        $this->assertEquals('/baz?bar=bam', $r1->getRequestTarget());
+    }
+
+    public function testHostIsAddedFirst()
+    {
+        $r = new Request('GET', 'http://foo.com/baz?bar=bam', ['Foo' => 'Bar']);
+        $this->assertEquals([
+            'Host' => ['foo.com'],
+            'Foo'  => ['Bar']
+        ], $r->getHeaders());
+    }
+
+    public function testCanGetHeaderAsCsv()
+    {
+        $r = new Request('GET', 'http://foo.com/baz?bar=bam', [
+            'Foo' => ['a', 'b', 'c']
+        ]);
+        $this->assertEquals('a, b, c', $r->getHeaderLine('Foo'));
+        $this->assertEquals('', $r->getHeaderLine('Bar'));
+    }
+
+    public function testHostIsNotOverwrittenWhenPreservingHost()
+    {
+        $r = new Request('GET', 'http://foo.com/baz?bar=bam', ['Host' => 'a.com']);
+        $this->assertEquals(['Host' => ['a.com']], $r->getHeaders());
+        $r2 = $r->withUri(new Uri('http://www.foo.com/bar'), true);
+        $this->assertEquals('a.com', $r2->getHeaderLine('Host'));
+    }
+
+    public function testOverridesHostWithUri()
+    {
+        $r = new Request('GET', 'http://foo.com/baz?bar=bam');
+        $this->assertEquals(['Host' => ['foo.com']], $r->getHeaders());
+        $r2 = $r->withUri(new Uri('http://www.baz.com/bar'));
+        $this->assertEquals('www.baz.com', $r2->getHeaderLine('Host'));
+    }
+
+    public function testAggregatesHeaders()
+    {
+        $r = new Request('GET', 'http://foo.com', [
+            'ZOO' => 'zoobar',
+            'zoo' => ['foobar', 'zoobar']
+        ]);
+        $this->assertEquals('zoobar, foobar, zoobar', $r->getHeaderLine('zoo'));
+    }
+
+    public function testAddsPortToHeader()
+    {
+        $r = new Request('GET', 'http://foo.com:8124/bar');
+        $this->assertEquals('foo.com:8124', $r->getHeaderLine('host'));
+    }
+
+    public function testAddsPortToHeaderAndReplacePreviousPort()
+    {
+        $r = new Request('GET', 'http://foo.com:8124/bar');
+        $r = $r->withUri(new Uri('http://foo.com:8125/bar'));
+        $this->assertEquals('foo.com:8125', $r->getHeaderLine('host'));
+    }
+}
diff --git a/core/vendor/guzzlehttp/psr7/tests/ResponseTest.php b/core/vendor/guzzlehttp/psr7/tests/ResponseTest.php
new file mode 100644
index 000000000..e8702924b
--- /dev/null
+++ b/core/vendor/guzzlehttp/psr7/tests/ResponseTest.php
@@ -0,0 +1,139 @@
+<?php
+namespace GuzzleHttp\Tests\Psr7;
+
+use GuzzleHttp\Psr7\Response;
+use GuzzleHttp\Psr7;
+
+/**
+ * @covers GuzzleHttp\Psr7\MessageTrait
+ * @covers GuzzleHttp\Psr7\Response
+ */
+class ResponseTest extends \PHPUnit_Framework_TestCase
+{
+    public function testAddsDefaultReason()
+    {
+        $r = new Response('200');
+        $this->assertSame(200, $r->getStatusCode());
+        $this->assertEquals('OK', $r->getReasonPhrase());
+    }
+
+    public function testCanGiveCustomReason()
+    {
+        $r = new Response(200, [], null, '1.1', 'bar');
+        $this->assertEquals('bar', $r->getReasonPhrase());
+    }
+
+    public function testCanGiveCustomProtocolVersion()
+    {
+        $r = new Response(200, [], null, '1000');
+        $this->assertEquals('1000', $r->getProtocolVersion());
+    }
+
+    public function testCanCreateNewResponseWithStatusAndNoReason()
+    {
+        $r = new Response(200);
+        $r2 = $r->withStatus(201);
+        $this->assertEquals(200, $r->getStatusCode());
+        $this->assertEquals('OK', $r->getReasonPhrase());
+        $this->assertEquals(201, $r2->getStatusCode());
+        $this->assertEquals('Created', $r2->getReasonPhrase());
+    }
+
+    public function testCanCreateNewResponseWithStatusAndReason()
+    {
+        $r = new Response(200);
+        $r2 = $r->withStatus(201, 'Foo');
+        $this->assertEquals(200, $r->getStatusCode());
+        $this->assertEquals('OK', $r->getReasonPhrase());
+        $this->assertEquals(201, $r2->getStatusCode());
+        $this->assertEquals('Foo', $r2->getReasonPhrase());
+    }
+
+    public function testCreatesResponseWithAddedHeaderArray()
+    {
+        $r = new Response();
+        $r2 = $r->withAddedHeader('foo', ['baz', 'bar']);
+        $this->assertFalse($r->hasHeader('foo'));
+        $this->assertEquals('baz, bar', $r2->getHeaderLine('foo'));
+    }
+
+    public function testReturnsIdentityWhenRemovingMissingHeader()
+    {
+        $r = new Response();
+        $this->assertSame($r, $r->withoutHeader('foo'));
+    }
+
+    public function testAlwaysReturnsBody()
+    {
+        $r = new Response();
+        $this->assertInstanceOf('Psr\Http\Message\StreamInterface', $r->getBody());
+    }
+
+    public function testCanSetHeaderAsArray()
+    {
+        $r = new Response(200, [
+            'foo' => ['baz ', ' bar ']
+        ]);
+        $this->assertEquals('baz, bar', $r->getHeaderLine('foo'));
+        $this->assertEquals(['baz', 'bar'], $r->getHeader('foo'));
+    }
+
+    public function testSameInstanceWhenSameBody()
+    {
+        $r = new Response(200, [], 'foo');
+        $b = $r->getBody();
+        $this->assertSame($r, $r->withBody($b));
+    }
+
+    public function testNewInstanceWhenNewBody()
+    {
+        $r = new Response(200, [], 'foo');
+        $b2 = Psr7\stream_for('abc');
+        $this->assertNotSame($r, $r->withBody($b2));
+    }
+
+    public function testSameInstanceWhenSameProtocol()
+    {
+        $r = new Response(200);
+        $this->assertSame($r, $r->withProtocolVersion('1.1'));
+    }
+
+    public function testNewInstanceWhenNewProtocol()
+    {
+        $r = new Response(200);
+        $this->assertNotSame($r, $r->withProtocolVersion('1.0'));
+    }
+
+    public function testNewInstanceWhenRemovingHeader()
+    {
+        $r = new Response(200, ['Foo' => 'Bar']);
+        $r2 = $r->withoutHeader('Foo');
+        $this->assertNotSame($r, $r2);
+        $this->assertFalse($r2->hasHeader('foo'));
+    }
+
+    public function testNewInstanceWhenAddingHeader()
+    {
+        $r = new Response(200, ['Foo' => 'Bar']);
+        $r2 = $r->withAddedHeader('Foo', 'Baz');
+        $this->assertNotSame($r, $r2);
+        $this->assertEquals('Bar, Baz', $r2->getHeaderLine('foo'));
+    }
+
+    public function testNewInstanceWhenAddingHeaderThatWasNotThereBefore()
+    {
+        $r = new Response(200, ['Foo' => 'Bar']);
+        $r2 = $r->withAddedHeader('Baz', 'Bam');
+        $this->assertNotSame($r, $r2);
+        $this->assertEquals('Bam', $r2->getHeaderLine('Baz'));
+        $this->assertEquals('Bar', $r2->getHeaderLine('Foo'));
+    }
+
+    public function testRemovesPreviouslyAddedHeaderOfDifferentCase()
+    {
+        $r = new Response(200, ['Foo' => 'Bar']);
+        $r2 = $r->withHeader('foo', 'Bam');
+        $this->assertNotSame($r, $r2);
+        $this->assertEquals('Bam', $r2->getHeaderLine('Foo'));
+    }
+}
diff --git a/core/vendor/guzzlehttp/streams/tests/StreamDecoratorTraitTest.php b/core/vendor/guzzlehttp/psr7/tests/StreamDecoratorTraitTest.php
similarity index 80%
rename from core/vendor/guzzlehttp/streams/tests/StreamDecoratorTraitTest.php
rename to core/vendor/guzzlehttp/psr7/tests/StreamDecoratorTraitTest.php
index 2ba79addf..682079e0c 100644
--- a/core/vendor/guzzlehttp/streams/tests/StreamDecoratorTraitTest.php
+++ b/core/vendor/guzzlehttp/psr7/tests/StreamDecoratorTraitTest.php
@@ -1,9 +1,9 @@
 <?php
-namespace GuzzleHttp\Tests\Stream;
+namespace GuzzleHttp\Tests\Psr7;
 
-use GuzzleHttp\Stream\StreamInterface;
-use GuzzleHttp\Stream\Stream;
-use GuzzleHttp\Stream\StreamDecoratorTrait;
+use Psr\Http\Message\StreamInterface;
+use GuzzleHttp\Psr7;
+use GuzzleHttp\Psr7\StreamDecoratorTrait;
 
 class Str implements StreamInterface
 {
@@ -11,7 +11,7 @@ class Str implements StreamInterface
 }
 
 /**
- * @covers GuzzleHttp\Stream\StreamDecoratorTrait
+ * @covers GuzzleHttp\Psr7\StreamDecoratorTrait
  */
 class StreamDecoratorTraitTest extends \PHPUnit_Framework_TestCase
 {
@@ -24,13 +24,13 @@ class StreamDecoratorTraitTest extends \PHPUnit_Framework_TestCase
         $this->c = fopen('php://temp', 'r+');
         fwrite($this->c, 'foo');
         fseek($this->c, 0);
-        $this->a = Stream::factory($this->c);
+        $this->a = Psr7\stream_for($this->c);
         $this->b = new Str($this->a);
     }
 
     public function testCatchesExceptionsWhenCastingToString()
     {
-        $s = $this->getMockBuilder('GuzzleHttp\Stream\StreamInterface')
+        $s = $this->getMockBuilder('Psr\Http\Message\StreamInterface')
             ->setMethods(['read'])
             ->getMockForAbstractClass();
         $s->expects($this->once())
@@ -51,8 +51,6 @@ class StreamDecoratorTraitTest extends \PHPUnit_Framework_TestCase
     public function testHasSize()
     {
         $this->assertEquals(3, $this->b->getSize());
-        $this->assertSame($this->b, $this->b->setSize(2));
-        $this->assertEquals(2, $this->b->getSize());
     }
 
     public function testReads()
@@ -69,13 +67,13 @@ class StreamDecoratorTraitTest extends \PHPUnit_Framework_TestCase
 
     public function testSeeksAndTells()
     {
-        $this->assertTrue($this->b->seek(1));
+        $this->b->seek(1);
         $this->assertEquals(1, $this->a->tell());
         $this->assertEquals(1, $this->b->tell());
-        $this->assertTrue($this->b->seek(0));
+        $this->b->seek(0);
         $this->assertEquals(0, $this->a->tell());
         $this->assertEquals(0, $this->b->tell());
-        $this->assertTrue($this->b->seek(0, SEEK_END));
+        $this->b->seek(0, SEEK_END);
         $this->assertEquals(3, $this->a->tell());
         $this->assertEquals(3, $this->b->tell());
     }
@@ -100,14 +98,6 @@ class StreamDecoratorTraitTest extends \PHPUnit_Framework_TestCase
         $this->assertFalse($this->b->isReadable());
     }
 
-    /**
-     * @expectedException \GuzzleHttp\Stream\Exception\CannotAttachException
-     */
-    public function testCannotAttachByDefault()
-    {
-        $this->b->attach('a');
-    }
-
     public function testWrapsMetadata()
     {
         $this->assertSame($this->b->getMetadata(), $this->a->getMetadata());
diff --git a/core/vendor/guzzlehttp/streams/tests/StreamTest.php b/core/vendor/guzzlehttp/psr7/tests/StreamTest.php
similarity index 53%
rename from core/vendor/guzzlehttp/streams/tests/StreamTest.php
rename to core/vendor/guzzlehttp/psr7/tests/StreamTest.php
index 2985bfbb1..4fe92cc6b 100644
--- a/core/vendor/guzzlehttp/streams/tests/StreamTest.php
+++ b/core/vendor/guzzlehttp/psr7/tests/StreamTest.php
@@ -1,10 +1,11 @@
 <?php
-namespace GuzzleHttp\Tests\Stream;
+namespace GuzzleHttp\Tests\Psr7;
 
-use GuzzleHttp\Stream\Stream;
+use GuzzleHttp\Psr7\NoSeekStream;
+use GuzzleHttp\Psr7\Stream;
 
 /**
- * @covers GuzzleHttp\Stream\Stream
+ * @covers GuzzleHttp\Psr7\Stream
  */
 class StreamTest extends \PHPUnit_Framework_TestCase
 {
@@ -71,16 +72,6 @@ class StreamTest extends \PHPUnit_Framework_TestCase
         $stream->close();
     }
 
-    public function testAllowsSettingManualSize()
-    {
-        $handle = fopen('php://temp', 'w+');
-        fwrite($handle, 'data');
-        $stream = new Stream($handle);
-        $stream->setSize(10);
-        $this->assertEquals(10, $stream->getSize());
-        $stream->close();
-    }
-
     public function testGetSize()
     {
         $size = filesize(__FILE__);
@@ -117,43 +108,34 @@ class StreamTest extends \PHPUnit_Framework_TestCase
         $stream->close();
     }
 
-    public function testKeepsPositionOfResource()
-    {
-        $h = fopen(__FILE__, 'r');
-        fseek($h, 10);
-        $stream = Stream::factory($h);
-        $this->assertEquals(10, $stream->tell());
-        $stream->close();
-    }
-
-    public function testCanDetachAndAttachStream()
+    public function testCanDetachStream()
     {
         $r = fopen('php://temp', 'w+');
         $stream = new Stream($r);
         $stream->write('foo');
         $this->assertTrue($stream->isReadable());
         $this->assertSame($r, $stream->detach());
-        $this->assertNull($stream->detach());
+        $stream->detach();
 
         $this->assertFalse($stream->isReadable());
-        $this->assertFalse($stream->read(10));
         $this->assertFalse($stream->isWritable());
-        $this->assertFalse($stream->write('bar'));
         $this->assertFalse($stream->isSeekable());
-        $this->assertFalse($stream->seek(10));
-        $this->assertFalse($stream->tell());
-        $this->assertTrue($stream->eof());
-        $this->assertNull($stream->getSize());
+
+        $throws = function (callable $fn) use ($stream) {
+            try {
+                $fn($stream);
+                $this->fail();
+            } catch (\Exception $e) {}
+        };
+
+        $throws(function ($stream) { $stream->read(10); });
+        $throws(function ($stream) { $stream->write('bar'); });
+        $throws(function ($stream) { $stream->seek(10); });
+        $throws(function ($stream) { $stream->tell(); });
+        $throws(function ($stream) { $stream->eof(); });
+        $throws(function ($stream) { $stream->getSize(); });
+        $throws(function ($stream) { $stream->getContents(); });
         $this->assertSame('', (string) $stream);
-        $this->assertSame('', $stream->getContents());
-
-        $stream->attach($r);
-        $stream->seek(0);
-        $this->assertEquals('foo', $stream->getContents());
-        $this->assertTrue($stream->isReadable());
-        $this->assertTrue($stream->isWritable());
-        $this->assertTrue($stream->isSeekable());
-
         $stream->close();
     }
 
@@ -163,90 +145,17 @@ class StreamTest extends \PHPUnit_Framework_TestCase
         $stream = new Stream($handle);
         $stream->close();
 
-        $this->assertEmpty($stream->getMetadata());
         $this->assertFalse($stream->isSeekable());
         $this->assertFalse($stream->isReadable());
         $this->assertFalse($stream->isWritable());
         $this->assertNull($stream->getSize());
+        $this->assertEmpty($stream->getMetadata());
     }
 
-    public function testCreatesWithFactory()
+    public function testDoesNotThrowInToString()
     {
-        $stream = Stream::factory('foo');
-        $this->assertInstanceOf('GuzzleHttp\Stream\Stream', $stream);
-        $this->assertEquals('foo', $stream->getContents());
-        $stream->close();
-    }
-
-    public function testFactoryCreatesFromEmptyString()
-    {
-        $s = Stream::factory();
-        $this->assertInstanceOf('GuzzleHttp\Stream\Stream', $s);
-    }
-
-    public function testFactoryCreatesFromResource()
-    {
-        $r = fopen(__FILE__, 'r');
-        $s = Stream::factory($r);
-        $this->assertInstanceOf('GuzzleHttp\Stream\Stream', $s);
-        $this->assertSame(file_get_contents(__FILE__), (string) $s);
-    }
-
-    public function testFactoryCreatesFromObjectWithToString()
-    {
-        $r = new HasToString();
-        $s = Stream::factory($r);
-        $this->assertInstanceOf('GuzzleHttp\Stream\Stream', $s);
+        $s = \GuzzleHttp\Psr7\stream_for('foo');
+        $s = new NoSeekStream($s);
         $this->assertEquals('foo', (string) $s);
     }
-
-    public function testCreatePassesThrough()
-    {
-        $s = Stream::factory('foo');
-        $this->assertSame($s, Stream::factory($s));
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     */
-    public function testThrowsExceptionForUnknown()
-    {
-        Stream::factory(new \stdClass());
-    }
-
-    public function testReturnsCustomMetadata()
-    {
-        $s = Stream::factory('foo', ['metadata' => ['hwm' => 3]]);
-        $this->assertEquals(3, $s->getMetadata('hwm'));
-        $this->assertArrayHasKey('hwm', $s->getMetadata());
-    }
-
-    public function testCanSetSize()
-    {
-        $s = Stream::factory('', ['size' => 10]);
-        $this->assertEquals(10, $s->getSize());
-    }
-
-    public function testCanCreateIteratorBasedStream()
-    {
-        $a = new \ArrayIterator(['foo', 'bar', '123']);
-        $p = Stream::factory($a);
-        $this->assertInstanceOf('GuzzleHttp\Stream\PumpStream', $p);
-        $this->assertEquals('foo', $p->read(3));
-        $this->assertFalse($p->eof());
-        $this->assertEquals('b', $p->read(1));
-        $this->assertEquals('a', $p->read(1));
-        $this->assertEquals('r12', $p->read(3));
-        $this->assertFalse($p->eof());
-        $this->assertEquals('3', $p->getContents());
-        $this->assertTrue($p->eof());
-        $this->assertEquals(9, $p->tell());
-    }
-}
-
-class HasToString
-{
-    public function __toString() {
-        return 'foo';
-    }
 }
diff --git a/core/vendor/guzzlehttp/streams/tests/GuzzleStreamWrapperTest.php b/core/vendor/guzzlehttp/psr7/tests/StreamWrapperTest.php
similarity index 81%
rename from core/vendor/guzzlehttp/streams/tests/GuzzleStreamWrapperTest.php
rename to core/vendor/guzzlehttp/psr7/tests/StreamWrapperTest.php
index 33c3eccb4..0156e5988 100644
--- a/core/vendor/guzzlehttp/streams/tests/GuzzleStreamWrapperTest.php
+++ b/core/vendor/guzzlehttp/psr7/tests/StreamWrapperTest.php
@@ -1,23 +1,24 @@
 <?php
-namespace GuzzleHttp\Tests\Stream;
+namespace GuzzleHttp\Tests\Psr7;
 
-use GuzzleHttp\Stream\GuzzleStreamWrapper;
-use GuzzleHttp\Stream\Stream;
+use GuzzleHttp\Psr7\StreamWrapper;
+use GuzzleHttp\Psr7;
 
 /**
- * @covers GuzzleHttp\Stream\GuzzleStreamWrapper
+ * @covers GuzzleHttp\Psr7\StreamWrapper
  */
-class GuzzleStreamWrapperTest extends \PHPUnit_Framework_TestCase
+class StreamWrapperTest extends \PHPUnit_Framework_TestCase
 {
     public function testResource()
     {
-        $stream = Stream::factory('foo');
-        $handle = GuzzleStreamWrapper::getResource($stream);
+        $stream = Psr7\stream_for('foo');
+        $handle = StreamWrapper::getResource($stream);
         $this->assertSame('foo', fread($handle, 3));
         $this->assertSame(3, ftell($handle));
         $this->assertSame(3, fwrite($handle, 'bar'));
         $this->assertSame(0, fseek($handle, 0));
         $this->assertSame('foobar', fread($handle, 6));
+        $this->assertSame('', fread($handle, 1));
         $this->assertTrue(feof($handle));
 
         // This fails on HHVM for some reason
@@ -61,7 +62,7 @@ class GuzzleStreamWrapperTest extends \PHPUnit_Framework_TestCase
      */
     public function testValidatesStream()
     {
-        $stream = $this->getMockBuilder('GuzzleHttp\Stream\StreamInterface')
+        $stream = $this->getMockBuilder('Psr\Http\Message\StreamInterface')
             ->setMethods(['isReadable', 'isWritable'])
             ->getMockForAbstractClass();
         $stream->expects($this->once())
@@ -70,7 +71,7 @@ class GuzzleStreamWrapperTest extends \PHPUnit_Framework_TestCase
         $stream->expects($this->once())
             ->method('isWritable')
             ->will($this->returnValue(false));
-        GuzzleStreamWrapper::getResource($stream);
+        StreamWrapper::getResource($stream);
     }
 
     /**
@@ -83,7 +84,7 @@ class GuzzleStreamWrapperTest extends \PHPUnit_Framework_TestCase
 
     public function testCanOpenReadonlyStream()
     {
-        $stream = $this->getMockBuilder('GuzzleHttp\Stream\StreamInterface')
+        $stream = $this->getMockBuilder('Psr\Http\Message\StreamInterface')
             ->setMethods(['isReadable', 'isWritable'])
             ->getMockForAbstractClass();
         $stream->expects($this->once())
@@ -92,7 +93,7 @@ class GuzzleStreamWrapperTest extends \PHPUnit_Framework_TestCase
         $stream->expects($this->once())
             ->method('isWritable')
             ->will($this->returnValue(true));
-        $r = GuzzleStreamWrapper::getResource($stream);
+        $r = StreamWrapper::getResource($stream);
         $this->assertInternalType('resource', $r);
         fclose($r);
     }
diff --git a/core/vendor/guzzlehttp/psr7/tests/UriTest.php b/core/vendor/guzzlehttp/psr7/tests/UriTest.php
new file mode 100644
index 000000000..80755da0f
--- /dev/null
+++ b/core/vendor/guzzlehttp/psr7/tests/UriTest.php
@@ -0,0 +1,245 @@
+<?php
+namespace GuzzleHttp\Tests\Psr7;
+
+use GuzzleHttp\Psr7\Uri;
+
+/**
+ * @covers GuzzleHttp\Psr7\Uri
+ */
+class UriTest extends \PHPUnit_Framework_TestCase
+{
+    const RFC3986_BASE = "http://a/b/c/d;p?q";
+
+    public function testParsesProvidedUrl()
+    {
+        $uri = new Uri('https://michael:test@test.com:443/path/123?q=abc#test');
+
+        // Standard port 443 for https gets ignored.
+        $this->assertEquals(
+            'https://michael:test@test.com/path/123?q=abc#test',
+            (string) $uri
+        );
+
+        $this->assertEquals('test', $uri->getFragment());
+        $this->assertEquals('test.com', $uri->getHost());
+        $this->assertEquals('/path/123', $uri->getPath());
+        $this->assertEquals(null, $uri->getPort());
+        $this->assertEquals('q=abc', $uri->getQuery());
+        $this->assertEquals('https', $uri->getScheme());
+        $this->assertEquals('michael:test', $uri->getUserInfo());
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Unable to parse URI
+     */
+    public function testValidatesUriCanBeParsed()
+    {
+        new Uri('///');
+    }
+
+    public function testCanTransformAndRetrievePartsIndividually()
+    {
+        $uri = (new Uri(''))
+            ->withFragment('#test')
+            ->withHost('example.com')
+            ->withPath('path/123')
+            ->withPort(8080)
+            ->withQuery('?q=abc')
+            ->withScheme('http')
+            ->withUserInfo('user', 'pass');
+
+        // Test getters.
+        $this->assertEquals('user:pass@example.com:8080', $uri->getAuthority());
+        $this->assertEquals('test', $uri->getFragment());
+        $this->assertEquals('example.com', $uri->getHost());
+        $this->assertEquals('path/123', $uri->getPath());
+        $this->assertEquals(8080, $uri->getPort());
+        $this->assertEquals('q=abc', $uri->getQuery());
+        $this->assertEquals('http', $uri->getScheme());
+        $this->assertEquals('user:pass', $uri->getUserInfo());
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     */
+    public function testPortMustBeValid()
+    {
+        (new Uri(''))->withPort(100000);
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     */
+    public function testPathMustBeValid()
+    {
+        (new Uri(''))->withPath([]);
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     */
+    public function testQueryMustBeValid()
+    {
+        (new Uri(''))->withQuery(new \stdClass);
+    }
+
+    public function testAllowsFalseyUrlParts()
+    {
+        $url = new Uri('http://a:1/0?0#0');
+        $this->assertSame('a', $url->getHost());
+        $this->assertEquals(1, $url->getPort());
+        $this->assertSame('/0', $url->getPath());
+        $this->assertEquals('0', (string) $url->getQuery());
+        $this->assertSame('0', $url->getFragment());
+        $this->assertEquals('http://a:1/0?0#0', (string) $url);
+        $url = new Uri('');
+        $this->assertSame('', (string) $url);
+        $url = new Uri('0');
+        $this->assertSame('0', (string) $url);
+        $url = new Uri('/');
+        $this->assertSame('/', (string) $url);
+    }
+
+    /**
+     * @dataProvider getResolveTestCases
+     */
+    public function testResolvesUris($base, $rel, $expected)
+    {
+        $uri = new Uri($base);
+        $actual = Uri::resolve($uri, $rel);
+        $this->assertEquals($expected, (string) $actual);
+    }
+
+    public function getResolveTestCases()
+    {
+        return [
+            //[self::RFC3986_BASE, 'g:h',           'g:h'],
+            [self::RFC3986_BASE, 'g',             'http://a/b/c/g'],
+            [self::RFC3986_BASE, './g',           'http://a/b/c/g'],
+            [self::RFC3986_BASE, 'g/',            'http://a/b/c/g/'],
+            [self::RFC3986_BASE, '/g',            'http://a/g'],
+            [self::RFC3986_BASE, '//g',           'http://g'],
+            [self::RFC3986_BASE, '?y',            'http://a/b/c/d;p?y'],
+            [self::RFC3986_BASE, 'g?y',           'http://a/b/c/g?y'],
+            [self::RFC3986_BASE, '#s',            'http://a/b/c/d;p?q#s'],
+            [self::RFC3986_BASE, 'g#s',           'http://a/b/c/g#s'],
+            [self::RFC3986_BASE, 'g?y#s',         'http://a/b/c/g?y#s'],
+            [self::RFC3986_BASE, ';x',            'http://a/b/c/;x'],
+            [self::RFC3986_BASE, 'g;x',           'http://a/b/c/g;x'],
+            [self::RFC3986_BASE, 'g;x?y#s',       'http://a/b/c/g;x?y#s'],
+            [self::RFC3986_BASE, '',              self::RFC3986_BASE],
+            [self::RFC3986_BASE, '.',             'http://a/b/c/'],
+            [self::RFC3986_BASE, './',            'http://a/b/c/'],
+            [self::RFC3986_BASE, '..',            'http://a/b/'],
+            [self::RFC3986_BASE, '../',           'http://a/b/'],
+            [self::RFC3986_BASE, '../g',          'http://a/b/g'],
+            [self::RFC3986_BASE, '../..',         'http://a/'],
+            [self::RFC3986_BASE, '../../',        'http://a/'],
+            [self::RFC3986_BASE, '../../g',       'http://a/g'],
+            [self::RFC3986_BASE, '../../../g',    'http://a/g'],
+            [self::RFC3986_BASE, '../../../../g', 'http://a/g'],
+            [self::RFC3986_BASE, '/./g',          'http://a/g'],
+            [self::RFC3986_BASE, '/../g',         'http://a/g'],
+            [self::RFC3986_BASE, 'g.',            'http://a/b/c/g.'],
+            [self::RFC3986_BASE, '.g',            'http://a/b/c/.g'],
+            [self::RFC3986_BASE, 'g..',           'http://a/b/c/g..'],
+            [self::RFC3986_BASE, '..g',           'http://a/b/c/..g'],
+            [self::RFC3986_BASE, './../g',        'http://a/b/g'],
+            [self::RFC3986_BASE, 'foo////g',      'http://a/b/c/foo////g'],
+            [self::RFC3986_BASE, './g/.',         'http://a/b/c/g/'],
+            [self::RFC3986_BASE, 'g/./h',         'http://a/b/c/g/h'],
+            [self::RFC3986_BASE, 'g/../h',        'http://a/b/c/h'],
+            [self::RFC3986_BASE, 'g;x=1/./y',     'http://a/b/c/g;x=1/y'],
+            [self::RFC3986_BASE, 'g;x=1/../y',    'http://a/b/c/y'],
+            //[self::RFC3986_BASE, 'http:g',        'http:g'],
+        ];
+    }
+
+    public function testAddAndRemoveQueryValues()
+    {
+        $uri = new Uri('http://foo.com/bar');
+        $uri = Uri::withQueryValue($uri, 'a', 'b');
+        $uri = Uri::withQueryValue($uri, 'c', 'd');
+        $uri = Uri::withQueryValue($uri, 'e', null);
+        $this->assertEquals('a=b&c=d&e', $uri->getQuery());
+
+        $uri = Uri::withoutQueryValue($uri, 'c');
+        $uri = Uri::withoutQueryValue($uri, 'e');
+        $this->assertEquals('a=b', $uri->getQuery());
+        $uri = Uri::withoutQueryValue($uri, 'a');
+        $uri = Uri::withoutQueryValue($uri, 'a');
+        $this->assertEquals('', $uri->getQuery());
+    }
+
+    public function testGetAuthorityReturnsCorrectPort()
+    {
+        // HTTPS non-standard port
+        $uri = new Uri('https://foo.co:99');
+        $this->assertEquals('foo.co:99', $uri->getAuthority());
+
+        // HTTP non-standard port
+        $uri = new Uri('http://foo.co:99');
+        $this->assertEquals('foo.co:99', $uri->getAuthority());
+
+        // No scheme
+        $uri = new Uri('foo.co:99');
+        $this->assertEquals('foo.co:99', $uri->getAuthority());
+
+        // No host or port
+        $uri = new Uri('http:');
+        $this->assertEquals('', $uri->getAuthority());
+
+        // No host or port
+        $uri = new Uri('http://foo.co');
+        $this->assertEquals('foo.co', $uri->getAuthority());
+    }
+
+    public function pathTestProvider()
+    {
+        return [
+            // Percent encode spaces.
+            ['http://foo.com/baz bar', 'http://foo.com/baz%20bar'],
+            // Don't encoding something that's already encoded.
+            ['http://foo.com/baz%20bar', 'http://foo.com/baz%20bar'],
+            // Percent encode invalid percent encodings
+            ['http://foo.com/baz%2-bar', 'http://foo.com/baz%252-bar'],
+            // Don't encode path segments
+            ['http://foo.com/baz/bar/bam?a', 'http://foo.com/baz/bar/bam?a'],
+            ['http://foo.com/baz+bar', 'http://foo.com/baz+bar'],
+            ['http://foo.com/baz:bar', 'http://foo.com/baz:bar'],
+            ['http://foo.com/baz@bar', 'http://foo.com/baz@bar'],
+            ['http://foo.com/baz(bar);bam/', 'http://foo.com/baz(bar);bam/'],
+            ['http://foo.com/a-zA-Z0-9.-_~!$&\'()*+,;=:@', 'http://foo.com/a-zA-Z0-9.-_~!$&\'()*+,;=:@'],
+        ];
+    }
+
+    /**
+     * @dataProvider pathTestProvider
+     */
+    public function testUriEncodesPathProperly($input, $output)
+    {
+        $uri = new Uri($input);
+        $this->assertEquals((string) $uri, $output);
+    }
+
+    public function testDoesNotAddPortWhenNoPort()
+    {
+        $this->assertEquals('bar', new Uri('//bar'));
+        $this->assertEquals('bar', (new Uri('//bar'))->getHost());
+    }
+
+    public function testAllowsForRelativeUri()
+    {
+        $uri = (new Uri)->withPath('foo');
+        $this->assertEquals('foo', $uri->getPath());
+        $this->assertEquals('foo', (string) $uri);
+    }
+
+    public function testAddsSlashForRelativeUriStringWithHost()
+    {
+        $uri = (new Uri)->withPath('foo')->withHost('bar.com');
+        $this->assertEquals('foo', $uri->getPath());
+        $this->assertEquals('bar.com/foo', (string) $uri);
+    }
+}
diff --git a/core/vendor/guzzlehttp/psr7/tests/bootstrap.php b/core/vendor/guzzlehttp/psr7/tests/bootstrap.php
new file mode 100644
index 000000000..8601dd330
--- /dev/null
+++ b/core/vendor/guzzlehttp/psr7/tests/bootstrap.php
@@ -0,0 +1,11 @@
+<?php
+namespace GuzzleHttp\Tests\Psr7;
+
+require __DIR__ . '/../vendor/autoload.php';
+
+class HasToString
+{
+    public function __toString() {
+        return 'foo';
+    }
+}
diff --git a/core/vendor/guzzlehttp/ringphp/.gitignore b/core/vendor/guzzlehttp/ringphp/.gitignore
deleted file mode 100644
index 290a94524..000000000
--- a/core/vendor/guzzlehttp/ringphp/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-vendor
-build/artifacts/
-composer.lock
-docs/_build/
diff --git a/core/vendor/guzzlehttp/ringphp/.travis.yml b/core/vendor/guzzlehttp/ringphp/.travis.yml
deleted file mode 100644
index e43fbdd9c..000000000
--- a/core/vendor/guzzlehttp/ringphp/.travis.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-language: php
-
-php:
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - hhvm
-
-before_script:
-  - composer self-update
-  - composer install --no-interaction --prefer-source --dev
-  - ~/.nvm/nvm.sh install v0.6.14
-  - ~/.nvm/nvm.sh run v0.6.14
-
-script:
-  - make test
-
-matrix:
-  allow_failures:
-    - php: hhvm
-  fast_finish: true
diff --git a/core/vendor/guzzlehttp/ringphp/CHANGELOG.md b/core/vendor/guzzlehttp/ringphp/CHANGELOG.md
deleted file mode 100644
index 97458da57..000000000
--- a/core/vendor/guzzlehttp/ringphp/CHANGELOG.md
+++ /dev/null
@@ -1,44 +0,0 @@
-# CHANGELOG
-
-## 1.0.7 - 2015-03-29
-
-* PHP 7 fixes.
-
-## 1.0.6 - 2015-02-26
-
-* Bug fix: futures now extend from React's PromiseInterface to ensure that they
-  are properly forwarded down the promise chain.
-* The multi handle of the CurlMultiHandler is now created lazily.
-
-## 1.0.5 - 2014-12-10
-
-* Adding more error information to PHP stream wrapper exceptions.
-* Added digest auth integration test support to test server.
-
-## 1.0.4 - 2014-12-01
-
-* Added support for older versions of cURL that do not have CURLOPT_TIMEOUT_MS.
-* Setting debug to `false` does not enable debug output.
-* Added a fix to the StreamHandler to return a `FutureArrayInterface` when an
-  error occurs.
-
-## 1.0.3 - 2014-11-03
-
-* Setting the `header` stream option as a string to be compatible with GAE.
-* Header parsing now ensures that header order is maintained in the parsed
-  message.
-
-## 1.0.2 - 2014-10-28
-
-* Now correctly honoring a `version` option is supplied in a request.
-  See https://github.com/guzzle/RingPHP/pull/8
-
-## 1.0.1 - 2014-10-26
-
-* Fixed a header parsing issue with the `CurlHandler` and `CurlMultiHandler`
-  that caused cURL requests with multiple responses to merge repsonses together
-  (e.g., requests with digest authentication).
-
-## 1.0.0 - 2014-10-12
-
-* Initial release.
diff --git a/core/vendor/guzzlehttp/ringphp/Makefile b/core/vendor/guzzlehttp/ringphp/Makefile
deleted file mode 100644
index 21c812e38..000000000
--- a/core/vendor/guzzlehttp/ringphp/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-all: clean coverage docs
-
-docs:
-	cd docs && make html
-
-view-docs:
-	open docs/_build/html/index.html
-
-start-server: stop-server
-	node tests/Client/server.js &> /dev/null &
-
-stop-server:
-	@PID=$(shell ps axo pid,command \
-	  | grep 'tests/Client/server.js' \
-	  | grep -v grep \
-	  | cut -f 1 -d " "\
-	) && [ -n "$$PID" ] && kill $$PID || true
-
-test: start-server
-	vendor/bin/phpunit $(TEST)
-	$(MAKE) stop-server
-
-coverage: start-server
-	vendor/bin/phpunit --coverage-html=build/artifacts/coverage $(TEST)
-	$(MAKE) stop-server
-
-view-coverage:
-	open build/artifacts/coverage/index.html
-
-clean:
-	rm -rf build/artifacts/*
-	cd docs && make clean
-
-tag:
-	$(if $(TAG),,$(error TAG is not defined. Pass via "make tag TAG=4.2.1"))
-	@echo Tagging $(TAG)
-	chag update -m '$(TAG) ()'
-	git add -A
-	git commit -m '$(TAG) release'
-	chag tag
-
-perf: start-server
-	php tests/perf.php
-	$(MAKE) stop-server
-
-.PHONY: docs
diff --git a/core/vendor/guzzlehttp/ringphp/README.rst b/core/vendor/guzzlehttp/ringphp/README.rst
deleted file mode 100644
index 10374e813..000000000
--- a/core/vendor/guzzlehttp/ringphp/README.rst
+++ /dev/null
@@ -1,46 +0,0 @@
-=======
-RingPHP
-=======
-
-Provides a simple API and specification that abstracts away the details of HTTP
-into a single PHP function. RingPHP be used to power HTTP clients and servers
-through a PHP function that accepts a request hash and returns a response hash
-that is fulfilled using a `promise <https://github.com/reactphp/promise>`_,
-allowing RingPHP to support both synchronous and asynchronous workflows.
-
-By abstracting the implementation details of different HTTP clients and
-servers, RingPHP allows you to utilize pluggable HTTP clients and servers
-without tying your application to a specific implementation.
-
-.. code-block:: php
-
-    <?php
-    require 'vendor/autoload.php';
-
-    use GuzzleHttp\Ring\Client\CurlHandler;
-
-    $handler = new CurlHandler();
-    $response = $handler([
-        'http_method' => 'GET',
-        'uri'         => '/',
-        'headers'     => [
-            'host'  => ['www.google.com'],
-            'x-foo' => ['baz']
-        ]
-    ]);
-
-    $response->then(function (array $response) {
-        echo $response['status'];
-    });
-
-    $response->wait();
-
-RingPHP is inspired by Clojure's `Ring <https://github.com/ring-clojure/ring>`_,
-which, in turn, was inspired by Python's WSGI and Ruby's Rack. RingPHP is
-utilized as the handler layer in `Guzzle <http://guzzlephp.org>`_ 5.0+ to send
-HTTP requests.
-
-Documentation
--------------
-
-See http://ringphp.readthedocs.org/ for the full online documentation.
diff --git a/core/vendor/guzzlehttp/ringphp/composer.json b/core/vendor/guzzlehttp/ringphp/composer.json
deleted file mode 100644
index fcca6298e..000000000
--- a/core/vendor/guzzlehttp/ringphp/composer.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "name": "guzzlehttp/ringphp",
-    "description": "Provides a simple API and specification that abstracts away the details of HTTP into a single PHP function.",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Michael Dowling",
-            "email": "mtdowling@gmail.com",
-            "homepage": "https://github.com/mtdowling"
-        }
-    ],
-    "require": {
-        "php": ">=5.4.0",
-        "guzzlehttp/streams": "~3.0",
-        "react/promise": "~2.0"
-    },
-    "require-dev": {
-        "ext-curl": "*",
-        "phpunit/phpunit": "~4.0"
-    },
-    "suggest": {
-        "ext-curl": "Guzzle will use specific adapters if cURL is present"
-    },
-    "autoload": {
-        "psr-4": {
-            "GuzzleHttp\\Ring\\": "src/"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "GuzzleHttp\\Tests\\Ring\\": "tests/"
-        }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.0-dev"
-        }
-    }
-}
diff --git a/core/vendor/guzzlehttp/ringphp/docs/Makefile b/core/vendor/guzzlehttp/ringphp/docs/Makefile
deleted file mode 100644
index 51270aa5d..000000000
--- a/core/vendor/guzzlehttp/ringphp/docs/Makefile
+++ /dev/null
@@ -1,153 +0,0 @@
-# Makefile for Sphinx documentation
-#
-
-# You can set these variables from the command line.
-SPHINXOPTS    =
-SPHINXBUILD   = sphinx-build
-PAPER         =
-BUILDDIR      = _build
-
-# Internal variables.
-PAPEROPT_a4     = -D latex_paper_size=a4
-PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
-# the i18n builder cannot share the environment and doctrees with the others
-I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
-
-.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
-
-help:
-	@echo "Please use \`make <target>' where <target> is one of"
-	@echo "  html       to make standalone HTML files"
-	@echo "  dirhtml    to make HTML files named index.html in directories"
-	@echo "  singlehtml to make a single large HTML file"
-	@echo "  pickle     to make pickle files"
-	@echo "  json       to make JSON files"
-	@echo "  htmlhelp   to make HTML files and a HTML help project"
-	@echo "  qthelp     to make HTML files and a qthelp project"
-	@echo "  devhelp    to make HTML files and a Devhelp project"
-	@echo "  epub       to make an epub"
-	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
-	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
-	@echo "  text       to make text files"
-	@echo "  man        to make manual pages"
-	@echo "  texinfo    to make Texinfo files"
-	@echo "  info       to make Texinfo files and run them through makeinfo"
-	@echo "  gettext    to make PO message catalogs"
-	@echo "  changes    to make an overview of all changed/added/deprecated items"
-	@echo "  linkcheck  to check all external links for integrity"
-	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
-
-clean:
-	-rm -rf $(BUILDDIR)/*
-
-html:
-	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
-
-dirhtml:
-	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
-
-singlehtml:
-	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
-	@echo
-	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
-
-pickle:
-	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
-	@echo
-	@echo "Build finished; now you can process the pickle files."
-
-json:
-	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
-	@echo
-	@echo "Build finished; now you can process the JSON files."
-
-htmlhelp:
-	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
-	@echo
-	@echo "Build finished; now you can run HTML Help Workshop with the" \
-	      ".hhp project file in $(BUILDDIR)/htmlhelp."
-
-qthelp:
-	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
-	@echo
-	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
-	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/GuzzleRing.qhcp"
-	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/GuzzleRing.qhc"
-
-devhelp:
-	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
-	@echo
-	@echo "Build finished."
-	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/GuzzleRing"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/GuzzleRing"
-	@echo "# devhelp"
-
-epub:
-	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
-	@echo
-	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
-
-latex:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo
-	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
-	@echo "Run \`make' in that directory to run these through (pdf)latex" \
-	      "(use \`make latexpdf' here to do that automatically)."
-
-latexpdf:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo "Running LaTeX files through pdflatex..."
-	$(MAKE) -C $(BUILDDIR)/latex all-pdf
-	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
-
-text:
-	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
-	@echo
-	@echo "Build finished. The text files are in $(BUILDDIR)/text."
-
-man:
-	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
-	@echo
-	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
-
-texinfo:
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo
-	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
-	@echo "Run \`make' in that directory to run these through makeinfo" \
-	      "(use \`make info' here to do that automatically)."
-
-info:
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo "Running Texinfo files through makeinfo..."
-	make -C $(BUILDDIR)/texinfo info
-	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
-
-gettext:
-	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
-	@echo
-	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
-
-changes:
-	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
-	@echo
-	@echo "The overview file is in $(BUILDDIR)/changes."
-
-linkcheck:
-	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
-	@echo
-	@echo "Link check complete; look for any errors in the above output " \
-	      "or in $(BUILDDIR)/linkcheck/output.txt."
-
-doctest:
-	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
-	@echo "Testing of doctests in the sources finished, look at the " \
-	      "results in $(BUILDDIR)/doctest/output.txt."
diff --git a/core/vendor/guzzlehttp/ringphp/docs/client_handlers.rst b/core/vendor/guzzlehttp/ringphp/docs/client_handlers.rst
deleted file mode 100644
index 3151f0021..000000000
--- a/core/vendor/guzzlehttp/ringphp/docs/client_handlers.rst
+++ /dev/null
@@ -1,173 +0,0 @@
-===============
-Client Handlers
-===============
-
-Client handlers accept a request array and return a future response array that
-can be used synchronously as an array or asynchronously using a promise.
-
-Built-In Handlers
------------------
-
-RingPHP comes with three built-in client handlers.
-
-Stream Handler
-~~~~~~~~~~~~~~
-
-The ``GuzzleHttp\Ring\Client\StreamHandler`` uses PHP's
-`http stream wrapper <http://php.net/manual/en/wrappers.http.php>`_ to send
-requests.
-
-.. note::
-
-    This handler cannot send requests concurrently.
-
-You can provide an associative array of custom stream context options to the
-StreamHandler using the ``stream_context`` key of the ``client`` request
-option.
-
-.. code-block:: php
-
-    use GuzzleHttp\Ring\Client\StreamHandler;
-
-    $response = $handler([
-        'http_method' => 'GET',
-        'uri' => '/',
-        'headers' => ['host' => ['httpbin.org']],
-        'client' => [
-            'stream_context' => [
-                'http' => [
-                    'request_fulluri' => true,
-                    'method' => 'HEAD'
-                ],
-                'socket' => [
-                    'bindto' => '127.0.0.1:0'
-                ],
-                'ssl' => [
-                    'verify_peer' => false
-                ]
-            ]
-        ]
-    ]);
-
-    // Even though it's already completed, you can still use a promise
-    $response->then(function ($response) {
-        echo $response['status']; // 200
-    });
-
-    // Or access the response using the future interface
-    echo $response['status']; // 200
-
-cURL Handler
-~~~~~~~~~~~~
-
-The ``GuzzleHttp\Ring\Client\CurlHandler`` can be used with PHP 5.5+ to send
-requests using cURL easy handles. This handler is great for sending requests
-one at a time because the execute and select loop is implemented in C code
-which executes faster and consumes less memory than using PHP's
-``curl_multi_*`` interface.
-
-.. note::
-
-    This handler cannot send requests concurrently.
-
-When using the CurlHandler, custom curl options can be specified as an
-associative array of `cURL option constants <http://php.net/manual/en/curl.constants.php>`_
-mapping to values in the ``client`` option of a requst using the **curl** key.
-
-.. code-block:: php
-
-    use GuzzleHttp\Ring\Client\CurlHandler;
-
-    $handler = new CurlHandler();
-
-    $request = [
-        'http_method' => 'GET',
-        'headers'     => ['host' => [Server::$host]],
-        'client'      => ['curl' => [CURLOPT_LOW_SPEED_LIMIT => 10]]
-    ];
-
-    $response = $handler($request);
-
-    // The response can be used directly as an array.
-    echo $response['status']; // 200
-
-    // Or, it can be used as a promise (that has already fulfilled).
-    $response->then(function ($response) {
-        echo $response['status']; // 200
-    });
-
-cURL Multi Handler
-~~~~~~~~~~~~~~~~~~
-
-The ``GuzzleHttp\Ring\Client\CurlMultiHandler`` transfers requests using
-cURL's `multi API <http://curl.haxx.se/libcurl/c/libcurl-multi.html>`_. The
-``CurlMultiHandler`` is great for sending requests concurrently.
-
-.. code-block:: php
-
-    use GuzzleHttp\Ring\Client\CurlMultiHandler;
-
-    $handler = new CurlMultiHandler();
-
-    $request = [
-        'http_method' => 'GET',
-        'headers'     => ['host' => [Server::$host]]
-    ];
-
-    // this call returns a future array immediately.
-    $response = $handler($request);
-
-    // Ideally, you should use the promise API to not block.
-    $response
-        ->then(function ($response) {
-            // Got the response at some point in the future
-            echo $response['status']; // 200
-            // Don't break the chain
-            return $response;
-        })->then(function ($response) {
-            // ...
-        });
-
-    // If you really need to block, then you can use the response as an
-    // associative array. This will block until it has completed.
-    echo $response['status']; // 200
-
-Just like the ``CurlHandler``, the ``CurlMultiHandler`` accepts custom curl
-option in the ``curl`` key of the ``client`` request option.
-
-Mock Handler
-~~~~~~~~~~~~
-
-The ``GuzzleHttp\Ring\Client\MockHandler`` is used to return mock responses.
-When constructed, the handler can be configured to return the same response
-array over and over, a future response, or a the evaluation of a callback
-function.
-
-.. code-block:: php
-
-    use GuzzleHttp\Ring\Client\MockHandler;
-
-    // Return a canned response.
-    $mock = new MockHandler(['status' => 200]);
-    $response = $mock([]);
-    assert(200 == $response['status']);
-    assert([] == $response['headers']);
-
-Implementing Handlers
----------------------
-
-Client handlers are just PHP callables (functions or classes that have the
-``__invoke`` magic method). The callable accepts a request array and MUST
-return an instance of ``GuzzleHttp\Ring\Future\FutureArrayInterface`` so that
-the response can be used by both blocking and non-blocking consumers.
-
-Handlers need to follow a few simple rules:
-
-1. Do not throw exceptions. If an error is encountered, return an array that
-   contains the ``error`` key that maps to an ``\Exception`` value.
-2. If the request has a ``delay`` client option, then the handler should only
-   send the request after the specified delay time in seconds. Blocking
-   handlers may find it convenient to just let the
-   ``GuzzleHttp\Ring\Core::doSleep($request)`` function handle this for them.
-3. Always return an instance of ``GuzzleHttp\Ring\Future\FutureArrayInterface``.
-4. Complete any outstanding requests when the handler is destructed.
diff --git a/core/vendor/guzzlehttp/ringphp/docs/client_middleware.rst b/core/vendor/guzzlehttp/ringphp/docs/client_middleware.rst
deleted file mode 100644
index 7c52c8a69..000000000
--- a/core/vendor/guzzlehttp/ringphp/docs/client_middleware.rst
+++ /dev/null
@@ -1,165 +0,0 @@
-=================
-Client Middleware
-=================
-
-Middleware intercepts requests before they are sent over the wire and can be
-used to add functionality to handlers.
-
-Modifying Requests
-------------------
-
-Let's say you wanted to modify requests before they are sent over the wire
-so that they always add specific headers. This can be accomplished by creating
-a function that accepts a handler and returns a new function that adds the
-composed behavior.
-
-.. code-block:: php
-
-    use GuzzleHttp\Ring\Client\CurlHandler;
-
-    $handler = new CurlHandler();
-
-    $addHeaderHandler = function (callable $handler, array $headers = []) {
-        return function (array $request) use ($handler, $headers) {
-            // Add our custom headers
-            foreach ($headers as $key => $value) {
-                $request['headers'][$key] = $value;
-            }
-
-            // Send the request using the handler and return the response.
-            return $handler($request);
-        }
-    };
-
-    // Create a new handler that adds headers to each request.
-    $handler = $addHeaderHandler($handler, [
-        'X-AddMe'       => 'hello',
-        'Authorization' => 'Basic xyz'
-    ]);
-
-    $response = $handler([
-        'http_method' => 'GET',
-        'headers'     => ['Host' => ['httpbin.org']
-    ]);
-
-Modifying Responses
--------------------
-
-You can change a response as it's returned from a middleware. Remember that
-responses returned from an handler (including middleware) must implement
-``GuzzleHttp\Ring\Future\FutureArrayInterface``. In order to be a good citizen,
-you should not expect that the responses returned through your middleware will
-be completed synchronously. Instead, you should use the
-``GuzzleHttp\Ring\Core::proxy()`` function to modify the response when the
-underlying promise is resolved. This function is a helper function that makes it
-easy to create a new instance of ``FutureArrayInterface`` that wraps an existing
-``FutureArrayInterface`` object.
-
-Let's say you wanted to add headers to a response as they are returned from
-your middleware, but you want to make sure you aren't causing future
-responses to be dereferenced right away. You can achieve this by modifying the
-incoming request and using the ``Core::proxy`` function.
-
-.. code-block:: php
-
-    use GuzzleHttp\Ring\Core;
-    use GuzzleHttp\Ring\Client\CurlHandler;
-
-    $handler = new CurlHandler();
-
-    $responseHeaderHandler = function (callable $handler, array $headers) {
-        return function (array $request) use ($handler, $headers) {
-            // Send the request using the wrapped handler.
-            return Core::proxy($handler($request), function ($response) use ($headers) {
-                // Add the headers to the response when it is available.
-                foreach ($headers as $key => $value) {
-                    $response['headers'][$key] = (array) $value;
-                }
-                // Note that you can return a regular response array when using
-                // the proxy method.
-                return $response;
-            });
-        }
-    };
-
-    // Create a new handler that adds headers to each response.
-    $handler = $responseHeaderHandler($handler, ['X-Header' => 'hello!']);
-
-    $response = $handler([
-        'http_method' => 'GET',
-        'headers'     => ['Host' => ['httpbin.org']
-    ]);
-
-    assert($response['headers']['X-Header'] == 'hello!');
-
-Built-In Middleware
--------------------
-
-RingPHP comes with a few basic client middlewares that modify requests
-and responses.
-
-Streaming Middleware
-~~~~~~~~~~~~~~~~~~~~
-
-If you want to send all requests with the ``streaming`` option to a specific
-handler but other requests to a different handler, then use the streaming
-middleware.
-
-.. code-block:: php
-
-    use GuzzleHttp\Ring\Client\CurlHandler;
-    use GuzzleHttp\Ring\Client\StreamHandler;
-    use GuzzleHttp\Ring\Client\Middleware;
-
-    $defaultHandler = new CurlHandler();
-    $streamingHandler = new StreamHandler();
-    $streamingHandler = Middleware::wrapStreaming(
-        $defaultHandler,
-        $streamingHandler
-    );
-
-    // Send the request using the streaming handler.
-    $response = $streamingHandler([
-        'http_method' => 'GET',
-        'headers'     => ['Host' => ['www.google.com'],
-        'stream'      => true
-    ]);
-
-    // Send the request using the default handler.
-    $response = $streamingHandler([
-        'http_method' => 'GET',
-        'headers'     => ['Host' => ['www.google.com']
-    ]);
-
-Future Middleware
-~~~~~~~~~~~~~~~~~
-
-If you want to send all requests with the ``future`` option to a specific
-handler but other requests to a different handler, then use the future
-middleware.
-
-.. code-block:: php
-
-    use GuzzleHttp\Ring\Client\CurlHandler;
-    use GuzzleHttp\Ring\Client\CurlMultiHandler;
-    use GuzzleHttp\Ring\Client\Middleware;
-
-    $defaultHandler = new CurlHandler();
-    $futureHandler = new CurlMultiHandler();
-    $futureHandler = Middleware::wrapFuture(
-        $defaultHandler,
-        $futureHandler
-    );
-
-    // Send the request using the blocking CurlHandler.
-    $response = $futureHandler([
-        'http_method' => 'GET',
-        'headers'     => ['Host' => ['www.google.com']
-    ]);
-
-    // Send the request using the non-blocking CurlMultiHandler.
-    $response = $futureHandler([
-        'http_method' => 'GET',
-        'headers'     => ['Host' => ['www.google.com'],
-        'future'      => true
-    ]);
diff --git a/core/vendor/guzzlehttp/ringphp/docs/conf.py b/core/vendor/guzzlehttp/ringphp/docs/conf.py
deleted file mode 100644
index c6404aa1e..000000000
--- a/core/vendor/guzzlehttp/ringphp/docs/conf.py
+++ /dev/null
@@ -1,23 +0,0 @@
-import sys, os
-import sphinx_rtd_theme
-from sphinx.highlighting import lexers
-from pygments.lexers.web import PhpLexer
-
-
-lexers['php'] = PhpLexer(startinline=True, linenos=1)
-lexers['php-annotations'] = PhpLexer(startinline=True, linenos=1)
-primary_domain = 'php'
-
-extensions = []
-templates_path = ['_templates']
-source_suffix = '.rst'
-master_doc = 'index'
-project = u'RingPHP'
-copyright = u'2014, Michael Dowling'
-version = '1.0.0-alpha'
-exclude_patterns = ['_build']
-
-html_title = "RingPHP"
-html_short_title = "RingPHP"
-html_theme = "sphinx_rtd_theme"
-html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
diff --git a/core/vendor/guzzlehttp/ringphp/docs/futures.rst b/core/vendor/guzzlehttp/ringphp/docs/futures.rst
deleted file mode 100644
index af29cb378..000000000
--- a/core/vendor/guzzlehttp/ringphp/docs/futures.rst
+++ /dev/null
@@ -1,164 +0,0 @@
-=======
-Futures
-=======
-
-Futures represent a computation that may have not yet completed. RingPHP
-uses hybrid of futures and promises to provide a consistent API that can be
-used for both blocking and non-blocking consumers.
-
-Promises
---------
-
-You can get the result of a future when it is ready using the promise interface
-of a future. Futures expose a promise API via a ``then()`` method that utilizes
-`React's promise library <https://github.com/reactphp/promise>`_. You should
-use this API when you do not wish to block.
-
-.. code-block:: php
-
-    use GuzzleHttp\Ring\Client\CurlMultiHandler;
-
-    $request = [
-        'http_method' => 'GET',
-        'uri'         => '/',
-        'headers'     => ['host' => ['httpbin.org']]
-    ];
-
-    $response = $handler($request);
-
-    // Use the then() method to use the promise API of the future.
-    $response->then(function ($response) {
-        echo $response['status'];
-    });
-
-You can get the promise used by a future, an instance of
-``React\Promise\PromiseInterface``, by calling the ``promise()`` method.
-
-.. code-block:: php
-
-    $response = $handler($request);
-    $promise = $response->promise();
-    $promise->then(function ($response) {
-        echo $response['status'];
-    });
-
-This promise value can be used with React's
-`aggregate promise functions <https://github.com/reactphp/promise#functions>`_.
-
-Waiting
--------
-
-You can wait on a future to complete and retrieve the value, or *dereference*
-the future, using the ``wait()`` method. Calling the ``wait()`` method of a
-future will block until the result is available. The result is then returned or
-an exception is thrown if and exception was encountered while waiting on the
-the result. Subsequent calls to dereference a future will return the previously
-completed result or throw the previously encountered exception. Futures can be
-cancelled, which stops the computation if possible.
-
-.. code-block:: php
-
-    use GuzzleHttp\Ring\Client\CurlMultiHandler;
-
-    $response = $handler([
-        'http_method' => 'GET',
-        'uri'         => '/',
-        'headers'     => ['host' => ['httpbin.org']]
-    ]);
-
-    // You can explicitly call block to wait on a result.
-    $realizedResponse = $response->wait();
-
-    // Future responses can be used like a regular PHP array.
-    echo $response['status'];
-
-In addition to explicitly calling the ``wait()`` function, using a future like
-a normal value will implicitly trigger the ``wait()`` function.
-
-Future Responses
-----------------
-
-RingPHP uses futures to return asynchronous responses immediately. Client
-handlers always return future responses that implement
-``GuzzleHttp\Ring\Future\ArrayFutureInterface``. These future responses act
-just like normal PHP associative arrays for blocking access and provide a
-promise interface for non-blocking access.
-
-.. code-block:: php
-
-    use GuzzleHttp\Ring\Client\CurlMultiHandler;
-
-    $handler = new CurlMultiHandler();
-
-    $request = [
-        'http_method'  => 'GET',
-        'uri'          => '/',
-        'headers'      => ['Host' => ['www.google.com']]
-    ];
-
-    $response = $handler($request);
-
-    // Use the promise API for non-blocking access to the response. The actual
-    // response value will be delivered to the promise.
-    $response->then(function ($response) {
-        echo $response['status'];
-    });
-
-    // You can wait (block) until the future is completed.
-    $response->wait();
-
-    // This will implicitly call wait(), and will block too!
-    $response['status'];
-
-.. important::
-
-    Futures that are not completed by the time the underlying handler is
-    destructed will be completed when the handler is shutting down.
-
-Cancelling
-----------
-
-Futures can be cancelled if they have not already been dereferenced.
-
-RingPHP futures are typically implemented with the
-``GuzzleHttp\Ring\Future\BaseFutureTrait``. This trait provides the cancellation
-functionality that should be common to most implementations. Cancelling a
-future response will try to prevent the request from sending over the wire.
-
-When a future is cancelled, the cancellation function is invoked and performs
-the actual work needed to cancel the request from sending if possible
-(e.g., telling an event loop to stop sending a request or to close a socket).
-If no cancellation function is provided, then a request cannot be cancelled. If
-a cancel function is provided, then it should accept the future as an argument
-and return true if the future was successfully cancelled or false if it could
-not be cancelled.
-
-Wrapping an existing Promise
-----------------------------
-
-You can easily create a future from any existing promise using the
-``GuzzleHttp\Ring\Future\FutureValue`` class. This class's constructor
-accepts a promise as the first argument, a wait function as the second
-argument, and a cancellation function as the third argument. The dereference
-function is used to force the promise to resolve (for example, manually ticking
-an event loop). The cancel function is optional and is used to tell the thing
-that created the promise that it can stop computing the result (for example,
-telling an event loop to stop transferring a request).
-
-.. code-block:: php
-
-    use GuzzleHttp\Ring\Future\FutureValue;
-    use React\Promise\Deferred;
-
-    $deferred = new Deferred();
-    $promise = $deferred->promise();
-
-    $f = new FutureValue(
-        $promise,
-        function () use ($deferred) {
-            // This function is responsible for blocking and resolving the
-            // promise. Here we pass in a reference to the deferred so that
-            // it can be resolved or rejected.
-            $deferred->resolve('foo');
-        }
-    );
diff --git a/core/vendor/guzzlehttp/ringphp/docs/index.rst b/core/vendor/guzzlehttp/ringphp/docs/index.rst
deleted file mode 100644
index 4bbce631c..000000000
--- a/core/vendor/guzzlehttp/ringphp/docs/index.rst
+++ /dev/null
@@ -1,50 +0,0 @@
-=======
-RingPHP
-=======
-
-Provides a simple API and specification that abstracts away the details of HTTP
-into a single PHP function. RingPHP be used to power HTTP clients and servers
-through a PHP function that accepts a request hash and returns a response hash
-that is fulfilled using a `promise <https://github.com/reactphp/promise>`_,
-allowing RingPHP to support both synchronous and asynchronous workflows.
-
-By abstracting the implementation details of different HTTP clients and
-servers, RingPHP allows you to utilize pluggable HTTP clients and servers
-without tying your application to a specific implementation.
-
-.. toctree::
-   :maxdepth: 2
-
-   spec
-   futures
-   client_middleware
-   client_handlers
-   testing
-
-.. code-block:: php
-
-    <?php
-    require 'vendor/autoload.php';
-
-    use GuzzleHttp\Ring\Client\CurlHandler;
-
-    $handler = new CurlHandler();
-    $response = $handler([
-        'http_method' => 'GET',
-        'uri'         => '/',
-        'headers'     => [
-            'host'  => ['www.google.com'],
-            'x-foo' => ['baz']
-        ]
-    ]);
-
-    $response->then(function (array $response) {
-        echo $response['status'];
-    });
-
-    $response->wait();
-
-RingPHP is inspired by Clojure's `Ring <https://github.com/ring-clojure/ring>`_,
-which, in turn, was inspired by Python's WSGI and Ruby's Rack. RingPHP is
-utilized as the handler layer in `Guzzle <http://guzzlephp.org>`_ 5.0+ to send
-HTTP requests.
diff --git a/core/vendor/guzzlehttp/ringphp/docs/requirements.txt b/core/vendor/guzzlehttp/ringphp/docs/requirements.txt
deleted file mode 100644
index 483a4e960..000000000
--- a/core/vendor/guzzlehttp/ringphp/docs/requirements.txt
+++ /dev/null
@@ -1 +0,0 @@
-sphinx_rtd_theme
diff --git a/core/vendor/guzzlehttp/ringphp/docs/spec.rst b/core/vendor/guzzlehttp/ringphp/docs/spec.rst
deleted file mode 100644
index bc9107898..000000000
--- a/core/vendor/guzzlehttp/ringphp/docs/spec.rst
+++ /dev/null
@@ -1,311 +0,0 @@
-=============
-Specification
-=============
-
-RingPHP applications consist of handlers, requests, responses, and
-middleware.
-
-Handlers
---------
-
-Handlers are implemented as a PHP ``callable`` that accept a request array 
-and return a response array (``GuzzleHttp\Ring\Future\FutureArrayInterface``).
-
-For example:
-
-.. code-block:: php
-
-    use GuzzleHttp\Ring\Future\CompletedFutureArray;
-
-    $mockHandler = function (array $request) {
-        return new CompletedFutureArray([
-            'status'  => 200,
-            'headers' => ['X-Foo' => ['Bar']],
-            'body'    => 'Hello!'
-         ]);
-    };
-
-This handler returns the same response each time it is invoked. All RingPHP
-handlers must return a ``GuzzleHttp\Ring\Future\FutureArrayInterface``. Use
-``GuzzleHttp\Ring\Future\CompletedFutureArray`` when returning a response that
-has already completed.
-
-Requests
---------
-
-A request array is a PHP associative array that contains the configuration
-settings need to send a request.
-
-.. code-block:: php
-
-    $request = [
-        'http_method' => 'GET',
-        'scheme'      => 'http',
-        'uri'         => '/',
-        'body'        => 'hello!',
-        'client'      => ['timeout' => 1.0],
-        'headers'     => [
-            'host'  => ['httpbin.org'],
-            'X-Foo' => ['baz', 'bar']
-        ]
-    ];
-
-The request array contains the following key value pairs:
-
-request_method
-    (string, required) The HTTP request method, must be all caps corresponding
-    to a HTTP request method, such as ``GET`` or ``POST``.
-
-scheme
-    (string) The transport protocol, must be one of ``http`` or ``https``.
-    Defaults to ``http``.
-
-uri
-    (string, required) The request URI excluding the query string. Must
-    start with "/".
-
-query_string
-    (string) The query string, if present (e.g., ``foo=bar``).
-
-version
-    (string) HTTP protocol version. Defaults to ``1.1``.
-
-headers
-    (required, array) Associative array of headers. Each key represents the
-    header name. Each value contains an array of strings where each entry of
-    the array SHOULD be sent over the wire on a separate header line.
-
-body
-    (string, fopen resource, ``Iterator``, ``GuzzleHttp\Stream\StreamInterface``)
-    The body of the request, if present. Can be a string, resource returned
-    from fopen, an ``Iterator`` that yields chunks of data, an object that
-    implemented ``__toString``, or a ``GuzzleHttp\Stream\StreamInterface``.
-
-future
-    (bool, string) Controls the asynchronous behavior of a response.
-
-    Set to ``true`` or omit the ``future`` option to *request* that a request
-    will be completed asynchronously. Keep in mind that your request might not
-    necessarily be completed asynchronously based on the handler you are using.
-    Set the ``future`` option to ``false`` to request that a synchronous
-    response be provided.
-
-    You can provide a string value to specify fine-tuned future behaviors that
-    may be specific to the underlying handlers you are using. There are,
-    however, some common future options that handlers should implement if
-    possible.
-
-    lazy
-        Requests that the handler does not open and send the request
-        immediately, but rather only opens and sends the request once the
-        future is dereferenced. This option is often useful for sending a large
-        number of requests concurrently to allow handlers to take better
-        advantage of non-blocking transfers by first building up a pool of
-        requests.
-
-    If an handler does not implement or understand a provided string value,
-    then the request MUST be treated as if the user provided ``true`` rather
-    than the string value.
-
-    Future responses created by asynchronous handlers MUST attempt to complete
-    any outstanding future responses when they are destructed. Asynchronous
-    handlers MAY choose to automatically complete responses when the number
-    of outstanding requests reaches an handler-specific threshold.
-
-Client Specific Options
-~~~~~~~~~~~~~~~~~~~~~~~
-
-The following options are only used in ring client handlers.
-
-.. _client-options:
-
-client
-    (array) Associative array of client specific transfer options. The
-    ``client`` request key value pair can contain the following keys:
-
-    cert
-        (string, array) Set to a string to specify the path to a file
-        containing a PEM formatted SSL client side certificate. If a password
-        is required, then set ``cert`` to an array containing the path to the
-        PEM file in the first array element followed by the certificate
-        password in the second array element.
-
-    connect_timeout
-        (float) Float describing the number of seconds to wait while trying to
-        connect to a server. Use ``0`` to wait indefinitely (the default
-        behavior).
-
-    debug
-        (bool, fopen() resource) Set to true or set to a PHP stream returned by
-        fopen() to enable debug output with the handler used to send a request.
-        If set to ``true``, the output is written to PHP's STDOUT. If a PHP
-        ``fopen`` resource handle is provided, the output is written to the
-        stream.
-
-        "Debug output" is handler specific: different handlers will yield
-        different output and various various level of detail. For example, when
-        using cURL to transfer requests, cURL's `CURLOPT_VERBOSE <http://curl.haxx.se/libcurl/c/CURLOPT_VERBOSE.html>`_
-        will be used. When using the PHP stream wrapper, `stream notifications <http://php.net/manual/en/function.stream-notification-callback.php>`_
-        will be emitted.
-
-    decode_content
-        (bool) Specify whether or not ``Content-Encoding`` responses
-        (gzip, deflate, etc.) are automatically decoded. Set to ``true`` to
-        automatically decode encoded responses. Set to ``false`` to not decode
-        responses. By default, content is *not* decoded automatically.
-
-    delay
-        (int) The number of milliseconds to delay before sending the request.
-        This is often used for delaying before retrying a request. Handlers
-        SHOULD implement this if possible, but it is not a strict requirement.
-
-    progress
-        (function) Defines a function to invoke when transfer progress is made.
-        The function accepts the following arguments:
-
-        1. The total number of bytes expected to be downloaded
-        2. The number of bytes downloaded so far
-        3. The number of bytes expected to be uploaded
-        4. The number of bytes uploaded so far
-
-    proxy
-        (string, array) Pass a string to specify an HTTP proxy, or an
-        associative array to specify different proxies for different protocols
-        where the scheme is the key and the value is the proxy address.
-
-        .. code-block:: php
-
-            $request = [
-                'http_method' => 'GET',
-                'headers'     => ['host' => ['httpbin.org']],
-                'client'      => [
-                    // Use different proxies for different URI schemes.
-                    'proxy' => [
-                        'http'  => 'http://proxy.example.com:5100',
-                        'https' => 'https://proxy.example.com:6100'
-                    ]
-                ]
-            ];
-
-    ssl_key
-        (string, array) Specify the path to a file containing a private SSL key
-        in PEM format. If a password is required, then set to an array
-        containing the path to the SSL key in the first array element followed
-        by the password required for the certificate in the second element.
-
-    save_to
-        (string, fopen resource, ``GuzzleHttp\Stream\StreamInterface``)
-        Specifies where the body of the response is downloaded. Pass a string to
-        open a local file on disk and save the output to the file. Pass an fopen
-        resource to save the output to a PHP stream resource. Pass a
-        ``GuzzleHttp\Stream\StreamInterface`` to save the output to a Guzzle
-        StreamInterface. Omitting this option will typically save the body of a
-        response to a PHP temp stream.
-
-    stream
-        (bool) Set to true to stream a response rather than download it all
-        up-front. This option will only be utilized when the corresponding
-        handler supports it.
-
-    timeout
-        (float) Float describing the timeout of the request in seconds. Use 0 to
-        wait indefinitely (the default behavior).
-
-    verify
-        (bool, string) Describes the SSL certificate verification behavior of a
-        request. Set to true to enable SSL certificate verification using the
-        system CA bundle when available (the default). Set to false to disable
-        certificate verification (this is insecure!). Set to a string to provide
-        the path to a CA bundle on disk to enable verification using a custom
-        certificate.
-
-    version
-        (string) HTTP protocol version to use with the request.
-
-Server Specific Options
-~~~~~~~~~~~~~~~~~~~~~~~
-
-The following options are only used in ring server handlers.
-
-server_port
-    (integer) The port on which the request is being handled. This is only
-    used with ring servers, and is required.
-
-server_name
-    (string) The resolved server name, or the server IP address. Required when
-    using a Ring server.
-
-remote_addr
-    (string) The IP address of the client or the last proxy that sent the
-    request. Required when using a Ring server.
-
-Responses
----------
-
-A response is an array-like object that implements
-``GuzzleHttp\Ring\Future\FutureArrayInterface``. Responses contain the
-following key value pairs:
-
-body
-    (string, fopen resource, ``Iterator``, ``GuzzleHttp\Stream\StreamInterface``)
-    The body of the response, if present. Can be a string, resource returned
-    from fopen, an ``Iterator`` that yields chunks of data, an object that
-    implemented ``__toString``, or a ``GuzzleHttp\Stream\StreamInterface``.
-
-effective_url
-    (string) The URL that returned the resulting response.
-
-error
-    (``\Exception``) Contains an exception describing any errors that were
-    encountered during the transfer.
-
-headers
-    (Required, array) Associative array of headers. Each key represents the
-    header name. Each value contains an array of strings where each entry of
-    the array is a header line. The headers array MAY be an empty array in the
-    event an error occurred before a response was received.
-
-reason
-    (string) Optional reason phrase. This option should be provided when the
-    reason phrase does not match the typical reason phrase associated with the
-    ``status`` code. See `RFC 7231 <http://tools.ietf.org/html/rfc7231#section-6.1>`_
-    for a list of HTTP reason phrases mapped to status codes.
-
-status
-    (Required, integer) The HTTP status code. The status code MAY be set to
-    ``null`` in the event an error occurred before a response was received
-    (e.g., a networking error).
-
-transfer_stats
-    (array) Provides an associative array of arbitrary transfer statistics if
-    provided by the underlying handler.
-
-version
-    (string) HTTP protocol version. Defaults to ``1.1``.
-
-Middleware
-----------
-
-Ring middleware augments the functionality of handlers by invoking them in the
-process of generating responses. Middleware is typically implemented as a
-higher-order function that takes one or more handlers as arguments followed by
-an optional associative array of options as the last argument, returning a new
-handler with the desired compound behavior.
-
-Here's an example of a middleware that adds a Content-Type header to each
-request.
-
-.. code-block:: php
-
-    use GuzzleHttp\Ring\Client\CurlHandler;
-    use GuzzleHttp\Ring\Core;
-
-    $contentTypeHandler = function(callable $handler, $contentType) {
-        return function (array $request) use ($handler, $contentType) {
-            return $handler(Core::setHeader('Content-Type', $contentType));
-        };
-    };
-
-    $baseHandler = new CurlHandler();
-    $wrappedHandler = $contentTypeHandler($baseHandler, 'text/html');
-    $response = $wrappedHandler([/** request hash **/]);
diff --git a/core/vendor/guzzlehttp/ringphp/docs/testing.rst b/core/vendor/guzzlehttp/ringphp/docs/testing.rst
deleted file mode 100644
index 9df2562ed..000000000
--- a/core/vendor/guzzlehttp/ringphp/docs/testing.rst
+++ /dev/null
@@ -1,74 +0,0 @@
-=======
-Testing
-=======
-
-RingPHP tests client handlers using `PHPUnit <https://phpunit.de/>`_ and a
-built-in node.js web server.
-
-Running Tests
--------------
-
-First, install the dependencies using `Composer <https://getcomposer.org>`_.
-
-    composer.phar install
-
-Next, run the unit tests using ``Make``.
-
-    make test
-
-The tests are also run on Travis-CI on each commit: https://travis-ci.org/guzzle/guzzle-ring
-
-Test Server
------------
-
-Testing client handlers usually involves actually sending HTTP requests.
-RingPHP provides a node.js web server that returns canned responses and
-keep a list of the requests that have been received. The server can then
-be queried to get a list of the requests that were sent by the client so that
-you can ensure that the client serialized and transferred requests as intended.
-
-The server keeps a list of queued responses and returns responses that are
-popped off of the queue as HTTP requests are received. When there are not
-more responses to serve, the server returns a 500 error response.
-
-The test server uses the ``GuzzleHttp\Tests\Ring\Client\Server`` class to
-control the server.
-
-.. code-block:: php
-
-    use GuzzleHttp\Ring\Client\StreamHandler;
-    use GuzzleHttp\Tests\Ring\Client\Server;
-
-    // First return a 200 followed by a 404 response.
-    Server::enqueue([
-        ['status' => 200],
-        ['status' => 404]
-    ]);
-
-    $handler = new StreamHandler();
-
-    $response = $handler([
-        'http_method' => 'GET',
-        'headers'     => ['host' => [Server::$host]],
-        'uri'         => '/'
-    ]);
-
-    assert(200 == $response['status']);
-
-    $response = $handler([
-        'http_method' => 'HEAD',
-        'headers'     => ['host' => [Server::$host]],
-        'uri'         => '/'
-    ]);
-
-    assert(404 == $response['status']);
-
-After requests have been sent, you can get a list of the requests as they
-were sent over the wire to ensure they were sent correctly.
-
-.. code-block:: php
-
-    $received = Server::received();
-
-    assert('GET' == $received[0]['http_method']);
-    assert('HEAD' == $received[1]['http_method']);
diff --git a/core/vendor/guzzlehttp/ringphp/phpunit.xml.dist b/core/vendor/guzzlehttp/ringphp/phpunit.xml.dist
deleted file mode 100644
index 1d1929025..000000000
--- a/core/vendor/guzzlehttp/ringphp/phpunit.xml.dist
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./tests/bootstrap.php"
-         colors="true">
-    <testsuites>
-        <testsuite>
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src</directory>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/core/vendor/guzzlehttp/ringphp/src/Client/ClientUtils.php b/core/vendor/guzzlehttp/ringphp/src/Client/ClientUtils.php
deleted file mode 100644
index 2acf92eba..000000000
--- a/core/vendor/guzzlehttp/ringphp/src/Client/ClientUtils.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-namespace GuzzleHttp\Ring\Client;
-
-/**
- * Client specific utility functions.
- */
-class ClientUtils
-{
-    /**
-     * Returns the default cacert bundle for the current system.
-     *
-     * First, the openssl.cafile and curl.cainfo php.ini settings are checked.
-     * If those settings are not configured, then the common locations for
-     * bundles found on Red Hat, CentOS, Fedora, Ubuntu, Debian, FreeBSD, OS X
-     * and Windows are checked. If any of these file locations are found on
-     * disk, they will be utilized.
-     *
-     * Note: the result of this function is cached for subsequent calls.
-     *
-     * @return string
-     * @throws \RuntimeException if no bundle can be found.
-     */
-    public static function getDefaultCaBundle()
-    {
-        static $cached = null;
-        static $cafiles = [
-            // Red Hat, CentOS, Fedora (provided by the ca-certificates package)
-            '/etc/pki/tls/certs/ca-bundle.crt',
-            // Ubuntu, Debian (provided by the ca-certificates package)
-            '/etc/ssl/certs/ca-certificates.crt',
-            // FreeBSD (provided by the ca_root_nss package)
-            '/usr/local/share/certs/ca-root-nss.crt',
-            // OS X provided by homebrew (using the default path)
-            '/usr/local/etc/openssl/cert.pem',
-            // Windows?
-            'C:\\windows\\system32\\curl-ca-bundle.crt',
-            'C:\\windows\\curl-ca-bundle.crt',
-        ];
-
-        if ($cached) {
-            return $cached;
-        }
-
-        if ($ca = ini_get('openssl.cafile')) {
-            return $cached = $ca;
-        }
-
-        if ($ca = ini_get('curl.cainfo')) {
-            return $cached = $ca;
-        }
-
-        foreach ($cafiles as $filename) {
-            if (file_exists($filename)) {
-                return $cached = $filename;
-            }
-        }
-
-        throw new \RuntimeException(self::CA_ERR);
-    }
-
-    const CA_ERR = "
-No system CA bundle could be found in any of the the common system locations.
-PHP versions earlier than 5.6 are not properly configured to use the system's
-CA bundle by default. In order to verify peer certificates, you will need to
-supply the path on disk to a certificate bundle to the 'verify' request
-option: http://docs.guzzlephp.org/en/latest/clients.html#verify. If you do not
-need a specific certificate bundle, then Mozilla provides a commonly used CA
-bundle which can be downloaded here (provided by the maintainer of cURL):
-https://raw.githubusercontent.com/bagder/ca-bundle/master/ca-bundle.crt. Once
-you have a CA bundle available on disk, you can set the 'openssl.cafile' PHP
-ini setting to point to the path to the file, allowing you to omit the 'verify'
-request option. See http://curl.haxx.se/docs/sslcerts.html for more
-information.";
-}
diff --git a/core/vendor/guzzlehttp/ringphp/src/Client/CurlFactory.php b/core/vendor/guzzlehttp/ringphp/src/Client/CurlFactory.php
deleted file mode 100644
index 0377ec258..000000000
--- a/core/vendor/guzzlehttp/ringphp/src/Client/CurlFactory.php
+++ /dev/null
@@ -1,546 +0,0 @@
-<?php
-namespace GuzzleHttp\Ring\Client;
-
-use GuzzleHttp\Ring\Core;
-use GuzzleHttp\Ring\Exception\ConnectException;
-use GuzzleHttp\Ring\Exception\RingException;
-use GuzzleHttp\Stream\LazyOpenStream;
-use GuzzleHttp\Stream\StreamInterface;
-
-/**
- * Creates curl resources from a request
- */
-class CurlFactory
-{
-    /**
-     * Creates a cURL handle, header resource, and body resource based on a
-     * transaction.
-     *
-     * @param array         $request Request hash
-     * @param null|resource $handle  Optionally provide a curl handle to modify
-     *
-     * @return array Returns an array of the curl handle, headers array, and
-     *               response body handle.
-     * @throws \RuntimeException when an option cannot be applied
-     */
-    public function __invoke(array $request, $handle = null)
-    {
-        $headers = [];
-        $options = $this->getDefaultOptions($request, $headers);
-        $this->applyMethod($request, $options);
-
-        if (isset($request['client'])) {
-            $this->applyHandlerOptions($request, $options);
-        }
-
-        $this->applyHeaders($request, $options);
-        unset($options['_headers']);
-
-        // Add handler options from the request's configuration options
-        if (isset($request['client']['curl'])) {
-            $options = $this->applyCustomCurlOptions(
-                $request['client']['curl'],
-                $options
-            );
-        }
-
-        if (!$handle) {
-            $handle = curl_init();
-        }
-
-        $body = $this->getOutputBody($request, $options);
-        curl_setopt_array($handle, $options);
-
-        return [$handle, &$headers, $body];
-    }
-
-    /**
-     * Creates a response hash from a cURL result.
-     *
-     * @param callable $handler  Handler that was used.
-     * @param array    $request  Request that sent.
-     * @param array    $response Response hash to update.
-     * @param array    $headers  Headers received during transfer.
-     * @param resource $body     Body fopen response.
-     *
-     * @return array
-     */
-    public static function createResponse(
-        callable $handler,
-        array $request,
-        array $response,
-        array $headers,
-        $body
-    ) {
-        if (isset($response['transfer_stats']['url'])) {
-            $response['effective_url'] = $response['transfer_stats']['url'];
-        }
-
-        if (!empty($headers)) {
-            $startLine = explode(' ', array_shift($headers), 3);
-            $headerList = Core::headersFromLines($headers);
-            $response['headers'] = $headerList;
-            $response['status'] = isset($startLine[1]) ? (int) $startLine[1] : null;
-            $response['reason'] = isset($startLine[2]) ? $startLine[2] : null;
-            $response['body'] = $body;
-            Core::rewindBody($response);
-        }
-
-        return !empty($response['curl']['errno']) || !isset($response['status'])
-            ? self::createErrorResponse($handler, $request, $response)
-            : $response;
-    }
-
-    private static function createErrorResponse(
-        callable $handler,
-        array $request,
-        array $response
-    ) {
-        static $connectionErrors = [
-            CURLE_OPERATION_TIMEOUTED  => true,
-            CURLE_COULDNT_RESOLVE_HOST => true,
-            CURLE_COULDNT_CONNECT      => true,
-            CURLE_SSL_CONNECT_ERROR    => true,
-            CURLE_GOT_NOTHING          => true,
-        ];
-
-        // Retry when nothing is present or when curl failed to rewind.
-        if (!isset($response['err_message'])
-            && (empty($response['curl']['errno'])
-                || $response['curl']['errno'] == 65)
-        ) {
-            return self::retryFailedRewind($handler, $request, $response);
-        }
-
-        $message = isset($response['err_message'])
-            ? $response['err_message']
-            : sprintf('cURL error %s: %s',
-                $response['curl']['errno'],
-                isset($response['curl']['error'])
-                    ? $response['curl']['error']
-                    : 'See http://curl.haxx.se/libcurl/c/libcurl-errors.html');
-
-        $error = isset($response['curl']['errno'])
-            && isset($connectionErrors[$response['curl']['errno']])
-            ? new ConnectException($message)
-            : new RingException($message);
-
-        return $response + [
-            'status'  => null,
-            'reason'  => null,
-            'body'    => null,
-            'headers' => [],
-            'error'   => $error,
-        ];
-    }
-
-    private function getOutputBody(array $request, array &$options)
-    {
-        // Determine where the body of the response (if any) will be streamed.
-        if (isset($options[CURLOPT_WRITEFUNCTION])) {
-            return $request['client']['save_to'];
-        }
-
-        if (isset($options[CURLOPT_FILE])) {
-            return $options[CURLOPT_FILE];
-        }
-
-        if ($request['http_method'] != 'HEAD') {
-            // Create a default body if one was not provided
-            return $options[CURLOPT_FILE] = fopen('php://temp', 'w+');
-        }
-
-        return null;
-    }
-
-    private function getDefaultOptions(array $request, array &$headers)
-    {
-        $url = Core::url($request);
-        $startingResponse = false;
-
-        $options = [
-            '_headers'             => $request['headers'],
-            CURLOPT_CUSTOMREQUEST  => $request['http_method'],
-            CURLOPT_URL            => $url,
-            CURLOPT_RETURNTRANSFER => false,
-            CURLOPT_HEADER         => false,
-            CURLOPT_CONNECTTIMEOUT => 150,
-            CURLOPT_HEADERFUNCTION => function ($ch, $h) use (&$headers, &$startingResponse) {
-                $value = trim($h);
-                if ($value === '') {
-                    $startingResponse = true;
-                } elseif ($startingResponse) {
-                    $startingResponse = false;
-                    $headers = [$value];
-                } else {
-                    $headers[] = $value;
-                }
-                return strlen($h);
-            },
-        ];
-
-        if (isset($request['version'])) {
-            $options[CURLOPT_HTTP_VERSION] = $request['version'] == 1.1 ? CURL_HTTP_VERSION_1_1 : CURL_HTTP_VERSION_1_0;
-        }
-
-        if (defined('CURLOPT_PROTOCOLS')) {
-            $options[CURLOPT_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
-        }
-
-        return $options;
-    }
-
-    private function applyMethod(array $request, array &$options)
-    {
-        if (isset($request['body'])) {
-            $this->applyBody($request, $options);
-            return;
-        }
-
-        switch ($request['http_method']) {
-            case 'PUT':
-            case 'POST':
-                // See http://tools.ietf.org/html/rfc7230#section-3.3.2
-                if (!Core::hasHeader($request, 'Content-Length')) {
-                    $options[CURLOPT_HTTPHEADER][] = 'Content-Length: 0';
-                }
-                break;
-            case 'HEAD':
-                $options[CURLOPT_NOBODY] = true;
-                unset(
-                    $options[CURLOPT_WRITEFUNCTION],
-                    $options[CURLOPT_READFUNCTION],
-                    $options[CURLOPT_FILE],
-                    $options[CURLOPT_INFILE]
-                );
-        }
-    }
-
-    private function applyBody(array $request, array &$options)
-    {
-        $contentLength = Core::firstHeader($request, 'Content-Length');
-        $size = $contentLength !== null ? (int) $contentLength : null;
-
-        // Send the body as a string if the size is less than 1MB OR if the
-        // [client][curl][body_as_string] request value is set.
-        if (($size !== null && $size < 1000000) ||
-            isset($request['client']['curl']['body_as_string']) ||
-            is_string($request['body'])
-        ) {
-            $options[CURLOPT_POSTFIELDS] = Core::body($request);
-            // Don't duplicate the Content-Length header
-            $this->removeHeader('Content-Length', $options);
-            $this->removeHeader('Transfer-Encoding', $options);
-        } else {
-            $options[CURLOPT_UPLOAD] = true;
-            if ($size !== null) {
-                // Let cURL handle setting the Content-Length header
-                $options[CURLOPT_INFILESIZE] = $size;
-                $this->removeHeader('Content-Length', $options);
-            }
-            $this->addStreamingBody($request, $options);
-        }
-
-        // If the Expect header is not present, prevent curl from adding it
-        if (!Core::hasHeader($request, 'Expect')) {
-            $options[CURLOPT_HTTPHEADER][] = 'Expect:';
-        }
-
-        // cURL sometimes adds a content-type by default. Prevent this.
-        if (!Core::hasHeader($request, 'Content-Type')) {
-            $options[CURLOPT_HTTPHEADER][] = 'Content-Type:';
-        }
-    }
-
-    private function addStreamingBody(array $request, array &$options)
-    {
-        $body = $request['body'];
-
-        if ($body instanceof StreamInterface) {
-            $options[CURLOPT_READFUNCTION] = function ($ch, $fd, $length) use ($body) {
-                return (string) $body->read($length);
-            };
-            if (!isset($options[CURLOPT_INFILESIZE])) {
-                if ($size = $body->getSize()) {
-                    $options[CURLOPT_INFILESIZE] = $size;
-                }
-            }
-        } elseif (is_resource($body)) {
-            $options[CURLOPT_INFILE] = $body;
-        } elseif ($body instanceof \Iterator) {
-            $buf = '';
-            $options[CURLOPT_READFUNCTION] = function ($ch, $fd, $length) use ($body, &$buf) {
-                if ($body->valid()) {
-                    $buf .= $body->current();
-                    $body->next();
-                }
-                $result = (string) substr($buf, 0, $length);
-                $buf = substr($buf, $length);
-                return $result;
-            };
-        } else {
-            throw new \InvalidArgumentException('Invalid request body provided');
-        }
-    }
-
-    private function applyHeaders(array $request, array &$options)
-    {
-        foreach ($options['_headers'] as $name => $values) {
-            foreach ($values as $value) {
-                $options[CURLOPT_HTTPHEADER][] = "$name: $value";
-            }
-        }
-
-        // Remove the Accept header if one was not set
-        if (!Core::hasHeader($request, 'Accept')) {
-            $options[CURLOPT_HTTPHEADER][] = 'Accept:';
-        }
-    }
-
-    /**
-     * Takes an array of curl options specified in the 'curl' option of a
-     * request's configuration array and maps them to CURLOPT_* options.
-     *
-     * This method is only called when a  request has a 'curl' config setting.
-     *
-     * @param array $config  Configuration array of custom curl option
-     * @param array $options Array of existing curl options
-     *
-     * @return array Returns a new array of curl options
-     */
-    private function applyCustomCurlOptions(array $config, array $options)
-    {
-        $curlOptions = [];
-        foreach ($config as $key => $value) {
-            if (is_int($key)) {
-                $curlOptions[$key] = $value;
-            }
-        }
-
-        return $curlOptions + $options;
-    }
-
-    /**
-     * Remove a header from the options array.
-     *
-     * @param string $name    Case-insensitive header to remove
-     * @param array  $options Array of options to modify
-     */
-    private function removeHeader($name, array &$options)
-    {
-        foreach (array_keys($options['_headers']) as $key) {
-            if (!strcasecmp($key, $name)) {
-                unset($options['_headers'][$key]);
-                return;
-            }
-        }
-    }
-
-    /**
-     * Applies an array of request client options to a the options array.
-     *
-     * This method uses a large switch rather than double-dispatch to save on
-     * high overhead of calling functions in PHP.
-     */
-    private function applyHandlerOptions(array $request, array &$options)
-    {
-        foreach ($request['client'] as $key => $value) {
-            switch ($key) {
-            // Violating PSR-4 to provide more room.
-            case 'verify':
-
-                if ($value === false) {
-                    unset($options[CURLOPT_CAINFO]);
-                    $options[CURLOPT_SSL_VERIFYHOST] = 0;
-                    $options[CURLOPT_SSL_VERIFYPEER] = false;
-                    continue;
-                }
-
-                $options[CURLOPT_SSL_VERIFYHOST] = 2;
-                $options[CURLOPT_SSL_VERIFYPEER] = true;
-
-                if (is_string($value)) {
-                    $options[CURLOPT_CAINFO] = $value;
-                    if (!file_exists($value)) {
-                        throw new \InvalidArgumentException(
-                            "SSL CA bundle not found: $value"
-                        );
-                    }
-                }
-                break;
-
-            case 'decode_content':
-
-                if ($value === false) {
-                    continue;
-                }
-
-                $accept = Core::firstHeader($request, 'Accept-Encoding');
-                if ($accept) {
-                    $options[CURLOPT_ENCODING] = $accept;
-                } else {
-                    $options[CURLOPT_ENCODING] = '';
-                    // Don't let curl send the header over the wire
-                    $options[CURLOPT_HTTPHEADER][] = 'Accept-Encoding:';
-                }
-                break;
-
-            case 'save_to':
-
-                if (is_string($value)) {
-                    $value = new LazyOpenStream($value, 'w+');
-                }
-
-                if ($value instanceof StreamInterface) {
-                    $options[CURLOPT_WRITEFUNCTION] =
-                        function ($ch, $write) use ($value) {
-                            return $value->write($write);
-                        };
-                } elseif (is_resource($value)) {
-                    $options[CURLOPT_FILE] = $value;
-                } else {
-                    throw new \InvalidArgumentException('save_to must be a '
-                        . 'GuzzleHttp\Stream\StreamInterface or resource');
-                }
-                break;
-
-            case 'timeout':
-
-                if (defined('CURLOPT_TIMEOUT_MS')) {
-                    $options[CURLOPT_TIMEOUT_MS] = $value * 1000;
-                } else {
-                    $options[CURLOPT_TIMEOUT] = $value;
-                }
-                break;
-
-            case 'connect_timeout':
-
-                if (defined('CURLOPT_CONNECTTIMEOUT_MS')) {
-                    $options[CURLOPT_CONNECTTIMEOUT_MS] = $value * 1000;
-                } else {
-                    $options[CURLOPT_CONNECTTIMEOUT] = $value;
-                }
-                break;
-
-            case 'proxy':
-
-                if (!is_array($value)) {
-                    $options[CURLOPT_PROXY] = $value;
-                } elseif (isset($request['scheme'])) {
-                    $scheme = $request['scheme'];
-                    if (isset($value[$scheme])) {
-                        $options[CURLOPT_PROXY] = $value[$scheme];
-                    }
-                }
-                break;
-
-            case 'cert':
-
-                if (is_array($value)) {
-                    $options[CURLOPT_SSLCERTPASSWD] = $value[1];
-                    $value = $value[0];
-                }
-
-                if (!file_exists($value)) {
-                    throw new \InvalidArgumentException(
-                        "SSL certificate not found: {$value}"
-                    );
-                }
-
-                $options[CURLOPT_SSLCERT] = $value;
-                break;
-
-            case 'ssl_key':
-
-                if (is_array($value)) {
-                    $options[CURLOPT_SSLKEYPASSWD] = $value[1];
-                    $value = $value[0];
-                }
-
-                if (!file_exists($value)) {
-                    throw new \InvalidArgumentException(
-                        "SSL private key not found: {$value}"
-                    );
-                }
-
-                $options[CURLOPT_SSLKEY] = $value;
-                break;
-
-            case 'progress':
-
-                if (!is_callable($value)) {
-                    throw new \InvalidArgumentException(
-                        'progress client option must be callable'
-                    );
-                }
-
-                $options[CURLOPT_NOPROGRESS] = false;
-                $options[CURLOPT_PROGRESSFUNCTION] =
-                    function () use ($value) {
-                        $args = func_get_args();
-                        // PHP 5.5 pushed the handle onto the start of the args
-                        if (is_resource($args[0])) {
-                            array_shift($args);
-                        }
-                        call_user_func_array($value, $args);
-                    };
-                break;
-
-            case 'debug':
-
-                if ($value) {
-                    $options[CURLOPT_STDERR] = Core::getDebugResource($value);
-                    $options[CURLOPT_VERBOSE] = true;
-                }
-                break;
-            }
-        }
-    }
-
-    /**
-     * This function ensures that a response was set on a transaction. If one
-     * was not set, then the request is retried if possible. This error
-     * typically means you are sending a payload, curl encountered a
-     * "Connection died, retrying a fresh connect" error, tried to rewind the
-     * stream, and then encountered a "necessary data rewind wasn't possible"
-     * error, causing the request to be sent through curl_multi_info_read()
-     * without an error status.
-     */
-    private static function retryFailedRewind(
-        callable $handler,
-        array $request,
-        array $response
-    ) {
-        // If there is no body, then there is some other kind of issue. This
-        // is weird and should probably never happen.
-        if (!isset($request['body'])) {
-            $response['err_message'] = 'No response was received for a request '
-                . 'with no body. This could mean that you are saturating your '
-                . 'network.';
-            return self::createErrorResponse($handler, $request, $response);
-        }
-
-        if (!Core::rewindBody($request)) {
-            $response['err_message'] = 'The connection unexpectedly failed '
-                . 'without providing an error. The request would have been '
-                . 'retried, but attempting to rewind the request body failed.';
-            return self::createErrorResponse($handler, $request, $response);
-        }
-
-        // Retry no more than 3 times before giving up.
-        if (!isset($request['curl']['retries'])) {
-            $request['curl']['retries'] = 1;
-        } elseif ($request['curl']['retries'] == 2) {
-            $response['err_message'] = 'The cURL request was retried 3 times '
-                . 'and did no succeed. cURL was unable to rewind the body of '
-                . 'the request and subsequent retries resulted in the same '
-                . 'error. Turn on the debug option to see what went wrong. '
-                . 'See https://bugs.php.net/bug.php?id=47204 for more information.';
-            return self::createErrorResponse($handler, $request, $response);
-        } else {
-            $request['curl']['retries']++;
-        }
-
-        return $handler($request);
-    }
-}
diff --git a/core/vendor/guzzlehttp/ringphp/src/Client/CurlHandler.php b/core/vendor/guzzlehttp/ringphp/src/Client/CurlHandler.php
deleted file mode 100644
index d8215c5cf..000000000
--- a/core/vendor/guzzlehttp/ringphp/src/Client/CurlHandler.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-namespace GuzzleHttp\Ring\Client;
-
-use GuzzleHttp\Ring\Future\CompletedFutureArray;
-use GuzzleHttp\Ring\Core;
-
-/**
- * HTTP handler that uses cURL easy handles as a transport layer.
- *
- * Requires PHP 5.5+
- *
- * When using the CurlHandler, custom curl options can be specified as an
- * associative array of curl option constants mapping to values in the
- * **curl** key of the "client" key of the request.
- */
-class CurlHandler
-{
-    /** @var callable */
-    private $factory;
-
-    /** @var array Array of curl easy handles */
-    private $handles = [];
-
-    /** @var array Array of owned curl easy handles */
-    private $ownedHandles = [];
-
-    /** @var int Total number of idle handles to keep in cache */
-    private $maxHandles;
-
-    /**
-     * Accepts an associative array of options:
-     *
-     * - factory: Optional callable factory used to create cURL handles.
-     *   The callable is passed a request hash when invoked, and returns an
-     *   array of the curl handle, headers resource, and body resource.
-     * - max_handles: Maximum number of idle handles (defaults to 5).
-     *
-     * @param array $options Array of options to use with the handler
-     */
-    public function __construct(array $options = [])
-    {
-        $this->handles = $this->ownedHandles = [];
-        $this->factory = isset($options['handle_factory'])
-            ? $options['handle_factory']
-            : new CurlFactory();
-        $this->maxHandles = isset($options['max_handles'])
-            ? $options['max_handles']
-            : 5;
-    }
-
-    public function __destruct()
-    {
-        foreach ($this->handles as $handle) {
-            if (is_resource($handle)) {
-                curl_close($handle);
-            }
-        }
-    }
-
-    public function __invoke(array $request)
-    {
-        $factory = $this->factory;
-
-        // Ensure headers are by reference. They're updated elsewhere.
-        $result = $factory($request, $this->checkoutEasyHandle());
-        $h = $result[0];
-        $hd =& $result[1];
-        $bd = $result[2];
-        Core::doSleep($request);
-        curl_exec($h);
-        $response = ['transfer_stats' => curl_getinfo($h)];
-        $response['curl']['error'] = curl_error($h);
-        $response['curl']['errno'] = curl_errno($h);
-        $response['transfer_stats'] = array_merge($response['transfer_stats'], $response['curl']);
-        $this->releaseEasyHandle($h);
-
-        return new CompletedFutureArray(
-            CurlFactory::createResponse($this, $request, $response, $hd, $bd)
-        );
-    }
-
-    private function checkoutEasyHandle()
-    {
-        // Find an unused handle in the cache
-        if (false !== ($key = array_search(false, $this->ownedHandles, true))) {
-            $this->ownedHandles[$key] = true;
-            return $this->handles[$key];
-        }
-
-        // Add a new handle
-        $handle = curl_init();
-        $id = (int) $handle;
-        $this->handles[$id] = $handle;
-        $this->ownedHandles[$id] = true;
-
-        return $handle;
-    }
-
-    private function releaseEasyHandle($handle)
-    {
-        $id = (int) $handle;
-        if (count($this->ownedHandles) > $this->maxHandles) {
-            curl_close($this->handles[$id]);
-            unset($this->handles[$id], $this->ownedHandles[$id]);
-        } else {
-            // curl_reset doesn't clear these out for some reason
-            static $unsetValues = [
-                CURLOPT_HEADERFUNCTION   => null,
-                CURLOPT_WRITEFUNCTION    => null,
-                CURLOPT_READFUNCTION     => null,
-                CURLOPT_PROGRESSFUNCTION => null,
-            ];
-            curl_setopt_array($handle, $unsetValues);
-            curl_reset($handle);
-            $this->ownedHandles[$id] = false;
-        }
-    }
-}
diff --git a/core/vendor/guzzlehttp/ringphp/src/Client/CurlMultiHandler.php b/core/vendor/guzzlehttp/ringphp/src/Client/CurlMultiHandler.php
deleted file mode 100644
index b45f6c397..000000000
--- a/core/vendor/guzzlehttp/ringphp/src/Client/CurlMultiHandler.php
+++ /dev/null
@@ -1,250 +0,0 @@
-<?php
-namespace GuzzleHttp\Ring\Client;
-
-use GuzzleHttp\Ring\Future\FutureArray;
-use React\Promise\Deferred;
-
-/**
- * Returns an asynchronous response using curl_multi_* functions.
- *
- * This handler supports future responses and the "delay" request client
- * option that can be used to delay before sending a request.
- *
- * When using the CurlMultiHandler, custom curl options can be specified as an
- * associative array of curl option constants mapping to values in the
- * **curl** key of the "client" key of the request.
- *
- * @property resource $_mh Internal use only. Lazy loaded multi-handle.
- */
-class CurlMultiHandler
-{
-    /** @var callable */
-    private $factory;
-    private $selectTimeout;
-    private $active;
-    private $handles = [];
-    private $delays = [];
-    private $maxHandles;
-
-    /**
-     * This handler accepts the following options:
-     *
-     * - mh: An optional curl_multi resource
-     * - handle_factory: An optional callable used to generate curl handle
-     *   resources. the callable accepts a request hash and returns an array
-     *   of the handle, headers file resource, and the body resource.
-     * - select_timeout: Optional timeout (in seconds) to block before timing
-     *   out while selecting curl handles. Defaults to 1 second.
-     * - max_handles: Optional integer representing the maximum number of
-     *   open requests. When this number is reached, the queued futures are
-     *   flushed.
-     *
-     * @param array $options
-     */
-    public function __construct(array $options = [])
-    {
-        if (isset($options['mh'])) {
-            $this->_mh = $options['mh'];
-        }
-        $this->factory = isset($options['handle_factory'])
-            ? $options['handle_factory'] : new CurlFactory();
-        $this->selectTimeout = isset($options['select_timeout'])
-            ? $options['select_timeout'] : 1;
-        $this->maxHandles = isset($options['max_handles'])
-            ? $options['max_handles'] : 100;
-    }
-
-    public function __get($name)
-    {
-        if ($name === '_mh') {
-            return $this->_mh = curl_multi_init();
-        }
-
-        throw new \BadMethodCallException();
-    }
-
-    public function __destruct()
-    {
-        // Finish any open connections before terminating the script.
-        if ($this->handles) {
-            $this->execute();
-        }
-
-        if (isset($this->_mh)) {
-            curl_multi_close($this->_mh);
-            unset($this->_mh);
-        }
-    }
-
-    public function __invoke(array $request)
-    {
-        $factory = $this->factory;
-        $result = $factory($request);
-        $entry = [
-            'request'  => $request,
-            'response' => [],
-            'handle'   => $result[0],
-            'headers'  => &$result[1],
-            'body'     => $result[2],
-            'deferred' => new Deferred(),
-        ];
-
-        $id = (int) $result[0];
-
-        $future = new FutureArray(
-            $entry['deferred']->promise(),
-            [$this, 'execute'],
-            function () use ($id) {
-                return $this->cancel($id);
-            }
-        );
-
-        $this->addRequest($entry);
-
-        // Transfer outstanding requests if there are too many open handles.
-        if (count($this->handles) >= $this->maxHandles) {
-            $this->execute();
-        }
-
-        return $future;
-    }
-
-    /**
-     * Runs until all outstanding connections have completed.
-     */
-    public function execute()
-    {
-        do {
-
-            if ($this->active &&
-                curl_multi_select($this->_mh, $this->selectTimeout) === -1
-            ) {
-                // Perform a usleep if a select returns -1.
-                // See: https://bugs.php.net/bug.php?id=61141
-                usleep(250);
-            }
-
-            // Add any delayed futures if needed.
-            if ($this->delays) {
-                $this->addDelays();
-            }
-
-            do {
-                $mrc = curl_multi_exec($this->_mh, $this->active);
-            } while ($mrc === CURLM_CALL_MULTI_PERFORM);
-
-            $this->processMessages();
-
-            // If there are delays but no transfers, then sleep for a bit.
-            if (!$this->active && $this->delays) {
-                usleep(500);
-            }
-
-        } while ($this->active || $this->handles);
-    }
-
-    private function addRequest(array &$entry)
-    {
-        $id = (int) $entry['handle'];
-        $this->handles[$id] = $entry;
-
-        // If the request is a delay, then add the reques to the curl multi
-        // pool only after the specified delay.
-        if (isset($entry['request']['client']['delay'])) {
-            $this->delays[$id] = microtime(true) + ($entry['request']['client']['delay'] / 1000);
-        } elseif (empty($entry['request']['future'])) {
-            curl_multi_add_handle($this->_mh, $entry['handle']);
-        } else {
-            curl_multi_add_handle($this->_mh, $entry['handle']);
-            // "lazy" futures are only sent once the pool has many requests.
-            if ($entry['request']['future'] !== 'lazy') {
-                do {
-                    $mrc = curl_multi_exec($this->_mh, $this->active);
-                } while ($mrc === CURLM_CALL_MULTI_PERFORM);
-                $this->processMessages();
-            }
-        }
-    }
-
-    private function removeProcessed($id)
-    {
-        if (isset($this->handles[$id])) {
-            curl_multi_remove_handle(
-                $this->_mh,
-                $this->handles[$id]['handle']
-            );
-            curl_close($this->handles[$id]['handle']);
-            unset($this->handles[$id], $this->delays[$id]);
-        }
-    }
-
-    /**
-     * Cancels a handle from sending and removes references to it.
-     *
-     * @param int $id Handle ID to cancel and remove.
-     *
-     * @return bool True on success, false on failure.
-     */
-    private function cancel($id)
-    {
-        // Cannot cancel if it has been processed.
-        if (!isset($this->handles[$id])) {
-            return false;
-        }
-
-        $handle = $this->handles[$id]['handle'];
-        unset($this->delays[$id], $this->handles[$id]);
-        curl_multi_remove_handle($this->_mh, $handle);
-        curl_close($handle);
-
-        return true;
-    }
-
-    private function addDelays()
-    {
-        $currentTime = microtime(true);
-
-        foreach ($this->delays as $id => $delay) {
-            if ($currentTime >= $delay) {
-                unset($this->delays[$id]);
-                curl_multi_add_handle(
-                    $this->_mh,
-                    $this->handles[$id]['handle']
-                );
-            }
-        }
-    }
-
-    private function processMessages()
-    {
-        while ($done = curl_multi_info_read($this->_mh)) {
-            $id = (int) $done['handle'];
-
-            if (!isset($this->handles[$id])) {
-                // Probably was cancelled.
-                continue;
-            }
-
-            $entry = $this->handles[$id];
-            $entry['response']['transfer_stats'] = curl_getinfo($done['handle']);
-
-            if ($done['result'] !== CURLM_OK) {
-                $entry['response']['curl']['errno'] = $done['result'];
-                if (function_exists('curl_strerror')) {
-                    $entry['response']['curl']['error'] = curl_strerror($done['result']);
-                }
-            }
-
-            $result = CurlFactory::createResponse(
-                $this,
-                $entry['request'],
-                $entry['response'],
-                $entry['headers'],
-                $entry['body']
-            );
-
-            $this->removeProcessed($id);
-            $entry['deferred']->resolve($result);
-        }
-    }
-}
diff --git a/core/vendor/guzzlehttp/ringphp/src/Client/Middleware.php b/core/vendor/guzzlehttp/ringphp/src/Client/Middleware.php
deleted file mode 100644
index 6fa7318ab..000000000
--- a/core/vendor/guzzlehttp/ringphp/src/Client/Middleware.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-namespace GuzzleHttp\Ring\Client;
-
-/**
- * Provides basic middleware wrappers.
- *
- * If a middleware is more complex than a few lines of code, then it should
- * be implemented in a class rather than a static method.
- */
-class Middleware
-{
-    /**
-     * Sends future requests to a future compatible handler while sending all
-     * other requests to a default handler.
-     *
-     * When the "future" option is not provided on a request, any future responses
-     * are automatically converted to synchronous responses and block.
-     *
-     * @param callable $default Handler used for non-streaming responses
-     * @param callable $future  Handler used for future responses
-     *
-     * @return callable Returns the composed handler.
-     */
-    public static function wrapFuture(
-        callable $default,
-        callable $future
-    ) {
-        return function (array $request) use ($default, $future) {
-            return empty($request['client']['future'])
-                ? $default($request)
-                : $future($request);
-        };
-    }
-
-    /**
-     * Sends streaming requests to a streaming compatible handler while sendin
-     * all other requests to a default handler.
-     *
-     * This, for example, could be useful for taking advantage of the
-     * performance benefits of curl while still supporting true streaming
-     * through the StreamHandler.
-     *
-     * @param callable $default   Handler used for non-streaming responses
-     * @param callable $streaming Handler used for streaming responses
-     *
-     * @return callable Returns the composed handler.
-     */
-    public static function wrapStreaming(
-        callable $default,
-        callable $streaming
-    ) {
-        return function (array $request) use ($default, $streaming) {
-            return empty($request['client']['stream'])
-                ? $default($request)
-                : $streaming($request);
-        };
-    }
-}
diff --git a/core/vendor/guzzlehttp/ringphp/src/Client/MockHandler.php b/core/vendor/guzzlehttp/ringphp/src/Client/MockHandler.php
deleted file mode 100644
index 56cc32da7..000000000
--- a/core/vendor/guzzlehttp/ringphp/src/Client/MockHandler.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-namespace GuzzleHttp\Ring\Client;
-
-use GuzzleHttp\Ring\Core;
-use GuzzleHttp\Ring\Future\CompletedFutureArray;
-use GuzzleHttp\Ring\Future\FutureArrayInterface;
-
-/**
- * Ring handler that returns a canned response or evaluated function result.
- */
-class MockHandler
-{
-    /** @var callable|array|FutureArrayInterface */
-    private $result;
-
-    /**
-     * Provide an array or future to always return the same value. Provide a
-     * callable that accepts a request object and returns an array or future
-     * to dynamically create a response.
-     *
-     * @param array|FutureArrayInterface|callable $result Mock return value.
-     */
-    public function __construct($result)
-    {
-        $this->result = $result;
-    }
-
-    public function __invoke(array $request)
-    {
-        Core::doSleep($request);
-        $response = is_callable($this->result)
-            ? call_user_func($this->result, $request)
-            : $this->result;
-
-        if (is_array($response)) {
-            $response = new CompletedFutureArray($response + [
-                'status'        => null,
-                'body'          => null,
-                'headers'       => [],
-                'reason'        => null,
-                'effective_url' => null,
-            ]);
-        } elseif (!$response instanceof FutureArrayInterface) {
-            throw new \InvalidArgumentException(
-                'Response must be an array or FutureArrayInterface. Found '
-                . Core::describeType($request)
-            );
-        }
-
-        return $response;
-    }
-}
diff --git a/core/vendor/guzzlehttp/ringphp/src/Client/StreamHandler.php b/core/vendor/guzzlehttp/ringphp/src/Client/StreamHandler.php
deleted file mode 100644
index 855aad7f6..000000000
--- a/core/vendor/guzzlehttp/ringphp/src/Client/StreamHandler.php
+++ /dev/null
@@ -1,412 +0,0 @@
-<?php
-namespace GuzzleHttp\Ring\Client;
-
-use GuzzleHttp\Ring\Core;
-use GuzzleHttp\Ring\Exception\ConnectException;
-use GuzzleHttp\Ring\Exception\RingException;
-use GuzzleHttp\Ring\Future\CompletedFutureArray;
-use GuzzleHttp\Stream\InflateStream;
-use GuzzleHttp\Stream\StreamInterface;
-use GuzzleHttp\Stream\Stream;
-use GuzzleHttp\Stream\Utils;
-
-/**
- * RingPHP client handler that uses PHP's HTTP stream wrapper.
- */
-class StreamHandler
-{
-    private $options;
-    private $lastHeaders;
-
-    public function __construct(array $options = [])
-    {
-        $this->options = $options;
-    }
-
-    public function __invoke(array $request)
-    {
-        $url = Core::url($request);
-        Core::doSleep($request);
-
-        try {
-            // Does not support the expect header.
-            $request = Core::removeHeader($request, 'Expect');
-            $stream = $this->createStream($url, $request);
-            return $this->createResponse($request, $url, $stream);
-        } catch (RingException $e) {
-            return $this->createErrorResponse($url, $e);
-        }
-    }
-
-    private function createResponse(array $request, $url, $stream)
-    {
-        $hdrs = $this->lastHeaders;
-        $this->lastHeaders = null;
-        $parts = explode(' ', array_shift($hdrs), 3);
-        $response = [
-            'status'         => $parts[1],
-            'reason'         => isset($parts[2]) ? $parts[2] : null,
-            'headers'        => Core::headersFromLines($hdrs),
-            'effective_url'  => $url,
-        ];
-
-        $stream = $this->checkDecode($request, $response, $stream);
-
-        // If not streaming, then drain the response into a stream.
-        if (empty($request['client']['stream'])) {
-            $dest = isset($request['client']['save_to'])
-                ? $request['client']['save_to']
-                : fopen('php://temp', 'r+');
-            $stream = $this->drain($stream, $dest);
-        }
-
-        $response['body'] = $stream;
-
-        return new CompletedFutureArray($response);
-    }
-
-    private function checkDecode(array $request, array $response, $stream)
-    {
-        // Automatically decode responses when instructed.
-        if (!empty($request['client']['decode_content'])) {
-            switch (Core::firstHeader($response, 'Content-Encoding', true)) {
-                case 'gzip':
-                case 'deflate':
-                    $stream = new InflateStream(Stream::factory($stream));
-                    break;
-            }
-        }
-
-        return $stream;
-    }
-
-    /**
-     * Drains the stream into the "save_to" client option.
-     *
-     * @param resource                        $stream
-     * @param string|resource|StreamInterface $dest
-     *
-     * @return Stream
-     * @throws \RuntimeException when the save_to option is invalid.
-     */
-    private function drain($stream, $dest)
-    {
-        if (is_resource($stream)) {
-            if (!is_resource($dest)) {
-                $stream = Stream::factory($stream);
-            } else {
-                stream_copy_to_stream($stream, $dest);
-                fclose($stream);
-                rewind($dest);
-                return $dest;
-            }
-        }
-
-        // Stream the response into the destination stream
-        $dest = is_string($dest)
-            ? new Stream(Utils::open($dest, 'r+'))
-            : Stream::factory($dest);
-
-        Utils::copyToStream($stream, $dest);
-        $dest->seek(0);
-        $stream->close();
-
-        return $dest;
-    }
-
-    /**
-     * Creates an error response for the given stream.
-     *
-     * @param string        $url
-     * @param RingException $e
-     *
-     * @return array
-     */
-    private function createErrorResponse($url, RingException $e)
-    {
-        // Determine if the error was a networking error.
-        $message = $e->getMessage();
-
-        // This list can probably get more comprehensive.
-        if (strpos($message, 'getaddrinfo') // DNS lookup failed
-            || strpos($message, 'Connection refused')
-        ) {
-            $e = new ConnectException($e->getMessage(), 0, $e);
-        }
-
-        return new CompletedFutureArray([
-            'status'        => null,
-            'body'          => null,
-            'headers'       => [],
-            'effective_url' => $url,
-            'error'         => $e
-        ]);
-    }
-
-    /**
-     * Create a resource and check to ensure it was created successfully
-     *
-     * @param callable $callback Callable that returns stream resource
-     *
-     * @return resource
-     * @throws \RuntimeException on error
-     */
-    private function createResource(callable $callback)
-    {
-        $errors = null;
-        set_error_handler(function ($_, $msg, $file, $line) use (&$errors) {
-            $errors[] = [
-                'message' => $msg,
-                'file'    => $file,
-                'line'    => $line
-            ];
-            return true;
-        });
-
-        $resource = $callback();
-        restore_error_handler();
-
-        if (!$resource) {
-            $message = 'Error creating resource: ';
-            foreach ($errors as $err) {
-                foreach ($err as $key => $value) {
-                    $message .= "[$key] $value" . PHP_EOL;
-                }
-            }
-            throw new RingException(trim($message));
-        }
-
-        return $resource;
-    }
-
-    private function createStream($url, array $request)
-    {
-        static $methods;
-        if (!$methods) {
-            $methods = array_flip(get_class_methods(__CLASS__));
-        }
-
-        // HTTP/1.1 streams using the PHP stream wrapper require a
-        // Connection: close header
-        if ((!isset($request['version']) || $request['version'] == '1.1')
-            && !Core::hasHeader($request, 'Connection')
-        ) {
-            $request['headers']['Connection'] = ['close'];
-        }
-
-        // Ensure SSL is verified by default
-        if (!isset($request['client']['verify'])) {
-            $request['client']['verify'] = true;
-        }
-
-        $params = [];
-        $options = $this->getDefaultOptions($request);
-
-        if (isset($request['client'])) {
-            foreach ($request['client'] as $key => $value) {
-                $method = "add_{$key}";
-                if (isset($methods[$method])) {
-                    $this->{$method}($request, $options, $value, $params);
-                }
-            }
-        }
-
-        return $this->createStreamResource(
-            $url,
-            $request,
-            $options,
-            $this->createContext($request, $options, $params)
-        );
-    }
-
-    private function getDefaultOptions(array $request)
-    {
-        $headers = "";
-        foreach ($request['headers'] as $name => $value) {
-            foreach ((array) $value as $val) {
-                $headers .= "$name: $val\r\n";
-            }
-        }
-
-        $context = [
-            'http' => [
-                'method'           => $request['http_method'],
-                'header'           => $headers,
-                'protocol_version' => isset($request['version']) ? $request['version'] : 1.1,
-                'ignore_errors'    => true,
-                'follow_location'  => 0,
-            ],
-        ];
-
-        $body = Core::body($request);
-        if (isset($body)) {
-            $context['http']['content'] = $body;
-            // Prevent the HTTP handler from adding a Content-Type header.
-            if (!Core::hasHeader($request, 'Content-Type')) {
-                $context['http']['header'] .= "Content-Type:\r\n";
-            }
-        }
-
-        $context['http']['header'] = rtrim($context['http']['header']);
-
-        return $context;
-    }
-
-    private function add_proxy(array $request, &$options, $value, &$params)
-    {
-        if (!is_array($value)) {
-            $options['http']['proxy'] = $value;
-        } else {
-            $scheme = isset($request['scheme']) ? $request['scheme'] : 'http';
-            if (isset($value[$scheme])) {
-                $options['http']['proxy'] = $value[$scheme];
-            }
-        }
-    }
-
-    private function add_timeout(array $request, &$options, $value, &$params)
-    {
-        $options['http']['timeout'] = $value;
-    }
-
-    private function add_verify(array $request, &$options, $value, &$params)
-    {
-        if ($value === true) {
-            // PHP 5.6 or greater will find the system cert by default. When
-            // < 5.6, use the Guzzle bundled cacert.
-            if (PHP_VERSION_ID < 50600) {
-                $options['ssl']['cafile'] = ClientUtils::getDefaultCaBundle();
-            }
-        } elseif (is_string($value)) {
-            $options['ssl']['cafile'] = $value;
-            if (!file_exists($value)) {
-                throw new RingException("SSL CA bundle not found: $value");
-            }
-        } elseif ($value === false) {
-            $options['ssl']['verify_peer'] = false;
-            return;
-        } else {
-            throw new RingException('Invalid verify request option');
-        }
-
-        $options['ssl']['verify_peer'] = true;
-        $options['ssl']['allow_self_signed'] = true;
-    }
-
-    private function add_cert(array $request, &$options, $value, &$params)
-    {
-        if (is_array($value)) {
-            $options['ssl']['passphrase'] = $value[1];
-            $value = $value[0];
-        }
-
-        if (!file_exists($value)) {
-            throw new RingException("SSL certificate not found: {$value}");
-        }
-
-        $options['ssl']['local_cert'] = $value;
-    }
-
-    private function add_progress(array $request, &$options, $value, &$params)
-    {
-        $fn = function ($code, $_1, $_2, $_3, $transferred, $total) use ($value) {
-            if ($code == STREAM_NOTIFY_PROGRESS) {
-                $value($total, $transferred, null, null);
-            }
-        };
-
-        // Wrap the existing function if needed.
-        $params['notification'] = isset($params['notification'])
-            ? Core::callArray([$params['notification'], $fn])
-            : $fn;
-    }
-
-    private function add_debug(array $request, &$options, $value, &$params)
-    {
-        if ($value === false) {
-            return;
-        }
-
-        static $map = [
-            STREAM_NOTIFY_CONNECT       => 'CONNECT',
-            STREAM_NOTIFY_AUTH_REQUIRED => 'AUTH_REQUIRED',
-            STREAM_NOTIFY_AUTH_RESULT   => 'AUTH_RESULT',
-            STREAM_NOTIFY_MIME_TYPE_IS  => 'MIME_TYPE_IS',
-            STREAM_NOTIFY_FILE_SIZE_IS  => 'FILE_SIZE_IS',
-            STREAM_NOTIFY_REDIRECTED    => 'REDIRECTED',
-            STREAM_NOTIFY_PROGRESS      => 'PROGRESS',
-            STREAM_NOTIFY_FAILURE       => 'FAILURE',
-            STREAM_NOTIFY_COMPLETED     => 'COMPLETED',
-            STREAM_NOTIFY_RESOLVE       => 'RESOLVE',
-        ];
-
-        static $args = ['severity', 'message', 'message_code',
-            'bytes_transferred', 'bytes_max'];
-
-        $value = Core::getDebugResource($value);
-        $ident = $request['http_method'] . ' ' . Core::url($request);
-        $fn = function () use ($ident, $value, $map, $args) {
-            $passed = func_get_args();
-            $code = array_shift($passed);
-            fprintf($value, '<%s> [%s] ', $ident, $map[$code]);
-            foreach (array_filter($passed) as $i => $v) {
-                fwrite($value, $args[$i] . ': "' . $v . '" ');
-            }
-            fwrite($value, "\n");
-        };
-
-        // Wrap the existing function if needed.
-        $params['notification'] = isset($params['notification'])
-            ? Core::callArray([$params['notification'], $fn])
-            : $fn;
-    }
-
-    private function applyCustomOptions(array $request, array &$options)
-    {
-        if (!isset($request['client']['stream_context'])) {
-            return;
-        }
-
-        if (!is_array($request['client']['stream_context'])) {
-            throw new RingException('stream_context must be an array');
-        }
-
-        $options = array_replace_recursive(
-            $options,
-            $request['client']['stream_context']
-        );
-    }
-
-    private function createContext(array $request, array $options, array $params)
-    {
-        $this->applyCustomOptions($request, $options);
-        return $this->createResource(
-            function () use ($request, $options, $params) {
-                return stream_context_create($options, $params);
-            },
-            $request,
-            $options
-        );
-    }
-
-    private function createStreamResource(
-        $url,
-        array $request,
-        array $options,
-        $context
-    ) {
-        return $this->createResource(
-            function () use ($url, $context) {
-                if (false === strpos($url, 'http')) {
-                    trigger_error("URL is invalid: {$url}", E_USER_WARNING);
-                    return null;
-                }
-                $resource = fopen($url, 'r', null, $context);
-                $this->lastHeaders = $http_response_header;
-                return $resource;
-            },
-            $request,
-            $options
-        );
-    }
-}
diff --git a/core/vendor/guzzlehttp/ringphp/src/Core.php b/core/vendor/guzzlehttp/ringphp/src/Core.php
deleted file mode 100644
index dd7d1a0c5..000000000
--- a/core/vendor/guzzlehttp/ringphp/src/Core.php
+++ /dev/null
@@ -1,364 +0,0 @@
-<?php
-namespace GuzzleHttp\Ring;
-
-use GuzzleHttp\Stream\StreamInterface;
-use GuzzleHttp\Ring\Future\FutureArrayInterface;
-use GuzzleHttp\Ring\Future\FutureArray;
-
-/**
- * Provides core functionality of Ring handlers and middleware.
- */
-class Core
-{
-    /**
-     * Returns a function that calls all of the provided functions, in order,
-     * passing the arguments provided to the composed function to each function.
-     *
-     * @param callable[] $functions Array of functions to proxy to.
-     *
-     * @return callable
-     */
-    public static function callArray(array $functions)
-    {
-        return function () use ($functions) {
-            $args = func_get_args();
-            foreach ($functions as $fn) {
-                call_user_func_array($fn, $args);
-            }
-        };
-    }
-
-    /**
-     * Gets an array of header line values from a message for a specific header
-     *
-     * This method searches through the "headers" key of a message for a header
-     * using a case-insensitive search.
-     *
-     * @param array  $message Request or response hash.
-     * @param string $header  Header to retrieve
-     *
-     * @return array
-     */
-    public static function headerLines($message, $header)
-    {
-        $result = [];
-
-        if (!empty($message['headers'])) {
-            foreach ($message['headers'] as $name => $value) {
-                if (!strcasecmp($name, $header)) {
-                    $result = array_merge($result, $value);
-                }
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Gets a header value from a message as a string or null
-     *
-     * This method searches through the "headers" key of a message for a header
-     * using a case-insensitive search. The lines of the header are imploded
-     * using commas into a single string return value.
-     *
-     * @param array  $message Request or response hash.
-     * @param string $header  Header to retrieve
-     *
-     * @return string|null Returns the header string if found, or null if not.
-     */
-    public static function header($message, $header)
-    {
-        $match = self::headerLines($message, $header);
-        return $match ? implode(', ', $match) : null;
-    }
-
-    /**
-     * Returns the first header value from a message as a string or null. If
-     * a header line contains multiple values separated by a comma, then this
-     * function will return the first value in the list.
-     *
-     * @param array  $message Request or response hash.
-     * @param string $header  Header to retrieve
-     *
-     * @return string|null Returns the value as a string if found.
-     */
-    public static function firstHeader($message, $header)
-    {
-        if (!empty($message['headers'])) {
-            foreach ($message['headers'] as $name => $value) {
-                if (!strcasecmp($name, $header)) {
-                    // Return the match itself if it is a single value.
-                    $pos = strpos($value[0], ',');
-                    return $pos ? substr($value[0], 0, $pos) : $value[0];
-                }
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Returns true if a message has the provided case-insensitive header.
-     *
-     * @param array  $message Request or response hash.
-     * @param string $header  Header to check
-     *
-     * @return bool
-     */
-    public static function hasHeader($message, $header)
-    {
-        if (!empty($message['headers'])) {
-            foreach ($message['headers'] as $name => $value) {
-                if (!strcasecmp($name, $header)) {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Parses an array of header lines into an associative array of headers.
-     *
-     * @param array $lines Header lines array of strings in the following
-     *                     format: "Name: Value"
-     * @return array
-     */
-    public static function headersFromLines($lines)
-    {
-        $headers = [];
-
-        foreach ($lines as $line) {
-            $parts = explode(':', $line, 2);
-            $headers[trim($parts[0])][] = isset($parts[1])
-                ? trim($parts[1])
-                : null;
-        }
-
-        return $headers;
-    }
-
-    /**
-     * Removes a header from a message using a case-insensitive comparison.
-     *
-     * @param array  $message Message that contains 'headers'
-     * @param string $header  Header to remove
-     *
-     * @return array
-     */
-    public static function removeHeader(array $message, $header)
-    {
-        if (isset($message['headers'])) {
-            foreach (array_keys($message['headers']) as $key) {
-                if (!strcasecmp($header, $key)) {
-                    unset($message['headers'][$key]);
-                }
-            }
-        }
-
-        return $message;
-    }
-
-    /**
-     * Replaces any existing case insensitive headers with the given value.
-     *
-     * @param array  $message Message that contains 'headers'
-     * @param string $header  Header to set.
-     * @param array  $value   Value to set.
-     *
-     * @return array
-     */
-    public static function setHeader(array $message, $header, array $value)
-    {
-        $message = self::removeHeader($message, $header);
-        $message['headers'][$header] = $value;
-
-        return $message;
-    }
-
-    /**
-     * Creates a URL string from a request.
-     *
-     * If the "url" key is present on the request, it is returned, otherwise
-     * the url is built up based on the scheme, host, uri, and query_string
-     * request values.
-     *
-     * @param array $request Request to get the URL from
-     *
-     * @return string Returns the request URL as a string.
-     * @throws \InvalidArgumentException if no Host header is present.
-     */
-    public static function url(array $request)
-    {
-        if (isset($request['url'])) {
-            return $request['url'];
-        }
-
-        $uri = (isset($request['scheme'])
-                ? $request['scheme'] : 'http') . '://';
-
-        if ($host = self::header($request, 'host')) {
-            $uri .= $host;
-        } else {
-            throw new \InvalidArgumentException('No Host header was provided');
-        }
-
-        if (isset($request['uri'])) {
-            $uri .= $request['uri'];
-        }
-
-        if (isset($request['query_string'])) {
-            $uri .= '?' . $request['query_string'];
-        }
-
-        return $uri;
-    }
-
-    /**
-     * Reads the body of a message into a string.
-     *
-     * @param array|FutureArrayInterface $message Array containing a "body" key
-     *
-     * @return null|string Returns the body as a string or null if not set.
-     * @throws \InvalidArgumentException if a request body is invalid.
-     */
-    public static function body($message)
-    {
-        if (!isset($message['body'])) {
-            return null;
-        }
-
-        if ($message['body'] instanceof StreamInterface) {
-            return (string) $message['body'];
-        }
-
-        switch (gettype($message['body'])) {
-            case 'string':
-                return $message['body'];
-            case 'resource':
-                return stream_get_contents($message['body']);
-            case 'object':
-                if ($message['body'] instanceof \Iterator) {
-                    return implode('', iterator_to_array($message['body']));
-                } elseif (method_exists($message['body'], '__toString')) {
-                    return (string) $message['body'];
-                }
-            default:
-                throw new \InvalidArgumentException('Invalid request body: '
-                    . self::describeType($message['body']));
-        }
-    }
-
-    /**
-     * Rewind the body of the provided message if possible.
-     *
-     * @param array $message Message that contains a 'body' field.
-     *
-     * @return bool Returns true on success, false on failure
-     */
-    public static function rewindBody($message)
-    {
-        if ($message['body'] instanceof StreamInterface) {
-            return $message['body']->seek(0);
-        }
-
-        if ($message['body'] instanceof \Generator) {
-            return false;
-        }
-
-        if ($message['body'] instanceof \Iterator) {
-            $message['body']->rewind();
-            return true;
-        }
-
-        if (is_resource($message['body'])) {
-            return rewind($message['body']);
-        }
-
-        return is_string($message['body'])
-            || (is_object($message['body'])
-                && method_exists($message['body'], '__toString'));
-    }
-
-    /**
-     * Debug function used to describe the provided value type and class.
-     *
-     * @param mixed $input
-     *
-     * @return string Returns a string containing the type of the variable and
-     *                if a class is provided, the class name.
-     */
-    public static function describeType($input)
-    {
-        switch (gettype($input)) {
-            case 'object':
-                return 'object(' . get_class($input) . ')';
-            case 'array':
-                return 'array(' . count($input) . ')';
-            default:
-                ob_start();
-                var_dump($input);
-                // normalize float vs double
-                return str_replace('double(', 'float(', rtrim(ob_get_clean()));
-        }
-    }
-
-    /**
-     * Sleep for the specified amount of time specified in the request's
-     * ['client']['delay'] option if present.
-     *
-     * This function should only be used when a non-blocking sleep is not
-     * possible.
-     *
-     * @param array $request Request to sleep
-     */
-    public static function doSleep(array $request)
-    {
-        if (isset($request['client']['delay'])) {
-            usleep($request['client']['delay'] * 1000);
-        }
-    }
-
-    /**
-     * Returns a proxied future that modifies the dereferenced value of another
-     * future using a promise.
-     *
-     * @param FutureArrayInterface $future      Future to wrap with a new future
-     * @param callable    $onFulfilled Invoked when the future fulfilled
-     * @param callable    $onRejected  Invoked when the future rejected
-     * @param callable    $onProgress  Invoked when the future progresses
-     *
-     * @return FutureArray
-     */
-    public static function proxy(
-        FutureArrayInterface $future,
-        callable $onFulfilled = null,
-        callable $onRejected = null,
-        callable $onProgress = null
-    ) {
-        return new FutureArray(
-            $future->then($onFulfilled, $onRejected, $onProgress),
-            [$future, 'wait'],
-            [$future, 'cancel']
-        );
-    }
-
-    /**
-     * Returns a debug stream based on the provided variable.
-     *
-     * @param mixed $value Optional value
-     *
-     * @return resource
-     */
-    public static function getDebugResource($value = null)
-    {
-        if (is_resource($value)) {
-            return $value;
-        } elseif (defined('STDOUT')) {
-            return STDOUT;
-        } else {
-            return fopen('php://output', 'w');
-        }
-    }
-}
diff --git a/core/vendor/guzzlehttp/ringphp/src/Exception/CancelledException.php b/core/vendor/guzzlehttp/ringphp/src/Exception/CancelledException.php
deleted file mode 100644
index 95b353acf..000000000
--- a/core/vendor/guzzlehttp/ringphp/src/Exception/CancelledException.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-namespace GuzzleHttp\Ring\Exception;
-
-/**
- * Marker interface for cancelled exceptions.
- */
-interface CancelledException {}
diff --git a/core/vendor/guzzlehttp/ringphp/src/Exception/CancelledFutureAccessException.php b/core/vendor/guzzlehttp/ringphp/src/Exception/CancelledFutureAccessException.php
deleted file mode 100644
index 4a14574df..000000000
--- a/core/vendor/guzzlehttp/ringphp/src/Exception/CancelledFutureAccessException.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-namespace GuzzleHttp\Ring\Exception;
-
-class CancelledFutureAccessException extends RingException implements CancelledException {}
diff --git a/core/vendor/guzzlehttp/ringphp/src/Exception/ConnectException.php b/core/vendor/guzzlehttp/ringphp/src/Exception/ConnectException.php
deleted file mode 100644
index 925cd133c..000000000
--- a/core/vendor/guzzlehttp/ringphp/src/Exception/ConnectException.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-namespace GuzzleHttp\Ring\Exception;
-
-/**
- * Occurs when the connection failed.
- */
-class ConnectException extends RingException {}
diff --git a/core/vendor/guzzlehttp/ringphp/src/Exception/RingException.php b/core/vendor/guzzlehttp/ringphp/src/Exception/RingException.php
deleted file mode 100644
index eed0daf7d..000000000
--- a/core/vendor/guzzlehttp/ringphp/src/Exception/RingException.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-namespace GuzzleHttp\Ring\Exception;
-
-class RingException extends \RuntimeException {};
diff --git a/core/vendor/guzzlehttp/ringphp/src/Future/BaseFutureTrait.php b/core/vendor/guzzlehttp/ringphp/src/Future/BaseFutureTrait.php
deleted file mode 100644
index e6a7ca77c..000000000
--- a/core/vendor/guzzlehttp/ringphp/src/Future/BaseFutureTrait.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-namespace GuzzleHttp\Ring\Future;
-
-use GuzzleHttp\Ring\Exception\CancelledFutureAccessException;
-use GuzzleHttp\Ring\Exception\RingException;
-use React\Promise\PromiseInterface;
-
-/**
- * Implements common future functionality built on top of promises.
- */
-trait BaseFutureTrait
-{
-    /** @var callable */
-    private $waitfn;
-
-    /** @var callable */
-    private $cancelfn;
-
-    /** @var PromiseInterface */
-    private $wrappedPromise;
-
-    /** @var \Exception Error encountered. */
-    private $error;
-
-    /** @var mixed Result of the future */
-    private $result;
-
-    private $isRealized = false;
-
-    /**
-     * @param PromiseInterface $promise Promise to shadow with the future.
-     * @param callable         $wait    Function that blocks until the deferred
-     *                                  computation has been resolved. This
-     *                                  function MUST resolve the deferred value
-     *                                  associated with the supplied promise.
-     * @param callable         $cancel  If possible and reasonable, provide a
-     *                                  function that can be used to cancel the
-     *                                  future from completing.
-     */
-    public function __construct(
-        PromiseInterface $promise,
-        callable $wait = null,
-        callable $cancel = null
-    ) {
-        $this->wrappedPromise = $promise;
-        $this->waitfn = $wait;
-        $this->cancelfn = $cancel;
-    }
-
-    public function wait()
-    {
-        if (!$this->isRealized) {
-            $this->addShadow();
-            if (!$this->isRealized && $this->waitfn) {
-                $this->invokeWait();
-            }
-            if (!$this->isRealized) {
-                $this->error = new RingException('Waiting did not resolve future');
-            }
-        }
-
-        if ($this->error) {
-            throw $this->error;
-        }
-
-        return $this->result;
-    }
-
-    public function promise()
-    {
-        return $this->wrappedPromise;
-    }
-
-    public function then(
-        callable $onFulfilled = null,
-        callable $onRejected = null,
-        callable $onProgress = null
-    ) {
-        return $this->wrappedPromise->then($onFulfilled, $onRejected, $onProgress);
-    }
-
-    public function cancel()
-    {
-        if (!$this->isRealized) {
-            $cancelfn = $this->cancelfn;
-            $this->waitfn = $this->cancelfn = null;
-            $this->isRealized = true;
-            $this->error = new CancelledFutureAccessException();
-            if ($cancelfn) {
-                $cancelfn($this);
-            }
-        }
-    }
-
-    private function addShadow()
-    {
-        // Get the result and error when the promise is resolved. Note that
-        // calling this function might trigger the resolution immediately.
-        $this->wrappedPromise->then(
-            function ($value) {
-                $this->isRealized = true;
-                $this->result = $value;
-                $this->waitfn = $this->cancelfn = null;
-            },
-            function ($error) {
-                $this->isRealized = true;
-                $this->error = $error;
-                $this->waitfn = $this->cancelfn = null;
-            }
-        );
-    }
-
-    private function invokeWait()
-    {
-        try {
-            $wait = $this->waitfn;
-            $this->waitfn = null;
-            $wait();
-        } catch (\Exception $e) {
-            // Defer can throw to reject.
-            $this->error = $e;
-            $this->isRealized = true;
-        }
-    }
-}
diff --git a/core/vendor/guzzlehttp/ringphp/src/Future/CompletedFutureArray.php b/core/vendor/guzzlehttp/ringphp/src/Future/CompletedFutureArray.php
deleted file mode 100644
index 0a90c939f..000000000
--- a/core/vendor/guzzlehttp/ringphp/src/Future/CompletedFutureArray.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-namespace GuzzleHttp\Ring\Future;
-
-/**
- * Represents a future array that has been completed successfully.
- */
-class CompletedFutureArray extends CompletedFutureValue implements FutureArrayInterface
-{
-    public function __construct(array $result)
-    {
-        parent::__construct($result);
-    }
-
-    public function offsetExists($offset)
-    {
-        return isset($this->result[$offset]);
-    }
-
-    public function offsetGet($offset)
-    {
-        return $this->result[$offset];
-    }
-
-    public function offsetSet($offset, $value)
-    {
-        $this->result[$offset] = $value;
-    }
-
-    public function offsetUnset($offset)
-    {
-        unset($this->result[$offset]);
-    }
-
-    public function count()
-    {
-        return count($this->result);
-    }
-
-    public function getIterator()
-    {
-        return new \ArrayIterator($this->result);
-    }
-}
diff --git a/core/vendor/guzzlehttp/ringphp/src/Future/CompletedFutureValue.php b/core/vendor/guzzlehttp/ringphp/src/Future/CompletedFutureValue.php
deleted file mode 100644
index 0d25af72d..000000000
--- a/core/vendor/guzzlehttp/ringphp/src/Future/CompletedFutureValue.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-namespace GuzzleHttp\Ring\Future;
-
-use React\Promise\FulfilledPromise;
-use React\Promise\RejectedPromise;
-
-/**
- * Represents a future value that has been resolved or rejected.
- */
-class CompletedFutureValue implements FutureInterface
-{
-    protected $result;
-    protected $error;
-
-    private $cachedPromise;
-
-    /**
-     * @param mixed      $result Resolved result
-     * @param \Exception $e      Error. Pass a GuzzleHttp\Ring\Exception\CancelledFutureAccessException
-     *                           to mark the future as cancelled.
-     */
-    public function __construct($result, \Exception $e = null)
-    {
-        $this->result = $result;
-        $this->error = $e;
-    }
-
-    public function wait()
-    {
-        if ($this->error) {
-            throw $this->error;
-        }
-
-        return $this->result;
-    }
-
-    public function cancel() {}
-
-    public function promise()
-    {
-        if (!$this->cachedPromise) {
-            $this->cachedPromise = $this->error
-                ? new RejectedPromise($this->error)
-                : new FulfilledPromise($this->result);
-        }
-
-        return $this->cachedPromise;
-    }
-
-    public function then(
-        callable $onFulfilled = null,
-        callable $onRejected = null,
-        callable $onProgress = null
-    ) {
-        return $this->promise()->then($onFulfilled, $onRejected, $onProgress);
-    }
-}
diff --git a/core/vendor/guzzlehttp/ringphp/src/Future/FutureArray.php b/core/vendor/guzzlehttp/ringphp/src/Future/FutureArray.php
deleted file mode 100644
index 3d64c9643..000000000
--- a/core/vendor/guzzlehttp/ringphp/src/Future/FutureArray.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-namespace GuzzleHttp\Ring\Future;
-
-/**
- * Represents a future array value that when dereferenced returns an array.
- */
-class FutureArray implements FutureArrayInterface
-{
-    use MagicFutureTrait;
-
-    public function offsetExists($offset)
-    {
-        return isset($this->_value[$offset]);
-    }
-
-    public function offsetGet($offset)
-    {
-        return $this->_value[$offset];
-    }
-
-    public function offsetSet($offset, $value)
-    {
-        $this->_value[$offset] = $value;
-    }
-
-    public function offsetUnset($offset)
-    {
-        unset($this->_value[$offset]);
-    }
-
-    public function count()
-    {
-        return count($this->_value);
-    }
-
-    public function getIterator()
-    {
-        return new \ArrayIterator($this->_value);
-    }
-}
diff --git a/core/vendor/guzzlehttp/ringphp/src/Future/FutureArrayInterface.php b/core/vendor/guzzlehttp/ringphp/src/Future/FutureArrayInterface.php
deleted file mode 100644
index 58f5f7367..000000000
--- a/core/vendor/guzzlehttp/ringphp/src/Future/FutureArrayInterface.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-namespace GuzzleHttp\Ring\Future;
-
-/**
- * Future that provides array-like access.
- */
-interface FutureArrayInterface extends
-    FutureInterface,
-    \ArrayAccess,
-    \Countable,
-    \IteratorAggregate {};
diff --git a/core/vendor/guzzlehttp/ringphp/src/Future/FutureInterface.php b/core/vendor/guzzlehttp/ringphp/src/Future/FutureInterface.php
deleted file mode 100644
index 43d18117b..000000000
--- a/core/vendor/guzzlehttp/ringphp/src/Future/FutureInterface.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-namespace GuzzleHttp\Ring\Future;
-
-use React\Promise\PromiseInterface;
-use React\Promise\PromisorInterface;
-
-/**
- * Represents the result of a computation that may not have completed yet.
- *
- * You can use the future in a blocking manner using the wait() function, or
- * you can use a promise from the future to receive the result when the future
- * has been resolved.
- *
- * When the future is dereferenced using wait(), the result of the computation
- * is cached and returned for subsequent calls to wait(). If the result of the
- * computation has not yet completed when wait() is called, the call to wait()
- * will block until the future has completed.
- */
-interface FutureInterface extends PromiseInterface, PromisorInterface
-{
-    /**
-     * Returns the result of the future either from cache or by blocking until
-     * it is complete.
-     *
-     * This method must block until the future has a result or is cancelled.
-     * Throwing an exception in the wait() method will mark the future as
-     * realized and will throw the exception each time wait() is called.
-     * Throwing an instance of GuzzleHttp\Ring\CancelledException will mark
-     * the future as realized, will not throw immediately, but will throw the
-     * exception if the future's wait() method is called again.
-     *
-     * @return mixed
-     */
-    public function wait();
-
-    /**
-     * Cancels the future, if possible.
-     */
-    public function cancel();
-}
diff --git a/core/vendor/guzzlehttp/ringphp/src/Future/FutureValue.php b/core/vendor/guzzlehttp/ringphp/src/Future/FutureValue.php
deleted file mode 100644
index 4cac9281b..000000000
--- a/core/vendor/guzzlehttp/ringphp/src/Future/FutureValue.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-namespace GuzzleHttp\Ring\Future;
-
-/**
- * Represents a future value that responds to wait() to retrieve the promised
- * value, but can also return promises that are delivered the value when it is
- * available.
- */
-class FutureValue implements FutureInterface
-{
-    use BaseFutureTrait;
-}
diff --git a/core/vendor/guzzlehttp/ringphp/src/Future/MagicFutureTrait.php b/core/vendor/guzzlehttp/ringphp/src/Future/MagicFutureTrait.php
deleted file mode 100644
index 58d779db4..000000000
--- a/core/vendor/guzzlehttp/ringphp/src/Future/MagicFutureTrait.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-namespace GuzzleHttp\Ring\Future;
-
-/**
- * Implements common future functionality that is triggered when the result
- * property is accessed via a magic __get method.
- *
- * @property mixed $_value Actual data used by the future. Accessing this
- *     property will cause the future to block if needed.
- */
-trait MagicFutureTrait
-{
-    use BaseFutureTrait;
-
-    /**
-     * This function handles retrieving the dereferenced result when requested.
-     *
-     * @param string $name Should always be "data" or an exception is thrown.
-     *
-     * @return mixed Returns the dereferenced data.
-     * @throws \RuntimeException
-     * @throws \GuzzleHttp\Ring\Exception\CancelledException
-     */
-    public function __get($name)
-    {
-        if ($name !== '_value') {
-            throw new \RuntimeException("Class has no {$name} property");
-        }
-
-        return $this->_value = $this->wait();
-    }
-}
diff --git a/core/vendor/guzzlehttp/ringphp/tests/Client/CurlFactoryTest.php b/core/vendor/guzzlehttp/ringphp/tests/Client/CurlFactoryTest.php
deleted file mode 100644
index 0f787c931..000000000
--- a/core/vendor/guzzlehttp/ringphp/tests/Client/CurlFactoryTest.php
+++ /dev/null
@@ -1,792 +0,0 @@
-<?php
-// Override curl_setopt_array() to get the last set curl options
-namespace GuzzleHttp\Ring\Client {
-    function curl_setopt_array($handle, array $options) {
-        if (!empty($_SERVER['curl_test'])) {
-            $_SERVER['_curl'] = $options;
-        } else {
-            unset($_SERVER['_curl']);
-        }
-        \curl_setopt_array($handle, $options);
-    }
-}
-
-namespace GuzzleHttp\Tests\Ring\Client {
-
-use GuzzleHttp\Ring\Client\CurlFactory;
-use GuzzleHttp\Ring\Client\CurlMultiHandler;
-use GuzzleHttp\Ring\Client\MockHandler;
-use GuzzleHttp\Ring\Core;
-use GuzzleHttp\Stream\FnStream;
-use GuzzleHttp\Stream\NoSeekStream;
-use GuzzleHttp\Stream\Stream;
-
-class CurlFactoryTest extends \PHPUnit_Framework_TestCase
-{
-    public static function setUpBeforeClass()
-    {
-        $_SERVER['curl_test'] = true;
-        unset($_SERVER['_curl']);
-    }
-
-    public static function tearDownAfterClass()
-    {
-        unset($_SERVER['_curl'], $_SERVER['curl_test']);
-    }
-
-    public function testCreatesCurlHandle()
-    {
-        Server::flush();
-        Server::enqueue([[
-            'status' => 200,
-            'headers' => [
-                'Foo' => ['Bar'],
-                'Baz' => ['bam'],
-                'Content-Length' => [2],
-            ],
-            'body' => 'hi',
-        ]]);
-
-        $stream = Stream::factory();
-
-        $request = [
-            'http_method' => 'PUT',
-            'headers' => [
-                'host' => [Server::$url],
-                'Hi'   => [' 123'],
-            ],
-            'body' => 'testing',
-            'client' => ['save_to' => $stream],
-        ];
-
-        $f = new CurlFactory();
-        $result = $f($request);
-        $this->assertInternalType('array', $result);
-        $this->assertCount(3, $result);
-        $this->assertInternalType('resource', $result[0]);
-        $this->assertInternalType('array', $result[1]);
-        $this->assertSame($stream, $result[2]);
-        curl_close($result[0]);
-
-        $this->assertEquals('PUT', $_SERVER['_curl'][CURLOPT_CUSTOMREQUEST]);
-        $this->assertEquals(
-            'http://http://127.0.0.1:8125/',
-            $_SERVER['_curl'][CURLOPT_URL]
-        );
-        // Sends via post fields when the request is small enough
-        $this->assertEquals('testing', $_SERVER['_curl'][CURLOPT_POSTFIELDS]);
-        $this->assertEquals(0, $_SERVER['_curl'][CURLOPT_RETURNTRANSFER]);
-        $this->assertEquals(0, $_SERVER['_curl'][CURLOPT_HEADER]);
-        $this->assertEquals(150, $_SERVER['_curl'][CURLOPT_CONNECTTIMEOUT]);
-        $this->assertInstanceOf('Closure', $_SERVER['_curl'][CURLOPT_HEADERFUNCTION]);
-
-        if (defined('CURLOPT_PROTOCOLS')) {
-            $this->assertEquals(
-                CURLPROTO_HTTP | CURLPROTO_HTTPS,
-                $_SERVER['_curl'][CURLOPT_PROTOCOLS]
-            );
-        }
-
-        $this->assertContains('Expect:', $_SERVER['_curl'][CURLOPT_HTTPHEADER]);
-        $this->assertContains('Accept:', $_SERVER['_curl'][CURLOPT_HTTPHEADER]);
-        $this->assertContains('Content-Type:', $_SERVER['_curl'][CURLOPT_HTTPHEADER]);
-        $this->assertContains('Hi:  123', $_SERVER['_curl'][CURLOPT_HTTPHEADER]);
-        $this->assertContains('host: http://127.0.0.1:8125/', $_SERVER['_curl'][CURLOPT_HTTPHEADER]);
-    }
-
-    public function testSendsHeadRequests()
-    {
-        Server::flush();
-        Server::enqueue([['status' => 200]]);
-        $a = new CurlMultiHandler();
-        $response = $a([
-            'http_method' => 'HEAD',
-            'headers' => ['host' => [Server::$host]],
-        ]);
-        $response->wait();
-        $this->assertEquals(true, $_SERVER['_curl'][CURLOPT_NOBODY]);
-        $checks = [CURLOPT_WRITEFUNCTION, CURLOPT_READFUNCTION, CURLOPT_FILE, CURLOPT_INFILE];
-        foreach ($checks as $check) {
-            $this->assertArrayNotHasKey($check, $_SERVER['_curl']);
-        }
-        $this->assertEquals('HEAD', Server::received()[0]['http_method']);
-    }
-
-    public function testCanAddCustomCurlOptions()
-    {
-        Server::flush();
-        Server::enqueue([['status' => 200]]);
-        $a = new CurlMultiHandler();
-        $a([
-            'http_method' => 'GET',
-            'headers'     => ['host' => [Server::$host]],
-            'client'      => ['curl' => [CURLOPT_LOW_SPEED_LIMIT => 10]],
-        ]);
-        $this->assertEquals(10, $_SERVER['_curl'][CURLOPT_LOW_SPEED_LIMIT]);
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage SSL CA bundle not found: /does/not/exist
-     */
-    public function testValidatesVerify()
-    {
-        $f = new CurlFactory();
-        $f([
-            'http_method' => 'GET',
-            'headers' => ['host' => ['foo.com']],
-            'client' => ['verify' => '/does/not/exist'],
-        ]);
-    }
-
-    public function testCanSetVerifyToFile()
-    {
-        $f = new CurlFactory();
-        $f([
-            'http_method' => 'GET',
-            'headers' => ['host' => ['foo.com']],
-            'client' => ['verify' => __FILE__],
-        ]);
-        $this->assertEquals(__FILE__, $_SERVER['_curl'][CURLOPT_CAINFO]);
-        $this->assertEquals(2, $_SERVER['_curl'][CURLOPT_SSL_VERIFYHOST]);
-        $this->assertEquals(true, $_SERVER['_curl'][CURLOPT_SSL_VERIFYPEER]);
-    }
-
-    public function testAddsVerifyAsTrue()
-    {
-        $f = new CurlFactory();
-        $f([
-            'http_method' => 'GET',
-            'headers' => ['host' => ['foo.com']],
-            'client' => ['verify' => true],
-        ]);
-        $this->assertEquals(2, $_SERVER['_curl'][CURLOPT_SSL_VERIFYHOST]);
-        $this->assertEquals(true, $_SERVER['_curl'][CURLOPT_SSL_VERIFYPEER]);
-        $this->assertArrayNotHasKey(CURLOPT_CAINFO, $_SERVER['_curl']);
-    }
-
-    public function testCanDisableVerify()
-    {
-        $f = new CurlFactory();
-        $f([
-            'http_method' => 'GET',
-            'headers' => ['host' => ['foo.com']],
-            'client' => ['verify' => false],
-        ]);
-        $this->assertEquals(0, $_SERVER['_curl'][CURLOPT_SSL_VERIFYHOST]);
-        $this->assertEquals(false, $_SERVER['_curl'][CURLOPT_SSL_VERIFYPEER]);
-    }
-
-    public function testAddsProxy()
-    {
-        $f = new CurlFactory();
-        $f([
-            'http_method' => 'GET',
-            'headers' => ['host' => ['foo.com']],
-            'client' => ['proxy' => 'http://bar.com'],
-        ]);
-        $this->assertEquals('http://bar.com', $_SERVER['_curl'][CURLOPT_PROXY]);
-    }
-
-    public function testAddsViaScheme()
-    {
-        $f = new CurlFactory();
-        $f([
-            'http_method' => 'GET',
-            'scheme' => 'http',
-            'headers' => ['host' => ['foo.com']],
-            'client' => [
-                'proxy' => ['http' => 'http://bar.com', 'https' => 'https://t'],
-            ],
-        ]);
-        $this->assertEquals('http://bar.com', $_SERVER['_curl'][CURLOPT_PROXY]);
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage SSL private key not found: /does/not/exist
-     */
-    public function testValidatesSslKey()
-    {
-        $f = new CurlFactory();
-        $f([
-            'http_method' => 'GET',
-            'headers' => ['host' => ['foo.com']],
-            'client' => ['ssl_key' => '/does/not/exist'],
-        ]);
-    }
-
-    public function testAddsSslKey()
-    {
-        $f = new CurlFactory();
-        $f([
-            'http_method' => 'GET',
-            'headers' => ['host' => ['foo.com']],
-            'client' => ['ssl_key' => __FILE__],
-        ]);
-        $this->assertEquals(__FILE__, $_SERVER['_curl'][CURLOPT_SSLKEY]);
-    }
-
-    public function testAddsSslKeyWithPassword()
-    {
-        $f = new CurlFactory();
-        $f([
-            'http_method' => 'GET',
-            'headers' => ['host' => ['foo.com']],
-            'client' => ['ssl_key' => [__FILE__, 'test']],
-        ]);
-        $this->assertEquals(__FILE__, $_SERVER['_curl'][CURLOPT_SSLKEY]);
-        $this->assertEquals('test', $_SERVER['_curl'][CURLOPT_SSLKEYPASSWD]);
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage SSL certificate not found: /does/not/exist
-     */
-    public function testValidatesCert()
-    {
-        $f = new CurlFactory();
-        $f([
-            'http_method' => 'GET',
-            'headers' => ['host' => ['foo.com']],
-            'client' => ['cert' => '/does/not/exist'],
-        ]);
-    }
-
-    public function testAddsCert()
-    {
-        $f = new CurlFactory();
-        $f([
-            'http_method' => 'GET',
-            'headers' => ['host' => ['foo.com']],
-            'client' => ['cert' => __FILE__],
-        ]);
-        $this->assertEquals(__FILE__, $_SERVER['_curl'][CURLOPT_SSLCERT]);
-    }
-
-    public function testAddsCertWithPassword()
-    {
-        $f = new CurlFactory();
-        $f([
-            'http_method' => 'GET',
-            'headers' => ['host' => ['foo.com']],
-            'client' => ['cert' => [__FILE__, 'test']],
-        ]);
-        $this->assertEquals(__FILE__, $_SERVER['_curl'][CURLOPT_SSLCERT]);
-        $this->assertEquals('test', $_SERVER['_curl'][CURLOPT_SSLCERTPASSWD]);
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage progress client option must be callable
-     */
-    public function testValidatesProgress()
-    {
-        $f = new CurlFactory();
-        $f([
-            'http_method' => 'GET',
-            'headers' => ['host' => ['foo.com']],
-            'client' => ['progress' => 'foo'],
-        ]);
-    }
-
-    public function testEmitsDebugInfoToStream()
-    {
-        $res = fopen('php://memory', 'r+');
-        Server::flush();
-        Server::enqueue([['status' => 200]]);
-        $a = new CurlMultiHandler();
-        $response = $a([
-            'http_method' => 'HEAD',
-            'headers'     => ['host' => [Server::$host]],
-            'client'      => ['debug' => $res],
-        ]);
-        $response->wait();
-        rewind($res);
-        $output = str_replace("\r", '', stream_get_contents($res));
-        $this->assertContains(
-            "> HEAD / HTTP/1.1\nhost: 127.0.0.1:8125\n\n",
-            $output
-        );
-        $this->assertContains("< HTTP/1.1 200", $output);
-        fclose($res);
-    }
-
-    public function testEmitsProgressToFunction()
-    {
-        Server::flush();
-        Server::enqueue([['status' => 200]]);
-        $a = new CurlMultiHandler();
-        $called = [];
-        $response = $a([
-            'http_method' => 'HEAD',
-            'headers'     => ['host' => [Server::$host]],
-            'client'      => [
-                'progress' => function () use (&$called) {
-                    $called[] = func_get_args();
-                },
-            ],
-        ]);
-        $response->wait();
-        $this->assertNotEmpty($called);
-        foreach ($called as $call) {
-            $this->assertCount(4, $call);
-        }
-    }
-
-    private function addDecodeResponse($withEncoding = true)
-    {
-        $content = gzencode('test');
-        $response  = [
-            'status'  => 200,
-            'reason'  => 'OK',
-            'headers' => ['Content-Length' => [strlen($content)]],
-            'body'    => $content,
-        ];
-
-        if ($withEncoding) {
-            $response['headers']['Content-Encoding'] = ['gzip'];
-        }
-
-        Server::flush();
-        Server::enqueue([$response]);
-
-        return $content;
-    }
-
-    public function testDecodesGzippedResponses()
-    {
-        $this->addDecodeResponse();
-        $handler = new CurlMultiHandler();
-        $response = $handler([
-            'http_method' => 'GET',
-            'headers'     => ['host' => [Server::$host]],
-            'client'      => ['decode_content' => true],
-        ]);
-        $response->wait();
-        $this->assertEquals('test', Core::body($response));
-        $this->assertEquals('', $_SERVER['_curl'][CURLOPT_ENCODING]);
-        $sent = Server::received()[0];
-        $this->assertNull(Core::header($sent, 'Accept-Encoding'));
-    }
-
-    public function testDecodesGzippedResponsesWithHeader()
-    {
-        $this->addDecodeResponse();
-        $handler = new CurlMultiHandler();
-        $response = $handler([
-            'http_method' => 'GET',
-            'headers'     => [
-                'host'            => [Server::$host],
-                'Accept-Encoding' => ['gzip'],
-            ],
-            'client' => ['decode_content' => true],
-        ]);
-        $response->wait();
-        $this->assertEquals('gzip', $_SERVER['_curl'][CURLOPT_ENCODING]);
-        $sent = Server::received()[0];
-        $this->assertEquals('gzip', Core::header($sent, 'Accept-Encoding'));
-        $this->assertEquals('test', Core::body($response));
-    }
-
-    public function testDoesNotForceDecode()
-    {
-        $content = $this->addDecodeResponse();
-        $handler = new CurlMultiHandler();
-        $response = $handler([
-            'http_method' => 'GET',
-            'headers'     => ['host' => [Server::$host]],
-            'client'      => ['decode_content' => false],
-        ]);
-        $response->wait();
-        $sent = Server::received()[0];
-        $this->assertNull(Core::header($sent, 'Accept-Encoding'));
-        $this->assertEquals($content, Core::body($response));
-    }
-
-    public function testProtocolVersion()
-    {
-        Server::flush();
-        Server::enqueue([['status' => 200]]);
-        $a = new CurlMultiHandler();
-        $a([
-            'http_method' => 'GET',
-            'headers'     => ['host' => [Server::$host]],
-            'version'     => 1.0,
-        ]);
-        $this->assertEquals(CURL_HTTP_VERSION_1_0, $_SERVER['_curl'][CURLOPT_HTTP_VERSION]);
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     */
-    public function testValidatesSaveTo()
-    {
-        $handler = new CurlMultiHandler();
-        $handler([
-            'http_method' => 'GET',
-            'headers'     => ['host' => [Server::$host]],
-            'client'      => ['save_to' => true],
-        ]);
-    }
-
-    public function testSavesToStream()
-    {
-        $stream = fopen('php://memory', 'r+');
-        $this->addDecodeResponse();
-        $handler = new CurlMultiHandler();
-        $response = $handler([
-            'http_method' => 'GET',
-            'headers'     => ['host' => [Server::$host]],
-            'client' => [
-                'decode_content' => true,
-                'save_to' => $stream,
-            ],
-        ]);
-        $response->wait();
-        rewind($stream);
-        $this->assertEquals('test', stream_get_contents($stream));
-    }
-
-    public function testSavesToGuzzleStream()
-    {
-        $stream = Stream::factory();
-        $this->addDecodeResponse();
-        $handler = new CurlMultiHandler();
-        $response = $handler([
-            'http_method' => 'GET',
-            'headers'     => ['host' => [Server::$host]],
-            'client' => [
-                'decode_content' => true,
-                'save_to'        => $stream,
-            ],
-        ]);
-        $response->wait();
-        $this->assertEquals('test', (string) $stream);
-    }
-
-    public function testSavesToFileOnDisk()
-    {
-        $tmpfile = tempnam(sys_get_temp_dir(), 'testfile');
-        $this->addDecodeResponse();
-        $handler = new CurlMultiHandler();
-        $response = $handler([
-            'http_method' => 'GET',
-            'headers'     => ['host' => [Server::$host]],
-            'client' => [
-                'decode_content' => true,
-                'save_to'        => $tmpfile,
-            ],
-        ]);
-        $response->wait();
-        $this->assertEquals('test', file_get_contents($tmpfile));
-        unlink($tmpfile);
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     */
-    public function testValidatesBody()
-    {
-        $handler = new CurlMultiHandler();
-        $handler([
-            'http_method' => 'GET',
-            'headers'     => ['host' => [Server::$host]],
-            'body'        => false,
-        ]);
-    }
-
-    public function testAddsLargePayloadFromStreamWithNoSizeUsingChunked()
-    {
-        $stream = Stream::factory('foo');
-        $stream = FnStream::decorate($stream, [
-            'getSize' => function () {
-                return null;
-            }
-        ]);
-        $this->addDecodeResponse();
-        $handler = new CurlMultiHandler();
-        $response = $handler([
-            'http_method' => 'GET',
-            'headers'     => ['host' => [Server::$host]],
-            'body'        => $stream,
-        ]);
-        $response->wait();
-        $sent = Server::received()[0];
-        $this->assertEquals('chunked', Core::header($sent, 'Transfer-Encoding'));
-        $this->assertNull(Core::header($sent, 'Content-Length'));
-        $this->assertEquals('foo', $sent['body']);
-    }
-
-    public function testAddsPayloadFromIterator()
-    {
-        $iter = new \ArrayIterator(['f', 'o', 'o']);
-        $this->addDecodeResponse();
-        $handler = new CurlMultiHandler();
-        $response = $handler([
-            'http_method' => 'GET',
-            'headers'     => ['host' => [Server::$host]],
-            'body'        => $iter,
-        ]);
-        $response->wait();
-        $sent = Server::received()[0];
-        $this->assertEquals('chunked', Core::header($sent, 'Transfer-Encoding'));
-        $this->assertNull(Core::header($sent, 'Content-Length'));
-        $this->assertEquals('foo', $sent['body']);
-    }
-
-    public function testAddsPayloadFromResource()
-    {
-        $res = fopen('php://memory', 'r+');
-        $data = str_repeat('.', 1000000);
-        fwrite($res, $data);
-        rewind($res);
-        $this->addDecodeResponse();
-        $handler = new CurlMultiHandler();
-        $response = $handler([
-            'http_method' => 'GET',
-            'headers'     => [
-                'host'           => [Server::$host],
-                'content-length' => [1000000],
-            ],
-            'body'        => $res,
-        ]);
-        $response->wait();
-        $sent = Server::received()[0];
-        $this->assertNull(Core::header($sent, 'Transfer-Encoding'));
-        $this->assertEquals(1000000, Core::header($sent, 'Content-Length'));
-        $this->assertEquals($data, $sent['body']);
-    }
-
-    public function testAddsContentLengthFromStream()
-    {
-        $stream = Stream::factory('foo');
-        $this->addDecodeResponse();
-        $handler = new CurlMultiHandler();
-        $response = $handler([
-            'http_method' => 'GET',
-            'headers'     => ['host' => [Server::$host]],
-            'body'        => $stream,
-        ]);
-        $response->wait();
-        $sent = Server::received()[0];
-        $this->assertEquals(3, Core::header($sent, 'Content-Length'));
-        $this->assertNull(Core::header($sent, 'Transfer-Encoding'));
-        $this->assertEquals('foo', $sent['body']);
-    }
-
-    public function testDoesNotAddMultipleContentLengthHeaders()
-    {
-        $this->addDecodeResponse();
-        $handler = new CurlMultiHandler();
-        $response = $handler([
-            'http_method' => 'GET',
-            'headers'     => [
-                'host'           => [Server::$host],
-                'content-length' => [3],
-            ],
-            'body' => 'foo',
-        ]);
-        $response->wait();
-        $sent = Server::received()[0];
-        $this->assertEquals(3, Core::header($sent, 'Content-Length'));
-        $this->assertNull(Core::header($sent, 'Transfer-Encoding'));
-        $this->assertEquals('foo', $sent['body']);
-    }
-
-    public function testSendsPostWithNoBodyOrDefaultContentType()
-    {
-        Server::flush();
-        Server::enqueue([['status' => 200]]);
-        $handler = new CurlMultiHandler();
-        $response = $handler([
-            'http_method' => 'POST',
-            'uri'         => '/',
-            'headers'     => ['host' => [Server::$host]],
-        ]);
-        $response->wait();
-        $received = Server::received()[0];
-        $this->assertEquals('POST', $received['http_method']);
-        $this->assertNull(Core::header($received, 'content-type'));
-        $this->assertSame('0', Core::firstHeader($received, 'content-length'));
-    }
-
-    public function testFailsWhenNoResponseAndNoBody()
-    {
-        $res = CurlFactory::createResponse(function () {}, [], [], [], null);
-        $this->assertInstanceOf('GuzzleHttp\Ring\Exception\RingException', $res['error']);
-        $this->assertContains(
-            'No response was received for a request with no body',
-            $res['error']->getMessage()
-        );
-    }
-
-    public function testFailsWhenCannotRewindRetry()
-    {
-        $res = CurlFactory::createResponse(function () {}, [
-            'body' => new NoSeekStream(Stream::factory('foo'))
-        ], [], [], null);
-        $this->assertInstanceOf('GuzzleHttp\Ring\Exception\RingException', $res['error']);
-        $this->assertContains(
-            'rewind the request body failed',
-            $res['error']->getMessage()
-        );
-    }
-
-    public function testRetriesWhenBodyCanBeRewound()
-    {
-        $callHandler = $called = false;
-        $res = CurlFactory::createResponse(function () use (&$callHandler) {
-            $callHandler = true;
-            return ['status' => 200];
-        }, [
-            'body' => FnStream::decorate(Stream::factory('test'), [
-                'seek' => function () use (&$called) {
-                    $called = true;
-                    return true;
-                }
-            ])
-        ], [], [], null);
-
-        $this->assertTrue($callHandler);
-        $this->assertTrue($called);
-        $this->assertEquals('200', $res['status']);
-    }
-
-    public function testFailsWhenRetryMoreThanThreeTimes()
-    {
-        $call = 0;
-        $mock = new MockHandler(function (array $request) use (&$mock, &$call) {
-            $call++;
-            return CurlFactory::createResponse($mock, $request, [], [], null);
-        });
-        $response = $mock([
-            'http_method' => 'GET',
-            'body'        => 'test',
-        ]);
-        $this->assertEquals(3, $call);
-        $this->assertArrayHasKey('error', $response);
-        $this->assertContains(
-            'The cURL request was retried 3 times',
-            $response['error']->getMessage()
-        );
-    }
-
-    public function testHandles100Continue()
-    {
-        Server::flush();
-        Server::enqueue([
-            [
-                'status' => '200',
-                'reason' => 'OK',
-                'headers' => [
-                    'Test' => ['Hello'],
-                    'Content-Length' => ['4'],
-                ],
-                'body' => 'test',
-            ],
-        ]);
-
-        $request = [
-            'http_method' => 'PUT',
-            'headers'     => [
-                'Host'   => [Server::$host],
-                'Expect' => ['100-Continue'],
-            ],
-            'body'        => 'test',
-        ];
-
-        $handler = new CurlMultiHandler();
-        $response = $handler($request)->wait();
-        $this->assertEquals(200, $response['status']);
-        $this->assertEquals('OK', $response['reason']);
-        $this->assertEquals(['Hello'], $response['headers']['Test']);
-        $this->assertEquals(['4'], $response['headers']['Content-Length']);
-        $this->assertEquals('test', Core::body($response));
-    }
-
-    public function testCreatesConnectException()
-    {
-        $m = new \ReflectionMethod('GuzzleHttp\Ring\Client\CurlFactory', 'createErrorResponse');
-        $m->setAccessible(true);
-        $response = $m->invoke(
-            null,
-            function () {},
-            [],
-            [
-                'err_message' => 'foo',
-                'curl' => [
-                    'errno' => CURLE_COULDNT_CONNECT,
-                ]
-            ]
-        );
-        $this->assertInstanceOf('GuzzleHttp\Ring\Exception\ConnectException', $response['error']);
-    }
-
-    public function testParsesLastResponseOnly()
-    {
-        $response1  = [
-            'status'  => 301,
-            'headers' => [
-                'Content-Length' => ['0'],
-                'Location' => ['/foo']
-            ]
-        ];
-
-        $response2 = [
-            'status'  => 200,
-            'headers' => [
-                'Content-Length' => ['0'],
-                'Foo' => ['bar']
-            ]
-        ];
-
-        Server::flush();
-        Server::enqueue([$response1, $response2]);
-
-        $a = new CurlMultiHandler();
-        $response = $a([
-            'http_method' => 'GET',
-            'headers'     => ['Host'   => [Server::$host]],
-            'client' => [
-                'curl' => [
-                    CURLOPT_FOLLOWLOCATION => true
-                ]
-            ]
-        ])->wait();
-
-        $this->assertEquals(1, $response['transfer_stats']['redirect_count']);
-        $this->assertEquals('http://127.0.0.1:8125/foo', $response['effective_url']);
-        $this->assertEquals(['bar'], $response['headers']['Foo']);
-        $this->assertEquals(200, $response['status']);
-        $this->assertFalse(Core::hasHeader($response, 'Location'));
-    }
-
-    public function testMaintainsMultiHeaderOrder()
-    {
-        Server::flush();
-        Server::enqueue([
-            [
-                'status'  => 200,
-                'headers' => [
-                    'Content-Length' => ['0'],
-                    'Foo' => ['a', 'b'],
-                    'foo' => ['c', 'd'],
-                ]
-            ]
-        ]);
-
-        $a = new CurlMultiHandler();
-        $response = $a([
-            'http_method' => 'GET',
-            'headers'     => ['Host'   => [Server::$host]]
-        ])->wait();
-
-        $this->assertEquals(
-            ['a', 'b', 'c', 'd'],
-            Core::headerLines($response, 'Foo')
-        );
-    }
-}
-
-}
diff --git a/core/vendor/guzzlehttp/ringphp/tests/Client/CurlHandlerTest.php b/core/vendor/guzzlehttp/ringphp/tests/Client/CurlHandlerTest.php
deleted file mode 100644
index ba03b8cd3..000000000
--- a/core/vendor/guzzlehttp/ringphp/tests/Client/CurlHandlerTest.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests\Ring\Client;
-
-use GuzzleHttp\Ring\Client\CurlHandler;
-
-class CurlHandlerTest extends \PHPUnit_Framework_TestCase
-{
-    protected function setUp()
-    {
-        if (!function_exists('curl_reset')) {
-            $this->markTestSkipped('curl_reset() is not available');
-        }
-    }
-
-    protected function getHandler($factory = null, $options = [])
-    {
-        return new CurlHandler($options);
-    }
-
-    public function testCanSetMaxHandles()
-    {
-        $a = new CurlHandler(['max_handles' => 10]);
-        $this->assertEquals(10, $this->readAttribute($a, 'maxHandles'));
-    }
-
-    public function testCreatesCurlErrors()
-    {
-        $handler = new CurlHandler();
-        $response = $handler([
-            'http_method' => 'GET',
-            'uri' => '/',
-            'headers' => ['host' => ['localhost:123']],
-            'client' => ['timeout' => 0.001, 'connect_timeout' => 0.001],
-        ]);
-        $this->assertNull($response['status']);
-        $this->assertNull($response['reason']);
-        $this->assertEquals([], $response['headers']);
-        $this->assertInstanceOf(
-            'GuzzleHttp\Ring\Exception\RingException',
-            $response['error']
-        );
-
-        $this->assertEquals(
-            1,
-            preg_match('/^cURL error \d+: .*$/', $response['error']->getMessage())
-        );
-    }
-
-    public function testReleasesAdditionalEasyHandles()
-    {
-        Server::flush();
-        $response = [
-            'status'  => 200,
-            'headers' => ['Content-Length' => [4]],
-            'body'    => 'test',
-        ];
-
-        Server::enqueue([$response, $response, $response, $response]);
-        $a = new CurlHandler(['max_handles' => 2]);
-
-        $fn = function () use (&$calls, $a, &$fn) {
-            if (++$calls < 4) {
-                $a([
-                    'http_method' => 'GET',
-                    'headers'     => ['host' => [Server::$host]],
-                    'client'      => ['progress' => $fn],
-                ]);
-            }
-        };
-
-        $request = [
-            'http_method' => 'GET',
-            'headers'     => ['host' => [Server::$host]],
-            'client'      => [
-                'progress' => $fn,
-            ],
-        ];
-
-        $a($request);
-        $this->assertCount(2, $this->readAttribute($a, 'handles'));
-    }
-
-    public function testReusesHandles()
-    {
-        Server::flush();
-        $response = ['status' => 200];
-        Server::enqueue([$response, $response]);
-        $a = new CurlHandler();
-        $request = [
-            'http_method' => 'GET',
-            'headers'     => ['host' => [Server::$host]],
-        ];
-        $a($request);
-        $a($request);
-    }
-}
diff --git a/core/vendor/guzzlehttp/ringphp/tests/Client/CurlMultiHandlerTest.php b/core/vendor/guzzlehttp/ringphp/tests/Client/CurlMultiHandlerTest.php
deleted file mode 100644
index 9228f1cea..000000000
--- a/core/vendor/guzzlehttp/ringphp/tests/Client/CurlMultiHandlerTest.php
+++ /dev/null
@@ -1,165 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests\Ring\Client;
-
-use GuzzleHttp\Ring\Client\CurlMultiHandler;
-
-class CurlMultiHandlerTest extends \PHPUnit_Framework_TestCase
-{
-    public function testSendsRequest()
-    {
-        Server::enqueue([['status' => 200]]);
-        $a = new CurlMultiHandler();
-        $response = $a([
-            'http_method' => 'GET',
-            'headers'     => ['host' => [Server::$host]],
-        ]);
-        $this->assertInstanceOf('GuzzleHttp\Ring\Future\FutureArray', $response);
-        $this->assertEquals(200, $response['status']);
-        $this->assertArrayHasKey('transfer_stats', $response);
-        $realUrl = trim($response['transfer_stats']['url'], '/');
-        $this->assertEquals(trim(Server::$url, '/'), $realUrl);
-        $this->assertArrayHasKey('effective_url', $response);
-        $this->assertEquals(
-            trim(Server::$url, '/'),
-            trim($response['effective_url'], '/')
-        );
-    }
-
-    public function testCreatesErrorResponses()
-    {
-        $url = 'http://localhost:123/';
-        $a = new CurlMultiHandler();
-        $response = $a([
-            'http_method' => 'GET',
-            'headers'     => ['host' => ['localhost:123']],
-        ]);
-        $this->assertInstanceOf('GuzzleHttp\Ring\Future\FutureArray', $response);
-        $this->assertNull($response['status']);
-        $this->assertNull($response['reason']);
-        $this->assertEquals([], $response['headers']);
-        $this->assertArrayHasKey('error', $response);
-        $this->assertContains('cURL error ', $response['error']->getMessage());
-        $this->assertArrayHasKey('transfer_stats', $response);
-        $this->assertEquals(
-            trim($url, '/'),
-            trim($response['transfer_stats']['url'], '/')
-        );
-        $this->assertArrayHasKey('effective_url', $response);
-        $this->assertEquals(
-            trim($url, '/'),
-            trim($response['effective_url'], '/')
-        );
-    }
-
-    public function testSendsFuturesWhenDestructed()
-    {
-        Server::enqueue([['status' => 200]]);
-        $a = new CurlMultiHandler();
-        $response = $a([
-            'http_method' => 'GET',
-            'headers'     => ['host' => [Server::$host]],
-        ]);
-        $this->assertInstanceOf('GuzzleHttp\Ring\Future\FutureArray', $response);
-        $a->__destruct();
-        $this->assertEquals(200, $response['status']);
-    }
-
-    public function testCanSetMaxHandles()
-    {
-        $a = new CurlMultiHandler(['max_handles' => 2]);
-        $this->assertEquals(2, $this->readAttribute($a, 'maxHandles'));
-    }
-
-    public function testCanSetSelectTimeout()
-    {
-        $a = new CurlMultiHandler(['select_timeout' => 2]);
-        $this->assertEquals(2, $this->readAttribute($a, 'selectTimeout'));
-    }
-
-    public function testSendsFuturesWhenMaxHandlesIsReached()
-    {
-        $request = [
-            'http_method' => 'PUT',
-            'headers'     => ['host' => [Server::$host]],
-            'future'      => 'lazy', // passing this to control the test
-        ];
-        $response = ['status' => 200];
-        Server::flush();
-        Server::enqueue([$response, $response, $response]);
-        $a = new CurlMultiHandler(['max_handles' => 3]);
-        for ($i = 0; $i < 5; $i++) {
-            $responses[] = $a($request);
-        }
-        $this->assertCount(3, Server::received());
-        $responses[3]->cancel();
-        $responses[4]->cancel();
-    }
-
-    public function testCanCancel()
-    {
-        Server::flush();
-        $response = ['status' => 200];
-        Server::enqueue(array_fill_keys(range(0, 10), $response));
-        $a = new CurlMultiHandler();
-        $responses = [];
-
-        for ($i = 0; $i < 10; $i++) {
-            $response = $a([
-                'http_method' => 'GET',
-                'headers'     => ['host' => [Server::$host]],
-                'future'      => 'lazy',
-            ]);
-            $response->cancel();
-            $responses[] = $response;
-        }
-
-        $this->assertCount(0, Server::received());
-
-        foreach ($responses as $response) {
-            $this->assertTrue($this->readAttribute($response, 'isRealized'));
-        }
-    }
-
-    public function testCannotCancelFinished()
-    {
-        Server::flush();
-        Server::enqueue([['status' => 200]]);
-        $a = new CurlMultiHandler();
-        $response = $a([
-            'http_method' => 'GET',
-            'headers'     => ['host' => [Server::$host]],
-        ]);
-        $response->wait();
-        $response->cancel();
-    }
-
-    public function testDelaysInParallel()
-    {
-        Server::flush();
-        Server::enqueue([['status' => 200]]);
-        $a = new CurlMultiHandler();
-        $expected = microtime(true) + (100 / 1000);
-        $response = $a([
-            'http_method' => 'GET',
-            'headers'     => ['host' => [Server::$host]],
-            'client'      => ['delay' => 100],
-        ]);
-        $response->wait();
-        $this->assertGreaterThanOrEqual($expected, microtime(true));
-    }
-
-    public function testSendsNonLazyFutures()
-    {
-        $request = [
-            'http_method' => 'GET',
-            'headers'     => ['host' => [Server::$host]],
-            'future'      => true,
-        ];
-        Server::flush();
-        Server::enqueue([['status' => 202]]);
-        $a = new CurlMultiHandler();
-        $response = $a($request);
-        $this->assertInstanceOf('GuzzleHttp\Ring\Future\FutureArray', $response);
-        $this->assertEquals(202, $response['status']);
-    }
-}
diff --git a/core/vendor/guzzlehttp/ringphp/tests/Client/MiddlewareTest.php b/core/vendor/guzzlehttp/ringphp/tests/Client/MiddlewareTest.php
deleted file mode 100644
index a47bb30ba..000000000
--- a/core/vendor/guzzlehttp/ringphp/tests/Client/MiddlewareTest.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests\Ring\Client;
-
-use GuzzleHttp\Ring\Client\Middleware;
-use GuzzleHttp\Ring\Future\CompletedFutureArray;
-
-class MiddlewareTest extends \PHPUnit_Framework_TestCase
-{
-    public function testFutureCallsDefaultHandler()
-    {
-        $future = new CompletedFutureArray(['status' => 200]);
-        $calledA = false;
-        $a = function (array $req) use (&$calledA, $future) {
-            $calledA = true;
-            return $future;
-        };
-        $calledB = false;
-        $b = function (array $req) use (&$calledB) { $calledB = true; };
-        $s = Middleware::wrapFuture($a, $b);
-        $s([]);
-        $this->assertTrue($calledA);
-        $this->assertFalse($calledB);
-    }
-
-    public function testFutureCallsStreamingHandler()
-    {
-        $future = new CompletedFutureArray(['status' => 200]);
-        $calledA = false;
-        $a = function (array $req) use (&$calledA) { $calledA = true; };
-        $calledB = false;
-        $b = function (array $req) use (&$calledB, $future) {
-            $calledB = true;
-            return $future;
-        };
-        $s = Middleware::wrapFuture($a, $b);
-        $result = $s(['client' => ['future' => true]]);
-        $this->assertFalse($calledA);
-        $this->assertTrue($calledB);
-        $this->assertSame($future, $result);
-    }
-
-    public function testStreamingCallsDefaultHandler()
-    {
-        $calledA = false;
-        $a = function (array $req) use (&$calledA) { $calledA = true; };
-        $calledB = false;
-        $b = function (array $req) use (&$calledB) { $calledB = true; };
-        $s = Middleware::wrapStreaming($a, $b);
-        $s([]);
-        $this->assertTrue($calledA);
-        $this->assertFalse($calledB);
-    }
-
-    public function testStreamingCallsStreamingHandler()
-    {
-        $calledA = false;
-        $a = function (array $req) use (&$calledA) { $calledA = true; };
-        $calledB = false;
-        $b = function (array $req) use (&$calledB) { $calledB = true; };
-        $s = Middleware::wrapStreaming($a, $b);
-        $s(['client' => ['stream' => true]]);
-        $this->assertFalse($calledA);
-        $this->assertTrue($calledB);
-    }
-}
diff --git a/core/vendor/guzzlehttp/ringphp/tests/Client/MockHandlerTest.php b/core/vendor/guzzlehttp/ringphp/tests/Client/MockHandlerTest.php
deleted file mode 100644
index 26bcd6cdc..000000000
--- a/core/vendor/guzzlehttp/ringphp/tests/Client/MockHandlerTest.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests\Ring\Client;
-
-use GuzzleHttp\Ring\Client\MockHandler;
-use GuzzleHttp\Ring\Future\FutureArray;
-use React\Promise\Deferred;
-
-class MockHandlerTest extends \PHPUnit_Framework_TestCase
-{
-    public function testReturnsArray()
-    {
-        $mock = new MockHandler(['status' => 200]);
-        $response = $mock([]);
-        $this->assertEquals(200, $response['status']);
-        $this->assertEquals([], $response['headers']);
-        $this->assertNull($response['body']);
-        $this->assertNull($response['reason']);
-        $this->assertNull($response['effective_url']);
-    }
-
-    public function testReturnsFutures()
-    {
-        $deferred = new Deferred();
-        $future = new FutureArray(
-            $deferred->promise(),
-            function () use ($deferred) {
-                $deferred->resolve(['status' => 200]);
-            }
-        );
-        $mock = new MockHandler($future);
-        $response = $mock([]);
-        $this->assertInstanceOf('GuzzleHttp\Ring\Future\FutureArray', $response);
-        $this->assertEquals(200, $response['status']);
-    }
-
-    public function testReturnsFuturesWithThenCall()
-    {
-        $deferred = new Deferred();
-        $future = new FutureArray(
-            $deferred->promise(),
-            function () use ($deferred) {
-                $deferred->resolve(['status' => 200]);
-            }
-        );
-        $mock = new MockHandler($future);
-        $response = $mock([]);
-        $this->assertInstanceOf('GuzzleHttp\Ring\Future\FutureArray', $response);
-        $this->assertEquals(200, $response['status']);
-        $req = null;
-        $promise = $response->then(function ($value) use (&$req) {
-            $req = $value;
-            $this->assertEquals(200, $req['status']);
-        });
-        $this->assertInstanceOf('React\Promise\PromiseInterface', $promise);
-        $this->assertEquals(200, $req['status']);
-    }
-
-    public function testReturnsFuturesAndProxiesCancel()
-    {
-        $c = null;
-        $deferred = new Deferred();
-        $future = new FutureArray(
-            $deferred->promise(),
-            function () {},
-            function () use (&$c) {
-                $c = true;
-                return true;
-            }
-        );
-        $mock = new MockHandler($future);
-        $response = $mock([]);
-        $this->assertInstanceOf('GuzzleHttp\Ring\Future\FutureArray', $response);
-        $response->cancel();
-        $this->assertTrue($c);
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Response must be an array or FutureArrayInterface. Found
-     */
-    public function testEnsuresMockIsValid()
-    {
-        $mock = new MockHandler('foo');
-        $mock([]);
-    }
-}
diff --git a/core/vendor/guzzlehttp/ringphp/tests/Client/Server.php b/core/vendor/guzzlehttp/ringphp/tests/Client/Server.php
deleted file mode 100644
index 14665a556..000000000
--- a/core/vendor/guzzlehttp/ringphp/tests/Client/Server.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests\Ring\Client;
-
-use GuzzleHttp\Ring\Client\StreamHandler;
-use GuzzleHttp\Ring\Core;
-
-/**
- * Class uses to control the test webserver.
- *
- * Queued responses will be served to requests using a FIFO order.  All requests
- * received by the server are stored on the node.js server and can be retrieved
- * by calling {@see Server::received()}.
- *
- * Mock responses that don't require data to be transmitted over HTTP a great
- * for testing.  Mock response, however, cannot test the actual sending of an
- * HTTP request using cURL.  This test server allows the simulation of any
- * number of HTTP request response transactions to test the actual sending of
- * requests over the wire without having to leave an internal network.
- */
-class Server
-{
-    public static $started;
-    public static $url = 'http://127.0.0.1:8125/';
-    public static $host = '127.0.0.1:8125';
-    public static $port = 8125;
-
-    /**
-     * Flush the received requests from the server
-     * @throws \RuntimeException
-     */
-    public static function flush()
-    {
-        self::send('DELETE', '/guzzle-server/requests');
-    }
-
-    /**
-     * Queue an array of responses or a single response on the server.
-     *
-     * Any currently queued responses will be overwritten. Subsequent requests
-     * on the server will return queued responses in FIFO order.
-     *
-     * @param array $responses An array of responses. The shape of a response
-     *                         is the shape described in the RingPHP spec.
-     * @throws \Exception
-     */
-    public static function enqueue(array $responses)
-    {
-        $data = [];
-
-        foreach ($responses as $response) {
-            if (!is_array($response)) {
-                throw new \Exception('Each response must be an array');
-            }
-
-            if (isset($response['body'])) {
-                $response['body'] = base64_encode($response['body']);
-            }
-
-            $response += ['headers' => [], 'reason' => '', 'body' => ''];
-            $data[] = $response;
-        }
-
-        self::send('PUT', '/guzzle-server/responses', json_encode($data));
-    }
-
-    /**
-     * Get all of the received requests as a RingPHP request structure.
-     *
-     * @return array
-     * @throws \RuntimeException
-     */
-    public static function received()
-    {
-        if (!self::$started) {
-            return [];
-        }
-
-        $response = self::send('GET', '/guzzle-server/requests');
-        $body = Core::body($response);
-        $result = json_decode($body, true);
-        if ($result === false) {
-            throw new \RuntimeException('Error decoding response: '
-                . json_last_error());
-        }
-
-        foreach ($result as &$res) {
-            if (isset($res['uri'])) {
-                $res['resource'] = $res['uri'];
-            }
-            if (isset($res['query_string'])) {
-                $res['resource'] .= '?' . $res['query_string'];
-            }
-            if (!isset($res['resource'])) {
-                $res['resource'] = '';
-            }
-            // Ensure that headers are all arrays
-            if (isset($res['headers'])) {
-                foreach ($res['headers'] as &$h) {
-                    $h = (array) $h;
-                }
-                unset($h);
-            }
-        }
-
-        unset($res);
-        return $result;
-    }
-
-    /**
-     * Stop running the node.js server
-     */
-    public static function stop()
-    {
-        if (self::$started) {
-            self::send('DELETE', '/guzzle-server');
-        }
-
-        self::$started = false;
-    }
-
-    public static function wait($maxTries = 20)
-    {
-        $tries = 0;
-        while (!self::isListening() && ++$tries < $maxTries) {
-            usleep(100000);
-        }
-
-        if (!self::isListening()) {
-            throw new \RuntimeException('Unable to contact node.js server');
-        }
-    }
-
-    public static function start()
-    {
-        if (self::$started) {
-            return;
-        }
-
-        try {
-            self::wait();
-        } catch (\Exception $e) {
-            exec('node ' . __DIR__ . \DIRECTORY_SEPARATOR . 'server.js '
-                . self::$port . ' >> /tmp/server.log 2>&1 &');
-            self::wait();
-        }
-
-        self::$started = true;
-    }
-
-    private static function isListening()
-    {
-        $response = self::send('GET', '/guzzle-server/perf', null, [
-            'connect_timeout' => 1,
-            'timeout'         => 1
-        ]);
-
-        return !isset($response['error']);
-    }
-
-    private static function send(
-        $method,
-        $path,
-        $body = null,
-        array $client = []
-    ) {
-        $handler = new StreamHandler();
-
-        $request = [
-            'http_method'  => $method,
-            'uri'          => $path,
-            'request_port' => 8125,
-            'headers'      => ['host' => ['127.0.0.1:8125']],
-            'body'         => $body,
-            'client'       => $client,
-        ];
-
-        if ($body) {
-            $request['headers']['content-length'] = [strlen($body)];
-        }
-
-        return $handler($request);
-    }
-}
diff --git a/core/vendor/guzzlehttp/ringphp/tests/Client/StreamHandlerTest.php b/core/vendor/guzzlehttp/ringphp/tests/Client/StreamHandlerTest.php
deleted file mode 100644
index 7549a83f6..000000000
--- a/core/vendor/guzzlehttp/ringphp/tests/Client/StreamHandlerTest.php
+++ /dev/null
@@ -1,479 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests\Ring\Client;
-
-use GuzzleHttp\Ring\Client\ClientUtils;
-use GuzzleHttp\Ring\Core;
-use GuzzleHttp\Ring\Client\StreamHandler;
-
-class StreamHandlerTest extends \PHPUnit_Framework_TestCase
-{
-    public function testReturnsResponseForSuccessfulRequest()
-    {
-        $this->queueRes();
-        $handler = new StreamHandler();
-        $response = $handler([
-            'http_method' => 'GET',
-            'uri'         => '/',
-            'headers'     => [
-                'host' => [Server::$host],
-                'Foo' => ['Bar'],
-            ],
-        ]);
-
-        $this->assertEquals(200, $response['status']);
-        $this->assertEquals('OK', $response['reason']);
-        $this->assertEquals(['Bar'], $response['headers']['Foo']);
-        $this->assertEquals(['8'], $response['headers']['Content-Length']);
-        $this->assertEquals('hi there', Core::body($response));
-
-        $sent = Server::received()[0];
-        $this->assertEquals('GET', $sent['http_method']);
-        $this->assertEquals('/', $sent['resource']);
-        $this->assertEquals(['127.0.0.1:8125'], $sent['headers']['host']);
-        $this->assertEquals('Bar', Core::header($sent, 'foo'));
-    }
-
-    public function testAddsErrorToResponse()
-    {
-        $handler = new StreamHandler();
-        $result = $handler([
-            'http_method' => 'GET',
-            'headers'     => ['host' => ['localhost:123']],
-            'client'      => ['timeout' => 0.01],
-        ]);
-        $this->assertInstanceOf(
-            'GuzzleHttp\Ring\Future\CompletedFutureArray',
-            $result
-        );
-        $this->assertNull($result['status']);
-        $this->assertNull($result['body']);
-        $this->assertEquals([], $result['headers']);
-        $this->assertInstanceOf(
-            'GuzzleHttp\Ring\Exception\RingException',
-            $result['error']
-        );
-    }
-
-    public function testEnsuresTheHttpProtocol()
-    {
-        $handler = new StreamHandler();
-        $result = $handler([
-            'http_method' => 'GET',
-            'url'         => 'ftp://localhost:123',
-        ]);
-        $this->assertArrayHasKey('error', $result);
-        $this->assertContains(
-            'URL is invalid: ftp://localhost:123',
-            $result['error']->getMessage()
-        );
-    }
-
-    public function testStreamAttributeKeepsStreamOpen()
-    {
-        $this->queueRes();
-        $handler = new StreamHandler();
-        $response = $handler([
-            'http_method'  => 'PUT',
-            'uri'          => '/foo',
-            'query_string' => 'baz=bar',
-            'headers'      => [
-                'host' => [Server::$host],
-                'Foo'  => ['Bar'],
-            ],
-            'body'         => 'test',
-            'client'       => ['stream' => true],
-        ]);
-
-        $this->assertEquals(200, $response['status']);
-        $this->assertEquals('OK', $response['reason']);
-        $this->assertEquals('8', Core::header($response, 'Content-Length'));
-        $body = $response['body'];
-        $this->assertTrue(is_resource($body));
-        $this->assertEquals('http', stream_get_meta_data($body)['wrapper_type']);
-        $this->assertEquals('hi there', stream_get_contents($body));
-        fclose($body);
-        $sent = Server::received()[0];
-        $this->assertEquals('PUT', $sent['http_method']);
-        $this->assertEquals('/foo', $sent['uri']);
-        $this->assertEquals('baz=bar', $sent['query_string']);
-        $this->assertEquals('/foo?baz=bar', $sent['resource']);
-        $this->assertEquals('127.0.0.1:8125', Core::header($sent, 'host'));
-        $this->assertEquals('Bar', Core::header($sent, 'foo'));
-    }
-
-    public function testDrainsResponseIntoTempStream()
-    {
-        $this->queueRes();
-        $handler = new StreamHandler();
-        $response = $handler([
-            'http_method' => 'GET',
-            'uri'         => '/',
-            'headers'     => ['host' => [Server::$host]],
-        ]);
-        $body = $response['body'];
-        $this->assertEquals('php://temp', stream_get_meta_data($body)['uri']);
-        $this->assertEquals('hi', fread($body, 2));
-        fclose($body);
-    }
-
-    public function testDrainsResponseIntoSaveToBody()
-    {
-        $r = fopen('php://temp', 'r+');
-        $this->queueRes();
-        $handler = new StreamHandler();
-        $response = $handler([
-            'http_method' => 'GET',
-            'uri' => '/',
-            'headers' => ['host' => [Server::$host]],
-            'client' => ['save_to' => $r],
-        ]);
-        $body = $response['body'];
-        $this->assertEquals('php://temp', stream_get_meta_data($body)['uri']);
-        $this->assertEquals('hi', fread($body, 2));
-        $this->assertEquals(' there', stream_get_contents($r));
-        fclose($r);
-    }
-
-    public function testDrainsResponseIntoSaveToBodyAtPath()
-    {
-        $tmpfname = tempnam('/tmp', 'save_to_path');
-        $this->queueRes();
-        $handler = new StreamHandler();
-        $response = $handler([
-            'http_method' => 'GET',
-            'uri' => '/',
-            'headers' => ['host' => [Server::$host]],
-            'client' => ['save_to' => $tmpfname],
-        ]);
-        $body = $response['body'];
-        $this->assertInstanceOf('GuzzleHttp\Stream\StreamInterface', $body);
-        $this->assertEquals($tmpfname, $body->getMetadata('uri'));
-        $this->assertEquals('hi', $body->read(2));
-        $body->close();
-        unlink($tmpfname);
-    }
-
-    public function testAutomaticallyDecompressGzip()
-    {
-        Server::flush();
-        $content = gzencode('test');
-        Server::enqueue([
-            [
-                'status' => 200,
-                'reason' => 'OK',
-                'headers' => [
-                    'Content-Encoding' => ['gzip'],
-                    'Content-Length' => [strlen($content)],
-                ],
-                'body' => $content,
-            ],
-        ]);
-
-        $handler = new StreamHandler();
-        $response = $handler([
-            'http_method' => 'GET',
-            'headers'     => ['host' => [Server::$host]],
-            'uri'         => '/',
-            'client'      => ['decode_content' => true],
-        ]);
-        $this->assertEquals('test', Core::body($response));
-    }
-
-    public function testDoesNotForceGzipDecode()
-    {
-        Server::flush();
-        $content = gzencode('test');
-        Server::enqueue([
-            [
-                'status' => 200,
-                'reason' => 'OK',
-                'headers' => [
-                    'Content-Encoding' => ['gzip'],
-                    'Content-Length'   => [strlen($content)],
-                ],
-                'body' => $content,
-            ],
-        ]);
-
-        $handler = new StreamHandler();
-        $response = $handler([
-            'http_method' => 'GET',
-            'headers'     => ['host' => [Server::$host]],
-            'uri'         => '/',
-            'client'      => ['stream' => true, 'decode_content' => false],
-        ]);
-        $this->assertSame($content, Core::body($response));
-    }
-
-    public function testProtocolVersion()
-    {
-        $this->queueRes();
-        $handler = new StreamHandler();
-        $handler([
-            'http_method' => 'GET',
-            'uri'         => '/',
-            'headers'     => ['host' => [Server::$host]],
-            'version'     => 1.0,
-        ]);
-
-        $this->assertEquals(1.0, Server::received()[0]['version']);
-    }
-
-    protected function getSendResult(array $opts)
-    {
-        $this->queueRes();
-        $handler = new StreamHandler();
-        $opts['stream'] = true;
-        return $handler([
-            'http_method' => 'GET',
-            'uri'         => '/',
-            'headers'     => ['host' => [Server::$host]],
-            'client'      => $opts,
-        ]);
-    }
-
-    public function testAddsProxy()
-    {
-        $res = $this->getSendResult(['stream' => true, 'proxy' => '127.0.0.1:8125']);
-        $opts = stream_context_get_options($res['body']);
-        $this->assertEquals('127.0.0.1:8125', $opts['http']['proxy']);
-    }
-
-    public function testAddsTimeout()
-    {
-        $res = $this->getSendResult(['stream' => true, 'timeout' => 200]);
-        $opts = stream_context_get_options($res['body']);
-        $this->assertEquals(200, $opts['http']['timeout']);
-    }
-
-    public function testVerifiesVerifyIsValidIfPath()
-    {
-        $res = $this->getSendResult(['verify' => '/does/not/exist']);
-        $this->assertContains(
-            'SSL CA bundle not found: /does/not/exist',
-            (string) $res['error']
-        );
-    }
-
-    public function testVerifyCanBeDisabled()
-    {
-        $res = $this->getSendResult(['verify' => false]);
-        $this->assertArrayNotHasKey('error', $res);
-    }
-
-    public function testVerifiesCertIfValidPath()
-    {
-        $res = $this->getSendResult(['cert' => '/does/not/exist']);
-        $this->assertContains(
-            'SSL certificate not found: /does/not/exist',
-            (string) $res['error']
-        );
-    }
-
-    public function testVerifyCanBeSetToPath()
-    {
-        $path = $path = ClientUtils::getDefaultCaBundle();
-        $res = $this->getSendResult(['verify' => $path]);
-        $this->assertArrayNotHasKey('error', $res);
-        $opts = stream_context_get_options($res['body']);
-        $this->assertEquals(true, $opts['ssl']['verify_peer']);
-        $this->assertEquals($path, $opts['ssl']['cafile']);
-        $this->assertTrue(file_exists($opts['ssl']['cafile']));
-    }
-
-    public function testUsesSystemDefaultBundle()
-    {
-        $path = $path = ClientUtils::getDefaultCaBundle();
-        $res = $this->getSendResult(['verify' => true]);
-        $this->assertArrayNotHasKey('error', $res);
-        $opts = stream_context_get_options($res['body']);
-        if (PHP_VERSION_ID < 50600) {
-            $this->assertEquals($path, $opts['ssl']['cafile']);
-        }
-    }
-
-    public function testEnsuresVerifyOptionIsValid()
-    {
-        $res = $this->getSendResult(['verify' => 10]);
-        $this->assertContains(
-            'Invalid verify request option',
-            (string) $res['error']
-        );
-    }
-
-    public function testCanSetPasswordWhenSettingCert()
-    {
-        $path = __FILE__;
-        $res = $this->getSendResult(['cert' => [$path, 'foo']]);
-        $opts = stream_context_get_options($res['body']);
-        $this->assertEquals($path, $opts['ssl']['local_cert']);
-        $this->assertEquals('foo', $opts['ssl']['passphrase']);
-    }
-
-    public function testDebugAttributeWritesToStream()
-    {
-        $this->queueRes();
-        $f = fopen('php://temp', 'w+');
-        $this->getSendResult(['debug' => $f]);
-        fseek($f, 0);
-        $contents = stream_get_contents($f);
-        $this->assertContains('<GET http://127.0.0.1:8125/> [CONNECT]', $contents);
-        $this->assertContains('<GET http://127.0.0.1:8125/> [FILE_SIZE_IS]', $contents);
-        $this->assertContains('<GET http://127.0.0.1:8125/> [PROGRESS]', $contents);
-    }
-
-    public function testDebugAttributeWritesStreamInfoToBuffer()
-    {
-        $called = false;
-        $this->queueRes();
-        $buffer = fopen('php://temp', 'r+');
-        $this->getSendResult([
-            'progress' => function () use (&$called) { $called = true; },
-            'debug' => $buffer,
-        ]);
-        fseek($buffer, 0);
-        $contents = stream_get_contents($buffer);
-        $this->assertContains('<GET http://127.0.0.1:8125/> [CONNECT]', $contents);
-        $this->assertContains('<GET http://127.0.0.1:8125/> [FILE_SIZE_IS] message: "Content-Length: 8"', $contents);
-        $this->assertContains('<GET http://127.0.0.1:8125/> [PROGRESS] bytes_max: "8"', $contents);
-        $this->assertTrue($called);
-    }
-
-    public function testEmitsProgressInformation()
-    {
-        $called = [];
-        $this->queueRes();
-        $this->getSendResult([
-            'progress' => function () use (&$called) {
-                $called[] = func_get_args();
-            },
-        ]);
-        $this->assertNotEmpty($called);
-        $this->assertEquals(8, $called[0][0]);
-        $this->assertEquals(0, $called[0][1]);
-    }
-
-    public function testEmitsProgressInformationAndDebugInformation()
-    {
-        $called = [];
-        $this->queueRes();
-        $buffer = fopen('php://memory', 'w+');
-        $this->getSendResult([
-            'debug'    => $buffer,
-            'progress' => function () use (&$called) {
-                $called[] = func_get_args();
-            },
-        ]);
-        $this->assertNotEmpty($called);
-        $this->assertEquals(8, $called[0][0]);
-        $this->assertEquals(0, $called[0][1]);
-        rewind($buffer);
-        $this->assertNotEmpty(stream_get_contents($buffer));
-        fclose($buffer);
-    }
-
-    public function testAddsProxyByProtocol()
-    {
-        $url = str_replace('http', 'tcp', Server::$url);
-        $res = $this->getSendResult(['proxy' => ['http' => $url]]);
-        $opts = stream_context_get_options($res['body']);
-        $this->assertEquals($url, $opts['http']['proxy']);
-    }
-
-    public function testPerformsShallowMergeOfCustomContextOptions()
-    {
-        $res = $this->getSendResult([
-            'stream_context' => [
-                'http' => [
-                    'request_fulluri' => true,
-                    'method' => 'HEAD',
-                ],
-                'socket' => [
-                    'bindto' => '127.0.0.1:0',
-                ],
-                'ssl' => [
-                    'verify_peer' => false,
-                ],
-            ],
-        ]);
-
-        $opts = stream_context_get_options($res['body']);
-        $this->assertEquals('HEAD', $opts['http']['method']);
-        $this->assertTrue($opts['http']['request_fulluri']);
-        $this->assertFalse($opts['ssl']['verify_peer']);
-        $this->assertEquals('127.0.0.1:0', $opts['socket']['bindto']);
-    }
-
-    public function testEnsuresThatStreamContextIsAnArray()
-    {
-        $res = $this->getSendResult(['stream_context' => 'foo']);
-        $this->assertContains(
-            'stream_context must be an array',
-            (string) $res['error']
-        );
-    }
-
-    public function testDoesNotAddContentTypeByDefault()
-    {
-        $this->queueRes();
-        $handler = new StreamHandler();
-        $handler([
-            'http_method' => 'PUT',
-            'uri' => '/',
-            'headers' => ['host' => [Server::$host], 'content-length' => [3]],
-            'body' => 'foo',
-        ]);
-        $req = Server::received()[0];
-        $this->assertEquals('', Core::header($req, 'Content-Type'));
-        $this->assertEquals(3, Core::header($req, 'Content-Length'));
-    }
-
-    private function queueRes()
-    {
-        Server::flush();
-        Server::enqueue([
-            [
-                'status' => 200,
-                'reason' => 'OK',
-                'headers' => [
-                    'Foo' => ['Bar'],
-                    'Content-Length' => [8],
-                ],
-                'body' => 'hi there',
-            ],
-        ]);
-    }
-
-    public function testSupports100Continue()
-    {
-        Server::flush();
-        Server::enqueue([
-            [
-                'status' => '200',
-                'reason' => 'OK',
-                'headers' => [
-                    'Test' => ['Hello'],
-                    'Content-Length' => ['4'],
-                ],
-                'body' => 'test',
-            ],
-        ]);
-
-        $request = [
-            'http_method' => 'PUT',
-            'headers'     => [
-                'Host'   => [Server::$host],
-                'Expect' => ['100-Continue'],
-            ],
-            'body'        => 'test',
-        ];
-
-        $handler = new StreamHandler();
-        $response = $handler($request);
-        $this->assertEquals(200, $response['status']);
-        $this->assertEquals('OK', $response['reason']);
-        $this->assertEquals(['Hello'], $response['headers']['Test']);
-        $this->assertEquals(['4'], $response['headers']['Content-Length']);
-        $this->assertEquals('test', Core::body($response));
-    }
-}
diff --git a/core/vendor/guzzlehttp/ringphp/tests/Client/server.js b/core/vendor/guzzlehttp/ringphp/tests/Client/server.js
deleted file mode 100644
index 6a03e33ab..000000000
--- a/core/vendor/guzzlehttp/ringphp/tests/Client/server.js
+++ /dev/null
@@ -1,241 +0,0 @@
-/**
- * Guzzle node.js test server to return queued responses to HTTP requests and
- * expose a RESTful API for enqueueing responses and retrieving the requests
- * that have been received.
- *
- * - Delete all requests that have been received:
- *      > DELETE /guzzle-server/requests
- *      > Host: 127.0.0.1:8125
- *
- *  - Enqueue responses
- *      > PUT /guzzle-server/responses
- *      > Host: 127.0.0.1:8125
- *      >
- *      > [{'status': 200, 'reason': 'OK', 'headers': {}, 'body': '' }]
- *
- *  - Get the received requests
- *      > GET /guzzle-server/requests
- *      > Host: 127.0.0.1:8125
- *
- *      < HTTP/1.1 200 OK
- *      <
- *      < [{'http_method': 'GET', 'uri': '/', 'headers': {}, 'body': 'string'}]
- *
- *  - Attempt access to the secure area
- *      > GET /secure/by-digest/qop-auth/guzzle-server/requests
- *      > Host: 127.0.0.1:8125
- *
- *      < HTTP/1.1 401 Unauthorized
- *      < WWW-Authenticate: Digest realm="Digest Test", qop="auth", nonce="0796e98e1aeef43141fab2a66bf4521a", algorithm="MD5", stale="false"
- *      <
- *      < 401 Unauthorized
- *
- *  - Shutdown the server
- *      > DELETE /guzzle-server
- *      > Host: 127.0.0.1:8125
- *
- * @package Guzzle PHP <http://www.guzzlephp.org>
- * @license See the LICENSE file that was distributed with this source code.
- */
-
-var http = require('http');
-var url = require('url');
-
-/**
- * Guzzle node.js server
- * @class
- */
-var GuzzleServer = function(port, log) {
-
-    this.port = port;
-    this.log = log;
-    this.responses = [];
-    this.requests = [];
-    var that = this;
-
-    var md5 = function(input) {
-        var crypto = require('crypto');
-        var hasher = crypto.createHash('md5');
-        hasher.update(input);
-        return hasher.digest('hex');
-    }
-
-    /**
-     * Node.js HTTP server authentication module.
-     *
-     * It is only initialized on demand (by loadAuthentifier). This avoids
-     * requiring the dependency to http-auth on standard operations, and the
-     * performance hit at startup.
-     */
-    var auth;
-
-    /**
-     * Provides authentication handlers (Basic, Digest).
-     */
-    var loadAuthentifier = function(type, options) {
-        var typeId = type;
-        if (type == 'digest') {
-            typeId += '.'+(options && options.qop ? options.qop : 'none');
-        }
-        if (!loadAuthentifier[typeId]) {
-            if (!auth) {
-                try {
-                    auth = require('http-auth');
-                } catch (e) {
-                    if (e.code == 'MODULE_NOT_FOUND') {
-                        return;
-                    }
-                }
-            }
-            switch (type) {
-                case 'digest':
-                    var digestParams = {
-                        realm: 'Digest Test',
-                        login: 'me',
-                        password: 'test'
-                    };
-                    if (options && options.qop) {
-                        digestParams.qop = options.qop;
-                    }
-                    loadAuthentifier[typeId] = auth.digest(digestParams, function(username, callback) {
-                        callback(md5(digestParams.login + ':' + digestParams.realm + ':' + digestParams.password));
-                    });
-                    break
-            }
-        }
-        return loadAuthentifier[typeId];
-    };
-
-    var firewallRequest = function(request, req, res, requestHandlerCallback) {
-        var securedAreaUriParts = request.uri.match(/^\/secure\/by-(digest)(\/qop-([^\/]*))?(\/.*)$/);
-        if (securedAreaUriParts) {
-            var authentifier = loadAuthentifier(securedAreaUriParts[1], { qop: securedAreaUriParts[2] });
-            if (!authentifier) {
-                res.writeHead(501, 'HTTP authentication not implemented', { 'Content-Length': 0 });
-                res.end();
-                return;
-            }
-            authentifier.check(req, res, function(req, res) {
-                req.url = securedAreaUriParts[4];
-                requestHandlerCallback(request, req, res);
-            });
-        } else {
-            requestHandlerCallback(request, req, res);
-        }
-    };
-
-    var controlRequest = function(request, req, res) {
-        if (req.url == '/guzzle-server/perf') {
-            res.writeHead(200, 'OK', {'Content-Length': 16});
-            res.end('Body of response');
-        } else if (req.method == 'DELETE') {
-            if (req.url == '/guzzle-server/requests') {
-                // Clear the received requests
-                that.requests = [];
-                res.writeHead(200, 'OK', { 'Content-Length': 0 });
-                res.end();
-                if (that.log) {
-                    console.log('Flushing requests');
-                }
-            } else if (req.url == '/guzzle-server') {
-                // Shutdown the server
-                res.writeHead(200, 'OK', { 'Content-Length': 0, 'Connection': 'close' });
-                res.end();
-                if (that.log) {
-                    console.log('Shutting down');
-                }
-                that.server.close();
-            }
-        } else if (req.method == 'GET') {
-            if (req.url === '/guzzle-server/requests') {
-                if (that.log) {
-                    console.log('Sending received requests');
-                }
-                // Get received requests
-                var body = JSON.stringify(that.requests);
-                res.writeHead(200, 'OK', { 'Content-Length': body.length });
-                res.end(body);
-            }
-        } else if (req.method == 'PUT' && req.url == '/guzzle-server/responses') {
-            if (that.log) {
-                console.log('Adding responses...');
-            }
-            if (!request.body) {
-                if (that.log) {
-                    console.log('No response data was provided');
-                }
-                res.writeHead(400, 'NO RESPONSES IN REQUEST', { 'Content-Length': 0 });
-            } else {
-                that.responses = eval('(' + request.body + ')');
-                for (var i = 0; i < that.responses.length; i++) {
-                    if (that.responses[i].body) {
-                        that.responses[i].body = new Buffer(that.responses[i].body, 'base64');
-                    }
-                }
-                if (that.log) {
-                    console.log(that.responses);
-                }
-                res.writeHead(200, 'OK', { 'Content-Length': 0 });
-            }
-            res.end();
-        }
-    };
-
-    var receivedRequest = function(request, req, res) {
-        if (req.url.indexOf('/guzzle-server') === 0) {
-            controlRequest(request, req, res);
-        } else if (req.url.indexOf('/guzzle-server') == -1 && !that.responses.length) {
-            res.writeHead(500);
-            res.end('No responses in queue');
-        } else {
-            if (that.log) {
-                console.log('Returning response from queue and adding request');
-            }
-            that.requests.push(request);
-            var response = that.responses.shift();
-            res.writeHead(response.status, response.reason, response.headers);
-            res.end(response.body);
-        }
-    };
-
-    this.start = function() {
-
-        that.server = http.createServer(function(req, res) {
-
-            var parts = url.parse(req.url, false);
-            var request = {
-                http_method: req.method,
-                scheme: parts.scheme,
-                uri: parts.pathname,
-                query_string: parts.query,
-                headers: req.headers,
-                version: req.httpVersion,
-                body: ''
-            };
-
-            // Receive each chunk of the request body
-            req.addListener('data', function(chunk) {
-                request.body += chunk;
-            });
-
-            // Called when the request completes
-            req.addListener('end', function() {
-                firewallRequest(request, req, res, receivedRequest);
-            });
-        });
-
-        that.server.listen(this.port, '127.0.0.1');
-
-        if (this.log) {
-            console.log('Server running at http://127.0.0.1:8125/');
-        }
-    };
-};
-
-// Get the port from the arguments
-port = process.argv.length >= 3 ? process.argv[2] : 8125;
-log = process.argv.length >= 4 ? process.argv[3] : false;
-
-// Start the server
-server = new GuzzleServer(port, log);
-server.start();
diff --git a/core/vendor/guzzlehttp/ringphp/tests/CoreTest.php b/core/vendor/guzzlehttp/ringphp/tests/CoreTest.php
deleted file mode 100644
index 49522f26b..000000000
--- a/core/vendor/guzzlehttp/ringphp/tests/CoreTest.php
+++ /dev/null
@@ -1,336 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests\Ring;
-
-use GuzzleHttp\Ring\Core;
-use GuzzleHttp\Ring\Future\CompletedFutureArray;
-use GuzzleHttp\Ring\Future\FutureArray;
-use GuzzleHttp\Stream\Stream;
-use React\Promise\Deferred;
-
-class CoreTest extends \PHPUnit_Framework_TestCase
-{
-    public function testReturnsNullNoHeadersAreSet()
-    {
-        $this->assertNull(Core::header([], 'Foo'));
-        $this->assertNull(Core::firstHeader([], 'Foo'));
-    }
-
-    public function testChecksIfHasHeader()
-    {
-        $message = [
-            'headers' => [
-                'Foo' => ['Bar', 'Baz'],
-                'foo' => ['hello'],
-                'bar' => ['1']
-            ]
-        ];
-        $this->assertTrue(Core::hasHeader($message, 'Foo'));
-        $this->assertTrue(Core::hasHeader($message, 'foo'));
-        $this->assertTrue(Core::hasHeader($message, 'FoO'));
-        $this->assertTrue(Core::hasHeader($message, 'bar'));
-        $this->assertFalse(Core::hasHeader($message, 'barr'));
-    }
-
-    public function testReturnsFirstHeaderWhenSimple()
-    {
-        $this->assertEquals('Bar', Core::firstHeader([
-            'headers' => ['Foo' => ['Bar', 'Baz']],
-        ], 'Foo'));
-    }
-
-    public function testReturnsFirstHeaderWhenMultiplePerLine()
-    {
-        $this->assertEquals('Bar', Core::firstHeader([
-            'headers' => ['Foo' => ['Bar, Baz']],
-        ], 'Foo'));
-    }
-
-    public function testExtractsCaseInsensitiveHeader()
-    {
-        $this->assertEquals(
-            'hello',
-            Core::header(['headers' => ['foo' => ['hello']]], 'FoO')
-        );
-    }
-
-    public function testExtractsCaseInsensitiveHeaderLines()
-    {
-        $this->assertEquals(
-            ['a', 'b', 'c', 'd'],
-            Core::headerLines([
-                'headers' => [
-                    'foo' => ['a', 'b'],
-                    'Foo' => ['c', 'd']
-                ]
-            ], 'foo')
-        );
-    }
-
-    public function testExtractsHeaderLines()
-    {
-        $this->assertEquals(
-            ['bar', 'baz'],
-            Core::headerLines([
-                'headers' => [
-                    'Foo' => ['bar', 'baz'],
-                ],
-            ], 'Foo')
-        );
-    }
-
-    public function testExtractsHeaderAsString()
-    {
-        $this->assertEquals(
-            'bar, baz',
-            Core::header([
-                'headers' => [
-                    'Foo' => ['bar', 'baz'],
-                ],
-            ], 'Foo', true)
-        );
-    }
-
-    public function testReturnsNullWhenHeaderNotFound()
-    {
-        $this->assertNull(Core::header(['headers' => []], 'Foo'));
-    }
-
-    public function testRemovesHeaders()
-    {
-        $message = [
-            'headers' => [
-                'foo' => ['bar'],
-                'Foo' => ['bam'],
-                'baz' => ['123'],
-            ],
-        ];
-
-        $this->assertSame($message, Core::removeHeader($message, 'bam'));
-        $this->assertEquals([
-            'headers' => ['baz' => ['123']],
-        ], Core::removeHeader($message, 'foo'));
-    }
-
-    public function testCreatesUrl()
-    {
-        $req = [
-            'scheme'  => 'http',
-            'headers' => ['host' => ['foo.com']],
-            'uri'     => '/',
-        ];
-
-        $this->assertEquals('http://foo.com/', Core::url($req));
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage No Host header was provided
-     */
-    public function testEnsuresHostIsAvailableWhenCreatingUrls()
-    {
-        Core::url([]);
-    }
-
-    public function testCreatesUrlWithQueryString()
-    {
-        $req = [
-            'scheme'       => 'http',
-            'headers'      => ['host' => ['foo.com']],
-            'uri'          => '/',
-            'query_string' => 'foo=baz',
-        ];
-
-        $this->assertEquals('http://foo.com/?foo=baz', Core::url($req));
-    }
-
-    public function testUsesUrlIfSet()
-    {
-        $req = ['url' => 'http://foo.com'];
-        $this->assertEquals('http://foo.com', Core::url($req));
-    }
-
-    public function testReturnsNullWhenNoBody()
-    {
-        $this->assertNull(Core::body([]));
-    }
-
-    public function testReturnsStreamAsString()
-    {
-        $this->assertEquals(
-            'foo',
-            Core::body(['body' => Stream::factory('foo')])
-        );
-    }
-
-    public function testReturnsString()
-    {
-        $this->assertEquals('foo', Core::body(['body' => 'foo']));
-    }
-
-    public function testReturnsResourceContent()
-    {
-        $r = fopen('php://memory', 'w+');
-        fwrite($r, 'foo');
-        rewind($r);
-        $this->assertEquals('foo', Core::body(['body' => $r]));
-        fclose($r);
-    }
-
-    public function testReturnsIteratorContent()
-    {
-        $a = new \ArrayIterator(['a', 'b', 'cd', '']);
-        $this->assertEquals('abcd', Core::body(['body' => $a]));
-    }
-
-    public function testReturnsObjectToString()
-    {
-        $this->assertEquals('foo', Core::body(['body' => new StrClass]));
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     */
-    public function testEnsuresBodyIsValid()
-    {
-        Core::body(['body' => false]);
-    }
-
-    public function testParsesHeadersFromLines()
-    {
-        $lines = ['Foo: bar', 'Foo: baz', 'Abc: 123', 'Def: a, b'];
-        $this->assertEquals([
-            'Foo' => ['bar', 'baz'],
-            'Abc' => ['123'],
-            'Def' => ['a, b'],
-        ], Core::headersFromLines($lines));
-    }
-
-    public function testParsesHeadersFromLinesWithMultipleLines()
-    {
-        $lines = ['Foo: bar', 'Foo: baz', 'Foo: 123'];
-        $this->assertEquals([
-            'Foo' => ['bar', 'baz', '123'],
-        ], Core::headersFromLines($lines));
-    }
-
-    public function testCreatesArrayCallFunctions()
-    {
-        $called = [];
-        $a = function ($a, $b) use (&$called) {
-            $called['a'] = func_get_args();
-        };
-        $b = function ($a, $b) use (&$called) {
-            $called['b'] = func_get_args();
-        };
-        $c = Core::callArray([$a, $b]);
-        $c(1, 2);
-        $this->assertEquals([1, 2], $called['a']);
-        $this->assertEquals([1, 2], $called['b']);
-    }
-
-    public function testRewindsGuzzleStreams()
-    {
-        $str = Stream::factory('foo');
-        $this->assertTrue(Core::rewindBody(['body' => $str]));
-    }
-
-    public function testRewindsStreams()
-    {
-        $str = Stream::factory('foo')->detach();
-        $this->assertTrue(Core::rewindBody(['body' => $str]));
-    }
-
-    public function testRewindsIterators()
-    {
-        $iter = new \ArrayIterator(['foo']);
-        $this->assertTrue(Core::rewindBody(['body' => $iter]));
-    }
-
-    public function testRewindsStrings()
-    {
-        $this->assertTrue(Core::rewindBody(['body' => 'hi']));
-    }
-
-    public function testRewindsToStrings()
-    {
-        $this->assertTrue(Core::rewindBody(['body' => new StrClass()]));
-    }
-
-    public function typeProvider()
-    {
-        return [
-            ['foo', 'string(3) "foo"'],
-            [true, 'bool(true)'],
-            [false, 'bool(false)'],
-            [10, 'int(10)'],
-            [1.0, 'float(1)'],
-            [new StrClass(), 'object(GuzzleHttp\Tests\Ring\StrClass)'],
-            [['foo'], 'array(1)']
-        ];
-    }
-
-    /**
-     * @dataProvider typeProvider
-     */
-    public function testDescribesType($input, $output)
-    {
-        $this->assertEquals($output, Core::describeType($input));
-    }
-
-    public function testDoesSleep()
-    {
-        $t = microtime(true);
-        $expected = $t + (100 / 1000);
-        Core::doSleep(['client' => ['delay' => 100]]);
-        $this->assertGreaterThanOrEqual($expected, microtime(true));
-    }
-
-    public function testProxiesFuture()
-    {
-        $f = new CompletedFutureArray(['status' => 200]);
-        $res = null;
-        $proxied = Core::proxy($f, function ($value) use (&$res) {
-            $value['foo'] = 'bar';
-            $res = $value;
-            return $value;
-        });
-        $this->assertNotSame($f, $proxied);
-        $this->assertEquals(200, $f->wait()['status']);
-        $this->assertArrayNotHasKey('foo', $f->wait());
-        $this->assertEquals('bar', $proxied->wait()['foo']);
-        $this->assertEquals(200, $proxied->wait()['status']);
-    }
-
-    public function testProxiesDeferredFuture()
-    {
-        $d = new Deferred();
-        $f = new FutureArray($d->promise());
-        $f2 = Core::proxy($f);
-        $d->resolve(['foo' => 'bar']);
-        $this->assertEquals('bar', $f['foo']);
-        $this->assertEquals('bar', $f2['foo']);
-    }
-
-    public function testProxiesDeferredFutureFailure()
-    {
-        $d = new Deferred();
-        $f = new FutureArray($d->promise());
-        $f2 = Core::proxy($f);
-        $d->reject(new \Exception('foo'));
-        try {
-            $f2['hello?'];
-            $this->fail('did not throw');
-        } catch (\Exception $e) {
-            $this->assertEquals('foo', $e->getMessage());
-        }
-
-    }
-}
-
-final class StrClass
-{
-    public function __toString()
-    {
-        return 'foo';
-    }
-}
diff --git a/core/vendor/guzzlehttp/ringphp/tests/Future/CompletedFutureArrayTest.php b/core/vendor/guzzlehttp/ringphp/tests/Future/CompletedFutureArrayTest.php
deleted file mode 100644
index 82d7efbf5..000000000
--- a/core/vendor/guzzlehttp/ringphp/tests/Future/CompletedFutureArrayTest.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests\Ring\Future;
-
-use GuzzleHttp\Ring\Future\CompletedFutureArray;
-
-class CompletedFutureArrayTest extends \PHPUnit_Framework_TestCase
-{
-    public function testReturnsAsArray()
-    {
-        $f = new CompletedFutureArray(['foo' => 'bar']);
-        $this->assertEquals('bar', $f['foo']);
-        $this->assertFalse(isset($f['baz']));
-        $f['abc'] = '123';
-        $this->assertTrue(isset($f['abc']));
-        $this->assertEquals(['foo' => 'bar', 'abc' => '123'], iterator_to_array($f));
-        $this->assertEquals(2, count($f));
-        unset($f['abc']);
-        $this->assertEquals(1, count($f));
-        $this->assertEquals(['foo' => 'bar'], iterator_to_array($f));
-    }
-}
diff --git a/core/vendor/guzzlehttp/ringphp/tests/Future/CompletedFutureValueTest.php b/core/vendor/guzzlehttp/ringphp/tests/Future/CompletedFutureValueTest.php
deleted file mode 100644
index 6ded40dfb..000000000
--- a/core/vendor/guzzlehttp/ringphp/tests/Future/CompletedFutureValueTest.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests\Ring\Future;
-
-use GuzzleHttp\Ring\Exception\CancelledFutureAccessException;
-use GuzzleHttp\Ring\Future\CompletedFutureValue;
-
-class CompletedFutureValueTest extends \PHPUnit_Framework_TestCase
-{
-    public function testReturnsValue()
-    {
-        $f = new CompletedFutureValue('hi');
-        $this->assertEquals('hi', $f->wait());
-        $f->cancel();
-
-        $a = null;
-        $f->then(function ($v) use (&$a) {
-            $a = $v;
-        });
-        $this->assertSame('hi', $a);
-    }
-
-    public function testThrows()
-    {
-        $ex = new \Exception('foo');
-        $f = new CompletedFutureValue(null, $ex);
-        $f->cancel();
-        try {
-            $f->wait();
-            $this->fail('did not throw');
-        } catch (\Exception $e) {
-            $this->assertSame($e, $ex);
-        }
-    }
-
-    public function testMarksAsCancelled()
-    {
-        $ex = new CancelledFutureAccessException();
-        $f = new CompletedFutureValue(null, $ex);
-        try {
-            $f->wait();
-            $this->fail('did not throw');
-        } catch (\Exception $e) {
-            $this->assertSame($e, $ex);
-        }
-    }
-}
diff --git a/core/vendor/guzzlehttp/ringphp/tests/Future/FutureArrayTest.php b/core/vendor/guzzlehttp/ringphp/tests/Future/FutureArrayTest.php
deleted file mode 100644
index 0e09f5afa..000000000
--- a/core/vendor/guzzlehttp/ringphp/tests/Future/FutureArrayTest.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests\Ring\Future;
-
-use GuzzleHttp\Ring\Future\FutureArray;
-use React\Promise\Deferred;
-
-class FutureArrayTest extends \PHPUnit_Framework_TestCase
-{
-    public function testLazilyCallsDeref()
-    {
-        $c = false;
-        $deferred = new Deferred();
-        $f = new FutureArray(
-            $deferred->promise(),
-            function () use (&$c, $deferred) {
-                $c = true;
-                $deferred->resolve(['status' => 200]);
-            }
-        );
-        $this->assertFalse($c);
-        $this->assertFalse($this->readAttribute($f, 'isRealized'));
-        $this->assertEquals(200, $f['status']);
-        $this->assertTrue($c);
-    }
-
-    public function testActsLikeArray()
-    {
-        $deferred = new Deferred();
-        $f = new FutureArray(
-            $deferred->promise(),
-            function () use (&$c, $deferred) {
-                $deferred->resolve(['status' => 200]);
-            }
-        );
-
-        $this->assertTrue(isset($f['status']));
-        $this->assertEquals(200, $f['status']);
-        $this->assertEquals(['status' => 200], $f->wait());
-        $this->assertEquals(1, count($f));
-        $f['baz'] = 10;
-        $this->assertEquals(10, $f['baz']);
-        unset($f['baz']);
-        $this->assertFalse(isset($f['baz']));
-        $this->assertEquals(['status' => 200], iterator_to_array($f));
-    }
-
-    /**
-     * @expectedException \RuntimeException
-     */
-    public function testThrowsWhenAccessingInvalidProperty()
-    {
-        $deferred = new Deferred();
-        $f = new FutureArray($deferred->promise(), function () {});
-        $f->foo;
-    }
-}
diff --git a/core/vendor/guzzlehttp/ringphp/tests/Future/FutureValueTest.php b/core/vendor/guzzlehttp/ringphp/tests/Future/FutureValueTest.php
deleted file mode 100644
index d59c543d0..000000000
--- a/core/vendor/guzzlehttp/ringphp/tests/Future/FutureValueTest.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests\Ring\Future;
-
-use GuzzleHttp\Ring\Exception\CancelledFutureAccessException;
-use GuzzleHttp\Ring\Future\FutureValue;
-use React\Promise\Deferred;
-
-class FutureValueTest extends \PHPUnit_Framework_TestCase
-{
-    public function testDerefReturnsValue()
-    {
-        $called = 0;
-        $deferred = new Deferred();
-
-        $f = new FutureValue(
-            $deferred->promise(),
-            function () use ($deferred, &$called) {
-                $called++;
-                $deferred->resolve('foo');
-            }
-        );
-
-        $this->assertEquals('foo', $f->wait());
-        $this->assertEquals(1, $called);
-        $this->assertEquals('foo', $f->wait());
-        $this->assertEquals(1, $called);
-        $f->cancel();
-        $this->assertTrue($this->readAttribute($f, 'isRealized'));
-    }
-
-    /**
-     * @expectedException \GuzzleHttp\Ring\Exception\CancelledFutureAccessException
-     */
-    public function testThrowsWhenAccessingCancelled()
-    {
-        $f = new FutureValue(
-            (new Deferred())->promise(),
-            function () {},
-            function () { return true; }
-        );
-        $f->cancel();
-        $f->wait();
-    }
-
-    /**
-     * @expectedException \OutOfBoundsException
-     */
-    public function testThrowsWhenDerefFailure()
-    {
-        $called = false;
-        $deferred = new Deferred();
-        $f = new FutureValue(
-            $deferred->promise(),
-            function () use(&$called) {
-                $called = true;
-            }
-        );
-        $deferred->reject(new \OutOfBoundsException());
-        $f->wait();
-        $this->assertFalse($called);
-    }
-
-    /**
-     * @expectedException \GuzzleHttp\Ring\Exception\RingException
-     * @expectedExceptionMessage Waiting did not resolve future
-     */
-    public function testThrowsWhenDerefDoesNotResolve()
-    {
-        $deferred = new Deferred();
-        $f = new FutureValue(
-            $deferred->promise(),
-            function () use(&$called) {
-                $called = true;
-            }
-        );
-        $f->wait();
-    }
-
-    public function testThrowingCancelledFutureAccessExceptionCancels()
-    {
-        $deferred = new Deferred();
-        $f = new FutureValue(
-            $deferred->promise(),
-            function () use ($deferred) {
-                throw new CancelledFutureAccessException();
-            }
-        );
-        try {
-            $f->wait();
-            $this->fail('did not throw');
-        } catch (CancelledFutureAccessException $e) {}
-    }
-
-    /**
-     * @expectedException \Exception
-     * @expectedExceptionMessage foo
-     */
-    public function testThrowingExceptionInDerefMarksAsFailed()
-    {
-        $deferred = new Deferred();
-        $f = new FutureValue(
-            $deferred->promise(),
-            function () {
-                throw new \Exception('foo');
-            }
-        );
-        $f->wait();
-    }
-}
diff --git a/core/vendor/guzzlehttp/ringphp/tests/bootstrap.php b/core/vendor/guzzlehttp/ringphp/tests/bootstrap.php
deleted file mode 100644
index 017610fe0..000000000
--- a/core/vendor/guzzlehttp/ringphp/tests/bootstrap.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-require __DIR__ . '/../vendor/autoload.php';
-require __DIR__ . '/Client/Server.php';
-
-use GuzzleHttp\Tests\Ring\Client\Server;
-
-Server::start();
-
-register_shutdown_function(function () {
-    Server::stop();
-});
diff --git a/core/vendor/guzzlehttp/streams/.travis.yml b/core/vendor/guzzlehttp/streams/.travis.yml
deleted file mode 100644
index a6f8a87b7..000000000
--- a/core/vendor/guzzlehttp/streams/.travis.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-language: php
-
-php:
-  - 5.4
-  - 5.5
-  - 5.6
-  - hhvm
-
-before_script:
-  - composer self-update
-  - composer install --no-interaction --prefer-source --dev
-
-script: vendor/bin/phpunit
-
-matrix:
-  allow_failures:
-    - php: hhvm
diff --git a/core/vendor/guzzlehttp/streams/CHANGELOG.rst b/core/vendor/guzzlehttp/streams/CHANGELOG.rst
deleted file mode 100644
index 0018ffe35..000000000
--- a/core/vendor/guzzlehttp/streams/CHANGELOG.rst
+++ /dev/null
@@ -1,94 +0,0 @@
-=========
-Changelog
-=========
-
-3.0.0 (2014-10-12)
-------------------
-
-* Now supports creating streams from functions and iterators.
-* Supports creating buffered streams and asynchronous streams.
-* Removed ``functions.php``. Use the corresponding functions provided by
-  ``GuzzleHttp\Streams\Utils`` instead.
-* Moved ``GuzzleHttp\Stream\MetadataStreamInterface::getMetadata`` to
-  ``GuzzleHttp\Stream\StreamInterface``. MetadataStreamInterface is no longer
-  used and is marked as deprecated.
-* Added ``attach()`` to ``GuzzleHttp\Stream\StreamInterface`` for PSR-7
-  compatibility.
-* Removed ``flush()`` from StreamInterface.
-* Removed the ``$maxLength`` parameter from
-  ``GuzzleHttp\Stream\StreamInterface::getContents()``. This function now
-  returns the entire remainder of the stream. If you want to limit the maximum
-  amount of data read from the stream, use the
-  ``GuzzleHttp\Stream\Utils::copyToString()`` function.
-* Streams that return an empty string, ``''``, are no longer considered a
-  failure. You MUST return ``false`` to mark the read as a failure, and ensure
-  that any decorators you create properly return ``true`` in response to the
-  ``eof()`` method when the stream is consumed.
-* ``GuzzleHttp\Stream\Stream::__construct``,
-  ``GuzzleHttp\Stream\Stream::factory``, and
-  ``GuzzleHttp\Stream\Utils::create`` no longer accept a size in the second
-  argument. They now accept an associative array of options, including the
-  "size" key and "metadata" key which can be used to provide custom metadata.
-* Added ``GuzzleHttp\Stream\BufferStream`` to add support for buffering data,
-  and when read, shifting data off of the buffer.
-* Added ``GuzzleHttp\Stream\NullBuffer`` which can be used as a buffer that
-  does not actually store any data.
-* Added ``GuzzleHttp\Stream\AsyncStream`` to provide support for non-blocking
-  streams that can be filled by a remote source (e.g., an event-loop). If a
-  ``drain`` option is provided, the stream can also act as if it is a blocking
-  stream.
-
-2.1.0 (2014-08-17)
-------------------
-
-* Added an InflateStream to inflate gzipped or deflated content.
-* Added ``flush`` to stream wrapper.
-* Added the ability to easily register the GuzzleStreamWrapper if needed.
-
-2.0.0 (2014-08-16)
-------------------
-
-* Deprecated functions.php and moved all of those methods to
-  ``GuzzleHttp\Streams\Utils``. Use ``GuzzleHttp\Stream\Stream::factory()``
-  instead of ``GuzzleHttp\Stream\create()`` to create new streams.
-* Added ``flush()`` to ``StreamInterface``. This method is used to flush any
-  underlying stream write buffers.
-* Added ``FnStream`` to easily decorate stream behavior with callables.
-* ``Utils::hash`` now throws an exception when the stream cannot seek to 0.
-
-1.5.1 (2014-09-10)
-------------------
-
-* Stream metadata is grabbed from the underlying stream each time
-  ``getMetadata`` is called rather than returning a value from a cache.
-* Properly closing all underlying streams when AppendStream is closed.
-* Seek functions no longer throw exceptions.
-* LazyOpenStream now correctly returns the underlying stream resource when
-  detached.
-
-1.5.0 (2014-08-07)
-------------------
-
-* Added ``Stream\safe_open`` to open stream resources and throw exceptions
-  instead of raising errors.
-
-1.4.0 (2014-07-19)
-------------------
-
-* Added a LazyOpenStream
-
-1.3.0 (2014-07-15)
-------------------
-
-* Added an AppendStream to stream over multiple stream one after the other.
-
-1.2.0 (2014-07-15)
-------------------
-
-* Updated the ``detach()`` method to return the underlying stream resource or
-  ``null`` if it does not wrap a resource.
-* Multiple fixes for how streams behave when the underlying resource is
-  detached
-* Do not clear statcache when a stream does not have a 'uri'
-* Added a fix to LimitStream
-* Added a condition to ensure that functions.php can be required multiple times
diff --git a/core/vendor/guzzlehttp/streams/README.rst b/core/vendor/guzzlehttp/streams/README.rst
deleted file mode 100644
index baff63b37..000000000
--- a/core/vendor/guzzlehttp/streams/README.rst
+++ /dev/null
@@ -1,36 +0,0 @@
-==============
-Guzzle Streams
-==============
-
-Provides a simple abstraction over streams of data.
-
-This library is used in `Guzzle 5 <https://github.com/guzzle/guzzle>`_, and is
-(currently) compatible with the WIP PSR-7.
-
-Installation
-============
-
-This package can be installed easily using `Composer <http://getcomposer.org>`_.
-Simply add the following to the composer.json file at the root of your project:
-
-.. code-block:: javascript
-
-    {
-      "require": {
-        "guzzlehttp/streams": "~3.0"
-      }
-    }
-
-Then install your dependencies using ``composer.phar install``.
-
-Documentation
-=============
-
-The documentation for this package can be found on the main Guzzle website at
-http://docs.guzzlephp.org/en/guzzle4/streams.html.
-
-Testing
-=======
-
-This library is tested using PHPUnit. You'll need to install the dependencies
-using `Composer <http://getcomposer.org>`_ then run ``make test``.
diff --git a/core/vendor/guzzlehttp/streams/phpunit.xml.dist b/core/vendor/guzzlehttp/streams/phpunit.xml.dist
deleted file mode 100644
index 6e758c192..000000000
--- a/core/vendor/guzzlehttp/streams/phpunit.xml.dist
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./vendor/autoload.php"
-         colors="true">
-    <testsuites>
-        <testsuite>
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src</directory>
-            <exclude>
-                <file>src/functions.php</file>
-            </exclude>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/core/vendor/guzzlehttp/streams/src/AsyncReadStream.php b/core/vendor/guzzlehttp/streams/src/AsyncReadStream.php
deleted file mode 100644
index 25ad96021..000000000
--- a/core/vendor/guzzlehttp/streams/src/AsyncReadStream.php
+++ /dev/null
@@ -1,207 +0,0 @@
-<?php
-namespace GuzzleHttp\Stream;
-
-/**
- * Represents an asynchronous read-only stream that supports a drain event and
- * pumping data from a source stream.
- *
- * The AsyncReadStream can be used as a completely asynchronous stream, meaning
- * the data you can read from the stream will immediately return only
- * the data that is currently buffered.
- *
- * AsyncReadStream can also be used in a "blocking" manner if a "pump" function
- * is provided. When a caller requests more bytes than are available in the
- * buffer, then the pump function is used to block until the requested number
- * of bytes are available or the remote source stream has errored, closed, or
- * timed-out. This behavior isn't strictly "blocking" because the pump function
- * can send other transfers while waiting on the desired buffer size to be
- * ready for reading (e.g., continue to tick an event loop).
- *
- * @unstable This class is subject to change.
- */
-class AsyncReadStream implements StreamInterface
-{
-    use StreamDecoratorTrait;
-
-    /** @var callable|null Fn used to notify writers the buffer has drained */
-    private $drain;
-
-    /** @var callable|null Fn used to block for more data */
-    private $pump;
-
-    /** @var int|null Highwater mark of the underlying buffer */
-    private $hwm;
-
-    /** @var bool Whether or not drain needs to be called at some point */
-    private $needsDrain;
-
-    /** @var int The expected size of the remote source */
-    private $size;
-
-    /**
-     * In order to utilize high water marks to tell writers to slow down, the
-     * provided stream must answer to the "hwm" stream metadata variable,
-     * providing the high water mark. If no "hwm" metadata value is available,
-     * then the "drain" functionality is not utilized.
-     *
-     * This class accepts an associative array of configuration options.
-     *
-     * - drain: (callable) Function to invoke when the stream has drained,
-     *   meaning the buffer is now writable again because the size of the
-     *   buffer is at an acceptable level (e.g., below the high water mark).
-     *   The function accepts a single argument, the buffer stream object that
-     *   has drained.
-     * - pump: (callable) A function that accepts the number of bytes to read
-     *   from the source stream. This function will block until all of the data
-     *   that was requested has been read, EOF of the source stream, or the
-     *   source stream is closed.
-     * - size: (int) The expected size in bytes of the data that will be read
-     *   (if known up-front).
-     *
-     * @param StreamInterface $buffer   Buffer that contains the data that has
-     *                                  been read by the event loop.
-     * @param array           $config   Associative array of options.
-     *
-     * @throws \InvalidArgumentException if the buffer is not readable and
-     *                                   writable.
-     */
-    public function __construct(
-        StreamInterface $buffer,
-        array $config = []
-    ) {
-        if (!$buffer->isReadable() || !$buffer->isWritable()) {
-            throw new \InvalidArgumentException(
-                'Buffer must be readable and writable'
-            );
-        }
-
-        if (isset($config['size'])) {
-            $this->size = $config['size'];
-        }
-
-        static $callables = ['pump', 'drain'];
-        foreach ($callables as $check) {
-            if (isset($config[$check])) {
-                if (!is_callable($config[$check])) {
-                    throw new \InvalidArgumentException(
-                        $check . ' must be callable'
-                    );
-                }
-                $this->{$check} = $config[$check];
-            }
-        }
-
-        $this->hwm = $buffer->getMetadata('hwm');
-
-        // Cannot drain when there's no high water mark.
-        if ($this->hwm === null) {
-            $this->drain = null;
-        }
-
-        $this->stream = $buffer;
-    }
-
-    /**
-     * Factory method used to create new async stream and an underlying buffer
-     * if no buffer is provided.
-     *
-     * This function accepts the same options as AsyncReadStream::__construct,
-     * but added the following key value pairs:
-     *
-     * - buffer: (StreamInterface) Buffer used to buffer data. If none is
-     *   provided, a default buffer is created.
-     * - hwm: (int) High water mark to use if a buffer is created on your
-     *   behalf.
-     * - max_buffer: (int) If provided, wraps the utilized buffer in a
-     *   DroppingStream decorator to ensure that buffer does not exceed a given
-     *   length. When exceeded, the stream will begin dropping data. Set the
-     *   max_buffer to 0, to use a NullStream which does not store data.
-     * - write: (callable) A function that is invoked when data is written
-     *   to the underlying buffer. The function accepts the buffer as the first
-     *   argument, and the data being written as the second. The function MUST
-     *   return the number of bytes that were written or false to let writers
-     *   know to slow down.
-     * - drain: (callable) See constructor documentation.
-     * - pump: (callable) See constructor documentation.
-     *
-     * @param array $options Associative array of options.
-     *
-     * @return array Returns an array containing the buffer used to buffer
-     *               data, followed by the ready to use AsyncReadStream object.
-     */
-    public static function create(array $options = [])
-    {
-        $maxBuffer = isset($options['max_buffer'])
-            ? $options['max_buffer']
-            : null;
-
-        if ($maxBuffer === 0) {
-            $buffer = new NullStream();
-        } elseif (isset($options['buffer'])) {
-            $buffer = $options['buffer'];
-        } else {
-            $hwm = isset($options['hwm']) ? $options['hwm'] : 16384;
-            $buffer = new BufferStream($hwm);
-        }
-
-        if ($maxBuffer > 0) {
-            $buffer = new DroppingStream($buffer, $options['max_buffer']);
-        }
-
-        // Call the on_write callback if an on_write function was provided.
-        if (isset($options['write'])) {
-            $onWrite = $options['write'];
-            $buffer = FnStream::decorate($buffer, [
-                'write' => function ($string) use ($buffer, $onWrite) {
-                    $result = $buffer->write($string);
-                    $onWrite($buffer, $string);
-                    return $result;
-                }
-            ]);
-        }
-
-        return [$buffer, new self($buffer, $options)];
-    }
-
-    public function getSize()
-    {
-        return $this->size;
-    }
-
-    public function isWritable()
-    {
-        return false;
-    }
-
-    public function write($string)
-    {
-        return false;
-    }
-
-    public function read($length)
-    {
-        if (!$this->needsDrain && $this->drain) {
-            $this->needsDrain = $this->stream->getSize() >= $this->hwm;
-        }
-
-        $result = $this->stream->read($length);
-
-        // If we need to drain, then drain when the buffer is empty.
-        if ($this->needsDrain && $this->stream->getSize() === 0) {
-            $this->needsDrain = false;
-            $drainFn = $this->drain;
-            $drainFn($this->stream);
-        }
-
-        $resultLen = strlen($result);
-
-        // If a pump was provided, the buffer is still open, and not enough
-        // data was given, then block until the data is provided.
-        if ($this->pump && $resultLen < $length) {
-            $pumpFn = $this->pump;
-            $result .= $pumpFn($length - $resultLen);
-        }
-
-        return $result;
-    }
-}
diff --git a/core/vendor/guzzlehttp/streams/src/Exception/CannotAttachException.php b/core/vendor/guzzlehttp/streams/src/Exception/CannotAttachException.php
deleted file mode 100644
index e631b9fa4..000000000
--- a/core/vendor/guzzlehttp/streams/src/Exception/CannotAttachException.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-namespace GuzzleHttp\Stream\Exception;
-
-class CannotAttachException extends \RuntimeException {}
diff --git a/core/vendor/guzzlehttp/streams/src/MetadataStreamInterface.php b/core/vendor/guzzlehttp/streams/src/MetadataStreamInterface.php
deleted file mode 100644
index c1433ad83..000000000
--- a/core/vendor/guzzlehttp/streams/src/MetadataStreamInterface.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-namespace GuzzleHttp\Stream;
-
-/**
- * This interface is deprecated and should no longer be used. Just use
- * StreamInterface now that the getMetadata method has been added to
- * StreamInterface.
- *
- * @deprecated
- */
-interface MetadataStreamInterface extends StreamInterface {}
diff --git a/core/vendor/guzzlehttp/streams/src/NullStream.php b/core/vendor/guzzlehttp/streams/src/NullStream.php
deleted file mode 100644
index 41ee77668..000000000
--- a/core/vendor/guzzlehttp/streams/src/NullStream.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-namespace GuzzleHttp\Stream;
-use GuzzleHttp\Stream\Exception\CannotAttachException;
-
-/**
- * Does not store any data written to it.
- */
-class NullStream implements StreamInterface
-{
-    public function __toString()
-    {
-        return '';
-    }
-
-    public function getContents()
-    {
-        return '';
-    }
-
-    public function close() {}
-
-    public function detach() {}
-
-    public function attach($stream)
-    {
-        throw new CannotAttachException();
-    }
-
-    public function getSize()
-    {
-        return 0;
-    }
-
-    public function isReadable()
-    {
-        return true;
-    }
-
-    public function isWritable()
-    {
-        return true;
-    }
-
-    public function isSeekable()
-    {
-        return true;
-    }
-
-    public function eof()
-    {
-        return true;
-    }
-
-    public function tell()
-    {
-        return 0;
-    }
-
-    public function seek($offset, $whence = SEEK_SET)
-    {
-        return false;
-    }
-
-    public function read($length)
-    {
-        return false;
-    }
-
-    public function write($string)
-    {
-        return strlen($string);
-    }
-
-    public function getMetadata($key = null)
-    {
-        return $key ? null : [];
-    }
-}
diff --git a/core/vendor/guzzlehttp/streams/src/StreamInterface.php b/core/vendor/guzzlehttp/streams/src/StreamInterface.php
deleted file mode 100644
index fd19c6f25..000000000
--- a/core/vendor/guzzlehttp/streams/src/StreamInterface.php
+++ /dev/null
@@ -1,159 +0,0 @@
-<?php
-namespace GuzzleHttp\Stream;
-
-/**
- * Describes a stream instance.
- */
-interface StreamInterface
-{
-    /**
-     * Attempts to seek to the beginning of the stream and reads all data into
-     * a string until the end of the stream is reached.
-     *
-     * Warning: This could attempt to load a large amount of data into memory.
-     *
-     * @return string
-     */
-    public function __toString();
-
-    /**
-     * Closes the stream and any underlying resources.
-     */
-    public function close();
-
-    /**
-     * Separates any underlying resources from the stream.
-     *
-     * After the underlying resource has been detached, the stream object is in
-     * an unusable state. If you wish to use a Stream object as a PHP stream
-     * but keep the Stream object in a consistent state, use
-     * {@see GuzzleHttp\Stream\GuzzleStreamWrapper::getResource}.
-     *
-     * @return resource|null Returns the underlying PHP stream resource or null
-     *                       if the Stream object did not utilize an underlying
-     *                       stream resource.
-     */
-    public function detach();
-
-    /**
-     * Replaces the underlying stream resource with the provided stream.
-     *
-     * Use this method to replace the underlying stream with another; as an
-     * example, in server-side code, if you decide to return a file, you
-     * would replace the original content-oriented stream with the file
-     * stream.
-     *
-     * Any internal state such as caching of cursor position should be reset
-     * when attach() is called, as the stream has changed.
-     *
-     * @param resource $stream
-     *
-     * @return void
-     */
-    public function attach($stream);
-
-    /**
-     * Get the size of the stream if known
-     *
-     * @return int|null Returns the size in bytes if known, or null if unknown
-     */
-    public function getSize();
-
-    /**
-     * Returns the current position of the file read/write pointer
-     *
-     * @return int|bool Returns the position of the file pointer or false on error
-     */
-    public function tell();
-
-    /**
-     * Returns true if the stream is at the end of the stream.
-     *
-     * @return bool
-     */
-    public function eof();
-
-    /**
-     * Returns whether or not the stream is seekable
-     *
-     * @return bool
-     */
-    public function isSeekable();
-
-    /**
-     * Seek to a position in the stream
-     *
-     * @param int $offset Stream offset
-     * @param int $whence Specifies how the cursor position will be calculated
-     *                    based on the seek offset. Valid values are identical
-     *                    to the built-in PHP $whence values for `fseek()`.
-     *                    SEEK_SET: Set position equal to offset bytes
-     *                    SEEK_CUR: Set position to current location plus offset
-     *                    SEEK_END: Set position to end-of-stream plus offset
-     *
-     * @return bool Returns true on success or false on failure
-     * @link   http://www.php.net/manual/en/function.fseek.php
-     */
-    public function seek($offset, $whence = SEEK_SET);
-
-    /**
-     * Returns whether or not the stream is writable
-     *
-     * @return bool
-     */
-    public function isWritable();
-
-    /**
-     * Write data to the stream
-     *
-     * @param string $string The string that is to be written.
-     *
-     * @return int|bool Returns the number of bytes written to the stream on
-     *                  success returns false on failure (e.g., broken pipe,
-     *                  writer needs to slow down, buffer is full, etc.)
-     */
-    public function write($string);
-
-    /**
-     * Returns whether or not the stream is readable
-     *
-     * @return bool
-     */
-    public function isReadable();
-
-    /**
-     * Read data from the stream
-     *
-     * @param int $length Read up to $length bytes from the object and return
-     *                    them. Fewer than $length bytes may be returned if
-     *                    underlying stream call returns fewer bytes.
-     *
-     * @return string     Returns the data read from the stream.
-     */
-    public function read($length);
-
-    /**
-     * Returns the remaining contents of the stream as a string.
-     *
-     * Note: this could potentially load a large amount of data into memory.
-     *
-     * @return string
-     */
-    public function getContents();
-
-    /**
-     * Get stream metadata as an associative array or retrieve a specific key.
-     *
-     * The keys returned are identical to the keys returned from PHP's
-     * stream_get_meta_data() function.
-     *
-     * @param string $key Specific metadata to retrieve.
-     *
-     * @return array|mixed|null Returns an associative array if no key is
-     *                          no key is provided. Returns a specific key
-     *                          value if a key is provided and the value is
-     *                          found, or null if the key is not found.
-     * @see http://php.net/manual/en/function.stream-get-meta-data.php
-     */
-    public function getMetadata($key = null);
-}
diff --git a/core/vendor/guzzlehttp/streams/src/Utils.php b/core/vendor/guzzlehttp/streams/src/Utils.php
deleted file mode 100644
index 94cb42d31..000000000
--- a/core/vendor/guzzlehttp/streams/src/Utils.php
+++ /dev/null
@@ -1,196 +0,0 @@
-<?php
-namespace GuzzleHttp\Stream;
-
-use GuzzleHttp\Stream\Exception\SeekException;
-
-/**
- * Static utility class because PHP's autoloaders don't support the concept
- * of namespaced function autoloading.
- */
-class Utils
-{
-    /**
-     * Safely opens a PHP stream resource using a filename.
-     *
-     * When fopen fails, PHP normally raises a warning. This function adds an
-     * error handler that checks for errors and throws an exception instead.
-     *
-     * @param string $filename File to open
-     * @param string $mode     Mode used to open the file
-     *
-     * @return resource
-     * @throws \RuntimeException if the file cannot be opened
-     */
-    public static function open($filename, $mode)
-    {
-        $ex = null;
-        set_error_handler(function () use ($filename, $mode, &$ex) {
-            $ex = new \RuntimeException(sprintf(
-                'Unable to open %s using mode %s: %s',
-                $filename,
-                $mode,
-                func_get_args()[1]
-            ));
-        });
-
-        $handle = fopen($filename, $mode);
-        restore_error_handler();
-
-        if ($ex) {
-            /** @var $ex \RuntimeException */
-            throw $ex;
-        }
-
-        return $handle;
-    }
-
-    /**
-     * Copy the contents of a stream into a string until the given number of
-     * bytes have been read.
-     *
-     * @param StreamInterface $stream Stream to read
-     * @param int             $maxLen Maximum number of bytes to read. Pass -1
-     *                                to read the entire stream.
-     * @return string
-     */
-    public static function copyToString(StreamInterface $stream, $maxLen = -1)
-    {
-        $buffer = '';
-
-        if ($maxLen === -1) {
-            while (!$stream->eof()) {
-                $buf = $stream->read(1048576);
-                if ($buf === false) {
-                    break;
-                }
-                $buffer .= $buf;
-            }
-            return $buffer;
-        }
-
-        $len = 0;
-        while (!$stream->eof() && $len < $maxLen) {
-            $buf = $stream->read($maxLen - $len);
-            if ($buf === false) {
-                break;
-            }
-            $buffer .= $buf;
-            $len = strlen($buffer);
-        }
-
-        return $buffer;
-    }
-
-    /**
-     * Copy the contents of a stream into another stream until the given number
-     * of bytes have been read.
-     *
-     * @param StreamInterface $source Stream to read from
-     * @param StreamInterface $dest   Stream to write to
-     * @param int             $maxLen Maximum number of bytes to read. Pass -1
-     *                                to read the entire stream.
-     */
-    public static function copyToStream(
-        StreamInterface $source,
-        StreamInterface $dest,
-        $maxLen = -1
-    ) {
-        if ($maxLen === -1) {
-            while (!$source->eof()) {
-                if (!$dest->write($source->read(1048576))) {
-                    break;
-                }
-            }
-            return;
-        }
-
-        $bytes = 0;
-        while (!$source->eof()) {
-            $buf = $source->read($maxLen - $bytes);
-            if (!($len = strlen($buf))) {
-                break;
-            }
-            $bytes += $len;
-            $dest->write($buf);
-            if ($bytes == $maxLen) {
-                break;
-            }
-        }
-    }
-
-    /**
-     * Calculate a hash of a Stream
-     *
-     * @param StreamInterface $stream    Stream to calculate the hash for
-     * @param string          $algo      Hash algorithm (e.g. md5, crc32, etc)
-     * @param bool            $rawOutput Whether or not to use raw output
-     *
-     * @return string Returns the hash of the stream
-     * @throws SeekException
-     */
-    public static function hash(
-        StreamInterface $stream,
-        $algo,
-        $rawOutput = false
-    ) {
-        $pos = $stream->tell();
-
-        if ($pos > 0 && !$stream->seek(0)) {
-            throw new SeekException($stream);
-        }
-
-        $ctx = hash_init($algo);
-        while (!$stream->eof()) {
-            hash_update($ctx, $stream->read(1048576));
-        }
-
-        $out = hash_final($ctx, (bool) $rawOutput);
-        $stream->seek($pos);
-
-        return $out;
-    }
-
-    /**
-     * Read a line from the stream up to the maximum allowed buffer length
-     *
-     * @param StreamInterface $stream    Stream to read from
-     * @param int             $maxLength Maximum buffer length
-     *
-     * @return string|bool
-     */
-    public static function readline(StreamInterface $stream, $maxLength = null)
-    {
-        $buffer = '';
-        $size = 0;
-
-        while (!$stream->eof()) {
-            if (false === ($byte = $stream->read(1))) {
-                return $buffer;
-            }
-            $buffer .= $byte;
-            // Break when a new line is found or the max length - 1 is reached
-            if ($byte == PHP_EOL || ++$size == $maxLength - 1) {
-                break;
-            }
-        }
-
-        return $buffer;
-    }
-
-    /**
-     * Alias of GuzzleHttp\Stream\Stream::factory.
-     *
-     * @param mixed $resource Resource to create
-     * @param array $options  Associative array of stream options defined in
-     *                        {@see \GuzzleHttp\Stream\Stream::__construct}
-     *
-     * @return StreamInterface
-     *
-     * @see GuzzleHttp\Stream\Stream::factory
-     * @see GuzzleHttp\Stream\Stream::__construct
-     */
-    public static function create($resource, array $options = [])
-    {
-        return Stream::factory($resource, $options);
-    }
-}
diff --git a/core/vendor/guzzlehttp/streams/tests/AsyncReadStreamTest.php b/core/vendor/guzzlehttp/streams/tests/AsyncReadStreamTest.php
deleted file mode 100644
index 8c7899596..000000000
--- a/core/vendor/guzzlehttp/streams/tests/AsyncReadStreamTest.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests\Stream;
-
-use GuzzleHttp\Stream\AsyncReadStream;
-use GuzzleHttp\Stream\BufferStream;
-use GuzzleHttp\Stream\FnStream;
-use GuzzleHttp\Stream\Stream;
-
-class AsyncReadStreamTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Buffer must be readable and writable
-     */
-    public function testValidatesReadableBuffer()
-    {
-        new AsyncReadStream(FnStream::decorate(
-            Stream::factory(),
-            ['isReadable' => function () { return false; }]
-        ));
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Buffer must be readable and writable
-     */
-    public function testValidatesWritableBuffer()
-    {
-        new AsyncReadStream(FnStream::decorate(
-            Stream::factory(),
-            ['isWritable' => function () { return false; }]
-        ));
-    }
-
-    public function testValidatesHwmMetadata()
-    {
-        $a = new AsyncReadStream(Stream::factory(), [
-            'drain' => function() {}
-        ]);
-        $this->assertNull($this->readAttribute($a, 'drain'));
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage pump must be callable
-     */
-    public function testValidatesPumpIsCallable()
-    {
-        new AsyncReadStream(new BufferStream(), ['pump' => true]);
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage drain must be callable
-     */
-    public function testValidatesDrainIsCallable()
-    {
-        new AsyncReadStream(new BufferStream(), ['drain' => true]);
-    }
-
-    public function testCanInitialize()
-    {
-        $buffer = new BufferStream();
-        $a = new AsyncReadStream($buffer, [
-            'size'  => 10,
-            'drain' => function () {},
-            'pump'  => function () {},
-        ]);
-        $this->assertSame($buffer, $this->readAttribute($a, 'stream'));
-        $this->assertTrue(is_callable($this->readAttribute($a, 'drain')));
-        $this->assertTrue(is_callable($this->readAttribute($a, 'pump')));
-        $this->assertTrue($a->isReadable());
-        $this->assertFalse($a->isSeekable());
-        $this->assertFalse($a->isWritable());
-        $this->assertFalse($a->write('foo'));
-        $this->assertEquals(10, $a->getSize());
-    }
-
-    public function testReadsFromBufferWithNoDrainOrPump()
-    {
-        $buffer = new BufferStream();
-        $a = new AsyncReadStream($buffer);
-        $buffer->write('foo');
-        $this->assertNull($a->getSize());
-        $this->assertEquals('foo', $a->read(10));
-        $this->assertEquals('', $a->read(10));
-    }
-
-    public function testCallsPumpForMoreDataWhenRequested()
-    {
-        $called = 0;
-        $buffer = new BufferStream();
-        $a = new AsyncReadStream($buffer, [
-            'pump' => function ($size) use (&$called) {
-                $called++;
-                return str_repeat('.', $size);
-            }
-        ]);
-        $buffer->write('foobar');
-        $this->assertEquals('foo', $a->read(3));
-        $this->assertEquals(0, $called);
-        $this->assertEquals('bar.....', $a->read(8));
-        $this->assertEquals(1, $called);
-        $this->assertEquals('..', $a->read(2));
-        $this->assertEquals(2, $called);
-    }
-
-    public function testCallsDrainWhenNeeded()
-    {
-        $called = 0;
-        $buffer = new BufferStream(5);
-        $a = new AsyncReadStream($buffer, [
-            'drain' => function (BufferStream $b) use (&$called, $buffer) {
-                $this->assertSame($b, $buffer);
-                $called++;
-            }
-        ]);
-
-        $buffer->write('foobar');
-        $this->assertEquals(6, $buffer->getSize());
-        $this->assertEquals(0, $called);
-
-        $a->read(3);
-        $this->assertTrue($this->readAttribute($a, 'needsDrain'));
-        $this->assertEquals(3, $buffer->getSize());
-        $this->assertEquals(0, $called);
-
-        $a->read(3);
-        $this->assertEquals(0, $buffer->getSize());
-        $this->assertFalse($this->readAttribute($a, 'needsDrain'));
-        $this->assertEquals(1, $called);
-    }
-
-    public function testCreatesBufferWithNoConfig()
-    {
-        list($buffer, $async) = AsyncReadStream::create();
-        $this->assertInstanceOf('GuzzleHttp\Stream\BufferStream', $buffer);
-        $this->assertInstanceOf('GuzzleHttp\Stream\AsyncReadStream', $async);
-    }
-
-    public function testCreatesBufferWithSpecifiedBuffer()
-    {
-        $buf = new BufferStream();
-        list($buffer, $async) = AsyncReadStream::create(['buffer' => $buf]);
-        $this->assertSame($buf, $buffer);
-        $this->assertInstanceOf('GuzzleHttp\Stream\AsyncReadStream', $async);
-    }
-
-    public function testCreatesNullStream()
-    {
-        list($buffer, $async) = AsyncReadStream::create(['max_buffer' => 0]);
-        $this->assertInstanceOf('GuzzleHttp\Stream\NullStream', $buffer);
-        $this->assertInstanceOf('GuzzleHttp\Stream\AsyncReadStream', $async);
-    }
-
-    public function testCreatesDroppingStream()
-    {
-        list($buffer, $async) = AsyncReadStream::create(['max_buffer' => 5]);
-        $this->assertInstanceOf('GuzzleHttp\Stream\DroppingStream', $buffer);
-        $this->assertInstanceOf('GuzzleHttp\Stream\AsyncReadStream', $async);
-        $buffer->write('12345678910');
-        $this->assertEquals(5, $buffer->getSize());
-    }
-
-    public function testCreatesOnWriteStream()
-    {
-        $c = 0;
-        $b = new BufferStream();
-        list($buffer, $async) = AsyncReadStream::create([
-            'buffer' => $b,
-            'write'  => function (BufferStream $buf, $data) use (&$c, $b) {
-                $this->assertSame($buf, $b);
-                $this->assertEquals('foo', $data);
-                $c++;
-            }
-        ]);
-        $this->assertInstanceOf('GuzzleHttp\Stream\FnStream', $buffer);
-        $this->assertInstanceOf('GuzzleHttp\Stream\AsyncReadStream', $async);
-        $this->assertEquals(0, $c);
-        $this->assertEquals(3, $buffer->write('foo'));
-        $this->assertEquals(1, $c);
-        $this->assertEquals(3, $buffer->write('foo'));
-        $this->assertEquals(2, $c);
-        $this->assertEquals('foofoo', (string) $buffer);
-    }
-}
diff --git a/core/vendor/guzzlehttp/streams/tests/Exception/SeekExceptionTest.php b/core/vendor/guzzlehttp/streams/tests/Exception/SeekExceptionTest.php
deleted file mode 100644
index fd8cd1ad2..000000000
--- a/core/vendor/guzzlehttp/streams/tests/Exception/SeekExceptionTest.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests\Stream\Exception;
-
-use GuzzleHttp\Stream\Exception\SeekException;
-use GuzzleHttp\Stream\Stream;
-
-class SeekExceptionTest extends \PHPUnit_Framework_TestCase
-{
-    public function testHasStream()
-    {
-        $s = Stream::factory('foo');
-        $e = new SeekException($s, 10);
-        $this->assertSame($s, $e->getStream());
-        $this->assertContains('10', $e->getMessage());
-    }
-}
diff --git a/core/vendor/guzzlehttp/streams/tests/NoSeekStreamTest.php b/core/vendor/guzzlehttp/streams/tests/NoSeekStreamTest.php
deleted file mode 100644
index 21b7c6d22..000000000
--- a/core/vendor/guzzlehttp/streams/tests/NoSeekStreamTest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests\Stream;
-
-use GuzzleHttp\Stream\Stream;
-use GuzzleHttp\Stream\NoSeekStream;
-
-/**
- * @covers GuzzleHttp\Stream\NoSeekStream
- * @covers GuzzleHttp\Stream\StreamDecoratorTrait
- */
-class NoSeekStreamTest extends \PHPUnit_Framework_TestCase
-{
-    public function testCannotSeek()
-    {
-        $s = $this->getMockBuilder('GuzzleHttp\Stream\StreamInterface')
-            ->setMethods(['isSeekable', 'seek'])
-            ->getMockForAbstractClass();
-        $s->expects($this->never())->method('seek');
-        $s->expects($this->never())->method('isSeekable');
-        $wrapped = new NoSeekStream($s);
-        $this->assertFalse($wrapped->isSeekable());
-        $this->assertFalse($wrapped->seek(2));
-    }
-
-    public function testHandlesClose()
-    {
-        $s = Stream::factory('foo');
-        $wrapped = new NoSeekStream($s);
-        $wrapped->close();
-        $this->assertFalse($wrapped->write('foo'));
-    }
-
-    public function testCanAttach()
-    {
-        $s1 = Stream::factory('foo');
-        $s2 = Stream::factory('bar');
-        $wrapped = new NoSeekStream($s1);
-        $wrapped->attach($s2->detach());
-        $this->assertEquals('bar', (string) $wrapped);
-    }
-}
diff --git a/core/vendor/guzzlehttp/streams/tests/NullStreamTest.php b/core/vendor/guzzlehttp/streams/tests/NullStreamTest.php
deleted file mode 100644
index 8e4143159..000000000
--- a/core/vendor/guzzlehttp/streams/tests/NullStreamTest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests\Stream;
-
-use GuzzleHttp\Stream\NullStream;
-
-class NullStreamTest extends \PHPUnit_Framework_TestCase
-{
-    public function testDoesNothing()
-    {
-        $b = new NullStream();
-        $this->assertEquals('', $b->read(10));
-        $this->assertEquals(4, $b->write('test'));
-        $this->assertEquals('', (string) $b);
-        $this->assertNull($b->getMetadata('a'));
-        $this->assertEquals([], $b->getMetadata());
-        $this->assertEquals(0, $b->getSize());
-        $this->assertEquals('', $b->getContents());
-        $this->assertEquals(0, $b->tell());
-
-        $this->assertTrue($b->isReadable());
-        $this->assertTrue($b->isWritable());
-        $this->assertTrue($b->isSeekable());
-        $this->assertFalse($b->seek(10));
-
-        $this->assertTrue($b->eof());
-        $b->detach();
-        $this->assertTrue($b->eof());
-        $b->close();
-    }
-
-    /**
-     * @expectedException \GuzzleHttp\Stream\Exception\CannotAttachException
-     */
-    public function testCannotAttach()
-    {
-        $p = new NullStream();
-        $p->attach('a');
-    }
-}
diff --git a/core/vendor/guzzlehttp/streams/tests/UtilsTest.php b/core/vendor/guzzlehttp/streams/tests/UtilsTest.php
deleted file mode 100644
index 6e3e3b216..000000000
--- a/core/vendor/guzzlehttp/streams/tests/UtilsTest.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests\Stream;
-
-use GuzzleHttp\Stream\FnStream;
-use GuzzleHttp\Stream\NoSeekStream;
-use GuzzleHttp\Stream\Stream;
-use GuzzleHttp\Stream\Utils;
-
-class UtilsTest extends \PHPUnit_Framework_TestCase
-{
-    public function testCopiesToString()
-    {
-        $s = Stream::factory('foobaz');
-        $this->assertEquals('foobaz', Utils::copyToString($s));
-        $s->seek(0);
-        $this->assertEquals('foo', Utils::copyToString($s, 3));
-        $this->assertEquals('baz', Utils::copyToString($s, 3));
-        $this->assertEquals('', Utils::copyToString($s));
-    }
-
-    public function testCopiesToStringStopsWhenReadFails()
-    {
-        $s1 = Stream::factory('foobaz');
-        $s1 = FnStream::decorate($s1, [
-            'read' => function () {
-                return false;
-            }
-        ]);
-        $result = Utils::copyToString($s1);
-        $this->assertEquals('', $result);
-    }
-
-    public function testCopiesToStream()
-    {
-        $s1 = Stream::factory('foobaz');
-        $s2 = Stream::factory('');
-        Utils::copyToStream($s1, $s2);
-        $this->assertEquals('foobaz', (string) $s2);
-        $s2 = Stream::factory('');
-        $s1->seek(0);
-        Utils::copyToStream($s1, $s2, 3);
-        $this->assertEquals('foo', (string) $s2);
-        Utils::copyToStream($s1, $s2, 3);
-        $this->assertEquals('foobaz', (string) $s2);
-    }
-
-    public function testStopsCopyToStreamWhenWriteFails()
-    {
-        $s1 = Stream::factory('foobaz');
-        $s2 = Stream::factory('');
-        $s2 = FnStream::decorate($s2, ['write' => function () { return 0; }]);
-        Utils::copyToStream($s1, $s2);
-        $this->assertEquals('', (string) $s2);
-    }
-
-    public function testStopsCopyToSteamWhenWriteFailsWithMaxLen()
-    {
-        $s1 = Stream::factory('foobaz');
-        $s2 = Stream::factory('');
-        $s2 = FnStream::decorate($s2, ['write' => function () { return 0; }]);
-        Utils::copyToStream($s1, $s2, 10);
-        $this->assertEquals('', (string) $s2);
-    }
-
-    public function testStopsCopyToSteamWhenReadFailsWithMaxLen()
-    {
-        $s1 = Stream::factory('foobaz');
-        $s1 = FnStream::decorate($s1, ['read' => function () { return ''; }]);
-        $s2 = Stream::factory('');
-        Utils::copyToStream($s1, $s2, 10);
-        $this->assertEquals('', (string) $s2);
-    }
-
-    public function testReadsLines()
-    {
-        $s = Stream::factory("foo\nbaz\nbar");
-        $this->assertEquals("foo\n", Utils::readline($s));
-        $this->assertEquals("baz\n", Utils::readline($s));
-        $this->assertEquals("bar", Utils::readline($s));
-    }
-
-    public function testReadsLinesUpToMaxLength()
-    {
-        $s = Stream::factory("12345\n");
-        $this->assertEquals("123", Utils::readline($s, 4));
-        $this->assertEquals("45\n", Utils::readline($s));
-    }
-
-    public function testReadsLineUntilFalseReturnedFromRead()
-    {
-        $s = $this->getMockBuilder('GuzzleHttp\Stream\Stream')
-            ->setMethods(['read', 'eof'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $s->expects($this->exactly(2))
-            ->method('read')
-            ->will($this->returnCallback(function () {
-                static $c = false;
-                if ($c) {
-                    return false;
-                }
-                $c = true;
-                return 'h';
-            }));
-        $s->expects($this->exactly(2))
-            ->method('eof')
-            ->will($this->returnValue(false));
-        $this->assertEquals("h", Utils::readline($s));
-    }
-
-    public function testCalculatesHash()
-    {
-        $s = Stream::factory('foobazbar');
-        $this->assertEquals(md5('foobazbar'), Utils::hash($s, 'md5'));
-    }
-
-    /**
-     * @expectedException \GuzzleHttp\Stream\Exception\SeekException
-     */
-    public function testCalculatesHashThrowsWhenSeekFails()
-    {
-        $s = new NoSeekStream(Stream::factory('foobazbar'));
-        $s->read(2);
-        Utils::hash($s, 'md5');
-    }
-
-    public function testCalculatesHashSeeksToOriginalPosition()
-    {
-        $s = Stream::factory('foobazbar');
-        $s->seek(4);
-        $this->assertEquals(md5('foobazbar'), Utils::hash($s, 'md5'));
-        $this->assertEquals(4, $s->tell());
-    }
-
-    public function testOpensFilesSuccessfully()
-    {
-        $r = Utils::open(__FILE__, 'r');
-        $this->assertInternalType('resource', $r);
-        fclose($r);
-    }
-
-    /**
-     * @expectedException \RuntimeException
-     * @expectedExceptionMessage Unable to open /path/to/does/not/exist using mode r
-     */
-    public function testThrowsExceptionNotWarning()
-    {
-        Utils::open('/path/to/does/not/exist', 'r');
-    }
-
-    public function testProxiesToFactory()
-    {
-        $this->assertEquals('foo', (string) Utils::create('foo'));
-    }
-}
diff --git a/core/vendor/phpunit/php-code-coverage/tests/_files/CoverageFunctionParenthesesWhitespaceTest.php b/core/vendor/phpunit/php-code-coverage/tests/_files/CoverageFunctionParenthesesWhitespaceTest.php
new file mode 100644
index 000000000..becc6c8f9
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/tests/_files/CoverageFunctionParenthesesWhitespaceTest.php
@@ -0,0 +1,11 @@
+<?php
+class CoverageFunctionParenthesesWhitespaceTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers ::globalFunction ( )
+     */
+    public function testSomething()
+    {
+        globalFunction();
+    }
+}
diff --git a/core/vendor/phpunit/php-code-coverage/tests/_files/CoverageMethodOneLineAnnotationTest.php b/core/vendor/phpunit/php-code-coverage/tests/_files/CoverageMethodOneLineAnnotationTest.php
new file mode 100644
index 000000000..55d7f571e
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/tests/_files/CoverageMethodOneLineAnnotationTest.php
@@ -0,0 +1,11 @@
+<?php
+
+class CoverageMethodOneLineAnnotationTest extends PHPUnit_Framework_TestCase
+{
+    /** @covers CoveredClass::publicMethod */
+    public function testSomething()
+    {
+        $o = new CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/core/vendor/phpunit/php-code-coverage/tests/_files/CoverageMethodParenthesesWhitespaceTest.php b/core/vendor/phpunit/php-code-coverage/tests/_files/CoverageMethodParenthesesWhitespaceTest.php
new file mode 100644
index 000000000..d1be1c6cf
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/tests/_files/CoverageMethodParenthesesWhitespaceTest.php
@@ -0,0 +1,12 @@
+<?php
+class CoverageMethodParenthesesWhitespaceTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers CoveredClass::publicMethod ( )
+     */
+    public function testSomething()
+    {
+        $o = new CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/core/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageCoversClassPublicTest.php b/core/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageCoversClassPublicTest.php
new file mode 100644
index 000000000..45f583b77
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageCoversClassPublicTest.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * @coversDefaultClass \Foo\CoveredClass
+ */
+class NamespaceCoverageCoversClassPublicTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers ::publicMethod
+     */
+    public function testSomething()
+    {
+        $o = new Foo\CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/core/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageCoversClassTest.php b/core/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageCoversClassTest.php
new file mode 100644
index 000000000..b33674546
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageCoversClassTest.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @coversDefaultClass \Foo\CoveredClass
+ */
+class NamespaceCoverageCoversClassTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers ::privateMethod
+     * @covers ::protectedMethod
+     * @covers ::publicMethod
+     * @covers \Foo\CoveredParentClass::privateMethod
+     * @covers \Foo\CoveredParentClass::protectedMethod
+     * @covers \Foo\CoveredParentClass::publicMethod
+     */
+    public function testSomething()
+    {
+        $o = new Foo\CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/core/vendor/phpunit/phpunit/tests/_files/ExceptionInSetUpTest.php b/core/vendor/phpunit/phpunit/tests/_files/ExceptionInSetUpTest.php
new file mode 100644
index 000000000..9c48030b8
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/ExceptionInSetUpTest.php
@@ -0,0 +1,35 @@
+<?php
+class ExceptionInSetUpTest extends PHPUnit_Framework_TestCase
+{
+    public $setUp = false;
+    public $assertPreConditions = false;
+    public $assertPostConditions = false;
+    public $tearDown = false;
+    public $testSomething = false;
+
+    protected function setUp()
+    {
+        $this->setUp = true;
+        throw new Exception;
+    }
+
+    protected function assertPreConditions()
+    {
+        $this->assertPreConditions = true;
+    }
+
+    public function testSomething()
+    {
+        $this->testSomething = true;
+    }
+
+    protected function assertPostConditions()
+    {
+        $this->assertPostConditions = true;
+    }
+
+    protected function tearDown()
+    {
+        $this->tearDown = true;
+    }
+}
diff --git a/core/vendor/phpunit/phpunit/tests/_files/ExceptionInTest.php b/core/vendor/phpunit/phpunit/tests/_files/ExceptionInTest.php
new file mode 100644
index 000000000..4ca556e55
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/ExceptionInTest.php
@@ -0,0 +1,35 @@
+<?php
+class ExceptionInTest extends PHPUnit_Framework_TestCase
+{
+    public $setUp = false;
+    public $assertPreConditions = false;
+    public $assertPostConditions = false;
+    public $tearDown = false;
+    public $testSomething = false;
+
+    protected function setUp()
+    {
+        $this->setUp = true;
+    }
+
+    protected function assertPreConditions()
+    {
+        $this->assertPreConditions = true;
+    }
+
+    public function testSomething()
+    {
+        $this->testSomething = true;
+        throw new Exception;
+    }
+
+    protected function assertPostConditions()
+    {
+        $this->assertPostConditions = true;
+    }
+
+    protected function tearDown()
+    {
+        $this->tearDown = true;
+    }
+}
diff --git a/core/vendor/psr/http-message/LICENSE b/core/vendor/psr/http-message/LICENSE
new file mode 100644
index 000000000..c2d8e452d
--- /dev/null
+++ b/core/vendor/psr/http-message/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2014 PHP Framework Interoperability Group
+
+Permission is hereby granted, free of charge, to any person obtaining a copy 
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights 
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
+copies of the Software, and to permit persons to whom the Software is 
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in 
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/core/vendor/psr/http-message/README.md b/core/vendor/psr/http-message/README.md
new file mode 100644
index 000000000..28185338f
--- /dev/null
+++ b/core/vendor/psr/http-message/README.md
@@ -0,0 +1,13 @@
+PSR Http Message
+================
+
+This repository holds all interfaces/classes/traits related to
+[PSR-7](http://www.php-fig.org/psr/psr-7/).
+
+Note that this is not a HTTP message implementation of its own. It is merely an
+interface that describes a HTTP message. See the specification for more details.
+
+Usage
+-----
+
+We'll certainly need some stuff in here.
\ No newline at end of file
diff --git a/core/vendor/psr/http-message/composer.json b/core/vendor/psr/http-message/composer.json
new file mode 100644
index 000000000..4774b6126
--- /dev/null
+++ b/core/vendor/psr/http-message/composer.json
@@ -0,0 +1,25 @@
+{
+    "name": "psr/http-message",
+    "description": "Common interface for HTTP messages",
+    "keywords": ["psr", "psr-7", "http", "http-message", "request", "response"],
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "PHP-FIG",
+            "homepage": "http://www.php-fig.org/"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Psr\\Http\\Message\\": "src/"
+        }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.0.x-dev"
+        }
+    }
+}
diff --git a/core/vendor/psr/http-message/src/MessageInterface.php b/core/vendor/psr/http-message/src/MessageInterface.php
new file mode 100644
index 000000000..8f67a050e
--- /dev/null
+++ b/core/vendor/psr/http-message/src/MessageInterface.php
@@ -0,0 +1,187 @@
+<?php
+
+namespace Psr\Http\Message;
+
+/**
+ * HTTP messages consist of requests from a client to a server and responses
+ * from a server to a client. This interface defines the methods common to
+ * each.
+ *
+ * Messages are considered immutable; all methods that might change state MUST
+ * be implemented such that they retain the internal state of the current
+ * message and return an instance that contains the changed state.
+ *
+ * @link http://www.ietf.org/rfc/rfc7230.txt
+ * @link http://www.ietf.org/rfc/rfc7231.txt
+ */
+interface MessageInterface
+{
+    /**
+     * Retrieves the HTTP protocol version as a string.
+     *
+     * The string MUST contain only the HTTP version number (e.g., "1.1", "1.0").
+     *
+     * @return string HTTP protocol version.
+     */
+    public function getProtocolVersion();
+
+    /**
+     * Return an instance with the specified HTTP protocol version.
+     *
+     * The version string MUST contain only the HTTP version number (e.g.,
+     * "1.1", "1.0").
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * new protocol version.
+     *
+     * @param string $version HTTP protocol version
+     * @return self
+     */
+    public function withProtocolVersion($version);
+
+    /**
+     * Retrieves all message header values.
+     *
+     * The keys represent the header name as it will be sent over the wire, and
+     * each value is an array of strings associated with the header.
+     *
+     *     // Represent the headers as a string
+     *     foreach ($message->getHeaders() as $name => $values) {
+     *         echo $name . ": " . implode(", ", $values);
+     *     }
+     *
+     *     // Emit headers iteratively:
+     *     foreach ($message->getHeaders() as $name => $values) {
+     *         foreach ($values as $value) {
+     *             header(sprintf('%s: %s', $name, $value), false);
+     *         }
+     *     }
+     *
+     * While header names are not case-sensitive, getHeaders() will preserve the
+     * exact case in which headers were originally specified.
+     *
+     * @return array Returns an associative array of the message's headers. Each
+     *     key MUST be a header name, and each value MUST be an array of strings
+     *     for that header.
+     */
+    public function getHeaders();
+
+    /**
+     * Checks if a header exists by the given case-insensitive name.
+     *
+     * @param string $name Case-insensitive header field name.
+     * @return bool Returns true if any header names match the given header
+     *     name using a case-insensitive string comparison. Returns false if
+     *     no matching header name is found in the message.
+     */
+    public function hasHeader($name);
+
+    /**
+     * Retrieves a message header value by the given case-insensitive name.
+     *
+     * This method returns an array of all the header values of the given
+     * case-insensitive header name.
+     *
+     * If the header does not appear in the message, this method MUST return an
+     * empty array.
+     *
+     * @param string $name Case-insensitive header field name.
+     * @return string[] An array of string values as provided for the given
+     *    header. If the header does not appear in the message, this method MUST
+     *    return an empty array.
+     */
+    public function getHeader($name);
+
+    /**
+     * Retrieves a comma-separated string of the values for a single header.
+     *
+     * This method returns all of the header values of the given
+     * case-insensitive header name as a string concatenated together using
+     * a comma.
+     *
+     * NOTE: Not all header values may be appropriately represented using
+     * comma concatenation. For such headers, use getHeader() instead
+     * and supply your own delimiter when concatenating.
+     *
+     * If the header does not appear in the message, this method MUST return
+     * an empty string.
+     *
+     * @param string $name Case-insensitive header field name.
+     * @return string A string of values as provided for the given header
+     *    concatenated together using a comma. If the header does not appear in
+     *    the message, this method MUST return an empty string.
+     */
+    public function getHeaderLine($name);
+
+    /**
+     * Return an instance with the provided value replacing the specified header.
+     *
+     * While header names are case-insensitive, the casing of the header will
+     * be preserved by this function, and returned from getHeaders().
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * new and/or updated header and value.
+     *
+     * @param string $name Case-insensitive header field name.
+     * @param string|string[] $value Header value(s).
+     * @return self
+     * @throws \InvalidArgumentException for invalid header names or values.
+     */
+    public function withHeader($name, $value);
+
+    /**
+     * Return an instance with the specified header appended with the given value.
+     *
+     * Existing values for the specified header will be maintained. The new
+     * value(s) will be appended to the existing list. If the header did not
+     * exist previously, it will be added.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * new header and/or value.
+     *
+     * @param string $name Case-insensitive header field name to add.
+     * @param string|string[] $value Header value(s).
+     * @return self
+     * @throws \InvalidArgumentException for invalid header names or values.
+     */
+    public function withAddedHeader($name, $value);
+
+    /**
+     * Return an instance without the specified header.
+     *
+     * Header resolution MUST be done without case-sensitivity.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that removes
+     * the named header.
+     *
+     * @param string $name Case-insensitive header field name to remove.
+     * @return self
+     */
+    public function withoutHeader($name);
+
+    /**
+     * Gets the body of the message.
+     *
+     * @return StreamInterface Returns the body as a stream.
+     */
+    public function getBody();
+
+    /**
+     * Return an instance with the specified message body.
+     *
+     * The body MUST be a StreamInterface object.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return a new instance that has the
+     * new body stream.
+     *
+     * @param StreamInterface $body Body.
+     * @return self
+     * @throws \InvalidArgumentException When the body is not valid.
+     */
+    public function withBody(StreamInterface $body);
+}
diff --git a/core/vendor/psr/http-message/src/RequestInterface.php b/core/vendor/psr/http-message/src/RequestInterface.php
new file mode 100644
index 000000000..75c802e29
--- /dev/null
+++ b/core/vendor/psr/http-message/src/RequestInterface.php
@@ -0,0 +1,129 @@
+<?php
+
+namespace Psr\Http\Message;
+
+/**
+ * Representation of an outgoing, client-side request.
+ *
+ * Per the HTTP specification, this interface includes properties for
+ * each of the following:
+ *
+ * - Protocol version
+ * - HTTP method
+ * - URI
+ * - Headers
+ * - Message body
+ *
+ * During construction, implementations MUST attempt to set the Host header from
+ * a provided URI if no Host header is provided.
+ *
+ * Requests are considered immutable; all methods that might change state MUST
+ * be implemented such that they retain the internal state of the current
+ * message and return an instance that contains the changed state.
+ */
+interface RequestInterface extends MessageInterface
+{
+    /**
+     * Retrieves the message's request target.
+     *
+     * Retrieves the message's request-target either as it will appear (for
+     * clients), as it appeared at request (for servers), or as it was
+     * specified for the instance (see withRequestTarget()).
+     *
+     * In most cases, this will be the origin-form of the composed URI,
+     * unless a value was provided to the concrete implementation (see
+     * withRequestTarget() below).
+     *
+     * If no URI is available, and no request-target has been specifically
+     * provided, this method MUST return the string "/".
+     *
+     * @return string
+     */
+    public function getRequestTarget();
+
+    /**
+     * Return an instance with the specific request-target.
+     *
+     * If the request needs a non-origin-form request-target — e.g., for
+     * specifying an absolute-form, authority-form, or asterisk-form —
+     * this method may be used to create an instance with the specified
+     * request-target, verbatim.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * changed request target.
+     *
+     * @link http://tools.ietf.org/html/rfc7230#section-2.7 (for the various
+     *     request-target forms allowed in request messages)
+     * @param mixed $requestTarget
+     * @return self
+     */
+    public function withRequestTarget($requestTarget);
+
+    /**
+     * Retrieves the HTTP method of the request.
+     *
+     * @return string Returns the request method.
+     */
+    public function getMethod();
+
+    /**
+     * Return an instance with the provided HTTP method.
+     *
+     * While HTTP method names are typically all uppercase characters, HTTP
+     * method names are case-sensitive and thus implementations SHOULD NOT
+     * modify the given string.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * changed request method.
+     *
+     * @param string $method Case-sensitive method.
+     * @return self
+     * @throws \InvalidArgumentException for invalid HTTP methods.
+     */
+    public function withMethod($method);
+
+    /**
+     * Retrieves the URI instance.
+     *
+     * This method MUST return a UriInterface instance.
+     *
+     * @link http://tools.ietf.org/html/rfc3986#section-4.3
+     * @return UriInterface Returns a UriInterface instance
+     *     representing the URI of the request.
+     */
+    public function getUri();
+
+    /**
+     * Returns an instance with the provided URI.
+     *
+     * This method MUST update the Host header of the returned request by
+     * default if the URI contains a host component. If the URI does not
+     * contain a host component, any pre-existing Host header MUST be carried
+     * over to the returned request.
+     *
+     * You can opt-in to preserving the original state of the Host header by
+     * setting `$preserveHost` to `true`. When `$preserveHost` is set to
+     * `true`, this method interacts with the Host header in the following ways:
+     *
+     * - If the the Host header is missing or empty, and the new URI contains
+     *   a host component, this method MUST update the Host header in the returned
+     *   request.
+     * - If the Host header is missing or empty, and the new URI does not contain a
+     *   host component, this method MUST NOT update the Host header in the returned
+     *   request.
+     * - If a Host header is present and non-empty, this method MUST NOT update
+     *   the Host header in the returned request.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * new UriInterface instance.
+     *
+     * @link http://tools.ietf.org/html/rfc3986#section-4.3
+     * @param UriInterface $uri New request URI to use.
+     * @param bool $preserveHost Preserve the original state of the Host header.
+     * @return self
+     */
+    public function withUri(UriInterface $uri, $preserveHost = false);
+}
diff --git a/core/vendor/psr/http-message/src/ResponseInterface.php b/core/vendor/psr/http-message/src/ResponseInterface.php
new file mode 100644
index 000000000..6724809e3
--- /dev/null
+++ b/core/vendor/psr/http-message/src/ResponseInterface.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace Psr\Http\Message;
+
+/**
+ * Representation of an outgoing, server-side response.
+ *
+ * Per the HTTP specification, this interface includes properties for
+ * each of the following:
+ *
+ * - Protocol version
+ * - Status code and reason phrase
+ * - Headers
+ * - Message body
+ *
+ * Responses are considered immutable; all methods that might change state MUST
+ * be implemented such that they retain the internal state of the current
+ * message and return an instance that contains the changed state.
+ */
+interface ResponseInterface extends MessageInterface
+{
+    /**
+     * Gets the response status code.
+     *
+     * The status code is a 3-digit integer result code of the server's attempt
+     * to understand and satisfy the request.
+     *
+     * @return int Status code.
+     */
+    public function getStatusCode();
+
+    /**
+     * Return an instance with the specified status code and, optionally, reason phrase.
+     *
+     * If no reason phrase is specified, implementations MAY choose to default
+     * to the RFC 7231 or IANA recommended reason phrase for the response's
+     * status code.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * updated status and reason phrase.
+     *
+     * @link http://tools.ietf.org/html/rfc7231#section-6
+     * @link http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
+     * @param int $code The 3-digit integer result code to set.
+     * @param string $reasonPhrase The reason phrase to use with the
+     *     provided status code; if none is provided, implementations MAY
+     *     use the defaults as suggested in the HTTP specification.
+     * @return self
+     * @throws \InvalidArgumentException For invalid status code arguments.
+     */
+    public function withStatus($code, $reasonPhrase = '');
+
+    /**
+     * Gets the response reason phrase associated with the status code.
+     *
+     * Because a reason phrase is not a required element in a response
+     * status line, the reason phrase value MAY be null. Implementations MAY
+     * choose to return the default RFC 7231 recommended reason phrase (or those
+     * listed in the IANA HTTP Status Code Registry) for the response's
+     * status code.
+     *
+     * @link http://tools.ietf.org/html/rfc7231#section-6
+     * @link http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
+     * @return string Reason phrase; must return an empty string if none present.
+     */
+    public function getReasonPhrase();
+}
diff --git a/core/vendor/psr/http-message/src/ServerRequestInterface.php b/core/vendor/psr/http-message/src/ServerRequestInterface.php
new file mode 100644
index 000000000..916e0658d
--- /dev/null
+++ b/core/vendor/psr/http-message/src/ServerRequestInterface.php
@@ -0,0 +1,261 @@
+<?php
+
+namespace Psr\Http\Message;
+
+/**
+ * Representation of an incoming, server-side HTTP request.
+ *
+ * Per the HTTP specification, this interface includes properties for
+ * each of the following:
+ *
+ * - Protocol version
+ * - HTTP method
+ * - URI
+ * - Headers
+ * - Message body
+ *
+ * Additionally, it encapsulates all data as it has arrived to the
+ * application from the CGI and/or PHP environment, including:
+ *
+ * - The values represented in $_SERVER.
+ * - Any cookies provided (generally via $_COOKIE)
+ * - Query string arguments (generally via $_GET, or as parsed via parse_str())
+ * - Upload files, if any (as represented by $_FILES)
+ * - Deserialized body parameters (generally from $_POST)
+ *
+ * $_SERVER values MUST be treated as immutable, as they represent application
+ * state at the time of request; as such, no methods are provided to allow
+ * modification of those values. The other values provide such methods, as they
+ * can be restored from $_SERVER or the request body, and may need treatment
+ * during the application (e.g., body parameters may be deserialized based on
+ * content type).
+ *
+ * Additionally, this interface recognizes the utility of introspecting a
+ * request to derive and match additional parameters (e.g., via URI path
+ * matching, decrypting cookie values, deserializing non-form-encoded body
+ * content, matching authorization headers to users, etc). These parameters
+ * are stored in an "attributes" property.
+ *
+ * Requests are considered immutable; all methods that might change state MUST
+ * be implemented such that they retain the internal state of the current
+ * message and return an instance that contains the changed state.
+ */
+interface ServerRequestInterface extends RequestInterface
+{
+    /**
+     * Retrieve server parameters.
+     *
+     * Retrieves data related to the incoming request environment,
+     * typically derived from PHP's $_SERVER superglobal. The data IS NOT
+     * REQUIRED to originate from $_SERVER.
+     *
+     * @return array
+     */
+    public function getServerParams();
+
+    /**
+     * Retrieve cookies.
+     *
+     * Retrieves cookies sent by the client to the server.
+     *
+     * The data MUST be compatible with the structure of the $_COOKIE
+     * superglobal.
+     *
+     * @return array
+     */
+    public function getCookieParams();
+
+    /**
+     * Return an instance with the specified cookies.
+     *
+     * The data IS NOT REQUIRED to come from the $_COOKIE superglobal, but MUST
+     * be compatible with the structure of $_COOKIE. Typically, this data will
+     * be injected at instantiation.
+     *
+     * This method MUST NOT update the related Cookie header of the request
+     * instance, nor related values in the server params.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * updated cookie values.
+     *
+     * @param array $cookies Array of key/value pairs representing cookies.
+     * @return self
+     */
+    public function withCookieParams(array $cookies);
+
+    /**
+     * Retrieve query string arguments.
+     *
+     * Retrieves the deserialized query string arguments, if any.
+     *
+     * Note: the query params might not be in sync with the URI or server
+     * params. If you need to ensure you are only getting the original
+     * values, you may need to parse the query string from `getUri()->getQuery()`
+     * or from the `QUERY_STRING` server param.
+     *
+     * @return array
+     */
+    public function getQueryParams();
+
+    /**
+     * Return an instance with the specified query string arguments.
+     *
+     * These values SHOULD remain immutable over the course of the incoming
+     * request. They MAY be injected during instantiation, such as from PHP's
+     * $_GET superglobal, or MAY be derived from some other value such as the
+     * URI. In cases where the arguments are parsed from the URI, the data
+     * MUST be compatible with what PHP's parse_str() would return for
+     * purposes of how duplicate query parameters are handled, and how nested
+     * sets are handled.
+     *
+     * Setting query string arguments MUST NOT change the URI stored by the
+     * request, nor the values in the server params.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * updated query string arguments.
+     *
+     * @param array $query Array of query string arguments, typically from
+     *     $_GET.
+     * @return self
+     */
+    public function withQueryParams(array $query);
+
+    /**
+     * Retrieve normalized file upload data.
+     *
+     * This method returns upload metadata in a normalized tree, with each leaf
+     * an instance of Psr\Http\Message\UploadedFileInterface.
+     *
+     * These values MAY be prepared from $_FILES or the message body during
+     * instantiation, or MAY be injected via withUploadedFiles().
+     *
+     * @return array An array tree of UploadedFileInterface instances; an empty
+     *     array MUST be returned if no data is present.
+     */
+    public function getUploadedFiles();
+
+    /**
+     * Create a new instance with the specified uploaded files.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * updated body parameters.
+     *
+     * @param array An array tree of UploadedFileInterface instances.
+     * @return self
+     * @throws \InvalidArgumentException if an invalid structure is provided.
+     */
+    public function withUploadedFiles(array $uploadedFiles);
+
+    /**
+     * Retrieve any parameters provided in the request body.
+     *
+     * If the request Content-Type is either application/x-www-form-urlencoded
+     * or multipart/form-data, and the request method is POST, this method MUST
+     * return the contents of $_POST.
+     *
+     * Otherwise, this method may return any results of deserializing
+     * the request body content; as parsing returns structured content, the
+     * potential types MUST be arrays or objects only. A null value indicates
+     * the absence of body content.
+     *
+     * @return null|array|object The deserialized body parameters, if any.
+     *     These will typically be an array or object.
+     */
+    public function getParsedBody();
+
+    /**
+     * Return an instance with the specified body parameters.
+     *
+     * These MAY be injected during instantiation.
+     *
+     * If the request Content-Type is either application/x-www-form-urlencoded
+     * or multipart/form-data, and the request method is POST, use this method
+     * ONLY to inject the contents of $_POST.
+     *
+     * The data IS NOT REQUIRED to come from $_POST, but MUST be the results of
+     * deserializing the request body content. Deserialization/parsing returns
+     * structured data, and, as such, this method ONLY accepts arrays or objects,
+     * or a null value if nothing was available to parse.
+     *
+     * As an example, if content negotiation determines that the request data
+     * is a JSON payload, this method could be used to create a request
+     * instance with the deserialized parameters.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * updated body parameters.
+     *
+     * @param null|array|object $data The deserialized body data. This will
+     *     typically be in an array or object.
+     * @return self
+     * @throws \InvalidArgumentException if an unsupported argument type is
+     *     provided.
+     */
+    public function withParsedBody($data);
+
+    /**
+     * Retrieve attributes derived from the request.
+     *
+     * The request "attributes" may be used to allow injection of any
+     * parameters derived from the request: e.g., the results of path
+     * match operations; the results of decrypting cookies; the results of
+     * deserializing non-form-encoded message bodies; etc. Attributes
+     * will be application and request specific, and CAN be mutable.
+     *
+     * @return array Attributes derived from the request.
+     */
+    public function getAttributes();
+
+    /**
+     * Retrieve a single derived request attribute.
+     *
+     * Retrieves a single derived request attribute as described in
+     * getAttributes(). If the attribute has not been previously set, returns
+     * the default value as provided.
+     *
+     * This method obviates the need for a hasAttribute() method, as it allows
+     * specifying a default value to return if the attribute is not found.
+     *
+     * @see getAttributes()
+     * @param string $name The attribute name.
+     * @param mixed $default Default value to return if the attribute does not exist.
+     * @return mixed
+     */
+    public function getAttribute($name, $default = null);
+
+    /**
+     * Return an instance with the specified derived request attribute.
+     *
+     * This method allows setting a single derived request attribute as
+     * described in getAttributes().
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * updated attribute.
+     *
+     * @see getAttributes()
+     * @param string $name The attribute name.
+     * @param mixed $value The value of the attribute.
+     * @return self
+     */
+    public function withAttribute($name, $value);
+
+    /**
+     * Return an instance that removes the specified derived request attribute.
+     *
+     * This method allows removing a single derived request attribute as
+     * described in getAttributes().
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that removes
+     * the attribute.
+     *
+     * @see getAttributes()
+     * @param string $name The attribute name.
+     * @return self
+     */
+    public function withoutAttribute($name);
+}
diff --git a/core/vendor/psr/http-message/src/StreamInterface.php b/core/vendor/psr/http-message/src/StreamInterface.php
new file mode 100644
index 000000000..f68f39126
--- /dev/null
+++ b/core/vendor/psr/http-message/src/StreamInterface.php
@@ -0,0 +1,158 @@
+<?php
+
+namespace Psr\Http\Message;
+
+/**
+ * Describes a data stream.
+ *
+ * Typically, an instance will wrap a PHP stream; this interface provides
+ * a wrapper around the most common operations, including serialization of
+ * the entire stream to a string.
+ */
+interface StreamInterface
+{
+    /**
+     * Reads all data from the stream into a string, from the beginning to end.
+     *
+     * This method MUST attempt to seek to the beginning of the stream before
+     * reading data and read the stream until the end is reached.
+     *
+     * Warning: This could attempt to load a large amount of data into memory.
+     *
+     * This method MUST NOT raise an exception in order to conform with PHP's
+     * string casting operations.
+     *
+     * @see http://php.net/manual/en/language.oop5.magic.php#object.tostring
+     * @return string
+     */
+    public function __toString();
+
+    /**
+     * Closes the stream and any underlying resources.
+     *
+     * @return void
+     */
+    public function close();
+
+    /**
+     * Separates any underlying resources from the stream.
+     *
+     * After the stream has been detached, the stream is in an unusable state.
+     *
+     * @return resource|null Underlying PHP stream, if any
+     */
+    public function detach();
+
+    /**
+     * Get the size of the stream if known.
+     *
+     * @return int|null Returns the size in bytes if known, or null if unknown.
+     */
+    public function getSize();
+
+    /**
+     * Returns the current position of the file read/write pointer
+     *
+     * @return int Position of the file pointer
+     * @throws \RuntimeException on error.
+     */
+    public function tell();
+
+    /**
+     * Returns true if the stream is at the end of the stream.
+     *
+     * @return bool
+     */
+    public function eof();
+
+    /**
+     * Returns whether or not the stream is seekable.
+     *
+     * @return bool
+     */
+    public function isSeekable();
+
+    /**
+     * Seek to a position in the stream.
+     *
+     * @link http://www.php.net/manual/en/function.fseek.php
+     * @param int $offset Stream offset
+     * @param int $whence Specifies how the cursor position will be calculated
+     *     based on the seek offset. Valid values are identical to the built-in
+     *     PHP $whence values for `fseek()`.  SEEK_SET: Set position equal to
+     *     offset bytes SEEK_CUR: Set position to current location plus offset
+     *     SEEK_END: Set position to end-of-stream plus offset.
+     * @throws \RuntimeException on failure.
+     */
+    public function seek($offset, $whence = SEEK_SET);
+
+    /**
+     * Seek to the beginning of the stream.
+     *
+     * If the stream is not seekable, this method will raise an exception;
+     * otherwise, it will perform a seek(0).
+     *
+     * @see seek()
+     * @link http://www.php.net/manual/en/function.fseek.php
+     * @throws \RuntimeException on failure.
+     */
+    public function rewind();
+
+    /**
+     * Returns whether or not the stream is writable.
+     *
+     * @return bool
+     */
+    public function isWritable();
+
+    /**
+     * Write data to the stream.
+     *
+     * @param string $string The string that is to be written.
+     * @return int Returns the number of bytes written to the stream.
+     * @throws \RuntimeException on failure.
+     */
+    public function write($string);
+
+    /**
+     * Returns whether or not the stream is readable.
+     *
+     * @return bool
+     */
+    public function isReadable();
+
+    /**
+     * Read data from the stream.
+     *
+     * @param int $length Read up to $length bytes from the object and return
+     *     them. Fewer than $length bytes may be returned if underlying stream
+     *     call returns fewer bytes.
+     * @return string Returns the data read from the stream, or an empty string
+     *     if no bytes are available.
+     * @throws \RuntimeException if an error occurs.
+     */
+    public function read($length);
+
+    /**
+     * Returns the remaining contents in a string
+     *
+     * @return string
+     * @throws \RuntimeException if unable to read or an error occurs while
+     *     reading.
+     */
+    public function getContents();
+
+    /**
+     * Get stream metadata as an associative array or retrieve a specific key.
+     *
+     * The keys returned are identical to the keys returned from PHP's
+     * stream_get_meta_data() function.
+     *
+     * @link http://php.net/manual/en/function.stream-get-meta-data.php
+     * @param string $key Specific metadata to retrieve.
+     * @return array|mixed|null Returns an associative array if no key is
+     *     provided. Returns a specific key value if a key is provided and the
+     *     value is found, or null if the key is not found.
+     */
+    public function getMetadata($key = null);
+}
diff --git a/core/vendor/psr/http-message/src/UploadedFileInterface.php b/core/vendor/psr/http-message/src/UploadedFileInterface.php
new file mode 100644
index 000000000..5ad288d2b
--- /dev/null
+++ b/core/vendor/psr/http-message/src/UploadedFileInterface.php
@@ -0,0 +1,123 @@
+<?php
+
+namespace Psr\Http\Message;
+
+/**
+ * Value object representing a file uploaded through an HTTP request.
+ *
+ * Instances of this interface are considered immutable; all methods that
+ * might change state MUST be implemented such that they retain the internal
+ * state of the current instance and return an instance that contains the
+ * changed state.
+ */
+interface UploadedFileInterface
+{
+    /**
+     * Retrieve a stream representing the uploaded file.
+     *
+     * This method MUST return a StreamInterface instance, representing the
+     * uploaded file. The purpose of this method is to allow utilizing native PHP
+     * stream functionality to manipulate the file upload, such as
+     * stream_copy_to_stream() (though the result will need to be decorated in a
+     * native PHP stream wrapper to work with such functions).
+     *
+     * If the moveTo() method has been called previously, this method MUST raise
+     * an exception.
+     *
+     * @return StreamInterface Stream representation of the uploaded file.
+     * @throws \RuntimeException in cases when no stream is available or can be
+     *     created.
+     */
+    public function getStream();
+
+    /**
+     * Move the uploaded file to a new location.
+     *
+     * Use this method as an alternative to move_uploaded_file(). This method is
+     * guaranteed to work in both SAPI and non-SAPI environments.
+     * Implementations must determine which environment they are in, and use the
+     * appropriate method (move_uploaded_file(), rename(), or a stream
+     * operation) to perform the operation.
+     *
+     * $targetPath may be an absolute path, or a relative path. If it is a
+     * relative path, resolution should be the same as used by PHP's rename()
+     * function.
+     *
+     * The original file or stream MUST be removed on completion.
+     *
+     * If this method is called more than once, any subsequent calls MUST raise
+     * an exception.
+     *
+     * When used in an SAPI environment where $_FILES is populated, when writing
+     * files via moveTo(), is_uploaded_file() and move_uploaded_file() SHOULD be
+     * used to ensure permissions and upload status are verified correctly.
+     *
+     * If you wish to move to a stream, use getStream(), as SAPI operations
+     * cannot guarantee writing to stream destinations.
+     *
+     * @see http://php.net/is_uploaded_file
+     * @see http://php.net/move_uploaded_file
+     * @param string $targetPath Path to which to move the uploaded file.
+     * @throws \InvalidArgumentException if the $path specified is invalid.
+     * @throws \RuntimeException on any error during the move operation, or on
+     *     the second or subsequent call to the method.
+     */
+    public function moveTo($targetPath);
+    
+    /**
+     * Retrieve the file size.
+     *
+     * Implementations SHOULD return the value stored in the "size" key of
+     * the file in the $_FILES array if available, as PHP calculates this based
+     * on the actual size transmitted.
+     *
+     * @return int|null The file size in bytes or null if unknown.
+     */
+    public function getSize();
+    
+    /**
+     * Retrieve the error associated with the uploaded file.
+     *
+     * The return value MUST be one of PHP's UPLOAD_ERR_XXX constants.
+     *
+     * If the file was uploaded successfully, this method MUST return
+     * UPLOAD_ERR_OK.
+     *
+     * Implementations SHOULD return the value stored in the "error" key of
+     * the file in the $_FILES array.
+     *
+     * @see http://php.net/manual/en/features.file-upload.errors.php
+     * @return int One of PHP's UPLOAD_ERR_XXX constants.
+     */
+    public function getError();
+    
+    /**
+     * Retrieve the filename sent by the client.
+     *
+     * Do not trust the value returned by this method. A client could send
+     * a malicious filename with the intention to corrupt or hack your
+     * application.
+     *
+     * Implementations SHOULD return the value stored in the "name" key of
+     * the file in the $_FILES array.
+     *
+     * @return string|null The filename sent by the client or null if none
+     *     was provided.
+     */
+    public function getClientFilename();
+    
+    /**
+     * Retrieve the media type sent by the client.
+     *
+     * Do not trust the value returned by this method. A client could send
+     * a malicious media type with the intention to corrupt or hack your
+     * application.
+     *
+     * Implementations SHOULD return the value stored in the "type" key of
+     * the file in the $_FILES array.
+     *
+     * @return string|null The media type sent by the client or null if none
+     *     was provided.
+     */
+    public function getClientMediaType();
+}
diff --git a/core/vendor/psr/http-message/src/UriInterface.php b/core/vendor/psr/http-message/src/UriInterface.php
new file mode 100644
index 000000000..1ff5bf01d
--- /dev/null
+++ b/core/vendor/psr/http-message/src/UriInterface.php
@@ -0,0 +1,323 @@
+<?php
+namespace Psr\Http\Message;
+
+/**
+ * Value object representing a URI.
+ *
+ * This interface is meant to represent URIs according to RFC 3986 and to
+ * provide methods for most common operations. Additional functionality for
+ * working with URIs can be provided on top of the interface or externally.
+ * Its primary use is for HTTP requests, but may also be used in other
+ * contexts.
+ *
+ * Instances of this interface are considered immutable; all methods that
+ * might change state MUST be implemented such that they retain the internal
+ * state of the current instance and return an instance that contains the
+ * changed state.
+ *
+ * Typically the Host header will be also be present in the request message.
+ * For server-side requests, the scheme will typically be discoverable in the
+ * server parameters.
+ *
+ * @link http://tools.ietf.org/html/rfc3986 (the URI specification)
+ */
+interface UriInterface
+{
+    /**
+     * Retrieve the scheme component of the URI.
+     *
+     * If no scheme is present, this method MUST return an empty string.
+     *
+     * The value returned MUST be normalized to lowercase, per RFC 3986
+     * Section 3.1.
+     *
+     * The trailing ":" character is not part of the scheme and MUST NOT be
+     * added.
+     *
+     * @see https://tools.ietf.org/html/rfc3986#section-3.1
+     * @return string The URI scheme.
+     */
+    public function getScheme();
+
+    /**
+     * Retrieve the authority component of the URI.
+     *
+     * If no authority information is present, this method MUST return an empty
+     * string.
+     *
+     * The authority syntax of the URI is:
+     *
+     * <pre>
+     * [user-info@]host[:port]
+     * </pre>
+     *
+     * If the port component is not set or is the standard port for the current
+     * scheme, it SHOULD NOT be included.
+     *
+     * @see https://tools.ietf.org/html/rfc3986#section-3.2
+     * @return string The URI authority, in "[user-info@]host[:port]" format.
+     */
+    public function getAuthority();
+
+    /**
+     * Retrieve the user information component of the URI.
+     *
+     * If no user information is present, this method MUST return an empty
+     * string.
+     *
+     * If a user is present in the URI, this will return that value;
+     * additionally, if the password is also present, it will be appended to the
+     * user value, with a colon (":") separating the values.
+     *
+     * The trailing "@" character is not part of the user information and MUST
+     * NOT be added.
+     *
+     * @return string The URI user information, in "username[:password]" format.
+     */
+    public function getUserInfo();
+
+    /**
+     * Retrieve the host component of the URI.
+     *
+     * If no host is present, this method MUST return an empty string.
+     *
+     * The value returned MUST be normalized to lowercase, per RFC 3986
+     * Section 3.2.2.
+     *
+     * @see http://tools.ietf.org/html/rfc3986#section-3.2.2
+     * @return string The URI host.
+     */
+    public function getHost();
+
+    /**
+     * Retrieve the port component of the URI.
+     *
+     * If a port is present, and it is non-standard for the current scheme,
+     * this method MUST return it as an integer. If the port is the standard port
+     * used with the current scheme, this method SHOULD return null.
+     *
+     * If no port is present, and no scheme is present, this method MUST return
+     * a null value.
+     *
+     * If no port is present, but a scheme is present, this method MAY return
+     * the standard port for that scheme, but SHOULD return null.
+     *
+     * @return null|int The URI port.
+     */
+    public function getPort();
+
+    /**
+     * Retrieve the path component of the URI.
+     *
+     * The path can either be empty or absolute (starting with a slash) or
+     * rootless (not starting with a slash). Implementations MUST support all
+     * three syntaxes.
+     *
+     * Normally, the empty path "" and absolute path "/" are considered equal as
+     * defined in RFC 7230 Section 2.7.3. But this method MUST NOT automatically
+     * do this normalization because in contexts with a trimmed base path, e.g.
+     * the front controller, this difference becomes significant. It's the task
+     * of the user to handle both "" and "/".
+     *
+     * The value returned MUST be percent-encoded, but MUST NOT double-encode
+     * any characters. To determine what characters to encode, please refer to
+     * RFC 3986, Sections 2 and 3.3.
+     *
+     * As an example, if the value should include a slash ("/") not intended as
+     * delimiter between path segments, that value MUST be passed in encoded
+     * form (e.g., "%2F") to the instance.
+     *
+     * @see https://tools.ietf.org/html/rfc3986#section-2
+     * @see https://tools.ietf.org/html/rfc3986#section-3.3
+     * @return string The URI path.
+     */
+    public function getPath();
+
+    /**
+     * Retrieve the query string of the URI.
+     *
+     * If no query string is present, this method MUST return an empty string.
+     *
+     * The leading "?" character is not part of the query and MUST NOT be
+     * added.
+     *
+     * The value returned MUST be percent-encoded, but MUST NOT double-encode
+     * any characters. To determine what characters to encode, please refer to
+     * RFC 3986, Sections 2 and 3.4.
+     *
+     * As an example, if a value in a key/value pair of the query string should
+     * include an ampersand ("&") not intended as a delimiter between values,
+     * that value MUST be passed in encoded form (e.g., "%26") to the instance.
+     *
+     * @see https://tools.ietf.org/html/rfc3986#section-2
+     * @see https://tools.ietf.org/html/rfc3986#section-3.4
+     * @return string The URI query string.
+     */
+    public function getQuery();
+
+    /**
+     * Retrieve the fragment component of the URI.
+     *
+     * If no fragment is present, this method MUST return an empty string.
+     *
+     * The leading "#" character is not part of the fragment and MUST NOT be
+     * added.
+     *
+     * The value returned MUST be percent-encoded, but MUST NOT double-encode
+     * any characters. To determine what characters to encode, please refer to
+     * RFC 3986, Sections 2 and 3.5.
+     *
+     * @see https://tools.ietf.org/html/rfc3986#section-2
+     * @see https://tools.ietf.org/html/rfc3986#section-3.5
+     * @return string The URI fragment.
+     */
+    public function getFragment();
+
+    /**
+     * Return an instance with the specified scheme.
+     *
+     * This method MUST retain the state of the current instance, and return
+     * an instance that contains the specified scheme.
+     *
+     * Implementations MUST support the schemes "http" and "https" case
+     * insensitively, and MAY accommodate other schemes if required.
+     *
+     * An empty scheme is equivalent to removing the scheme.
+     *
+     * @param string $scheme The scheme to use with the new instance.
+     * @return self A new instance with the specified scheme.
+     * @throws \InvalidArgumentException for invalid or unsupported schemes.
+     */
+    public function withScheme($scheme);
+
+    /**
+     * Return an instance with the specified user information.
+     *
+     * This method MUST retain the state of the current instance, and return
+     * an instance that contains the specified user information.
+     *
+     * Password is optional, but the user information MUST include the
+     * user; an empty string for the user is equivalent to removing user
+     * information.
+     *
+     * @param string $user The user name to use for authority.
+     * @param null|string $password The password associated with $user.
+     * @return self A new instance with the specified user information.
+     */
+    public function withUserInfo($user, $password = null);
+
+    /**
+     * Return an instance with the specified host.
+     *
+     * This method MUST retain the state of the current instance, and return
+     * an instance that contains the specified host.
+     *
+     * An empty host value is equivalent to removing the host.
+     *
+     * @param string $host The hostname to use with the new instance.
+     * @return self A new instance with the specified host.
+     * @throws \InvalidArgumentException for invalid hostnames.
+     */
+    public function withHost($host);
+
+    /**
+     * Return an instance with the specified port.
+     *
+     * This method MUST retain the state of the current instance, and return
+     * an instance that contains the specified port.
+     *
+     * Implementations MUST raise an exception for ports outside the
+     * established TCP and UDP port ranges.
+     *
+     * A null value provided for the port is equivalent to removing the port
+     * information.
+     *
+     * @param null|int $port The port to use with the new instance; a null value
+     *     removes the port information.
+     * @return self A new instance with the specified port.
+     * @throws \InvalidArgumentException for invalid ports.
+     */
+    public function withPort($port);
+
+    /**
+     * Return an instance with the specified path.
+     *
+     * This method MUST retain the state of the current instance, and return
+     * an instance that contains the specified path.
+     *
+     * The path can either be empty or absolute (starting with a slash) or
+     * rootless (not starting with a slash). Implementations MUST support all
+     * three syntaxes.
+     *
+     * If the path is intended to be domain-relative rather than path relative then
+     * it must begin with a slash ("/"). Paths not starting with a slash ("/")
+     * are assumed to be relative to some base path known to the application or
+     * consumer.
+     *
+     * Users can provide both encoded and decoded path characters.
+     * Implementations ensure the correct encoding as outlined in getPath().
+     *
+     * @param string $path The path to use with the new instance.
+     * @return self A new instance with the specified path.
+     * @throws \InvalidArgumentException for invalid paths.
+     */
+    public function withPath($path);
+
+    /**
+     * Return an instance with the specified query string.
+     *
+     * This method MUST retain the state of the current instance, and return
+     * an instance that contains the specified query string.
+     *
+     * Users can provide both encoded and decoded query characters.
+     * Implementations ensure the correct encoding as outlined in getQuery().
+     *
+     * An empty query string value is equivalent to removing the query string.
+     *
+     * @param string $query The query string to use with the new instance.
+     * @return self A new instance with the specified query string.
+     * @throws \InvalidArgumentException for invalid query strings.
+     */
+    public function withQuery($query);
+
+    /**
+     * Return an instance with the specified URI fragment.
+     *
+     * This method MUST retain the state of the current instance, and return
+     * an instance that contains the specified URI fragment.
+     *
+     * Users can provide both encoded and decoded fragment characters.
+     * Implementations ensure the correct encoding as outlined in getFragment().
+     *
+     * An empty fragment value is equivalent to removing the fragment.
+     *
+     * @param string $fragment The fragment to use with the new instance.
+     * @return self A new instance with the specified fragment.
+     */
+    public function withFragment($fragment);
+
+    /**
+     * Return the string representation as a URI reference.
+     *
+     * Depending on which components of the URI are present, the resulting
+     * string is either a full URI or relative reference according to RFC 3986,
+     * Section 4.1. The method concatenates the various components of the URI,
+     * using the appropriate delimiters:
+     *
+     * - If a scheme is present, it MUST be suffixed by ":".
+     * - If an authority is present, it MUST be prefixed by "//".
+     * - The path can be concatenated without delimiters. But there are two
+     *   cases where the path has to be adjusted to make the URI reference
+     *   valid as PHP does not allow to throw an exception in __toString():
+     *     - If the path is rootless and an authority is present, the path MUST
+     *       be prefixed by "/".
+     *     - If the path is starting with more than one "/" and no authority is
+     *       present, the starting slashes MUST be reduced to one.
+     * - If a query is present, it MUST be prefixed by "?".
+     * - If a fragment is present, it MUST be prefixed by "#".
+     *
+     * @see http://tools.ietf.org/html/rfc3986#section-4.1
+     * @return string
+     */
+    public function __toString();
+}
diff --git a/core/vendor/react/promise/.travis.yml b/core/vendor/react/promise/.travis.yml
deleted file mode 100644
index e26d91aae..000000000
--- a/core/vendor/react/promise/.travis.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-language: php
-
-php:
-  - 5.4
-  - 5.5
-  - 5.6
-  - hhvm
-
-before_script:
-  - composer self-update
-  - composer install --dev --prefer-source
-
-script: phpunit --coverage-text
diff --git a/core/vendor/react/promise/CHANGELOG.md b/core/vendor/react/promise/CHANGELOG.md
deleted file mode 100644
index f2d16543d..000000000
--- a/core/vendor/react/promise/CHANGELOG.md
+++ /dev/null
@@ -1,60 +0,0 @@
-CHANGELOG
-=========
-
-* 2.2.0 (2014-12-30)
-
-  * Introduce new ExtendedPromiseInterface implemented by all promises
-  * Add new .done() method (part of the ExtendedPromiseInterface)
-  * Add new .otherwise() method (part of the ExtendedPromiseInterface)
-  * Add new .always() method (part of the ExtendedPromiseInterface)
-  * Add new .progress() method (part of the ExtendedPromiseInterface)
-  * Rename Deferred::progress to Deferred::notify to avoid confusion with
-    ExtendedPromiseInterface::progress (a Deferred::progress alias is still
-    available for backward compatibility)
-  * resolve() now always returns a ExtendedPromiseInterface
-
-* 2.1.0 (2014-10-15)
-
-  * Introduce new CancellablePromiseInterface implemented by all promises
-  * Add new .cancel() method (part of the CancellablePromiseInterface)
-
-* 2.0.0 (2013-12-10)
-
-  New major release. The goal was to streamline the API and to make it more
-  compliant with other promise libraries and especially with the new upcoming
-  [ES6 promises specification](https://github.com/domenic/promises-unwrapping/).
-
-  * Add standalone Promise class.
-  * Add new React\Promise\race() function.
-  * BC break: Bump minimum PHP version to PHP 5.4.
-  * BC break: Remove ResolverInterface and PromiseInterface from Deferred.
-  * BC break: Change signature of PromiseInterface.
-  * BC break: Remove When and Util classes and move static methods to functions.
-  * BC break: FulfilledPromise and RejectedPromise now throw an exception when
-    initialized with a promise instead of a value/reason.
-  * BC break: React\Promise\Deferred::resolve() and React\Promise\Deferred::reject()
-    no longer return a promise.
-
-* 1.0.4 (2013-04-03)
-
-  * Trigger PHP errors when invalid callback is passed.
-  * Fully resolve rejection value before calling rejection handler.
-  * Add When::lazy() to create lazy promises which will be initialized once a
-    consumer calls the then() method.
-
-* 1.0.3 (2012-11-17)
-
-  * Add `PromisorInterface` for objects that have a `promise()` method.
-
-* 1.0.2 (2012-11-14)
-
-  * Fix bug in When::any() not correctly unwrapping to a single result value
-  * $promiseOrValue argument of When::resolve() and When::reject() is now optional
-
-* 1.0.1 (2012-11-13)
-
-  * Prevent deep recursion which was reaching `xdebug.max_nesting_level` default of 100
-
-* 1.0.0 (2012-11-07)
-
-  * First tagged release
diff --git a/core/vendor/react/promise/LICENSE b/core/vendor/react/promise/LICENSE
deleted file mode 100644
index 9bfcd4113..000000000
--- a/core/vendor/react/promise/LICENSE
+++ /dev/null
@@ -1,22 +0,0 @@
-Copyright (c) 2012 Jan Sorgalla
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
diff --git a/core/vendor/react/promise/README.md b/core/vendor/react/promise/README.md
deleted file mode 100644
index 0be869ebc..000000000
--- a/core/vendor/react/promise/README.md
+++ /dev/null
@@ -1,824 +0,0 @@
-React/Promise
-=============
-
-A lightweight implementation of
-[CommonJS Promises/A](http://wiki.commonjs.org/wiki/Promises/A) for PHP.
-
-[![Build Status](https://secure.travis-ci.org/reactphp/promise.png?branch=master)](http://travis-ci.org/reactphp/promise)
-
-Table of Contents
------------------
-
-1. [Introduction](#introduction)
-2. [Concepts](#concepts)
-   * [Deferred](#deferred)
-   * [Promise](#promise)
-3. [API](#api)
-   * [Deferred](#deferred-1)
-     * [Deferred::promise()](#deferredpromise)
-     * [Deferred::resolve()](#deferredresolve)
-     * [Deferred::reject()](#deferredreject)
-     * [Deferred::notify()](#deferrednotify)
-   * [PromiseInterface](#promiseinterface)
-     * [PromiseInterface::then()](#promiseinterfacethen)
-   * [ExtendedPromiseInterface](#extendedpromiseinterface)
-        * [ExtendedPromiseInterface::done()](#extendedpromiseinterfacedone)
-        * [ExtendedPromiseInterface::otherwise()](#extendedpromiseinterfaceotherwise)
-        * [ExtendedPromiseInterface::always()](#extendedpromiseinterfacealways)
-        * [ExtendedPromiseInterface::progress()](#extendedpromiseinterfaceprogress)
-   * [CancellablePromiseInterface](#cancellablepromiseinterface)
-        * [CancellablePromiseInterface::cancel()](#cancellablepromiseinterfacecancel)
-   * [Promise](#promise-1)
-   * [FulfilledPromise](#fulfilledpromise)
-   * [RejectedPromise](#rejectedpromise)
-   * [LazyPromise](#lazypromise)
-   * [Functions](#functions)
-     * [resolve()](#resolve)
-     * [reject()](#reject)
-     * [all()](#all)
-     * [race()](#race)
-     * [any()](#any)
-     * [some()](#some)
-     * [map()](#map)
-     * [reduce()](#reduce)
-   * [PromisorInterface](#promisorinterface)
-4. [Examples](#examples)
-   * [How to use Deferred](#how-to-use-deferred)
-   * [How promise forwarding works](#how-promise-forwarding-works)
-     * [Resolution forwarding](#resolution-forwarding)
-     * [Rejection forwarding](#rejection-forwarding)
-     * [Mixed resolution and rejection forwarding](#mixed-resolution-and-rejection-forwarding)
-     * [Progress event forwarding](#progress-event-forwarding)
-   * [done() vs. then()](#done-vs-then)
-5. [Credits](#credits)
-6. [License](#license)
-
-Introduction
-------------
-
-React/Promise is a library implementing
-[CommonJS Promises/A](http://wiki.commonjs.org/wiki/Promises/A) for PHP.
-
-It also provides several other useful promise-related concepts, such as joining
-multiple promises and mapping and reducing collections of promises.
-
-If you've never heard about promises before,
-[read this first](https://gist.github.com/3889970).
-
-Concepts
---------
-
-### Deferred
-
-A **Deferred** represents a computation or unit of work that may not have
-completed yet. Typically (but not always), that computation will be something
-that executes asynchronously and completes at some point in the future.
-
-### Promise
-
-While a deferred represents the computation itself, a **Promise** represents
-the result of that computation. Thus, each deferred has a promise that acts as
-a placeholder for its actual result.
-
-API
----
-
-### Deferred
-
-A deferred represents an operation whose resolution is pending. It has separate
-promise and resolver parts.
-
-```php
-$deferred = new React\Promise\Deferred();
-
-$promise = $deferred->promise();
-
-$deferred->resolve(mixed $value = null);
-$deferred->reject(mixed $reason = null);
-$deferred->notify(mixed $update = null);
-```
-
-The `promise` method returns the promise of the deferred.
-
-The `resolve` and `reject` methods control the state of the deferred.
-
-The `notify` method is for progress notification.
-
-The constructor of the `Deferred` accepts an optional `$canceller` argument.
-See [Promise](#promise-1) for more information.
-
-#### Deferred::promise()
-
-```php
-$promise = $deferred->promise();
-```
-
-Returns the promise of the deferred, which you can hand out to others while
-keeping the authority to modify its state to yourself.
-
-#### Deferred::resolve()
-
-```php
-$deferred->resolve(mixed $value = null);
-```
-
-Resolves the promise returned by `promise()`. All consumers are notified by
-having `$onFulfilled` (which they registered via `$promise->then()`) called with
-`$value`.
-
-If `$value` itself is a promise, the promise will transition to the state of
-this promise once it is resolved.
-
-#### Deferred::reject()
-
-```php
-$deferred->reject(mixed $reason = null);
-```
-
-Rejects the promise returned by `promise()`, signalling that the deferred's
-computation failed.
-All consumers are notified by having `$onRejected` (which they registered via
-`$promise->then()`) called with `$reason`.
-
-If `$reason` itself is a promise, the promise will be rejected with the outcome
-of this promise regardless whether it fulfills or rejects.
-
-#### Deferred::notify()
-
-```php
-$deferred->notify(mixed $update = null);
-```
-
-Triggers progress notifications, to indicate to consumers that the computation
-is making progress toward its result.
-
-All consumers are notified by having `$onProgress` (which they registered via
-`$promise->then()`) called with `$update`.
-
-### PromiseInterface
-
-The promise interface provides the common interface for all promise
-implementations.
-
-A promise represents an eventual outcome, which is either fulfillment (success)
-and an associated value, or rejection (failure) and an associated reason.
-
-Once in the fulfilled or rejected state, a promise becomes immutable.
-Neither its state nor its result (or error) can be modified.
-
-#### Implementations
-
-* [Promise](#promise-1)
-* [FulfilledPromise](#fulfilledpromise)
-* [RejectedPromise](#rejectedpromise)
-* [LazyPromise](#lazypromise)
-
-#### PromiseInterface::then()
-
-```php
-$transformedPromise = $promise->then(callable $onFulfilled = null, callable $onRejected = null, callable $onProgress = null);
-```
-
-Transforms a promise's value by applying a function to the promise's fulfillment
-or rejection value. Returns a new promise for the transformed result.
-
-The `then()` method registers new fulfilled, rejection and progress handlers
-with a promise (all parameters are optional):
-
-  * `$onFulfilled` will be invoked once the promise is fulfilled and passed
-    the result as the first argument.
-  * `$onRejected` will be invoked once the promise is rejected and passed the
-    reason as the first argument.
-  * `$onProgress` will be invoked whenever the producer of the promise
-    triggers progress notifications and passed a single argument (whatever it
-    wants) to indicate progress.
-
-It returns a new promise that will fulfill with the return value of either
-`$onFulfilled` or `$onRejected`, whichever is called, or will reject with
-the thrown exception if either throws.
-
-A promise makes the following guarantees about handlers registered in
-the same call to `then()`:
-
-  1. Only one of `$onFulfilled` or `$onRejected` will be called,
-     never both.
-  2. `$onFulfilled` and `$onRejected` will never be called more
-     than once.
-  3. `$onProgress` may be called multiple times.
-
-#### See also
-
-* [resolve()](#resolve) - Creating a resolved promise
-* [reject()](#reject) - Creating a rejected promise
-* [ExtendedPromiseInterface::done()](#extendedpromiseinterfacedone)
-* [done() vs. then()](#done-vs-then)
-
-### ExtendedPromiseInterface
-
-The ExtendedPromiseInterface extends the PromiseInterface with useful shortcut
-and utility methods which are not part of the Promises/A specification.
-
-#### Implementations
-
-* [Promise](#promise-1)
-* [FulfilledPromise](#fulfilledpromise)
-* [RejectedPromise](#rejectedpromise)
-* [LazyPromise](#lazypromise)
-
-#### ExtendedPromiseInterface::done()
-
-```php
-$promise->done(callable $onFulfilled = null, callable $onRejected = null, callable $onProgress = null);
-```
-
-Consumes the promise's ultimate value if the promise fulfills, or handles the
-ultimate error.
-
-It will cause a fatal error if either `$onFulfilled` or `$onRejected` throw or
-return a rejected promise.
-
-Since the purpose of `done()` is consumption rather than transformation,
-`done()` always returns `null`.
-
-#### See also
-
-* [PromiseInterface::then()](#promiseinterfacethen)
-* [done() vs. then()](#done-vs-then)
-
-#### ExtendedPromiseInterface::otherwise()
-
-```php
-$promise->otherwise(callable $onRejected);
-```
-
-Registers a rejection handler for promise. It is a shortcut for:
-
-```php
-$promise->then(null, $onRejected);
-```
-
-Additionally, you can type hint the `$reason` argument of `$onRejected` to catch
-only specific errors.
-
-```php
-$promise
-    ->otherwise(function (\RuntimeException $reason) {
-        // Only catch \RuntimeException instances
-        // All other types of errors will propagate automatically
-    })
-    ->otherwise(function ($reason) {
-        // Catch other errors
-    )};
-```
-
-#### ExtendedPromiseInterface::always()
-
-```php
-$newPromise = $promise->always(callable $onFulfilledOrRejected);
-```
-
-Allows you to execute "cleanup" type tasks in a promise chain.
-
-It arranges for `$onFulfilledOrRejected` to be called, with no arguments,
-when the promise is either fulfilled or rejected.
-
-* If `$promise` fulfills, and `$onFulfilledOrRejected` returns successfully,
-  `$newPromise` will fulfill with the same value as `$promise`.
-* If `$promise` fulfills, and `$onFulfilledOrRejected` throws or returns a
-  rejected promise, `$newPromise` will reject with the thrown exception or
-  rejected promise's reason.
-* If `$promise` rejects, and `$onFulfilledOrRejected` returns successfully,
-  `$newPromise` will reject with the same reason as `$promise`.
-* If `$promise` rejects, and `$onFulfilledOrRejected` throws or returns a
-  rejected promise, `$newPromise` will reject with the thrown exception or
-  rejected promise's reason.
-
-`always()` behaves similarly to the synchronous finally statement. When combined
-with `otherwise()`, `always()` allows you to write code that is similar to the familiar
-synchronous catch/finally pair.
-
-Consider the following synchronous code:
-
-```php
-try {
-  return doSomething();
-} catch(\Exception $e) {
-    return handleError($e);
-} finally {
-    cleanup();
-}
-```
-
-Similar asynchronous code (with `doSomething()` that returns a promise) can be
-written:
-
-```php
-return doSomething()
-    ->otherwise('handleError')
-    ->always('cleanup');
-```
-
-#### ExtendedPromiseInterface::progress()
-
-```php
-$promise->progress(callable $onProgress);
-```
-
-Registers a handler for progress updates from promise. It is a shortcut for:
-
-```php
-$promise->then(null, null, $onProgress);
-```
-
-### CancellablePromiseInterface
-
-A cancellable promise provides a mechanism for consumers to notify the creator
-of the promise that they are not longer interested in the result of an
-operation.
-
-#### CancellablePromiseInterface::cancel()
-
-``` php
-$promise->cancel();
-```
-
-The `cancel()` method notifies the creator of the promise that there is no
-further interest in the results of the operation.
-
-Once a promise is settled (either fulfilled or rejected), calling `cancel()` on
-a promise has no effect.
-
-#### Implementations
-
-* [Promise](#promise-1)
-* [FulfilledPromise](#fulfilledpromise)
-* [RejectedPromise](#rejectedpromise)
-* [LazyPromise](#lazypromise)
-
-### Promise
-
-Creates a promise whose state is controlled by the functions passed to
-`$resolver`.
-
-```php
-$resolver = function (callable $resolve, callable $reject, callable $notify) {
-    // Do some work, possibly asynchronously, and then
-    // resolve or reject. You can notify of progress events
-    // along the way if you want/need.
-
-    $resolve($awesomeResult);
-    // or $resolve($anotherPromise);
-    // or $reject($nastyError);
-    // or $notify($progressNotification);
-};
-
-$canceller = function (callable $resolve, callable $reject, callable $progress) {
-    // Cancel/abort any running operations like network connections, streams etc.
-
-    $reject(new \Exception('Promise cancelled'));
-};
-
-$promise = new React\Promise\Promise($resolver, $canceller);
-```
-
-The promise constructor receives a resolver function and an optional canceller
-function which both will be called with 3 arguments:
-
-  * `$resolve($value)` - Primary function that seals the fate of the
-    returned promise. Accepts either a non-promise value, or another promise.
-    When called with a non-promise value, fulfills promise with that value.
-    When called with another promise, e.g. `$resolve($otherPromise)`, promise's
-    fate will be equivalent to that of `$otherPromise`.
-  * `$reject($reason)` - Function that rejects the promise.
-  * `$notify($update)` - Function that issues progress events for the promise.
-
-If the resolver or canceller throw an exception, the promise will be rejected
-with that thrown exception as the rejection reason.
-
-The resolver function will be called immediately, the canceller function only
-once all consumers called the `cancel()` method of the promise.
-
-### FulfilledPromise
-
-Creates a already fulfilled promise.
-
-```php
-$promise = React\Promise\FulfilledPromise($value);
-```
-
-Note, that `$value` **cannot** be a promise. It's recommended to use
-[resolve()](#resolve) for creating resolved promises.
-
-### RejectedPromise
-
-Creates a already rejected promise.
-
-```php
-$promise = React\Promise\RejectedPromise($reason);
-```
-
-Note, that `$reason` **cannot** be a promise. It's recommended to use
-[reject()](#reject) for creating rejected promises.
-
-### LazyPromise
-
-Creates a promise which will be lazily initialized by `$factory` once a consumer
-calls the `then()` method.
-
-```php
-$factory = function () {
-    $deferred = new React\Promise\Deferred();
-
-    // Do some heavy stuff here and resolve the deferred once completed
-
-    return $deferred->promise();
-};
-
-$promise = React\Promise\LazyPromise($factory);
-
-// $factory will only be executed once we call then()
-$promise->then(function ($value) {
-});
-```
-
-### Functions
-
-Useful functions for creating, joining, mapping and reducing collections of
-promises.
-
-#### resolve()
-
-```php
-$promise = React\Promise\resolve(mixed $promiseOrValue);
-```
-
-Creates a promise for the supplied `$promiseOrValue`.
-
-If `$promiseOrValue` is a value, it will be the resolution value of the
-returned promise.
-
-If `$promiseOrValue` is a promise, it will simply be returned.
-
-Note: The promise returned is always a promise implementing
-[ExtendedPromiseInterface](#extendedpromiseinterface). If you pass in a custom
-promise which only implements [PromiseInterface](#promiseinterface), this
-promise will be assimilated to a extended promise following `$promiseOrValue`.
-
-#### reject()
-
-```php
-$promise = React\Promise\reject(mixed $promiseOrValue);
-```
-
-Creates a rejected promise for the supplied `$promiseOrValue`.
-
-If `$promiseOrValue` is a value, it will be the rejection value of the
-returned promise.
-
-If `$promiseOrValue` is a promise, its completion value will be the rejected
-value of the returned promise.
-
-This can be useful in situations where you need to reject a promise without
-throwing an exception. For example, it allows you to propagate a rejection with
-the value of another promise.
-
-#### all()
-
-```php
-$promise = React\Promise\all(array|React\Promise\PromiseInterface $promisesOrValues);
-```
-
-Returns a promise that will resolve only once all the items in
-`$promisesOrValues` have resolved. The resolution value of the returned promise
-will be an array containing the resolution values of each of the items in
-`$promisesOrValues`.
-
-#### race()
-
-```php
-$promise = React\Promise\race(array|React\Promise\PromiseInterface $promisesOrValues);
-```
-
-Initiates a competitive race that allows one winner. Returns a promise which is
-resolved in the same way the first settled promise resolves.
-
-#### any()
-
-```php
-$promise = React\Promise\any(array|React\Promise\PromiseInterface $promisesOrValues);
-```
-
-Returns a promise that will resolve when any one of the items in
-`$promisesOrValues` resolves. The resolution value of the returned promise
-will be the resolution value of the triggering item.
-
-The returned promise will only reject if *all* items in `$promisesOrValues` are
-rejected. The rejection value will be an array of all rejection reasons.
-
-#### some()
-
-```php
-$promise = React\Promise\some(array|React\Promise\PromiseInterface $promisesOrValues, integer $howMany);
-```
-
-Returns a promise that will resolve when `$howMany` of the supplied items in
-`$promisesOrValues` resolve. The resolution value of the returned promise
-will be an array of length `$howMany` containing the resolution values of the
-triggering items.
-
-The returned promise will reject if it becomes impossible for `$howMany` items
-to resolve (that is, when `(count($promisesOrValues) - $howMany) + 1` items
-reject). The rejection value will be an array of
-`(count($promisesOrValues) - $howMany) + 1` rejection reasons.
-
-#### map()
-
-```php
-$promise = React\Promise\map(array|React\Promise\PromiseInterface $promisesOrValues, callable $mapFunc);
-```
-
-Traditional map function, similar to `array_map()`, but allows input to contain
-promises and/or values, and `$mapFunc` may return either a value or a promise.
-
-The map function receives each item as argument, where item is a fully resolved
-value of a promise or value in `$promisesOrValues`.
-
-#### reduce()
-
-```php
-$promise = React\Promise\reduce(array|React\Promise\PromiseInterface $promisesOrValues, callable $reduceFunc , $initialValue = null);
-```
-
-Traditional reduce function, similar to `array_reduce()`, but input may contain
-promises and/or values, and `$reduceFunc` may return either a value or a
-promise, *and* `$initialValue` may be a promise or a value for the starting
-value.
-
-### PromisorInterface
-
-The `React\Promise\PromisorInterface` provides a common interface for objects
-that provide a promise. `React\Promise\Deferred` implements it, but since it
-is part of the public API anyone can implement it.
-
-Examples
---------
-
-### How to use Deferred
-
-```php
-function getAwesomeResultPromise()
-{
-    $deferred = new React\Promise\Deferred();
-
-    // Execute a Node.js-style function using the callback pattern
-    computeAwesomeResultAsynchronously(function ($error, $result) use ($deferred) {
-        if ($error) {
-            $deferred->reject($error);
-        } else {
-            $deferred->resolve($result);
-        }
-    });
-
-    // Return the promise
-    return $deferred->promise();
-}
-
-getAwesomeResultPromise()
-    ->then(
-        function ($value) {
-            // Deferred resolved, do something with $value
-        },
-        function ($reason) {
-            // Deferred rejected, do something with $reason
-        },
-        function ($update) {
-            // Progress notification triggered, do something with $update
-        }
-    );
-```
-
-### How promise forwarding works
-
-A few simple examples to show how the mechanics of Promises/A forwarding works.
-These examples are contrived, of course, and in real usage, promise chains will
-typically be spread across several function calls, or even several levels of
-your application architecture.
-
-#### Resolution forwarding
-
-Resolved promises forward resolution values to the next promise.
-The first promise, `$deferred->promise()`, will resolve with the value passed
-to `$deferred->resolve()` below.
-
-Each call to `then()` returns a new promise that will resolve with the return
-value of the previous handler. This creates a promise "pipeline".
-
-```php
-$deferred = new React\Promise\Deferred();
-
-$deferred->promise()
-    ->then(function ($x) {
-        // $x will be the value passed to $deferred->resolve() below
-        // and returns a *new promise* for $x + 1
-        return $x + 1;
-    })
-    ->then(function ($x) {
-        // $x === 2
-        // This handler receives the return value of the
-        // previous handler.
-        return $x + 1;
-    })
-    ->then(function ($x) {
-        // $x === 3
-        // This handler receives the return value of the
-        // previous handler.
-        return $x + 1;
-    })
-    ->then(function ($x) {
-        // $x === 4
-        // This handler receives the return value of the
-        // previous handler.
-        echo 'Resolve ' . $x;
-    });
-
-$deferred->resolve(1); // Prints "Resolve 4"
-```
-
-#### Rejection forwarding
-
-Rejected promises behave similarly, and also work similarly to try/catch:
-When you catch an exception, you must rethrow for it to propagate.
-
-Similarly, when you handle a rejected promise, to propagate the rejection,
-"rethrow" it by either returning a rejected promise, or actually throwing
-(since promise translates thrown exceptions into rejections)
-
-```php
-$deferred = new React\Promise\Deferred();
-
-$deferred->promise()
-    ->then(function ($x) {
-        throw new \Exception($x + 1);
-    })
-    ->then(null, function (\Exception $x) {
-        // Propagate the rejection
-        throw $x;
-    })
-    ->then(null, function (\Exception $x) {
-        // Can also propagate by returning another rejection
-        return React\Promise\reject((integer) $x->getMessage() + 1);
-    })
-    ->then(null, function ($x) {
-        echo 'Reject ' . $x; // 3
-    });
-
-$deferred->resolve(1);  // Prints "Reject 3"
-```
-
-#### Mixed resolution and rejection forwarding
-
-Just like try/catch, you can choose to propagate or not. Mixing resolutions and
-rejections will still forward handler results in a predictable way.
-
-```php
-$deferred = new React\Promise\Deferred();
-
-$deferred->promise()
-    ->then(function ($x) {
-        return $x + 1;
-    })
-    ->then(function ($x) {
-        throw \Exception($x + 1);
-    })
-    ->then(null, function (\Exception $x) {
-        // Handle the rejection, and don't propagate.
-        // This is like catch without a rethrow
-        return (integer) $x->getMessage() + 1;
-    })
-    ->then(function ($x) {
-        echo 'Mixed ' . $x; // 4
-    });
-
-$deferred->resolve(1);  // Prints "Mixed 4"
-```
-
-#### Progress event forwarding
-
-In the same way as resolution and rejection handlers, your progress handler
-**MUST** return a progress event to be propagated to the next link in the chain.
-If you return nothing, `null` will be propagated.
-
-Also in the same way as resolutions and rejections, if you don't register a
-progress handler, the update will be propagated through.
-
-If your progress handler throws an exception, the exception will be propagated
-to the next link in the chain. The best thing to do is to ensure your progress
-handlers do not throw exceptions.
-
-This gives you the opportunity to transform progress events at each step in the
-chain so that they are meaningful to the next step. It also allows you to choose
-not to transform them, and simply let them propagate untransformed, by not
-registering a progress handler.
-
-```php
-$deferred = new React\Promise\Deferred();
-
-$deferred->promise()
-    ->progress(function ($update) {
-        return $update + 1;
-    })
-    ->progress(function ($update) {
-        echo 'Progress ' . $update; // 2
-    });
-
-$deferred->notify(1);  // Prints "Progress 2"
-```
-
-### done() vs. then()
-
-The golden rule is:
-
-    Either return your promise, or call done() on it.
-
-At a first glance, `then()` and `done()` seem very similar. However, there are
-important distinctions.
-
-The intent of `then()` is to transform a promise's value and to pass or return
-a new promise for the transformed value along to other parts of your code.
-
-The intent of `done()` is to consume a promise's value, transferring
-responsibility for the value to your code.
-
-In addition to transforming a value, `then()` allows you to recover from, or
-propagate intermediate errors. Any errors that are not handled will be caught
-by the promise machinery and used to reject the promise returned by `then()`.
-
-Calling `done()` transfers all responsibility for errors to your code. If an
-error (either a thrown exception or returned rejection) escapes the
-`$onFulfilled` or `$onRejected` callbacks you provide to done, it will be
-rethrown in an uncatchable way causing a fatal error.
-
-```php
-function getJsonResult()
-{
-    return queryApi()
-        ->then(
-            // Transform API results to an object
-            function ($jsonResultString) {
-                return json_decode($jsonResultString);
-            },
-            // Transform API errors to an exception
-            function ($jsonErrorString) {
-                $object = json_decode($jsonErrorString);
-                throw new ApiErrorException($object->errorMessage);
-            }
-        );
-}
-
-// Here we provide no rejection handler.
-// If the promise returned has been rejected,
-// a React\Promise\UnhandledRejectionException will be thrown
-getJsonResult()
-    ->done(
-        // Consume transformed object
-        function ($jsonResultObject) {
-            // Do something with $jsonObject
-        }
-    );
-
-// Here we provide a rejection handler which will either throw while debugging
-// or log the exception.
-getJsonResult()
-    ->done(
-        function ($jsonObject) {
-            // Do something with $jsonObject
-        },
-        function (ApiErrorException $exception) {
-            if (isDebug()) {
-                throw $e;
-            } else {
-                logException($exception);
-            }
-        }
-    );
-```
-
-Note that if a rejection value is not an instance of `\Exception`, it will be
-wrapped in an exception of the type `React\Promise\UnhandledRejectionException`.
-
-You can get the original rejection reason by calling `$exception->getReason()`.
-
-Credits
--------
-
-React/Promise is a port of [when.js](https://github.com/cujojs/when)
-by [Brian Cavalier](https://github.com/briancavalier).
-
-Also, large parts of the documentation have been ported from the when.js
-[Wiki](https://github.com/cujojs/when/wiki) and the
-[API docs](https://github.com/cujojs/when/blob/master/docs/api.md).
-
-License
--------
-
-React/Promise is released under the [MIT](https://github.com/reactphp/promise/blob/master/LICENSE) license.
diff --git a/core/vendor/react/promise/composer.json b/core/vendor/react/promise/composer.json
deleted file mode 100644
index c428b7ba6..000000000
--- a/core/vendor/react/promise/composer.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "name": "react/promise",
-    "description": "A lightweight implementation of CommonJS Promises/A for PHP",
-    "license": "MIT",
-    "authors": [
-        {"name": "Jan Sorgalla", "email": "jsorgalla@googlemail.com"}
-    ],
-    "require": {
-        "php": ">=5.4.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "React\\Promise\\": "src/"
-        },
-        "files": ["src/functions_include.php"]
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.0-dev"
-        }
-    }
-}
diff --git a/core/vendor/react/promise/src/CancellablePromiseInterface.php b/core/vendor/react/promise/src/CancellablePromiseInterface.php
deleted file mode 100644
index 896db2d37..000000000
--- a/core/vendor/react/promise/src/CancellablePromiseInterface.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-namespace React\Promise;
-
-interface CancellablePromiseInterface extends PromiseInterface
-{
-    /**
-     * @return void
-     */
-    public function cancel();
-}
diff --git a/core/vendor/react/promise/src/Deferred.php b/core/vendor/react/promise/src/Deferred.php
deleted file mode 100644
index f23980c31..000000000
--- a/core/vendor/react/promise/src/Deferred.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-namespace React\Promise;
-
-class Deferred implements PromisorInterface
-{
-    private $promise;
-    private $resolveCallback;
-    private $rejectCallback;
-    private $notifyCallback;
-    private $canceller;
-
-    public function __construct(callable $canceller = null)
-    {
-        $this->canceller = $canceller;
-    }
-
-    public function promise()
-    {
-        if (null === $this->promise) {
-            $this->promise = new Promise(function ($resolve, $reject, $notify) {
-                $this->resolveCallback = $resolve;
-                $this->rejectCallback  = $reject;
-                $this->notifyCallback  = $notify;
-            }, $this->canceller);
-        }
-
-        return $this->promise;
-    }
-
-    public function resolve($value = null)
-    {
-        $this->promise();
-
-        call_user_func($this->resolveCallback, $value);
-    }
-
-    public function reject($reason = null)
-    {
-        $this->promise();
-
-        call_user_func($this->rejectCallback, $reason);
-    }
-
-    public function notify($update = null)
-    {
-        $this->promise();
-
-        call_user_func($this->notifyCallback, $update);
-    }
-
-    /**
-     * @deprecated 2.2.0
-     * @see Deferred::notify()
-     */
-    public function progress($update = null)
-    {
-        $this->notify($update);
-    }
-}
diff --git a/core/vendor/react/promise/src/ExtendedPromiseInterface.php b/core/vendor/react/promise/src/ExtendedPromiseInterface.php
deleted file mode 100644
index 9cb643598..000000000
--- a/core/vendor/react/promise/src/ExtendedPromiseInterface.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace React\Promise;
-
-interface ExtendedPromiseInterface extends PromiseInterface
-{
-    /**
-     * @return void
-     */
-    public function done(callable $onFulfilled = null, callable $onRejected = null, callable $onProgress = null);
-
-    /**
-     * @return ExtendedPromiseInterface
-     */
-    public function otherwise(callable $onRejected);
-
-    /**
-     * @return ExtendedPromiseInterface
-     */
-    public function always(callable $onFulfilledOrRejected);
-
-    /**
-     * @return ExtendedPromiseInterface
-     */
-    public function progress(callable $onProgress);
-}
diff --git a/core/vendor/react/promise/src/FulfilledPromise.php b/core/vendor/react/promise/src/FulfilledPromise.php
deleted file mode 100644
index cd3665929..000000000
--- a/core/vendor/react/promise/src/FulfilledPromise.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-namespace React\Promise;
-
-class FulfilledPromise implements ExtendedPromiseInterface, CancellablePromiseInterface
-{
-    private $value;
-
-    public function __construct($value = null)
-    {
-        if ($value instanceof PromiseInterface) {
-            throw new \InvalidArgumentException('You cannot create React\Promise\FulfilledPromise with a promise. Use React\Promise\resolve($promiseOrValue) instead.');
-        }
-
-        $this->value = $value;
-    }
-
-    public function then(callable $onFulfilled = null, callable $onRejected = null, callable $onProgress = null)
-    {
-        try {
-            $value = $this->value;
-
-            if (null !== $onFulfilled) {
-                $value = $onFulfilled($value);
-            }
-
-            return resolve($value);
-        } catch (\Exception $exception) {
-            return new RejectedPromise($exception);
-        }
-    }
-
-    public function done(callable $onFulfilled = null, callable $onRejected = null, callable $onProgress = null)
-    {
-        if (null === $onFulfilled) {
-            return;
-        }
-
-        $result = $onFulfilled($this->value);
-
-        if ($result instanceof ExtendedPromiseInterface) {
-            $result->done();
-        }
-    }
-
-    public function otherwise(callable $onRejected)
-    {
-        return new FulfilledPromise($this->value);
-    }
-
-    public function always(callable $onFulfilledOrRejected)
-    {
-        return $this->then(function ($value) use ($onFulfilledOrRejected) {
-            return resolve($onFulfilledOrRejected())->then(function () use ($value) {
-                return $value;
-            });
-        });
-    }
-
-    public function progress(callable $onProgress)
-    {
-        return new FulfilledPromise($this->value);
-    }
-
-    public function cancel()
-    {
-    }
-}
diff --git a/core/vendor/react/promise/src/LazyPromise.php b/core/vendor/react/promise/src/LazyPromise.php
deleted file mode 100644
index 68524a929..000000000
--- a/core/vendor/react/promise/src/LazyPromise.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-namespace React\Promise;
-
-class LazyPromise implements ExtendedPromiseInterface, CancellablePromiseInterface
-{
-    private $factory;
-    private $promise;
-
-    public function __construct(callable $factory)
-    {
-        $this->factory = $factory;
-    }
-
-    public function then(callable $onFulfilled = null, callable $onRejected = null, callable $onProgress = null)
-    {
-        return $this->promise()->then($onFulfilled, $onRejected, $onProgress);
-    }
-
-
-    public function done(callable $onFulfilled = null, callable $onRejected = null, callable $onProgress = null)
-    {
-        return $this->promise()->done($onFulfilled, $onRejected, $onProgress);
-    }
-
-    public function otherwise(callable $onRejected)
-    {
-        return $this->promise()->otherwise($onRejected);
-    }
-
-    public function always(callable $onFulfilledOrRejected)
-    {
-        return $this->promise()->always($onFulfilledOrRejected);
-    }
-
-    public function progress(callable $onProgress)
-    {
-        return $this->promise()->progress($onProgress);
-    }
-
-    public function cancel()
-    {
-        return $this->promise()->cancel();
-    }
-
-    private function promise()
-    {
-        if (null === $this->promise) {
-            try {
-                $this->promise = resolve(call_user_func($this->factory));
-            } catch (\Exception $exception) {
-                $this->promise = new RejectedPromise($exception);
-            }
-        }
-
-        return $this->promise;
-    }
-}
diff --git a/core/vendor/react/promise/src/Promise.php b/core/vendor/react/promise/src/Promise.php
deleted file mode 100644
index b2635bf30..000000000
--- a/core/vendor/react/promise/src/Promise.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-
-namespace React\Promise;
-
-class Promise implements ExtendedPromiseInterface, CancellablePromiseInterface
-{
-    private $canceller;
-    private $result;
-
-    private $handlers = [];
-    private $progressHandlers = [];
-
-    private $requiredCancelRequests = 0;
-    private $cancelRequests = 0;
-
-    public function __construct(callable $resolver, callable $canceller = null)
-    {
-        $this->canceller = $canceller;
-        $this->call($resolver);
-    }
-
-    public function then(callable $onFulfilled = null, callable $onRejected = null, callable $onProgress = null)
-    {
-        if (null !== $this->result) {
-            return $this->result->then($onFulfilled, $onRejected, $onProgress);
-        }
-
-        if (null === $this->canceller) {
-            return new static($this->resolver($onFulfilled, $onRejected, $onProgress));
-        }
-
-        $this->requiredCancelRequests++;
-
-        return new static($this->resolver($onFulfilled, $onRejected, $onProgress), function ($resolve, $reject, $progress) {
-            if (++$this->cancelRequests < $this->requiredCancelRequests) {
-                return;
-            }
-
-            $this->cancel();
-        });
-    }
-
-    public function done(callable $onFulfilled = null, callable $onRejected = null, callable $onProgress = null)
-    {
-        if (null !== $this->result) {
-            return $this->result->done($onFulfilled, $onRejected, $onProgress);
-        }
-
-        $this->handlers[] = function (PromiseInterface $promise) use ($onFulfilled, $onRejected) {
-            $promise
-                ->done($onFulfilled, $onRejected);
-        };
-
-        if ($onProgress) {
-            $this->progressHandlers[] = $onProgress;
-        }
-    }
-
-    public function otherwise(callable $onRejected)
-    {
-        return $this->then(null, function ($reason) use ($onRejected) {
-            if (!_checkTypehint($onRejected, $reason)) {
-                return new RejectedPromise($reason);
-            }
-
-            return $onRejected($reason);
-        });
-    }
-
-    public function always(callable $onFulfilledOrRejected)
-    {
-        return $this->then(function ($value) use ($onFulfilledOrRejected) {
-            return resolve($onFulfilledOrRejected())->then(function () use ($value) {
-                return $value;
-            });
-        }, function ($reason) use ($onFulfilledOrRejected) {
-            return resolve($onFulfilledOrRejected())->then(function () use ($reason) {
-                return new RejectedPromise($reason);
-            });
-        });
-    }
-
-    public function progress(callable $onProgress)
-    {
-        return $this->then(null, null, $onProgress);
-    }
-
-    public function cancel()
-    {
-        if (null === $this->canceller || null !== $this->result) {
-            return;
-        }
-
-        $this->call($this->canceller);
-    }
-
-    private function resolver(callable $onFulfilled = null, callable $onRejected = null, callable $onProgress = null)
-    {
-        return function ($resolve, $reject, $notify) use ($onFulfilled, $onRejected, $onProgress) {
-            if ($onProgress) {
-                $progressHandler = function ($update) use ($notify, $onProgress) {
-                    try {
-                        $notify($onProgress($update));
-                    } catch (\Exception $e) {
-                        $notify($e);
-                    }
-                };
-            } else {
-                $progressHandler = $notify;
-            }
-
-            $this->handlers[] = function (PromiseInterface $promise) use ($onFulfilled, $onRejected, $resolve, $reject, $progressHandler) {
-                $promise
-                    ->then($onFulfilled, $onRejected)
-                    ->done($resolve, $reject, $progressHandler);
-            };
-
-            $this->progressHandlers[] = $progressHandler;
-        };
-    }
-
-    private function resolve($value = null)
-    {
-        if (null !== $this->result) {
-            return;
-        }
-
-        $this->settle(resolve($value));
-    }
-
-    private function reject($reason = null)
-    {
-        if (null !== $this->result) {
-            return;
-        }
-
-        $this->settle(reject($reason));
-    }
-
-    private function notify($update = null)
-    {
-        if (null !== $this->result) {
-            return;
-        }
-
-        foreach ($this->progressHandlers as $handler) {
-            $handler($update);
-        }
-    }
-
-    private function settle(ExtendedPromiseInterface $promise)
-    {
-        $result = $promise;
-
-        foreach ($this->handlers as $handler) {
-            $handler($result);
-        }
-
-        $this->progressHandlers = $this->handlers = [];
-
-        $this->result = $result;
-    }
-
-    private function call(callable $callback)
-    {
-        try {
-            $callback(
-                function ($value = null) {
-                    $this->resolve($value);
-                },
-                function ($reason = null) {
-                    $this->reject($reason);
-                },
-                function ($update = null) {
-                    $this->notify($update);
-                }
-            );
-        } catch (\Exception $e) {
-            $this->reject($e);
-        }
-    }
-}
diff --git a/core/vendor/react/promise/src/PromiseInterface.php b/core/vendor/react/promise/src/PromiseInterface.php
deleted file mode 100644
index d80d11421..000000000
--- a/core/vendor/react/promise/src/PromiseInterface.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-namespace React\Promise;
-
-interface PromiseInterface
-{
-    /**
-     * @return PromiseInterface
-     */
-    public function then(callable $onFulfilled = null, callable $onRejected = null, callable $onProgress = null);
-}
diff --git a/core/vendor/react/promise/src/PromisorInterface.php b/core/vendor/react/promise/src/PromisorInterface.php
deleted file mode 100644
index 9341a4fa8..000000000
--- a/core/vendor/react/promise/src/PromisorInterface.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-namespace React\Promise;
-
-interface PromisorInterface
-{
-    /**
-     * @return PromiseInterface
-     */
-    public function promise();
-}
diff --git a/core/vendor/react/promise/src/RejectedPromise.php b/core/vendor/react/promise/src/RejectedPromise.php
deleted file mode 100644
index 350286df4..000000000
--- a/core/vendor/react/promise/src/RejectedPromise.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-namespace React\Promise;
-
-class RejectedPromise implements ExtendedPromiseInterface, CancellablePromiseInterface
-{
-    private $reason;
-
-    public function __construct($reason = null)
-    {
-        if ($reason instanceof PromiseInterface) {
-            throw new \InvalidArgumentException('You cannot create React\Promise\RejectedPromise with a promise. Use React\Promise\reject($promiseOrValue) instead.');
-        }
-
-        $this->reason = $reason;
-    }
-
-    public function then(callable $onFulfilled = null, callable $onRejected = null, callable $onProgress = null)
-    {
-        try {
-            if (null === $onRejected) {
-                return new RejectedPromise($this->reason);
-            }
-
-            return resolve($onRejected($this->reason));
-        } catch (\Exception $exception) {
-            return new RejectedPromise($exception);
-        }
-    }
-
-    public function done(callable $onFulfilled = null, callable $onRejected = null, callable $onProgress = null)
-    {
-        if (null === $onRejected) {
-            throw UnhandledRejectionException::resolve($this->reason);
-        }
-
-        $result = $onRejected($this->reason);
-
-        if ($result instanceof self) {
-            throw UnhandledRejectionException::resolve($result->reason);
-        }
-
-        if ($result instanceof ExtendedPromiseInterface) {
-            $result->done();
-        }
-    }
-
-    public function otherwise(callable $onRejected)
-    {
-        if (!_checkTypehint($onRejected, $this->reason)) {
-            return new RejectedPromise($this->reason);
-        }
-
-        return $this->then(null, $onRejected);
-    }
-
-    public function always(callable $onFulfilledOrRejected)
-    {
-        return $this->then(null, function ($reason) use ($onFulfilledOrRejected) {
-            return resolve($onFulfilledOrRejected())->then(function () use ($reason) {
-                return new RejectedPromise($reason);
-            });
-        });
-    }
-
-    public function progress(callable $onProgress)
-    {
-        return new RejectedPromise($this->reason);
-    }
-
-    public function cancel()
-    {
-    }
-}
diff --git a/core/vendor/react/promise/src/UnhandledRejectionException.php b/core/vendor/react/promise/src/UnhandledRejectionException.php
deleted file mode 100644
index ed166b30a..000000000
--- a/core/vendor/react/promise/src/UnhandledRejectionException.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace React\Promise;
-
-class UnhandledRejectionException extends \RuntimeException
-{
-    private $reason;
-
-    public static function resolve($reason)
-    {
-        if ($reason instanceof \Exception) {
-            return $reason;
-        }
-
-        return new static($reason);
-    }
-
-    public function __construct($reason)
-    {
-        $this->reason = $reason;
-
-        $message = sprintf('Unhandled Rejection: %s', json_encode($reason));
-
-        parent::__construct($message, 0);
-    }
-
-    public function getReason()
-    {
-        return $this->reason;
-    }
-}
diff --git a/core/vendor/react/promise/src/functions.php b/core/vendor/react/promise/src/functions.php
deleted file mode 100644
index 2eae6050e..000000000
--- a/core/vendor/react/promise/src/functions.php
+++ /dev/null
@@ -1,196 +0,0 @@
-<?php
-
-namespace React\Promise;
-
-function resolve($promiseOrValue = null)
-{
-    if (!$promiseOrValue instanceof PromiseInterface) {
-        return new FulfilledPromise($promiseOrValue);
-    }
-
-    if ($promiseOrValue instanceof ExtendedPromiseInterface) {
-        return $promiseOrValue;
-    }
-
-    return new Promise(function ($resolve, $reject, $notify) use ($promiseOrValue) {
-        $promiseOrValue->then($resolve, $reject, $notify);
-    });
-}
-
-function reject($promiseOrValue = null)
-{
-    if ($promiseOrValue instanceof PromiseInterface) {
-        return resolve($promiseOrValue)->then(function ($value) {
-            return new RejectedPromise($value);
-        });
-    }
-
-    return new RejectedPromise($promiseOrValue);
-}
-
-function all($promisesOrValues)
-{
-    return map($promisesOrValues, function ($val) {
-        return $val;
-    });
-}
-
-function race($promisesOrValues)
-{
-    return resolve($promisesOrValues)
-        ->then(function ($array) {
-            if (!is_array($array) || !$array) {
-                return resolve();
-            }
-
-            return new Promise(function ($resolve, $reject, $notify) use ($array) {
-                foreach ($array as $promiseOrValue) {
-                    resolve($promiseOrValue)
-                        ->done($resolve, $reject, $notify);
-                }
-            });
-        });
-}
-
-function any($promisesOrValues)
-{
-    return some($promisesOrValues, 1)
-        ->then(function ($val) {
-            return array_shift($val);
-        });
-}
-
-function some($promisesOrValues, $howMany)
-{
-    return resolve($promisesOrValues)
-        ->then(function ($array) use ($howMany) {
-            if (!is_array($array) || !$array || $howMany < 1) {
-                return resolve([]);
-            }
-
-            return new Promise(function ($resolve, $reject, $notify) use ($array, $howMany) {
-                $len       = count($array);
-                $toResolve = min($howMany, $len);
-                $toReject  = ($len - $toResolve) + 1;
-                $values    = [];
-                $reasons   = [];
-
-                foreach ($array as $i => $promiseOrValue) {
-                    $fulfiller = function ($val) use ($i, &$values, &$toResolve, $toReject, $resolve) {
-                        if ($toResolve < 1 || $toReject < 1) {
-                            return;
-                        }
-
-                        $values[$i] = $val;
-
-                        if (0 === --$toResolve) {
-                            $resolve($values);
-                        }
-                    };
-
-                    $rejecter = function ($reason) use ($i, &$reasons, &$toReject, $toResolve, $reject) {
-                        if ($toResolve < 1 || $toReject < 1) {
-                            return;
-                        }
-
-                        $reasons[$i] = $reason;
-
-                        if (0 === --$toReject) {
-                            $reject($reasons);
-                        }
-                    };
-
-                    resolve($promiseOrValue)
-                        ->done($fulfiller, $rejecter, $notify);
-                }
-            });
-        });
-}
-
-function map($promisesOrValues, callable $mapFunc)
-{
-    return resolve($promisesOrValues)
-        ->then(function ($array) use ($mapFunc) {
-            if (!is_array($array) || !$array) {
-                return resolve([]);
-            }
-
-            return new Promise(function ($resolve, $reject, $notify) use ($array, $mapFunc) {
-                $toResolve = count($array);
-                $values    = [];
-
-                foreach ($array as $i => $promiseOrValue) {
-                    resolve($promiseOrValue)
-                        ->then($mapFunc)
-                        ->done(
-                            function ($mapped) use ($i, &$values, &$toResolve, $resolve) {
-                                $values[$i] = $mapped;
-
-                                if (0 === --$toResolve) {
-                                    $resolve($values);
-                                }
-                            },
-                            $reject,
-                            $notify
-                        );
-                }
-            });
-        });
-}
-
-function reduce($promisesOrValues, callable $reduceFunc , $initialValue = null)
-{
-    return resolve($promisesOrValues)
-        ->then(function ($array) use ($reduceFunc, $initialValue) {
-            if (!is_array($array)) {
-                $array = [];
-            }
-
-            $total = count($array);
-            $i = 0;
-
-            // Wrap the supplied $reduceFunc with one that handles promises and then
-            // delegates to the supplied.
-            $wrappedReduceFunc = function ($current, $val) use ($reduceFunc, $total, &$i) {
-                return resolve($current)
-                    ->then(function ($c) use ($reduceFunc, $total, &$i, $val) {
-                        return resolve($val)
-                            ->then(function ($value) use ($reduceFunc, $total, &$i, $c) {
-                                return $reduceFunc($c, $value, $i++, $total);
-                            });
-                    });
-            };
-
-            return array_reduce($array, $wrappedReduceFunc, $initialValue);
-        });
-}
-
-// Internal functions
-function _checkTypehint(callable $callback, $object)
-{
-    if (!is_object($object)) {
-        return true;
-    }
-
-    if (is_array($callback)) {
-        $callbackReflection = new \ReflectionMethod($callback[0], $callback[1]);
-    } elseif (is_object($callback) && !$callback instanceof \Closure) {
-        $callbackReflection = new \ReflectionMethod($callback, '__invoke');
-    } else {
-        $callbackReflection = new \ReflectionFunction($callback);
-    }
-
-    $parameters = $callbackReflection->getParameters();
-
-    if (!isset($parameters[0])) {
-        return true;
-    }
-
-    $expectedException = $parameters[0];
-
-    if (!$expectedException->getClass()) {
-        return true;
-    }
-
-    return $expectedException->getClass()->isInstance($object);
-}
diff --git a/core/vendor/react/promise/src/functions_include.php b/core/vendor/react/promise/src/functions_include.php
deleted file mode 100644
index c71decbf9..000000000
--- a/core/vendor/react/promise/src/functions_include.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-if (!function_exists('React\Promise\resolve')) {
-    require __DIR__.'/functions.php';
-}
diff --git a/core/vendor/react/promise/tests/DeferredTest.php b/core/vendor/react/promise/tests/DeferredTest.php
deleted file mode 100644
index 16212e9e1..000000000
--- a/core/vendor/react/promise/tests/DeferredTest.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-namespace React\Promise;
-
-use React\Promise\PromiseAdapter\CallbackPromiseAdapter;
-
-class DeferredTest extends TestCase
-{
-    use PromiseTest\FullTestTrait;
-
-    public function getPromiseTestAdapter(callable $canceller = null)
-    {
-        $d = new Deferred($canceller);
-
-        return new CallbackPromiseAdapter([
-            'promise' => [$d, 'promise'],
-            'resolve' => [$d, 'resolve'],
-            'reject'  => [$d, 'reject'],
-            'notify'  => [$d, 'progress'],
-            'settle'  => [$d, 'resolve'],
-        ]);
-    }
-
-    /** @test */
-    public function progressIsAnAliasForNotify()
-    {
-        $deferred = new Deferred();
-
-        $sentinel = new \stdClass();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($sentinel);
-
-        $deferred->promise()
-            ->then($this->expectCallableNever(), $this->expectCallableNever(), $mock);
-
-        $deferred->progress($sentinel);
-    }
-}
diff --git a/core/vendor/react/promise/tests/FulfilledPromiseTest.php b/core/vendor/react/promise/tests/FulfilledPromiseTest.php
deleted file mode 100644
index 97fc8f6c6..000000000
--- a/core/vendor/react/promise/tests/FulfilledPromiseTest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-namespace React\Promise;
-
-use React\Promise\PromiseAdapter\CallbackPromiseAdapter;
-
-class FulfilledPromiseTest extends TestCase
-{
-    use PromiseTest\PromiseSettledTestTrait,
-        PromiseTest\PromiseFulfilledTestTrait;
-
-    public function getPromiseTestAdapter(callable $canceller = null)
-    {
-        $promise = null;
-
-        return new CallbackPromiseAdapter([
-            'promise' => function () use (&$promise) {
-                if (!$promise) {
-                    throw new \LogicException('FulfilledPromise must be resolved before obtaining the promise');
-                }
-
-                return $promise;
-            },
-            'resolve' => function ($value = null) use (&$promise) {
-                if (!$promise) {
-                    $promise = new FulfilledPromise($value);
-                }
-            },
-            'reject' => function () {
-                throw new \LogicException('You cannot call reject() for React\Promise\FulfilledPromise');
-            },
-            'notify' => function () {
-                // no-op
-            },
-            'settle' => function ($value = null) use (&$promise) {
-                if (!$promise) {
-                    $promise = new FulfilledPromise($value);
-                }
-            },
-        ]);
-    }
-
-    /** @test */
-    public function shouldThrowExceptionIfConstructedWithAPromise()
-    {
-        $this->setExpectedException('\InvalidArgumentException');
-
-        return new FulfilledPromise(new FulfilledPromise());
-    }
-}
diff --git a/core/vendor/react/promise/tests/FunctionAllTest.php b/core/vendor/react/promise/tests/FunctionAllTest.php
deleted file mode 100644
index fcd0a5df1..000000000
--- a/core/vendor/react/promise/tests/FunctionAllTest.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-
-namespace React\Promise;
-
-class FunctionAllTest extends TestCase
-{
-    /** @test */
-    public function shouldResolveEmptyInput()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo([]));
-
-        all([])
-            ->then($mock);
-    }
-
-    /** @test */
-    public function shouldResolveValuesArray()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo([1, 2, 3]));
-
-        all([1, 2, 3])
-            ->then($mock);
-    }
-
-    /** @test */
-    public function shouldResolvePromisesArray()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo([1, 2, 3]));
-
-        all([resolve(1), resolve(2), resolve(3)])
-            ->then($mock);
-    }
-
-    /** @test */
-    public function shouldResolveSparseArrayInput()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo([null, 1, null, 1, 1]));
-
-        all([null, 1, null, 1, 1])
-            ->then($mock);
-    }
-
-    /** @test */
-    public function shouldRejectIfAnyInputPromiseRejects()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(2));
-
-        all([resolve(1), reject(2), resolve(3)])
-            ->then($this->expectCallableNever(), $mock);
-    }
-
-    /** @test */
-    public function shouldAcceptAPromiseForAnArray()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo([1, 2, 3]));
-
-        all(resolve([1, 2, 3]))
-            ->then($mock);
-    }
-
-    /** @test */
-    public function shouldResolveToEmptyArrayWhenInputPromiseDoesNotResolveToArray()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo([]));
-
-        all(resolve(1))
-            ->then($mock);
-    }
-}
diff --git a/core/vendor/react/promise/tests/FunctionAnyTest.php b/core/vendor/react/promise/tests/FunctionAnyTest.php
deleted file mode 100644
index bf8a0db47..000000000
--- a/core/vendor/react/promise/tests/FunctionAnyTest.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-
-namespace React\Promise;
-
-class FunctionAnyTest extends TestCase
-{
-    /** @test */
-    public function shouldResolveToNullWithEmptyInputArray()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(null));
-
-        any([])
-            ->then($mock);
-    }
-
-    /** @test */
-    public function shouldResolveWithAnInputValue()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(1));
-
-        any([1, 2, 3])
-            ->then($mock);
-    }
-
-    /** @test */
-    public function shouldResolveWithAPromisedInputValue()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(1));
-
-        any([resolve(1), resolve(2), resolve(3)])
-            ->then($mock);
-    }
-
-    /** @test */
-    public function shouldRejectWithAllRejectedInputValuesIfAllInputsAreRejected()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo([0 => 1, 1 => 2, 2 => 3]));
-
-        any([reject(1), reject(2), reject(3)])
-            ->then($this->expectCallableNever(), $mock);
-    }
-
-    /** @test */
-    public function shouldResolveWhenFirstInputPromiseResolves()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(1));
-
-        any([resolve(1), reject(2), reject(3)])
-            ->then($mock);
-    }
-
-    /** @test */
-    public function shouldAcceptAPromiseForAnArray()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(1));
-
-        any(resolve([1, 2, 3]))
-            ->then($mock);
-    }
-
-    /** @test */
-    public function shouldResolveToNullArrayWhenInputPromiseDoesNotResolveToArray()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(null));
-
-        any(resolve(1))
-            ->then($mock);
-    }
-
-    /** @test */
-    public function shouldNotRelyOnArryIndexesWhenUnwrappingToASingleResolutionValue()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(2));
-
-        $d1 = new Deferred();
-        $d2 = new Deferred();
-
-        any(['abc' => $d1->promise(), 1 => $d2->promise()])
-            ->then($mock);
-
-        $d2->resolve(2);
-        $d1->resolve(1);
-    }
-}
diff --git a/core/vendor/react/promise/tests/FunctionCheckTypehintTest.php b/core/vendor/react/promise/tests/FunctionCheckTypehintTest.php
deleted file mode 100644
index 8449bc1f7..000000000
--- a/core/vendor/react/promise/tests/FunctionCheckTypehintTest.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-
-namespace React\Promise;
-
-class FunctionCheckTypehintTest extends TestCase
-{
-    /** @test */
-    public function shouldAcceptClosureCallbackWithTypehint()
-    {
-        $this->assertTrue(_checkTypehint(function (\InvalidArgumentException $e) {
-                }, new \InvalidArgumentException()));
-        $this->assertfalse(_checkTypehint(function (\InvalidArgumentException $e) {
-                }, new \Exception()));
-    }
-
-    /** @test */
-    public function shouldAcceptFunctionStringCallbackWithTypehint()
-    {
-        $this->assertTrue(_checkTypehint('React\Promise\testCallbackWithTypehint', new \InvalidArgumentException()));
-        $this->assertfalse(_checkTypehint('React\Promise\testCallbackWithTypehint', new \Exception()));
-    }
-
-    /** @test */
-    public function shouldAcceptInvokableObjectCallbackWithTypehint()
-    {
-        $this->assertTrue(_checkTypehint(new TestCallbackWithTypehintClass(), new \InvalidArgumentException()));
-        $this->assertfalse(_checkTypehint(new TestCallbackWithTypehintClass(), new \Exception()));
-    }
-
-    /** @test */
-    public function shouldAcceptObjectMethodCallbackWithTypehint()
-    {
-        $this->assertTrue(_checkTypehint([new TestCallbackWithTypehintClass(), 'testCallback'], new \InvalidArgumentException()));
-        $this->assertfalse(_checkTypehint([new TestCallbackWithTypehintClass(), 'testCallback'], new \Exception()));
-    }
-
-    /** @test */
-    public function shouldAcceptStaticClassCallbackWithTypehint()
-    {
-        $this->assertTrue(_checkTypehint(['React\Promise\TestCallbackWithTypehintClass', 'testCallbackStatic'], new \InvalidArgumentException()));
-        $this->assertfalse(_checkTypehint(['React\Promise\TestCallbackWithTypehintClass', 'testCallbackStatic'], new \Exception()));
-    }
-
-    /** @test */
-    public function shouldAcceptClosureCallbackWithoutTypehint()
-    {
-        $this->assertTrue(_checkTypehint(function (\InvalidArgumentException $e) {
-        }, new \InvalidArgumentException()));
-    }
-
-    /** @test */
-    public function shouldAcceptFunctionStringCallbackWithoutTypehint()
-    {
-        $this->assertTrue(_checkTypehint('React\Promise\testCallbackWithoutTypehint', new \InvalidArgumentException()));
-    }
-
-    /** @test */
-    public function shouldAcceptInvokableObjectCallbackWithoutTypehint()
-    {
-        $this->assertTrue(_checkTypehint(new TestCallbackWithoutTypehintClass(), new \InvalidArgumentException()));
-    }
-
-    /** @test */
-    public function shouldAcceptObjectMethodCallbackWithoutTypehint()
-    {
-        $this->assertTrue(_checkTypehint([new TestCallbackWithoutTypehintClass(), 'testCallback'], new \InvalidArgumentException()));
-    }
-
-    /** @test */
-    public function shouldAcceptStaticClassCallbackWithoutTypehint()
-    {
-        $this->assertTrue(_checkTypehint(['React\Promise\TestCallbackWithoutTypehintClass', 'testCallbackStatic'], new \InvalidArgumentException()));
-    }
-}
-
-function testCallbackWithTypehint(\InvalidArgumentException $e)
-{
-}
-
-function testCallbackWithoutTypehint()
-{
-}
-
-class TestCallbackWithTypehintClass
-{
-    public function __invoke(\InvalidArgumentException $e)
-    {
-
-    }
-
-    public function testCallback(\InvalidArgumentException $e)
-    {
-
-    }
-
-    public static function testCallbackStatic(\InvalidArgumentException $e)
-    {
-
-    }
-}
-
-class TestCallbackWithoutTypehintClass
-{
-    public function __invoke()
-    {
-
-    }
-
-    public function testCallback()
-    {
-
-    }
-
-    public static function testCallbackStatic()
-    {
-
-    }
-}
diff --git a/core/vendor/react/promise/tests/FunctionMapTest.php b/core/vendor/react/promise/tests/FunctionMapTest.php
deleted file mode 100644
index b8bf3a832..000000000
--- a/core/vendor/react/promise/tests/FunctionMapTest.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-
-namespace React\Promise;
-
-class FunctionMapTest extends TestCase
-{
-    protected function mapper()
-    {
-        return function ($val) {
-            return $val * 2;
-        };
-    }
-
-    protected function promiseMapper()
-    {
-        return function ($val) {
-            return resolve($val * 2);
-        };
-    }
-
-    /** @test */
-    public function shouldMapInputValuesArray()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo([2, 4, 6]));
-
-        map(
-            [1, 2, 3],
-            $this->mapper()
-        )->then($mock);
-    }
-
-    /** @test */
-    public function shouldMapInputPromisesArray()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo([2, 4, 6]));
-
-        map(
-            [resolve(1), resolve(2), resolve(3)],
-            $this->mapper()
-        )->then($mock);
-    }
-
-    /** @test */
-    public function shouldMapMixedInputArray()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo([2, 4, 6]));
-
-        map(
-            [1, resolve(2), 3],
-            $this->mapper()
-        )->then($mock);
-    }
-
-    /** @test */
-    public function shouldMapInputWhenMapperReturnsAPromise()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo([2, 4, 6]));
-
-        map(
-            [1, 2, 3],
-            $this->promiseMapper()
-        )->then($mock);
-    }
-
-    /** @test */
-    public function shouldAcceptAPromiseForAnArray()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo([2, 4, 6]));
-
-        map(
-            resolve([1, resolve(2), 3]),
-            $this->mapper()
-        )->then($mock);
-    }
-
-    /** @test */
-    public function shouldResolveToEmptyArrayWhenInputPromiseDoesNotResolveToArray()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo([]));
-
-        map(
-            resolve(1),
-            $this->mapper()
-        )->then($mock);
-    }
-
-    /** @test */
-    public function shouldRejectWhenInputContainsRejection()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(2));
-
-        map(
-            [resolve(1), reject(2), resolve(3)],
-            $this->mapper()
-        )->then($this->expectCallableNever(), $mock);
-    }
-}
diff --git a/core/vendor/react/promise/tests/FunctionRaceTest.php b/core/vendor/react/promise/tests/FunctionRaceTest.php
deleted file mode 100644
index 553220c5e..000000000
--- a/core/vendor/react/promise/tests/FunctionRaceTest.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-
-namespace React\Promise;
-
-class FunctionRaceTest extends TestCase
-{
-    /** @test */
-    public function shouldResolveEmptyInput()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(null));
-
-        race(
-            []
-        )->then($mock);
-    }
-
-    /** @test */
-    public function shouldResolveValuesArray()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(1));
-
-        race(
-            [1, 2, 3]
-        )->then($mock);
-    }
-
-    /** @test */
-    public function shouldResolvePromisesArray()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(2));
-
-        $d1 = new Deferred();
-        $d2 = new Deferred();
-        $d3 = new Deferred();
-
-        race(
-            [$d1->promise(), $d2->promise(), $d3->promise()]
-        )->then($mock);
-
-        $d2->resolve(2);
-
-        $d1->resolve(1);
-        $d3->resolve(3);
-    }
-
-    /** @test */
-    public function shouldResolveSparseArrayInput()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(null));
-
-        race(
-            [null, 1, null, 2, 3]
-        )->then($mock);
-    }
-
-    /** @test */
-    public function shouldRejectIfFirstSettledPromiseRejects()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(2));
-
-        $d1 = new Deferred();
-        $d2 = new Deferred();
-        $d3 = new Deferred();
-
-        race(
-            [$d1->promise(), $d2->promise(), $d3->promise()]
-        )->then($this->expectCallableNever(), $mock);
-
-        $d2->reject(2);
-
-        $d1->resolve(1);
-        $d3->resolve(3);
-    }
-
-    /** @test */
-    public function shouldAcceptAPromiseForAnArray()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(1));
-
-        race(
-            resolve([1, 2, 3])
-        )->then($mock);
-    }
-
-    /** @test */
-    public function shouldResolveToNullWhenInputPromiseDoesNotResolveToArray()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(null));
-
-        race(
-            resolve(1)
-        )->then($mock);
-    }
-}
diff --git a/core/vendor/react/promise/tests/FunctionReduceTest.php b/core/vendor/react/promise/tests/FunctionReduceTest.php
deleted file mode 100644
index 715e84778..000000000
--- a/core/vendor/react/promise/tests/FunctionReduceTest.php
+++ /dev/null
@@ -1,290 +0,0 @@
-<?php
-
-namespace React\Promise;
-
-class FunctionReduceTest extends TestCase
-{
-    protected function plus()
-    {
-        return function ($sum, $val) {
-            return $sum + $val;
-        };
-    }
-
-    protected function append()
-    {
-        return function ($sum, $val) {
-            return $sum . $val;
-        };
-    }
-
-    /** @test */
-    public function shouldReduceValuesWithoutInitialValue()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(6));
-
-        reduce(
-            [1, 2, 3],
-            $this->plus()
-        )->then($mock);
-    }
-
-    /** @test */
-    public function shouldReduceValuesWithInitialValue()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(7));
-
-        reduce(
-            [1, 2, 3],
-            $this->plus(),
-            1
-        )->then($mock);
-    }
-
-    /** @test */
-    public function shouldReduceValuesWithInitialPromise()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(7));
-
-        reduce(
-            [1, 2, 3],
-            $this->plus(),
-            resolve(1)
-        )->then($mock);
-    }
-
-    /** @test */
-    public function shouldReducePromisedValuesWithoutInitialValue()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(6));
-
-        reduce(
-            [resolve(1), resolve(2), resolve(3)],
-            $this->plus()
-        )->then($mock);
-    }
-
-    /** @test */
-    public function shouldReducePromisedValuesWithInitialValue()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(7));
-
-        reduce(
-            [resolve(1), resolve(2), resolve(3)],
-            $this->plus(),
-            1
-        )->then($mock);
-    }
-
-    /** @test */
-    public function shouldReducePromisedValuesWithInitialPromise()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(7));
-
-        reduce(
-            [resolve(1), resolve(2), resolve(3)],
-            $this->plus(),
-            resolve(1)
-        )->then($mock);
-    }
-
-    /** @test */
-    public function shouldReduceEmptyInputWithInitialValue()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(1));
-
-        reduce(
-            [],
-            $this->plus(),
-            1
-        )->then($mock);
-    }
-
-    /** @test */
-    public function shouldReduceEmptyInputWithInitialPromise()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(1));
-
-        reduce(
-            [],
-            $this->plus(),
-            resolve(1)
-        )->then($mock);
-    }
-
-    /** @test */
-    public function shouldRejectWhenInputContainsRejection()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(2));
-
-        reduce(
-            [resolve(1), reject(2), resolve(3)],
-            $this->plus(),
-            resolve(1)
-        )->then($this->expectCallableNever(), $mock);
-    }
-
-    /** @test */
-    public function shouldResolveWithNullWhenInputIsEmptyAndNoInitialValueOrPromiseProvided()
-    {
-        // Note: this is different from when.js's behavior!
-        // In when.reduce(), this rejects with a TypeError exception (following
-        // JavaScript's [].reduce behavior.
-        // We're following PHP's array_reduce behavior and resolve with NULL.
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(null));
-
-        reduce(
-            [],
-            $this->plus()
-        )->then($mock);
-    }
-
-    /** @test */
-    public function shouldAllowSparseArrayInputWithoutInitialValue()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(3));
-
-        reduce(
-            [null, null, 1, null, 1, 1],
-            $this->plus()
-        )->then($mock);
-    }
-
-    /** @test */
-    public function shouldAllowSparseArrayInputWithInitialValue()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(4));
-
-        reduce(
-            [null, null, 1, null, 1, 1],
-            $this->plus(),
-            1
-        )->then($mock);
-    }
-
-    /** @test */
-    public function shouldReduceInInputOrder()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo('123'));
-
-        reduce(
-            [1, 2, 3],
-            $this->append(),
-            ''
-        )->then($mock);
-    }
-
-    /** @test */
-    public function shouldAcceptAPromiseForAnArray()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo('123'));
-
-        reduce(
-            resolve([1, 2, 3]),
-            $this->append(),
-            ''
-        )->then($mock);
-    }
-
-    /** @test */
-    public function shouldResolveToInitialValueWhenInputPromiseDoesNotResolveToAnArray()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(1));
-
-        reduce(
-            resolve(1),
-            $this->plus(),
-            1
-        )->then($mock);
-    }
-
-    /** @test */
-    public function shouldProvideCorrectBasisValue()
-    {
-        $insertIntoArray = function ($arr, $val, $i) {
-            $arr[$i] = $val;
-
-            return $arr;
-        };
-
-        $d1 = new Deferred();
-        $d2 = new Deferred();
-        $d3 = new Deferred();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo([1, 2, 3]));
-
-        reduce(
-            [$d1->promise(), $d2->promise(), $d3->promise()],
-            $insertIntoArray,
-            []
-        )->then($mock);
-
-        $d3->resolve(3);
-        $d1->resolve(1);
-        $d2->resolve(2);
-    }
-}
diff --git a/core/vendor/react/promise/tests/FunctionRejectTest.php b/core/vendor/react/promise/tests/FunctionRejectTest.php
deleted file mode 100644
index 84b8ec6a0..000000000
--- a/core/vendor/react/promise/tests/FunctionRejectTest.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-namespace React\Promise;
-
-class FunctionRejectTest extends TestCase
-{
-    /** @test */
-    public function shouldRejectAnImmediateValue()
-    {
-        $expected = 123;
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo($expected));
-
-        reject($expected)
-            ->then(
-                $this->expectCallableNever(),
-                $mock
-            );
-    }
-
-    /** @test */
-    public function shouldRejectAFulfilledPromise()
-    {
-        $expected = 123;
-
-        $resolved = new FulfilledPromise($expected);
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo($expected));
-
-        reject($resolved)
-            ->then(
-                $this->expectCallableNever(),
-                $mock
-            );
-    }
-
-    /** @test */
-    public function shouldRejectARejectedPromise()
-    {
-        $expected = 123;
-
-        $resolved = new RejectedPromise($expected);
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo($expected));
-
-        reject($resolved)
-            ->then(
-                $this->expectCallableNever(),
-                $mock
-            );
-    }
-}
diff --git a/core/vendor/react/promise/tests/FunctionResolveTest.php b/core/vendor/react/promise/tests/FunctionResolveTest.php
deleted file mode 100644
index 576c30931..000000000
--- a/core/vendor/react/promise/tests/FunctionResolveTest.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-namespace React\Promise;
-
-class FunctionResolveTest extends TestCase
-{
-    /** @test */
-    public function shouldResolveAnImmediateValue()
-    {
-        $expected = 123;
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo($expected));
-
-        resolve($expected)
-            ->then(
-                $mock,
-                $this->expectCallableNever()
-            );
-    }
-
-    /** @test */
-    public function shouldResolveAFulfilledPromise()
-    {
-        $expected = 123;
-
-        $resolved = new FulfilledPromise($expected);
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo($expected));
-
-        resolve($resolved)
-            ->then(
-                $mock,
-                $this->expectCallableNever()
-            );
-    }
-
-    /** @test */
-    public function shouldRejectARejectedPromise()
-    {
-        $expected = 123;
-
-        $resolved = new RejectedPromise($expected);
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo($expected));
-
-        resolve($resolved)
-            ->then(
-                $this->expectCallableNever(),
-                $mock
-            );
-    }
-
-    /** @test */
-    public function shouldSupportDeepNestingInPromiseChains()
-    {
-        $d = new Deferred();
-        $d->resolve(false);
-
-        $result = resolve(resolve($d->promise()->then(function ($val) {
-            $d = new Deferred();
-            $d->resolve($val);
-
-            $identity = function ($val) {
-                return $val;
-            };
-
-            return resolve($d->promise()->then($identity))->then(
-                function ($val) {
-                    return !$val;
-                }
-            );
-        })));
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(true));
-
-        $result->then($mock);
-    }
-
-    /** @test */
-    public function returnsExtendePromiseForSimplePromise()
-    {
-        $promise = $this->getMock('React\Promise\PromiseInterface');
-
-        $this->assertInstanceOf('React\Promise\ExtendedPromiseInterface', resolve($promise));
-    }
-}
diff --git a/core/vendor/react/promise/tests/FunctionSomeTest.php b/core/vendor/react/promise/tests/FunctionSomeTest.php
deleted file mode 100644
index 09e535049..000000000
--- a/core/vendor/react/promise/tests/FunctionSomeTest.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-
-namespace React\Promise;
-
-class FunctionSomeTest extends TestCase
-{
-    /** @test */
-    public function shouldResolveEmptyInput()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo([]));
-
-        some(
-            [],
-            1
-        )->then($mock);
-    }
-
-    /** @test */
-    public function shouldResolveValuesArray()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo([1, 2]));
-
-        some(
-            [1, 2, 3],
-            2
-        )->then($mock);
-    }
-
-    /** @test */
-    public function shouldResolvePromisesArray()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo([1, 2]));
-
-        some(
-            [resolve(1), resolve(2), resolve(3)],
-            2
-        )->then($mock);
-    }
-
-    /** @test */
-    public function shouldResolveSparseArrayInput()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo([null, 1]));
-
-        some(
-            [null, 1, null, 2, 3],
-            2
-        )->then($mock);
-    }
-
-    /** @test */
-    public function shouldRejectIfAnyInputPromiseRejectsBeforeDesiredNumberOfInputsAreResolved()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo([1 => 2, 2 => 3]));
-
-        some(
-            [resolve(1), reject(2), reject(3)],
-            2
-        )->then($this->expectCallableNever(), $mock);
-    }
-
-    /** @test */
-    public function shouldAcceptAPromiseForAnArray()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo([1, 2]));
-
-        some(
-            resolve([1, 2, 3]),
-            2
-        )->then($mock);
-    }
-
-    /** @test */
-    public function shouldResolveWithEmptyArrayIfHowManyIsLessThanOne()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo([]));
-
-        some(
-            [1],
-            0
-        )->then($mock);
-    }
-
-    /** @test */
-    public function shouldResolveToEmptyArrayWhenInputPromiseDoesNotResolveToArray()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo([]));
-
-        some(
-            resolve(1),
-            1
-        )->then($mock);
-    }
-}
diff --git a/core/vendor/react/promise/tests/LazyPromiseTest.php b/core/vendor/react/promise/tests/LazyPromiseTest.php
deleted file mode 100644
index b6308818a..000000000
--- a/core/vendor/react/promise/tests/LazyPromiseTest.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-
-namespace React\Promise;
-
-use React\Promise\PromiseAdapter\CallbackPromiseAdapter;
-
-class LazyPromiseTest extends TestCase
-{
-    use PromiseTest\FullTestTrait;
-
-    public function getPromiseTestAdapter(callable $canceller = null)
-    {
-        $d = new Deferred($canceller);
-
-        $factory = function () use ($d) {
-            return $d->promise();
-        };
-
-        return new CallbackPromiseAdapter([
-            'promise'  => function () use ($factory) {
-                return new LazyPromise($factory);
-            },
-            'resolve' => [$d, 'resolve'],
-            'reject'  => [$d, 'reject'],
-            'notify'  => [$d, 'progress'],
-            'settle'  => [$d, 'resolve'],
-        ]);
-    }
-
-    /** @test */
-    public function shouldNotCallFactoryIfThenIsNotInvoked()
-    {
-        $factory = $this->createCallableMock();
-        $factory
-            ->expects($this->never())
-            ->method('__invoke');
-
-        new LazyPromise($factory);
-    }
-
-    /** @test */
-    public function shouldCallFactoryIfThenIsInvoked()
-    {
-        $factory = $this->createCallableMock();
-        $factory
-            ->expects($this->once())
-            ->method('__invoke');
-
-        $p = new LazyPromise($factory);
-        $p->then();
-    }
-
-    /** @test */
-    public function shouldReturnPromiseFromFactory()
-    {
-        $factory = $this->createCallableMock();
-        $factory
-            ->expects($this->once())
-            ->method('__invoke')
-            ->will($this->returnValue(new FulfilledPromise(1)));
-
-        $onFulfilled = $this->createCallableMock();
-        $onFulfilled
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(1));
-
-        $p = new LazyPromise($factory);
-
-        $p->then($onFulfilled);
-    }
-
-    /** @test */
-    public function shouldReturnPromiseIfFactoryReturnsNull()
-    {
-        $factory = $this->createCallableMock();
-        $factory
-            ->expects($this->once())
-            ->method('__invoke')
-            ->will($this->returnValue(null));
-
-        $p = new LazyPromise($factory);
-        $this->assertInstanceOf('React\\Promise\\PromiseInterface', $p->then());
-    }
-
-    /** @test */
-    public function shouldReturnRejectedPromiseIfFactoryThrowsException()
-    {
-        $exception = new \Exception();
-
-        $factory = $this->createCallableMock();
-        $factory
-            ->expects($this->once())
-            ->method('__invoke')
-            ->will($this->throwException($exception));
-
-        $onRejected = $this->createCallableMock();
-        $onRejected
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo($exception));
-
-        $p = new LazyPromise($factory);
-
-        $p->then($this->expectCallableNever(), $onRejected);
-    }
-}
diff --git a/core/vendor/react/promise/tests/PromiseAdapter/CallbackPromiseAdapter.php b/core/vendor/react/promise/tests/PromiseAdapter/CallbackPromiseAdapter.php
deleted file mode 100644
index bdedf4658..000000000
--- a/core/vendor/react/promise/tests/PromiseAdapter/CallbackPromiseAdapter.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace React\Promise\PromiseAdapter;
-
-use React\Promise;
-
-class CallbackPromiseAdapter implements PromiseAdapterInterface
-{
-    private $callbacks;
-
-    public function __construct(array $callbacks)
-    {
-        $this->callbacks = $callbacks;
-    }
-
-    public function promise()
-    {
-        return call_user_func_array($this->callbacks['promise'], func_get_args());
-    }
-
-    public function resolve()
-    {
-        return call_user_func_array($this->callbacks['resolve'], func_get_args());
-    }
-
-    public function reject()
-    {
-        return call_user_func_array($this->callbacks['reject'], func_get_args());
-    }
-
-    public function notify()
-    {
-        return call_user_func_array($this->callbacks['notify'], func_get_args());
-    }
-
-    public function settle()
-    {
-        return call_user_func_array($this->callbacks['settle'], func_get_args());
-    }
-}
diff --git a/core/vendor/react/promise/tests/PromiseAdapter/PromiseAdapterInterface.php b/core/vendor/react/promise/tests/PromiseAdapter/PromiseAdapterInterface.php
deleted file mode 100644
index 9157cd4ea..000000000
--- a/core/vendor/react/promise/tests/PromiseAdapter/PromiseAdapterInterface.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace React\Promise\PromiseAdapter;
-
-use React\Promise;
-
-interface PromiseAdapterInterface
-{
-    public function promise();
-    public function resolve();
-    public function reject();
-    public function notify();
-    public function settle();
-}
diff --git a/core/vendor/react/promise/tests/PromiseTest.php b/core/vendor/react/promise/tests/PromiseTest.php
deleted file mode 100644
index faba70468..000000000
--- a/core/vendor/react/promise/tests/PromiseTest.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-
-namespace React\Promise;
-
-use React\Promise\PromiseAdapter\CallbackPromiseAdapter;
-
-class PromiseTest extends TestCase
-{
-    use PromiseTest\FullTestTrait;
-
-    public function getPromiseTestAdapter(callable $canceller = null)
-    {
-        $resolveCallback = $rejectCallback = $progressCallback = null;
-
-        $promise = new Promise(function ($resolve, $reject, $progress) use (&$resolveCallback, &$rejectCallback, &$progressCallback) {
-            $resolveCallback  = $resolve;
-            $rejectCallback   = $reject;
-            $progressCallback = $progress;
-        }, $canceller);
-
-        return new CallbackPromiseAdapter([
-            'promise' => function () use ($promise) {
-                return $promise;
-            },
-            'resolve' => $resolveCallback,
-            'reject'  => $rejectCallback,
-            'notify'  => $progressCallback,
-            'settle'  => $resolveCallback,
-        ]);
-    }
-
-    /** @test */
-    public function shouldRejectIfResolverThrowsException()
-    {
-        $exception = new \Exception('foo');
-
-        $promise = new Promise(function () use ($exception) {
-            throw $exception;
-        });
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo($exception));
-
-        $promise
-            ->then($this->expectCallableNever(), $mock);
-    }
-
-    /** @test */
-    public function shouldFulfillIfFullfilledWithSimplePromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo('foo'));
-
-        $adapter->promise()
-            ->then($mock);
-
-        $adapter->resolve(new SimpleFulfilledTestPromise());
-    }
-
-    /** @test */
-    public function shouldRejectIfRejectedWithSimplePromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo('foo'));
-
-        $adapter->promise()
-            ->then($this->expectCallableNever(), $mock);
-
-        $adapter->resolve(new SimpleRejectedTestPromise());
-    }
-}
-
-class SimpleFulfilledTestPromise implements PromiseInterface
-{
-    public function then(callable $onFulfilled = null, callable $onRejected = null, callable $onProgress = null)
-    {
-        try {
-            if ($onFulfilled) {
-                $onFulfilled('foo');
-            }
-
-            return new self('foo');
-        } catch (\Exception $exception) {
-            return new RejectedPromise($exception);
-        }
-    }
-}
-
-class SimpleRejectedTestPromise implements PromiseInterface
-{
-    public function then(callable $onFulfilled = null, callable $onRejected = null, callable $onProgress = null)
-    {
-        try {
-            if ($onRejected) {
-                $onRejected('foo');
-            }
-
-            return new self('foo');
-        } catch (\Exception $exception) {
-            return new RejectedPromise($exception);
-        }
-    }
-}
diff --git a/core/vendor/react/promise/tests/PromiseTest/CancelTestTrait.php b/core/vendor/react/promise/tests/PromiseTest/CancelTestTrait.php
deleted file mode 100644
index d6c095662..000000000
--- a/core/vendor/react/promise/tests/PromiseTest/CancelTestTrait.php
+++ /dev/null
@@ -1,206 +0,0 @@
-<?php
-
-namespace React\Promise\PromiseTest;
-
-use React\Promise;
-
-trait CancelTestTrait
-{
-    /**
-     * @return \React\Promise\PromiseAdapter\PromiseAdapterInterface
-     */
-    abstract public function getPromiseTestAdapter(callable $canceller = null);
-
-    /** @test */
-    public function cancelShouldCallCancellerWithResolverArguments()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->isType('callable'), $this->isType('callable'), $this->isType('callable'));
-
-        $adapter = $this->getPromiseTestAdapter($mock);
-
-        $adapter->promise()->cancel();
-    }
-
-    /** @test */
-    public function cancelShouldFulfillPromiseIfCancellerFulfills()
-    {
-        $adapter = $this->getPromiseTestAdapter(function ($resolve) {
-            $resolve(1);
-        });
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(1));
-
-        $adapter->promise()
-            ->then($mock, $this->expectCallableNever());
-
-        $adapter->promise()->cancel();
-    }
-
-    /** @test */
-    public function cancelShouldRejectPromiseIfCancellerRejects()
-    {
-        $adapter = $this->getPromiseTestAdapter(function ($resolve, $reject) {
-            $reject(1);
-        });
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(1));
-
-        $adapter->promise()
-            ->then($this->expectCallableNever(), $mock);
-
-        $adapter->promise()->cancel();
-    }
-
-    /** @test */
-    public function cancelShouldRejectPromiseWithExceptionIfCancellerThrows()
-    {
-        $e = new \Exception();
-
-        $adapter = $this->getPromiseTestAdapter(function () use ($e) {
-            throw $e;
-        });
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo($e));
-
-        $adapter->promise()
-            ->then($this->expectCallableNever(), $mock);
-
-        $adapter->promise()->cancel();
-    }
-
-    /** @test */
-    public function cancelShouldProgressPromiseIfCancellerNotifies()
-    {
-        $adapter = $this->getPromiseTestAdapter(function ($resolve, $reject, $progress) {
-            $progress(1);
-        });
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(1));
-
-        $adapter->promise()
-            ->then($this->expectCallableNever(), $this->expectCallableNever(), $mock);
-
-        $adapter->promise()->cancel();
-    }
-
-    /** @test */
-    public function cancelShouldCallCancellerOnlyOnceIfCancellerResolves()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->will($this->returnCallback(function ($resolve) {
-                $resolve();
-            }));
-
-        $adapter = $this->getPromiseTestAdapter($mock);
-
-        $adapter->promise()->cancel();
-        $adapter->promise()->cancel();
-    }
-
-    /** @test */
-    public function cancelShouldHaveNoEffectIfCancellerDoesNothing()
-    {
-        $adapter = $this->getPromiseTestAdapter(function () {});
-
-        $adapter->promise()
-            ->then($this->expectCallableNever(), $this->expectCallableNever());
-
-        $adapter->promise()->cancel();
-        $adapter->promise()->cancel();
-    }
-
-    /** @test */
-    public function cancelShouldCallCancellerFromDeepNestedPromiseChain()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke');
-
-        $adapter = $this->getPromiseTestAdapter($mock);
-
-        $promise = $adapter->promise()
-            ->then(function () {
-                return new Promise\Promise(function () {});
-            })
-            ->then(function () {
-                $d = new Promise\Deferred();
-
-                return $d->promise();
-            })
-            ->then(function () {
-                return new Promise\Promise(function () {});
-            });
-
-        $promise->cancel();
-    }
-
-    /** @test */
-    public function cancelCalledOnChildrenSouldOnlyCancelWhenAllChildrenCancelled()
-    {
-        $adapter = $this->getPromiseTestAdapter($this->expectCallableNever());
-
-        $child1 = $adapter->promise()
-            ->then()
-            ->then();
-
-        $adapter->promise()
-            ->then();
-
-        $child1->cancel();
-    }
-
-    /** @test */
-    public function cancelShouldTriggerCancellerWhenAllChildrenCancel()
-    {
-        $adapter = $this->getPromiseTestAdapter($this->expectCallableOnce());
-
-        $child1 = $adapter->promise()
-            ->then()
-            ->then();
-
-        $child2 = $adapter->promise()
-            ->then();
-
-        $child1->cancel();
-        $child2->cancel();
-    }
-
-    /** @test */
-    public function cancelShouldAlwaysTriggerCancellerWhenCalledOnRootPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter($this->expectCallableOnce());
-
-        $adapter->promise()
-            ->then()
-            ->then();
-
-        $adapter->promise()
-            ->then();
-
-        $adapter->promise()->cancel();
-    }
-}
diff --git a/core/vendor/react/promise/tests/PromiseTest/FullTestTrait.php b/core/vendor/react/promise/tests/PromiseTest/FullTestTrait.php
deleted file mode 100644
index 3ce45d61f..000000000
--- a/core/vendor/react/promise/tests/PromiseTest/FullTestTrait.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-namespace React\Promise\PromiseTest;
-
-trait FullTestTrait
-{
-    use PromisePendingTestTrait,
-        PromiseSettledTestTrait,
-        PromiseFulfilledTestTrait,
-        PromiseRejectedTestTrait,
-        ResolveTestTrait,
-        RejectTestTrait,
-        NotifyTestTrait,
-        CancelTestTrait;
-}
diff --git a/core/vendor/react/promise/tests/PromiseTest/NotifyTestTrait.php b/core/vendor/react/promise/tests/PromiseTest/NotifyTestTrait.php
deleted file mode 100644
index 4501df676..000000000
--- a/core/vendor/react/promise/tests/PromiseTest/NotifyTestTrait.php
+++ /dev/null
@@ -1,336 +0,0 @@
-<?php
-
-namespace React\Promise\PromiseTest;
-
-trait NotifyTestTrait
-{
-    /**
-     * @return \React\Promise\PromiseAdapter\PromiseAdapterInterface
-     */
-    abstract public function getPromiseTestAdapter(callable $canceller = null);
-
-    /** @test */
-    public function notifyShouldProgress()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $sentinel = new \stdClass();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($sentinel);
-
-        $adapter->promise()
-            ->then($this->expectCallableNever(), $this->expectCallableNever(), $mock);
-
-        $adapter->notify($sentinel);
-    }
-
-    /** @test */
-    public function notifyShouldPropagateProgressToDownstreamPromises()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $sentinel = new \stdClass();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->will($this->returnArgument(0));
-
-        $mock2 = $this->createCallableMock();
-        $mock2
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($sentinel);
-
-        $adapter->promise()
-            ->then(
-                $this->expectCallableNever(),
-                $this->expectCallableNever(),
-                $mock
-            )
-            ->then(
-                $this->expectCallableNever(),
-                $this->expectCallableNever(),
-                $mock2
-            );
-
-        $adapter->notify($sentinel);
-    }
-
-    /** @test */
-    public function notifyShouldPropagateTransformedProgressToDownstreamPromises()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $sentinel = new \stdClass();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->will($this->returnValue($sentinel));
-
-        $mock2 = $this->createCallableMock();
-        $mock2
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($sentinel);
-
-        $adapter->promise()
-            ->then(
-                $this->expectCallableNever(),
-                $this->expectCallableNever(),
-                $mock
-            )
-            ->then(
-                $this->expectCallableNever(),
-                $this->expectCallableNever(),
-                $mock2
-            );
-
-        $adapter->notify(1);
-    }
-
-    /** @test */
-    public function notifyShouldPropagateCaughtExceptionValueAsProgress()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $exception = new \Exception();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->will($this->throwException($exception));
-
-        $mock2 = $this->createCallableMock();
-        $mock2
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo($exception));
-
-        $adapter->promise()
-            ->then(
-                $this->expectCallableNever(),
-                $this->expectCallableNever(),
-                $mock
-            )
-            ->then(
-                $this->expectCallableNever(),
-                $this->expectCallableNever(),
-                $mock2
-            );
-
-        $adapter->notify(1);
-    }
-
-    /** @test */
-    public function notifyShouldForwardProgressEventsWhenIntermediaryCallbackTiedToAResolvedPromiseReturnsAPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-        $adapter2 = $this->getPromiseTestAdapter();
-
-        $promise2 = $adapter2->promise();
-
-        $sentinel = new \stdClass();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($sentinel);
-
-        // resolve BEFORE attaching progress handler
-        $adapter->resolve();
-
-        $adapter->promise()
-            ->then(function () use ($promise2) {
-                return $promise2;
-            })
-            ->then(
-                $this->expectCallableNever(),
-                $this->expectCallableNever(),
-                $mock
-            );
-
-        $adapter2->notify($sentinel);
-    }
-
-    /** @test */
-    public function notifyShouldForwardProgressEventsWhenIntermediaryCallbackTiedToAnUnresolvedPromiseReturnsAPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-        $adapter2 = $this->getPromiseTestAdapter();
-
-        $promise2 = $adapter2->promise();
-
-        $sentinel = new \stdClass();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($sentinel);
-
-        $adapter->promise()
-            ->then(function () use ($promise2) {
-                return $promise2;
-            })
-            ->then(
-                $this->expectCallableNever(),
-                $this->expectCallableNever(),
-                $mock
-            );
-
-        // resolve AFTER attaching progress handler
-        $adapter->resolve();
-        $adapter2->notify($sentinel);
-    }
-
-    /** @test */
-    public function notifyShouldForwardProgressWhenResolvedWithAnotherPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-        $adapter2 = $this->getPromiseTestAdapter();
-
-        $sentinel = new \stdClass();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->will($this->returnValue($sentinel));
-
-        $mock2 = $this->createCallableMock();
-        $mock2
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($sentinel);
-
-        $adapter->promise()
-            ->then(
-                $this->expectCallableNever(),
-                $this->expectCallableNever(),
-                $mock
-            )
-            ->then(
-                $this->expectCallableNever(),
-                $this->expectCallableNever(),
-                $mock2
-            );
-
-        $adapter->resolve($adapter2->promise());
-        $adapter2->notify($sentinel);
-    }
-
-    /** @test */
-    public function notifyShouldAllowResolveAfterProgress()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->at(0))
-            ->method('__invoke')
-            ->with($this->identicalTo(1));
-        $mock
-            ->expects($this->at(1))
-            ->method('__invoke')
-            ->with($this->identicalTo(2));
-
-        $adapter->promise()
-            ->then(
-                $mock,
-                $this->expectCallableNever(),
-                $mock
-            );
-
-        $adapter->notify(1);
-        $adapter->resolve(2);
-    }
-
-    /** @test */
-    public function notifyShouldAllowRejectAfterProgress()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->at(0))
-            ->method('__invoke')
-            ->with($this->identicalTo(1));
-        $mock
-            ->expects($this->at(1))
-            ->method('__invoke')
-            ->with($this->identicalTo(2));
-
-        $adapter->promise()
-            ->then(
-                $this->expectCallableNever(),
-                $mock,
-                $mock
-            );
-
-        $adapter->notify(1);
-        $adapter->reject(2);
-    }
-
-    /** @test */
-    public function notifyShouldReturnSilentlyOnProgressWhenAlreadyRejected()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $adapter->reject(1);
-
-        $this->assertNull($adapter->notify());
-    }
-
-    /** @test */
-    public function notifyShouldInvokeProgressHandler()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(1));
-
-        $adapter->promise()->progress($mock);
-        $adapter->notify(1);
-    }
-
-    /** @test */
-    public function notifyShouldInvokeProgressHandlerFromDone()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(1));
-
-        $this->assertNull($adapter->promise()->done(null, null, $mock));
-        $adapter->notify(1);
-    }
-
-    /** @test */
-    public function notifyShouldThrowExceptionThrownProgressHandlerFromDone()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $this->setExpectedException('\Exception', 'UnhandledRejectionException');
-
-        $this->assertNull($adapter->promise()->done(null, null, function () {
-            throw new \Exception('UnhandledRejectionException');
-        }));
-        $adapter->notify(1);
-    }
-}
diff --git a/core/vendor/react/promise/tests/PromiseTest/PromiseFulfilledTestTrait.php b/core/vendor/react/promise/tests/PromiseTest/PromiseFulfilledTestTrait.php
deleted file mode 100644
index 428230b97..000000000
--- a/core/vendor/react/promise/tests/PromiseTest/PromiseFulfilledTestTrait.php
+++ /dev/null
@@ -1,351 +0,0 @@
-<?php
-
-namespace React\Promise\PromiseTest;
-
-trait PromiseFulfilledTestTrait
-{
-    /**
-     * @return \React\Promise\PromiseAdapter\PromiseAdapterInterface
-     */
-    abstract public function getPromiseTestAdapter(callable $canceller = null);
-
-    /** @test */
-    public function fulfilledPromiseShouldBeImmutable()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(1));
-
-        $adapter->resolve(1);
-        $adapter->resolve(2);
-
-        $adapter->promise()
-            ->then(
-                $mock,
-                $this->expectCallableNever()
-            );
-    }
-
-    /** @test */
-    public function fulfilledPromiseShouldInvokeNewlyAddedCallback()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $adapter->resolve(1);
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(1));
-
-        $adapter->promise()
-            ->then($mock, $this->expectCallableNever());
-    }
-
-    /** @test */
-    public function thenShouldForwardResultWhenCallbackIsNull()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(1));
-
-        $adapter->resolve(1);
-        $adapter->promise()
-            ->then(
-                null,
-                $this->expectCallableNever()
-            )
-            ->then(
-                $mock,
-                $this->expectCallableNever()
-            );
-    }
-
-    /** @test */
-    public function thenShouldForwardCallbackResultToNextCallback()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(2));
-
-        $adapter->resolve(1);
-        $adapter->promise()
-            ->then(
-                function ($val) {
-                    return $val + 1;
-                },
-                $this->expectCallableNever()
-            )
-            ->then(
-                $mock,
-                $this->expectCallableNever()
-            );
-    }
-
-    /** @test */
-    public function thenShouldForwardPromisedCallbackResultValueToNextCallback()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(2));
-
-        $adapter->resolve(1);
-        $adapter->promise()
-            ->then(
-                function ($val) {
-                    return \React\Promise\resolve($val + 1);
-                },
-                $this->expectCallableNever()
-            )
-            ->then(
-                $mock,
-                $this->expectCallableNever()
-            );
-    }
-
-    /** @test */
-    public function thenShouldSwitchFromCallbacksToErrbacksWhenCallbackReturnsARejection()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(2));
-
-        $adapter->resolve(1);
-        $adapter->promise()
-            ->then(
-                function ($val) {
-                    return \React\Promise\reject($val + 1);
-                },
-                $this->expectCallableNever()
-            )
-            ->then(
-                $this->expectCallableNever(),
-                $mock
-            );
-    }
-
-    /** @test */
-    public function thenShouldSwitchFromCallbacksToErrbacksWhenCallbackThrows()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $exception = new \Exception();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->will($this->throwException($exception));
-
-        $mock2 = $this->createCallableMock();
-        $mock2
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo($exception));
-
-        $adapter->resolve(1);
-        $adapter->promise()
-            ->then(
-                $mock,
-                $this->expectCallableNever()
-            )
-            ->then(
-                $this->expectCallableNever(),
-                $mock2
-            );
-    }
-
-    /** @test */
-    public function cancelShouldReturnNullForFulfilledPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $adapter->resolve();
-
-        $this->assertNull($adapter->promise()->cancel());
-    }
-
-    /** @test */
-    public function cancelShouldHaveNoEffectForFulfilledPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter($this->expectCallableNever());
-
-        $adapter->resolve();
-
-        $adapter->promise()->cancel();
-    }
-
-    /** @test */
-    public function doneShouldInvokeFulfillmentHandlerForFulfilledPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(1));
-
-        $adapter->resolve(1);
-        $this->assertNull($adapter->promise()->done($mock));
-    }
-
-    /** @test */
-    public function doneShouldThrowExceptionThrownFulfillmentHandlerForFulfilledPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $this->setExpectedException('\Exception', 'UnhandledRejectionException');
-
-        $adapter->resolve(1);
-        $this->assertNull($adapter->promise()->done(function () {
-            throw new \Exception('UnhandledRejectionException');
-        }));
-    }
-
-    /** @test */
-    public function doneShouldThrowUnhandledRejectionExceptionWhenFulfillmentHandlerRejectsForFulfilledPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $this->setExpectedException('React\\Promise\\UnhandledRejectionException');
-
-        $adapter->resolve(1);
-        $this->assertNull($adapter->promise()->done(function () {
-            return \React\Promise\reject();
-        }));
-    }
-
-    /** @test */
-    public function otherwiseShouldNotInvokeRejectionHandlerForFulfilledPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $adapter->resolve(1);
-        $adapter->promise()->otherwise($this->expectCallableNever());
-    }
-
-    /** @test */
-    public function alwaysShouldNotSuppressValueForFulfilledPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $value = new \stdClass();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo($value));
-
-        $adapter->resolve($value);
-        $adapter->promise()
-            ->always(function () {})
-            ->then($mock);
-    }
-
-    /** @test */
-    public function alwaysShouldNotSuppressValueWhenHandlerReturnsANonPromiseForFulfilledPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $value = new \stdClass();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo($value));
-
-        $adapter->resolve($value);
-        $adapter->promise()
-            ->always(function () {
-                return 1;
-            })
-            ->then($mock);
-    }
-
-    /** @test */
-    public function alwaysShouldNotSuppressValueWhenHandlerReturnsAPromiseForFulfilledPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $value = new \stdClass();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo($value));
-
-        $adapter->resolve($value);
-        $adapter->promise()
-            ->always(function () {
-                return \React\Promise\resolve(1);
-            })
-            ->then($mock);
-    }
-
-    /** @test */
-    public function alwaysShouldRejectWhenHandlerThrowsForFulfilledPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $exception = new \Exception();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo($exception));
-
-        $adapter->resolve(1);
-        $adapter->promise()
-            ->always(function () use ($exception) {
-                throw $exception;
-            })
-            ->then(null, $mock);
-    }
-
-    /** @test */
-    public function alwaysShouldRejectWhenHandlerRejectsForFulfilledPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $exception = new \Exception();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo($exception));
-
-        $adapter->resolve(1);
-        $adapter->promise()
-            ->always(function () use ($exception) {
-                return \React\Promise\reject($exception);
-            })
-            ->then(null, $mock);
-    }
-}
diff --git a/core/vendor/react/promise/tests/PromiseTest/PromisePendingTestTrait.php b/core/vendor/react/promise/tests/PromiseTest/PromisePendingTestTrait.php
deleted file mode 100644
index a4f48ee25..000000000
--- a/core/vendor/react/promise/tests/PromiseTest/PromisePendingTestTrait.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-namespace React\Promise\PromiseTest;
-
-trait PromisePendingTestTrait
-{
-    /**
-     * @return \React\Promise\PromiseAdapter\PromiseAdapterInterface
-     */
-    abstract public function getPromiseTestAdapter(callable $canceller = null);
-
-    /** @test */
-    public function thenShouldReturnAPromiseForPendingPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $this->assertInstanceOf('React\\Promise\\PromiseInterface', $adapter->promise()->then());
-    }
-
-    /** @test */
-    public function thenShouldReturnAllowNullForPendingPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $this->assertInstanceOf('React\\Promise\\PromiseInterface', $adapter->promise()->then(null, null, null));
-    }
-
-    /** @test */
-    public function cancelShouldReturnNullForPendingPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $this->assertNull($adapter->promise()->cancel());
-    }
-
-    /** @test */
-    public function doneShouldReturnNullForPendingPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $this->assertNull($adapter->promise()->done());
-    }
-
-    /** @test */
-    public function doneShouldReturnAllowNullForPendingPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $this->assertNull($adapter->promise()->done(null, null, null));
-    }
-
-    /** @test */
-    public function otherwiseShouldNotInvokeRejectionHandlerForPendingPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $adapter->settle();
-        $adapter->promise()->otherwise($this->expectCallableNever());
-    }
-
-    /** @test */
-    public function alwaysShouldReturnAPromiseForPendingPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $this->assertInstanceOf('React\\Promise\\PromiseInterface', $adapter->promise()->always(function () {}));
-    }
-}
diff --git a/core/vendor/react/promise/tests/PromiseTest/PromiseRejectedTestTrait.php b/core/vendor/react/promise/tests/PromiseTest/PromiseRejectedTestTrait.php
deleted file mode 100644
index 64255e831..000000000
--- a/core/vendor/react/promise/tests/PromiseTest/PromiseRejectedTestTrait.php
+++ /dev/null
@@ -1,492 +0,0 @@
-<?php
-
-namespace React\Promise\PromiseTest;
-
-use React\Promise\Deferred;
-
-trait PromiseRejectedTestTrait
-{
-    /**
-     * @return \React\Promise\PromiseAdapter\PromiseAdapterInterface
-     */
-    abstract public function getPromiseTestAdapter(callable $canceller = null);
-
-    /** @test */
-    public function rejectedPromiseShouldBeImmutable()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(1));
-
-        $adapter->reject(1);
-        $adapter->reject(2);
-
-        $adapter->promise()
-            ->then(
-                $this->expectCallableNever(),
-                $mock
-            );
-    }
-
-    /** @test */
-    public function rejectedPromiseShouldInvokeNewlyAddedCallback()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $adapter->reject(1);
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(1));
-
-        $adapter->promise()
-            ->then($this->expectCallableNever(), $mock);
-    }
-
-    /** @test */
-    public function shouldForwardUndefinedRejectionValue()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with(null);
-
-        $adapter->reject(1);
-        $adapter->promise()
-            ->then(
-                $this->expectCallableNever(),
-                function () {
-                    // Presence of rejection handler is enough to switch back
-                    // to resolve mode, even though it returns undefined.
-                    // The ONLY way to propagate a rejection is to re-throw or
-                    // return a rejected promise;
-                }
-            )
-            ->then(
-                $mock,
-                $this->expectCallableNever()
-            );
-    }
-
-    /** @test */
-    public function shouldSwitchFromErrbacksToCallbacksWhenErrbackDoesNotExplicitlyPropagate()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(2));
-
-        $adapter->reject(1);
-        $adapter->promise()
-            ->then(
-                $this->expectCallableNever(),
-                function ($val) {
-                    return $val + 1;
-                }
-            )
-            ->then(
-                $mock,
-                $this->expectCallableNever()
-            );
-    }
-
-    /** @test */
-    public function shouldSwitchFromErrbacksToCallbacksWhenErrbackReturnsAResolution()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(2));
-
-        $adapter->reject(1);
-        $adapter->promise()
-            ->then(
-                $this->expectCallableNever(),
-                function ($val) {
-                    return \React\Promise\resolve($val + 1);
-                }
-            )
-            ->then(
-                $mock,
-                $this->expectCallableNever()
-            );
-    }
-
-    /** @test */
-    public function shouldPropagateRejectionsWhenErrbackThrows()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $exception = new \Exception();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->will($this->throwException($exception));
-
-        $mock2 = $this->createCallableMock();
-        $mock2
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo($exception));
-
-        $adapter->reject(1);
-        $adapter->promise()
-            ->then(
-                $this->expectCallableNever(),
-                $mock
-            )
-            ->then(
-                $this->expectCallableNever(),
-                $mock2
-            );
-    }
-
-    /** @test */
-    public function shouldPropagateRejectionsWhenErrbackReturnsARejection()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(2));
-
-        $adapter->reject(1);
-        $adapter->promise()
-            ->then(
-                $this->expectCallableNever(),
-                function ($val) {
-                    return \React\Promise\reject($val + 1);
-                }
-            )
-            ->then(
-                $this->expectCallableNever(),
-                $mock
-            );
-    }
-
-    /** @test */
-    public function doneShouldInvokeRejectionHandlerForRejectedPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(1));
-
-        $adapter->reject(1);
-        $this->assertNull($adapter->promise()->done(null, $mock));
-    }
-
-    /** @test */
-    public function doneShouldThrowExceptionThrownByRejectionHandlerForRejectedPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $this->setExpectedException('\Exception', 'UnhandledRejectionException');
-
-        $adapter->reject(1);
-        $this->assertNull($adapter->promise()->done(null, function () {
-            throw new \Exception('UnhandledRejectionException');
-        }));
-    }
-
-    /** @test */
-    public function doneShouldThrowUnhandledRejectionExceptionWhenRejectedWithNonExceptionForRejectedPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $this->setExpectedException('React\\Promise\\UnhandledRejectionException');
-
-        $adapter->reject(1);
-        $this->assertNull($adapter->promise()->done());
-    }
-
-    /** @test */
-    public function doneShouldThrowUnhandledRejectionExceptionWhenRejectionHandlerRejectsForRejectedPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $this->setExpectedException('React\\Promise\\UnhandledRejectionException');
-
-        $adapter->reject(1);
-        $this->assertNull($adapter->promise()->done(null, function () {
-            return \React\Promise\reject();
-        }));
-    }
-
-    /** @test */
-    public function doneShouldThrowRejectionExceptionWhenRejectionHandlerRejectsWithExceptionForRejectedPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $this->setExpectedException('\Exception', 'UnhandledRejectionException');
-
-        $adapter->reject(1);
-        $this->assertNull($adapter->promise()->done(null, function () {
-            return \React\Promise\reject(new \Exception('UnhandledRejectionException'));
-        }));
-    }
-
-    /** @test */
-    public function doneShouldThrowExceptionProvidedAsRejectionValueForRejectedPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $this->setExpectedException('\Exception', 'UnhandledRejectionException');
-
-        $adapter->reject(new \Exception('UnhandledRejectionException'));
-        $this->assertNull($adapter->promise()->done());
-    }
-
-    /** @test */
-    public function doneShouldThrowWithDeepNestingPromiseChainsForRejectedPromise()
-    {
-        $this->setExpectedException('\Exception', 'UnhandledRejectionException');
-
-        $exception = new \Exception('UnhandledRejectionException');
-
-        $d = new Deferred();
-        $d->resolve();
-
-        $result = \React\Promise\resolve(\React\Promise\resolve($d->promise()->then(function () use ($exception) {
-            $d = new Deferred();
-            $d->resolve();
-
-            return \React\Promise\resolve($d->promise()->then(function () {}))->then(
-                function () use ($exception) {
-                    throw $exception;
-                }
-            );
-        })));
-
-        $result->done();
-    }
-
-    /** @test */
-    public function doneShouldRecoverWhenRejectionHandlerCatchesExceptionForRejectedPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $adapter->reject(new \Exception('UnhandledRejectionException'));
-        $this->assertNull($adapter->promise()->done(null, function (\Exception $e) {
-
-        }));
-    }
-
-    /** @test */
-    public function otherwiseShouldInvokeRejectionHandlerForRejectedPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(1));
-
-        $adapter->reject(1);
-        $adapter->promise()->otherwise($mock);
-    }
-
-    /** @test */
-    public function otherwiseShouldInvokeNonTypeHintedRejectionHandlerIfReasonIsAnExceptionForRejectedPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $exception = new \Exception();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo($exception));
-
-        $adapter->reject($exception);
-        $adapter->promise()
-            ->otherwise(function ($reason) use ($mock) {
-                $mock($reason);
-            });
-    }
-
-    /** @test */
-    public function otherwiseShouldInvokeRejectionHandlerIfReasonMatchesTypehintForRejectedPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $exception = new \InvalidArgumentException();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo($exception));
-
-        $adapter->reject($exception);
-        $adapter->promise()
-            ->otherwise(function (\InvalidArgumentException $reason) use ($mock) {
-                $mock($reason);
-            });
-    }
-
-    /** @test */
-    public function otherwiseShouldNotInvokeRejectionHandlerIfReaonsDoesNotMatchTypehintForRejectedPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $exception = new \Exception();
-
-        $mock = $this->expectCallableNever();
-
-        $adapter->reject($exception);
-        $adapter->promise()
-            ->otherwise(function (\InvalidArgumentException $reason) use ($mock) {
-                $mock($reason);
-            });
-    }
-
-    /** @test */
-    public function alwaysShouldNotSuppressRejectionForRejectedPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $exception = new \Exception();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo($exception));
-
-        $adapter->reject($exception);
-        $adapter->promise()
-            ->always(function () {})
-            ->then(null, $mock);
-    }
-
-    /** @test */
-    public function alwaysShouldNotSuppressRejectionWhenHandlerReturnsANonPromiseForRejectedPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $exception = new \Exception();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo($exception));
-
-        $adapter->reject($exception);
-        $adapter->promise()
-            ->always(function () {
-                return 1;
-            })
-            ->then(null, $mock);
-    }
-
-    /** @test */
-    public function alwaysShouldNotSuppressRejectionWhenHandlerReturnsAPromiseForRejectedPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $exception = new \Exception();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo($exception));
-
-        $adapter->reject($exception);
-        $adapter->promise()
-            ->always(function () {
-                return \React\Promise\resolve(1);
-            })
-            ->then(null, $mock);
-    }
-
-    /** @test */
-    public function alwaysShouldRejectWhenHandlerThrowsForRejectedPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $exception1 = new \Exception();
-        $exception2 = new \Exception();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo($exception2));
-
-        $adapter->reject($exception1);
-        $adapter->promise()
-            ->always(function () use ($exception2) {
-                throw $exception2;
-            })
-            ->then(null, $mock);
-    }
-
-    /** @test */
-    public function alwaysShouldRejectWhenHandlerRejectsForRejectedPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $exception1 = new \Exception();
-        $exception2 = new \Exception();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo($exception2));
-
-        $adapter->reject($exception1);
-        $adapter->promise()
-            ->always(function () use ($exception2) {
-                return \React\Promise\reject($exception2);
-            })
-            ->then(null, $mock);
-    }
-
-    /** @test */
-    public function cancelShouldReturnNullForRejectedPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $adapter->reject();
-
-        $this->assertNull($adapter->promise()->cancel());
-    }
-
-    /** @test */
-    public function cancelShouldHaveNoEffectForRejectedPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter($this->expectCallableNever());
-
-        $adapter->reject();
-
-        $adapter->promise()->cancel();
-    }
-}
diff --git a/core/vendor/react/promise/tests/PromiseTest/PromiseSettledTestTrait.php b/core/vendor/react/promise/tests/PromiseTest/PromiseSettledTestTrait.php
deleted file mode 100644
index e363b6d91..000000000
--- a/core/vendor/react/promise/tests/PromiseTest/PromiseSettledTestTrait.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-namespace React\Promise\PromiseTest;
-
-trait PromiseSettledTestTrait
-{
-    /**
-     * @return \React\Promise\PromiseAdapter\PromiseAdapterInterface
-     */
-    abstract public function getPromiseTestAdapter(callable $canceller = null);
-
-    /** @test */
-    public function thenShouldReturnAPromiseForSettledPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $adapter->settle();
-        $this->assertInstanceOf('React\\Promise\\PromiseInterface', $adapter->promise()->then());
-    }
-
-    /** @test */
-    public function thenShouldReturnAllowNullForSettledPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $adapter->settle();
-        $this->assertInstanceOf('React\\Promise\\PromiseInterface', $adapter->promise()->then(null, null, null));
-    }
-
-    /** @test */
-    public function cancelShouldReturnNullForSettledPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $adapter->settle();
-
-        $this->assertNull($adapter->promise()->cancel());
-    }
-
-    /** @test */
-    public function cancelShouldHaveNoEffectForSettledPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter($this->expectCallableNever());
-
-        $adapter->settle();
-
-        $adapter->promise()->cancel();
-    }
-
-    /** @test */
-    public function doneShouldReturnNullForSettledPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $adapter->settle();
-        $this->assertNull($adapter->promise()->done(null, function () {}));
-    }
-
-    /** @test */
-    public function doneShouldReturnAllowNullForSettledPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $adapter->settle();
-        $this->assertNull($adapter->promise()->done(null, function () {}, null));
-    }
-
-    /** @test */
-    public function progressShouldNotInvokeProgressHandlerForSettledPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $adapter->settle();
-        $adapter->promise()->progress($this->expectCallableNever());
-        $adapter->notify();
-    }
-
-    /** @test */
-    public function alwaysShouldReturnAPromiseForSettledPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $adapter->settle();
-        $this->assertInstanceOf('React\\Promise\\PromiseInterface', $adapter->promise()->always(function () {}));
-    }
-}
diff --git a/core/vendor/react/promise/tests/PromiseTest/RejectTestTrait.php b/core/vendor/react/promise/tests/PromiseTest/RejectTestTrait.php
deleted file mode 100644
index 7d6f65fd0..000000000
--- a/core/vendor/react/promise/tests/PromiseTest/RejectTestTrait.php
+++ /dev/null
@@ -1,363 +0,0 @@
-<?php
-
-namespace React\Promise\PromiseTest;
-
-use React\Promise;
-use React\Promise\Deferred;
-
-trait RejectTestTrait
-{
-    /**
-     * @return \React\Promise\PromiseAdapter\PromiseAdapterInterface
-     */
-    abstract public function getPromiseTestAdapter(callable $canceller = null);
-
-    /** @test */
-    public function rejectShouldRejectWithAnImmediateValue()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(1));
-
-        $adapter->promise()
-            ->then($this->expectCallableNever(), $mock);
-
-        $adapter->reject(1);
-    }
-
-    /** @test */
-    public function rejectShouldRejectWithFulfilledPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(1));
-
-        $adapter->promise()
-            ->then($this->expectCallableNever(), $mock);
-
-        $adapter->reject(Promise\resolve(1));
-    }
-
-    /** @test */
-    public function rejectShouldRejectWithRejectedPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(1));
-
-        $adapter->promise()
-            ->then($this->expectCallableNever(), $mock);
-
-        $adapter->reject(Promise\reject(1));
-    }
-
-    /** @test */
-    public function rejectShouldForwardReasonWhenCallbackIsNull()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(1));
-
-        $adapter->promise()
-            ->then(
-                $this->expectCallableNever()
-            )
-            ->then(
-                $this->expectCallableNever(),
-                $mock
-            );
-
-        $adapter->reject(1);
-    }
-
-    /** @test */
-    public function rejectShouldMakePromiseImmutable()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(1));
-
-        $adapter->promise()
-            ->then(
-                $this->expectCallableNever(),
-                $mock
-            );
-
-        $adapter->reject(1);
-        $adapter->reject(2);
-    }
-
-    /** @test */
-    public function notifyShouldInvokeOtherwiseHandler()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(1));
-
-        $adapter->promise()
-            ->otherwise($mock);
-
-        $adapter->reject(1);
-    }
-
-    /** @test */
-    public function doneShouldInvokeRejectionHandler()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(1));
-
-        $this->assertNull($adapter->promise()->done(null, $mock));
-        $adapter->reject(1);
-    }
-
-    /** @test */
-    public function doneShouldThrowExceptionThrownByRejectionHandler()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $this->setExpectedException('\Exception', 'UnhandledRejectionException');
-
-        $this->assertNull($adapter->promise()->done(null, function () {
-            throw new \Exception('UnhandledRejectionException');
-        }));
-        $adapter->reject(1);
-    }
-
-    /** @test */
-    public function doneShouldThrowUnhandledRejectionExceptionWhenRejectedWithNonException()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $this->setExpectedException('React\\Promise\\UnhandledRejectionException');
-
-        $this->assertNull($adapter->promise()->done());
-        $adapter->reject(1);
-    }
-
-    /** @test */
-    public function doneShouldThrowUnhandledRejectionExceptionWhenRejectionHandlerRejects()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $this->setExpectedException('React\\Promise\\UnhandledRejectionException');
-
-        $this->assertNull($adapter->promise()->done(null, function () {
-            return \React\Promise\reject();
-        }));
-        $adapter->reject(1);
-    }
-
-    /** @test */
-    public function doneShouldThrowRejectionExceptionWhenRejectionHandlerRejectsWithException()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $this->setExpectedException('\Exception', 'UnhandledRejectionException');
-
-        $this->assertNull($adapter->promise()->done(null, function () {
-            return \React\Promise\reject(new \Exception('UnhandledRejectionException'));
-        }));
-        $adapter->reject(1);
-    }
-
-    /** @test */
-    public function doneShouldThrowUnhandledRejectionExceptionWhenRejectionHandlerRetunsPendingPromiseWhichRejectsLater()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $this->setExpectedException('React\\Promise\\UnhandledRejectionException');
-
-        $d = new Deferred();
-        $promise = $d->promise();
-
-        $this->assertNull($adapter->promise()->done(null, function () use ($promise) {
-            return $promise;
-        }));
-        $adapter->reject(1);
-        $d->reject(1);
-    }
-
-    /** @test */
-    public function doneShouldThrowExceptionProvidedAsRejectionValue()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $this->setExpectedException('\Exception', 'UnhandledRejectionException');
-
-        $this->assertNull($adapter->promise()->done());
-        $adapter->reject(new \Exception('UnhandledRejectionException'));
-    }
-
-    /** @test */
-    public function doneShouldThrowWithDeepNestingPromiseChains()
-    {
-        $this->setExpectedException('\Exception', 'UnhandledRejectionException');
-
-        $exception = new \Exception('UnhandledRejectionException');
-
-        $d = new Deferred();
-
-        $result = \React\Promise\resolve(\React\Promise\resolve($d->promise()->then(function () use ($exception) {
-            $d = new Deferred();
-            $d->resolve();
-
-            return \React\Promise\resolve($d->promise()->then(function () {}))->then(
-                function () use ($exception) {
-                    throw $exception;
-                }
-            );
-        })));
-
-        $result->done();
-
-        $d->resolve();
-    }
-
-    /** @test */
-    public function doneShouldRecoverWhenRejectionHandlerCatchesException()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $this->assertNull($adapter->promise()->done(null, function (\Exception $e) {
-
-        }));
-        $adapter->reject(new \Exception('UnhandledRejectionException'));
-    }
-
-    /** @test */
-    public function alwaysShouldNotSuppressRejection()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $exception = new \Exception();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo($exception));
-
-        $adapter->promise()
-            ->always(function () {})
-            ->then(null, $mock);
-
-        $adapter->reject($exception);
-    }
-
-    /** @test */
-    public function alwaysShouldNotSuppressRejectionWhenHandlerReturnsANonPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $exception = new \Exception();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo($exception));
-
-        $adapter->promise()
-            ->always(function () {
-                return 1;
-            })
-            ->then(null, $mock);
-
-        $adapter->reject($exception);
-    }
-
-    /** @test */
-    public function alwaysShouldNotSuppressRejectionWhenHandlerReturnsAPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $exception = new \Exception();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo($exception));
-
-        $adapter->promise()
-            ->always(function () {
-                return \React\Promise\resolve(1);
-            })
-            ->then(null, $mock);
-
-        $adapter->reject($exception);
-    }
-
-    /** @test */
-    public function alwaysShouldRejectWhenHandlerThrowsForRejection()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $exception = new \Exception();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo($exception));
-
-        $adapter->promise()
-            ->always(function () use ($exception) {
-                throw $exception;
-            })
-            ->then(null, $mock);
-
-        $adapter->reject($exception);
-    }
-
-    /** @test */
-    public function alwaysShouldRejectWhenHandlerRejectsForRejection()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $exception = new \Exception();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo($exception));
-
-        $adapter->promise()
-            ->always(function () use ($exception) {
-                return \React\Promise\reject($exception);
-            })
-            ->then(null, $mock);
-
-        $adapter->reject($exception);
-    }
-}
diff --git a/core/vendor/react/promise/tests/PromiseTest/ResolveTestTrait.php b/core/vendor/react/promise/tests/PromiseTest/ResolveTestTrait.php
deleted file mode 100644
index b05f7fe84..000000000
--- a/core/vendor/react/promise/tests/PromiseTest/ResolveTestTrait.php
+++ /dev/null
@@ -1,258 +0,0 @@
-<?php
-
-namespace React\Promise\PromiseTest;
-
-use React\Promise;
-
-trait ResolveTestTrait
-{
-    /**
-     * @return \React\Promise\PromiseAdapter\PromiseAdapterInterface
-     */
-    abstract public function getPromiseTestAdapter(callable $canceller = null);
-
-    /** @test */
-    public function resolveShouldResolve()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(1));
-
-        $adapter->promise()
-            ->then($mock);
-
-        $adapter->resolve(1);
-    }
-
-    /** @test */
-    public function resolveShouldResolveWithPromisedValue()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(1));
-
-        $adapter->promise()
-            ->then($mock);
-
-        $adapter->resolve(Promise\resolve(1));
-    }
-
-    /** @test */
-    public function resolveShouldRejectWhenResolvedWithRejectedPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(1));
-
-        $adapter->promise()
-            ->then($this->expectCallableNever(), $mock);
-
-        $adapter->resolve(Promise\reject(1));
-    }
-
-    /** @test */
-    public function resolveShouldForwardValueWhenCallbackIsNull()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(1));
-
-        $adapter->promise()
-            ->then(
-                null,
-                $this->expectCallableNever()
-            )
-            ->then(
-                $mock,
-                $this->expectCallableNever()
-            );
-
-        $adapter->resolve(1);
-    }
-
-    /** @test */
-    public function resolveShouldMakePromiseImmutable()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(1));
-
-        $adapter->promise()
-            ->then(
-                $mock,
-                $this->expectCallableNever()
-            );
-
-        $adapter->resolve(1);
-        $adapter->resolve(2);
-    }
-
-    /** @test */
-    public function doneShouldInvokeFulfillmentHandler()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo(1));
-
-        $this->assertNull($adapter->promise()->done($mock));
-        $adapter->resolve(1);
-    }
-
-    /** @test */
-    public function doneShouldThrowExceptionThrownFulfillmentHandler()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $this->setExpectedException('\Exception', 'UnhandledRejectionException');
-
-        $this->assertNull($adapter->promise()->done(function () {
-            throw new \Exception('UnhandledRejectionException');
-        }));
-        $adapter->resolve(1);
-    }
-
-    /** @test */
-    public function doneShouldThrowUnhandledRejectionExceptionWhenFulfillmentHandlerRejects()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $this->setExpectedException('React\\Promise\\UnhandledRejectionException');
-
-        $this->assertNull($adapter->promise()->done(function () {
-            return \React\Promise\reject();
-        }));
-        $adapter->resolve(1);
-    }
-
-    /** @test */
-    public function alwaysShouldNotSuppressValue()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $value = new \stdClass();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo($value));
-
-        $adapter->promise()
-            ->always(function () {})
-            ->then($mock);
-
-        $adapter->resolve($value);
-    }
-
-    /** @test */
-    public function alwaysShouldNotSuppressValueWhenHandlerReturnsANonPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $value = new \stdClass();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo($value));
-
-        $adapter->promise()
-            ->always(function () {
-                return 1;
-            })
-            ->then($mock);
-
-        $adapter->resolve($value);
-    }
-
-    /** @test */
-    public function alwaysShouldNotSuppressValueWhenHandlerReturnsAPromise()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $value = new \stdClass();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo($value));
-
-        $adapter->promise()
-            ->always(function () {
-                return \React\Promise\resolve(1);
-            })
-            ->then($mock);
-
-        $adapter->resolve($value);
-    }
-
-    /** @test */
-    public function alwaysShouldRejectWhenHandlerThrowsForFulfillment()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $exception = new \Exception();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo($exception));
-
-        $adapter->promise()
-            ->always(function () use ($exception) {
-                throw $exception;
-            })
-            ->then(null, $mock);
-
-        $adapter->resolve(1);
-    }
-
-    /** @test */
-    public function alwaysShouldRejectWhenHandlerRejectsForFulfillment()
-    {
-        $adapter = $this->getPromiseTestAdapter();
-
-        $exception = new \Exception();
-
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke')
-            ->with($this->identicalTo($exception));
-
-        $adapter->promise()
-            ->always(function () use ($exception) {
-                return \React\Promise\reject($exception);
-            })
-            ->then(null, $mock);
-
-        $adapter->resolve(1);
-    }
-}
diff --git a/core/vendor/react/promise/tests/RejectedPromiseTest.php b/core/vendor/react/promise/tests/RejectedPromiseTest.php
deleted file mode 100644
index c886b0095..000000000
--- a/core/vendor/react/promise/tests/RejectedPromiseTest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-namespace React\Promise;
-
-use React\Promise\PromiseAdapter\CallbackPromiseAdapter;
-
-class RejectedPromiseTest extends TestCase
-{
-    use PromiseTest\PromiseSettledTestTrait,
-        PromiseTest\PromiseRejectedTestTrait;
-
-    public function getPromiseTestAdapter(callable $canceller = null)
-    {
-        $promise = null;
-
-        return new CallbackPromiseAdapter([
-            'promise' => function () use (&$promise) {
-                if (!$promise) {
-                    throw new \LogicException('RejectedPromise must be rejected before obtaining the promise');
-                }
-
-                return $promise;
-            },
-            'resolve' => function () {
-                throw new \LogicException('You cannot call resolve() for React\Promise\RejectedPromise');
-            },
-            'reject' => function ($reason = null) use (&$promise) {
-                if (!$promise) {
-                    $promise = new RejectedPromise($reason);
-                }
-            },
-            'notify' => function () {
-                // no-op
-            },
-            'settle' => function ($reason = null) use (&$promise) {
-                if (!$promise) {
-                    $promise = new RejectedPromise($reason);
-                }
-            },
-        ]);
-    }
-
-    /** @test */
-    public function shouldThrowExceptionIfConstructedWithAPromise()
-    {
-        $this->setExpectedException('\InvalidArgumentException');
-
-        return new RejectedPromise(new RejectedPromise());
-    }
-}
diff --git a/core/vendor/react/promise/tests/Stub/CallableStub.php b/core/vendor/react/promise/tests/Stub/CallableStub.php
deleted file mode 100644
index 012089335..000000000
--- a/core/vendor/react/promise/tests/Stub/CallableStub.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace React\Promise\Stub;
-
-class CallableStub
-{
-    public function __invoke()
-    {
-    }
-}
diff --git a/core/vendor/react/promise/tests/TestCase.php b/core/vendor/react/promise/tests/TestCase.php
deleted file mode 100644
index 60ea46d7d..000000000
--- a/core/vendor/react/promise/tests/TestCase.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-namespace React\Promise;
-
-class TestCase extends \PHPUnit_Framework_TestCase
-{
-    public function expectCallableExactly($amount)
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->exactly($amount))
-            ->method('__invoke');
-
-        return $mock;
-    }
-
-    public function expectCallableOnce()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->once())
-            ->method('__invoke');
-
-        return $mock;
-    }
-
-    public function expectCallableNever()
-    {
-        $mock = $this->createCallableMock();
-        $mock
-            ->expects($this->never())
-            ->method('__invoke');
-
-        return $mock;
-    }
-
-    public function createCallableMock()
-    {
-        return $this->getMock('React\\Promise\Stub\CallableStub');
-    }
-}
diff --git a/core/vendor/react/promise/tests/bootstrap.php b/core/vendor/react/promise/tests/bootstrap.php
deleted file mode 100644
index 9b7f872a5..000000000
--- a/core/vendor/react/promise/tests/bootstrap.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-$loader = @include __DIR__.'/../vendor/autoload.php';
-if (!$loader) {
-    $loader = require __DIR__.'/../../../../vendor/autoload.php';
-}
-$loader->addPsr4('React\\Promise\\', __DIR__);
diff --git a/core/vendor/sdboyer/gliph/README.md b/core/vendor/sdboyer/gliph/README.md
deleted file mode 100644
index 73f3629cf..000000000
--- a/core/vendor/sdboyer/gliph/README.md
+++ /dev/null
@@ -1,52 +0,0 @@
-# Gliph
-
-[![Build Status](https://travis-ci.org/sdboyer/gliph.png?branch=php53)](https://travis-ci.org/sdboyer/gliph)
-[![Latest Stable Version](https://poser.pugx.org/sdboyer/gliph/v/stable.png)](https://packagist.org/packages/sdboyer/gliph)
-[![Coverage Status](https://coveralls.io/repos/sdboyer/gliph/badge.png?branch=php53)](https://coveralls.io/r/sdboyer/gliph?branch=php53)
-
-Gliph is a **g**raph **li**brary for **PH**P. It provides graph building blocks and datastructures for use by other PHP applications. It is (currently) designed for use with in-memory graphs, not for interaction with a graph database like [Neo4J](http://neo4j.org/).
-
-Gliph aims for both sane interfaces and performant implementation - at least, as performant as can be hoped for a PHP graph library. This does require knowing enough about graphs to know what type is appropriate for your use case, but we are aiming to provide helpers that simplify those choices.
-
-## Core Concepts
-
-Gliph has several components that work together: graph classes, algorithms, and visitors. Generally speaking, Gliph is patterned after the [C++ Boost Graph Library](http://www.boost.org/libs/graph/doc); reading their documentation can yield a lot of insight into how Gliph is intended to work.
-
-Note that Gliph is currently written for compatibility with PHP 5.3, but it is intended to port the library to PHP 5.5. The availability of traits, non-scalar keys in iterators, and generators will considerably change and improve both the internal and public-facing implementations.
-
-### Graphs
-
-There are a number of different strategies for representing graphs; these strategies are more or less efficient depending on certain properties the graph, and what needs to be done to the graph. The approach taken in Gliph is to offer a roughly consistent 'Graph' interface that is common to all these different strategies. The strategies will have varying levels of efficiency at meeting this common interface, so it is the responsibility of the user to select a graph implementation that is appropriate for their use case. This approach draws heavily from the [taxonomy of graphs](http://www.boost.org/doc/libs/1_54_0/libs/graph/doc/graph_concepts.html) established by the BGL.
-
-Gliph currently implements only an adjacency list graph strategy, in both directed and undirected flavors. Adjacency lists offer efficient access to out-edges, but inefficient access to in-edges (in a directed graph - in an undirected graph, in-edges and out-edges are the same). Adjacency lists and are generally more space-efficient for sparse graphs.
-
-### Algorithms
-
-Gliph provides various algorithms that can be run on graph objects. These algorithms interact with the graph by making calls to methods defined in the assorted Graph interfaces. If a graph implements the interface type-hinted by a particular algorithm, then the algorithm can run on that graph. But the efficiency of the algorithm will be largely determined by how efficiently that graph implementation can meet the requirements of the interface. Adjacency lists, for example, are not terribly efficient at providing a list of all edges in a graph, but are very good at single-vertex-centric operations.
-
-Gliph's algorithms are typically implemented quite sparsely (especially traversers) - they seek to implement the simplest, most generic version of an algorithm. They also may not return any output, as that work is left to Visitors.
-
-### Visitors
-
-Most algorithms require a visitor object to be provided. The visitor conforms to an interface specified by the algorithm, and the algorithm will call the visitor at certain choice points during its execution. This allows the algorithms to stay highly generic, while visitors can be tailored to a more specific purpose.
-
-For example, a ```DepthFirst``` visitor might be used to calculate vertex reach, or generate a topologically sorted list. Each of these are things that a depth-first graph traversal can do. But the work of doing so is left to the visitor so that only one traversal algorithm is needed, and that algorithm is as cheap (memory and cycles) as possible.
-
-## TODOs
-
-Lots. But, to start with:
-
-- Port to, or provide a parallel implementation in, PHP 5.5. Generators and non-scalar keys from iterators make this all SO much better. In doing that, also shift as much over to traits as possible.
-- Implement a generic breadth-first algorithm and its corresponding visitors.
-- Implement a generic iterative deepening depth-first algorithm, and its corresponding visitors.
-- Implement other popular connected components algorithms, as well as some shortest path algorithms (starting with Dijkstra)
-- Write up some examples showing how to actually use the library.
-- Extend the ```DepthFirst::traverse()``` algorithm and ```DepthFirstVisitorInterface``` to allow the visitor to stop the traversal. useful if, e.g., a search is being performed and the desired vertex has been found.
-
-## Acknowledgements
-
-This library draws heavy inspiration from the [C++ Boost Graph Library](http://www.boost.org/libs/graph/doc).
-
-## License
-
-MIT
diff --git a/core/vendor/sdboyer/gliph/composer.json b/core/vendor/sdboyer/gliph/composer.json
deleted file mode 100644
index 0c8c84fb7..000000000
--- a/core/vendor/sdboyer/gliph/composer.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "name": "sdboyer/gliph",
-    "description": "A graph library for PHP.",
-    "license": "MIT",
-    "keywords": ["gliph", "library", "php", "spl", "graph"],
-    "homepage": "http://github.com/sdboyer/gliph",
-    "type": "library",
-    "authors": [
-        {
-            "name": "Sam Boyer",
-            "email": "tech@samboyer.org"
-        }
-    ],
-    "require": {
-        "php": ">=5.3"
-    },
-    "require-dev": {
-      "satooshi/php-coveralls": "0.6.*",
-      "phpunit/phpunit": "3.7.*"
-    },
-    "autoload": {
-        "psr-0": { "Gliph": "src/" }
-    }
-}
diff --git a/core/vendor/sdboyer/gliph/composer.lock b/core/vendor/sdboyer/gliph/composer.lock
deleted file mode 100644
index dd00f9d13..000000000
--- a/core/vendor/sdboyer/gliph/composer.lock
+++ /dev/null
@@ -1,886 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
-    ],
-    "hash": "3837dc792787c5b77aecfac96337ffc5",
-    "packages": [
-
-    ],
-    "packages-dev": [
-        {
-            "name": "guzzle/guzzle",
-            "version": "v3.7.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "b170b028c6bb5799640e46c8803015b0f9a45ed9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b170b028c6bb5799640e46c8803015b0f9a45ed9",
-                "reference": "b170b028c6bb5799640e46c8803015b0f9a45ed9",
-                "shasum": ""
-            },
-            "require": {
-                "ext-curl": "*",
-                "php": ">=5.3.3",
-                "symfony/event-dispatcher": ">=2.1"
-            },
-            "replace": {
-                "guzzle/batch": "self.version",
-                "guzzle/cache": "self.version",
-                "guzzle/common": "self.version",
-                "guzzle/http": "self.version",
-                "guzzle/inflection": "self.version",
-                "guzzle/iterator": "self.version",
-                "guzzle/log": "self.version",
-                "guzzle/parser": "self.version",
-                "guzzle/plugin": "self.version",
-                "guzzle/plugin-async": "self.version",
-                "guzzle/plugin-backoff": "self.version",
-                "guzzle/plugin-cache": "self.version",
-                "guzzle/plugin-cookie": "self.version",
-                "guzzle/plugin-curlauth": "self.version",
-                "guzzle/plugin-error-response": "self.version",
-                "guzzle/plugin-history": "self.version",
-                "guzzle/plugin-log": "self.version",
-                "guzzle/plugin-md5": "self.version",
-                "guzzle/plugin-mock": "self.version",
-                "guzzle/plugin-oauth": "self.version",
-                "guzzle/service": "self.version",
-                "guzzle/stream": "self.version"
-            },
-            "require-dev": {
-                "doctrine/cache": "*",
-                "monolog/monolog": "1.*",
-                "phpunit/phpunit": "3.7.*",
-                "psr/log": "1.0.*",
-                "symfony/class-loader": "*",
-                "zendframework/zend-cache": "2.0.*",
-                "zendframework/zend-log": "2.0.*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.7-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Guzzle\\Tests": "tests/",
-                    "Guzzle": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Michael Dowling",
-                    "email": "mtdowling@gmail.com",
-                    "homepage": "https://github.com/mtdowling"
-                },
-                {
-                    "name": "Guzzle Community",
-                    "homepage": "https://github.com/guzzle/guzzle/contributors"
-                }
-            ],
-            "description": "Guzzle is a PHP HTTP client library and framework for building RESTful web service clients",
-            "homepage": "http://guzzlephp.org/",
-            "keywords": [
-                "client",
-                "curl",
-                "framework",
-                "http",
-                "http client",
-                "rest",
-                "web service"
-            ],
-            "time": "2013-10-02 20:47:00"
-        },
-        {
-            "name": "phpunit/php-code-coverage",
-            "version": "1.2.13",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "466e7cd2554b4e264c9e3f31216d25ac0e5f3d94"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/466e7cd2554b4e264c9e3f31216d25ac0e5f3d94",
-                "reference": "466e7cd2554b4e264c9e3f31216d25ac0e5f3d94",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "phpunit/php-file-iterator": ">=1.3.0@stable",
-                "phpunit/php-text-template": ">=1.1.1@stable",
-                "phpunit/php-token-stream": ">=1.1.3@stable"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "3.7.*@dev"
-            },
-            "suggest": {
-                "ext-dom": "*",
-                "ext-xdebug": ">=2.0.5"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "PHP/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                ""
-            ],
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
-            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
-            "keywords": [
-                "coverage",
-                "testing",
-                "xunit"
-            ],
-            "time": "2013-09-10 08:14:32"
-        },
-        {
-            "name": "phpunit/php-file-iterator",
-            "version": "1.3.3",
-            "source": {
-                "type": "git",
-                "url": "git://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "1.3.3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://github.com/sebastianbergmann/php-file-iterator/zipball/1.3.3",
-                "reference": "1.3.3",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "File/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                ""
-            ],
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
-            "homepage": "http://www.phpunit.de/",
-            "keywords": [
-                "filesystem",
-                "iterator"
-            ],
-            "time": "2012-10-11 04:44:38"
-        },
-        {
-            "name": "phpunit/php-text-template",
-            "version": "1.1.4",
-            "source": {
-                "type": "git",
-                "url": "git://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "1.1.4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://github.com/sebastianbergmann/php-text-template/zipball/1.1.4",
-                "reference": "1.1.4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "Text/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                ""
-            ],
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Simple template engine.",
-            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
-            "keywords": [
-                "template"
-            ],
-            "time": "2012-10-31 11:15:28"
-        },
-        {
-            "name": "phpunit/php-timer",
-            "version": "1.0.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "1.0.5"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/1.0.5",
-                "reference": "1.0.5",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "PHP/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                ""
-            ],
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Utility class for timing",
-            "homepage": "https://github.com/sebastianbergmann/php-timer/",
-            "keywords": [
-                "timer"
-            ],
-            "time": "2013-08-02 07:42:54"
-        },
-        {
-            "name": "phpunit/php-token-stream",
-            "version": "1.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "5220af2a7929aa35cf663d97c89ad3d50cf5fa3e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/5220af2a7929aa35cf663d97c89ad3d50cf5fa3e",
-                "reference": "5220af2a7929aa35cf663d97c89ad3d50cf5fa3e",
-                "shasum": ""
-            },
-            "require": {
-                "ext-tokenizer": "*",
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "PHP/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                ""
-            ],
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Wrapper around PHP's tokenizer extension.",
-            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
-            "keywords": [
-                "tokenizer"
-            ],
-            "time": "2013-09-13 04:58:23"
-        },
-        {
-            "name": "phpunit/phpunit",
-            "version": "3.7.27",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "4b024e753e3421837afbcca962c8724c58b39376"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4b024e753e3421837afbcca962c8724c58b39376",
-                "reference": "4b024e753e3421837afbcca962c8724c58b39376",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-pcre": "*",
-                "ext-reflection": "*",
-                "ext-spl": "*",
-                "php": ">=5.3.3",
-                "phpunit/php-code-coverage": "~1.2.1",
-                "phpunit/php-file-iterator": ">=1.3.1",
-                "phpunit/php-text-template": ">=1.1.1",
-                "phpunit/php-timer": ">=1.0.4",
-                "phpunit/phpunit-mock-objects": "~1.2.0",
-                "symfony/yaml": "~2.0"
-            },
-            "require-dev": {
-                "pear-pear/pear": "1.9.4"
-            },
-            "suggest": {
-                "ext-json": "*",
-                "ext-simplexml": "*",
-                "ext-tokenizer": "*",
-                "phpunit/php-invoker": ">=1.1.0,<1.2.0"
-            },
-            "bin": [
-                "composer/bin/phpunit"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.7.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "PHPUnit/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                "",
-                "../../symfony/yaml/"
-            ],
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "The PHP Unit Testing framework.",
-            "homepage": "http://www.phpunit.de/",
-            "keywords": [
-                "phpunit",
-                "testing",
-                "xunit"
-            ],
-            "time": "2013-09-16 03:09:52"
-        },
-        {
-            "name": "phpunit/phpunit-mock-objects",
-            "version": "1.2.3",
-            "source": {
-                "type": "git",
-                "url": "git://github.com/sebastianbergmann/phpunit-mock-objects.git",
-                "reference": "1.2.3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects/archive/1.2.3.zip",
-                "reference": "1.2.3",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "phpunit/php-text-template": ">=1.1.1@stable"
-            },
-            "suggest": {
-                "ext-soap": "*"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "PHPUnit/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                ""
-            ],
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Mock Object library for PHPUnit",
-            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
-            "keywords": [
-                "mock",
-                "xunit"
-            ],
-            "time": "2013-01-13 10:24:48"
-        },
-        {
-            "name": "psr/log",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/log.git",
-                "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b",
-                "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b",
-                "shasum": ""
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "Psr\\Log\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for logging libraries",
-            "keywords": [
-                "log",
-                "psr",
-                "psr-3"
-            ],
-            "time": "2012-12-21 11:40:51"
-        },
-        {
-            "name": "satooshi/php-coveralls",
-            "version": "v0.6.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/satooshi/php-coveralls.git",
-                "reference": "dd0df95bd37a7cf5c5c50304dfe260ffe4b50760"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/satooshi/php-coveralls/zipball/dd0df95bd37a7cf5c5c50304dfe260ffe4b50760",
-                "reference": "dd0df95bd37a7cf5c5c50304dfe260ffe4b50760",
-                "shasum": ""
-            },
-            "require": {
-                "ext-curl": "*",
-                "ext-json": "*",
-                "ext-simplexml": "*",
-                "guzzle/guzzle": ">=3.0",
-                "php": ">=5.3",
-                "psr/log": "1.0.0",
-                "symfony/config": ">=2.0",
-                "symfony/console": ">=2.0",
-                "symfony/stopwatch": ">=2.2",
-                "symfony/yaml": ">=2.0"
-            },
-            "require-dev": {
-                "apigen/apigen": "2.8.*@stable",
-                "pdepend/pdepend": "dev-master",
-                "phpmd/phpmd": "dev-master",
-                "phpunit/php-invoker": ">=1.1.0,<1.2.0",
-                "phpunit/phpunit": "3.7.*@stable",
-                "sebastian/finder-facade": "dev-master",
-                "sebastian/phpcpd": "1.4.*@stable",
-                "squizlabs/php_codesniffer": "1.4.*@stable",
-                "theseer/fdomdocument": "dev-master"
-            },
-            "bin": [
-                "composer/bin/coveralls"
-            ],
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "Contrib\\Component": "src/",
-                    "Contrib\\Bundle": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Kitamura Satoshi",
-                    "email": "with.no.parachute@gmail.com",
-                    "homepage": "https://www.facebook.com/satooshi.jp"
-                }
-            ],
-            "description": "PHP client library for Coveralls API",
-            "homepage": "https://github.com/satooshi/php-coveralls",
-            "keywords": [
-                "ci",
-                "coverage",
-                "github",
-                "test"
-            ],
-            "time": "2013-05-04 08:07:33"
-        },
-        {
-            "name": "symfony/config",
-            "version": "v2.3.5",
-            "target-dir": "Symfony/Component/Config",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/Config.git",
-                "reference": "1ced3d6c88b22df8cd1fe5209dbd6a89df362a29"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Config/zipball/1ced3d6c88b22df8cd1fe5209dbd6a89df362a29",
-                "reference": "1ced3d6c88b22df8cd1fe5209dbd6a89df362a29",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "symfony/filesystem": "~2.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.3-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Symfony\\Component\\Config\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Config Component",
-            "homepage": "http://symfony.com",
-            "time": "2013-09-19 09:45:20"
-        },
-        {
-            "name": "symfony/console",
-            "version": "v2.3.5",
-            "target-dir": "Symfony/Component/Console",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/Console.git",
-                "reference": "f880062d56edefb25b36f2defa65aafe65959dc7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Console/zipball/f880062d56edefb25b36f2defa65aafe65959dc7",
-                "reference": "f880062d56edefb25b36f2defa65aafe65959dc7",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "symfony/event-dispatcher": "~2.1"
-            },
-            "suggest": {
-                "symfony/event-dispatcher": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.3-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Symfony\\Component\\Console\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Console Component",
-            "homepage": "http://symfony.com",
-            "time": "2013-09-25 06:04:15"
-        },
-        {
-            "name": "symfony/event-dispatcher",
-            "version": "v2.3.5",
-            "target-dir": "Symfony/Component/EventDispatcher",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/EventDispatcher.git",
-                "reference": "7fc72a7a346a1887d3968cc1ce5642a15cd182e9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/7fc72a7a346a1887d3968cc1ce5642a15cd182e9",
-                "reference": "7fc72a7a346a1887d3968cc1ce5642a15cd182e9",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "symfony/dependency-injection": "~2.0"
-            },
-            "suggest": {
-                "symfony/dependency-injection": "",
-                "symfony/http-kernel": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.3-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Symfony\\Component\\EventDispatcher\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony EventDispatcher Component",
-            "homepage": "http://symfony.com",
-            "time": "2013-09-19 09:45:20"
-        },
-        {
-            "name": "symfony/filesystem",
-            "version": "v2.3.5",
-            "target-dir": "Symfony/Component/Filesystem",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/Filesystem.git",
-                "reference": "2b8995042086c5552c94d33b5553c492e9cfc00e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Filesystem/zipball/2b8995042086c5552c94d33b5553c492e9cfc00e",
-                "reference": "2b8995042086c5552c94d33b5553c492e9cfc00e",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.3-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Symfony\\Component\\Filesystem\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Filesystem Component",
-            "homepage": "http://symfony.com",
-            "time": "2013-09-19 09:45:20"
-        },
-        {
-            "name": "symfony/stopwatch",
-            "version": "v2.3.5",
-            "target-dir": "Symfony/Component/Stopwatch",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/Stopwatch.git",
-                "reference": "1f951fa881d2e661525e81ee0afc97261ad43459"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Stopwatch/zipball/1f951fa881d2e661525e81ee0afc97261ad43459",
-                "reference": "1f951fa881d2e661525e81ee0afc97261ad43459",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.3-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Symfony\\Component\\Stopwatch\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Stopwatch Component",
-            "homepage": "http://symfony.com",
-            "time": "2013-09-19 09:45:20"
-        },
-        {
-            "name": "symfony/yaml",
-            "version": "v2.3.5",
-            "target-dir": "Symfony/Component/Yaml",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/Yaml.git",
-                "reference": "6bb881b948368482e1abf1a75c08bcf88a1c5fc3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Yaml/zipball/6bb881b948368482e1abf1a75c08bcf88a1c5fc3",
-                "reference": "6bb881b948368482e1abf1a75c08bcf88a1c5fc3",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.3-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Symfony\\Component\\Yaml\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Yaml Component",
-            "homepage": "http://symfony.com",
-            "time": "2013-09-22 18:04:39"
-        }
-    ],
-    "aliases": [
-
-    ],
-    "minimum-stability": "stable",
-    "stability-flags": [
-
-    ],
-    "platform": {
-        "php": ">=5.3"
-    },
-    "platform-dev": [
-
-    ]
-}
diff --git a/core/vendor/sdboyer/gliph/src/Gliph/Algorithm/ConnectedComponent.php b/core/vendor/sdboyer/gliph/src/Gliph/Algorithm/ConnectedComponent.php
deleted file mode 100644
index 686c29963..000000000
--- a/core/vendor/sdboyer/gliph/src/Gliph/Algorithm/ConnectedComponent.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-namespace Gliph\Algorithm;
-
-use Gliph\Graph\DirectedGraph;
-use Gliph\Visitor\TarjanSCCVisitor;
-
-/**
- * Contains algorithms for discovering connected components.
- */
-class ConnectedComponent {
-
-    /**
-     * Finds connected components in the provided directed graph.
-     *
-     * @param DirectedGraph $graph
-     *   The DirectedGraph to search for connected components.
-     * @param TarjanSCCVisitor $visitor
-     *   The visitor that will collect and store the connected components. One
-     *   will be created if not provided.
-     *
-     * @return TarjanSCCVisitor
-     *   The finalized visitor.
-     */
-    public static function tarjan_scc(DirectedGraph $graph, TarjanSCCVisitor $visitor = NULL) {
-        $visitor = $visitor ?: new TarjanSCCVisitor();
-        $counter = 0;
-        $stack = array();
-        $indices = new \SplObjectStorage();
-        $lowlimits = new \SplObjectStorage();
-
-        $visit = function($vertex) use (&$visit, &$counter, $graph, &$stack, $indices, $lowlimits, $visitor) {
-            $indices->attach($vertex, $counter);
-            $lowlimits->attach($vertex, $counter);
-            $stack[] = $vertex;
-            $counter++;
-
-            $graph->eachAdjacent($vertex, function ($to) use (&$visit, $vertex, $indices, $lowlimits, &$stack) {
-                if (!$indices->contains($to)) {
-                    $visit($to);
-                    $lowlimits[$vertex] = min($lowlimits[$vertex], $lowlimits[$to]);
-                }
-                else if (in_array($to, $stack, TRUE)) {
-                    $lowlimits[$vertex] = min($lowlimits[$vertex], $indices[$to]);
-                }
-            });
-
-            if ($lowlimits[$vertex] === $indices[$vertex]) {
-                $visitor->newComponent();
-                do {
-                    $other = array_pop($stack);
-                    $visitor->addToCurrentComponent($other);
-                } while ($other != $vertex);
-            }
-        };
-
-        $graph->eachVertex(function($vertex) use (&$visit, $indices) {
-            if (!$indices->contains($vertex)) {
-                $visit($vertex);
-            }
-        });
-
-        return $visitor;
-    }
-}
\ No newline at end of file
diff --git a/core/vendor/sdboyer/gliph/src/Gliph/Exception/InvalidVertexTypeException.php b/core/vendor/sdboyer/gliph/src/Gliph/Exception/InvalidVertexTypeException.php
deleted file mode 100644
index 4b33c815c..000000000
--- a/core/vendor/sdboyer/gliph/src/Gliph/Exception/InvalidVertexTypeException.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Gliph\Exception\InvalidVertexTypeException.
- */
-
-namespace Gliph\Exception;
-
-/**
- * Error thrown when attempting to add a vertex of an invalid type.
- */
-class InvalidVertexTypeException extends \Exception {}
\ No newline at end of file
diff --git a/core/vendor/sdboyer/gliph/src/Gliph/Exception/NonexistentVertexException.php b/core/vendor/sdboyer/gliph/src/Gliph/Exception/NonexistentVertexException.php
deleted file mode 100644
index 22d08602f..000000000
--- a/core/vendor/sdboyer/gliph/src/Gliph/Exception/NonexistentVertexException.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Gliph\Exception\NonexistentVertexException.
- */
-
-namespace Gliph\Exception;
-
-/**
- * Exception thrown when a vertex not present in a Graph is provided as a
- * parameter to a method that requires the vertex to be present (e.g., removing
- * the vertex, checking the edges of that vertex).
- */
-class NonexistentVertexException extends \OutOfBoundsException {}
\ No newline at end of file
diff --git a/core/vendor/sdboyer/gliph/src/Gliph/Exception/OutOfRangeException.php b/core/vendor/sdboyer/gliph/src/Gliph/Exception/OutOfRangeException.php
deleted file mode 100644
index f8aa085b6..000000000
--- a/core/vendor/sdboyer/gliph/src/Gliph/Exception/OutOfRangeException.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-namespace Gliph\Exception;
-
-/**
- * OutOfRangeException for Gliph.
- */
-class OutOfRangeException extends \OutOfRangeException {}
\ No newline at end of file
diff --git a/core/vendor/sdboyer/gliph/src/Gliph/Exception/RuntimeException.php b/core/vendor/sdboyer/gliph/src/Gliph/Exception/RuntimeException.php
deleted file mode 100644
index 39f98b438..000000000
--- a/core/vendor/sdboyer/gliph/src/Gliph/Exception/RuntimeException.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-namespace Gliph\Exception;
-
-/**
- * RuntimeException for Gliph.
- */
-class RuntimeException extends \RuntimeException {}
diff --git a/core/vendor/sdboyer/gliph/src/Gliph/Exception/WrongVisitorStateException.php b/core/vendor/sdboyer/gliph/src/Gliph/Exception/WrongVisitorStateException.php
deleted file mode 100644
index f6fa2be0c..000000000
--- a/core/vendor/sdboyer/gliph/src/Gliph/Exception/WrongVisitorStateException.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Gliph\Exception;
-
-/**
- * An exception thrown when a method is called on a visitor that it does not
- * expect in its current state.
- *
- * For example, this exception should be thrown by a visitor if it has a method
- * that returns data produced by a full traversal algorithm, but the algorithm
- * has not yet informed the visitor that it is done running.
- */
-class WrongVisitorStateException extends \LogicException {}
\ No newline at end of file
diff --git a/core/vendor/sdboyer/gliph/src/Gliph/Graph/AdjacencyList.php b/core/vendor/sdboyer/gliph/src/Gliph/Graph/AdjacencyList.php
deleted file mode 100644
index 3f87286a0..000000000
--- a/core/vendor/sdboyer/gliph/src/Gliph/Graph/AdjacencyList.php
+++ /dev/null
@@ -1,168 +0,0 @@
-<?php
-
-namespace Gliph\Graph;
-
-use Gliph\Exception\InvalidVertexTypeException;
-use Gliph\Exception\NonexistentVertexException;
-
-/**
- * A graph, represented as an adjacency list.
- *
- * Adjacency lists store vertices directly, and edges relative to the vertices
- * they connect. That means there is no overall list of edges in the graph; only
- * a list of the graph's vertices. In this implementation, that list is keyed by
- * vertex, with the value being a list of all the vertices to which that vertex
- * is adjacent - hence, "adjacency list."
- *
- * Consequently, this structure offers highly efficient access to vertices, but
- * less efficient access to edges.
- *
- * In an undirected graph, the edges are stored in both vertices' adjacency
- * lists. In a directed graph, only the out-edges are stored in each vertex's
- * adjacency list. This makes accessing in-edge information in a directed graph
- * highly inefficient.
- */
-abstract class AdjacencyList implements MutableGraph {
-
-    /**
-     * Contains the adjacency list of vertices.
-     *
-     * @var \SplObjectStorage
-     */
-    protected $vertices;
-
-    /**
-     * Bookkeeper for nested iteration.
-     *
-     * @var \SplObjectStorage
-     */
-    protected $walking;
-
-    /**
-     * Count of the number of edges in the graph.
-     *
-     * We keep track because calculating it on demand is expensive.
-     *
-     * @var int
-     */
-    protected $size = 0;
-
-    public function __construct() {
-        $this->vertices = new \SplObjectStorage();
-        $this->walking = new \SplObjectStorage();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function addVertex($vertex) {
-        if (!is_object($vertex)) {
-            throw new InvalidVertexTypeException('Vertices must be objects; non-object provided.');
-        }
-
-        if (!$this->hasVertex($vertex)) {
-            $this->vertices[$vertex] = new \SplObjectStorage();
-        }
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function eachAdjacent($vertex, $callback) {
-        if (!$this->hasVertex($vertex)) {
-            throw new NonexistentVertexException('Vertex is not in graph; cannot iterate over its adjacent vertices.');
-        }
-
-        $set = $this->_getTraversableSplos($this->vertices[$vertex]);
-        foreach ($set as $adjacent_vertex) {
-            call_user_func($callback, $adjacent_vertex);
-        }
-        $this->walking->detach($set);
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function eachVertex($callback) {
-        $this->fev(function ($v, $adjacent) use ($callback) {
-            call_user_func($callback, $v, $adjacent);
-        });
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function hasVertex($vertex) {
-        return $this->vertices->contains($vertex);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function order() {
-        return $this->vertices->count();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function size() {
-        return $this->size;
-    }
-
-    protected function fev($callback) {
-        $set = $this->_getTraversableSplos($this->vertices);
-        foreach ($set as $vertex) {
-            $outgoing = $set->getInfo();
-            $callback($vertex, $outgoing);
-        }
-        $this->walking->detach($set);
-
-        return $this;
-        }
-
-    /**
-     * Helper function to ensure SPLOS traversal pointer is not overridden.
-     *
-     * This would otherwise occur if nested calls are made that traverse the
-     * same SPLOS. This keeps track of which SPLOSes are currently being
-     * traversed, and if it's in use, it returns a clone.
-     *
-     * It is incumbent on the calling code to release the semaphore directly
-     * by calling $this->_cleanupSplosTraversal() when the traversal in
-     * question is complete. (This is very important!)
-     *
-     * Only public because it needs to be called from within closures.
-     *
-     * @param \SplObjectStorage $splos
-     *   The SPLOS to traverse.
-     *
-     * @return \SplObjectStorage
-     *   A SPLOS that is safe for traversal; may or may not be a clone of the
-     *   original.
-     */
-    public function _getTraversableSplos(\SplObjectStorage $splos) {
-        if ($this->walking->contains($splos)) {
-            return clone $splos;
-        }
-        else {
-            $this->walking->attach($splos);
-            return $splos;
-        }
-    }
-
-    /**
-     * Helper function to clean up SPLOSes after finishing traversal.
-     *
-     * @param \SplObjectStorage $splos
-     *   The SPLOS to mark as safe for traversal again.
-     */
-    public function _cleanupSplosTraversal(\SplObjectStorage $splos) {
-        $this->walking->detach($splos);
-    }
-}
\ No newline at end of file
diff --git a/core/vendor/sdboyer/gliph/src/Gliph/Graph/DirectedAdjacencyList.php b/core/vendor/sdboyer/gliph/src/Gliph/Graph/DirectedAdjacencyList.php
deleted file mode 100644
index 443d61ffd..000000000
--- a/core/vendor/sdboyer/gliph/src/Gliph/Graph/DirectedAdjacencyList.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-
-namespace Gliph\Graph;
-
-use Gliph\Algorithm\ConnectedComponent;
-use Gliph\Exception\NonexistentVertexException;
-use Gliph\Exception\RuntimeException;
-use Gliph\Traversal\DepthFirst;
-use Gliph\Visitor\DepthFirstToposortVisitor;
-
-class DirectedAdjacencyList extends AdjacencyList implements MutableDirectedGraph {
-
-    /**
-     * {@inheritdoc}
-     */
-    public function addDirectedEdge($tail, $head) {
-        $this->addVertex($tail)->addVertex($head);
-        if (!$this->vertices[$tail]->contains($head)) {
-            $this->size++;
-        }
-
-        $this->vertices[$tail]->attach($head);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function removeVertex($vertex) {
-        if (!$this->hasVertex($vertex)) {
-            throw new NonexistentVertexException('Vertex is not in the graph, it cannot be removed.', E_WARNING);
-        }
-
-        $this->eachVertex(function($v, $outgoing) use ($vertex) {
-            if ($outgoing->contains($vertex)) {
-                $outgoing->detach($vertex);
-            }
-        });
-        unset($this->vertices[$vertex]);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function removeEdge($tail, $head) {
-        $this->vertices[$tail]->detach($head);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function eachEdge($callback) {
-        $edges = array();
-        $that = $this;
-        $this->fev(function ($from, $outgoing) use (&$edges, $that) {
-            $set = $that->_getTraversableSplos($outgoing);
-            foreach ($set as $to) {
-                $edges[] = array($from, $to);
-            }
-            $that->_cleanupSplosTraversal($set);
-        });
-
-        foreach ($edges as $edge) {
-            call_user_func($callback, $edge);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function transpose() {
-        $graph = new self();
-        $this->eachEdge(function($edge) use (&$graph) {
-            $graph->addDirectedEdge($edge[1], $edge[0]);
-        });
-
-        return $graph;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isAcyclic() {
-        // The DepthFirstToposortVisitor throws an exception on cycles.
-        try {
-            DepthFirst::traverse($this, new DepthFirstToposortVisitor());
-            return TRUE;
-        }
-        catch (RuntimeException $e) {
-            return FALSE;
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getCycles() {
-        $scc = ConnectedComponent::tarjan_scc($this);
-        return $scc->getConnectedComponents();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function inDegree($vertex) {
-        if (!$this->hasVertex($vertex)) {
-            throw new NonexistentVertexException('Vertex is not in the graph, in-degree information cannot be provided', E_WARNING);
-        }
-
-        $count = 0;
-        $this->fev(function ($from, $outgoing) use (&$count, $vertex) {
-            if ($outgoing->contains($vertex)) {
-                $count++;
-            }
-        });
-
-        return $count;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function outDegree($vertex) {
-        if (!$this->hasVertex($vertex)) {
-            throw new NonexistentVertexException('Vertex is not in the graph, out-degree information cannot be provided', E_WARNING);
-        }
-
-        return $this->vertices[$vertex]->count();
-    }
-}
-
diff --git a/core/vendor/sdboyer/gliph/src/Gliph/Graph/DirectedGraph.php b/core/vendor/sdboyer/gliph/src/Gliph/Graph/DirectedGraph.php
deleted file mode 100644
index a4ef20a9d..000000000
--- a/core/vendor/sdboyer/gliph/src/Gliph/Graph/DirectedGraph.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-namespace Gliph\Graph;
-
-/**
- * Interface for directed graph datastructures.
- */
-interface DirectedGraph extends Graph {
-
-    /**
-     * Returns the transpose of this graph.
-     *
-     * A transpose is identical to the current graph, except that its edges
-     * have had their directionality reversed.
-     *
-     * Transposed graphs are sometimes called the 'reverse' or 'converse'.
-     *
-     * @return DirectedGraph
-     */
-    public function transpose();
-
-    /**
-     * Indicates whether or not this graph is acyclic.
-     *
-     * @return bool
-     */
-    public function isAcyclic();
-
-    /**
-     * Returns the cycles in this graph, if any.
-     *
-     * @return array
-     *   An array of arrays, each subarray representing a full cycle in the
-     *   graph. If the array is empty, the graph is acyclic.
-     */
-    public function getCycles();
-}
\ No newline at end of file
diff --git a/core/vendor/sdboyer/gliph/src/Gliph/Graph/Graph.php b/core/vendor/sdboyer/gliph/src/Gliph/Graph/Graph.php
deleted file mode 100644
index 482ac2a43..000000000
--- a/core/vendor/sdboyer/gliph/src/Gliph/Graph/Graph.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-
-namespace Gliph\Graph;
-
-use Gliph\Exception\InvalidVertexTypeException;
-use Gliph\Exception\NonexistentVertexException;
-
-/**
- * The most basic interface for graph datastructures.
- */
-interface Graph {
-
-    /**
-     * Calls the callback with each vertex adjacent to the provided vertex.
-     *
-     * The meaning of "adjacency" depends on the type of graph. In a directed
-     * graph, it refers to all the out-edges of the provided vertex. In an
-     * undirected graph, in-edges and out-edges are the same, so this method
-     * will iterate over both.
-     *
-     * @param object $vertex
-     *   The vertex whose out-edges should be visited.
-     * @param callback $callback
-     *   The callback to fire. For each vertex found along an out-edge, this
-     *   callback will be called with that vertex as the sole parameter.
-     *
-     * @return Graph
-     *   The current graph instance.
-     *
-     * @throws NonexistentVertexException
-     *   Thrown if the vertex provided in the first parameter is not present in
-     *   the graph.
-     */
-    public function eachAdjacent($vertex, $callback);
-
-    /**
-     * Calls the provided callback for each vertex in the graph.
-     *
-     * @param $callback
-     *   The callback is called once for each vertex in the graph. Two
-     *   parameters are provided:
-     *    - The vertex being inspected.
-     *    - An SplObjectStorage containing a list of all the vertices adjacent
-     *      to the vertex being inspected.
-     *
-     * @return Graph
-     *   The current graph instance.
-     */
-    public function eachVertex($callback);
-
-    /**
-     * Calls the provided callback for each edge in the graph.
-     *
-     * @param $callback
-     *   The callback is called once for each unique edge in the graph. A single
-     *   parameter is provided: a 2-tuple (indexed array with two elements),
-     *   where the first element is the first vertex (in a directed graph, the
-     *   tail) and the second element is the second vertex (in a directed graph,
-     *   the head).
-     *
-     * @return Graph
-     *   The current graph instance.
-     */
-    public function eachEdge($callback);
-
-    /**
-     * Indicates whether or not the provided vertex is present in the graph.
-     *
-     * @param object $vertex
-     *   The vertex object to check for membership in the graph.
-     *
-     * @return bool
-     *   TRUE if the vertex is present, FALSE otherwise.
-     */
-    public function hasVertex($vertex);
-
-    /**
-     * Returns the in-degree (number of incoming edges) for the provided vertex.
-     *
-     * In undirected graphs, in-degree and out-degree are the same.
-     *
-     * @param object $vertex
-     *   The vertex for which to retrieve in-degree information.
-     *
-     * @return int
-     *
-     * @throws NonexistentVertexException
-     *   Thrown if the vertex provided in the first parameter is not present in
-     *   the graph.
-     *
-     */
-    public function inDegree($vertex);
-
-    /**
-     * Returns the out-degree (count of outgoing edges) for the provided vertex.
-     *
-     * In undirected graphs, in-degree and out-degree are the same.
-     *
-     * @param object $vertex
-     *   The vertex for which to retrieve out-degree information.
-     *
-     * @return int
-     *
-     * @throws NonexistentVertexException
-     *   Thrown if the vertex provided in the first parameter is not present in
-     *   the graph.
-     *
-     */
-    public function outDegree($vertex);
-
-    /**
-     * Returns the number of edges in the graph.
-     *
-     * @return int
-     */
-    public function size();
-
-    /**
-     * Returns the number of vertices in the graph.
-     *
-     * @return int
-     */
-    public function order();
-}
diff --git a/core/vendor/sdboyer/gliph/src/Gliph/Graph/MutableDirectedGraph.php b/core/vendor/sdboyer/gliph/src/Gliph/Graph/MutableDirectedGraph.php
deleted file mode 100644
index 4ac3a3e90..000000000
--- a/core/vendor/sdboyer/gliph/src/Gliph/Graph/MutableDirectedGraph.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-namespace Gliph\Graph;
-
-/**
- * Describes a directed graph that can be modified after initial creation.
- */
-interface MutableDirectedGraph extends MutableGraph, DirectedGraph {
-
-    /**
-     * Adds a directed edge to this graph.
-     *
-     * Directed edges are also often referred to as 'arcs'.
-     *
-     * @param object $tail
-     *   An object vertex from which the edge originates. The vertex will be
-     *   added to the graph if it is not already present.
-     * @param object $head
-     *   An object vertex to which the edge points. The vertex will be added to
-     *   the graph if it is not already present.
-     *
-     * @return DirectedGraph
-     *   The current graph instance.
-     */
-    public function addDirectedEdge($tail, $head);
-}
\ No newline at end of file
diff --git a/core/vendor/sdboyer/gliph/src/Gliph/Graph/MutableGraph.php b/core/vendor/sdboyer/gliph/src/Gliph/Graph/MutableGraph.php
deleted file mode 100644
index 752a2a00c..000000000
--- a/core/vendor/sdboyer/gliph/src/Gliph/Graph/MutableGraph.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-namespace Gliph\Graph;
-
-/**
- * Describes a graph that can be modified after initial creation.
- */
-interface MutableGraph extends Graph {
-
-    /**
-     * Adds a vertex to the graph.
-     *
-     * Gliph requires that its graph vertices be objects; beyond that, it does
-     * not care about vertex type.
-     *
-     * @param object $vertex
-     *   An object to use as a vertex in the graph.
-     *
-     * @return Graph
-     *   The current graph instance.
-     *
-     * @throws InvalidVertexTypeException
-     *   Thrown if an invalid type of data is provided as a vertex.
-     */
-    public function addVertex($vertex);
-
-    /**
-     * Remove a vertex from the graph.
-     *
-     * This will also remove any edges that include the vertex.
-     *
-     * @param object $vertex
-     *   A vertex object to remove from the graph.
-     *
-     * @return Graph
-     *   The current graph instance.
-     *
-     * @throws NonexistentVertexException
-     *   Thrown if the provided vertex is not present in the graph.
-     */
-    public function removeVertex($vertex);
-
-    /**
-     * Removes an edge from the graph.
-     *
-     * @param $a
-     *   The first vertex in the edge pair to remove. In a directed graph, this
-     *   is the tail vertex.
-     * @param $b
-     *   The second vertex in the edge pair to remove. In a directed graph, this
-     *   is the head vertex.
-     *
-     * @return Graph
-     *   The current graph instance.
-     */
-    public function removeEdge($a, $b);
-}
\ No newline at end of file
diff --git a/core/vendor/sdboyer/gliph/src/Gliph/Graph/MutableUndirectedGraph.php b/core/vendor/sdboyer/gliph/src/Gliph/Graph/MutableUndirectedGraph.php
deleted file mode 100644
index 3bbec05ba..000000000
--- a/core/vendor/sdboyer/gliph/src/Gliph/Graph/MutableUndirectedGraph.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace Gliph\Graph;
-
-/**
- * Describes a undirected graph that can be modified after initial creation.
- */
-interface MutableUndirectedGraph extends Graph {
-
-    /**
-     * Adds an undirected edge to this graph.
-     *
-     * @param object $a
-     *   The first object vertex in the edge pair. The vertex will be added to
-     *   the graph if it is not already present.
-     * @param object $b
-     *   The second object vertex in the edge pair. The vertex will be added to
-     *   the graph if it is not already present.
-     *
-     * @return MutableUndirectedGraph
-     *   The current graph instance.
-     */
-    public function addEdge($a, $b);
-}
\ No newline at end of file
diff --git a/core/vendor/sdboyer/gliph/src/Gliph/Graph/UndirectedAdjacencyList.php b/core/vendor/sdboyer/gliph/src/Gliph/Graph/UndirectedAdjacencyList.php
deleted file mode 100644
index be7d3e55f..000000000
--- a/core/vendor/sdboyer/gliph/src/Gliph/Graph/UndirectedAdjacencyList.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-namespace Gliph\Graph;
-
-use Gliph\Exception\NonexistentVertexException;
-
-class UndirectedAdjacencyList extends AdjacencyList implements MutableUndirectedGraph {
-
-    /**
-     * {@inheritdoc}
-     */
-    public function addEdge($from, $to) {
-        $this->addVertex($from)->addVertex($to);
-        if (!$this->vertices[$from]->contains($to)) {
-            $this->size++;
-        }
-
-        $this->vertices[$from]->attach($to);
-        $this->vertices[$to]->attach($from);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function removeVertex($vertex) {
-        if (!$this->hasVertex($vertex)) {
-            throw new NonexistentVertexException('Vertex is not in the graph, it cannot be removed.', E_WARNING);
-        }
-
-        foreach ($this->vertices[$vertex] as $adjacent) {
-            $this->vertices[$adjacent]->detach($vertex);
-        }
-        unset($this->vertices[$vertex]);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function removeEdge($from, $to) {
-        $this->vertices[$from]->detach($to);
-        $this->vertices[$to]->detach($from);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function eachEdge($callback) {
-        $edges = array();
-        $complete = new \SplObjectStorage();
-        $that = $this;
-        $this->fev(function ($a, $adjacent) use (&$edges, &$complete, $that) {
-            $set = $that->_getTraversableSplos($adjacent);
-            foreach ($set as $b) {
-                if (!$complete->contains($b)) {
-                    $edges[] = array($a, $b);
-                }
-            }
-            $that->_cleanupSplosTraversal($set);
-            $complete->attach($a);
-        });
-
-        foreach ($edges as $edge) {
-            call_user_func($callback, $edge);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function inDegree($vertex) {
-        if (!$this->hasVertex($vertex)) {
-            throw new NonexistentVertexException('Vertex is not in the graph, in-degree information cannot be provided', E_WARNING);
-        }
-
-        return $this->vertices[$vertex]->count();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function outDegree($vertex) {
-        if (!$this->hasVertex($vertex)) {
-            throw new NonexistentVertexException('Vertex is not in the graph, out-degree information cannot be provided', E_WARNING);
-        }
-
-        return $this->vertices[$vertex]->count();
-    }
-}
\ No newline at end of file
diff --git a/core/vendor/sdboyer/gliph/src/Gliph/Traversal/DepthFirst.php b/core/vendor/sdboyer/gliph/src/Gliph/Traversal/DepthFirst.php
deleted file mode 100644
index 5a0d4dda4..000000000
--- a/core/vendor/sdboyer/gliph/src/Gliph/Traversal/DepthFirst.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-
-namespace Gliph\Traversal;
-
-use Gliph\Exception\RuntimeException;
-use Gliph\Graph\DirectedGraph;
-use Gliph\Visitor\DepthFirstToposortVisitor;
-use Gliph\Visitor\DepthFirstVisitorInterface;
-
-class DepthFirst {
-
-    /**
-     * Perform a depth-first traversal on the provided graph.
-     *
-     * @param DirectedGraph $graph
-     *   The graph on which to perform the depth-first search.
-     * @param DepthFirstVisitorInterface $visitor
-     *   The visitor object to use during the traversal.
-     * @param object|\SplDoublyLinkedList $start
-     *   A vertex, or vertices, to use as start points for the traversal. There
-     *   are a few sub-behaviors here:
-     *     - If an SplDoublyLinkedList, SplQueue, or SplStack is provided, the
-     *       traversal will deque and visit vertices contained therein.
-     *     - If a single vertex object is provided, it will be the sole
-     *       originating point for the traversal.
-     *     - If no value is provided, DepthFirst::find_sources() is called to
-     *       search the graph for source vertices. These are place into an
-     *       SplQueue in the order in which they are discovered, and traversal
-     *       is then run over that queue in the same manner as if calling code
-     *       had provided a queue directly. This method *guarantees* that all
-     *       vertices in the graph will be visited.
-     *
-     * @throws RuntimeException
-     *   Thrown if an invalid $start parameter is provided.
-     */
-    public static function traverse(DirectedGraph $graph, DepthFirstVisitorInterface $visitor, $start = NULL) {
-        if ($start === NULL) {
-            $queue = self::find_sources($graph, $visitor);
-        }
-        else if ($start instanceof \SplDoublyLinkedList) {
-            $queue = $start;
-        }
-        else if (is_object($start)) {
-            $queue = new \SplDoublyLinkedList();
-            $queue->push($start);
-        }
-
-        if ($queue->isEmpty()) {
-            throw new RuntimeException('No start vertex or vertices were provided, and no source vertices could be found in the provided graph.', E_WARNING);
-        }
-
-        $visiting = new \SplObjectStorage();
-        $visited = new \SplObjectStorage();
-
-        $visitor->beginTraversal();
-
-        $visit = function($vertex) use ($graph, $visitor, &$visit, $visiting, $visited) {
-            if ($visiting->contains($vertex)) {
-                $visitor->onBackEdge($vertex, $visit);
-            }
-            else if (!$visited->contains($vertex)) {
-                $visiting->attach($vertex);
-
-                $visitor->onStartVertex($vertex, $visit);
-
-                $graph->eachAdjacent($vertex, function($to) use ($vertex, &$visit, $visitor) {
-                    $visitor->onExamineEdge($vertex, $to, $visit);
-                    $visit($to);
-                });
-
-                $visitor->onFinishVertex($vertex, $visit);
-
-                $visiting->detach($vertex);
-                $visited->attach($vertex);
-            }
-        };
-
-        while (!$queue->isEmpty()) {
-            $vertex = $queue->shift();
-            $visit($vertex);
-        }
-
-        $visitor->endTraversal();
-    }
-
-    /**
-     * Finds source vertices in a DirectedGraph, then enqueues them.
-     *
-     * @param DirectedGraph $graph
-     * @param DepthFirstVisitorInterface $visitor
-     *
-     * @return \SplQueue
-     */
-    public static function find_sources(DirectedGraph $graph, DepthFirstVisitorInterface $visitor) {
-        $incomings = new \SplObjectStorage();
-        $queue = new \SplQueue();
-
-        $graph->eachEdge(function ($edge) use (&$incomings) {
-            if (!isset($incomings[$edge[1]])) {
-                $incomings[$edge[1]] = new \SplObjectStorage();
-            }
-            $incomings[$edge[1]]->attach($edge[0]);
-        });
-
-        // Prime the queue with vertices that have no incoming edges.
-        $graph->eachVertex(function($vertex) use ($queue, $incomings, $visitor) {
-            if (!$incomings->contains($vertex)) {
-                $queue->push($vertex);
-                // TRUE second param indicates source vertex
-                $visitor->onInitializeVertex($vertex, TRUE, $queue);
-            }
-            else {
-                $visitor->onInitializeVertex($vertex, FALSE, $queue);
-            }
-        });
-
-        return $queue;
-    }
-
-    /**
-     * Performs a topological sort on the provided graph.
-     *
-     * @param DirectedGraph $graph
-     * @param object|\SplDoublyLinkedList $start
-     *   The starting point(s) for the toposort. @see DepthFirst::traverse()
-     *
-     * @return array
-     *   A valid topologically sorted list for the provided graph.
-     */
-    public static function toposort(DirectedGraph $graph, $start = NULL) {
-        $visitor = new DepthFirstToposortVisitor();
-        self::traverse($graph, $visitor, $start);
-
-        return $visitor->getTsl();
-    }
-}
\ No newline at end of file
diff --git a/core/vendor/sdboyer/gliph/src/Gliph/Visitor/DepthFirstBasicVisitor.php b/core/vendor/sdboyer/gliph/src/Gliph/Visitor/DepthFirstBasicVisitor.php
deleted file mode 100644
index c6d0aa98a..000000000
--- a/core/vendor/sdboyer/gliph/src/Gliph/Visitor/DepthFirstBasicVisitor.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-
-namespace Gliph\Visitor;
-
-use Gliph\Exception\WrongVisitorStateException;
-
-/**
- * Basic depth-first visitor.
- *
- * This visitor records reachability data for each vertex and creates a
- * topologically sorted list.
- */
-class DepthFirstBasicVisitor extends DepthFirstToposortVisitor {
-
-    /**
-     * @var \SplObjectStorage
-     */
-    public $active;
-
-    /**
-     * @var \SplObjectStorage
-     */
-    protected $paths;
-
-    public function __construct() {
-        $this->active = new \SplObjectStorage();
-        $this->paths = new \SplObjectStorage();
-    }
-
-    public function onInitializeVertex($vertex, $source, \SplQueue $queue) {
-        parent::onInitializeVertex($vertex, $source, $queue);
-
-        $this->paths[$vertex] = array();
-    }
-
-    public function onStartVertex($vertex, \Closure $visit) {
-        parent::onStartVertex($vertex, $visit);
-
-        $this->active->attach($vertex);
-        if (!isset($this->paths[$vertex])) {
-            $this->paths[$vertex] = array();
-        }
-    }
-
-    public function onExamineEdge($from, $to, \Closure $visit) {
-        parent::onExamineEdge($from, $to, $visit);
-
-        foreach ($this->active as $vertex) {
-            // TODO this check makes this less efficient - find a better algo
-            if (!in_array($to, $this->paths[$vertex], TRUE)) {
-                $path = $this->paths[$vertex];
-                $path[] = $to;
-                $this->paths[$vertex] = $path;
-            }
-        }
-    }
-
-    public function onFinishVertex($vertex, \Closure $visit) {
-        parent::onFinishVertex($vertex, $visit);
-
-        $this->active->detach($vertex);
-    }
-
-    /**
-     * Returns an array of all vertices reachable from the given vertex.
-     *
-     * @param object $vertex
-     *   The vertex for which reachability data is desired.
-     *
-     * @return array|bool
-     *   An array of reachable vertices, or FALSE if the vertex could not be
-     *   found in the reachability data. Note that an empty array will be
-     *   returned for vertices that zero reachable vertices. This is a different
-     *   from FALSE, so the identity operator (===) should be used to verify
-     *   returns.
-     *
-     * @throws WrongVisitorStateException
-     *   Thrown if reachability data is requested before the traversal algorithm
-     *   completes.
-     */
-    public function getReachable($vertex) {
-        if ($this->getState() !== self::COMPLETE) {
-            throw new WrongVisitorStateException('Correct reachability data cannot be retrieved until traversal is complete.');
-        }
-
-        if (!isset($this->paths[$vertex])) {
-            return FALSE;
-        }
-
-        return $this->paths[$vertex];
-    }
-}
\ No newline at end of file
diff --git a/core/vendor/sdboyer/gliph/src/Gliph/Visitor/DepthFirstNoOpVisitor.php b/core/vendor/sdboyer/gliph/src/Gliph/Visitor/DepthFirstNoOpVisitor.php
deleted file mode 100644
index a61709bf6..000000000
--- a/core/vendor/sdboyer/gliph/src/Gliph/Visitor/DepthFirstNoOpVisitor.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace Gliph\Visitor;
-
-/**
- * A no-op visitor for depth first traversal algorithms.
- *
- * @codeCoverageIgnore
- */
-class DepthFirstNoOpVisitor implements DepthFirstVisitorInterface {
-    public function onInitializeVertex($vertex, $source, \SplQueue $queue) {}
-    public function beginTraversal() {}
-    public function onBackEdge($vertex, \Closure $visit) {}
-    public function onStartVertex($vertex, \Closure $visit) {}
-    public function onExamineEdge($from, $to, \Closure $visit) {}
-    public function onFinishVertex($vertex, \Closure $visit) {}
-    public function endTraversal() {}
-}
\ No newline at end of file
diff --git a/core/vendor/sdboyer/gliph/src/Gliph/Visitor/DepthFirstToposortVisitor.php b/core/vendor/sdboyer/gliph/src/Gliph/Visitor/DepthFirstToposortVisitor.php
deleted file mode 100644
index 61a1d3758..000000000
--- a/core/vendor/sdboyer/gliph/src/Gliph/Visitor/DepthFirstToposortVisitor.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Gliph\Visitor\DepthFirstToposortVisitor.
- */
-
-namespace Gliph\Visitor;
-
-use Gliph\Exception\RuntimeException;
-use Gliph\Exception\WrongVisitorStateException;
-
-/**
- * Visitor that produces a topologically sorted list on a depth first traversal.
- */
-class DepthFirstToposortVisitor extends SimpleStatefulDepthFirstVisitor implements DepthFirstVisitorInterface {
-
-    /**
-     * @var array
-     */
-    protected $tsl = array();
-
-    /**
-     * @codeCoverageIgnore
-     */
-    public function onInitializeVertex($vertex, $source, \SplQueue $queue) {}
-
-    /**
-     * @codeCoverageIgnore
-     */
-    public function onStartVertex($vertex, \Closure $visit) {}
-
-    /**
-     * @codeCoverageIgnore
-     */
-    public function onExamineEdge($from, $to, \Closure $visit) {}
-
-    public function onBackEdge($vertex, \Closure $visit) {
-        throw new RuntimeException(sprintf('Cycle detected in provided graph; toposort is not possible.'));
-    }
-
-    public function beginTraversal() {
-        parent::beginTraversal();
-        $this->tsl = array();
-    }
-
-    public function onFinishVertex($vertex, \Closure $visit) {
-        $this->tsl[] = $vertex;
-    }
-
-    /**
-     * Returns a valid topological sort of the visited graph as an array.
-     *
-     * @return array
-     *
-     * @throws WrongVisitorStateException
-     *   Thrown if called before traversal is complete.
-     */
-    public function getTsl() {
-        if ($this->getState() !== self::COMPLETE) {
-            throw new WrongVisitorStateException('Topologically sorted list cannot be retrieved until traversal is complete.');
-        }
-
-        return $this->tsl;
-    }
-}
\ No newline at end of file
diff --git a/core/vendor/sdboyer/gliph/src/Gliph/Visitor/DepthFirstVisitorInterface.php b/core/vendor/sdboyer/gliph/src/Gliph/Visitor/DepthFirstVisitorInterface.php
deleted file mode 100644
index ae4f388e8..000000000
--- a/core/vendor/sdboyer/gliph/src/Gliph/Visitor/DepthFirstVisitorInterface.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Gliph\Visitor;
-
-interface DepthFirstVisitorInterface {
-    public function onInitializeVertex($vertex, $source, \SplQueue $queue);
-    public function beginTraversal();
-    public function onBackEdge($vertex, \Closure $visit);
-    public function onStartVertex($vertex, \Closure $visit);
-    public function onExamineEdge($from, $to, \Closure $visit);
-    public function onFinishVertex($vertex, \Closure $visit);
-    public function endTraversal();
-}
\ No newline at end of file
diff --git a/core/vendor/sdboyer/gliph/src/Gliph/Visitor/SimpleStatefulDepthFirstVisitor.php b/core/vendor/sdboyer/gliph/src/Gliph/Visitor/SimpleStatefulDepthFirstVisitor.php
deleted file mode 100644
index 8c7693ff6..000000000
--- a/core/vendor/sdboyer/gliph/src/Gliph/Visitor/SimpleStatefulDepthFirstVisitor.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Gliph\Visitor\SimpleStatefulDepthFirstVisitor.
- */
-
-namespace Gliph\Visitor;
-
-use Gliph\Exception\WrongVisitorStateException;
-
-/**
- * Simplified stateful depth-first visitor with less complex state.
- *
- * Rather than a three-way distinction (NOT_STARTED/IN_PROGRESS/COMPLETE), the
- * simplified visitor only cares about COMPLETE.
- */
-abstract class SimpleStatefulDepthFirstVisitor implements StatefulVisitorInterface, DepthFirstVisitorInterface {
-
-    /**
-     * Represents the current state of the visitor.
-     *
-     * This visitor disregards the NOT_STARTED phase as irrelevant, and so is
-     * considered IN_PROGRESS from initial construction.
-     *
-     * @var int
-     */
-    protected $state = self::IN_PROGRESS;
-
-    /**
-     * @codeCoverageIgnore
-     */
-    public function beginTraversal() {}
-
-    /**
-     * {@inheritdoc}
-     */
-    public function endTraversal() {
-        if ($this->getState() != self::IN_PROGRESS) {
-            throw new WrongVisitorStateException('Cannot end traversal, visitor is not marked as currently being in progress.');
-        }
-        $this->state = self::COMPLETE;
-    }
-
-    public function getState() {
-        return $this->state;
-    }
-}
\ No newline at end of file
diff --git a/core/vendor/sdboyer/gliph/src/Gliph/Visitor/StatefulDepthFirstVisitor.php b/core/vendor/sdboyer/gliph/src/Gliph/Visitor/StatefulDepthFirstVisitor.php
deleted file mode 100644
index 7c2de15a9..000000000
--- a/core/vendor/sdboyer/gliph/src/Gliph/Visitor/StatefulDepthFirstVisitor.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Gliph\Visitor\StatefulDepthFirstVisitor.
- */
-
-namespace Gliph\Visitor;
-
-use Gliph\Exception\WrongVisitorStateException;
-
-/**
- * A base class for stateful depth first visitors.
- *
- * This visitor tracks state as indicated to it by the depth first traversal
- * algorithm, throwing exceptions if certain methods are accessed from an
- * incorrect state.
- */
-abstract class StatefulDepthFirstVisitor implements DepthFirstVisitorInterface, StatefulVisitorInterface {
-
-    /**
-     * Represents the current state of the visitor.
-     *
-     * @var int
-     */
-    protected $state = self::NOT_STARTED;
-
-    public function onInitializeVertex($vertex, $source, \SplQueue $queue) {
-        if ($this->state != self::NOT_STARTED) {
-            throw new WrongVisitorStateException('Vertex initialization should only happen before traversal has begun.');
-        }
-    }
-
-    public function beginTraversal() {
-        if ($this->state != self::NOT_STARTED) {
-            throw new WrongVisitorStateException('Traversal has already begun; cannot begin twice.');
-        }
-        $this->state = self::IN_PROGRESS;
-    }
-
-    public function onBackEdge($vertex, \Closure $visit) {
-        if ($this->state != self::IN_PROGRESS) {
-            throw new WrongVisitorStateException('onBackEdge should only be called while traversal is in progress.');
-        }
-    }
-
-    public function onStartVertex($vertex, \Closure $visit) {
-        if ($this->state != self::IN_PROGRESS) {
-            throw new WrongVisitorStateException('onStartVertex should only be called while traversal is in progress.');
-        }
-    }
-
-    public function onExamineEdge($from, $to, \Closure $visit) {
-        if ($this->state != self::IN_PROGRESS) {
-            throw new WrongVisitorStateException('onExamineEdge should only be called while traversal is in progress.');
-        }
-    }
-
-    public function onFinishVertex($vertex, \Closure $visit) {
-        if ($this->state != self::IN_PROGRESS) {
-            throw new WrongVisitorStateException('onFinishVertex should only be called while traversal is in progress.');
-        }
-    }
-
-    public function endTraversal() {
-        if ($this->state != self::IN_PROGRESS) {
-            throw new WrongVisitorStateException('Cannot end traversal; no traversal is currently in progress.');
-        }
-        $this->state = self::COMPLETE;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getState() {
-        return $this->state;
-    }
-}
\ No newline at end of file
diff --git a/core/vendor/sdboyer/gliph/src/Gliph/Visitor/StatefulVisitorInterface.php b/core/vendor/sdboyer/gliph/src/Gliph/Visitor/StatefulVisitorInterface.php
deleted file mode 100644
index b73c5c0ff..000000000
--- a/core/vendor/sdboyer/gliph/src/Gliph/Visitor/StatefulVisitorInterface.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-namespace Gliph\Visitor;
-
-/**
- * Interface for stateful algorithm visitors.
- */
-interface StatefulVisitorInterface {
-    const NOT_STARTED = 0;
-    const IN_PROGRESS = 1;
-    const COMPLETE = 2;
-
-    /**
-     * Returns an integer indicating the current state of the visitor.
-     *
-     * @return int
-     *   State should be one of the three StatefulVisitorInterface constants:
-     *    - 0: indicates the algorithm has not yet started.
-     *    - 1: indicates the algorithm is in progress.
-     *    - 2: indicates the algorithm is complete.
-     */
-    public function getState();
-}
\ No newline at end of file
diff --git a/core/vendor/sdboyer/gliph/src/Gliph/Visitor/TarjanSCCVisitor.php b/core/vendor/sdboyer/gliph/src/Gliph/Visitor/TarjanSCCVisitor.php
deleted file mode 100644
index 73255b24e..000000000
--- a/core/vendor/sdboyer/gliph/src/Gliph/Visitor/TarjanSCCVisitor.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace Gliph\Visitor;
-
-/**
- * Visitor that collects strongly connected component data from Tarjan's
- * strongly connected components algorithm.
- */
-class TarjanSCCVisitor {
-
-    protected $components = array();
-
-    protected $currentComponent;
-
-    public function newComponent() {
-        // Ensure the reference is broken
-        unset($this->currentComponent);
-        $this->currentComponent = array();
-        $this->components[] = &$this->currentComponent;
-    }
-
-    public function addToCurrentComponent($vertex) {
-        $this->currentComponent[] = $vertex;
-    }
-
-    public function getComponents() {
-        return $this->components;
-    }
-
-    public function getConnectedComponents() {
-        // TODO make this less stupid
-        return array_values(array_filter($this->components, function($component) {
-            return count($component) > 1;
-        }));
-    }
-}
\ No newline at end of file
diff --git a/core/vendor/symfony/browser-kit/Client.php b/core/vendor/symfony/browser-kit/Client.php
index 90df108c8..f41f156ac 100644
--- a/core/vendor/symfony/browser-kit/Client.php
+++ b/core/vendor/symfony/browser-kit/Client.php
@@ -547,7 +547,7 @@ abstract class Client
     protected function getAbsoluteUri($uri)
     {
         // already absolute?
-        if (0 === strpos($uri, 'http')) {
+        if (0 === strpos($uri, 'http://') || 0 === strpos($uri, 'https://')) {
             return $uri;
         }
 
diff --git a/core/vendor/symfony/browser-kit/Cookie.php b/core/vendor/symfony/browser-kit/Cookie.php
index b225056f4..e690cdacd 100644
--- a/core/vendor/symfony/browser-kit/Cookie.php
+++ b/core/vendor/symfony/browser-kit/Cookie.php
@@ -69,11 +69,19 @@ class Cookie
             $this->rawValue = urlencode($value);
         }
         $this->name = $name;
-        $this->expires = null === $expires ? null : (int) $expires;
         $this->path = empty($path) ? '/' : $path;
         $this->domain = $domain;
         $this->secure = (bool) $secure;
         $this->httponly = (bool) $httponly;
+
+        if (null !== $expires) {
+            $timestampAsDateTime = \DateTime::createFromFormat('U', $expires);
+            if (false === $timestampAsDateTime) {
+                throw new \UnexpectedValueException(sprintf('The cookie expiration time "%s" is not valid.', $expires));
+            }
+
+            $this->expires = $timestampAsDateTime->getTimestamp();
+        }
     }
 
     /**
@@ -91,12 +99,6 @@ class Cookie
 
         if (null !== $this->expires) {
             $dateTime = \DateTime::createFromFormat('U', $this->expires, new \DateTimeZone('GMT'));
-
-            if ($dateTime === false) {
-                // this throw will provoke PHP fatal
-                throw new \UnexpectedValueException(sprintf('The cookie expiration time "%s" is not valid.'), $this->expires);
-            }
-
             $cookie .= '; expires='.str_replace('+0000', '', $dateTime->format(self::$dateFormats[0]));
         }
 
diff --git a/core/vendor/symfony/browser-kit/Tests/ClientTest.php b/core/vendor/symfony/browser-kit/Tests/ClientTest.php
index a6e5ba9e9..cc7db71fd 100644
--- a/core/vendor/symfony/browser-kit/Tests/ClientTest.php
+++ b/core/vendor/symfony/browser-kit/Tests/ClientTest.php
@@ -207,6 +207,21 @@ class ClientTest extends \PHPUnit_Framework_TestCase
         $client->request('GET', 'http://www.example.com/foo/foobar');
         $client->request('GET', 'bar');
         $this->assertEquals('http://www.example.com/foo/bar', $client->getRequest()->getUri(), '->request() uses the previous request for relative URLs');
+
+        $client = new TestClient();
+        $client->request('GET', 'http://www.example.com/foo/');
+        $client->request('GET', 'http');
+        $this->assertEquals('http://www.example.com/foo/http', $client->getRequest()->getUri(), '->request() uses the previous request for relative URLs');
+
+        $client = new TestClient();
+        $client->request('GET', 'http://www.example.com/foo');
+        $client->request('GET', 'http/bar');
+        $this->assertEquals('http://www.example.com/http/bar', $client->getRequest()->getUri(), '->request() uses the previous request for relative URLs');
+
+        $client = new TestClient();
+        $client->request('GET', 'http://www.example.com/');
+        $client->request('GET', 'http');
+        $this->assertEquals('http://www.example.com/http', $client->getRequest()->getUri(), '->request() uses the previous request for relative URLs');
     }
 
     public function testRequestURIConversionByServerHost()
@@ -332,7 +347,7 @@ class ClientTest extends \PHPUnit_Framework_TestCase
             $client->followRedirect();
             $this->fail('->followRedirect() throws a \LogicException if the request was not redirected');
         } catch (\Exception $e) {
-            $this->assertInstanceof('LogicException', $e, '->followRedirect() throws a \LogicException if the request was not redirected');
+            $this->assertInstanceOf('LogicException', $e, '->followRedirect() throws a \LogicException if the request was not redirected');
         }
 
         $client->setNextResponse(new Response('', 302, array('Location' => 'http://www.example.com/redirected')));
@@ -362,7 +377,7 @@ class ClientTest extends \PHPUnit_Framework_TestCase
             $client->followRedirect();
             $this->fail('->followRedirect() throws a \LogicException if the request did not respond with 30x HTTP Code');
         } catch (\Exception $e) {
-            $this->assertInstanceof('LogicException', $e, '->followRedirect() throws a \LogicException if the request did not respond with 30x HTTP Code');
+            $this->assertInstanceOf('LogicException', $e, '->followRedirect() throws a \LogicException if the request did not respond with 30x HTTP Code');
         }
     }
 
@@ -392,7 +407,7 @@ class ClientTest extends \PHPUnit_Framework_TestCase
             $client->followRedirect();
             $this->fail('->followRedirect() throws a \LogicException if the request was redirected and limit of redirections was reached');
         } catch (\Exception $e) {
-            $this->assertInstanceof('LogicException', $e, '->followRedirect() throws a \LogicException if the request was redirected and limit of redirections was reached');
+            $this->assertInstanceOf('LogicException', $e, '->followRedirect() throws a \LogicException if the request was redirected and limit of redirections was reached');
         }
 
         $client->setNextResponse(new Response('', 302, array('Location' => 'http://www.example.com/redirected')));
@@ -562,7 +577,7 @@ class ClientTest extends \PHPUnit_Framework_TestCase
             $client->request('GET', 'http://www.example.com/foo/foobar');
             $this->fail('->request() throws a \RuntimeException if the script has an error');
         } catch (\Exception $e) {
-            $this->assertInstanceof('RuntimeException', $e, '->request() throws a \RuntimeException if the script has an error');
+            $this->assertInstanceOf('RuntimeException', $e, '->request() throws a \RuntimeException if the script has an error');
         }
     }
 
diff --git a/core/vendor/symfony/browser-kit/Tests/CookieTest.php b/core/vendor/symfony/browser-kit/Tests/CookieTest.php
index 8e3578a28..e1dd0df2c 100644
--- a/core/vendor/symfony/browser-kit/Tests/CookieTest.php
+++ b/core/vendor/symfony/browser-kit/Tests/CookieTest.php
@@ -74,30 +74,30 @@ class CookieTest extends \PHPUnit_Framework_TestCase
 
     public function testFromStringWithUrl()
     {
-        $this->assertEquals('foo=bar; domain=www.example.com; path=/', (string) Cookie::FromString('foo=bar', 'http://www.example.com/'));
-        $this->assertEquals('foo=bar; domain=www.example.com; path=/', (string) Cookie::FromString('foo=bar', 'http://www.example.com'));
-        $this->assertEquals('foo=bar; domain=www.example.com; path=/', (string) Cookie::FromString('foo=bar', 'http://www.example.com?foo'));
-        $this->assertEquals('foo=bar; domain=www.example.com; path=/foo', (string) Cookie::FromString('foo=bar', 'http://www.example.com/foo/bar'));
-        $this->assertEquals('foo=bar; domain=www.example.com; path=/', (string) Cookie::FromString('foo=bar; path=/', 'http://www.example.com/foo/bar'));
-        $this->assertEquals('foo=bar; domain=www.myotherexample.com; path=/', (string) Cookie::FromString('foo=bar; domain=www.myotherexample.com', 'http://www.example.com/'));
+        $this->assertEquals('foo=bar; domain=www.example.com; path=/', (string) Cookie::fromString('foo=bar', 'http://www.example.com/'));
+        $this->assertEquals('foo=bar; domain=www.example.com; path=/', (string) Cookie::fromString('foo=bar', 'http://www.example.com'));
+        $this->assertEquals('foo=bar; domain=www.example.com; path=/', (string) Cookie::fromString('foo=bar', 'http://www.example.com?foo'));
+        $this->assertEquals('foo=bar; domain=www.example.com; path=/foo', (string) Cookie::fromString('foo=bar', 'http://www.example.com/foo/bar'));
+        $this->assertEquals('foo=bar; domain=www.example.com; path=/', (string) Cookie::fromString('foo=bar; path=/', 'http://www.example.com/foo/bar'));
+        $this->assertEquals('foo=bar; domain=www.myotherexample.com; path=/', (string) Cookie::fromString('foo=bar; domain=www.myotherexample.com', 'http://www.example.com/'));
     }
 
     public function testFromStringThrowsAnExceptionIfCookieIsNotValid()
     {
         $this->setExpectedException('InvalidArgumentException');
-        Cookie::FromString('foo');
+        Cookie::fromString('foo');
     }
 
     public function testFromStringThrowsAnExceptionIfCookieDateIsNotValid()
     {
         $this->setExpectedException('InvalidArgumentException');
-        Cookie::FromString('foo=bar; expires=Flursday July 31st 2020, 08:49:37 GMT');
+        Cookie::fromString('foo=bar; expires=Flursday July 31st 2020, 08:49:37 GMT');
     }
 
     public function testFromStringThrowsAnExceptionIfUrlIsNotValid()
     {
         $this->setExpectedException('InvalidArgumentException');
-        Cookie::FromString('foo=bar', 'foobar');
+        Cookie::fromString('foo=bar', 'foobar');
     }
 
     public function testGetName()
diff --git a/core/vendor/symfony/browser-kit/Tests/HistoryTest.php b/core/vendor/symfony/browser-kit/Tests/HistoryTest.php
index 882b730ef..d6d830e83 100644
--- a/core/vendor/symfony/browser-kit/Tests/HistoryTest.php
+++ b/core/vendor/symfony/browser-kit/Tests/HistoryTest.php
@@ -54,7 +54,7 @@ class HistoryTest extends \PHPUnit_Framework_TestCase
             $history->current();
             $this->fail('->current() throws a \LogicException if the history is empty');
         } catch (\Exception $e) {
-            $this->assertInstanceof('LogicException', $e, '->current() throws a \LogicException if the history is empty');
+            $this->assertInstanceOf('LogicException', $e, '->current() throws a \LogicException if the history is empty');
         }
 
         $history->add(new Request('http://www.example.com/', 'get'));
@@ -71,7 +71,7 @@ class HistoryTest extends \PHPUnit_Framework_TestCase
             $history->back();
             $this->fail('->back() throws a \LogicException if the history is already on the first page');
         } catch (\Exception $e) {
-            $this->assertInstanceof('LogicException', $e, '->current() throws a \LogicException if the history is already on the first page');
+            $this->assertInstanceOf('LogicException', $e, '->current() throws a \LogicException if the history is already on the first page');
         }
 
         $history->add(new Request('http://www.example1.com/', 'get'));
@@ -90,7 +90,7 @@ class HistoryTest extends \PHPUnit_Framework_TestCase
             $history->forward();
             $this->fail('->forward() throws a \LogicException if the history is already on the last page');
         } catch (\Exception $e) {
-            $this->assertInstanceof('LogicException', $e, '->forward() throws a \LogicException if the history is already on the last page');
+            $this->assertInstanceOf('LogicException', $e, '->forward() throws a \LogicException if the history is already on the last page');
         }
 
         $history->back();
diff --git a/core/vendor/react/promise/.gitignore b/core/vendor/symfony/class-loader/.gitignore
similarity index 70%
rename from core/vendor/react/promise/.gitignore
rename to core/vendor/symfony/class-loader/.gitignore
index c4bcb78f7..c49a5d8df 100644
--- a/core/vendor/react/promise/.gitignore
+++ b/core/vendor/symfony/class-loader/.gitignore
@@ -1,4 +1,3 @@
-composer.lock
-composer.phar
-phpunit.xml
 vendor/
+composer.lock
+phpunit.xml
diff --git a/core/vendor/symfony/class-loader/ApcUniversalClassLoader.php b/core/vendor/symfony/class-loader/ApcUniversalClassLoader.php
index dd95413ca..898018ae7 100644
--- a/core/vendor/symfony/class-loader/ApcUniversalClassLoader.php
+++ b/core/vendor/symfony/class-loader/ApcUniversalClassLoader.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\ClassLoader;
 
-trigger_error('The '.__NAMESPACE__.'\ApcUniversalClassLoader class is deprecated since version 2.7 and will be removed in 3.0. Use the Symfony\Component\ClassLoader\ApcClassLoader class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\ApcUniversalClassLoader class is deprecated since version 2.7 and will be removed in 3.0. Use the Symfony\Component\ClassLoader\ApcClassLoader class instead.', E_USER_DEPRECATED);
 
 /**
  * ApcUniversalClassLoader implements a "universal" autoloader cached in APC for PHP 5.3.
diff --git a/core/vendor/symfony/class-loader/DebugClassLoader.php b/core/vendor/symfony/class-loader/DebugClassLoader.php
index 351869928..b3eb89a6a 100644
--- a/core/vendor/symfony/class-loader/DebugClassLoader.php
+++ b/core/vendor/symfony/class-loader/DebugClassLoader.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\ClassLoader;
 
-trigger_error('The '.__NAMESPACE__.'\DebugClassLoader class is deprecated since version 2.4 and will be removed in 3.0. Use the Symfony\Component\Debug\DebugClassLoader class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\DebugClassLoader class is deprecated since version 2.4 and will be removed in 3.0. Use the Symfony\Component\Debug\DebugClassLoader class instead.', E_USER_DEPRECATED);
 
 /**
  * Autoloader checking if the class is really defined in the file found.
diff --git a/core/vendor/symfony/class-loader/DebugUniversalClassLoader.php b/core/vendor/symfony/class-loader/DebugUniversalClassLoader.php
index 2a102dbbf..807bcd15e 100644
--- a/core/vendor/symfony/class-loader/DebugUniversalClassLoader.php
+++ b/core/vendor/symfony/class-loader/DebugUniversalClassLoader.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\ClassLoader;
 
-trigger_error('The '.__NAMESPACE__.'\DebugUniversalClassLoader class is deprecated since version 2.4 and will be removed in 3.0. Use the Symfony\Component\Debug\DebugClassLoader class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\DebugUniversalClassLoader class is deprecated since version 2.4 and will be removed in 3.0. Use the Symfony\Component\Debug\DebugClassLoader class instead.', E_USER_DEPRECATED);
 
 /**
  * Checks that the class is actually declared in the included file.
diff --git a/core/vendor/symfony/class-loader/Tests/ClassMapGeneratorTest.php b/core/vendor/symfony/class-loader/Tests/ClassMapGeneratorTest.php
index 88099258e..29c328834 100644
--- a/core/vendor/symfony/class-loader/Tests/ClassMapGeneratorTest.php
+++ b/core/vendor/symfony/class-loader/Tests/ClassMapGeneratorTest.php
@@ -22,7 +22,7 @@ class ClassMapGeneratorTest extends \PHPUnit_Framework_TestCase
 
     public function prepare_workspace()
     {
-        $this->workspace = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.time().rand(0, 1000);
+        $this->workspace = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.time().mt_rand(0, 1000);
         mkdir($this->workspace, 0777, true);
         $this->workspace = realpath($this->workspace);
     }
diff --git a/core/vendor/symfony/class-loader/Tests/LegacyApcUniversalClassLoaderTest.php b/core/vendor/symfony/class-loader/Tests/LegacyApcUniversalClassLoaderTest.php
index 48b46fa3e..0268a1c45 100644
--- a/core/vendor/symfony/class-loader/Tests/LegacyApcUniversalClassLoaderTest.php
+++ b/core/vendor/symfony/class-loader/Tests/LegacyApcUniversalClassLoaderTest.php
@@ -20,8 +20,6 @@ class LegacyApcUniversalClassLoaderTest extends \PHPUnit_Framework_TestCase
 {
     protected function setUp()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         if (!extension_loaded('apc')) {
             $this->markTestSkipped('The apc extension is not available.');
         }
diff --git a/core/vendor/symfony/class-loader/Tests/LegacyUniversalClassLoaderTest.php b/core/vendor/symfony/class-loader/Tests/LegacyUniversalClassLoaderTest.php
index 9149e2e86..2588e9603 100644
--- a/core/vendor/symfony/class-loader/Tests/LegacyUniversalClassLoaderTest.php
+++ b/core/vendor/symfony/class-loader/Tests/LegacyUniversalClassLoaderTest.php
@@ -18,11 +18,6 @@ use Symfony\Component\ClassLoader\UniversalClassLoader;
  */
 class LegacyUniversalClassLoaderTest extends \PHPUnit_Framework_TestCase
 {
-    protected function setUp()
-    {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-    }
-
     /**
      * @dataProvider getLoadClassTests
      */
diff --git a/core/vendor/symfony/class-loader/UniversalClassLoader.php b/core/vendor/symfony/class-loader/UniversalClassLoader.php
index 781d3a29a..5293a4cb7 100644
--- a/core/vendor/symfony/class-loader/UniversalClassLoader.php
+++ b/core/vendor/symfony/class-loader/UniversalClassLoader.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\ClassLoader;
 
-trigger_error('The '.__NAMESPACE__.'\UniversalClassLoader class is deprecated since version 2.7 and will be removed in 3.0. Use the Symfony\Component\ClassLoader\ClassLoader class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\UniversalClassLoader class is deprecated since version 2.7 and will be removed in 3.0. Use the Symfony\Component\ClassLoader\ClassLoader class instead.', E_USER_DEPRECATED);
 
 /**
  * UniversalClassLoader implements a "universal" autoloader for PHP 5.3.
diff --git a/core/vendor/symfony/console/Application.php b/core/vendor/symfony/console/Application.php
index 1ee2831b7..c816f015b 100644
--- a/core/vendor/symfony/console/Application.php
+++ b/core/vendor/symfony/console/Application.php
@@ -488,7 +488,7 @@ class Application
         if (empty($namespaces)) {
             $message = sprintf('There are no commands defined in the "%s" namespace.', $namespace);
 
-            if ($alternatives = $this->findAlternatives($namespace, $allNamespaces, array())) {
+            if ($alternatives = $this->findAlternatives($namespace, $allNamespaces)) {
                 if (1 == count($alternatives)) {
                     $message .= "\n\nDid you mean this?\n    ";
                 } else {
@@ -537,7 +537,7 @@ class Application
 
             $message = sprintf('Command "%s" is not defined.', $name);
 
-            if ($alternatives = $this->findAlternatives($name, $allCommands, array())) {
+            if ($alternatives = $this->findAlternatives($name, $allCommands)) {
                 if (1 == count($alternatives)) {
                     $message .= "\n\nDid you mean this?\n    ";
                 } else {
@@ -628,7 +628,7 @@ class Application
      */
     public function asText($namespace = null, $raw = false)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0.', E_USER_DEPRECATED);
 
         $descriptor = new TextDescriptor();
         $output = new BufferedOutput(BufferedOutput::VERBOSITY_NORMAL, !$raw);
@@ -649,7 +649,7 @@ class Application
      */
     public function asXml($namespace = null, $asDom = false)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0.', E_USER_DEPRECATED);
 
         $descriptor = new XmlDescriptor();
 
@@ -1086,7 +1086,7 @@ class Application
             }
         }
 
-        $alternatives = array_filter($alternatives, function ($lev) use ($threshold) { return $lev < 2*$threshold; });
+        $alternatives = array_filter($alternatives, function ($lev) use ($threshold) { return $lev < 2 * $threshold; });
         asort($alternatives);
 
         return array_keys($alternatives);
@@ -1142,7 +1142,7 @@ class Application
             $lines[] = str_pad($line, $width);
             $line = $char;
         }
-        if (strlen($line)) {
+        if ('' !== $line) {
             $lines[] = count($lines) ? str_pad($line, $width) : $line;
         }
 
diff --git a/core/vendor/symfony/console/Command/Command.php b/core/vendor/symfony/console/Command/Command.php
index 02e207eac..e6642631c 100644
--- a/core/vendor/symfony/console/Command/Command.php
+++ b/core/vendor/symfony/console/Command/Command.php
@@ -645,7 +645,7 @@ class Command
      */
     public function asText()
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0.', E_USER_DEPRECATED);
 
         $descriptor = new TextDescriptor();
         $output = new BufferedOutput(BufferedOutput::VERBOSITY_NORMAL, true);
@@ -665,7 +665,7 @@ class Command
      */
     public function asXml($asDom = false)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0.', E_USER_DEPRECATED);
 
         $descriptor = new XmlDescriptor();
 
diff --git a/core/vendor/symfony/console/Command/HelpCommand.php b/core/vendor/symfony/console/Command/HelpCommand.php
index ae06af50e..8c20b5706 100644
--- a/core/vendor/symfony/console/Command/HelpCommand.php
+++ b/core/vendor/symfony/console/Command/HelpCommand.php
@@ -77,7 +77,7 @@ EOF
         }
 
         if ($input->getOption('xml')) {
-            trigger_error('The --xml option was deprecated in version 2.7 and will be removed in version 3.0. Use the --format option instead.', E_USER_DEPRECATED);
+            @trigger_error('The --xml option was deprecated in version 2.7 and will be removed in version 3.0. Use the --format option instead.', E_USER_DEPRECATED);
 
             $input->setOption('format', 'xml');
         }
diff --git a/core/vendor/symfony/console/Command/ListCommand.php b/core/vendor/symfony/console/Command/ListCommand.php
index c42a6f27d..5f970e82e 100644
--- a/core/vendor/symfony/console/Command/ListCommand.php
+++ b/core/vendor/symfony/console/Command/ListCommand.php
@@ -69,7 +69,7 @@ EOF
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         if ($input->getOption('xml')) {
-            trigger_error('The --xml option was deprecated in version 2.7 and will be removed in version 3.0. Use the --format option instead.', E_USER_DEPRECATED);
+            @trigger_error('The --xml option was deprecated in version 2.7 and will be removed in version 3.0. Use the --format option instead.', E_USER_DEPRECATED);
 
             $input->setOption('format', 'xml');
         }
diff --git a/core/vendor/symfony/console/Descriptor/TextDescriptor.php b/core/vendor/symfony/console/Descriptor/TextDescriptor.php
index 0824463fc..5c3fea9a2 100644
--- a/core/vendor/symfony/console/Descriptor/TextDescriptor.php
+++ b/core/vendor/symfony/console/Descriptor/TextDescriptor.php
@@ -40,7 +40,7 @@ class TextDescriptor extends Descriptor
         $totalWidth = isset($options['total_width']) ? $options['total_width'] : strlen($argument->getName());
         $spacingWidth = $totalWidth - strlen($argument->getName()) + 2;
 
-        $this->writeText(sprintf("  <info>%s</info>%s%s%s",
+        $this->writeText(sprintf('  <info>%s</info>%s%s%s',
             $argument->getName(),
             str_repeat(' ', $spacingWidth),
             // + 17 = 2 spaces + <info> + </info> + 2 spaces
@@ -77,7 +77,7 @@ class TextDescriptor extends Descriptor
 
         $spacingWidth = $totalWidth - strlen($synopsis) + 2;
 
-        $this->writeText(sprintf("  <info>%s</info>%s%s%s%s",
+        $this->writeText(sprintf('  <info>%s</info>%s%s%s%s',
             $synopsis,
             str_repeat(' ', $spacingWidth),
             // + 17 = 2 spaces + <info> + </info> + 2 spaces
@@ -207,7 +207,7 @@ class TextDescriptor extends Descriptor
                 foreach ($namespace['commands'] as $name) {
                     $this->writeText("\n");
                     $spacingWidth = $width - strlen($name);
-                    $this->writeText(sprintf("  <info>%s</info>%s%s", $name, str_repeat(' ', $spacingWidth), $description->getCommand($name)->getDescription()), $options);
+                    $this->writeText(sprintf('  <info>%s</info>%s%s', $name, str_repeat(' ', $spacingWidth), $description->getCommand($name)->getDescription()), $options);
                 }
             }
 
@@ -266,7 +266,8 @@ class TextDescriptor extends Descriptor
     {
         $totalWidth = 0;
         foreach ($options as $option) {
-            $nameLength = 4 + strlen($option->getName()) + 2; // - + shortcut + , + whitespace + name + --
+            // "-" + shortcut + ", --" + name
+            $nameLength = 1 + max(strlen($option->getShortcut()), 1) + 4 + strlen($option->getName());
 
             if ($option->acceptValue()) {
                 $valueLength = 1 + strlen($option->getName()); // = + value
diff --git a/core/vendor/symfony/console/Formatter/OutputFormatter.php b/core/vendor/symfony/console/Formatter/OutputFormatter.php
index a053ac6ba..331b204fe 100644
--- a/core/vendor/symfony/console/Formatter/OutputFormatter.php
+++ b/core/vendor/symfony/console/Formatter/OutputFormatter.php
@@ -33,7 +33,7 @@ class OutputFormatter implements OutputFormatterInterface
      */
     public static function escape($text)
     {
-        return preg_replace('/([^\\\\]?)</is', '$1\\<', $text);
+        return preg_replace('/([^\\\\]?)</', '$1\\<', $text);
     }
 
     /**
@@ -146,7 +146,7 @@ class OutputFormatter implements OutputFormatterInterface
         $offset = 0;
         $output = '';
         $tagRegex = '[a-z][a-z0-9_=;-]*';
-        preg_match_all("#<(($tagRegex) | /($tagRegex)?)>#isx", $message, $matches, PREG_OFFSET_CAPTURE);
+        preg_match_all("#<(($tagRegex) | /($tagRegex)?)>#ix", $message, $matches, PREG_OFFSET_CAPTURE);
         foreach ($matches[0] as $i => $match) {
             $pos = $match[1];
             $text = $match[0];
diff --git a/core/vendor/symfony/console/Formatter/OutputFormatterStyle.php b/core/vendor/symfony/console/Formatter/OutputFormatterStyle.php
index b3f274a8b..ee62cdbd6 100644
--- a/core/vendor/symfony/console/Formatter/OutputFormatterStyle.php
+++ b/core/vendor/symfony/console/Formatter/OutputFormatterStyle.php
@@ -29,6 +29,7 @@ class OutputFormatterStyle implements OutputFormatterStyleInterface
         'magenta' => array('set' => 35, 'unset' => 39),
         'cyan' => array('set' => 36, 'unset' => 39),
         'white' => array('set' => 37, 'unset' => 39),
+        'default' => array('set' => 39, 'unset' => 39),
     );
     private static $availableBackgroundColors = array(
         'black' => array('set' => 40, 'unset' => 49),
@@ -39,6 +40,7 @@ class OutputFormatterStyle implements OutputFormatterStyleInterface
         'magenta' => array('set' => 45, 'unset' => 49),
         'cyan' => array('set' => 46, 'unset' => 49),
         'white' => array('set' => 47, 'unset' => 49),
+        'default' => array('set' => 49, 'unset' => 49),
     );
     private static $availableOptions = array(
         'bold' => array('set' => 1, 'unset' => 22),
diff --git a/core/vendor/symfony/console/Helper/DebugFormatterHelper.php b/core/vendor/symfony/console/Helper/DebugFormatterHelper.php
index cdb620d16..0b4b93790 100644
--- a/core/vendor/symfony/console/Helper/DebugFormatterHelper.php
+++ b/core/vendor/symfony/console/Helper/DebugFormatterHelper.php
@@ -20,7 +20,7 @@ namespace Symfony\Component\Console\Helper;
  */
 class DebugFormatterHelper extends Helper
 {
-    private $colors = array('black', 'red', 'green', 'yellow', 'blue', 'magenta', 'cyan', 'white');
+    private $colors = array('black', 'red', 'green', 'yellow', 'blue', 'magenta', 'cyan', 'white', 'default');
     private $started = array();
     private $count = -1;
 
diff --git a/core/vendor/symfony/console/Helper/DialogHelper.php b/core/vendor/symfony/console/Helper/DialogHelper.php
index 886baafd4..a280b49c1 100644
--- a/core/vendor/symfony/console/Helper/DialogHelper.php
+++ b/core/vendor/symfony/console/Helper/DialogHelper.php
@@ -31,7 +31,7 @@ class DialogHelper extends InputAwareHelper
     public function __construct($triggerDeprecationError = true)
     {
         if ($triggerDeprecationError) {
-            trigger_error('"Symfony\Component\Console\Helper\DialogHelper" is deprecated since version 2.5 and will be removed in 3.0. Use "Symfony\Component\Console\Helper\QuestionHelper" instead.', E_USER_DEPRECATED);
+            @trigger_error('"Symfony\Component\Console\Helper\DialogHelper" is deprecated since version 2.5 and will be removed in 3.0. Use "Symfony\Component\Console\Helper\QuestionHelper" instead.', E_USER_DEPRECATED);
         }
     }
 
@@ -466,18 +466,18 @@ class DialogHelper extends InputAwareHelper
      */
     private function validateAttempts($interviewer, OutputInterface $output, $validator, $attempts)
     {
-        $error = null;
+        $e = null;
         while (false === $attempts || $attempts--) {
-            if (null !== $error) {
-                $output->writeln($this->getHelperSet()->get('formatter')->formatBlock($error->getMessage(), 'error'));
+            if (null !== $e) {
+                $output->writeln($this->getHelperSet()->get('formatter')->formatBlock($e->getMessage(), 'error'));
             }
 
             try {
                 return call_user_func($validator, $interviewer());
-            } catch (\Exception $error) {
+            } catch (\Exception $e) {
             }
         }
 
-        throw $error;
+        throw $e;
     }
 }
diff --git a/core/vendor/symfony/console/Helper/HelperSet.php b/core/vendor/symfony/console/Helper/HelperSet.php
index 52a669d48..00354dd91 100644
--- a/core/vendor/symfony/console/Helper/HelperSet.php
+++ b/core/vendor/symfony/console/Helper/HelperSet.php
@@ -79,11 +79,11 @@ class HelperSet implements \IteratorAggregate
         }
 
         if ('dialog' === $name && $this->helpers[$name] instanceof DialogHelper) {
-            trigger_error('"Symfony\Component\Console\Helper\DialogHelper" is deprecated since version 2.5 and will be removed in 3.0. Use "Symfony\Component\Console\Helper\QuestionHelper" instead.', E_USER_DEPRECATED);
+            @trigger_error('"Symfony\Component\Console\Helper\DialogHelper" is deprecated since version 2.5 and will be removed in 3.0. Use "Symfony\Component\Console\Helper\QuestionHelper" instead.', E_USER_DEPRECATED);
         } elseif ('progress' === $name && $this->helpers[$name] instanceof ProgressHelper) {
-            trigger_error('"Symfony\Component\Console\Helper\ProgressHelper" is deprecated since version 2.5 and will be removed in 3.0. Use "Symfony\Component\Console\Helper\ProgressBar" instead.', E_USER_DEPRECATED);
+            @trigger_error('"Symfony\Component\Console\Helper\ProgressHelper" is deprecated since version 2.5 and will be removed in 3.0. Use "Symfony\Component\Console\Helper\ProgressBar" instead.', E_USER_DEPRECATED);
         } elseif ('table' === $name && $this->helpers[$name] instanceof TableHelper) {
-            trigger_error('"Symfony\Component\Console\Helper\TableHelper" is deprecated since version 2.5 and will be removed in 3.0. Use "Symfony\Component\Console\Helper\Table" instead.', E_USER_DEPRECATED);
+            @trigger_error('"Symfony\Component\Console\Helper\TableHelper" is deprecated since version 2.5 and will be removed in 3.0. Use "Symfony\Component\Console\Helper\Table" instead.', E_USER_DEPRECATED);
         }
 
         return $this->helpers[$name];
diff --git a/core/vendor/symfony/console/Helper/ProgressBar.php b/core/vendor/symfony/console/Helper/ProgressBar.php
index ae1fdae88..e5ba92773 100644
--- a/core/vendor/symfony/console/Helper/ProgressBar.php
+++ b/core/vendor/symfony/console/Helper/ProgressBar.php
@@ -177,7 +177,7 @@ class ProgressBar
      */
     public function getStep()
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the getProgress() method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the getProgress() method instead.', E_USER_DEPRECATED);
 
         return $this->getProgress();
     }
@@ -368,13 +368,13 @@ class ProgressBar
      */
     public function setCurrent($step)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the setProgress() method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the setProgress() method instead.', E_USER_DEPRECATED);
 
         $this->setProgress($step);
     }
 
     /**
-     * Sets whether to overwrite the progressbar, false for new line
+     * Sets whether to overwrite the progressbar, false for new line.
      *
      * @param bool $overwrite
      */
@@ -401,8 +401,8 @@ class ProgressBar
             $this->max = $step;
         }
 
-        $prevPeriod = intval($this->step / $this->redrawFreq);
-        $currPeriod = intval($step / $this->redrawFreq);
+        $prevPeriod = (int) ($this->step / $this->redrawFreq);
+        $currPeriod = (int) ($step / $this->redrawFreq);
         $this->step = $step;
         $this->percent = $this->max ? (float) $this->step / $this->max : 0;
         if ($prevPeriod !== $currPeriod || $this->max === $step) {
diff --git a/core/vendor/symfony/console/Helper/ProgressHelper.php b/core/vendor/symfony/console/Helper/ProgressHelper.php
index fe67e9d02..bd885662f 100644
--- a/core/vendor/symfony/console/Helper/ProgressHelper.php
+++ b/core/vendor/symfony/console/Helper/ProgressHelper.php
@@ -121,7 +121,7 @@ class ProgressHelper extends Helper
     public function __construct($triggerDeprecationError = true)
     {
         if ($triggerDeprecationError) {
-            trigger_error('The '.__CLASS__.' class is deprecated since version 2.5 and will be removed in 3.0. Use the Symfony\Component\Console\Helper\ProgressBar class instead.', E_USER_DEPRECATED);
+            @trigger_error('The '.__CLASS__.' class is deprecated since version 2.5 and will be removed in 3.0. Use the Symfony\Component\Console\Helper\ProgressBar class instead.', E_USER_DEPRECATED);
         }
     }
 
diff --git a/core/vendor/symfony/console/Helper/Table.php b/core/vendor/symfony/console/Helper/Table.php
index ff668a475..9e86c856d 100644
--- a/core/vendor/symfony/console/Helper/Table.php
+++ b/core/vendor/symfony/console/Helper/Table.php
@@ -171,7 +171,7 @@ class Table
         if ($row instanceof TableSeparator) {
             $this->rows[] = $row;
 
-            return;
+            return $this;
         }
 
         if (!is_array($row)) {
@@ -385,7 +385,7 @@ class Table
         $unmergedRows = array();
         foreach ($rows[$line] as $column => $cell) {
             if ($cell instanceof TableCell && $cell->getRowspan() > 1) {
-                $nbLines = $cell->getRowspan()-1;
+                $nbLines = $cell->getRowspan() - 1;
                 $lines = array($cell);
                 if (strstr($cell, "\n")) {
                     $lines = explode("\n", $cell);
@@ -412,7 +412,7 @@ class Table
                     array_splice($rows[$unmergedRowKey], $cellKey, 0, array($cell));
                 }
             } else {
-                $row = $this->copyRow($rows, $unmergedRowKey-1);
+                $row = $this->copyRow($rows, $unmergedRowKey - 1);
                 foreach ($unmergedRow as $column => $cell) {
                     if (!empty($cell)) {
                         $row[$column] = $unmergedRow[$column];
@@ -476,7 +476,7 @@ class Table
     {
         $columns = count($row);
         foreach ($row as $column) {
-            $columns += $column instanceof TableCell ? ($column->getColspan()-1) : 0;
+            $columns += $column instanceof TableCell ? ($column->getColspan() - 1) : 0;
         }
 
         return $columns;
@@ -491,11 +491,11 @@ class Table
      */
     private function getRowColumns($row)
     {
-        $columns = range(0, $this->numberOfColumns-1);
+        $columns = range(0, $this->numberOfColumns - 1);
         foreach ($row as $cellKey => $cell) {
             if ($cell instanceof TableCell && $cell->getColspan() > 1) {
                 // exclude grouped columns.
-                $columns = array_diff($columns, range($cellKey+1, $cellKey + $cell->getColspan()-1));
+                $columns = array_diff($columns, range($cellKey + 1, $cellKey + $cell->getColspan() - 1));
             }
         }
 
@@ -550,12 +550,13 @@ class Table
     {
         if (isset($row[$column])) {
             $cell = $row[$column];
+            $cellWidth = Helper::strlenWithoutDecoration($this->output->getFormatter(), $cell);
             if ($cell instanceof TableCell && $cell->getColspan() > 1) {
                 // we assume that cell value will be across more than one column.
-                $cell = substr($cell, 0, strlen($cell)/$cell->getColspan());
+                $cellWidth = $cellWidth / $cell->getColspan();
             }
 
-            return Helper::strlenWithoutDecoration($this->output->getFormatter(), $cell);
+            return $cellWidth;
         }
 
         return 0;
diff --git a/core/vendor/symfony/console/Helper/TableHelper.php b/core/vendor/symfony/console/Helper/TableHelper.php
index 06af5fad9..29535225a 100644
--- a/core/vendor/symfony/console/Helper/TableHelper.php
+++ b/core/vendor/symfony/console/Helper/TableHelper.php
@@ -37,7 +37,7 @@ class TableHelper extends Helper
     public function __construct($triggerDeprecationError = true)
     {
         if ($triggerDeprecationError) {
-            trigger_error('The '.__CLASS__.' class is deprecated since version 2.5 and will be removed in 3.0. Use the Symfony\Component\Console\Helper\Table class instead.', E_USER_DEPRECATED);
+            @trigger_error('The '.__CLASS__.' class is deprecated since version 2.5 and will be removed in 3.0. Use the Symfony\Component\Console\Helper\Table class instead.', E_USER_DEPRECATED);
         }
 
         $this->table = new Table(new NullOutput());
diff --git a/core/vendor/symfony/console/Input/ArgvInput.php b/core/vendor/symfony/console/Input/ArgvInput.php
index 97b0cfc05..43cbe725f 100644
--- a/core/vendor/symfony/console/Input/ArgvInput.php
+++ b/core/vendor/symfony/console/Input/ArgvInput.php
@@ -221,7 +221,7 @@ class ArgvInput extends Input
         }
 
         if (null !== $value && !$option->acceptValue()) {
-            throw new \RuntimeException(sprintf('The "--%s" option does not accept a value.', $name, $value));
+            throw new \RuntimeException(sprintf('The "--%s" option does not accept a value.', $name));
         }
 
         if (null === $value && $option->acceptValue() && count($this->parsed)) {
diff --git a/core/vendor/symfony/console/Input/InputDefinition.php b/core/vendor/symfony/console/Input/InputDefinition.php
index 044ec265b..21ac832c3 100644
--- a/core/vendor/symfony/console/Input/InputDefinition.php
+++ b/core/vendor/symfony/console/Input/InputDefinition.php
@@ -449,7 +449,7 @@ class InputDefinition
      */
     public function asText()
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0.', E_USER_DEPRECATED);
 
         $descriptor = new TextDescriptor();
         $output = new BufferedOutput(BufferedOutput::VERBOSITY_NORMAL, true);
@@ -469,7 +469,7 @@ class InputDefinition
      */
     public function asXml($asDom = false)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0.', E_USER_DEPRECATED);
 
         $descriptor = new XmlDescriptor();
 
diff --git a/core/vendor/symfony/console/Input/StringInput.php b/core/vendor/symfony/console/Input/StringInput.php
index 40656b3c1..40d1dfbc7 100644
--- a/core/vendor/symfony/console/Input/StringInput.php
+++ b/core/vendor/symfony/console/Input/StringInput.php
@@ -40,7 +40,7 @@ class StringInput extends ArgvInput
     public function __construct($input, InputDefinition $definition = null)
     {
         if ($definition) {
-            trigger_error('The $definition argument of the '.__METHOD__.' method is deprecated and will be removed in 3.0. Set this parameter with the bind() method instead.', E_USER_DEPRECATED);
+            @trigger_error('The $definition argument of the '.__METHOD__.' method is deprecated and will be removed in 3.0. Set this parameter with the bind() method instead.', E_USER_DEPRECATED);
         }
 
         parent::__construct(array(), null);
diff --git a/core/vendor/symfony/console/Output/ConsoleOutput.php b/core/vendor/symfony/console/Output/ConsoleOutput.php
index 3560f1c6f..708d17144 100644
--- a/core/vendor/symfony/console/Output/ConsoleOutput.php
+++ b/core/vendor/symfony/console/Output/ConsoleOutput.php
@@ -30,6 +30,9 @@ use Symfony\Component\Console\Formatter\OutputFormatterInterface;
  */
 class ConsoleOutput extends StreamOutput implements ConsoleOutputInterface
 {
+    /**
+     * @var StreamOutput
+     */
     private $stderr;
 
     /**
@@ -43,14 +46,12 @@ class ConsoleOutput extends StreamOutput implements ConsoleOutputInterface
      */
     public function __construct($verbosity = self::VERBOSITY_NORMAL, $decorated = null, OutputFormatterInterface $formatter = null)
     {
-        $outputStream = 'php://stdout';
-        if (!$this->hasStdoutSupport()) {
-            $outputStream = 'php://output';
-        }
+        $outputStream = $this->hasStdoutSupport() ? 'php://stdout' : 'php://output';
+        $errorStream = $this->hasStderrSupport() ? 'php://stderr' : 'php://output';
 
         parent::__construct(fopen($outputStream, 'w'), $verbosity, $decorated, $formatter);
 
-        $this->stderr = new StreamOutput(fopen('php://stderr', 'w'), $verbosity, $decorated, $this->getFormatter());
+        $this->stderr = new StreamOutput(fopen($errorStream, 'w'), $verbosity, $decorated, $this->getFormatter());
     }
 
     /**
@@ -100,14 +101,32 @@ class ConsoleOutput extends StreamOutput implements ConsoleOutputInterface
      * Returns true if current environment supports writing console output to
      * STDOUT.
      *
-     * IBM iSeries (OS400) exhibits character-encoding issues when writing to
-     * STDOUT and doesn't properly convert ASCII to EBCDIC, resulting in garbage
-     * output.
-     *
      * @return bool
      */
     protected function hasStdoutSupport()
     {
-        return ('OS400' != php_uname('s'));
+        return false === $this->isRunningOS400();
+    }
+
+    /**
+     * Returns true if current environment supports writing console output to
+     * STDERR.
+     *
+     * @return bool
+     */
+    protected function hasStderrSupport()
+    {
+        return false === $this->isRunningOS400();
+    }
+
+    /**
+     * Checks if current executing environment is IBM iSeries (OS400), which
+     * doesn't properly convert character-encodings between ASCII to EBCDIC.
+     *
+     * @return bool
+     */
+    private function isRunningOS400()
+    {
+        return 'OS400' === php_uname('s');
     }
 }
diff --git a/core/vendor/symfony/console/Question/ChoiceQuestion.php b/core/vendor/symfony/console/Question/ChoiceQuestion.php
index 9586c5bf3..a61b410d5 100644
--- a/core/vendor/symfony/console/Question/ChoiceQuestion.php
+++ b/core/vendor/symfony/console/Question/ChoiceQuestion.php
@@ -161,7 +161,8 @@ class ChoiceQuestion extends Question
                 if (false === $result) {
                     throw new \InvalidArgumentException(sprintf($errorMessage, $value));
                 }
-                array_push($multiselectChoices, (string) $result);
+
+                $multiselectChoices[] = $choices[(string) $result];
             }
 
             if ($multiselect) {
diff --git a/core/vendor/symfony/console/Shell.php b/core/vendor/symfony/console/Shell.php
index 4167746aa..eaaadfd8a 100644
--- a/core/vendor/symfony/console/Shell.php
+++ b/core/vendor/symfony/console/Shell.php
@@ -206,7 +206,7 @@ EOF;
         } else {
             $this->output->write($this->getPrompt());
             $line = fgets(STDIN, 1024);
-            $line = (!$line && strlen($line) == 0) ? false : rtrim($line);
+            $line = (false === $line || '' === $line) ? false : rtrim($line);
         }
 
         return $line;
diff --git a/core/vendor/symfony/console/Style/SymfonyStyle.php b/core/vendor/symfony/console/Style/SymfonyStyle.php
index 6d69eca54..b3113a41e 100644
--- a/core/vendor/symfony/console/Style/SymfonyStyle.php
+++ b/core/vendor/symfony/console/Style/SymfonyStyle.php
@@ -18,6 +18,7 @@ use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Helper\SymfonyQuestionHelper;
 use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\BufferedOutput;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Question\ChoiceQuestion;
 use Symfony\Component\Console\Question\ConfirmationQuestion;
@@ -36,6 +37,7 @@ class SymfonyStyle extends OutputStyle
     private $questionHelper;
     private $progressBar;
     private $lineLength;
+    private $bufferedOutput;
 
     /**
      * @param InputInterface  $input
@@ -44,7 +46,9 @@ class SymfonyStyle extends OutputStyle
     public function __construct(InputInterface $input, OutputInterface $output)
     {
         $this->input = $input;
-        $this->lineLength = min($this->getTerminalWidth(), self::MAX_LINE_LENGTH);
+        $this->bufferedOutput = new BufferedOutput($output->getVerbosity(), false, clone $output->getFormatter());
+        // Windows cmd wraps lines as soon as the terminal width is reached, whether there are following chars or not.
+        $this->lineLength = min($this->getTerminalWidth() - (int) (DIRECTORY_SEPARATOR === '\\'), self::MAX_LINE_LENGTH);
 
         parent::__construct($output);
     }
@@ -60,6 +64,7 @@ class SymfonyStyle extends OutputStyle
      */
     public function block($messages, $type = null, $style = null, $prefix = ' ', $padding = false)
     {
+        $this->autoPrependBlock();
         $messages = is_array($messages) ? array_values($messages) : array($messages);
         $lines = array();
 
@@ -71,7 +76,7 @@ class SymfonyStyle extends OutputStyle
         // wrap and add newlines for each element
         foreach ($messages as $key => $message) {
             $message = OutputFormatter::escape($message);
-            $lines = array_merge($lines, explode("\n", wordwrap($message, $this->lineLength - Helper::strlen($prefix))));
+            $lines = array_merge($lines, explode(PHP_EOL, wordwrap($message, $this->lineLength - Helper::strlen($prefix), PHP_EOL, true)));
 
             if (count($messages) > 1 && $key < count($messages) - 1) {
                 $lines[] = '';
@@ -92,7 +97,8 @@ class SymfonyStyle extends OutputStyle
             }
         }
 
-        $this->writeln(implode("\n", $lines)."\n");
+        $this->writeln($lines);
+        $this->newLine();
     }
 
     /**
@@ -100,7 +106,12 @@ class SymfonyStyle extends OutputStyle
      */
     public function title($message)
     {
-        $this->writeln(sprintf("\n<comment>%s</>\n<comment>%s</>\n", $message, str_repeat('=', strlen($message))));
+        $this->autoPrependBlock();
+        $this->writeln(array(
+            sprintf('<comment>%s</>', $message),
+            sprintf('<comment>%s</>', str_repeat('=', strlen($message))),
+        ));
+        $this->newLine();
     }
 
     /**
@@ -108,7 +119,12 @@ class SymfonyStyle extends OutputStyle
      */
     public function section($message)
     {
-        $this->writeln(sprintf("<comment>%s</>\n<comment>%s</>\n", $message, str_repeat('-', strlen($message))));
+        $this->autoPrependBlock();
+        $this->writeln(array(
+            sprintf('<comment>%s</>', $message),
+            sprintf('<comment>%s</>', str_repeat('-', strlen($message))),
+        ));
+        $this->newLine();
     }
 
     /**
@@ -116,13 +132,13 @@ class SymfonyStyle extends OutputStyle
      */
     public function listing(array $elements)
     {
+        $this->autoPrependText();
         $elements = array_map(function ($element) {
-                return sprintf(' * %s', $element);
-            },
-            $elements
-        );
+            return sprintf(' * %s', $element);
+        }, $elements);
 
-        $this->writeln(implode("\n", $elements)."\n");
+        $this->writeln($elements);
+        $this->newLine();
     }
 
     /**
@@ -130,6 +146,8 @@ class SymfonyStyle extends OutputStyle
      */
     public function text($message)
     {
+        $this->autoPrependText();
+
         if (!is_array($message)) {
             $this->writeln(sprintf(' // %s', $message));
 
@@ -205,7 +223,7 @@ class SymfonyStyle extends OutputStyle
         $question = new Question($question, $default);
         $question->setValidator($validator);
 
-        return $this->askQuestion($question, $validator);
+        return $this->askQuestion($question);
     }
 
     /**
@@ -214,9 +232,11 @@ class SymfonyStyle extends OutputStyle
     public function askHidden($question, $validator = null)
     {
         $question = new Question($question);
-        $question->setHidden(true);
 
-        return $this->askQuestion($question, $validator);
+        $question->setHidden(true);
+        $question->setValidator($validator);
+
+        return $this->askQuestion($question);
     }
 
     /**
@@ -290,17 +310,51 @@ class SymfonyStyle extends OutputStyle
      */
     public function askQuestion(Question $question)
     {
+        if ($this->input->isInteractive()) {
+            $this->autoPrependBlock();
+        }
+
         if (!$this->questionHelper) {
             $this->questionHelper = new SymfonyQuestionHelper();
         }
 
         $answer = $this->questionHelper->ask($this->input, $this, $question);
 
-        $this->newLine();
+        if ($this->input->isInteractive()) {
+            $this->newLine();
+            $this->bufferedOutput->write("\n");
+        }
 
         return $answer;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function writeln($messages, $type = self::OUTPUT_NORMAL)
+    {
+        parent::writeln($messages, $type);
+        $this->bufferedOutput->writeln($this->reduceBuffer($messages), $type);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function write($messages, $newline = false, $type = self::OUTPUT_NORMAL)
+    {
+        parent::write($messages, $newline, $type);
+        $this->bufferedOutput->write($this->reduceBuffer($messages), $newline, $type);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function newLine($count = 1)
+    {
+        parent::newLine($count);
+        $this->bufferedOutput->write(str_repeat("\n", $count));
+    }
+
     /**
      * @return ProgressBar
      */
@@ -320,4 +374,33 @@ class SymfonyStyle extends OutputStyle
 
         return $dimensions[0] ?: self::MAX_LINE_LENGTH;
     }
+
+    private function autoPrependBlock()
+    {
+        $chars = substr(str_replace(PHP_EOL, "\n", $this->bufferedOutput->fetch()), -2);
+
+        if (false === $chars) {
+            return $this->newLine(); //empty history, so we should start with a new line.
+        }
+        //Prepend new line for each non LF chars (This means no blank line was output before)
+        $this->newLine(2 - substr_count($chars, "\n"));
+    }
+
+    private function autoPrependText()
+    {
+        $fetched = $this->bufferedOutput->fetch();
+        //Prepend new line if last char isn't EOL:
+        if ("\n" !== substr($fetched, -1)) {
+            $this->newLine();
+        }
+    }
+
+    private function reduceBuffer($messages)
+    {
+        // We need to know if the two last chars are PHP_EOL
+        // Preserve the last 4 chars inserted (PHP_EOL on windows is two chars) in the history buffer
+        return array_map(function ($value) {
+            return substr($value, -4);
+        }, array_merge(array($this->bufferedOutput->fetch()), (array) $messages));
+    }
 }
diff --git a/core/vendor/symfony/console/Tests/ApplicationTest.php b/core/vendor/symfony/console/Tests/ApplicationTest.php
index 1fa6c64af..dfee2321d 100644
--- a/core/vendor/symfony/console/Tests/ApplicationTest.php
+++ b/core/vendor/symfony/console/Tests/ApplicationTest.php
@@ -495,8 +495,6 @@ class ApplicationTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacyAsText()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $application = new Application();
         $application->add(new \FooCommand());
         $this->ensureStaticCommandHelp($application);
@@ -509,8 +507,6 @@ class ApplicationTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacyAsXml()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $application = new Application();
         $application->add(new \FooCommand());
         $this->ensureStaticCommandHelp($application);
@@ -679,7 +675,7 @@ class ApplicationTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * Issue #9285
+     * Issue #9285.
      *
      * If the "verbose" option is just before an argument in ArgvInput,
      * an argument value should not be treated as verbosity value.
diff --git a/core/vendor/symfony/console/Tests/Command/CommandTest.php b/core/vendor/symfony/console/Tests/Command/CommandTest.php
index 1f1160efb..7702ac834 100644
--- a/core/vendor/symfony/console/Tests/Command/CommandTest.php
+++ b/core/vendor/symfony/console/Tests/Command/CommandTest.php
@@ -314,8 +314,6 @@ class CommandTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacyAsText()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $command = new \TestCommand();
         $command->setApplication(new Application());
         $tester = new CommandTester($command);
@@ -328,8 +326,6 @@ class CommandTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacyAsXml()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $command = new \TestCommand();
         $command->setApplication(new Application());
         $tester = new CommandTester($command);
diff --git a/core/vendor/symfony/console/Tests/Descriptor/ObjectsProvider.php b/core/vendor/symfony/console/Tests/Descriptor/ObjectsProvider.php
index 1f40d2e6a..45b3b2fff 100644
--- a/core/vendor/symfony/console/Tests/Descriptor/ObjectsProvider.php
+++ b/core/vendor/symfony/console/Tests/Descriptor/ObjectsProvider.php
@@ -42,6 +42,7 @@ class ObjectsProvider
             'input_option_3' => new InputOption('option_name', 'o', InputOption::VALUE_REQUIRED, 'option description'),
             'input_option_4' => new InputOption('option_name', 'o', InputOption::VALUE_IS_ARRAY | InputOption::VALUE_OPTIONAL, 'option description', array()),
             'input_option_5' => new InputOption('option_name', 'o', InputOption::VALUE_REQUIRED, "multiline\noption description"),
+            'input_option_6' => new InputOption('option_name', array('o', 'O'), InputOption::VALUE_REQUIRED, 'option with multiple shortcuts'),
         );
     }
 
diff --git a/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_0.php b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_0.php
new file mode 100644
index 000000000..8fe7c0771
--- /dev/null
+++ b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_0.php
@@ -0,0 +1,11 @@
+<?php
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+//Ensure has single blank line at start when using block element
+return function (InputInterface $input, OutputInterface $output) {
+    $output = new SymfonyStyle($input, $output);
+    $output->caution('Lorem ipsum dolor sit amet');
+};
diff --git a/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_1.php b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_1.php
new file mode 100644
index 000000000..e5c700d60
--- /dev/null
+++ b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_1.php
@@ -0,0 +1,13 @@
+<?php
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+//Ensure has single blank line between titles and blocks
+return function (InputInterface $input, OutputInterface $output) {
+    $output = new SymfonyStyle($input, $output);
+    $output->title('Title');
+    $output->warning('Lorem ipsum dolor sit amet');
+    $output->title('Title');
+};
diff --git a/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_2.php b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_2.php
new file mode 100644
index 000000000..791b626f2
--- /dev/null
+++ b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_2.php
@@ -0,0 +1,16 @@
+<?php
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+//Ensure has single blank line between blocks
+return function (InputInterface $input, OutputInterface $output) {
+    $output = new SymfonyStyle($input, $output);
+    $output->warning('Warning');
+    $output->caution('Caution');
+    $output->error('Error');
+    $output->success('Success');
+    $output->note('Note');
+    $output->block('Custom block', 'CUSTOM', 'fg=white;bg=green', 'X ', true);
+};
diff --git a/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_3.php b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_3.php
new file mode 100644
index 000000000..99253a6c0
--- /dev/null
+++ b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_3.php
@@ -0,0 +1,12 @@
+<?php
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+//Ensure has single blank line between two titles
+return function (InputInterface $input, OutputInterface $output) {
+    $output = new SymfonyStyle($input, $output);
+    $output->title('First title');
+    $output->title('Second title');
+};
diff --git a/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_4.php b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_4.php
new file mode 100644
index 000000000..0c5d3fb26
--- /dev/null
+++ b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_4.php
@@ -0,0 +1,34 @@
+<?php
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+//Ensure has single blank line after any text and a title
+return function (InputInterface $input, OutputInterface $output) {
+    $output = new SymfonyStyle($input, $output);
+
+    $output->write('Lorem ipsum dolor sit amet');
+    $output->title('First title');
+
+    $output->writeln('Lorem ipsum dolor sit amet');
+    $output->title('Second title');
+
+    $output->write('Lorem ipsum dolor sit amet');
+    $output->write('');
+    $output->title('Third title');
+
+    //Ensure edge case by appending empty strings to history:
+    $output->write('Lorem ipsum dolor sit amet');
+    $output->write(array('', '', ''));
+    $output->title('Fourth title');
+
+    //Ensure have manual control over number of blank lines:
+    $output->writeln('Lorem ipsum dolor sit amet');
+    $output->writeln(array('', '')); //Should append an extra blank line
+    $output->title('Fifth title');
+
+    $output->writeln('Lorem ipsum dolor sit amet');
+    $output->newLine(2); //Should append an extra blank line
+    $output->title('Fifth title');
+};
diff --git a/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_5.php b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_5.php
new file mode 100644
index 000000000..4543ad8cd
--- /dev/null
+++ b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_5.php
@@ -0,0 +1,29 @@
+<?php
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+//Ensure has proper line ending before outputing a text block like with SymfonyStyle::listing() or SymfonyStyle::text()
+return function (InputInterface $input, OutputInterface $output) {
+    $output = new SymfonyStyle($input, $output);
+
+    $output->writeln('Lorem ipsum dolor sit amet');
+    $output->listing(array(
+        'Lorem ipsum dolor sit amet',
+        'consectetur adipiscing elit',
+    ));
+
+    //Even using write:
+    $output->write('Lorem ipsum dolor sit amet');
+    $output->listing(array(
+        'Lorem ipsum dolor sit amet',
+        'consectetur adipiscing elit',
+    ));
+
+    $output->write('Lorem ipsum dolor sit amet');
+    $output->text(array(
+        'Lorem ipsum dolor sit amet',
+        'consectetur adipiscing elit',
+    ));
+};
diff --git a/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_6.php b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_6.php
new file mode 100644
index 000000000..8031ec9c3
--- /dev/null
+++ b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_6.php
@@ -0,0 +1,16 @@
+<?php
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+//Ensure has proper blank line after text block when using a block like with SymfonyStyle::success
+return function (InputInterface $input, OutputInterface $output) {
+    $output = new SymfonyStyle($input, $output);
+
+    $output->listing(array(
+        'Lorem ipsum dolor sit amet',
+        'consectetur adipiscing elit',
+    ));
+    $output->success('Lorem ipsum dolor sit amet');
+};
diff --git a/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_7.php b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_7.php
new file mode 100644
index 000000000..203eb5b12
--- /dev/null
+++ b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/command/command_7.php
@@ -0,0 +1,15 @@
+<?php
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+//Ensure questions do not output anything when input is non-interactive
+return function (InputInterface $input, OutputInterface $output) {
+    $output = new SymfonyStyle($input, $output);
+    $output->title('Title');
+    $output->askHidden('Hidden question');
+    $output->choice('Choice question with default', array('choice1', 'choice2'), 'choice1');
+    $output->confirm('Confirmation with yes default', true);
+    $output->text('Duis aute irure dolor in reprehenderit in voluptate velit esse');
+};
diff --git a/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_0.txt b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_0.txt
new file mode 100644
index 000000000..a42e0f792
--- /dev/null
+++ b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_0.txt
@@ -0,0 +1,3 @@
+
+ ! [CAUTION] Lorem ipsum dolor sit amet                                                                                 
+
diff --git a/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_1.txt b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_1.txt
new file mode 100644
index 000000000..334875f78
--- /dev/null
+++ b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_1.txt
@@ -0,0 +1,9 @@
+
+Title
+=====
+
+ [WARNING] Lorem ipsum dolor sit amet                                                                                   
+
+Title
+=====
+
diff --git a/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_2.txt b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_2.txt
new file mode 100644
index 000000000..ca609760c
--- /dev/null
+++ b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_2.txt
@@ -0,0 +1,13 @@
+
+ [WARNING] Warning                                                                                                      
+
+ ! [CAUTION] Caution                                                                                                    
+
+ [ERROR] Error                                                                                                          
+
+ [OK] Success                                                                                                           
+
+ ! [NOTE] Note                                                                                                          
+
+X [CUSTOM] Custom block                                                                                                 
+
diff --git a/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_3.txt b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_3.txt
new file mode 100644
index 000000000..f4b6d5827
--- /dev/null
+++ b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_3.txt
@@ -0,0 +1,7 @@
+
+First title
+===========
+
+Second title
+============
+
diff --git a/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_4.txt b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_4.txt
new file mode 100644
index 000000000..2646d858e
--- /dev/null
+++ b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_4.txt
@@ -0,0 +1,32 @@
+Lorem ipsum dolor sit amet
+
+First title
+===========
+
+Lorem ipsum dolor sit amet
+
+Second title
+============
+
+Lorem ipsum dolor sit amet
+
+Third title
+===========
+
+Lorem ipsum dolor sit amet
+
+Fourth title
+============
+
+Lorem ipsum dolor sit amet
+
+
+Fifth title
+===========
+
+Lorem ipsum dolor sit amet
+
+
+Fifth title
+===========
+
diff --git a/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_5.txt b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_5.txt
new file mode 100644
index 000000000..910240fbf
--- /dev/null
+++ b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_5.txt
@@ -0,0 +1,11 @@
+Lorem ipsum dolor sit amet
+ * Lorem ipsum dolor sit amet
+ * consectetur adipiscing elit
+
+Lorem ipsum dolor sit amet
+ * Lorem ipsum dolor sit amet
+ * consectetur adipiscing elit
+
+Lorem ipsum dolor sit amet
+ // Lorem ipsum dolor sit amet
+ // consectetur adipiscing elit
diff --git a/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_6.txt b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_6.txt
new file mode 100644
index 000000000..5f2d33c14
--- /dev/null
+++ b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_6.txt
@@ -0,0 +1,6 @@
+
+ * Lorem ipsum dolor sit amet
+ * consectetur adipiscing elit
+
+ [OK] Lorem ipsum dolor sit amet                                                                                        
+
diff --git a/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_7.txt b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_7.txt
new file mode 100644
index 000000000..ab18e5dc7
--- /dev/null
+++ b/core/vendor/symfony/console/Tests/Fixtures/Style/SymfonyStyle/output/output_7.txt
@@ -0,0 +1,5 @@
+
+Title
+=====
+
+ // Duis aute irure dolor in reprehenderit in voluptate velit esse
diff --git a/core/vendor/symfony/console/Tests/Fixtures/input_option_6.json b/core/vendor/symfony/console/Tests/Fixtures/input_option_6.json
new file mode 100644
index 000000000..d84e87214
--- /dev/null
+++ b/core/vendor/symfony/console/Tests/Fixtures/input_option_6.json
@@ -0,0 +1 @@
+{"name":"--option_name","shortcut":"-o|-O","accept_value":true,"is_value_required":true,"is_multiple":false,"description":"option with multiple shortcuts","default":null}
diff --git a/core/vendor/symfony/console/Tests/Fixtures/input_option_6.md b/core/vendor/symfony/console/Tests/Fixtures/input_option_6.md
new file mode 100644
index 000000000..ed1ea1c84
--- /dev/null
+++ b/core/vendor/symfony/console/Tests/Fixtures/input_option_6.md
@@ -0,0 +1,9 @@
+**option_name:**
+
+* Name: `--option_name`
+* Shortcut: `-o|-O`
+* Accept value: yes
+* Is value required: yes
+* Is multiple: no
+* Description: option with multiple shortcuts
+* Default: `NULL`
diff --git a/core/vendor/symfony/console/Tests/Fixtures/input_option_6.txt b/core/vendor/symfony/console/Tests/Fixtures/input_option_6.txt
new file mode 100644
index 000000000..0e6c9759b
--- /dev/null
+++ b/core/vendor/symfony/console/Tests/Fixtures/input_option_6.txt
@@ -0,0 +1 @@
+  <info>-o|O, --option_name=OPTION_NAME</info>  option with multiple shortcuts
diff --git a/core/vendor/symfony/console/Tests/Fixtures/input_option_6.xml b/core/vendor/symfony/console/Tests/Fixtures/input_option_6.xml
new file mode 100644
index 000000000..06126a2f5
--- /dev/null
+++ b/core/vendor/symfony/console/Tests/Fixtures/input_option_6.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<option name="--option_name" shortcut="-o" shortcuts="-o|-O" accept_value="1" is_value_required="1" is_multiple="0">
+  <description>option with multiple shortcuts</description>
+  <defaults/>
+</option>
diff --git a/core/vendor/symfony/console/Tests/Formatter/OutputFormatterStyleTest.php b/core/vendor/symfony/console/Tests/Formatter/OutputFormatterStyleTest.php
index 52ada9e97..0abfb3ce2 100644
--- a/core/vendor/symfony/console/Tests/Formatter/OutputFormatterStyleTest.php
+++ b/core/vendor/symfony/console/Tests/Formatter/OutputFormatterStyleTest.php
@@ -37,6 +37,9 @@ class OutputFormatterStyleTest extends \PHPUnit_Framework_TestCase
         $style->setForeground('blue');
         $this->assertEquals("\033[34mfoo\033[39m", $style->apply('foo'));
 
+        $style->setForeground('default');
+        $this->assertEquals("\033[39mfoo\033[39m", $style->apply('foo'));
+
         $this->setExpectedException('InvalidArgumentException');
         $style->setForeground('undefined-color');
     }
@@ -51,6 +54,9 @@ class OutputFormatterStyleTest extends \PHPUnit_Framework_TestCase
         $style->setBackground('yellow');
         $this->assertEquals("\033[43mfoo\033[49m", $style->apply('foo'));
 
+        $style->setBackground('default');
+        $this->assertEquals("\033[49mfoo\033[49m", $style->apply('foo'));
+
         $this->setExpectedException('InvalidArgumentException');
         $style->setBackground('undefined-color');
     }
diff --git a/core/vendor/symfony/console/Tests/Helper/LegacyDialogHelperTest.php b/core/vendor/symfony/console/Tests/Helper/LegacyDialogHelperTest.php
index cf07793c3..e130cdc6b 100644
--- a/core/vendor/symfony/console/Tests/Helper/LegacyDialogHelperTest.php
+++ b/core/vendor/symfony/console/Tests/Helper/LegacyDialogHelperTest.php
@@ -22,11 +22,6 @@ use Symfony\Component\Console\Output\StreamOutput;
  */
 class LegacyDialogHelperTest extends \PHPUnit_Framework_TestCase
 {
-    protected function setUp()
-    {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-    }
-
     public function testSelect()
     {
         $dialog = new DialogHelper();
diff --git a/core/vendor/symfony/console/Tests/Helper/LegacyProgressHelperTest.php b/core/vendor/symfony/console/Tests/Helper/LegacyProgressHelperTest.php
index e93057a16..7b9cf29f0 100644
--- a/core/vendor/symfony/console/Tests/Helper/LegacyProgressHelperTest.php
+++ b/core/vendor/symfony/console/Tests/Helper/LegacyProgressHelperTest.php
@@ -19,11 +19,6 @@ use Symfony\Component\Console\Output\StreamOutput;
  */
 class LegacyProgressHelperTest extends \PHPUnit_Framework_TestCase
 {
-    protected function setUp()
-    {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-    }
-
     public function testAdvance()
     {
         $progress = new ProgressHelper();
diff --git a/core/vendor/symfony/console/Tests/Helper/LegacyTableHelperTest.php b/core/vendor/symfony/console/Tests/Helper/LegacyTableHelperTest.php
index b7e31596f..3b324237e 100644
--- a/core/vendor/symfony/console/Tests/Helper/LegacyTableHelperTest.php
+++ b/core/vendor/symfony/console/Tests/Helper/LegacyTableHelperTest.php
@@ -23,7 +23,6 @@ class LegacyTableHelperTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
         $this->stream = fopen('php://memory', 'r+');
     }
 
diff --git a/core/vendor/symfony/console/Tests/Helper/ProcessHelperTest.php b/core/vendor/symfony/console/Tests/Helper/ProcessHelperTest.php
index 2e333dc05..9f83885a5 100644
--- a/core/vendor/symfony/console/Tests/Helper/ProcessHelperTest.php
+++ b/core/vendor/symfony/console/Tests/Helper/ProcessHelperTest.php
@@ -13,7 +13,6 @@ namespace Symfony\Component\Console\Tests\Helper;
 
 use Symfony\Component\Console\Helper\DebugFormatterHelper;
 use Symfony\Component\Console\Helper\HelperSet;
-use Symfony\Component\Console\Helper\Helper;
 use Symfony\Component\Console\Output\StreamOutput;
 use Symfony\Component\Console\Helper\ProcessHelper;
 use Symfony\Component\Process\Process;
@@ -59,7 +58,7 @@ EOT;
 
 EOT;
         $successOutputDebugWithTags = <<<EOT
-  RUN  php -r "echo \"<info>42</info>\";"
+  RUN  php -r "echo '<info>42</info>';"
   OUT  <info>42</info>
   RES  Command ran successfully
 
@@ -92,7 +91,7 @@ EOT;
             array('', 'php -r "echo 42;"', StreamOutput::VERBOSITY_VERBOSE, null),
             array($successOutputVerbose, 'php -r "echo 42;"', StreamOutput::VERBOSITY_VERY_VERBOSE, null),
             array($successOutputDebug, 'php -r "echo 42;"', StreamOutput::VERBOSITY_DEBUG, null),
-            array($successOutputDebugWithTags, 'php -r "echo \"<info>42</info>\";"', StreamOutput::VERBOSITY_DEBUG, null),
+            array($successOutputDebugWithTags, 'php -r "echo \'<info>42</info>\';"', StreamOutput::VERBOSITY_DEBUG, null),
             array('', 'php -r "syntax error"', StreamOutput::VERBOSITY_VERBOSE, null),
             array($syntaxErrorOutputVerbose, 'php -r "fwrite(STDERR, \'error message\');usleep(50000);fwrite(STDOUT, \'out message\');exit(252);"', StreamOutput::VERBOSITY_VERY_VERBOSE, null),
             array($syntaxErrorOutputDebug, 'php -r "fwrite(STDERR, \'error message\');usleep(50000);fwrite(STDOUT, \'out message\');exit(252);"', StreamOutput::VERBOSITY_DEBUG, null),
diff --git a/core/vendor/symfony/console/Tests/Helper/ProgressBarTest.php b/core/vendor/symfony/console/Tests/Helper/ProgressBarTest.php
index 59c06bbee..97b99efe7 100644
--- a/core/vendor/symfony/console/Tests/Helper/ProgressBarTest.php
+++ b/core/vendor/symfony/console/Tests/Helper/ProgressBarTest.php
@@ -323,17 +323,17 @@ class ProgressBarTest extends \PHPUnit_Framework_TestCase
 
         rewind($output->getStream());
         $this->assertEquals(
-            "   0/200 [>---------------------------]   0%\n".
-            "  20/200 [==>-------------------------]  10%\n".
-            "  40/200 [=====>----------------------]  20%\n".
-            "  60/200 [========>-------------------]  30%\n".
-            "  80/200 [===========>----------------]  40%\n".
-            " 100/200 [==============>-------------]  50%\n".
-            " 120/200 [================>-----------]  60%\n".
-            " 140/200 [===================>--------]  70%\n".
-            " 160/200 [======================>-----]  80%\n".
-            " 180/200 [=========================>--]  90%\n".
-            " 200/200 [============================] 100%",
+            '   0/200 [>---------------------------]   0%'.PHP_EOL.
+            '  20/200 [==>-------------------------]  10%'.PHP_EOL.
+            '  40/200 [=====>----------------------]  20%'.PHP_EOL.
+            '  60/200 [========>-------------------]  30%'.PHP_EOL.
+            '  80/200 [===========>----------------]  40%'.PHP_EOL.
+            ' 100/200 [==============>-------------]  50%'.PHP_EOL.
+            ' 120/200 [================>-----------]  60%'.PHP_EOL.
+            ' 140/200 [===================>--------]  70%'.PHP_EOL.
+            ' 160/200 [======================>-----]  80%'.PHP_EOL.
+            ' 180/200 [=========================>--]  90%'.PHP_EOL.
+            ' 200/200 [============================] 100%',
             stream_get_contents($output->getStream())
         );
     }
@@ -349,9 +349,9 @@ class ProgressBarTest extends \PHPUnit_Framework_TestCase
 
         rewind($output->getStream());
         $this->assertEquals(
-            "  0/50 [>---------------------------]   0%\n".
-            " 25/50 [==============>-------------]  50%\n".
-            " 50/50 [============================] 100%",
+            '  0/50 [>---------------------------]   0%'.PHP_EOL.
+            ' 25/50 [==============>-------------]  50%'.PHP_EOL.
+            ' 50/50 [============================] 100%',
             stream_get_contents($output->getStream())
         );
     }
@@ -364,8 +364,8 @@ class ProgressBarTest extends \PHPUnit_Framework_TestCase
 
         rewind($output->getStream());
         $this->assertEquals(
-            "    0 [>---------------------------]\n".
-            "    1 [->--------------------------]",
+            '    0 [>---------------------------]'.PHP_EOL.
+            '    1 [->--------------------------]',
             stream_get_contents($output->getStream())
         );
     }
@@ -500,7 +500,7 @@ class ProgressBarTest extends \PHPUnit_Framework_TestCase
             $mem = 100000 * $i;
             $colors = $i++ ? '41;37' : '44;37';
 
-            return "\033[".$colors."m ".Helper::formatMemory($mem)." \033[0m";
+            return "\033[".$colors.'m '.Helper::formatMemory($mem)." \033[0m";
         });
         $bar->setFormat(" \033[44;37m %title:-37s% \033[0m\n %current%/%max% %bar% %percent:3s%%\n 🏁  %remaining:-10s% %memory:37s%");
         $bar->setBarCharacter($done = "\033[32m●\033[0m");
@@ -518,17 +518,17 @@ class ProgressBarTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(
             $this->generateOutput(
                 " \033[44;37m Starting the demo... fingers crossed  \033[0m\n".
-                "  0/15 ".$progress.str_repeat($empty, 26)."   0%\n".
+                '  0/15 '.$progress.str_repeat($empty, 26)."   0%\n".
                 " \xf0\x9f\x8f\x81  1 sec                          \033[44;37m 0 B \033[0m"
             ).
             $this->generateOutput(
                 " \033[44;37m Looks good to me...                   \033[0m\n".
-                "  4/15 ".str_repeat($done, 7).$progress.str_repeat($empty, 19)."  26%\n".
+                '  4/15 '.str_repeat($done, 7).$progress.str_repeat($empty, 19)."  26%\n".
                 " \xf0\x9f\x8f\x81  1 sec                       \033[41;37m 97 KiB \033[0m"
             ).
             $this->generateOutput(
                 " \033[44;37m Thanks, bye                           \033[0m\n".
-                " 15/15 ".str_repeat($done, 28)." 100%\n".
+                ' 15/15 '.str_repeat($done, 28)." 100%\n".
                 " \xf0\x9f\x8f\x81  1 sec                      \033[41;37m 195 KiB \033[0m"
             ),
             stream_get_contents($output->getStream())
@@ -570,7 +570,7 @@ class ProgressBarTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * Provides each defined format
+     * Provides each defined format.
      *
      * @return array
      */
diff --git a/core/vendor/symfony/console/Tests/Helper/TableTest.php b/core/vendor/symfony/console/Tests/Helper/TableTest.php
index 3db51f45b..2a66caa04 100644
--- a/core/vendor/symfony/console/Tests/Helper/TableTest.php
+++ b/core/vendor/symfony/console/Tests/Helper/TableTest.php
@@ -180,10 +180,10 @@ TABLE
             array(
                 array('ISBN', 'Title', 'Author'),
                 array(
-                    array("99921-58-10-7", "Divine\nComedy", "Dante Alighieri"),
-                    array("9971-5-0210-2", "Harry Potter\nand the Chamber of Secrets", "Rowling\nJoanne K."),
-                    array("9971-5-0210-2", "Harry Potter\nand the Chamber of Secrets", "Rowling\nJoanne K."),
-                    array("960-425-059-0", "The Lord of the Rings", "J. R. R.\nTolkien"),
+                    array('99921-58-10-7', "Divine\nComedy", 'Dante Alighieri'),
+                    array('9971-5-0210-2', "Harry Potter\nand the Chamber of Secrets", "Rowling\nJoanne K."),
+                    array('9971-5-0210-2', "Harry Potter\nand the Chamber of Secrets", "Rowling\nJoanne K."),
+                    array('960-425-059-0', 'The Lord of the Rings', "J. R. R.\nTolkien"),
                 ),
                 'default',
 <<<TABLE
@@ -550,6 +550,8 @@ TABLE;
 TABLE;
 
         $this->assertEquals($expected, $this->getOutputContent($output));
+
+        $this->assertEquals($table, $table->addRow(new TableSeparator()), 'fluent interface on addRow() with a single TableSeparator() works');
     }
 
     protected function getOutputStream()
diff --git a/core/vendor/symfony/console/Tests/Input/InputDefinitionTest.php b/core/vendor/symfony/console/Tests/Input/InputDefinitionTest.php
index 74d755f54..7e0a24258 100644
--- a/core/vendor/symfony/console/Tests/Input/InputDefinitionTest.php
+++ b/core/vendor/symfony/console/Tests/Input/InputDefinitionTest.php
@@ -376,7 +376,7 @@ class InputDefinitionTest extends \PHPUnit_Framework_TestCase
             array(new InputDefinition(array(new InputOption('foo'), new InputArgument('foo', InputArgument::REQUIRED))), '[--foo] [--] <foo>', 'puts [--] between options and arguments'),
         );
     }
-    
+
     public function testGetShortSynopsis()
     {
         $definition = new InputDefinition(array(new InputOption('foo'), new InputOption('bar'), new InputArgument('cat')));
@@ -388,8 +388,6 @@ class InputDefinitionTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacyAsText()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $definition = new InputDefinition(array(
             new InputArgument('foo', InputArgument::OPTIONAL, 'The foo argument'),
             new InputArgument('baz', InputArgument::OPTIONAL, 'The baz argument', true),
@@ -400,7 +398,7 @@ class InputDefinitionTest extends \PHPUnit_Framework_TestCase
             new InputOption('qux', '', InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY, 'The qux option', array('http://foo.com/', 'bar')),
             new InputOption('qux2', '', InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY, 'The qux2 option', array('foo' => 'bar')),
         ));
-        
+
         $this->assertStringEqualsFile(self::$fixtures.'/definition_astext.txt', $definition->asText(), '->asText() returns a textual representation of the InputDefinition');
     }
 
@@ -409,8 +407,6 @@ class InputDefinitionTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacyAsXml()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $definition = new InputDefinition(array(
             new InputArgument('foo', InputArgument::OPTIONAL, 'The foo argument'),
             new InputArgument('baz', InputArgument::OPTIONAL, 'The baz argument', true),
diff --git a/core/vendor/symfony/console/Tests/Input/StringInputTest.php b/core/vendor/symfony/console/Tests/Input/StringInputTest.php
index 575d527cb..ccf9289cf 100644
--- a/core/vendor/symfony/console/Tests/Input/StringInputTest.php
+++ b/core/vendor/symfony/console/Tests/Input/StringInputTest.php
@@ -46,8 +46,6 @@ class StringInputTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacyInputOptionDefinitionInConstructor()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $definition = new InputDefinition(
             array(new InputOption('foo', null, InputOption::VALUE_REQUIRED))
         );
diff --git a/core/vendor/symfony/console/Tests/Style/SymfonyStyleTest.php b/core/vendor/symfony/console/Tests/Style/SymfonyStyleTest.php
new file mode 100644
index 000000000..2df4f40e4
--- /dev/null
+++ b/core/vendor/symfony/console/Tests/Style/SymfonyStyleTest.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Symfony\Component\Console\Tests\Style;
+
+use PHPUnit_Framework_TestCase;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+use Symfony\Component\Console\Tester\CommandTester;
+
+class SymfonyStyleTest extends PHPUnit_Framework_TestCase
+{
+    /** @var Command */
+    protected $command;
+    /** @var CommandTester */
+    protected $tester;
+
+    protected function setUp()
+    {
+        $this->command = new Command('sfstyle');
+        $this->tester = new CommandTester($this->command);
+    }
+
+    protected function tearDown()
+    {
+        $this->command = null;
+        $this->tester = null;
+    }
+
+    /**
+     * @dataProvider inputCommandToOutputFilesProvider
+     */
+    public function testOutputs($inputCommandFilepath, $outputFilepath)
+    {
+        $code = require $inputCommandFilepath;
+        $this->command->setCode($code);
+        $this->tester->execute(array(), array('interactive' => false, 'decorated' => false));
+        $this->assertStringEqualsFile($outputFilepath, $this->tester->getDisplay(true));
+    }
+
+    public function inputCommandToOutputFilesProvider()
+    {
+        $baseDir = __DIR__.'/../Fixtures/Style/SymfonyStyle';
+
+        return array_map(null, glob($baseDir.'/command/command_*.php'), glob($baseDir.'/output/output_*.txt'));
+    }
+
+    public function testLongWordsBlockWrapping()
+    {
+        $word = 'Lopadotemachoselachogaleokranioleipsanodrimhypotrimmatosilphioparaomelitokatakechymenokichlepikossyphophattoperisteralektryonoptekephalliokigklopeleiolagoiosiraiobaphetraganopterygon';
+        $wordLength = strlen($word);
+        $maxLineLength = SymfonyStyle::MAX_LINE_LENGTH - 3;
+
+        $this->command->setCode(function (InputInterface $input, OutputInterface $output) use ($word) {
+            $sfStyle = new SymfonyStyle($input, $output);
+            $sfStyle->block($word, 'CUSTOM', 'fg=white;bg=blue', ' § ', false);
+        });
+
+        $this->tester->execute(array(), array('interactive' => false, 'decorated' => false));
+        $expectedCount = (int) ceil($wordLength / ($maxLineLength)) + (int) ($wordLength > $maxLineLength - 5);
+        $this->assertSame($expectedCount, substr_count($this->tester->getDisplay(true), ' § '));
+    }
+}
diff --git a/core/vendor/guzzlehttp/streams/.gitignore b/core/vendor/symfony/css-selector/.gitignore
similarity index 57%
rename from core/vendor/guzzlehttp/streams/.gitignore
rename to core/vendor/symfony/css-selector/.gitignore
index c33d3965f..c49a5d8df 100644
--- a/core/vendor/guzzlehttp/streams/.gitignore
+++ b/core/vendor/symfony/css-selector/.gitignore
@@ -1,6 +1,3 @@
-.idea
-.DS_STORE
-coverage
-phpunit.xml
-composer.lock
 vendor/
+composer.lock
+phpunit.xml
diff --git a/core/vendor/symfony/debug/DebugClassLoader.php b/core/vendor/symfony/debug/DebugClassLoader.php
index f26e12e66..a2532d303 100644
--- a/core/vendor/symfony/debug/DebugClassLoader.php
+++ b/core/vendor/symfony/debug/DebugClassLoader.php
@@ -45,7 +45,7 @@ class DebugClassLoader
         $this->wasFinder = is_object($classLoader) && method_exists($classLoader, 'findFile');
 
         if ($this->wasFinder) {
-            trigger_error('The '.__METHOD__.' method will no longer support receiving an object into its $classLoader argument in 3.0.', E_USER_DEPRECATED);
+            @trigger_error('The '.__METHOD__.' method will no longer support receiving an object into its $classLoader argument in 3.0.', E_USER_DEPRECATED);
             $this->classLoader = array($classLoader, 'loadClass');
             $this->isFinder = true;
         } else {
@@ -127,7 +127,7 @@ class DebugClassLoader
      */
     public function findFile($class)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
 
         if ($this->wasFinder) {
             return $this->classLoader[0]->findFile($class);
@@ -179,7 +179,7 @@ class DebugClassLoader
             }
 
             if (in_array(strtolower($refl->getShortName()), self::$php7Reserved)) {
-                trigger_error(sprintf('%s uses a reserved class name (%s) that will break on PHP 7 and higher', $name, $refl->getShortName()), E_USER_DEPRECATED);
+                @trigger_error(sprintf('%s uses a reserved class name (%s) that will break on PHP 7 and higher', $name, $refl->getShortName()), E_USER_DEPRECATED);
             } elseif (preg_match('#\n \* @deprecated (.*?)\r?\n \*(?: @|/$)#s', $refl->getDocComment(), $notice)) {
                 self::$deprecated[$name] = preg_replace('#\s*\r?\n \* +#', ' ', $notice[1]);
             } else {
@@ -200,12 +200,12 @@ class DebugClassLoader
 
                 if (!$parent || strncmp($ns, $parent->name, $len)) {
                     if ($parent && isset(self::$deprecated[$parent->name]) && strncmp($ns, $parent->name, $len)) {
-                        trigger_error(sprintf('The %s class extends %s that is deprecated %s', $name, $parent->name, self::$deprecated[$parent->name]), E_USER_DEPRECATED);
+                        @trigger_error(sprintf('The %s class extends %s that is deprecated %s', $name, $parent->name, self::$deprecated[$parent->name]), E_USER_DEPRECATED);
                     }
 
                     foreach ($refl->getInterfaceNames() as $interface) {
                         if (isset(self::$deprecated[$interface]) && strncmp($ns, $interface, $len) && !($parent && $parent->implementsInterface($interface))) {
-                            trigger_error(sprintf('The %s %s %s that is deprecated %s', $name, $refl->isInterface() ? 'interface extends' : 'class implements', $interface, self::$deprecated[$interface]), E_USER_DEPRECATED);
+                            @trigger_error(sprintf('The %s %s %s that is deprecated %s', $name, $refl->isInterface() ? 'interface extends' : 'class implements', $interface, self::$deprecated[$interface]), E_USER_DEPRECATED);
                         }
                     }
                 }
@@ -222,7 +222,7 @@ class DebugClassLoader
             }
             if (self::$caseCheck && preg_match('#([/\\\\][a-zA-Z_\x7F-\xFF][a-zA-Z0-9_\x7F-\xFF]*)+\.(php|hh)$#D', $file, $tail)) {
                 $tail = $tail[0];
-                $real = $refl->getFilename();
+                $real = $refl->getFileName();
 
                 if (2 === self::$caseCheck) {
                     // realpath() on MacOSX doesn't normalize the case of characters
diff --git a/core/vendor/symfony/debug/ErrorHandler.php b/core/vendor/symfony/debug/ErrorHandler.php
index 116ff4b5f..2d8a9167b 100644
--- a/core/vendor/symfony/debug/ErrorHandler.php
+++ b/core/vendor/symfony/debug/ErrorHandler.php
@@ -14,8 +14,8 @@ namespace Symfony\Component\Debug;
 use Psr\Log\LogLevel;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Debug\Exception\ContextErrorException;
-use Symfony\Component\Debug\Exception\FatalBaseException;
 use Symfony\Component\Debug\Exception\FatalErrorException;
+use Symfony\Component\Debug\Exception\FatalThrowableError;
 use Symfony\Component\Debug\Exception\OutOfMemoryException;
 use Symfony\Component\Debug\FatalErrorHandler\UndefinedFunctionFatalErrorHandler;
 use Symfony\Component\Debug\FatalErrorHandler\UndefinedMethodFatalErrorHandler;
@@ -350,7 +350,7 @@ class ErrorHandler
      *
      * @internal
      */
-    public function handleError($type, $message, $file, $line, array $context)
+    public function handleError($type, $message, $file, $line, array $context, array $backtrace = null)
     {
         $level = error_reporting() | E_RECOVERABLE_ERROR | E_USER_ERROR;
         $log = $this->loggedErrors & $type;
@@ -367,6 +367,15 @@ class ErrorHandler
             $context = $e;
         }
 
+        if (null !== $backtrace && $type & E_ERROR) {
+            // E_ERROR fatal errors are triggered on HHVM when
+            // hhvm.error_handling.call_user_handler_on_fatals=1
+            // which is the way to get their backtrace.
+            $this->handleFatalError(compact('type', 'message', 'file', 'line', 'backtrace'));
+
+            return true;
+        }
+
         if ($throw) {
             if (($this->scopedErrors & $type) && class_exists('Symfony\Component\Debug\Exception\ContextErrorException')) {
                 // Checking for class existence is a work around for https://bugs.php.net/42098
@@ -402,17 +411,24 @@ class ErrorHandler
             if ($this->scopedErrors & $type) {
                 $e['scope_vars'] = $context;
                 if ($trace) {
-                    $e['stack'] = debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT);
+                    $e['stack'] = $backtrace ?: debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT);
                 }
             } elseif ($trace) {
-                $e['stack'] = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+                if (null === $backtrace) {
+                    $e['stack'] = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+                } else {
+                    foreach ($backtrace as &$frame) {
+                        unset($frame['args'], $frame);
+                    }
+                    $e['stack'] = $backtrace;
+                }
             }
         }
 
         if ($this->isRecursive) {
             $log = 0;
         } elseif (self::$stackedErrorLevels) {
-            self::$stackedErrors[] = array($this->loggers[$type], $message, $e);
+            self::$stackedErrors[] = array($this->loggers[$type][0], ($type & $level) ? $this->loggers[$type][1] : LogLevel::DEBUG, $message, $e);
         } else {
             try {
                 $this->isRecursive = true;
@@ -431,15 +447,15 @@ class ErrorHandler
     /**
      * Handles an exception by logging then forwarding it to an other handler.
      *
-     * @param \Exception|\BaseException $exception An exception to handle
-     * @param array                     $error     An array as returned by error_get_last()
+     * @param \Exception|\Throwable $exception An exception to handle
+     * @param array                 $error     An array as returned by error_get_last()
      *
      * @internal
      */
     public function handleException($exception, array $error = null)
     {
         if (!$exception instanceof \Exception) {
-            $exception = new FatalBaseException($exception);
+            $exception = new FatalThrowableError($exception);
         }
         $type = $exception instanceof FatalErrorException ? $exception->getSeverity() : E_ERROR;
 
@@ -451,15 +467,17 @@ class ErrorHandler
                 'level' => error_reporting(),
                 'stack' => $exception->getTrace(),
             );
-            if ($exception instanceof FatalBaseException) {
-                $error = array(
-                    'type' => $type,
-                    'message' => $message = $exception->getMessage(),
-                    'file' => $e['file'],
-                    'line' => $e['line'],
-                );
-            } elseif ($exception instanceof FatalErrorException) {
-                $message = 'Fatal '.$exception->getMessage();
+            if ($exception instanceof FatalErrorException) {
+                if ($exception instanceof FatalThrowableError) {
+                    $error = array(
+                        'type' => $type,
+                        'message' => $message = $exception->getMessage(),
+                        'file' => $e['file'],
+                        'line' => $e['line'],
+                    );
+                } else {
+                    $message = 'Fatal '.$exception->getMessage();
+                }
             } elseif ($exception instanceof \ErrorException) {
                 $message = 'Uncaught '.$exception->getMessage();
                 if ($exception instanceof ContextErrorException) {
@@ -486,9 +504,9 @@ class ErrorHandler
         try {
             call_user_func($this->exceptionHandler, $exception);
         } catch (\Exception $handlerException) {
-            $this->exceptionHandler = null;
-            $this->handleException($handlerException);
-        } catch (\BaseException $handlerException) {
+        } catch (\Throwable $handlerException) {
+        }
+        if (isset($handlerException)) {
             $this->exceptionHandler = null;
             $this->handleException($handlerException);
         }
@@ -503,7 +521,11 @@ class ErrorHandler
      */
     public static function handleFatalError(array $error = null)
     {
-        self::$reservedMemory = '';
+        if (null === self::$reservedMemory) {
+            return;
+        }
+
+        self::$reservedMemory = null;
 
         $handler = set_error_handler('var_dump', 0);
         $handler = is_array($handler) ? $handler[0] : null;
@@ -525,14 +547,15 @@ class ErrorHandler
             // Handled below
         }
 
-        if ($error && ($error['type'] & (E_PARSE | E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR))) {
+        if ($error && $error['type'] &= E_PARSE | E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR) {
             // Let's not throw anymore but keep logging
             $handler->throwAt(0, true);
+            $trace = isset($error['backtrace']) ? $error['backtrace'] : null;
 
             if (0 === strpos($error['message'], 'Allowed memory') || 0 === strpos($error['message'], 'Out of memory')) {
-                $exception = new OutOfMemoryException($handler->levels[$error['type']].': '.$error['message'], 0, $error['type'], $error['file'], $error['line'], 2, false);
+                $exception = new OutOfMemoryException($handler->levels[$error['type']].': '.$error['message'], 0, $error['type'], $error['file'], $error['line'], 2, false, $trace);
             } else {
-                $exception = new FatalErrorException($handler->levels[$error['type']].': '.$error['message'], 0, $error['type'], $error['file'], $error['line'], 2, true);
+                $exception = new FatalErrorException($handler->levels[$error['type']].': '.$error['message'], 0, $error['type'], $error['file'], $error['line'], 2, true, $trace);
             }
         } elseif (!isset($exception)) {
             return;
@@ -581,7 +604,7 @@ class ErrorHandler
             self::$stackedErrors = array();
 
             foreach ($errors as $e) {
-                $e[0][0]->log($e[0][1], $e[1], $e[2]);
+                $e[0]->log($e[1], $e[2], $e[3]);
             }
         }
     }
@@ -611,7 +634,7 @@ class ErrorHandler
      */
     public function setLevel($level)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the throwAt() method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the throwAt() method instead.', E_USER_DEPRECATED);
 
         $level = null === $level ? error_reporting() : $level;
         $this->throwAt($level, true);
@@ -626,7 +649,7 @@ class ErrorHandler
      */
     public function setDisplayErrors($displayErrors)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the throwAt() method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the throwAt() method instead.', E_USER_DEPRECATED);
 
         if ($displayErrors) {
             $this->throwAt($this->displayErrors, true);
@@ -647,7 +670,7 @@ class ErrorHandler
      */
     public static function setLogger(LoggerInterface $logger, $channel = 'deprecation')
     {
-        trigger_error('The '.__METHOD__.' static method is deprecated since version 2.6 and will be removed in 3.0. Use the setLoggers() or setDefaultLogger() methods instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' static method is deprecated since version 2.6 and will be removed in 3.0. Use the setLoggers() or setDefaultLogger() methods instead.', E_USER_DEPRECATED);
 
         $handler = set_error_handler('var_dump', 0);
         $handler = is_array($handler) ? $handler[0] : null;
@@ -684,7 +707,7 @@ class ErrorHandler
      */
     public function handleFatal()
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the handleFatalError() method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the handleFatalError() method instead.', E_USER_DEPRECATED);
 
         static::handleFatalError();
     }
diff --git a/core/vendor/symfony/debug/Exception/DummyException.php b/core/vendor/symfony/debug/Exception/DummyException.php
index 378cbcc10..c836f876d 100644
--- a/core/vendor/symfony/debug/Exception/DummyException.php
+++ b/core/vendor/symfony/debug/Exception/DummyException.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Debug\Exception;
 
-trigger_error('The '.__NAMESPACE__.'\DummyException class is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\DummyException class is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
 
 /**
  * @author Fabien Potencier <fabien@symfony.com>
diff --git a/core/vendor/symfony/debug/Exception/FatalErrorException.php b/core/vendor/symfony/debug/Exception/FatalErrorException.php
index 41bb97c6a..db2fb43bb 100644
--- a/core/vendor/symfony/debug/Exception/FatalErrorException.php
+++ b/core/vendor/symfony/debug/Exception/FatalErrorException.php
@@ -35,11 +35,19 @@ use Symfony\Component\HttpKernel\Exception\FatalErrorException as LegacyFatalErr
  */
 class FatalErrorException extends LegacyFatalErrorException
 {
-    public function __construct($message, $code, $severity, $filename, $lineno, $traceOffset = null, $traceArgs = true)
+    public function __construct($message, $code, $severity, $filename, $lineno, $traceOffset = null, $traceArgs = true, array $trace = null)
     {
         parent::__construct($message, $code, $severity, $filename, $lineno);
 
-        if (null !== $traceOffset) {
+        if (null !== $trace) {
+            if (!$traceArgs) {
+                foreach ($trace as &$frame) {
+                    unset($frame['args'], $frame['this'], $frame);
+                }
+            }
+
+            $this->setTrace($trace);
+        } elseif (null !== $traceOffset) {
             if (function_exists('xdebug_get_function_stack')) {
                 $trace = xdebug_get_function_stack();
                 if (0 < $traceOffset) {
@@ -48,7 +56,7 @@ class FatalErrorException extends LegacyFatalErrorException
 
                 foreach ($trace as &$frame) {
                     if (!isset($frame['type'])) {
-                        //  XDebug pre 2.1.1 doesn't currently set the call type key http://bugs.xdebug.org/view.php?id=695
+                        // XDebug pre 2.1.1 doesn't currently set the call type key http://bugs.xdebug.org/view.php?id=695
                         if (isset($frame['class'])) {
                             $frame['type'] = '::';
                         }
diff --git a/core/vendor/symfony/debug/Exception/FatalBaseException.php b/core/vendor/symfony/debug/Exception/FatalThrowableError.php
similarity index 79%
rename from core/vendor/symfony/debug/Exception/FatalBaseException.php
rename to core/vendor/symfony/debug/Exception/FatalThrowableError.php
index 769d30ccb..6ff5ecdaf 100644
--- a/core/vendor/symfony/debug/Exception/FatalBaseException.php
+++ b/core/vendor/symfony/debug/Exception/FatalThrowableError.php
@@ -12,18 +12,18 @@
 namespace Symfony\Component\Debug\Exception;
 
 /**
- * Base Fatal Error Exception.
+ * Fatal Throwable Error.
  *
  * @author Nicolas Grekas <p@tchwork.com>
  */
-class FatalBaseException extends FatalErrorException
+class FatalThrowableError extends FatalErrorException
 {
-    public function __construct(\BaseException $e)
+    public function __construct(\Throwable $e)
     {
-        if ($e instanceof \ParseException) {
+        if ($e instanceof \ParseError) {
             $message = 'Parse error: '.$e->getMessage();
             $severity = E_PARSE;
-        } elseif ($e instanceof \TypeException) {
+        } elseif ($e instanceof \TypeError) {
             $message = 'Type error: '.$e->getMessage();
             $severity = E_RECOVERABLE_ERROR;
         } else {
diff --git a/core/vendor/symfony/debug/ExceptionHandler.php b/core/vendor/symfony/debug/ExceptionHandler.php
index 02546b403..c883f1546 100644
--- a/core/vendor/symfony/debug/ExceptionHandler.php
+++ b/core/vendor/symfony/debug/ExceptionHandler.php
@@ -428,7 +428,7 @@ EOF;
      */
     protected static function utf8Htmlize($str)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);
 
         return htmlspecialchars($str, ENT_QUOTES | (PHP_VERSION_ID >= 50400 ? ENT_SUBSTITUTE : 0), 'UTF-8');
     }
diff --git a/core/vendor/symfony/debug/Tests/DebugClassLoaderTest.php b/core/vendor/symfony/debug/Tests/DebugClassLoaderTest.php
index 46953290d..a368a7d25 100644
--- a/core/vendor/symfony/debug/Tests/DebugClassLoaderTest.php
+++ b/core/vendor/symfony/debug/Tests/DebugClassLoaderTest.php
@@ -64,6 +64,9 @@ class DebugClassLoaderTest extends \PHPUnit_Framework_TestCase
         if (PHP_VERSION_ID >= 70000) {
             $this->markTestSkipped('PHP7 throws exceptions, unsilencing is not required anymore.');
         }
+        if (defined('HHVM_VERSION')) {
+            $this->markTestSkipped('HHVM is not handled in this test case.');
+        }
 
         ob_start();
 
@@ -86,6 +89,9 @@ class DebugClassLoaderTest extends \PHPUnit_Framework_TestCase
         if (class_exists('Symfony\Component\Debug\Exception\ContextErrorException', false)) {
             $this->markTestSkipped('The ContextErrorException class is already loaded.');
         }
+        if (defined('HHVM_VERSION')) {
+            $this->markTestSkipped('HHVM is not handled in this test case.');
+        }
 
         ErrorHandler::register();
 
@@ -106,10 +112,10 @@ class DebugClassLoaderTest extends \PHPUnit_Framework_TestCase
             restore_exception_handler();
             $this->assertStringStartsWith(__FILE__, $exception->getFile());
             if (PHP_VERSION_ID < 70000) {
-                $this->assertRegexp('/^Runtime Notice: Declaration/', $exception->getMessage());
+                $this->assertRegExp('/^Runtime Notice: Declaration/', $exception->getMessage());
                 $this->assertEquals(E_STRICT, $exception->getSeverity());
             } else {
-                $this->assertRegexp('/^Warning: Declaration/', $exception->getMessage());
+                $this->assertRegExp('/^Warning: Declaration/', $exception->getMessage());
                 $this->assertEquals(E_WARNING, $exception->getSeverity());
             }
         } catch (\Exception $exception) {
@@ -130,6 +136,7 @@ class DebugClassLoaderTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @expectedException \RuntimeException
+     * @expectedExceptionMessage Case mismatch between class and source file names
      */
     public function testFileCaseMismatch()
     {
@@ -258,6 +265,8 @@ class ClassLoader
 
     public function findFile($class)
     {
+        $fixtureDir = __DIR__.DIRECTORY_SEPARATOR.'Fixtures'.DIRECTORY_SEPARATOR;
+
         if (__NAMESPACE__.'\TestingUnsilencing' === $class) {
             eval('-- parse error --');
         } elseif (__NAMESPACE__.'\TestingStacking' === $class) {
@@ -265,15 +274,15 @@ class ClassLoader
         } elseif (__NAMESPACE__.'\TestingCaseMismatch' === $class) {
             eval('namespace '.__NAMESPACE__.'; class TestingCaseMisMatch {}');
         } elseif (__NAMESPACE__.'\Fixtures\CaseMismatch' === $class) {
-            return __DIR__.'/Fixtures/CaseMismatch.php';
+            return $fixtureDir.'CaseMismatch.php';
         } elseif (__NAMESPACE__.'\Fixtures\Psr4CaseMismatch' === $class) {
-            return __DIR__.'/Fixtures/psr4/Psr4CaseMismatch.php';
+            return $fixtureDir.'psr4'.DIRECTORY_SEPARATOR.'Psr4CaseMismatch.php';
         } elseif (__NAMESPACE__.'\Fixtures\NotPSR0' === $class) {
-            return __DIR__.'/Fixtures/reallyNotPsr0.php';
+            return $fixtureDir.'reallyNotPsr0.php';
         } elseif (__NAMESPACE__.'\Fixtures\NotPSR0bis' === $class) {
-            return __DIR__.'/Fixtures/notPsr0Bis.php';
+            return $fixtureDir.'notPsr0Bis.php';
         } elseif (__NAMESPACE__.'\Fixtures\DeprecatedInterface' === $class) {
-            return __DIR__.'/Fixtures/DeprecatedInterface.php';
+            return $fixtureDir.'DeprecatedInterface.php';
         } elseif ('Symfony\Bridge\Debug\Tests\Fixtures\ExtendsDeprecatedParent' === $class) {
             eval('namespace Symfony\Bridge\Debug\Tests\Fixtures; class ExtendsDeprecatedParent extends \\'.__NAMESPACE__.'\Fixtures\DeprecatedClass {}');
         } elseif ('Test\\'.__NAMESPACE__.'\DeprecatedParentClass' === $class) {
diff --git a/core/vendor/symfony/debug/Tests/ErrorHandlerTest.php b/core/vendor/symfony/debug/Tests/ErrorHandlerTest.php
index 8b2d0bce2..5d521a143 100644
--- a/core/vendor/symfony/debug/Tests/ErrorHandlerTest.php
+++ b/core/vendor/symfony/debug/Tests/ErrorHandlerTest.php
@@ -77,7 +77,7 @@ class ErrorHandlerTest extends \PHPUnit_Framework_TestCase
 
             $this->assertEquals(E_NOTICE, $exception->getSeverity());
             $this->assertEquals(__FILE__, $exception->getFile());
-            $this->assertRegexp('/^Notice: Undefined variable: (foo|bar)/', $exception->getMessage());
+            $this->assertRegExp('/^Notice: Undefined variable: (foo|bar)/', $exception->getMessage());
             $this->assertArrayHasKey('foobar', $exception->getContext());
 
             $trace = $exception->getTrace();
@@ -169,8 +169,6 @@ class ErrorHandlerTest extends \PHPUnit_Framework_TestCase
 
     public function testHandleError()
     {
-        $this->iniSet('error_reporting', -1);
-
         try {
             $handler = ErrorHandler::register();
             $handler->throwAt(0, true);
@@ -318,6 +316,40 @@ class ErrorHandlerTest extends \PHPUnit_Framework_TestCase
         }
     }
 
+    public function testErrorStacking()
+    {
+        try {
+            $handler = ErrorHandler::register();
+            $handler->screamAt(E_USER_WARNING);
+
+            $logger = $this->getMock('Psr\Log\LoggerInterface');
+
+            $logger
+                ->expects($this->exactly(2))
+                ->method('log')
+                ->withConsecutive(
+                    array($this->equalTo(LogLevel::WARNING), $this->equalTo('Dummy log')),
+                    array($this->equalTo(LogLevel::DEBUG), $this->equalTo('Silenced warning'))
+                )
+            ;
+
+            $handler->setDefaultLogger($logger, array(E_USER_WARNING => LogLevel::WARNING));
+
+            ErrorHandler::stackErrors();
+            @trigger_error('Silenced warning', E_USER_WARNING);
+            $logger->log(LogLevel::WARNING, 'Dummy log');
+            ErrorHandler::unstackErrors();
+
+            restore_error_handler();
+            restore_exception_handler();
+        } catch (\Exception $e) {
+            restore_error_handler();
+            restore_exception_handler();
+
+            throw $e;
+        }
+    }
+
     public function testHandleFatalError()
     {
         try {
@@ -359,13 +391,57 @@ class ErrorHandlerTest extends \PHPUnit_Framework_TestCase
         }
     }
 
+    public function testHandleFatalErrorOnHHVM()
+    {
+        try {
+            $handler = ErrorHandler::register();
+
+            $logger = $this->getMock('Psr\Log\LoggerInterface');
+            $logger
+                ->expects($this->once())
+                ->method('log')
+                ->with(
+                    $this->equalTo(LogLevel::CRITICAL),
+                    $this->equalTo('Fatal Error: foo'),
+                    $this->equalTo(array(
+                        'type' => 1,
+                        'file' => 'bar',
+                        'line' => 123,
+                        'level' => -1,
+                        'stack' => array(456),
+                    ))
+                )
+            ;
+
+            $handler->setDefaultLogger($logger, E_ERROR);
+
+            $error = array(
+                'type' => E_ERROR + 0x1000000, // This error level is used by HHVM for fatal errors
+                'message' => 'foo',
+                'file' => 'bar',
+                'line' => 123,
+                'context' => array(123),
+                'backtrace' => array(456),
+            );
+
+            call_user_func_array(array($handler, 'handleError'), $error);
+            $handler->handleFatalError($error);
+
+            restore_error_handler();
+            restore_exception_handler();
+        } catch (\Exception $e) {
+            restore_error_handler();
+            restore_exception_handler();
+
+            throw $e;
+        }
+    }
+
     /**
      * @group legacy
      */
     public function testLegacyInterface()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         try {
             $handler = ErrorHandler::register(0);
             $this->assertFalse($handler->handle(0, 'foo', 'foo.php', 12, array()));
diff --git a/core/vendor/symfony/debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php b/core/vendor/symfony/debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php
index 6ac3374d8..c93983721 100644
--- a/core/vendor/symfony/debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php
+++ b/core/vendor/symfony/debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php
@@ -61,7 +61,7 @@ class ClassNotFoundFatalErrorHandlerTest extends \PHPUnit_Framework_TestCase
             array_map('spl_autoload_register', $autoloaders);
         }
 
-        $this->assertInstanceof('Symfony\Component\Debug\Exception\ClassNotFoundException', $exception);
+        $this->assertInstanceOf('Symfony\Component\Debug\Exception\ClassNotFoundException', $exception);
         $this->assertSame($translatedMessage, $exception->getMessage());
         $this->assertSame($error['type'], $exception->getSeverity());
         $this->assertSame($error['file'], $exception->getFile());
@@ -73,8 +73,6 @@ class ClassNotFoundFatalErrorHandlerTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacyHandleClassNotFound()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $prefixes = array('Symfony\Component\Debug\Exception\\' => realpath(__DIR__.'/../../Exception'));
         $symfonyUniversalClassLoader = new SymfonyUniversalClassLoader();
         $symfonyUniversalClassLoader->registerPrefixes($prefixes);
@@ -197,6 +195,6 @@ class ClassNotFoundFatalErrorHandlerTest extends \PHPUnit_Framework_TestCase
         $handler = new ClassNotFoundFatalErrorHandler();
         $exception = $handler->handleError($error, new FatalErrorException('', 0, $error['type'], $error['file'], $error['line']));
 
-        $this->assertInstanceof('Symfony\Component\Debug\Exception\ClassNotFoundException', $exception);
+        $this->assertInstanceOf('Symfony\Component\Debug\Exception\ClassNotFoundException', $exception);
     }
 }
diff --git a/core/vendor/symfony/debug/Tests/FatalErrorHandler/UndefinedFunctionFatalErrorHandlerTest.php b/core/vendor/symfony/debug/Tests/FatalErrorHandler/UndefinedFunctionFatalErrorHandlerTest.php
index ffe9edb06..795b74781 100644
--- a/core/vendor/symfony/debug/Tests/FatalErrorHandler/UndefinedFunctionFatalErrorHandlerTest.php
+++ b/core/vendor/symfony/debug/Tests/FatalErrorHandler/UndefinedFunctionFatalErrorHandlerTest.php
@@ -24,7 +24,7 @@ class UndefinedFunctionFatalErrorHandlerTest extends \PHPUnit_Framework_TestCase
         $handler = new UndefinedFunctionFatalErrorHandler();
         $exception = $handler->handleError($error, new FatalErrorException('', 0, $error['type'], $error['file'], $error['line']));
 
-        $this->assertInstanceof('Symfony\Component\Debug\Exception\UndefinedFunctionException', $exception);
+        $this->assertInstanceOf('Symfony\Component\Debug\Exception\UndefinedFunctionException', $exception);
         // class names are case insensitive and PHP/HHVM do not return the same
         $this->assertSame(strtolower($translatedMessage), strtolower($exception->getMessage()));
         $this->assertSame($error['type'], $exception->getSeverity());
diff --git a/core/vendor/symfony/debug/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php b/core/vendor/symfony/debug/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php
index 5d1ff2380..de7b21c69 100644
--- a/core/vendor/symfony/debug/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php
+++ b/core/vendor/symfony/debug/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php
@@ -24,7 +24,7 @@ class UndefinedMethodFatalErrorHandlerTest extends \PHPUnit_Framework_TestCase
         $handler = new UndefinedMethodFatalErrorHandler();
         $exception = $handler->handleError($error, new FatalErrorException('', 0, $error['type'], $error['file'], $error['line']));
 
-        $this->assertInstanceof('Symfony\Component\Debug\Exception\UndefinedMethodException', $exception);
+        $this->assertInstanceOf('Symfony\Component\Debug\Exception\UndefinedMethodException', $exception);
         $this->assertSame($translatedMessage, $exception->getMessage());
         $this->assertSame($error['type'], $exception->getSeverity());
         $this->assertSame($error['file'], $exception->getFile());
diff --git a/core/vendor/symfony/dependency-injection/.gitignore b/core/vendor/symfony/dependency-injection/.gitignore
new file mode 100644
index 000000000..c49a5d8df
--- /dev/null
+++ b/core/vendor/symfony/dependency-injection/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/core/vendor/symfony/dependency-injection/Compiler/ResolveDefinitionTemplatesPass.php b/core/vendor/symfony/dependency-injection/Compiler/ResolveDefinitionTemplatesPass.php
index 0efc6b500..3fc6a1102 100644
--- a/core/vendor/symfony/dependency-injection/Compiler/ResolveDefinitionTemplatesPass.php
+++ b/core/vendor/symfony/dependency-injection/Compiler/ResolveDefinitionTemplatesPass.php
@@ -125,6 +125,14 @@ class ResolveDefinitionTemplatesPass implements CompilerPassInterface
         if (isset($changes['lazy'])) {
             $def->setLazy($definition->isLazy());
         }
+        if (isset($changes['decorated_service'])) {
+            $decoratedService = $definition->getDecoratedService();
+            if (null === $decoratedService) {
+                $def->setDecoratedService($decoratedService);
+            } else {
+                $def->setDecoratedService($decoratedService[0], $decoratedService[1]);
+            }
+        }
 
         // merge arguments
         foreach ($definition->getArguments() as $k => $v) {
diff --git a/core/vendor/symfony/dependency-injection/Compiler/ResolveInvalidReferencesPass.php b/core/vendor/symfony/dependency-injection/Compiler/ResolveInvalidReferencesPass.php
index 000bf0870..85dbceb9a 100644
--- a/core/vendor/symfony/dependency-injection/Compiler/ResolveInvalidReferencesPass.php
+++ b/core/vendor/symfony/dependency-injection/Compiler/ResolveInvalidReferencesPass.php
@@ -47,7 +47,7 @@ class ResolveInvalidReferencesPass implements CompilerPassInterface
             foreach ($definition->getMethodCalls() as $call) {
                 try {
                     $calls[] = array($call[0], $this->processArguments($call[1], true));
-                } catch (RuntimeException $ignore) {
+                } catch (RuntimeException $e) {
                     // this call is simply removed
                 }
             }
@@ -58,7 +58,7 @@ class ResolveInvalidReferencesPass implements CompilerPassInterface
                 try {
                     $value = $this->processArguments(array($value), true);
                     $properties[$name] = reset($value);
-                } catch (RuntimeException $ignore) {
+                } catch (RuntimeException $e) {
                     // ignore property
                 }
             }
diff --git a/core/vendor/symfony/dependency-injection/Compiler/ResolveParameterPlaceHoldersPass.php b/core/vendor/symfony/dependency-injection/Compiler/ResolveParameterPlaceHoldersPass.php
index 0a789676c..a35f84cbe 100644
--- a/core/vendor/symfony/dependency-injection/Compiler/ResolveParameterPlaceHoldersPass.php
+++ b/core/vendor/symfony/dependency-injection/Compiler/ResolveParameterPlaceHoldersPass.php
@@ -38,7 +38,7 @@ class ResolveParameterPlaceHoldersPass implements CompilerPassInterface
                 $definition->setFile($parameterBag->resolveValue($definition->getFile()));
                 $definition->setArguments($parameterBag->resolveValue($definition->getArguments()));
                 if ($definition->getFactoryClass(false)) {
-                    $definition->setFactoryClass($parameterBag->resolveValue($definition->getFactoryClass()));
+                    $definition->setFactoryClass($parameterBag->resolveValue($definition->getFactoryClass(false)));
                 }
 
                 $factory = $definition->getFactory();
diff --git a/core/vendor/symfony/dependency-injection/ContainerBuilder.php b/core/vendor/symfony/dependency-injection/ContainerBuilder.php
index b7104a06e..e697814bb 100644
--- a/core/vendor/symfony/dependency-injection/ContainerBuilder.php
+++ b/core/vendor/symfony/dependency-injection/ContainerBuilder.php
@@ -982,7 +982,13 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
 
         if ($callable = $definition->getConfigurator()) {
             if (is_array($callable)) {
-                $callable[0] = $callable[0] instanceof Reference ? $this->get((string) $callable[0]) : $parameterBag->resolveValue($callable[0]);
+                $callable[0] = $parameterBag->resolveValue($callable[0]);
+
+                if ($callable[0] instanceof Reference) {
+                    $callable[0] = $this->get((string) $callable[0], $callable[0]->getInvalidBehavior());
+                } elseif ($callable[0] instanceof Definition) {
+                    $callable[0] = $this->createService($callable[0], null);
+                }
             }
 
             if (!is_callable($callable)) {
@@ -1127,7 +1133,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
     private function synchronize($id)
     {
         if ('request' !== $id) {
-            trigger_error('The '.__METHOD__.' method is deprecated in version 2.7 and will be removed in version 3.0.', E_USER_DEPRECATED);
+            @trigger_error('The '.__METHOD__.' method is deprecated in version 2.7 and will be removed in version 3.0.', E_USER_DEPRECATED);
         }
 
         foreach ($this->definitions as $definitionId => $definition) {
diff --git a/core/vendor/symfony/dependency-injection/Definition.php b/core/vendor/symfony/dependency-injection/Definition.php
index 9d02be4f6..71447fab1 100644
--- a/core/vendor/symfony/dependency-injection/Definition.php
+++ b/core/vendor/symfony/dependency-injection/Definition.php
@@ -98,7 +98,7 @@ class Definition
      */
     public function setFactoryClass($factoryClass)
     {
-        trigger_error(sprintf('%s(%s) is deprecated since version 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', __METHOD__, $factoryClass), E_USER_DEPRECATED);
+        @trigger_error(sprintf('%s(%s) is deprecated since version 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', __METHOD__, $factoryClass), E_USER_DEPRECATED);
 
         $this->factoryClass = $factoryClass;
 
@@ -116,7 +116,7 @@ class Definition
     public function getFactoryClass($triggerDeprecationError = true)
     {
         if ($triggerDeprecationError) {
-            trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);
+            @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);
         }
 
         return $this->factoryClass;
@@ -134,7 +134,7 @@ class Definition
      */
     public function setFactoryMethod($factoryMethod)
     {
-        trigger_error(sprintf('%s(%s) is deprecated since version 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', __METHOD__, $factoryMethod), E_USER_DEPRECATED);
+        @trigger_error(sprintf('%s(%s) is deprecated since version 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', __METHOD__, $factoryMethod), E_USER_DEPRECATED);
 
         $this->factoryMethod = $factoryMethod;
 
@@ -187,7 +187,7 @@ class Definition
     public function getFactoryMethod($triggerDeprecationError = true)
     {
         if ($triggerDeprecationError) {
-            trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);
+            @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);
         }
 
         return $this->factoryMethod;
@@ -205,7 +205,7 @@ class Definition
      */
     public function setFactoryService($factoryService)
     {
-        trigger_error(sprintf('%s(%s) is deprecated since version 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', __METHOD__, $factoryService), E_USER_DEPRECATED);
+        @trigger_error(sprintf('%s(%s) is deprecated since version 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', __METHOD__, $factoryService), E_USER_DEPRECATED);
 
         $this->factoryService = $factoryService;
 
@@ -223,7 +223,7 @@ class Definition
     public function getFactoryService($triggerDeprecationError = true)
     {
         if ($triggerDeprecationError) {
-            trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);
+            @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);
         }
 
         return $this->factoryService;
@@ -667,7 +667,7 @@ class Definition
     public function setSynchronized($boolean, $triggerDeprecationError = true)
     {
         if ($triggerDeprecationError) {
-            trigger_error('The '.__METHOD__.' method is deprecated since version 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);
+            @trigger_error('The '.__METHOD__.' method is deprecated since version 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);
         }
 
         $this->synchronized = (bool) $boolean;
@@ -687,7 +687,7 @@ class Definition
     public function isSynchronized($triggerDeprecationError = true)
     {
         if ($triggerDeprecationError) {
-            trigger_error('The '.__METHOD__.' method is deprecated since version 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);
+            @trigger_error('The '.__METHOD__.' method is deprecated since version 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);
         }
 
         return $this->synchronized;
diff --git a/core/vendor/symfony/dependency-injection/DefinitionDecorator.php b/core/vendor/symfony/dependency-injection/DefinitionDecorator.php
index d4b45d34a..f5a1485a5 100644
--- a/core/vendor/symfony/dependency-injection/DefinitionDecorator.php
+++ b/core/vendor/symfony/dependency-injection/DefinitionDecorator.php
@@ -170,6 +170,16 @@ class DefinitionDecorator extends Definition
         return parent::setLazy($boolean);
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function setDecoratedService($id, $renamedId = null)
+    {
+        $this->changes['decorated_service'] = true;
+
+        return parent::setDecoratedService($id, $renamedId);
+    }
+
     /**
      * Gets an argument to pass to the service constructor/factory method.
      *
diff --git a/core/vendor/symfony/dependency-injection/Dumper/GraphvizDumper.php b/core/vendor/symfony/dependency-injection/Dumper/GraphvizDumper.php
index 5eba090a2..5f35a1e5b 100644
--- a/core/vendor/symfony/dependency-injection/Dumper/GraphvizDumper.php
+++ b/core/vendor/symfony/dependency-injection/Dumper/GraphvizDumper.php
@@ -278,7 +278,7 @@ class GraphvizDumper extends Dumper
      */
     private function dotize($id)
     {
-        return strtolower(preg_replace('/[^\w]/i', '_', $id));
+        return strtolower(preg_replace('/\W/i', '_', $id));
     }
 
     /**
diff --git a/core/vendor/symfony/dependency-injection/Dumper/PhpDumper.php b/core/vendor/symfony/dependency-injection/Dumper/PhpDumper.php
index 75c955ab3..c59bc8d5b 100644
--- a/core/vendor/symfony/dependency-injection/Dumper/PhpDumper.php
+++ b/core/vendor/symfony/dependency-injection/Dumper/PhpDumper.php
@@ -705,7 +705,7 @@ EOF;
         }
 
         if ('request' !== $id) {
-            trigger_error('Synchronized services were deprecated in version 2.7 and won\'t work anymore in 3.0.', E_USER_DEPRECATED);
+            @trigger_error('Synchronized services were deprecated in version 2.7 and won\'t work anymore in 3.0.', E_USER_DEPRECATED);
         }
 
         $code = '';
@@ -862,8 +862,8 @@ EOF;
 
         if (count($scopes = $this->container->getScopes()) > 0) {
             $code .= "\n";
-            $code .= "        \$this->scopes = ".$this->dumpValue($scopes).";\n";
-            $code .= "        \$this->scopeChildren = ".$this->dumpValue($this->container->getScopeChildren()).";\n";
+            $code .= '        $this->scopes = '.$this->dumpValue($scopes).";\n";
+            $code .= '        $this->scopeChildren = '.$this->dumpValue($this->container->getScopeChildren()).";\n";
         }
 
         $code .= $this->addMethodMap();
@@ -908,8 +908,8 @@ EOF;
 
         $code .= "\n";
         if (count($scopes = $this->container->getScopes()) > 0) {
-            $code .= "        \$this->scopes = ".$this->dumpValue($scopes).";\n";
-            $code .= "        \$this->scopeChildren = ".$this->dumpValue($this->container->getScopeChildren()).";\n";
+            $code .= '        $this->scopes = '.$this->dumpValue($scopes).";\n";
+            $code .= '        $this->scopeChildren = '.$this->dumpValue($this->container->getScopeChildren()).";\n";
         } else {
             $code .= "        \$this->scopes = array();\n";
             $code .= "        \$this->scopeChildren = array();\n";
@@ -1301,11 +1301,6 @@ EOF;
             foreach ($value->getArguments() as $argument) {
                 $arguments[] = $this->dumpValue($argument);
             }
-            $class = $this->dumpValue($value->getClass());
-
-            if (false !== strpos($class, '$')) {
-                throw new RuntimeException('Cannot dump definitions which have a variable class name.');
-            }
 
             if (null !== $value->getFactory()) {
                 $factory = $value->getFactory();
@@ -1343,6 +1338,15 @@ EOF;
                 }
             }
 
+            $class = $value->getClass();
+            if (null === $class) {
+                throw new RuntimeException('Cannot dump definitions which have no class nor factory.');
+            }
+            $class = $this->dumpValue($class);
+            if (false !== strpos($class, '$')) {
+                throw new RuntimeException('Cannot dump definitions which have a variable class name.');
+            }
+
             return sprintf('new \\%s(%s)', substr(str_replace('\\\\', '\\', $class), 1, -1), implode(', ', $arguments));
         } elseif ($value instanceof Variable) {
             return '$'.$value;
@@ -1414,7 +1418,7 @@ EOF;
      */
     public function addExpressionLanguageProvider(ExpressionFunctionProviderInterface $provider)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.6.2 and will be removed in 3.0. Use the Symfony\Component\DependencyInjection\ContainerBuilder::addExpressionLanguageProvider method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6.2 and will be removed in 3.0. Use the Symfony\Component\DependencyInjection\ContainerBuilder::addExpressionLanguageProvider method instead.', E_USER_DEPRECATED);
 
         $this->expressionLanguageProviders[] = $provider;
     }
diff --git a/core/vendor/symfony/dependency-injection/Loader/XmlFileLoader.php b/core/vendor/symfony/dependency-injection/Loader/XmlFileLoader.php
index f81d8d693..887f536e4 100644
--- a/core/vendor/symfony/dependency-injection/Loader/XmlFileLoader.php
+++ b/core/vendor/symfony/dependency-injection/Loader/XmlFileLoader.php
@@ -126,10 +126,11 @@ class XmlFileLoader extends FileLoader
      * Parses an individual Definition.
      *
      * @param \DOMElement $service
+     * @param string      $file
      *
      * @return Definition|null
      */
-    private function parseDefinition(\DOMElement $service)
+    private function parseDefinition(\DOMElement $service, $file)
     {
         if ($alias = $service->getAttribute('alias')) {
             $public = true;
@@ -149,13 +150,22 @@ class XmlFileLoader extends FileLoader
 
         foreach (array('class', 'scope', 'public', 'factory-class', 'factory-method', 'factory-service', 'synthetic', 'lazy', 'abstract') as $key) {
             if ($value = $service->getAttribute($key)) {
+                if (in_array($key, array('factory-class', 'factory-method', 'factory-service'))) {
+                    @trigger_error(sprintf('The "%s" attribute of service "%s" in file "%s" is deprecated since version 2.6 and will be removed in 3.0. Use the "factory" element instead.', $key, (string) $service->getAttribute('id'), $file), E_USER_DEPRECATED);
+                }
                 $method = 'set'.str_replace('-', '', $key);
                 $definition->$method(XmlUtils::phpize($value));
             }
         }
 
         if ($value = $service->getAttribute('synchronized')) {
-            $definition->setSynchronized(XmlUtils::phpize($value), 'request' !== (string) $service->getAttribute('id'));
+            $triggerDeprecation = 'request' !== (string) $service->getAttribute('id');
+
+            if ($triggerDeprecation) {
+                @trigger_error(sprintf('The "synchronized" attribute of service "%s" in file "%s" is deprecated since version 2.7 and will be removed in 3.0.', (string) $service->getAttribute('id'), $file), E_USER_DEPRECATED);
+            }
+
+            $definition->setSynchronized(XmlUtils::phpize($value), $triggerDeprecation);
         }
 
         if ($files = $this->getChildren($service, 'file')) {
@@ -173,7 +183,7 @@ class XmlFileLoader extends FileLoader
                 $factoryService = $this->getChildren($factory, 'service');
 
                 if (isset($factoryService[0])) {
-                    $class = $this->parseDefinition($factoryService[0]);
+                    $class = $this->parseDefinition($factoryService[0], $file);
                 } elseif ($childService = $factory->getAttribute('service')) {
                     $class = new Reference($childService, ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, false);
                 } else {
@@ -192,7 +202,7 @@ class XmlFileLoader extends FileLoader
                 $configuratorService = $this->getChildren($configurator, 'service');
 
                 if (isset($configuratorService[0])) {
-                    $class = $this->parseDefinition($configuratorService[0]);
+                    $class = $this->parseDefinition($configuratorService[0], $file);
                 } elseif ($childService = $configurator->getAttribute('service')) {
                     $class = new Reference($childService, ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, false);
                 } else {
@@ -233,7 +243,7 @@ class XmlFileLoader extends FileLoader
     }
 
     /**
-     * Parses a XML file to a \DOMDocument
+     * Parses a XML file to a \DOMDocument.
      *
      * @param string $file Path to a file
      *
@@ -392,7 +402,7 @@ class XmlFileLoader extends FileLoader
     }
 
     /**
-     * Get child elements by name
+     * Get child elements by name.
      *
      * @param \DOMNode $node
      * @param mixed    $name
diff --git a/core/vendor/symfony/dependency-injection/Loader/YamlFileLoader.php b/core/vendor/symfony/dependency-injection/Loader/YamlFileLoader.php
index ae9613a61..be2d3f130 100644
--- a/core/vendor/symfony/dependency-injection/Loader/YamlFileLoader.php
+++ b/core/vendor/symfony/dependency-injection/Loader/YamlFileLoader.php
@@ -172,6 +172,7 @@ class YamlFileLoader extends FileLoader
         }
 
         if (isset($service['synchronized'])) {
+            @trigger_error(sprintf('The "synchronized" key of service "%s" in file "%s" is deprecated since version 2.7 and will be removed in 3.0.', $id, $file), E_USER_DEPRECATED);
             $definition->setSynchronized($service['synchronized'], 'request' !== $id);
         }
 
@@ -201,14 +202,17 @@ class YamlFileLoader extends FileLoader
         }
 
         if (isset($service['factory_class'])) {
+            @trigger_error(sprintf('The "factory_class" key of service "%s" in file "%s" is deprecated since version 2.6 and will be removed in 3.0. Use "factory" instead.', $id, $file), E_USER_DEPRECATED);
             $definition->setFactoryClass($service['factory_class']);
         }
 
         if (isset($service['factory_method'])) {
+            @trigger_error(sprintf('The "factory_method" key of service "%s" in file "%s" is deprecated since version 2.6 and will be removed in 3.0. Use "factory" instead.', $id, $file), E_USER_DEPRECATED);
             $definition->setFactoryMethod($service['factory_method']);
         }
 
         if (isset($service['factory_service'])) {
+            @trigger_error(sprintf('The "factory_service" key of service "%s" in file "%s" is deprecated since version 2.6 and will be removed in 3.0. Use "factory" instead.', $id, $file), E_USER_DEPRECATED);
             $definition->setFactoryService($service['factory_service']);
         }
 
diff --git a/core/vendor/symfony/dependency-injection/ParameterBag/FrozenParameterBag.php b/core/vendor/symfony/dependency-injection/ParameterBag/FrozenParameterBag.php
index dc936a0bd..3ea6d9636 100644
--- a/core/vendor/symfony/dependency-injection/ParameterBag/FrozenParameterBag.php
+++ b/core/vendor/symfony/dependency-injection/ParameterBag/FrozenParameterBag.php
@@ -69,4 +69,14 @@ class FrozenParameterBag extends ParameterBag
     {
         throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
     }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @api
+     */
+    public function remove($name)
+    {
+        throw new LogicException('Impossible to call remove() on a frozen ParameterBag.');
+    }
 }
diff --git a/core/vendor/symfony/dependency-injection/SimpleXMLElement.php b/core/vendor/symfony/dependency-injection/SimpleXMLElement.php
index 1b318fd9e..63d44ea38 100644
--- a/core/vendor/symfony/dependency-injection/SimpleXMLElement.php
+++ b/core/vendor/symfony/dependency-injection/SimpleXMLElement.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\DependencyInjection;
 
-trigger_error('The '.__NAMESPACE__.'\SimpleXMLElement method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\SimpleXMLElement method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
 
 use Symfony\Component\Config\Util\XmlUtils;
 use Symfony\Component\ExpressionLanguage\Expression;
diff --git a/core/vendor/symfony/dependency-injection/Tests/Compiler/CheckDefinitionValidityPassTest.php b/core/vendor/symfony/dependency-injection/Tests/Compiler/CheckDefinitionValidityPassTest.php
index 09ae3c413..4e8efdc8b 100644
--- a/core/vendor/symfony/dependency-injection/Tests/Compiler/CheckDefinitionValidityPassTest.php
+++ b/core/vendor/symfony/dependency-injection/Tests/Compiler/CheckDefinitionValidityPassTest.php
@@ -56,8 +56,6 @@ class CheckDefinitionValidityPassTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacyProcessDetectsBothFactorySyntaxesUsed()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $container = new ContainerBuilder();
         $container->register('a')->setFactory(array('a', 'b'))->setFactoryClass('a');
 
diff --git a/core/vendor/symfony/dependency-injection/Tests/Compiler/LegacyResolveParameterPlaceHoldersPassTest.php b/core/vendor/symfony/dependency-injection/Tests/Compiler/LegacyResolveParameterPlaceHoldersPassTest.php
index 148a30b6c..e730a1a28 100644
--- a/core/vendor/symfony/dependency-injection/Tests/Compiler/LegacyResolveParameterPlaceHoldersPassTest.php
+++ b/core/vendor/symfony/dependency-injection/Tests/Compiler/LegacyResolveParameterPlaceHoldersPassTest.php
@@ -21,8 +21,6 @@ class LegacyResolveParameterPlaceHoldersPassTest extends \PHPUnit_Framework_Test
 {
     public function testFactoryClassParametersShouldBeResolved()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $compilerPass = new ResolveParameterPlaceHoldersPass();
 
         $container = new ContainerBuilder();
diff --git a/core/vendor/symfony/dependency-injection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php b/core/vendor/symfony/dependency-injection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php
index fb2bb5fca..845edd2c1 100644
--- a/core/vendor/symfony/dependency-injection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php
+++ b/core/vendor/symfony/dependency-injection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php
@@ -117,6 +117,25 @@ class ResolveDefinitionTemplatesPassTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(array(), $def->getTags());
     }
 
+    public function testProcessDoesNotCopyDecoratedService()
+    {
+        $container = new ContainerBuilder();
+
+        $container
+            ->register('parent')
+            ->setDecoratedService('foo')
+        ;
+
+        $container
+            ->setDefinition('child', new DefinitionDecorator('parent'))
+        ;
+
+        $this->process($container);
+
+        $def = $container->getDefinition('child');
+        $this->assertNull($def->getDecoratedService());
+    }
+
     public function testProcessHandlesMultipleInheritance()
     {
         $container = new ContainerBuilder();
@@ -173,6 +192,21 @@ class ResolveDefinitionTemplatesPassTest extends \PHPUnit_Framework_TestCase
         $this->assertTrue($container->getDefinition('child1')->isLazy());
     }
 
+    public function testSetDecoratedServiceOnServiceHasParent()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('parent', 'stdClass');
+
+        $container->setDefinition('child1', new DefinitionDecorator('parent'))
+            ->setDecoratedService('foo', 'foo_inner')
+        ;
+
+        $this->process($container);
+
+        $this->assertEquals(array('foo', 'foo_inner'), $container->getDefinition('child1')->getDecoratedService());
+    }
+
     protected function process(ContainerBuilder $container)
     {
         $pass = new ResolveDefinitionTemplatesPass();
diff --git a/core/vendor/symfony/dependency-injection/Tests/ContainerBuilderTest.php b/core/vendor/symfony/dependency-injection/Tests/ContainerBuilderTest.php
index 5f6fdd1d1..8155e0b7c 100644
--- a/core/vendor/symfony/dependency-injection/Tests/ContainerBuilderTest.php
+++ b/core/vendor/symfony/dependency-injection/Tests/ContainerBuilderTest.php
@@ -342,8 +342,6 @@ class ContainerBuilderTest extends \PHPUnit_Framework_TestCase
 
     public function testLegacyCreateServiceFactory()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $builder = new ContainerBuilder();
         $builder->register('bar', 'Bar\FooClass');
         $builder
@@ -363,8 +361,6 @@ class ContainerBuilderTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacyCreateServiceFactoryService()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $builder = new ContainerBuilder();
         $builder->register('foo_service', 'Bar\FooClass');
         $builder
@@ -405,9 +401,12 @@ class ContainerBuilderTest extends \PHPUnit_Framework_TestCase
         $builder->register('foo3', 'Bar\FooClass')->setConfigurator(array(new Reference('baz'), 'configure'));
         $this->assertTrue($builder->get('foo3')->configured, '->createService() calls the configurator');
 
-        $builder->register('foo4', 'Bar\FooClass')->setConfigurator('foo');
+        $builder->register('foo4', 'Bar\FooClass')->setConfigurator(array($builder->getDefinition('baz'), 'configure'));
+        $this->assertTrue($builder->get('foo4')->configured, '->createService() calls the configurator');
+
+        $builder->register('foo5', 'Bar\FooClass')->setConfigurator('foo');
         try {
-            $builder->get('foo4');
+            $builder->get('foo5');
             $this->fail('->createService() throws an InvalidArgumentException if the configure callable is not a valid callable');
         } catch (\InvalidArgumentException $e) {
             $this->assertEquals('The configure callable for class "Bar\FooClass" is not a callable.', $e->getMessage(), '->createService() throws an InvalidArgumentException if the configure callable is not a valid callable');
@@ -732,8 +731,6 @@ class ContainerBuilderTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacySetOnSynchronizedService()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $container = new ContainerBuilder();
         $container->register('baz', 'BazClass')
             ->setSynchronized(true)
@@ -754,8 +751,6 @@ class ContainerBuilderTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacySynchronizedServiceWithScopes()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $container = new ContainerBuilder();
         $container->addScope(new Scope('foo'));
         $container->register('baz', 'BazClass')
diff --git a/core/vendor/symfony/dependency-injection/Tests/DefinitionDecoratorTest.php b/core/vendor/symfony/dependency-injection/Tests/DefinitionDecoratorTest.php
index f9006540a..732eead14 100644
--- a/core/vendor/symfony/dependency-injection/Tests/DefinitionDecoratorTest.php
+++ b/core/vendor/symfony/dependency-injection/Tests/DefinitionDecoratorTest.php
@@ -55,8 +55,6 @@ class DefinitionDecoratorTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacySetProperty($property, $changeKey)
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $def = new DefinitionDecorator('foo');
 
         $getter = 'get'.ucfirst($property);
diff --git a/core/vendor/symfony/dependency-injection/Tests/DefinitionTest.php b/core/vendor/symfony/dependency-injection/Tests/DefinitionTest.php
index b6539f3b7..b501f1183 100644
--- a/core/vendor/symfony/dependency-injection/Tests/DefinitionTest.php
+++ b/core/vendor/symfony/dependency-injection/Tests/DefinitionTest.php
@@ -170,8 +170,6 @@ class DefinitionTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacySetIsSynchronized()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $def = new Definition('stdClass');
         $this->assertFalse($def->isSynchronized(), '->isSynchronized() returns false by default');
         $this->assertSame($def, $def->setSynchronized(true), '->setSynchronized() implements a fluent interface');
diff --git a/core/vendor/symfony/dependency-injection/Tests/Dumper/GraphvizDumperTest.php b/core/vendor/symfony/dependency-injection/Tests/Dumper/GraphvizDumperTest.php
index ba5e12cd5..5da11359f 100644
--- a/core/vendor/symfony/dependency-injection/Tests/Dumper/GraphvizDumperTest.php
+++ b/core/vendor/symfony/dependency-injection/Tests/Dumper/GraphvizDumperTest.php
@@ -28,8 +28,6 @@ class GraphvizDumperTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacyDump()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $container = include self::$fixturesPath.'/containers/legacy-container9.php';
         $dumper = new GraphvizDumper($container);
         $this->assertEquals(str_replace('%path%', __DIR__, file_get_contents(self::$fixturesPath.'/graphviz/legacy-services9.dot')), $dumper->dump(), '->dump() dumps services');
diff --git a/core/vendor/symfony/dependency-injection/Tests/Dumper/PhpDumperTest.php b/core/vendor/symfony/dependency-injection/Tests/Dumper/PhpDumperTest.php
index 7fa0c17a1..063007e5d 100644
--- a/core/vendor/symfony/dependency-injection/Tests/Dumper/PhpDumperTest.php
+++ b/core/vendor/symfony/dependency-injection/Tests/Dumper/PhpDumperTest.php
@@ -129,8 +129,6 @@ class PhpDumperTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacySynchronizedServices()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $container = include self::$fixturesPath.'/containers/container20.php';
         $dumper = new PhpDumper($container);
         $this->assertEquals(str_replace('%path%', str_replace('\\', '\\\\', self::$fixturesPath.DIRECTORY_SEPARATOR.'includes'.DIRECTORY_SEPARATOR), file_get_contents(self::$fixturesPath.'/php/services20.php')), $dumper->dump(), '->dump() dumps services');
diff --git a/core/vendor/symfony/dependency-injection/Tests/Dumper/XmlDumperTest.php b/core/vendor/symfony/dependency-injection/Tests/Dumper/XmlDumperTest.php
index 9ee103630..8aa544c72 100644
--- a/core/vendor/symfony/dependency-injection/Tests/Dumper/XmlDumperTest.php
+++ b/core/vendor/symfony/dependency-injection/Tests/Dumper/XmlDumperTest.php
@@ -49,8 +49,6 @@ class XmlDumperTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacyAddService()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $container = include self::$fixturesPath.'/containers/legacy-container9.php';
         $dumper = new XmlDumper($container);
 
diff --git a/core/vendor/symfony/dependency-injection/Tests/Dumper/YamlDumperTest.php b/core/vendor/symfony/dependency-injection/Tests/Dumper/YamlDumperTest.php
index c22c7eb40..8e9f1174c 100644
--- a/core/vendor/symfony/dependency-injection/Tests/Dumper/YamlDumperTest.php
+++ b/core/vendor/symfony/dependency-injection/Tests/Dumper/YamlDumperTest.php
@@ -45,8 +45,6 @@ class YamlDumperTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacyAddService()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $container = include self::$fixturesPath.'/containers/legacy-container9.php';
         $dumper = new YamlDumper($container);
 
diff --git a/core/vendor/symfony/dependency-injection/Tests/Fixtures/includes/createphar.php b/core/vendor/symfony/dependency-injection/Tests/Fixtures/includes/createphar.php
index cfe9425c5..5fa06a0eb 100644
--- a/core/vendor/symfony/dependency-injection/Tests/Fixtures/includes/createphar.php
+++ b/core/vendor/symfony/dependency-injection/Tests/Fixtures/includes/createphar.php
@@ -44,4 +44,4 @@ $phar->addFromString('schema/project-1.0.xsd', <<<EOT
 </xsd:schema>
 EOT
 );
-$phar->setStub('<?php require_once "phar://ProjectWithXsdExtensionInPhar.phar/ProjectWithXsdExtensionInPhar.php"; __HALT_COMPILER(); ?>');
+$phar->setStub('<?php Phar::mapPhar("ProjectWithXsdExtensionInPhar.phar"); require_once "phar://ProjectWithXsdExtensionInPhar.phar/ProjectWithXsdExtensionInPhar.php"; __HALT_COMPILER(); ?>');
diff --git a/core/vendor/symfony/dependency-injection/Tests/Fixtures/xml/legacy-services6.xml b/core/vendor/symfony/dependency-injection/Tests/Fixtures/xml/legacy-services6.xml
index 17fe00f8f..708e10fd5 100644
--- a/core/vendor/symfony/dependency-injection/Tests/Fixtures/xml/legacy-services6.xml
+++ b/core/vendor/symfony/dependency-injection/Tests/Fixtures/xml/legacy-services6.xml
@@ -6,5 +6,6 @@
   <services>
     <service id="constructor" class="FooClass" factory-method="getInstance" />
     <service id="factory_service" factory-method="getInstance" factory-service="baz_factory" />
+    <service id="request" class="Request" synthetic="true" synchronized="true" lazy="true"/>
   </services>
 </container>
diff --git a/core/vendor/symfony/dependency-injection/Tests/Fixtures/xml/services6.xml b/core/vendor/symfony/dependency-injection/Tests/Fixtures/xml/services6.xml
index 3a68c6e39..9eb7b8915 100644
--- a/core/vendor/symfony/dependency-injection/Tests/Fixtures/xml/services6.xml
+++ b/core/vendor/symfony/dependency-injection/Tests/Fixtures/xml/services6.xml
@@ -47,7 +47,6 @@
     </service>
     <service id="alias_for_foo" alias="foo" />
     <service id="another_alias_for_foo" alias="foo" public="false" />
-    <service id="request" class="Request" synthetic="true" synchronized="true" lazy="true"/>
     <service id="decorator_service" decorates="decorated" />
     <service id="decorator_service_with_name" decorates="decorated" decoration-inner-name="decorated.pif-pouf"/>
     <service id="new_factory1" class="FooBarClass">
diff --git a/core/vendor/symfony/dependency-injection/Tests/Fixtures/yaml/legacy-services6.yml b/core/vendor/symfony/dependency-injection/Tests/Fixtures/yaml/legacy-services6.yml
index d6ca937a5..46ac67994 100644
--- a/core/vendor/symfony/dependency-injection/Tests/Fixtures/yaml/legacy-services6.yml
+++ b/core/vendor/symfony/dependency-injection/Tests/Fixtures/yaml/legacy-services6.yml
@@ -1,3 +1,8 @@
 services:
     constructor: { class: FooClass, factory_method: getInstance }
     factory_service: { class: BazClass, factory_method: getInstance, factory_service: baz_factory }
+    request:
+        class: Request
+        synthetic: true
+        synchronized: true
+        lazy: true
diff --git a/core/vendor/symfony/dependency-injection/Tests/Fixtures/yaml/services6.yml b/core/vendor/symfony/dependency-injection/Tests/Fixtures/yaml/services6.yml
index 8820b274e..78abf4d15 100644
--- a/core/vendor/symfony/dependency-injection/Tests/Fixtures/yaml/services6.yml
+++ b/core/vendor/symfony/dependency-injection/Tests/Fixtures/yaml/services6.yml
@@ -23,11 +23,6 @@ services:
     another_alias_for_foo:
         alias: foo
         public: false
-    request:
-        class: Request
-        synthetic: true
-        synchronized: true
-        lazy: true
     decorator_service:
         decorates: decorated
     decorator_service_with_name:
diff --git a/core/vendor/symfony/dependency-injection/Tests/LegacyContainerBuilderTest.php b/core/vendor/symfony/dependency-injection/Tests/LegacyContainerBuilderTest.php
index b8512a261..40aec2006 100644
--- a/core/vendor/symfony/dependency-injection/Tests/LegacyContainerBuilderTest.php
+++ b/core/vendor/symfony/dependency-injection/Tests/LegacyContainerBuilderTest.php
@@ -19,11 +19,6 @@ use Symfony\Component\DependencyInjection\Reference;
  */
 class LegacyContainerBuilderTest extends \PHPUnit_Framework_TestCase
 {
-    protected function setUp()
-    {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-    }
-
     /**
      * @covers Symfony\Component\DependencyInjection\ContainerBuilder::createService
      */
diff --git a/core/vendor/symfony/dependency-injection/Tests/LegacyDefinitionTest.php b/core/vendor/symfony/dependency-injection/Tests/LegacyDefinitionTest.php
index 437b77b31..b85d81f48 100644
--- a/core/vendor/symfony/dependency-injection/Tests/LegacyDefinitionTest.php
+++ b/core/vendor/symfony/dependency-injection/Tests/LegacyDefinitionTest.php
@@ -18,11 +18,6 @@ use Symfony\Component\DependencyInjection\Definition;
  */
 class LegacyDefinitionTest extends \PHPUnit_Framework_TestCase
 {
-    protected function setUp()
-    {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-    }
-
     public function testSetGetFactoryClass()
     {
         $def = new Definition('stdClass');
diff --git a/core/vendor/symfony/dependency-injection/Tests/Loader/XmlFileLoaderTest.php b/core/vendor/symfony/dependency-injection/Tests/Loader/XmlFileLoaderTest.php
index 501d680fc..8bf524ae4 100644
--- a/core/vendor/symfony/dependency-injection/Tests/Loader/XmlFileLoaderTest.php
+++ b/core/vendor/symfony/dependency-injection/Tests/Loader/XmlFileLoaderTest.php
@@ -195,8 +195,6 @@ class XmlFileLoaderTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacyLoadServices()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $container = new ContainerBuilder();
         $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
         $loader->load('legacy-services6.xml');
@@ -206,6 +204,10 @@ class XmlFileLoaderTest extends \PHPUnit_Framework_TestCase
         $this->assertNull($services['factory_service']->getClass());
         $this->assertEquals('baz_factory', $services['factory_service']->getFactoryService());
         $this->assertEquals('getInstance', $services['factory_service']->getFactoryMethod());
+        $this->assertTrue($services['request']->isSynthetic(), '->load() parses the synthetic flag');
+        $this->assertTrue($services['request']->isSynchronized(), '->load() parses the synchronized flag');
+        $this->assertTrue($services['request']->isLazy(), '->load() parses the lazy flag');
+        $this->assertNull($services['request']->getDecoratedService());
     }
 
     public function testLoadServices()
@@ -231,10 +233,6 @@ class XmlFileLoaderTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(array(new Reference('baz', ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, false), 'getClass'), $services['new_factory2']->getFactory(), '->load() parses the factory tag');
         $this->assertEquals(array('BazClass', 'getInstance'), $services['new_factory3']->getFactory(), '->load() parses the factory tag');
 
-        $this->assertTrue($services['request']->isSynthetic(), '->load() parses the synthetic flag');
-        $this->assertTrue($services['request']->isSynchronized(false), '->load() parses the synchronized flag');
-        $this->assertTrue($services['request']->isLazy(), '->load() parses the lazy flag');
-
         $aliases = $container->getAliases();
         $this->assertTrue(isset($aliases['alias_for_foo']), '->load() parses <service> elements');
         $this->assertEquals('foo', (string) $aliases['alias_for_foo'], '->load() parses aliases');
@@ -243,7 +241,6 @@ class XmlFileLoaderTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals('foo', (string) $aliases['another_alias_for_foo']);
         $this->assertFalse($aliases['another_alias_for_foo']->isPublic());
 
-        $this->assertNull($services['request']->getDecoratedService());
         $this->assertEquals(array('decorated', null), $services['decorator_service']->getDecoratedService());
         $this->assertEquals(array('decorated', 'decorated.pif-pouf'), $services['decorator_service_with_name']->getDecoratedService());
     }
diff --git a/core/vendor/symfony/dependency-injection/Tests/Loader/YamlFileLoaderTest.php b/core/vendor/symfony/dependency-injection/Tests/Loader/YamlFileLoaderTest.php
index 716aba558..28cf0ebf6 100644
--- a/core/vendor/symfony/dependency-injection/Tests/Loader/YamlFileLoaderTest.php
+++ b/core/vendor/symfony/dependency-injection/Tests/Loader/YamlFileLoaderTest.php
@@ -124,8 +124,6 @@ class YamlFileLoaderTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacyLoadServices()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $container = new ContainerBuilder();
         $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
         $loader->load('legacy-services6.yml');
@@ -135,6 +133,10 @@ class YamlFileLoaderTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals('BazClass', $services['factory_service']->getClass());
         $this->assertEquals('baz_factory', $services['factory_service']->getFactoryService());
         $this->assertEquals('getInstance', $services['factory_service']->getFactoryMethod());
+        $this->assertTrue($services['request']->isSynthetic(), '->load() parses the synthetic flag');
+        $this->assertTrue($services['request']->isSynchronized(), '->load() parses the synchronized flag');
+        $this->assertTrue($services['request']->isLazy(), '->load() parses the lazy flag');
+        $this->assertNull($services['request']->getDecoratedService());
     }
 
     public function testLoadServices()
@@ -160,10 +162,6 @@ class YamlFileLoaderTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(array(new Reference('baz'), 'getClass'), $services['new_factory2']->getFactory(), '->load() parses the factory tag');
         $this->assertEquals(array('BazClass', 'getInstance'), $services['new_factory3']->getFactory(), '->load() parses the factory tag');
 
-        $this->assertTrue($services['request']->isSynthetic(), '->load() parses the synthetic flag');
-        $this->assertTrue($services['request']->isSynchronized(false), '->load() parses the synchronized flag');
-        $this->assertTrue($services['request']->isLazy(), '->load() parses the lazy flag');
-
         $aliases = $container->getAliases();
         $this->assertTrue(isset($aliases['alias_for_foo']), '->load() parses aliases');
         $this->assertEquals('foo', (string) $aliases['alias_for_foo'], '->load() parses aliases');
@@ -172,7 +170,6 @@ class YamlFileLoaderTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals('foo', (string) $aliases['another_alias_for_foo']);
         $this->assertFalse($aliases['another_alias_for_foo']->isPublic());
 
-        $this->assertNull($services['request']->getDecoratedService());
         $this->assertEquals(array('decorated', null), $services['decorator_service']->getDecoratedService());
         $this->assertEquals(array('decorated', 'decorated.pif-pouf'), $services['decorator_service_with_name']->getDecoratedService());
     }
diff --git a/core/vendor/symfony/dom-crawler/Tests/FormTest.php b/core/vendor/symfony/dom-crawler/Tests/FormTest.php
index e2c190473..59c3c76cf 100644
--- a/core/vendor/symfony/dom-crawler/Tests/FormTest.php
+++ b/core/vendor/symfony/dom-crawler/Tests/FormTest.php
@@ -825,7 +825,6 @@ class FormTest extends \PHPUnit_Framework_TestCase
      */
     public function testFormRegistrySetArrayOnNotCompoundField()
     {
-
         $registry = new FormFieldRegistry();
         $registry->add($this->getFormFieldMock('bar'));
 
diff --git a/core/vendor/symfony/event-dispatcher/.gitignore b/core/vendor/symfony/event-dispatcher/.gitignore
new file mode 100644
index 000000000..c49a5d8df
--- /dev/null
+++ b/core/vendor/symfony/event-dispatcher/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/core/vendor/symfony/event-dispatcher/Event.php b/core/vendor/symfony/event-dispatcher/Event.php
index e411ca813..048bf0ac6 100644
--- a/core/vendor/symfony/event-dispatcher/Event.php
+++ b/core/vendor/symfony/event-dispatcher/Event.php
@@ -97,7 +97,7 @@ class Event
      */
     public function getDispatcher()
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0. The event dispatcher instance can be received in the listener call instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0. The event dispatcher instance can be received in the listener call instead.', E_USER_DEPRECATED);
 
         return $this->dispatcher;
     }
@@ -113,7 +113,7 @@ class Event
      */
     public function getName()
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0. The event name can be received in the listener call instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0. The event name can be received in the listener call instead.', E_USER_DEPRECATED);
 
         return $this->name;
     }
diff --git a/core/vendor/symfony/event-dispatcher/Tests/AbstractEventDispatcherTest.php b/core/vendor/symfony/event-dispatcher/Tests/AbstractEventDispatcherTest.php
index 5ff5be84d..f9c7e0e8b 100644
--- a/core/vendor/symfony/event-dispatcher/Tests/AbstractEventDispatcherTest.php
+++ b/core/vendor/symfony/event-dispatcher/Tests/AbstractEventDispatcherTest.php
@@ -126,8 +126,6 @@ abstract class AbstractEventDispatcherTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacyDispatch()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $event = new Event();
         $return = $this->dispatcher->dispatch(self::preFoo, $event);
         $this->assertEquals('pre.foo', $event->getName());
@@ -255,8 +253,6 @@ abstract class AbstractEventDispatcherTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacyEventReceivesTheDispatcherInstance()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $dispatcher = null;
         $this->dispatcher->addListener('test', function ($event) use (&$dispatcher) {
             $dispatcher = $event->getDispatcher();
diff --git a/core/vendor/symfony/event-dispatcher/Tests/EventTest.php b/core/vendor/symfony/event-dispatcher/Tests/EventTest.php
index 4bd269722..9a822670c 100644
--- a/core/vendor/symfony/event-dispatcher/Tests/EventTest.php
+++ b/core/vendor/symfony/event-dispatcher/Tests/EventTest.php
@@ -65,7 +65,6 @@ class EventTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacySetDispatcher()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
         $this->event->setDispatcher($this->dispatcher);
         $this->assertSame($this->dispatcher, $this->event->getDispatcher());
     }
@@ -75,7 +74,6 @@ class EventTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacyGetDispatcher()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
         $this->assertNull($this->event->getDispatcher());
     }
 
@@ -84,7 +82,6 @@ class EventTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacyGetName()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
         $this->assertNull($this->event->getName());
     }
 
@@ -93,7 +90,6 @@ class EventTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacySetName()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
         $this->event->setName('foo');
         $this->assertEquals('foo', $this->event->getName());
     }
diff --git a/core/vendor/symfony/http-foundation/.gitignore b/core/vendor/symfony/http-foundation/.gitignore
new file mode 100644
index 000000000..c49a5d8df
--- /dev/null
+++ b/core/vendor/symfony/http-foundation/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/core/vendor/symfony/http-foundation/File/MimeType/MimeTypeGuesser.php b/core/vendor/symfony/http-foundation/File/MimeType/MimeTypeGuesser.php
index 81b2b02bd..ecc8a30ac 100644
--- a/core/vendor/symfony/http-foundation/File/MimeType/MimeTypeGuesser.php
+++ b/core/vendor/symfony/http-foundation/File/MimeType/MimeTypeGuesser.php
@@ -67,6 +67,14 @@ class MimeTypeGuesser implements MimeTypeGuesserInterface
         return self::$instance;
     }
 
+    /**
+     * Resets the singleton instance.
+     */
+    public static function reset()
+    {
+        self::$instance = null;
+    }
+
     /**
      * Registers all natively provided mime type guessers.
      */
diff --git a/core/vendor/symfony/http-foundation/JsonResponse.php b/core/vendor/symfony/http-foundation/JsonResponse.php
index fa80c6885..5399d1b1f 100644
--- a/core/vendor/symfony/http-foundation/JsonResponse.php
+++ b/core/vendor/symfony/http-foundation/JsonResponse.php
@@ -26,7 +26,10 @@ class JsonResponse extends Response
 {
     protected $data;
     protected $callback;
-    protected $encodingOptions;
+
+    // Encode <, >, ', &, and " for RFC4627-compliant JSON, which may also be embedded into HTML.
+    // 15 === JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT
+    protected $encodingOptions = 15;
 
     /**
      * Constructor.
@@ -43,9 +46,6 @@ class JsonResponse extends Response
             $data = new \ArrayObject();
         }
 
-        // Encode <, >, ', &, and " for RFC4627-compliant JSON, which may also be embedded into HTML.
-        $this->encodingOptions = JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT;
-
         $this->setData($data);
     }
 
@@ -95,34 +95,58 @@ class JsonResponse extends Response
      */
     public function setData($data = array())
     {
-        $errorHandler = null;
-        $errorHandler = set_error_handler(function () use (&$errorHandler) {
-            if (JSON_ERROR_NONE !== json_last_error()) {
-                return;
+        if (defined('HHVM_VERSION')) {
+            // HHVM does not trigger any warnings and let exceptions
+            // thrown from a JsonSerializable object pass through.
+            // If only PHP did the same...
+            $data = json_encode($data, $this->encodingOptions);
+        } else {
+            try {
+                if (PHP_VERSION_ID < 50400) {
+                    // PHP 5.3 triggers annoying warnings for some
+                    // types that can't be serialized as JSON (INF, resources, etc.)
+                    // but doesn't provide the JsonSerializable interface.
+                    set_error_handler('var_dump', 0);
+                    $data = @json_encode($data, $this->encodingOptions);
+                } else {
+                    // PHP 5.4 and up wrap exceptions thrown by JsonSerializable
+                    // objects in a new exception that needs to be removed.
+                    // Fortunately, PHP 5.5 and up do not trigger any warning anymore.
+                    if (PHP_VERSION_ID < 50500) {
+                        // Clear json_last_error()
+                        json_encode(null);
+                        $errorHandler = set_error_handler('var_dump');
+                        restore_error_handler();
+                        set_error_handler(function () use ($errorHandler) {
+                            if (JSON_ERROR_NONE === json_last_error()) {
+                                return $errorHandler && false !== call_user_func_array($errorHandler, func_get_args());
+                            }
+                        });
+                    }
+
+                    $data = json_encode($data, $this->encodingOptions);
+                }
+
+                if (PHP_VERSION_ID < 50500) {
+                    restore_error_handler();
+                }
+            } catch (\Exception $e) {
+                if (PHP_VERSION_ID < 50500) {
+                    restore_error_handler();
+                }
+                if (PHP_VERSION_ID >= 50400 && 'Exception' === get_class($e) && 0 === strpos($e->getMessage(), 'Failed calling ')) {
+                    throw $e->getPrevious() ?: $e;
+                }
+                throw $e;
             }
-
-            if ($errorHandler) {
-                call_user_func_array($errorHandler, func_get_args());
-            }
-        });
-
-        try {
-            // Clear json_last_error()
-            json_encode(null);
-
-            $this->data = json_encode($data, $this->encodingOptions);
-
-            restore_error_handler();
-        } catch (\Exception $exception) {
-            restore_error_handler();
-
-            throw $exception;
         }
 
         if (JSON_ERROR_NONE !== json_last_error()) {
             throw new \InvalidArgumentException($this->transformJsonError());
         }
 
+        $this->data = $data;
+
         return $this->update();
     }
 
diff --git a/core/vendor/symfony/http-foundation/Request.php b/core/vendor/symfony/http-foundation/Request.php
index d78bc1fb5..7c4afb03b 100644
--- a/core/vendor/symfony/http-foundation/Request.php
+++ b/core/vendor/symfony/http-foundation/Request.php
@@ -517,10 +517,16 @@ class Request
      */
     public function __toString()
     {
+        try {
+            $content = $this->getContent();
+        } catch (\LogicException $e) {
+            return trigger_error($e, E_USER_ERROR);
+        }
+
         return
             sprintf('%s %s %s', $this->getMethod(), $this->getRequestUri(), $this->server->get('SERVER_PROTOCOL'))."\r\n".
             $this->headers."\r\n".
-            $this->getContent();
+            $content;
     }
 
     /**
@@ -1557,8 +1563,8 @@ class Request
      */
     public function getContent($asResource = false)
     {
-        if (false === $this->content || (true === $asResource && null !== $this->content)) {
-            throw new \LogicException('getContent() can only be called once when using the resource return type.');
+        if (PHP_VERSION_ID < 50600 && (false === $this->content || (true === $asResource && null !== $this->content))) {
+            throw new \LogicException('getContent() can only be called once when using the resource return type and PHP below 5.6.');
         }
 
         if (true === $asResource) {
diff --git a/core/vendor/symfony/http-foundation/Response.php b/core/vendor/symfony/http-foundation/Response.php
index 0421ceeae..dc7203a8d 100644
--- a/core/vendor/symfony/http-foundation/Response.php
+++ b/core/vendor/symfony/http-foundation/Response.php
@@ -1080,7 +1080,7 @@ class Response
         $lastModified = $this->headers->get('Last-Modified');
         $modifiedSince = $request->headers->get('If-Modified-Since');
 
-        if ($etags = $request->getEtags()) {
+        if ($etags = $request->getETags()) {
             $notModified = in_array($this->getEtag(), $etags) || in_array('*', $etags);
         }
 
@@ -1242,15 +1242,9 @@ class Response
     {
         $status = ob_get_status(true);
         $level = count($status);
+        $flags = PHP_VERSION_ID >= 50400 ? PHP_OUTPUT_HANDLER_REMOVABLE | ($flush ? PHP_OUTPUT_HANDLER_FLUSHABLE : PHP_OUTPUT_HANDLER_CLEANABLE) : -1;
 
-        while ($level-- > $targetLevel
-            && (!empty($status[$level]['del'])
-                || (isset($status[$level]['flags'])
-                    && ($status[$level]['flags'] & PHP_OUTPUT_HANDLER_REMOVABLE)
-                    && ($status[$level]['flags'] & ($flush ? PHP_OUTPUT_HANDLER_FLUSHABLE : PHP_OUTPUT_HANDLER_CLEANABLE))
-                )
-            )
-        ) {
+        while ($level-- > $targetLevel && ($s = $status[$level]) && (!isset($s['del']) ? !isset($s['flags']) || $flags === ($s['flags'] & $flags) : $s['del'])) {
             if ($flush) {
                 ob_end_flush();
             } else {
diff --git a/core/vendor/symfony/http-foundation/Session/Flash/FlashBag.php b/core/vendor/symfony/http-foundation/Session/Flash/FlashBag.php
index bbe7561be..0da771509 100644
--- a/core/vendor/symfony/http-foundation/Session/Flash/FlashBag.php
+++ b/core/vendor/symfony/http-foundation/Session/Flash/FlashBag.php
@@ -175,7 +175,7 @@ class FlashBag implements FlashBagInterface, \IteratorAggregate
      */
     public function getIterator()
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);
 
         return new \ArrayIterator($this->all());
     }
diff --git a/core/vendor/symfony/http-foundation/Session/Storage/Handler/LegacyPdoSessionHandler.php b/core/vendor/symfony/http-foundation/Session/Storage/Handler/LegacyPdoSessionHandler.php
index fd0c58275..eefaf8d8f 100644
--- a/core/vendor/symfony/http-foundation/Session/Storage/Handler/LegacyPdoSessionHandler.php
+++ b/core/vendor/symfony/http-foundation/Session/Storage/Handler/LegacyPdoSessionHandler.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
 
-trigger_error('The '.__NAMESPACE__.'\LegacyPdoSessionHandler class is deprecated since version 2.6 and will be removed in 3.0. Use the Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\LegacyPdoSessionHandler class is deprecated since version 2.6 and will be removed in 3.0. Use the Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler class instead.', E_USER_DEPRECATED);
 
 /**
  * Session handler using a PDO connection to read and write data.
diff --git a/core/vendor/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php b/core/vendor/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php
index 32b73968d..48e81ee0f 100644
--- a/core/vendor/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php
+++ b/core/vendor/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php
@@ -126,7 +126,7 @@ class PdoSessionHandler implements \SessionHandlerInterface
     private $lockMode = self::LOCK_TRANSACTIONAL;
 
     /**
-     * It's an array to support multiple reads before closing which is manual, non-standard usage
+     * It's an array to support multiple reads before closing which is manual, non-standard usage.
      *
      * @var \PDOStatement[] An array of statements to release advisory locks
      */
@@ -483,7 +483,7 @@ class PdoSessionHandler implements \SessionHandlerInterface
             if ('sqlite' === $this->driver) {
                 $this->pdo->exec('ROLLBACK');
             } else {
-                $this->pdo->rollback();
+                $this->pdo->rollBack();
             }
             $this->inTransaction = false;
         }
@@ -680,7 +680,7 @@ class PdoSessionHandler implements \SessionHandlerInterface
     }
 
     /**
-     * Return a PDO instance
+     * Return a PDO instance.
      *
      * @return \PDO
      */
diff --git a/core/vendor/symfony/http-foundation/Session/Storage/MockArraySessionStorage.php b/core/vendor/symfony/http-foundation/Session/Storage/MockArraySessionStorage.php
index f3eeb084e..bc1373755 100644
--- a/core/vendor/symfony/http-foundation/Session/Storage/MockArraySessionStorage.php
+++ b/core/vendor/symfony/http-foundation/Session/Storage/MockArraySessionStorage.php
@@ -249,7 +249,7 @@ class MockArraySessionStorage implements SessionStorageInterface
      */
     protected function generateId()
     {
-        return hash('sha256', uniqid(mt_rand()));
+        return hash('sha256', uniqid('ss_mock_', true));
     }
 
     protected function loadSession()
diff --git a/core/vendor/symfony/http-foundation/Session/Storage/NativeSessionStorage.php b/core/vendor/symfony/http-foundation/Session/Storage/NativeSessionStorage.php
index a5bdbe91d..db705db87 100644
--- a/core/vendor/symfony/http-foundation/Session/Storage/NativeSessionStorage.php
+++ b/core/vendor/symfony/http-foundation/Session/Storage/NativeSessionStorage.php
@@ -203,7 +203,13 @@ class NativeSessionStorage implements SessionStorageInterface
             $this->metadataBag->stampNew();
         }
 
-        return session_regenerate_id($destroy);
+        $isRegenerated = session_regenerate_id($destroy);
+
+        // The reference to $_SESSION in session bags is lost in PHP7 and we need to re-create it.
+        // @see https://bugs.php.net/bug.php?id=70013
+        $this->loadSession();
+
+        return $isRegenerated;
     }
 
     /**
diff --git a/core/vendor/symfony/http-foundation/Tests/BinaryFileResponseTest.php b/core/vendor/symfony/http-foundation/Tests/BinaryFileResponseTest.php
index 9b3f4d92e..47e4d4fed 100644
--- a/core/vendor/symfony/http-foundation/Tests/BinaryFileResponseTest.php
+++ b/core/vendor/symfony/http-foundation/Tests/BinaryFileResponseTest.php
@@ -179,7 +179,7 @@ class BinaryFileResponseTest extends ResponseTestCase
 
         $file = new FakeFile($realpath, __DIR__.'/File/Fixtures/test');
 
-        BinaryFileResponse::trustXSendFileTypeHeader();
+        BinaryFileResponse::trustXSendfileTypeHeader();
         $response = new BinaryFileResponse($file);
         $reflection = new \ReflectionObject($response);
         $property = $reflection->getProperty('file');
diff --git a/core/vendor/symfony/http-foundation/Tests/ClockMock.php b/core/vendor/symfony/http-foundation/Tests/ClockMock.php
new file mode 100644
index 000000000..04a842d9b
--- /dev/null
+++ b/core/vendor/symfony/http-foundation/Tests/ClockMock.php
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpFoundation;
+
+function time($asFloat = false)
+{
+    return Tests\time();
+}
+
+namespace Symfony\Component\HttpFoundation\Tests;
+
+function time()
+{
+    return $_SERVER['REQUEST_TIME'];
+}
diff --git a/core/vendor/symfony/http-foundation/Tests/CookieTest.php b/core/vendor/symfony/http-foundation/Tests/CookieTest.php
index 0aaeb6baa..b8474db15 100644
--- a/core/vendor/symfony/http-foundation/Tests/CookieTest.php
+++ b/core/vendor/symfony/http-foundation/Tests/CookieTest.php
@@ -13,6 +13,8 @@ namespace Symfony\Component\HttpFoundation\Tests;
 
 use Symfony\Component\HttpFoundation\Cookie;
 
+require_once __DIR__.'/ClockMock.php';
+
 /**
  * CookieTest.
  *
diff --git a/core/vendor/symfony/http-foundation/Tests/File/FileTest.php b/core/vendor/symfony/http-foundation/Tests/File/FileTest.php
index 9e07d9e14..6777849c8 100644
--- a/core/vendor/symfony/http-foundation/Tests/File/FileTest.php
+++ b/core/vendor/symfony/http-foundation/Tests/File/FileTest.php
@@ -45,6 +45,19 @@ class FileTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals('gif', $file->guessExtension());
     }
 
+    public function testGuessExtensionWithReset()
+    {
+        $file = new File(__DIR__.'/Fixtures/other-file.example');
+        $guesser = $this->createMockGuesser($file->getPathname(), 'image/gif');
+        MimeTypeGuesser::getInstance()->register($guesser);
+
+        $this->assertEquals('gif', $file->guessExtension());
+
+        MimeTypeGuesser::reset();
+
+        $this->assertNull($file->guessExtension());
+    }
+
     public function testConstructWhenFileNotExists()
     {
         $this->setExpectedException('Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException');
diff --git a/core/vendor/symfony/http-foundation/Tests/File/Fixtures/other-file.example b/core/vendor/symfony/http-foundation/Tests/File/Fixtures/other-file.example
new file mode 100644
index 000000000..e69de29bb
diff --git a/core/vendor/symfony/http-foundation/Tests/JsonResponseTest.php b/core/vendor/symfony/http-foundation/Tests/JsonResponseTest.php
index 48b86038a..f1ea56570 100644
--- a/core/vendor/symfony/http-foundation/Tests/JsonResponseTest.php
+++ b/core/vendor/symfony/http-foundation/Tests/JsonResponseTest.php
@@ -203,9 +203,8 @@ class JsonResponseTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * @expectedException Exception
-     * @expectedExceptionMessage Failed calling Symfony\Component\HttpFoundation\Tests\JsonSerializableObject::jsonSerialize()
-     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php#114688
+     * @expectedException \Exception
+     * @expectedExceptionMessage This error is expected
      */
     public function testSetContentJsonSerializeError()
     {
@@ -224,9 +223,7 @@ if (interface_exists('JsonSerializable')) {
     {
         public function jsonSerialize()
         {
-            trigger_error('This error is expected', E_USER_WARNING);
-
-            return array();
+            throw new \Exception('This error is expected');
         }
     }
 }
diff --git a/core/vendor/symfony/http-foundation/Tests/RequestTest.php b/core/vendor/symfony/http-foundation/Tests/RequestTest.php
index 50cb44806..45574df4c 100644
--- a/core/vendor/symfony/http-foundation/Tests/RequestTest.php
+++ b/core/vendor/symfony/http-foundation/Tests/RequestTest.php
@@ -975,11 +975,39 @@ class RequestTest extends \PHPUnit_Framework_TestCase
      */
     public function testGetContentCantBeCalledTwiceWithResources($first, $second)
     {
+        if (PHP_VERSION_ID >= 50600) {
+            $this->markTestSkipped('PHP >= 5.6 allows to open php://input several times.');
+        }
+
         $req = new Request();
         $req->getContent($first);
         $req->getContent($second);
     }
 
+    /**
+     * @dataProvider getContentCantBeCalledTwiceWithResourcesProvider
+     */
+    public function testGetContentCanBeCalledTwiceWithResources($first, $second)
+    {
+        if (PHP_VERSION_ID < 50600) {
+            $this->markTestSkipped('PHP < 5.6 does not allow to open php://input several times.');
+        }
+
+        $req = new Request();
+        $a = $req->getContent($first);
+        $b = $req->getContent($second);
+
+        if ($first) {
+            $a = stream_get_contents($a);
+        }
+
+        if ($second) {
+            $b = stream_get_contents($b);
+        }
+
+        $this->assertEquals($a, $b);
+    }
+
     public function getContentCantBeCalledTwiceWithResourcesProvider()
     {
         return array(
diff --git a/core/vendor/symfony/http-foundation/Tests/ResponseHeaderBagTest.php b/core/vendor/symfony/http-foundation/Tests/ResponseHeaderBagTest.php
index ec739b592..0fa198e09 100644
--- a/core/vendor/symfony/http-foundation/Tests/ResponseHeaderBagTest.php
+++ b/core/vendor/symfony/http-foundation/Tests/ResponseHeaderBagTest.php
@@ -14,6 +14,8 @@ namespace Symfony\Component\HttpFoundation\Tests;
 use Symfony\Component\HttpFoundation\ResponseHeaderBag;
 use Symfony\Component\HttpFoundation\Cookie;
 
+require_once __DIR__.'/ClockMock.php';
+
 class ResponseHeaderBagTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -118,7 +120,7 @@ class ResponseHeaderBagTest extends \PHPUnit_Framework_TestCase
 
         $bag->clearCookie('foo');
 
-        $this->assertContains('Set-Cookie: foo=deleted; expires='.gmdate('D, d-M-Y H:i:s T', time() - 31536001).'; path=/; httponly', explode("\r\n", $bag->__toString()));
+        $this->assertRegExp('#^Set-Cookie: foo=deleted; expires='.gmdate('D, d-M-Y H:i:s T', time() - 31536001).'; path=/; httponly#m', $bag->__toString());
     }
 
     public function testClearCookieSecureNotHttpOnly()
@@ -127,7 +129,7 @@ class ResponseHeaderBagTest extends \PHPUnit_Framework_TestCase
 
         $bag->clearCookie('foo', '/', null, true, false);
 
-        $this->assertContains("Set-Cookie: foo=deleted; expires=".gmdate("D, d-M-Y H:i:s T", time() - 31536001)."; path=/; secure", explode("\r\n", $bag->__toString()));
+        $this->assertRegExp('#^Set-Cookie: foo=deleted; expires='.gmdate('D, d-M-Y H:i:s T', time() - 31536001).'; path=/; secure#m', $bag->__toString());
     }
 
     public function testReplace()
diff --git a/core/vendor/symfony/http-foundation/Tests/Session/Flash/FlashBagTest.php b/core/vendor/symfony/http-foundation/Tests/Session/Flash/FlashBagTest.php
index 25e963a7e..44ad61b5e 100644
--- a/core/vendor/symfony/http-foundation/Tests/Session/Flash/FlashBagTest.php
+++ b/core/vendor/symfony/http-foundation/Tests/Session/Flash/FlashBagTest.php
@@ -138,8 +138,6 @@ class FlashBagTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacyGetIterator()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $flashes = array('hello' => 'world', 'beep' => 'boop', 'notice' => 'nope');
         foreach ($flashes as $key => $val) {
             $this->bag->set($key, $val);
diff --git a/core/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/LegacyPdoSessionHandlerTest.php b/core/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/LegacyPdoSessionHandlerTest.php
index 92f890152..7a1e491dc 100644
--- a/core/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/LegacyPdoSessionHandlerTest.php
+++ b/core/vendor/symfony/http-foundation/Tests/Session/Storage/Handler/LegacyPdoSessionHandlerTest.php
@@ -22,8 +22,6 @@ class LegacyPdoSessionHandlerTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         if (!class_exists('PDO') || !in_array('sqlite', \PDO::getAvailableDrivers())) {
             $this->markTestSkipped('This test requires SQLite support in your environment');
         }
diff --git a/core/vendor/symfony/http-foundation/Tests/Session/Storage/NativeSessionStorageTest.php b/core/vendor/symfony/http-foundation/Tests/Session/Storage/NativeSessionStorageTest.php
index e2146d843..c8743aba9 100644
--- a/core/vendor/symfony/http-foundation/Tests/Session/Storage/NativeSessionStorageTest.php
+++ b/core/vendor/symfony/http-foundation/Tests/Session/Storage/NativeSessionStorageTest.php
@@ -119,6 +119,17 @@ class NativeSessionStorageTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(11, $storage->getBag('attributes')->get('legs'));
     }
 
+    public function testSessionGlobalIsUpToDateAfterIdRegeneration()
+    {
+        $storage = $this->getStorage();
+        $storage->start();
+        $storage->getBag('attributes')->set('lucky', 7);
+        $storage->regenerate();
+        $storage->getBag('attributes')->set('lucky', 42);
+
+        $this->assertEquals(42, $_SESSION['_sf2_attributes']['lucky']);
+    }
+
     public function testDefaultSessionCacheLimiter()
     {
         $this->iniSet('session.cache_limiter', 'nocache');
@@ -216,7 +227,6 @@ class NativeSessionStorageTest extends \PHPUnit_Framework_TestCase
     {
         $storage = $this->getStorage();
 
-        $this->assertFalse(isset($_SESSION));
         $this->assertFalse($storage->getSaveHandler()->isActive());
         $this->assertFalse($storage->isStarted());
 
diff --git a/core/vendor/symfony/http-foundation/Tests/Session/Storage/PhpBridgeSessionStorageTest.php b/core/vendor/symfony/http-foundation/Tests/Session/Storage/PhpBridgeSessionStorageTest.php
index 0acc4458c..07d560f71 100644
--- a/core/vendor/symfony/http-foundation/Tests/Session/Storage/PhpBridgeSessionStorageTest.php
+++ b/core/vendor/symfony/http-foundation/Tests/Session/Storage/PhpBridgeSessionStorageTest.php
@@ -91,7 +91,6 @@ class PhpBridgeSessionStorageTest extends \PHPUnit_Framework_TestCase
 
         $storage = $this->getStorage();
 
-        $this->assertFalse(isset($_SESSION));
         $this->assertFalse($storage->getSaveHandler()->isActive());
         $this->assertFalse($storage->isStarted());
 
diff --git a/core/vendor/symfony/http-kernel/.gitignore b/core/vendor/symfony/http-kernel/.gitignore
new file mode 100644
index 000000000..94a6a2528
--- /dev/null
+++ b/core/vendor/symfony/http-kernel/.gitignore
@@ -0,0 +1,5 @@
+vendor/
+composer.lock
+phpunit.xml
+Tests/Fixtures/cache/
+Tests/Fixtures/logs/
diff --git a/core/vendor/symfony/http-kernel/DataCollector/RequestDataCollector.php b/core/vendor/symfony/http-kernel/DataCollector/RequestDataCollector.php
index 4d83e9a84..9a499a737 100644
--- a/core/vendor/symfony/http-kernel/DataCollector/RequestDataCollector.php
+++ b/core/vendor/symfony/http-kernel/DataCollector/RequestDataCollector.php
@@ -129,10 +129,10 @@ class RequestDataCollector extends DataCollector implements EventSubscriberInter
                     $this->data['controller'] = array(
                         'class' => is_object($controller[0]) ? get_class($controller[0]) : $controller[0],
                         'method' => $controller[1],
-                        'file' => $r->getFilename(),
+                        'file' => $r->getFileName(),
                         'line' => $r->getStartLine(),
                     );
-                } catch (\ReflectionException $re) {
+                } catch (\ReflectionException $e) {
                     if (is_callable($controller)) {
                         // using __call or  __callStatic
                         $this->data['controller'] = array(
@@ -148,7 +148,7 @@ class RequestDataCollector extends DataCollector implements EventSubscriberInter
                 $this->data['controller'] = array(
                     'class' => $r->getName(),
                     'method' => null,
-                    'file' => $r->getFilename(),
+                    'file' => $r->getFileName(),
                     'line' => $r->getStartLine(),
                 );
             } elseif (is_object($controller)) {
diff --git a/core/vendor/symfony/http-kernel/Debug/ErrorHandler.php b/core/vendor/symfony/http-kernel/Debug/ErrorHandler.php
index 577265bfa..af714a308 100644
--- a/core/vendor/symfony/http-kernel/Debug/ErrorHandler.php
+++ b/core/vendor/symfony/http-kernel/Debug/ErrorHandler.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\HttpKernel\Debug;
 
-trigger_error('The '.__NAMESPACE__.'\ErrorHandler class is deprecated since version 2.3 and will be removed in 3.0. Use the Symfony\Component\Debug\ErrorHandler class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\ErrorHandler class is deprecated since version 2.3 and will be removed in 3.0. Use the Symfony\Component\Debug\ErrorHandler class instead.', E_USER_DEPRECATED);
 
 use Symfony\Component\Debug\ErrorHandler as DebugErrorHandler;
 
diff --git a/core/vendor/symfony/http-kernel/Debug/ExceptionHandler.php b/core/vendor/symfony/http-kernel/Debug/ExceptionHandler.php
index 6ffba89f8..50755d97f 100644
--- a/core/vendor/symfony/http-kernel/Debug/ExceptionHandler.php
+++ b/core/vendor/symfony/http-kernel/Debug/ExceptionHandler.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\HttpKernel\Debug;
 
-trigger_error('The '.__NAMESPACE__.'\ExceptionHandler class is deprecated since version 2.3 and will be removed in 3.0. Use the Symfony\Component\Debug\ExceptionHandler class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\ExceptionHandler class is deprecated since version 2.3 and will be removed in 3.0. Use the Symfony\Component\Debug\ExceptionHandler class instead.', E_USER_DEPRECATED);
 
 use Symfony\Component\Debug\ExceptionHandler as DebugExceptionHandler;
 
diff --git a/core/vendor/symfony/http-kernel/Debug/TraceableEventDispatcher.php b/core/vendor/symfony/http-kernel/Debug/TraceableEventDispatcher.php
index 0a82d7652..eb1d8a8e9 100644
--- a/core/vendor/symfony/http-kernel/Debug/TraceableEventDispatcher.php
+++ b/core/vendor/symfony/http-kernel/Debug/TraceableEventDispatcher.php
@@ -38,7 +38,7 @@ class TraceableEventDispatcher extends BaseTraceableEventDispatcher
      */
     public function setProfiler(Profiler $profiler = null)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);
     }
 
     /**
diff --git a/core/vendor/symfony/http-kernel/DependencyInjection/ContainerAwareHttpKernel.php b/core/vendor/symfony/http-kernel/DependencyInjection/ContainerAwareHttpKernel.php
index c64c4c393..97aa74096 100644
--- a/core/vendor/symfony/http-kernel/DependencyInjection/ContainerAwareHttpKernel.php
+++ b/core/vendor/symfony/http-kernel/DependencyInjection/ContainerAwareHttpKernel.php
@@ -46,7 +46,7 @@ class ContainerAwareHttpKernel extends HttpKernel
         parent::__construct($dispatcher, $controllerResolver, $requestStack);
 
         if ($triggerDeprecation) {
-            trigger_error('The '.__CLASS__.' class is deprecated since version 2.7 and will be removed in 3.0. Use the Symfony\Component\HttpKernel\HttpKernel class instead.', E_USER_DEPRECATED);
+            @trigger_error('The '.__CLASS__.' class is deprecated since version 2.7 and will be removed in 3.0. Use the Symfony\Component\HttpKernel\HttpKernel class instead.', E_USER_DEPRECATED);
         }
 
         $this->container = $container;
diff --git a/core/vendor/symfony/http-kernel/DependencyInjection/FragmentRendererPass.php b/core/vendor/symfony/http-kernel/DependencyInjection/FragmentRendererPass.php
index c0cd8d4d5..dc44b2d44 100644
--- a/core/vendor/symfony/http-kernel/DependencyInjection/FragmentRendererPass.php
+++ b/core/vendor/symfony/http-kernel/DependencyInjection/FragmentRendererPass.php
@@ -60,7 +60,7 @@ class FragmentRendererPass implements CompilerPassInterface
 
             foreach ($tags as $tag) {
                 if (!isset($tag['alias'])) {
-                    trigger_error(sprintf('Service "%s" will have to define the "alias" attribute on the "%s" tag as of Symfony 3.0.', $id, $this->rendererTag), E_USER_DEPRECATED);
+                    @trigger_error(sprintf('Service "%s" will have to define the "alias" attribute on the "%s" tag as of Symfony 3.0.', $id, $this->rendererTag), E_USER_DEPRECATED);
 
                     // register the handler as a non-lazy-loaded one
                     $definition->addMethodCall('addRenderer', array(new Reference($id)));
diff --git a/core/vendor/symfony/http-kernel/DependencyInjection/RegisterListenersPass.php b/core/vendor/symfony/http-kernel/DependencyInjection/RegisterListenersPass.php
index 386476b3c..f1c224736 100644
--- a/core/vendor/symfony/http-kernel/DependencyInjection/RegisterListenersPass.php
+++ b/core/vendor/symfony/http-kernel/DependencyInjection/RegisterListenersPass.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\HttpKernel\DependencyInjection;
 
-trigger_error('The '.__NAMESPACE__.'\RegisterListenersPass is deprecated since version 2.5 and will be removed in 3.0. Use the Symfony\Component\EventDispatcher\DependencyInjection\RegisterListenersPass class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\RegisterListenersPass is deprecated since version 2.5 and will be removed in 3.0. Use the Symfony\Component\EventDispatcher\DependencyInjection\RegisterListenersPass class instead.', E_USER_DEPRECATED);
 
 use Symfony\Component\EventDispatcher\DependencyInjection\RegisterListenersPass as BaseRegisterListenersPass;
 
diff --git a/core/vendor/symfony/http-kernel/EventListener/ErrorsLoggerListener.php b/core/vendor/symfony/http-kernel/EventListener/ErrorsLoggerListener.php
index 230a94943..80c3fe597 100644
--- a/core/vendor/symfony/http-kernel/EventListener/ErrorsLoggerListener.php
+++ b/core/vendor/symfony/http-kernel/EventListener/ErrorsLoggerListener.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\HttpKernel\EventListener;
 
-trigger_error('The '.__NAMESPACE__.'\ErrorsLoggerListener class is deprecated since version 2.6 and will be removed in 3.0. Use the Symfony\Component\HttpKernel\EventListener\DebugHandlersListener class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\ErrorsLoggerListener class is deprecated since version 2.6 and will be removed in 3.0. Use the Symfony\Component\HttpKernel\EventListener\DebugHandlersListener class instead.', E_USER_DEPRECATED);
 
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Debug\ErrorHandler;
diff --git a/core/vendor/symfony/http-kernel/EventListener/EsiListener.php b/core/vendor/symfony/http-kernel/EventListener/EsiListener.php
index 9bede0056..bceb67265 100644
--- a/core/vendor/symfony/http-kernel/EventListener/EsiListener.php
+++ b/core/vendor/symfony/http-kernel/EventListener/EsiListener.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\HttpKernel\EventListener;
 
-trigger_error('The '.__NAMESPACE__.'\EsiListener class is deprecated since version 2.6 and will be removed in 3.0. Use the Symfony\Component\HttpKernel\EventListener\SurrogateListener class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\EsiListener class is deprecated since version 2.6 and will be removed in 3.0. Use the Symfony\Component\HttpKernel\EventListener\SurrogateListener class instead.', E_USER_DEPRECATED);
 
 /**
  * EsiListener adds a Surrogate-Control HTTP header when the Response needs to be parsed for ESI.
diff --git a/core/vendor/symfony/http-kernel/EventListener/FragmentListener.php b/core/vendor/symfony/http-kernel/EventListener/FragmentListener.php
index 3ff01ee1a..302faa17d 100644
--- a/core/vendor/symfony/http-kernel/EventListener/FragmentListener.php
+++ b/core/vendor/symfony/http-kernel/EventListener/FragmentListener.php
@@ -94,7 +94,7 @@ class FragmentListener implements EventSubscriberInterface
      */
     protected function getLocalIpAddresses()
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.3.19 and will be removed in 3.0.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3.19 and will be removed in 3.0.', E_USER_DEPRECATED);
 
         return array('127.0.0.1', 'fe80::1', '::1');
     }
diff --git a/core/vendor/symfony/http-kernel/EventListener/LocaleListener.php b/core/vendor/symfony/http-kernel/EventListener/LocaleListener.php
index ef3911694..564f6dc9b 100644
--- a/core/vendor/symfony/http-kernel/EventListener/LocaleListener.php
+++ b/core/vendor/symfony/http-kernel/EventListener/LocaleListener.php
@@ -58,7 +58,7 @@ class LocaleListener implements EventSubscriberInterface
      */
     public function setRequest(Request $request = null)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);
 
         if (null === $request) {
             return;
diff --git a/core/vendor/symfony/http-kernel/EventListener/ProfilerListener.php b/core/vendor/symfony/http-kernel/EventListener/ProfilerListener.php
index 781475a99..06a5bbf08 100644
--- a/core/vendor/symfony/http-kernel/EventListener/ProfilerListener.php
+++ b/core/vendor/symfony/http-kernel/EventListener/ProfilerListener.php
@@ -53,7 +53,7 @@ class ProfilerListener implements EventSubscriberInterface
             // Prevent the deprecation notice to be triggered all the time.
             // The onKernelRequest() method fires some logic only when the
             // RequestStack instance is not provided as a dependency.
-            trigger_error('Since version 2.4, the '.__METHOD__.' method must accept a RequestStack instance to get the request instead of using the '.__CLASS__.'::onKernelRequest method that will be removed in 3.0.', E_USER_DEPRECATED);
+            @trigger_error('Since version 2.4, the '.__METHOD__.' method must accept a RequestStack instance to get the request instead of using the '.__CLASS__.'::onKernelRequest method that will be removed in 3.0.', E_USER_DEPRECATED);
         }
 
         $this->profiler = $profiler;
diff --git a/core/vendor/symfony/http-kernel/EventListener/RouterListener.php b/core/vendor/symfony/http-kernel/EventListener/RouterListener.php
index 9a49e2f3c..00dc60ca3 100644
--- a/core/vendor/symfony/http-kernel/EventListener/RouterListener.php
+++ b/core/vendor/symfony/http-kernel/EventListener/RouterListener.php
@@ -68,7 +68,7 @@ class RouterListener implements EventSubscriberInterface
         }
 
         if (!$requestStack instanceof RequestStack) {
-            trigger_error('The '.__METHOD__.' method now requires a RequestStack instance as '.__CLASS__.'::setRequest method will not be supported anymore in 3.0.', E_USER_DEPRECATED);
+            @trigger_error('The '.__METHOD__.' method now requires a RequestStack instance as '.__CLASS__.'::setRequest method will not be supported anymore in 3.0.', E_USER_DEPRECATED);
         }
 
         $this->matcher = $matcher;
@@ -90,7 +90,7 @@ class RouterListener implements EventSubscriberInterface
      */
     public function setRequest(Request $request = null)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be made private in 3.0.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be made private in 3.0.', E_USER_DEPRECATED);
 
         $this->setCurrentRequest($request);
     }
diff --git a/core/vendor/symfony/http-kernel/Exception/FatalErrorException.php b/core/vendor/symfony/http-kernel/Exception/FatalErrorException.php
index 681d9d619..0d2b4f92a 100644
--- a/core/vendor/symfony/http-kernel/Exception/FatalErrorException.php
+++ b/core/vendor/symfony/http-kernel/Exception/FatalErrorException.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\HttpKernel\Exception;
 
-trigger_error('The '.__NAMESPACE__.'\FatalErrorException class is deprecated since version 2.3 and will be removed in 3.0. Use the Symfony\Component\Debug\Exception\FatalErrorException class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\FatalErrorException class is deprecated since version 2.3 and will be removed in 3.0. Use the Symfony\Component\Debug\Exception\FatalErrorException class instead.', E_USER_DEPRECATED);
 
 /*
  * Fatal Error Exception.
diff --git a/core/vendor/symfony/http-kernel/Exception/FlattenException.php b/core/vendor/symfony/http-kernel/Exception/FlattenException.php
index eb205a18e..599aa959f 100644
--- a/core/vendor/symfony/http-kernel/Exception/FlattenException.php
+++ b/core/vendor/symfony/http-kernel/Exception/FlattenException.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\HttpKernel\Exception;
 
-trigger_error('The '.__NAMESPACE__.'\FlattenException class is deprecated since version 2.3 and will be removed in 3.0. Use the Symfony\Component\Debug\Exception\FlattenException class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\FlattenException class is deprecated since version 2.3 and will be removed in 3.0. Use the Symfony\Component\Debug\Exception\FlattenException class instead.', E_USER_DEPRECATED);
 
 /*
  * FlattenException wraps a PHP Exception to be able to serialize it.
diff --git a/core/vendor/symfony/http-kernel/Fragment/FragmentHandler.php b/core/vendor/symfony/http-kernel/Fragment/FragmentHandler.php
index eae715e8a..774870a27 100644
--- a/core/vendor/symfony/http-kernel/Fragment/FragmentHandler.php
+++ b/core/vendor/symfony/http-kernel/Fragment/FragmentHandler.php
@@ -80,7 +80,7 @@ class FragmentHandler
      */
     public function setRequest(Request $request = null)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);
 
         $this->request = $request;
     }
diff --git a/core/vendor/symfony/http-kernel/HttpCache/Esi.php b/core/vendor/symfony/http-kernel/HttpCache/Esi.php
index f7031b81f..e4e0a4be6 100644
--- a/core/vendor/symfony/http-kernel/HttpCache/Esi.php
+++ b/core/vendor/symfony/http-kernel/HttpCache/Esi.php
@@ -87,7 +87,7 @@ class Esi implements SurrogateInterface
      */
     public function hasSurrogateEsiCapability(Request $request)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the hasSurrogateCapability() method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the hasSurrogateCapability() method instead.', E_USER_DEPRECATED);
 
         return $this->hasSurrogateCapability($request);
     }
@@ -114,7 +114,7 @@ class Esi implements SurrogateInterface
      */
     public function addSurrogateEsiCapability(Request $request)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the addSurrogateCapability() method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the addSurrogateCapability() method instead.', E_USER_DEPRECATED);
 
         $this->addSurrogateCapability($request);
     }
@@ -160,7 +160,7 @@ class Esi implements SurrogateInterface
      */
     public function needsEsiParsing(Response $response)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the needsParsing() method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the needsParsing() method instead.', E_USER_DEPRECATED);
 
         return $this->needsParsing($response);
     }
@@ -234,7 +234,7 @@ class Esi implements SurrogateInterface
             $chunks[$i] = sprintf('<?php echo $this->surrogate->handle($this, %s, %s, %s) ?>'."\n",
                 var_export($options['src'], true),
                 var_export(isset($options['alt']) ? $options['alt'] : '', true),
-                isset($options['onerror']) && 'continue' == $options['onerror'] ? 'true' : 'false'
+                isset($options['onerror']) && 'continue' === $options['onerror'] ? 'true' : 'false'
             );
             ++$i;
             $chunks[$i] = str_replace($this->phpEscapeMap[0], $this->phpEscapeMap[1], $chunks[$i]);
diff --git a/core/vendor/symfony/http-kernel/HttpCache/EsiResponseCacheStrategy.php b/core/vendor/symfony/http-kernel/HttpCache/EsiResponseCacheStrategy.php
index 0d855464a..636f60e93 100644
--- a/core/vendor/symfony/http-kernel/HttpCache/EsiResponseCacheStrategy.php
+++ b/core/vendor/symfony/http-kernel/HttpCache/EsiResponseCacheStrategy.php
@@ -15,7 +15,7 @@
 
 namespace Symfony\Component\HttpKernel\HttpCache;
 
-trigger_error('The '.__NAMESPACE__.'\EsiResponseCacheStrategy class is deprecated since version 2.6 and will be removed in 3.0. Use the Symfony\Component\HttpKernel\HttpCache\ResponseCacheStrategy class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\EsiResponseCacheStrategy class is deprecated since version 2.6 and will be removed in 3.0. Use the Symfony\Component\HttpKernel\HttpCache\ResponseCacheStrategy class instead.', E_USER_DEPRECATED);
 
 /**
  * EsiResponseCacheStrategy knows how to compute the Response cache HTTP header
diff --git a/core/vendor/symfony/http-kernel/HttpCache/EsiResponseCacheStrategyInterface.php b/core/vendor/symfony/http-kernel/HttpCache/EsiResponseCacheStrategyInterface.php
index 22abb8863..2320867d4 100644
--- a/core/vendor/symfony/http-kernel/HttpCache/EsiResponseCacheStrategyInterface.php
+++ b/core/vendor/symfony/http-kernel/HttpCache/EsiResponseCacheStrategyInterface.php
@@ -15,7 +15,7 @@
 
 namespace Symfony\Component\HttpKernel\HttpCache;
 
-trigger_error('The '.__NAMESPACE__.'\EsiResponseCacheStrategyInterface class is deprecated since version 2.6 and will be removed in 3.0. Use the Symfony\Component\HttpKernel\HttpCache\ResponseCacheStrategyInterface class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\EsiResponseCacheStrategyInterface class is deprecated since version 2.6 and will be removed in 3.0. Use the Symfony\Component\HttpKernel\HttpCache\ResponseCacheStrategyInterface class instead.', E_USER_DEPRECATED);
 
 /**
  * ResponseCacheStrategyInterface implementations know how to compute the
diff --git a/core/vendor/symfony/http-kernel/HttpCache/HttpCache.php b/core/vendor/symfony/http-kernel/HttpCache/HttpCache.php
index b6ccafc18..445f59c6f 100644
--- a/core/vendor/symfony/http-kernel/HttpCache/HttpCache.php
+++ b/core/vendor/symfony/http-kernel/HttpCache/HttpCache.php
@@ -174,7 +174,7 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
      */
     public function getEsi()
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the getSurrogate() method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the getSurrogate() method instead.', E_USER_DEPRECATED);
 
         if (!$this->surrogate instanceof Esi) {
             throw new \LogicException('This instance of HttpCache was not set up to use ESI as surrogate handler. You must overwrite and use createSurrogate');
@@ -388,7 +388,7 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
         // We keep the etags from the client to handle the case when the client
         // has a different private valid entry which is not cached here.
         $cachedEtags = $entry->getEtag() ? array($entry->getEtag()) : array();
-        $requestEtags = $request->getEtags();
+        $requestEtags = $request->getETags();
         if ($etags = array_unique(array_merge($cachedEtags, $requestEtags))) {
             $subRequest->headers->set('if_none_match', implode(', ', $etags));
         }
diff --git a/core/vendor/symfony/http-kernel/Kernel.php b/core/vendor/symfony/http-kernel/Kernel.php
index 41defa205..73c4b8b41 100644
--- a/core/vendor/symfony/http-kernel/Kernel.php
+++ b/core/vendor/symfony/http-kernel/Kernel.php
@@ -60,11 +60,11 @@ abstract class Kernel implements KernelInterface, TerminableInterface
     protected $startTime;
     protected $loadClassCache;
 
-    const VERSION = '2.7.0';
-    const VERSION_ID = '20700';
+    const VERSION = '2.7.2';
+    const VERSION_ID = '20702';
     const MAJOR_VERSION = '2';
     const MINOR_VERSION = '7';
-    const RELEASE_VERSION = '0';
+    const RELEASE_VERSION = '2';
     const EXTRA_VERSION = '';
 
     const END_OF_MAINTENANCE = '05/2018';
@@ -93,7 +93,7 @@ abstract class Kernel implements KernelInterface, TerminableInterface
         $defClass = $defClass->getDeclaringClass()->name;
 
         if (__CLASS__ !== $defClass) {
-            trigger_error(sprintf('Calling the %s::init() method is deprecated since version 2.3 and will be removed in 3.0. Move your logic to the constructor method instead.', $defClass), E_USER_DEPRECATED);
+            @trigger_error(sprintf('Calling the %s::init() method is deprecated since version 2.3 and will be removed in 3.0. Move your logic to the constructor method instead.', $defClass), E_USER_DEPRECATED);
             $this->init();
         }
     }
@@ -103,7 +103,7 @@ abstract class Kernel implements KernelInterface, TerminableInterface
      */
     public function init()
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Move your logic to the constructor method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Move your logic to the constructor method instead.', E_USER_DEPRECATED);
     }
 
     public function __clone()
@@ -225,7 +225,7 @@ abstract class Kernel implements KernelInterface, TerminableInterface
      */
     public function isClassInActiveBundle($class)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in version 3.0.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in version 3.0.', E_USER_DEPRECATED);
 
         foreach ($this->getBundles() as $bundle) {
             if (0 === strpos($class, $bundle->getNamespace())) {
diff --git a/core/vendor/symfony/http-kernel/Log/NullLogger.php b/core/vendor/symfony/http-kernel/Log/NullLogger.php
index 915773b00..b9e3ac495 100644
--- a/core/vendor/symfony/http-kernel/Log/NullLogger.php
+++ b/core/vendor/symfony/http-kernel/Log/NullLogger.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\HttpKernel\Log;
 
-trigger_error('The '.__NAMESPACE__.'\NullLogger class is deprecated since version 2.2 and will be removed in 3.0. Use the Psr\Log\NullLogger class instead from the psr/log Composer package.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\NullLogger class is deprecated since version 2.2 and will be removed in 3.0. Use the Psr\Log\NullLogger class instead from the psr/log Composer package.', E_USER_DEPRECATED);
 
 use Psr\Log\NullLogger as PsrNullLogger;
 
@@ -29,7 +29,7 @@ class NullLogger extends PsrNullLogger implements LoggerInterface
      */
     public function emerg($message, array $context = array())
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. You should use the new emergency() method instead, which is PSR-3 compatible.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. You should use the new emergency() method instead, which is PSR-3 compatible.', E_USER_DEPRECATED);
     }
 
     /**
@@ -37,7 +37,7 @@ class NullLogger extends PsrNullLogger implements LoggerInterface
      */
     public function crit($message, array $context = array())
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. You should use the new critical() method instead, which is PSR-3 compatible.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. You should use the new critical() method instead, which is PSR-3 compatible.', E_USER_DEPRECATED);
     }
 
     /**
@@ -45,7 +45,7 @@ class NullLogger extends PsrNullLogger implements LoggerInterface
      */
     public function err($message, array $context = array())
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. You should use the new error() method instead, which is PSR-3 compatible.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. You should use the new error() method instead, which is PSR-3 compatible.', E_USER_DEPRECATED);
     }
 
     /**
@@ -53,6 +53,6 @@ class NullLogger extends PsrNullLogger implements LoggerInterface
      */
     public function warn($message, array $context = array())
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. You should use the new warning() method instead, which is PSR-3 compatible.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. You should use the new warning() method instead, which is PSR-3 compatible.', E_USER_DEPRECATED);
     }
 }
diff --git a/core/vendor/symfony/http-kernel/Profiler/MemcacheProfilerStorage.php b/core/vendor/symfony/http-kernel/Profiler/MemcacheProfilerStorage.php
index e90083fb7..2727405cb 100644
--- a/core/vendor/symfony/http-kernel/Profiler/MemcacheProfilerStorage.php
+++ b/core/vendor/symfony/http-kernel/Profiler/MemcacheProfilerStorage.php
@@ -41,7 +41,7 @@ class MemcacheProfilerStorage extends BaseMemcacheProfilerStorage
             $port = $matches[3];
 
             $memcache = new \Memcache();
-            $memcache->addServer($host, $port);
+            $memcache->addserver($host, $port);
 
             $this->memcache = $memcache;
         }
diff --git a/core/vendor/symfony/http-kernel/Tests/DataCollector/ConfigDataCollectorTest.php b/core/vendor/symfony/http-kernel/Tests/DataCollector/ConfigDataCollectorTest.php
index 4aa01f0e7..4a0dc263b 100644
--- a/core/vendor/symfony/http-kernel/Tests/DataCollector/ConfigDataCollectorTest.php
+++ b/core/vendor/symfony/http-kernel/Tests/DataCollector/ConfigDataCollectorTest.php
@@ -37,9 +37,9 @@ class ConfigDataCollectorTest extends \PHPUnit_Framework_TestCase
 
         // if else clause because we don't know it
         if (extension_loaded('xdebug')) {
-            $this->assertTrue($c->hasXdebug());
+            $this->assertTrue($c->hasXDebug());
         } else {
-            $this->assertFalse($c->hasXdebug());
+            $this->assertFalse($c->hasXDebug());
         }
 
         // if else clause because we don't know it
diff --git a/core/vendor/symfony/http-kernel/Tests/DependencyInjection/ContainerAwareHttpKernelTest.php b/core/vendor/symfony/http-kernel/Tests/DependencyInjection/ContainerAwareHttpKernelTest.php
index d64cf68a4..c32f5bb01 100644
--- a/core/vendor/symfony/http-kernel/Tests/DependencyInjection/ContainerAwareHttpKernelTest.php
+++ b/core/vendor/symfony/http-kernel/Tests/DependencyInjection/ContainerAwareHttpKernelTest.php
@@ -103,10 +103,10 @@ class ContainerAwareHttpKernelTest extends \PHPUnit_Framework_TestCase
         try {
             $kernel->handle($request, $type);
             $this->fail('->handle() suppresses the controller exception');
-        } catch (\PHPUnit_Framework_Exception $exception) {
-            throw $exception;
-        } catch (\Exception $actual) {
-            $this->assertSame($expected, $actual, '->handle() throws the controller exception');
+        } catch (\PHPUnit_Framework_Exception $e) {
+            throw $e;
+        } catch (\Exception $e) {
+            $this->assertSame($expected, $e, '->handle() throws the controller exception');
         }
     }
 
diff --git a/core/vendor/symfony/http-kernel/Tests/DependencyInjection/FragmentRendererPassTest.php b/core/vendor/symfony/http-kernel/Tests/DependencyInjection/FragmentRendererPassTest.php
index a46a07cf1..3e2bfd072 100644
--- a/core/vendor/symfony/http-kernel/Tests/DependencyInjection/FragmentRendererPassTest.php
+++ b/core/vendor/symfony/http-kernel/Tests/DependencyInjection/FragmentRendererPassTest.php
@@ -23,8 +23,6 @@ class FragmentRendererPassTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacyFragmentRedererWithoutAlias()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         // no alias
         $services = array(
             'my_content_renderer' => array(array()),
diff --git a/core/vendor/symfony/http-kernel/Tests/EventListener/FragmentListenerTest.php b/core/vendor/symfony/http-kernel/Tests/EventListener/FragmentListenerTest.php
index 18edee612..fd5d63b16 100644
--- a/core/vendor/symfony/http-kernel/Tests/EventListener/FragmentListenerTest.php
+++ b/core/vendor/symfony/http-kernel/Tests/EventListener/FragmentListenerTest.php
@@ -34,7 +34,6 @@ class FragmentListenerTest extends \PHPUnit_Framework_TestCase
         $this->assertTrue($request->query->has('_path'));
     }
 
-
     public function testOnlyTriggeredIfControllerWasNotDefinedYet()
     {
         $request = Request::create('http://example.com/_fragment?_path=foo%3Dbar%26_controller%3Dfoo');
diff --git a/core/vendor/symfony/http-kernel/Tests/EventListener/ProfilerListenerTest.php b/core/vendor/symfony/http-kernel/Tests/EventListener/ProfilerListenerTest.php
index 605ea9dd2..84ff0d6f5 100644
--- a/core/vendor/symfony/http-kernel/Tests/EventListener/ProfilerListenerTest.php
+++ b/core/vendor/symfony/http-kernel/Tests/EventListener/ProfilerListenerTest.php
@@ -29,8 +29,6 @@ class ProfilerListenerTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacyEventsWithoutRequestStack()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $profile = $this->getMockBuilder('Symfony\Component\HttpKernel\Profiler\Profile')
             ->disableOriginalConstructor()
             ->getMock();
diff --git a/core/vendor/symfony/http-kernel/Tests/KernelTest.php b/core/vendor/symfony/http-kernel/Tests/KernelTest.php
index 2b75ba222..c9e00dd68 100644
--- a/core/vendor/symfony/http-kernel/Tests/KernelTest.php
+++ b/core/vendor/symfony/http-kernel/Tests/KernelTest.php
@@ -344,8 +344,6 @@ EOF;
 
     protected function getKernelMockForIsClassInActiveBundleTest()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $bundle = new FooBarBundle();
 
         $kernel = $this->getKernel(array('getBundles'));
diff --git a/core/vendor/symfony/http-kernel/Tests/Logger.php b/core/vendor/symfony/http-kernel/Tests/Logger.php
index 017518a30..54300960d 100644
--- a/core/vendor/symfony/http-kernel/Tests/Logger.php
+++ b/core/vendor/symfony/http-kernel/Tests/Logger.php
@@ -91,7 +91,7 @@ class Logger implements LoggerInterface
      */
     public function emerg($message, array $context = array())
     {
-        trigger_error('Use emergency() which is PSR-3 compatible', E_USER_DEPRECATED);
+        @trigger_error('Use emergency() which is PSR-3 compatible', E_USER_DEPRECATED);
 
         $this->log('emergency', $message, $context);
     }
@@ -101,7 +101,7 @@ class Logger implements LoggerInterface
      */
     public function crit($message, array $context = array())
     {
-        trigger_error('Use critical() which is PSR-3 compatible', E_USER_DEPRECATED);
+        @trigger_error('Use critical() which is PSR-3 compatible', E_USER_DEPRECATED);
 
         $this->log('critical', $message, $context);
     }
@@ -111,7 +111,7 @@ class Logger implements LoggerInterface
      */
     public function err($message, array $context = array())
     {
-        trigger_error('Use error() which is PSR-3 compatible', E_USER_DEPRECATED);
+        @trigger_error('Use error() which is PSR-3 compatible', E_USER_DEPRECATED);
 
         $this->log('error', $message, $context);
     }
@@ -121,7 +121,7 @@ class Logger implements LoggerInterface
      */
     public function warn($message, array $context = array())
     {
-        trigger_error('Use warning() which is PSR-3 compatible', E_USER_DEPRECATED);
+        @trigger_error('Use warning() which is PSR-3 compatible', E_USER_DEPRECATED);
 
         $this->log('warning', $message, $context);
     }
diff --git a/core/vendor/symfony/process/.gitignore b/core/vendor/symfony/process/.gitignore
new file mode 100644
index 000000000..c49a5d8df
--- /dev/null
+++ b/core/vendor/symfony/process/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/core/vendor/symfony/process/PhpExecutableFinder.php b/core/vendor/symfony/process/PhpExecutableFinder.php
index 91d6d78a6..f8f57cc53 100644
--- a/core/vendor/symfony/process/PhpExecutableFinder.php
+++ b/core/vendor/symfony/process/PhpExecutableFinder.php
@@ -37,7 +37,7 @@ class PhpExecutableFinder
     {
         // HHVM support
         if (defined('HHVM_VERSION')) {
-            return (false !== ($hhvm = getenv('PHP_BINARY')) ? $hhvm : PHP_BINARY).($includeArgs ? ' '.implode(' ', $this->findArguments()) : '');
+            return (getenv('PHP_BINARY') ?: PHP_BINARY).($includeArgs ? ' '.implode(' ', $this->findArguments()) : '');
         }
 
         // PHP_BINARY return the current sapi executable
diff --git a/core/vendor/symfony/process/Process.php b/core/vendor/symfony/process/Process.php
index fdb395de8..1474d6982 100644
--- a/core/vendor/symfony/process/Process.php
+++ b/core/vendor/symfony/process/Process.php
@@ -1069,7 +1069,7 @@ class Process
      */
     public function getStdin()
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Use the getInput() method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Use the getInput() method instead.', E_USER_DEPRECATED);
 
         return $this->getInput();
     }
@@ -1099,7 +1099,7 @@ class Process
      */
     public function setStdin($stdin)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Use the setInput() method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Use the setInput() method instead.', E_USER_DEPRECATED);
 
         return $this->setInput($stdin);
     }
diff --git a/core/vendor/symfony/process/ProcessUtils.php b/core/vendor/symfony/process/ProcessUtils.php
index 488010bac..4f30b630d 100644
--- a/core/vendor/symfony/process/ProcessUtils.php
+++ b/core/vendor/symfony/process/ProcessUtils.php
@@ -49,7 +49,7 @@ class ProcessUtils
 
             $escapedArgument = '';
             $quote = false;
-            foreach (preg_split('/(")/i', $argument, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE) as $part) {
+            foreach (preg_split('/(")/', $argument, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE) as $part) {
                 if ('"' === $part) {
                     $escapedArgument .= '\\"';
                 } elseif (self::isSurroundedBy($part, '%')) {
@@ -97,7 +97,7 @@ class ProcessUtils
             }
             // deprecated as of Symfony 2.5, to be removed in 3.0
             if (is_object($input) && method_exists($input, '__toString')) {
-                trigger_error('Passing an object as an input is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
+                @trigger_error('Passing an object as an input is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
 
                 return (string) $input;
             }
diff --git a/core/vendor/symfony/process/Tests/AbstractProcessTest.php b/core/vendor/symfony/process/Tests/AbstractProcessTest.php
index 2a4d583cb..2add8cc93 100644
--- a/core/vendor/symfony/process/Tests/AbstractProcessTest.php
+++ b/core/vendor/symfony/process/Tests/AbstractProcessTest.php
@@ -11,21 +11,30 @@
 
 namespace Symfony\Component\Process\Tests;
 
-use Symfony\Component\Process\Exception\ProcessTimedOutException;
 use Symfony\Component\Process\Exception\LogicException;
+use Symfony\Component\Process\Exception\ProcessTimedOutException;
+use Symfony\Component\Process\Exception\RuntimeException;
+use Symfony\Component\Process\PhpExecutableFinder;
 use Symfony\Component\Process\Pipes\PipesInterface;
 use Symfony\Component\Process\Process;
-use Symfony\Component\Process\Exception\RuntimeException;
 
 /**
  * @author Robert Schönthal <seroscho@googlemail.com>
  */
 abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
 {
+    protected static $phpBin;
+
+    public static function setUpBeforeClass()
+    {
+        $phpBin = new PhpExecutableFinder();
+        self::$phpBin = $phpBin->find();
+    }
+
     public function testThatProcessDoesNotThrowWarningDuringRun()
     {
         @trigger_error('Test Error', E_USER_NOTICE);
-        $process = $this->getProcess("php -r 'sleep(3)'");
+        $process = $this->getProcess(self::$phpBin." -r 'sleep(3)'");
         $process->run();
         $actualError = error_get_last();
         $this->assertEquals('Test Error', $actualError['message']);
@@ -95,7 +104,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
         $expectedOutputSize = PipesInterface::CHUNK_SIZE * 2 + 2;
 
         $code = sprintf('echo str_repeat(\'*\', %d);', $expectedOutputSize);
-        $p = $this->getProcess(sprintf('php -r %s', escapeshellarg($code)));
+        $p = $this->getProcess(sprintf('%s -r %s', self::$phpBin, escapeshellarg($code)));
 
         $p->start();
         // Let's wait enough time for process to finish...
@@ -134,7 +143,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
      */
     public function testProcessResponses($expected, $getter, $code)
     {
-        $p = $this->getProcess(sprintf('php -r %s', escapeshellarg($code)));
+        $p = $this->getProcess(sprintf('%s -r %s', self::$phpBin, escapeshellarg($code)));
         $p->run();
 
         $this->assertSame($expected, $p->$getter());
@@ -150,7 +159,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
         $expected = str_repeat(str_repeat('*', 1024), $size).'!';
         $expectedLength = (1024 * $size) + 1;
 
-        $p = $this->getProcess(sprintf('php -r %s', escapeshellarg($code)));
+        $p = $this->getProcess(sprintf('%s -r %s', self::$phpBin, escapeshellarg($code)));
         $p->setInput($expected);
         $p->run();
 
@@ -170,7 +179,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
         fwrite($stream, $expected);
         rewind($stream);
 
-        $p = $this->getProcess(sprintf('php -r %s', escapeshellarg($code)));
+        $p = $this->getProcess(sprintf('%s -r %s', self::$phpBin, escapeshellarg($code)));
         $p->setInput($stream);
         $p->run();
 
@@ -182,7 +191,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
 
     public function testSetInputWhileRunningThrowsAnException()
     {
-        $process = $this->getProcess('php -r "usleep(500000);"');
+        $process = $this->getProcess(self::$phpBin.' -r "usleep(500000);"');
         $process->start();
         try {
             $process->setInput('foobar');
@@ -201,7 +210,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
      */
     public function testInvalidInput($value)
     {
-        $process = $this->getProcess('php -v');
+        $process = $this->getProcess(self::$phpBin.' -v');
         $process->setInput($value);
     }
 
@@ -218,7 +227,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
      */
     public function testValidInput($expected, $value)
     {
-        $process = $this->getProcess('php -v');
+        $process = $this->getProcess(self::$phpBin.' -v');
         $process->setInput($value);
         $this->assertSame($expected, $process->getInput());
     }
@@ -238,9 +247,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacyValidInput($expected, $value)
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
-        $process = $this->getProcess('php -v');
+        $process = $this->getProcess(self::$phpBin.' -v');
         $process->setInput($value);
         $this->assertSame($expected, $process->getInput());
     }
@@ -278,7 +285,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
 
     public function testCallbackIsExecutedForOutput()
     {
-        $p = $this->getProcess(sprintf('php -r %s', escapeshellarg('echo \'foo\';')));
+        $p = $this->getProcess(sprintf('%s -r %s', self::$phpBin, escapeshellarg('echo \'foo\';')));
 
         $called = false;
         $p->run(function ($type, $buffer) use (&$called) {
@@ -290,7 +297,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
 
     public function testGetErrorOutput()
     {
-        $p = $this->getProcess(sprintf('php -r %s', escapeshellarg('$n = 0; while ($n < 3) { file_put_contents(\'php://stderr\', \'ERROR\'); $n++; }')));
+        $p = $this->getProcess(sprintf('%s -r %s', self::$phpBin, escapeshellarg('$n = 0; while ($n < 3) { file_put_contents(\'php://stderr\', \'ERROR\'); $n++; }')));
 
         $p->run();
         $this->assertEquals(3, preg_match_all('/ERROR/', $p->getErrorOutput(), $matches));
@@ -303,7 +310,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
         $lock = tempnam(sys_get_temp_dir(), get_class($this).'Lock');
         file_put_contents($lock, 'W');
 
-        $p = $this->getProcess(sprintf('php -r %s', escapeshellarg('$n = 0; while ($n < 3) { if (\'W\' === file_get_contents('.var_export($lock, true).')) { file_put_contents(\'php://stderr\', \'ERROR\'); $n++; file_put_contents('.var_export($lock, true).', \'R\'); } usleep(100); }')));
+        $p = $this->getProcess(sprintf('%s -r %s', self::$phpBin, escapeshellarg('$n = 0; while ($n < 3) { if (\'W\' === file_get_contents('.var_export($lock, true).')) { file_put_contents(\'php://stderr\', \'ERROR\'); $n++; file_put_contents('.var_export($lock, true).', \'R\'); } usleep(100); }')));
 
         $p->start();
         while ($p->isRunning()) {
@@ -319,7 +326,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
 
     public function testFlushErrorOutput()
     {
-        $p = $this->getProcess(sprintf('php -r %s', escapeshellarg('$n = 0; while ($n < 3) { file_put_contents(\'php://stderr\', \'ERROR\'); $n++; }')));
+        $p = $this->getProcess(sprintf('%s -r %s', self::$phpBin, escapeshellarg('$n = 0; while ($n < 3) { file_put_contents(\'php://stderr\', \'ERROR\'); $n++; }')));
 
         $p->run();
         $p->clearErrorOutput();
@@ -333,7 +340,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
         $lock = tempnam(sys_get_temp_dir(), get_class($this).'Lock');
         file_put_contents($lock, 'W');
 
-        $p = $this->getProcess(sprintf('php -r %s', escapeshellarg('$n = 0; while ($n < 3) { if (\'W\' === file_get_contents('.var_export($lock, true).')) { file_put_contents(\'php://stderr\', \'ERROR\'); $n++; file_put_contents('.var_export($lock, true).', \'R\'); } usleep(100); }')));
+        $p = $this->getProcess(sprintf('%s -r %s', self::$phpBin, escapeshellarg('$n = 0; while ($n < 3) { if (\'W\' === file_get_contents('.var_export($lock, true).')) { file_put_contents(\'php://stderr\', \'ERROR\'); $n++; file_put_contents('.var_export($lock, true).', \'R\'); } usleep(100); }')));
 
         $p->start();
 
@@ -359,7 +366,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
 
     public function testGetOutput()
     {
-        $p = $this->getProcess(sprintf('php -r %s', escapeshellarg('$n = 0; while ($n < 3) { echo \' foo \'; $n++; }')));
+        $p = $this->getProcess(sprintf('%s -r %s', self::$phpBin, escapeshellarg('$n = 0; while ($n < 3) { echo \' foo \'; $n++; }')));
 
         $p->run();
         $this->assertEquals(3, preg_match_all('/foo/', $p->getOutput(), $matches));
@@ -372,7 +379,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
         $lock = tempnam(sys_get_temp_dir(), get_class($this).'Lock');
         file_put_contents($lock, 'W');
 
-        $p = $this->getProcess(sprintf('php -r %s', escapeshellarg('$n = 0; while ($n < 3) { if (\'W\' === file_get_contents('.var_export($lock, true).')) { echo \' foo \'; $n++; file_put_contents('.var_export($lock, true).', \'R\'); } usleep(100); }')));
+        $p = $this->getProcess(sprintf('%s -r %s', self::$phpBin, escapeshellarg('$n = 0; while ($n < 3) { if (\'W\' === file_get_contents('.var_export($lock, true).')) { echo \' foo \'; $n++; file_put_contents('.var_export($lock, true).', \'R\'); } usleep(100); }')));
 
         $p->start();
         while ($p->isRunning()) {
@@ -388,7 +395,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
 
     public function testFlushOutput()
     {
-        $p = $this->getProcess(sprintf('php -r %s', escapeshellarg('$n=0;while ($n<3) {echo \' foo \';$n++;}')));
+        $p = $this->getProcess(sprintf('%s -r %s', self::$phpBin, escapeshellarg('$n=0;while ($n<3) {echo \' foo \';$n++;}')));
 
         $p->run();
         $p->clearOutput();
@@ -402,7 +409,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
         $lock = tempnam(sys_get_temp_dir(), get_class($this).'Lock');
         file_put_contents($lock, 'W');
 
-        $p = $this->getProcess(sprintf('php -r %s', escapeshellarg('$n = 0; while ($n < 3) { if (\'W\' === file_get_contents('.var_export($lock, true).')) { echo \' foo \'; $n++; file_put_contents('.var_export($lock, true).', \'R\'); } usleep(100); }')));
+        $p = $this->getProcess(sprintf('%s -r %s', self::$phpBin, escapeshellarg('$n = 0; while ($n < 3) { if (\'W\' === file_get_contents('.var_export($lock, true).')) { echo \' foo \'; $n++; file_put_contents('.var_export($lock, true).', \'R\'); } usleep(100); }')));
 
         $p->start();
 
@@ -548,7 +555,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
 
     public function testStartIsNonBlocking()
     {
-        $process = $this->getProcess('php -r "usleep(500000);"');
+        $process = $this->getProcess(self::$phpBin.' -r "usleep(500000);"');
         $start = microtime(true);
         $process->start();
         $end = microtime(true);
@@ -558,14 +565,14 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
 
     public function testUpdateStatus()
     {
-        $process = $this->getProcess('php -h');
+        $process = $this->getProcess(self::$phpBin.' -v');
         $process->run();
         $this->assertTrue(strlen($process->getOutput()) > 0);
     }
 
     public function testGetExitCodeIsNullOnStart()
     {
-        $process = $this->getProcess('php -r "usleep(200000);"');
+        $process = $this->getProcess(self::$phpBin.' -r "usleep(200000);"');
         $this->assertNull($process->getExitCode());
         $process->start();
         $this->assertNull($process->getExitCode());
@@ -575,7 +582,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
 
     public function testGetExitCodeIsNullOnWhenStartingAgain()
     {
-        $process = $this->getProcess('php -r "usleep(200000);"');
+        $process = $this->getProcess(self::$phpBin.' -r "usleep(200000);"');
         $process->run();
         $this->assertEquals(0, $process->getExitCode());
         $process->start();
@@ -586,14 +593,14 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
 
     public function testGetExitCode()
     {
-        $process = $this->getProcess('php -m');
+        $process = $this->getProcess(self::$phpBin.' -v');
         $process->run();
         $this->assertSame(0, $process->getExitCode());
     }
 
     public function testStatus()
     {
-        $process = $this->getProcess('php -r "usleep(500000);"');
+        $process = $this->getProcess(self::$phpBin.' -r "usleep(500000);"');
         $this->assertFalse($process->isRunning());
         $this->assertFalse($process->isStarted());
         $this->assertFalse($process->isTerminated());
@@ -612,7 +619,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
 
     public function testStop()
     {
-        $process = $this->getProcess('php -r "sleep(4);"');
+        $process = $this->getProcess(self::$phpBin.' -r "sleep(4);"');
         $process->start();
         $this->assertTrue($process->isRunning());
         $process->stop();
@@ -621,14 +628,14 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
 
     public function testIsSuccessful()
     {
-        $process = $this->getProcess('php -m');
+        $process = $this->getProcess(self::$phpBin.' -v');
         $process->run();
         $this->assertTrue($process->isSuccessful());
     }
 
     public function testIsSuccessfulOnlyAfterTerminated()
     {
-        $process = $this->getProcess('php -r "sleep(1);"');
+        $process = $this->getProcess(self::$phpBin.' -r "sleep(1);"');
         $process->start();
         while ($process->isRunning()) {
             $this->assertFalse($process->isSuccessful());
@@ -640,7 +647,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
 
     public function testIsNotSuccessful()
     {
-        $process = $this->getProcess('php -r "usleep(500000);throw new \Exception(\'BOUM\');"');
+        $process = $this->getProcess(self::$phpBin.' -r "usleep(500000);throw new \Exception(\'BOUM\');"');
         $process->start();
         $this->assertTrue($process->isRunning());
         $process->wait();
@@ -653,7 +660,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
             $this->markTestSkipped('Windows does not support POSIX signals');
         }
 
-        $process = $this->getProcess('php -m');
+        $process = $this->getProcess(self::$phpBin.' -v');
         $process->run();
         $this->assertFalse($process->hasBeenSignaled());
     }
@@ -664,7 +671,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
             $this->markTestSkipped('Windows does not support POSIX signals');
         }
 
-        $process = $this->getProcess('php -m');
+        $process = $this->getProcess(self::$phpBin.' -v');
         $process->run();
         $this->assertFalse($process->hasBeenSignaled());
     }
@@ -675,7 +682,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
             $this->markTestSkipped('Windows does not support POSIX signals');
         }
 
-        $process = $this->getProcess('php -m');
+        $process = $this->getProcess(self::$phpBin.' -v');
         $process->run();
         $this->assertEquals(0, $process->getTermSignal());
     }
@@ -686,7 +693,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
             $this->markTestSkipped('Windows does not support POSIX signals');
         }
 
-        $process = $this->getProcess('php -r "sleep(4);"');
+        $process = $this->getProcess(self::$phpBin.' -r "sleep(4);"');
         $process->start();
         $process->stop();
         $this->assertTrue($process->hasBeenSignaled());
@@ -701,7 +708,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
         // SIGTERM is only defined if pcntl extension is present
         $termSignal = defined('SIGTERM') ? SIGTERM : 15;
 
-        $process = $this->getProcess('php -r "sleep(4);"');
+        $process = $this->getProcess(self::$phpBin.' -r "sleep(4);"');
         $process->start();
         $process->stop();
 
@@ -730,7 +737,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
 
     public function testRestart()
     {
-        $process1 = $this->getProcess('php -r "echo getmypid();"');
+        $process1 = $this->getProcess(self::$phpBin.' -r "echo getmypid();"');
         $process1->run();
         $process2 = $process1->restart();
 
@@ -752,7 +759,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
 
         // Sleep doesn't work as it will allow the process to handle signals and close
         // file handles from the other end.
-        $process = $this->getProcess('php -r "while (true) {}"');
+        $process = $this->getProcess(self::$phpBin.' -r "while (true) {}"');
         $process->start();
 
         // PHP will deadlock when it tries to cleanup $process
@@ -761,7 +768,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
     public function testRunProcessWithTimeout()
     {
         $timeout = 0.5;
-        $process = $this->getProcess('php -r "usleep(600000);"');
+        $process = $this->getProcess(self::$phpBin.' -r "usleep(600000);"');
         $process->setTimeout($timeout);
         $start = microtime(true);
         try {
@@ -783,13 +790,13 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
 
     public function testCheckTimeoutOnNonStartedProcess()
     {
-        $process = $this->getProcess('php -r "sleep(3);"');
+        $process = $this->getProcess(self::$phpBin.' -r "sleep(3);"');
         $process->checkTimeout();
     }
 
     public function testCheckTimeoutOnTerminatedProcess()
     {
-        $process = $this->getProcess('php -v');
+        $process = $this->getProcess(self::$phpBin.' -v');
         $process->run();
         $process->checkTimeout();
     }
@@ -798,7 +805,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
     {
         $timeout = 0.5;
         $precision = 100000;
-        $process = $this->getProcess('php -r "sleep(3);"');
+        $process = $this->getProcess(self::$phpBin.' -r "sleep(3);"');
         $process->setTimeout($timeout);
         $start = microtime(true);
 
@@ -820,7 +827,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
 
     public function testIdleTimeout()
     {
-        $process = $this->getProcess('php -r "sleep(3);"');
+        $process = $this->getProcess(self::$phpBin.' -r "sleep(3);"');
         $process->setTimeout(10);
         $process->setIdleTimeout(0.5);
 
@@ -837,7 +844,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
 
     public function testIdleTimeoutNotExceededWhenOutputIsSent()
     {
-        $process = $this->getProcess(sprintf('php -r %s', escapeshellarg('$n = 30; while ($n--) {echo "foo\n"; usleep(100000); }')));
+        $process = $this->getProcess(sprintf('%s -r %s', self::$phpBin, escapeshellarg('$n = 30; while ($n--) {echo "foo\n"; usleep(100000); }')));
         $process->setTimeout(2);
         $process->setIdleTimeout(1);
 
@@ -853,7 +860,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
 
     public function testStartAfterATimeout()
     {
-        $process = $this->getProcess(sprintf('php -r %s', escapeshellarg('$n = 1000; while ($n--) {echo \'\'; usleep(1000); }')));
+        $process = $this->getProcess(sprintf('%s -r %s', self::$phpBin, escapeshellarg('$n = 1000; while ($n--) {echo \'\'; usleep(1000); }')));
         $process->setTimeout(0.1);
 
         try {
@@ -868,7 +875,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
 
     public function testGetPid()
     {
-        $process = $this->getProcess('php -r "usleep(500000);"');
+        $process = $this->getProcess(self::$phpBin.' -r "usleep(500000);"');
         $process->start();
         $this->assertGreaterThan(0, $process->getPid());
         $process->wait();
@@ -876,13 +883,13 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
 
     public function testGetPidIsNullBeforeStart()
     {
-        $process = $this->getProcess('php -r "sleep(1);"');
+        $process = $this->getProcess(self::$phpBin.' -r "sleep(1);"');
         $this->assertNull($process->getPid());
     }
 
     public function testGetPidIsNullAfterRun()
     {
-        $process = $this->getProcess('php -m');
+        $process = $this->getProcess(self::$phpBin.' -v');
         $process->run();
         $this->assertNull($process->getPid());
     }
@@ -927,7 +934,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
     public function testSignalProcessNotRunning()
     {
         $this->verifyPosixIsEnabled();
-        $process = $this->getProcess('php -m');
+        $process = $this->getProcess(self::$phpBin.' -v');
         $process->signal(SIGHUP);
     }
 
@@ -936,7 +943,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
      */
     public function testMethodsThatNeedARunningProcess($method)
     {
-        $process = $this->getProcess('php -m');
+        $process = $this->getProcess(self::$phpBin.' -v');
         $this->setExpectedException('Symfony\Component\Process\Exception\LogicException', sprintf('Process must be started before calling %s.', $method));
         $process->{$method}();
     }
@@ -957,7 +964,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
      */
     public function testMethodsThatNeedATerminatedProcess($method)
     {
-        $process = $this->getProcess('php -r "sleep(1);"');
+        $process = $this->getProcess(self::$phpBin.' -r "sleep(1);"');
         $process->start();
         try {
             $process->{$method}();
@@ -999,7 +1006,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
             $this->markTestSkipped('POSIX signals do not work on Windows');
         }
 
-        $process = $this->getProcess('php -r "sleep(3);"');
+        $process = $this->getProcess(self::$phpBin.' -r "sleep(3);"');
         $process->start();
         $process->signal(-4);
     }
@@ -1013,14 +1020,14 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
             $this->markTestSkipped('POSIX signals do not work on Windows');
         }
 
-        $process = $this->getProcess('php -r "sleep(3);"');
+        $process = $this->getProcess(self::$phpBin.' -r "sleep(3);"');
         $process->start();
         $process->signal('Céphalopodes');
     }
 
     public function testDisableOutputDisablesTheOutput()
     {
-        $p = $this->getProcess('php -r "usleep(500000);"');
+        $p = $this->getProcess(self::$phpBin.' -r "usleep(500000);"');
         $this->assertFalse($p->isOutputDisabled());
         $p->disableOutput();
         $this->assertTrue($p->isOutputDisabled());
@@ -1030,7 +1037,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
 
     public function testDisableOutputWhileRunningThrowsException()
     {
-        $p = $this->getProcess('php -r "usleep(500000);"');
+        $p = $this->getProcess(self::$phpBin.' -r "usleep(500000);"');
         $p->start();
         $this->setExpectedException('Symfony\Component\Process\Exception\RuntimeException', 'Disabling output while the process is running is not possible.');
         $p->disableOutput();
@@ -1038,7 +1045,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
 
     public function testEnableOutputWhileRunningThrowsException()
     {
-        $p = $this->getProcess('php -r "usleep(500000);"');
+        $p = $this->getProcess(self::$phpBin.' -r "usleep(500000);"');
         $p->disableOutput();
         $p->start();
         $this->setExpectedException('Symfony\Component\Process\Exception\RuntimeException', 'Enabling output while the process is running is not possible.');
@@ -1047,7 +1054,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
 
     public function testEnableOrDisableOutputAfterRunDoesNotThrowException()
     {
-        $p = $this->getProcess('php -r "usleep(500000);"');
+        $p = $this->getProcess(self::$phpBin.' -r "usleep(500000);"');
         $p->disableOutput();
         $p->start();
         $p->wait();
@@ -1083,7 +1090,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
      */
     public function testStartWithACallbackAndDisabledOutput($startMethod, $exception, $exceptionMessage)
     {
-        $p = $this->getProcess('php -r "usleep(500000);"');
+        $p = $this->getProcess(self::$phpBin.' -r "usleep(500000);"');
         $p->disableOutput();
         $this->setExpectedException($exception, $exceptionMessage);
         $p->{$startMethod}(function () {});
@@ -1103,7 +1110,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
      */
     public function testGetOutputWhileDisabled($fetchMethod)
     {
-        $p = $this->getProcess('php -r "usleep(500000);"');
+        $p = $this->getProcess(self::$phpBin.' -r "usleep(500000);"');
         $p->disableOutput();
         $p->start();
         $this->setExpectedException('Symfony\Component\Process\Exception\LogicException', 'Output has been disabled.');
diff --git a/core/vendor/symfony/process/Tests/ExecutableFinderTest.php b/core/vendor/symfony/process/Tests/ExecutableFinderTest.php
index 20b12b1c3..61a471b4f 100644
--- a/core/vendor/symfony/process/Tests/ExecutableFinderTest.php
+++ b/core/vendor/symfony/process/Tests/ExecutableFinderTest.php
@@ -102,7 +102,7 @@ class ExecutableFinderTest extends \PHPUnit_Framework_TestCase
             $this->markTestSkipped('Cannot test when open_basedir is set');
         }
 
-        $this->iniSet('open_basedir', dirname(PHP_BINARY).PATH_SEPARATOR.'/');
+        $this->iniSet('open_basedir', dirname(PHP_BINARY).(!defined('HHVM_VERSION') ? PATH_SEPARATOR.'/' : ''));
 
         $finder = new ExecutableFinder();
         $result = $finder->find($this->getPhpBinaryName());
@@ -125,7 +125,7 @@ class ExecutableFinderTest extends \PHPUnit_Framework_TestCase
         }
 
         $this->setPath('');
-        $this->iniSet('open_basedir', PHP_BINARY.PATH_SEPARATOR.'/');
+        $this->iniSet('open_basedir', PHP_BINARY.(!defined('HHVM_VERSION') ? PATH_SEPARATOR.'/' : ''));
 
         $finder = new ExecutableFinder();
         $result = $finder->find($this->getPhpBinaryName(), false);
diff --git a/core/vendor/symfony/process/Tests/PhpExecutableFinderTest.php b/core/vendor/symfony/process/Tests/PhpExecutableFinderTest.php
index 3acccacc3..cd4abedc9 100644
--- a/core/vendor/symfony/process/Tests/PhpExecutableFinderTest.php
+++ b/core/vendor/symfony/process/Tests/PhpExecutableFinderTest.php
@@ -53,10 +53,10 @@ class PhpExecutableFinderTest extends \PHPUnit_Framework_TestCase
 
         $f = new PhpExecutableFinder();
 
-        $current = $f->find();
+        $current = getenv('PHP_BINARY') ?: PHP_BINARY;
 
-        $this->assertEquals($f->find(), $current.' --php', '::find() returns the executable PHP');
-        $this->assertEquals($f->find(false), $current, '::find() returns the executable PHP');
+        $this->assertEquals($current.' --php', $f->find(), '::find() returns the executable PHP');
+        $this->assertEquals($current, $f->find(false), '::find() returns the executable PHP');
     }
 
     /**
@@ -91,7 +91,7 @@ class PhpExecutableFinderTest extends \PHPUnit_Framework_TestCase
         //TODO maybe php executable is custom or even Windows
         if ('\\' === DIRECTORY_SEPARATOR) {
             $this->assertTrue(is_executable($current));
-            $this->assertTrue((bool) preg_match('/'.addSlashes(DIRECTORY_SEPARATOR).'php\.(exe|bat|cmd|com)$/i', $current), '::find() returns the executable PHP with suffixes');
+            $this->assertTrue((bool) preg_match('/'.addslashes(DIRECTORY_SEPARATOR).'php\.(exe|bat|cmd|com)$/i', $current), '::find() returns the executable PHP with suffixes');
         }
     }
 }
diff --git a/core/vendor/symfony/process/Tests/PipeStdinInStdoutStdErrStreamSelect.php b/core/vendor/symfony/process/Tests/PipeStdinInStdoutStdErrStreamSelect.php
index 89d1f6a1a..26673ea45 100644
--- a/core/vendor/symfony/process/Tests/PipeStdinInStdoutStdErrStreamSelect.php
+++ b/core/vendor/symfony/process/Tests/PipeStdinInStdoutStdErrStreamSelect.php
@@ -32,7 +32,7 @@ while ($read || $write) {
         }
         $out = (binary) substr($out, $written);
     }
-    if (null === $read && strlen($out) < 1) {
+    if (null === $read && '' === $out) {
         $write = array_diff($write, array(STDOUT));
     }
 
@@ -43,7 +43,7 @@ while ($read || $write) {
         }
         $err = (binary) substr($err, $written);
     }
-    if (null === $read && strlen($err) < 1) {
+    if (null === $read && '' === $err) {
         $write = array_diff($write, array(STDERR));
     }
 
diff --git a/core/vendor/symfony/process/Tests/SimpleProcessTest.php b/core/vendor/symfony/process/Tests/SimpleProcessTest.php
index 4bf9ad87c..98eeb0ecb 100644
--- a/core/vendor/symfony/process/Tests/SimpleProcessTest.php
+++ b/core/vendor/symfony/process/Tests/SimpleProcessTest.php
@@ -150,7 +150,7 @@ class SimpleProcessTest extends AbstractProcessTest
     public function testStopTerminatesProcessCleanly()
     {
         try {
-            $process = $this->getProcess('php -r "echo \'foo\'; sleep(1); echo \'bar\';"');
+            $process = $this->getProcess(self::$phpBin.' -r "echo \'foo\'; sleep(1); echo \'bar\';"');
             $process->run(function () use ($process) {
                 $process->stop();
             });
@@ -164,7 +164,7 @@ class SimpleProcessTest extends AbstractProcessTest
         $this->expectExceptionIfPHPSigchild('Symfony\Component\Process\Exception\RuntimeException', 'This PHP has been compiled with --enable-sigchild. The process can not be signaled.');
 
         try {
-            $process = $this->getProcess('php -r "echo \'foo\'; sleep(1); echo \'bar\';"');
+            $process = $this->getProcess(self::$phpBin.' -r "echo \'foo\'; sleep(1); echo \'bar\';"');
             $process->run(function () use ($process) {
                 if ($process->isRunning()) {
                     $process->signal(defined('SIGKILL') ? SIGKILL : 9);
@@ -180,7 +180,7 @@ class SimpleProcessTest extends AbstractProcessTest
         $this->expectExceptionIfPHPSigchild('Symfony\Component\Process\Exception\RuntimeException', 'This PHP has been compiled with --enable-sigchild. The process can not be signaled.');
 
         try {
-            $process = $this->getProcess('php -r "echo \'foo\'; sleep(1); echo \'bar\';"');
+            $process = $this->getProcess(self::$phpBin.' -r "echo \'foo\'; sleep(1); echo \'bar\';"');
             $process->run(function () use ($process) {
                 if ($process->isRunning()) {
                     $process->signal(defined('SIGTERM') ? SIGTERM : 15);
diff --git a/core/vendor/symfony/psr-http-message-bridge/.travis.yml b/core/vendor/symfony/psr-http-message-bridge/.travis.yml
new file mode 100644
index 000000000..39e7eb618
--- /dev/null
+++ b/core/vendor/symfony/psr-http-message-bridge/.travis.yml
@@ -0,0 +1,43 @@
+language: php
+
+sudo: false
+
+matrix:
+    include:
+        - php: 5.3
+        - php: 5.4
+        - php: 5.5
+        - php: 5.6
+        - php: 5.3
+          env: deps=low
+        - php: 5.6
+          env: deps=high
+        - php: nightly
+        - php: hhvm
+    allow_failures:
+        - php: nightly
+        - php: hhvm
+    fast_finish: true
+
+env:
+    global:
+        - deps=no
+        - SYMFONY_DEPRECATIONS_HELPER=weak
+
+before_install:
+    - composer self-update
+    - if [[ "$TRAVIS_PHP_VERSION" != "nightly" ]] && [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then phpenv config-rm xdebug.ini; fi;
+    - if [[ "$TRAVIS_PHP_VERSION" != "nightly" ]] && [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]] && [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;
+    - if [[ "$TRAVIS_PHP_VERSION" != "nightly" ]] && [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then php -i; fi;
+    # Set the COMPOSER_ROOT_VERSION to the right version according to the branch being built
+    - if [ "$TRAVIS_BRANCH" = "master" ]; then export COMPOSER_ROOT_VERSION=dev-master; else export COMPOSER_ROOT_VERSION="$TRAVIS_BRANCH".x-dev; fi;
+
+install:
+    - if [[ "$TRAVIS_PHP_VERSION" != "5.3" ]] && [[ "$TRAVIS_PHP_VERSION" != "5.4" ]]; then composer require --no-update zendframework/zend-diactoros; fi;
+    - if [ "$deps" = "no" ]; then export SYMFONY_DEPRECATIONS_HELPER=strict; fi;
+    - if [ "$deps" = "no" ]; then composer --prefer-source install; fi;
+    - if [ "$deps" = "high" ]; then composer --prefer-source update; fi;
+    - if [ "$deps" = "low" ]; then composer --prefer-source --prefer-lowest --prefer-stable update; fi;
+
+script:
+    - phpunit
diff --git a/core/vendor/symfony/psr-http-message-bridge/CHANGELOG.md b/core/vendor/symfony/psr-http-message-bridge/CHANGELOG.md
new file mode 100644
index 000000000..569522f7c
--- /dev/null
+++ b/core/vendor/symfony/psr-http-message-bridge/CHANGELOG.md
@@ -0,0 +1,7 @@
+CHANGELOG
+=========
+
+2.8.0
+-----
+
+ * added the component
diff --git a/core/vendor/symfony/psr-http-message-bridge/Factory/DiactorosFactory.php b/core/vendor/symfony/psr-http-message-bridge/Factory/DiactorosFactory.php
new file mode 100644
index 000000000..31726f15a
--- /dev/null
+++ b/core/vendor/symfony/psr-http-message-bridge/Factory/DiactorosFactory.php
@@ -0,0 +1,164 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\PsrHttpMessage\Factory;
+
+use Symfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+use Zend\Diactoros\Response as DiactorosResponse;
+use Zend\Diactoros\ServerRequest;
+use Zend\Diactoros\ServerRequestFactory as DiactorosRequestFactory;
+use Zend\Diactoros\Stream as DiactorosStream;
+use Zend\Diactoros\UploadedFile as DiactorosUploadedFile;
+
+/**
+ * Builds Psr\HttpMessage instances using the Zend Diactoros implementation.
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+class DiactorosFactory implements HttpMessageFactoryInterface
+{
+    public function __construct()
+    {
+        if (!class_exists('Zend\Diactoros\ServerRequestFactory')) {
+            throw new \RuntimeException('Zend Diactoros must be installed to use the DiactorosFactory.');
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function createRequest(Request $symfonyRequest)
+    {
+        $server = DiactorosRequestFactory::normalizeServer($symfonyRequest->server->all());
+        $headers = $symfonyRequest->headers->all();
+
+        try {
+            $body = new DiactorosStream($symfonyRequest->getContent(true));
+        } catch (\LogicException $e) {
+            $body = new DiactorosStream('php://temp', 'wb+');
+            $body->write($symfonyRequest->getContent());
+        }
+
+        $request = new ServerRequest(
+            $server,
+            DiactorosRequestFactory::normalizeFiles($this->getFiles($symfonyRequest->files->all())),
+            $symfonyRequest->getUri(),
+            $symfonyRequest->getMethod(),
+            $body,
+            $headers
+        );
+
+        $request = $request
+            ->withCookieParams($symfonyRequest->cookies->all())
+            ->withQueryParams($symfonyRequest->query->all())
+            ->withParsedBody($symfonyRequest->request->all())
+        ;
+
+        foreach ($symfonyRequest->attributes->all() as $key => $value) {
+            $request = $request->withAttribute($key, $value);
+        }
+
+        return $request;
+    }
+
+    /**
+     * Converts Symfony uploaded files array to the PSR one.
+     *
+     * @param array $uploadedFiles
+     *
+     * @return array
+     */
+    private function getFiles(array $uploadedFiles)
+    {
+        $files = array();
+
+        foreach ($uploadedFiles as $key => $value) {
+            if ($value instanceof UploadedFile) {
+                $files[$key] = $this->createUploadedFile($value);
+            } else {
+                $files[$key] = $this->getFiles($value);
+            }
+        }
+
+        return $files;
+    }
+
+    /**
+     * Creates a PSR-7 UploadedFile instance from a Symfony one.
+     *
+     * @param UploadedFile $symfonyUploadedFile
+     *
+     * @return UploadedFileInterface
+     */
+    private function createUploadedFile(UploadedFile $symfonyUploadedFile)
+    {
+        return new DiactorosUploadedFile(
+            $symfonyUploadedFile->getRealPath(),
+            $symfonyUploadedFile->getSize(),
+            $symfonyUploadedFile->getError(),
+            $symfonyUploadedFile->getClientOriginalName(),
+            $symfonyUploadedFile->getClientMimeType()
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function createResponse(Response $symfonyResponse)
+    {
+        if ($symfonyResponse instanceof BinaryFileResponse) {
+            $stream = new DiactorosStream($symfonyResponse->getFile()->getPathname(), 'r');
+        } else {
+            $stream = new DiactorosStream('php://temp', 'wb+');
+            if ($symfonyResponse instanceof StreamedResponse) {
+                ob_start(function ($buffer) use ($stream) {
+                    $stream->write($buffer);
+
+                    return false;
+                });
+
+                $symfonyResponse->sendContent();
+                ob_end_clean();
+            } else {
+                $stream->write($symfonyResponse->getContent());
+            }
+        }
+
+        $headers = $symfonyResponse->headers->all();
+
+        $cookies = $symfonyResponse->headers->getCookies();
+        if (!empty($cookies)) {
+            $headers['Set-Cookie'] = array();
+
+            foreach ($cookies as $cookie) {
+                $headers['Set-Cookie'][] = $cookie->__toString();
+            }
+        }
+
+        $response = new DiactorosResponse(
+            $stream,
+            $symfonyResponse->getStatusCode(),
+            $headers
+        );
+
+        $protocolVersion = $symfonyResponse->getProtocolVersion();
+        if ('1.1' !== $protocolVersion) {
+            $response = $response->withProtocolVersion($protocolVersion);
+        }
+
+        return $response;
+    }
+}
diff --git a/core/vendor/symfony/psr-http-message-bridge/Factory/HttpFoundationFactory.php b/core/vendor/symfony/psr-http-message-bridge/Factory/HttpFoundationFactory.php
new file mode 100644
index 000000000..2c356fd15
--- /dev/null
+++ b/core/vendor/symfony/psr-http-message-bridge/Factory/HttpFoundationFactory.php
@@ -0,0 +1,199 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\PsrHttpMessage\Factory;
+
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\UploadedFileInterface;
+use Symfony\Bridge\PsrHttpMessage\HttpFoundationFactoryInterface;
+use Symfony\Component\HttpFoundation\Cookie;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+/**
+ * {@inheritdoc}
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+class HttpFoundationFactory implements HttpFoundationFactoryInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function createRequest(ServerRequestInterface $psrRequest)
+    {
+        $parsedBody = $psrRequest->getParsedBody();
+        $parsedBody = is_array($parsedBody) ? $parsedBody : array();
+
+        $request = new Request(
+            $psrRequest->getQueryParams(),
+            $parsedBody,
+            $psrRequest->getAttributes(),
+            $psrRequest->getCookieParams(),
+            $this->getFiles($psrRequest->getUploadedFiles()),
+            $psrRequest->getServerParams(),
+            $psrRequest->getBody()->__toString()
+        );
+        $request->headers->replace($psrRequest->getHeaders());
+
+        return $request;
+    }
+
+    /**
+     * Converts to the input array to $_FILES structure.
+     *
+     * @param array $uploadedFiles
+     *
+     * @return array
+     */
+    private function getFiles(array $uploadedFiles)
+    {
+        $files = array();
+
+        foreach ($uploadedFiles as $key => $value) {
+            if ($value instanceof UploadedFileInterface) {
+                $files[$key] = $this->createUploadedFile($value);
+            } else {
+                $files[$key] = $this->getFiles($value);
+            }
+        }
+
+        return $files;
+    }
+
+    /**
+     * Creates Symfony UploadedFile instance from PSR-7 ones.
+     *
+     * @param UploadedFileInterface $psrUploadedFile
+     *
+     * @return UploadedFile
+     */
+    private function createUploadedFile(UploadedFileInterface $psrUploadedFile)
+    {
+        $temporaryPath = $this->getTemporaryPath();
+        $psrUploadedFile->moveTo($temporaryPath);
+
+        $clientFileName = $psrUploadedFile->getClientFilename();
+
+        return new UploadedFile(
+            $temporaryPath,
+            null === $clientFileName ? '' : $clientFileName,
+            $psrUploadedFile->getClientMediaType(),
+            $psrUploadedFile->getSize(),
+            $psrUploadedFile->getError(),
+            true
+        );
+    }
+
+    /**
+     * Gets a temporary file path.
+     *
+     * @return string
+     */
+    protected function getTemporaryPath()
+    {
+        return tempnam(sys_get_temp_dir(), uniqid('symfony', true));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function createResponse(ResponseInterface $psrResponse)
+    {
+        $response = new Response(
+            $psrResponse->getBody()->__toString(),
+            $psrResponse->getStatusCode(),
+            $psrResponse->getHeaders()
+        );
+        $response->setProtocolVersion($psrResponse->getProtocolVersion());
+
+        foreach ($psrResponse->getHeader('Set-Cookie') as $cookie) {
+            $response->headers->setCookie($this->createCookie($cookie));
+        }
+
+        return $response;
+    }
+
+    /**
+     * Creates a Cookie instance from a cookie string.
+     *
+     * Some snippets have been taken from the Guzzle project: https://github.com/guzzle/guzzle/blob/5.3/src/Cookie/SetCookie.php#L34
+     *
+     * @param string $cookie
+     *
+     * @return Cookie
+     *
+     * @throws \InvalidArgumentException
+     */
+    private function createCookie($cookie)
+    {
+        foreach (explode(';', $cookie) as $part) {
+            $part = trim($part);
+
+            $data = explode('=', $part, 2);
+            $name = $data[0];
+            $value = isset($data[1]) ? trim($data[1], " \n\r\t\0\x0B\"") : null;
+
+            if (!isset($cookieName)) {
+                $cookieName = $name;
+                $cookieValue = $value;
+
+                continue;
+            }
+
+            if ('expires' === strtolower($name) && null !== $value) {
+                $cookieExpire = new \DateTime($value);
+
+                continue;
+            }
+
+            if ('path' === strtolower($name) && null !== $value) {
+                $cookiePath = $value;
+
+                continue;
+            }
+
+            if ('domain' === strtolower($name) && null !== $value) {
+                $cookieDomain = $value;
+
+                continue;
+            }
+
+            if ('secure' === strtolower($name)) {
+                $cookieSecure = true;
+
+                continue;
+            }
+
+            if ('httponly' === strtolower($name)) {
+                $cookieHttpOnly = true;
+
+                continue;
+            }
+        }
+
+        if (!isset($cookieName)) {
+            throw new \InvalidArgumentException('The value of the Set-Cookie header is malformed.');
+        }
+
+        return new Cookie(
+            $cookieName,
+            $cookieValue,
+            isset($cookieExpire) ? $cookieExpire : 0,
+            isset($cookiePath) ? $cookiePath : '/',
+            isset($cookieDomain) ? $cookieDomain : null,
+            isset($cookieSecure),
+            isset($cookieHttpOnly)
+        );
+    }
+}
diff --git a/core/vendor/symfony/psr-http-message-bridge/HttpFoundationFactoryInterface.php b/core/vendor/symfony/psr-http-message-bridge/HttpFoundationFactoryInterface.php
new file mode 100644
index 000000000..32ec4566b
--- /dev/null
+++ b/core/vendor/symfony/psr-http-message-bridge/HttpFoundationFactoryInterface.php
@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\PsrHttpMessage;
+
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\ResponseInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+/**
+ * Creates Symfony Request and Response instances from PSR-7 ones.
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+interface HttpFoundationFactoryInterface
+{
+    /**
+     * Creates a Symfony Request instance from a PSR-7 one.
+     *
+     * @param ServerRequestInterface $psrRequest
+     *
+     * @return Request
+     */
+    public function createRequest(ServerRequestInterface $psrRequest);
+
+    /**
+     * Creates a Symfony Response instance from a PSR-7 one.
+     *
+     * @param ResponseInterface $psrResponse
+     *
+     * @return Response
+     */
+    public function createResponse(ResponseInterface $psrResponse);
+}
diff --git a/core/vendor/symfony/psr-http-message-bridge/HttpMessageFactoryInterface.php b/core/vendor/symfony/psr-http-message-bridge/HttpMessageFactoryInterface.php
new file mode 100644
index 000000000..1367c8c90
--- /dev/null
+++ b/core/vendor/symfony/psr-http-message-bridge/HttpMessageFactoryInterface.php
@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\PsrHttpMessage;
+
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\ResponseInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+/**
+ * Creates PSR HTTP Request and Response instances from Symfony ones.
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+interface HttpMessageFactoryInterface
+{
+    /**
+     * Creates a PSR-7 Request instance from a Symfony one.
+     *
+     * @param Request $symfonyRequest
+     *
+     * @return ServerRequestInterface
+     */
+    public function createRequest(Request $symfonyRequest);
+
+    /**
+     * Creates a PSR-7 Response instance from a Symfony one.
+     *
+     * @param Response $symfonyResponse
+     *
+     * @return ResponseInterface
+     */
+    public function createResponse(Response $symfonyResponse);
+}
diff --git a/core/vendor/sdboyer/gliph/LICENSE b/core/vendor/symfony/psr-http-message-bridge/LICENSE
similarity index 96%
rename from core/vendor/sdboyer/gliph/LICENSE
rename to core/vendor/symfony/psr-http-message-bridge/LICENSE
index 0fd36c71b..43028bc60 100644
--- a/core/vendor/sdboyer/gliph/LICENSE
+++ b/core/vendor/symfony/psr-http-message-bridge/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) Sam Boyer
+Copyright (c) 2004-2015 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/core/vendor/symfony/psr-http-message-bridge/README.md b/core/vendor/symfony/psr-http-message-bridge/README.md
new file mode 100644
index 000000000..d2b2d373c
--- /dev/null
+++ b/core/vendor/symfony/psr-http-message-bridge/README.md
@@ -0,0 +1,14 @@
+PSR-7 Bridge
+============
+
+Provides integration for PSR7.
+
+Resources
+---------
+
+If you want to run the unit tests, install dev dependencies before
+running PHPUnit:
+
+    $ cd path/to/Symfony/Bridge/PsrHttpMessage/
+    $ composer.phar install
+    $ phpunit
diff --git a/core/vendor/symfony/psr-http-message-bridge/Tests/Factory/DiactorosFactoryTest.php b/core/vendor/symfony/psr-http-message-bridge/Tests/Factory/DiactorosFactoryTest.php
new file mode 100644
index 000000000..a4c32bdf9
--- /dev/null
+++ b/core/vendor/symfony/psr-http-message-bridge/Tests/Factory/DiactorosFactoryTest.php
@@ -0,0 +1,164 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\PsrHttpMessage\Tests\Factory;
+
+use Symfony\Bridge\PsrHttpMessage\Factory\DiactorosFactory;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Symfony\Component\HttpFoundation\Cookie;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+
+/**
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+class DiactorosFactoryTest extends \PHPUnit_Framework_TestCase
+{
+    private $factory;
+    private $tmpDir;
+
+    public function setup()
+    {
+        if (!class_exists('Zend\Diactoros\ServerRequestFactory')) {
+            $this->markTestSkipped('Zend Diactoros is not installed.');
+        }
+
+        $this->factory = new DiactorosFactory();
+        $this->tmpDir = sys_get_temp_dir();
+    }
+
+    public function testCreateRequest()
+    {
+        $stdClass = new \stdClass();
+        $request = new Request(
+            array(
+                'foo' => '1',
+                'bar' => array('baz' => '42'),
+            ),
+            array(
+                'twitter' => array(
+                    '@dunglas' => 'Kévin Dunglas',
+                    '@coopTilleuls' => 'Les-Tilleuls.coop',
+                ),
+                'baz' => '2',
+            ),
+            array(
+                'a1' => $stdClass,
+                'a2' => array('foo' => 'bar'),
+            ),
+            array(
+                'c1' => 'foo',
+                'c2' => array('c3' => 'bar'),
+            ),
+            array(
+                'f1' => $this->createUploadedFile('F1', 'f1.txt', 'text/plain', UPLOAD_ERR_OK),
+                'foo' => array('f2' => $this->createUploadedFile('F2', 'f2.txt', 'text/plain', UPLOAD_ERR_OK)),
+            ),
+            array(
+                'REQUEST_METHOD' => 'POST',
+                'HTTP_HOST' => 'dunglas.fr',
+                'HTTP_X_SYMFONY' => '2.8',
+            ),
+            'Content'
+        );
+
+        $psrRequest = $this->factory->createRequest($request);
+
+        $this->assertEquals('Content', $psrRequest->getBody()->__toString());
+
+        $queryParams = $psrRequest->getQueryParams();
+        $this->assertEquals('1', $queryParams['foo']);
+        $this->assertEquals('42', $queryParams['bar']['baz']);
+
+        $parsedBody = $psrRequest->getParsedBody();
+        $this->assertEquals('Kévin Dunglas', $parsedBody['twitter']['@dunglas']);
+        $this->assertEquals('Les-Tilleuls.coop', $parsedBody['twitter']['@coopTilleuls']);
+        $this->assertEquals('2', $parsedBody['baz']);
+
+        $attributes = $psrRequest->getAttributes();
+        $this->assertEquals($stdClass, $attributes['a1']);
+        $this->assertEquals('bar', $attributes['a2']['foo']);
+
+        $cookies = $psrRequest->getCookieParams();
+        $this->assertEquals('foo', $cookies['c1']);
+        $this->assertEquals('bar', $cookies['c2']['c3']);
+
+        $uploadedFiles = $psrRequest->getUploadedFiles();
+        $this->assertEquals('F1', $uploadedFiles['f1']->getStream()->__toString());
+        $this->assertEquals('f1.txt', $uploadedFiles['f1']->getClientFilename());
+        $this->assertEquals('text/plain', $uploadedFiles['f1']->getClientMediaType());
+        $this->assertEquals(UPLOAD_ERR_OK, $uploadedFiles['f1']->getError());
+
+        $this->assertEquals('F2', $uploadedFiles['foo']['f2']->getStream()->__toString());
+        $this->assertEquals('f2.txt', $uploadedFiles['foo']['f2']->getClientFilename());
+        $this->assertEquals('text/plain', $uploadedFiles['foo']['f2']->getClientMediaType());
+        $this->assertEquals(UPLOAD_ERR_OK, $uploadedFiles['foo']['f2']->getError());
+
+        $serverParams = $psrRequest->getServerParams();
+        $this->assertEquals('POST', $serverParams['REQUEST_METHOD']);
+        $this->assertEquals('2.8', $serverParams['HTTP_X_SYMFONY']);
+        $this->assertEquals('POST', $psrRequest->getMethod());
+        $this->assertEquals(array('2.8'), $psrRequest->getHeader('X-Symfony'));
+    }
+
+    private function createUploadedFile($content, $originalName, $mimeType, $error)
+    {
+        $path = tempnam($this->tmpDir, uniqid());
+        file_put_contents($path, $content);
+
+        return new UploadedFile($path, $originalName, $mimeType, filesize($path), $error, true);
+    }
+
+    public function testCreateResponse()
+    {
+        $response = new Response(
+            'Response content.',
+            202,
+            array('X-Symfony' => array('2.8'))
+        );
+        $response->headers->setCookie(new Cookie('city', 'Lille', new \DateTime('Wed, 13 Jan 2021 22:23:01 GMT')));
+
+        $psrResponse = $this->factory->createResponse($response);
+        $this->assertEquals('Response content.', $psrResponse->getBody()->__toString());
+        $this->assertEquals(202, $psrResponse->getStatusCode());
+        $this->assertEquals(array('2.8'), $psrResponse->getHeader('X-Symfony'));
+        $this->assertEquals(array('city=Lille; expires=Wed, 13-Jan-2021 22:23:01 GMT; path=/; httponly'), $psrResponse->getHeader('Set-Cookie'));
+    }
+
+    public function testCreateResponseFromStreamed()
+    {
+        $response = new StreamedResponse(function () {
+            echo "Line 1\n";
+            flush();
+
+            echo "Line 2\n";
+            flush();
+        });
+
+        $psrResponse = $this->factory->createResponse($response);
+
+        $this->assertEquals("Line 1\nLine 2\n", $psrResponse->getBody()->__toString());
+    }
+
+    public function testCreateResponseFromBinaryFile()
+    {
+        $path = tempnam($this->tmpDir, uniqid());
+        file_put_contents($path, 'Binary');
+
+        $response = new BinaryFileResponse($path);
+
+        $psrResponse = $this->factory->createResponse($response);
+
+        $this->assertEquals('Binary', $psrResponse->getBody()->__toString());
+    }
+}
diff --git a/core/vendor/symfony/psr-http-message-bridge/Tests/Factory/HttpFoundationFactoryTest.php b/core/vendor/symfony/psr-http-message-bridge/Tests/Factory/HttpFoundationFactoryTest.php
new file mode 100644
index 000000000..412e2874f
--- /dev/null
+++ b/core/vendor/symfony/psr-http-message-bridge/Tests/Factory/HttpFoundationFactoryTest.php
@@ -0,0 +1,211 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\PsrHttpMessage\Tests\Factory;
+
+use Psr\Http\Message\UploadedFileInterface;
+use Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory;
+use Symfony\Bridge\PsrHttpMessage\Tests\Fixtures\Response;
+use Symfony\Bridge\PsrHttpMessage\Tests\Fixtures\ServerRequest;
+use Symfony\Bridge\PsrHttpMessage\Tests\Fixtures\Stream;
+use Symfony\Bridge\PsrHttpMessage\Tests\Fixtures\UploadedFile;
+
+/**
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+class HttpFoundationFactoryTest extends \PHPUnit_Framework_TestCase
+{
+    private $factory;
+    private $tmpDir;
+
+    public function setup()
+    {
+        $this->factory = new HttpFoundationFactory();
+        $this->tmpDir = sys_get_temp_dir();
+    }
+
+    public function testCreateRequest()
+    {
+        $stdClass = new \stdClass();
+        $serverRequest = new ServerRequest(
+            '1.1',
+            array(
+                'X-Dunglas-API-Platform' => '1.0',
+                'X-data' => array('a', 'b'),
+            ),
+            new Stream('The body'),
+            '/about/kevin',
+            'GET',
+            'http://les-tilleuls.coop/about/kevin',
+            array('country' => 'France'),
+            array('city' => 'Lille'),
+            array('url' => 'http://les-tilleuls.coop'),
+            array(
+                'doc1' => $this->createUploadedFile('Doc 1', UPLOAD_ERR_OK, 'doc1.txt', 'text/plain'),
+                'nested' => array(
+                    'docs' => array(
+                        $this->createUploadedFile('Doc 2', UPLOAD_ERR_OK, 'doc2.txt', 'text/plain'),
+                        $this->createUploadedFile('Doc 3', UPLOAD_ERR_OK, 'doc3.txt', 'text/plain'),
+                    ),
+                ),
+            ),
+            array('url' => 'http://dunglas.fr'),
+            array('custom' => $stdClass)
+        );
+
+        $symfonyRequest = $this->factory->createRequest($serverRequest);
+
+        $this->assertEquals('http://les-tilleuls.coop', $symfonyRequest->query->get('url'));
+        $this->assertEquals('doc1.txt', $symfonyRequest->files->get('doc1')->getClientOriginalName());
+        $this->assertEquals('doc2.txt', $symfonyRequest->files->get('nested[docs][0]', null, true)->getClientOriginalName());
+        $this->assertEquals('doc3.txt', $symfonyRequest->files->get('nested[docs][1]', null, true)->getClientOriginalName());
+        $this->assertEquals('http://dunglas.fr', $symfonyRequest->request->get('url'));
+        $this->assertEquals($stdClass, $symfonyRequest->attributes->get('custom'));
+        $this->assertEquals('Lille', $symfonyRequest->cookies->get('city'));
+        $this->assertEquals('France', $symfonyRequest->server->get('country'));
+        $this->assertEquals('The body', $symfonyRequest->getContent());
+        $this->assertEquals('1.0', $symfonyRequest->headers->get('X-Dunglas-API-Platform'));
+        $this->assertEquals(array('a', 'b'), $symfonyRequest->headers->get('X-data', null, false));
+    }
+
+    public function testCreateRequestWithNullParsedBody()
+    {
+        $serverRequest = new ServerRequest(
+            '1.1',
+            array(),
+            new Stream(),
+            '/',
+            'GET',
+            null,
+            array(),
+            array(),
+            array(),
+            array(),
+            null,
+            array()
+        );
+
+        $this->assertCount(0, $this->factory->createRequest($serverRequest)->request);
+    }
+
+    public function testCreateRequestWithObjectParsedBody()
+    {
+        $serverRequest = new ServerRequest(
+            '1.1',
+            array(),
+            new Stream(),
+            '/',
+            'GET',
+            null,
+            array(),
+            array(),
+            array(),
+            array(),
+            new \stdClass(),
+            array()
+        );
+
+        $this->assertCount(0, $this->factory->createRequest($serverRequest)->request);
+    }
+
+    public function testCreateUploadedFile()
+    {
+        $uploadedFile = $this->createUploadedFile('An uploaded file.', UPLOAD_ERR_OK, 'myfile.txt', 'text/plain');
+        $symfonyUploadedFile = $this->callCreateUploadedFile($uploadedFile);
+
+        $uniqid = uniqid();
+        $symfonyUploadedFile->move($this->tmpDir, $uniqid);
+
+        $this->assertEquals($uploadedFile->getSize(), $symfonyUploadedFile->getClientSize());
+        $this->assertEquals(UPLOAD_ERR_OK, $symfonyUploadedFile->getError());
+        $this->assertEquals('myfile.txt', $symfonyUploadedFile->getClientOriginalName());
+        $this->assertEquals('txt', $symfonyUploadedFile->getClientOriginalExtension());
+        $this->assertEquals('text/plain', $symfonyUploadedFile->getClientMimeType());
+        $this->assertEquals('An uploaded file.', file_get_contents($this->tmpDir.'/'.$uniqid));
+    }
+
+    /**
+     * @expectedException        \Symfony\Component\HttpFoundation\File\Exception\FileException
+     * @expectedExceptionMessage The file "e" could not be written on disk.
+     */
+    public function testCreateUploadedFileWithError()
+    {
+        $uploadedFile = $this->createUploadedFile('Error.', UPLOAD_ERR_CANT_WRITE, 'e', 'text/plain');
+        $symfonyUploadedFile = $this->callCreateUploadedFile($uploadedFile);
+
+        $this->assertEquals(UPLOAD_ERR_CANT_WRITE, $symfonyUploadedFile->getError());
+
+        $symfonyUploadedFile->move($this->tmpDir, 'shouldFail.txt');
+    }
+
+    private function createUploadedFile($content, $error, $clientFileName, $clientMediaType)
+    {
+        $filePath = tempnam($this->tmpDir, uniqid());
+        file_put_contents($filePath, $content);
+
+        return new UploadedFile($filePath, filesize($filePath), $error, $clientFileName, $clientMediaType);
+    }
+
+    private function callCreateUploadedFile(UploadedFileInterface $uploadedFile)
+    {
+        $reflection = new \ReflectionClass($this->factory);
+        $createUploadedFile = $reflection->getMethod('createUploadedFile');
+        $createUploadedFile->setAccessible(true);
+
+        return $createUploadedFile->invokeArgs($this->factory, array($uploadedFile));
+    }
+
+    public function testCreateResponse()
+    {
+        $response = new Response(
+            '1.0',
+            array(
+                'X-Symfony' => array('2.8'),
+                'Set-Cookie' => array(
+                    'theme=light',
+                    'test',
+                    'ABC=AeD; Domain=dunglas.fr; Path=/kevin; Expires=Wed, 13 Jan 2021 22:23:01 GMT; Secure; HttpOnly',
+
+                ),
+            ),
+            new Stream('The response body'),
+            200
+        );
+
+        $symfonyResponse = $this->factory->createResponse($response);
+
+        $this->assertEquals('1.0', $symfonyResponse->getProtocolVersion());
+        $this->assertEquals('2.8', $symfonyResponse->headers->get('X-Symfony'));
+
+        $cookies = $symfonyResponse->headers->getCookies();
+        $this->assertEquals('theme', $cookies[0]->getName());
+        $this->assertEquals('light', $cookies[0]->getValue());
+        $this->assertEquals(0, $cookies[0]->getExpiresTime());
+        $this->assertNull($cookies[0]->getDomain());
+        $this->assertEquals('/', $cookies[0]->getPath());
+        $this->assertFalse($cookies[0]->isSecure());
+        $this->assertFalse($cookies[0]->isHttpOnly());
+
+        $this->assertEquals('test', $cookies[1]->getName());
+        $this->assertNull($cookies[1]->getValue());
+
+        $this->assertEquals('ABC', $cookies[2]->getName());
+        $this->assertEquals('AeD', $cookies[2]->getValue());
+        $this->assertEquals(strtotime('Wed, 13 Jan 2021 22:23:01 GMT'), $cookies[2]->getExpiresTime());
+        $this->assertEquals('dunglas.fr', $cookies[2]->getDomain());
+        $this->assertEquals('/kevin', $cookies[2]->getPath());
+        $this->assertTrue($cookies[2]->isSecure());
+        $this->assertTrue($cookies[2]->isHttpOnly());
+
+        $this->assertEquals('The response body', $symfonyResponse->getContent());
+        $this->assertEquals(200, $symfonyResponse->getStatusCode());
+    }
+}
diff --git a/core/vendor/symfony/psr-http-message-bridge/Tests/Fixtures/Message.php b/core/vendor/symfony/psr-http-message-bridge/Tests/Fixtures/Message.php
new file mode 100644
index 000000000..5cd099941
--- /dev/null
+++ b/core/vendor/symfony/psr-http-message-bridge/Tests/Fixtures/Message.php
@@ -0,0 +1,89 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\PsrHttpMessage\Tests\Fixtures;
+
+use Psr\Http\Message\MessageInterface;
+use Psr\Http\Message\StreamInterface;
+
+/**
+ * Message.
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+class Message implements MessageInterface
+{
+    private $version = '1.1';
+    private $headers = array();
+    private $body;
+
+    public function __construct($version = '1.1', array $headers = array(), StreamInterface $body = null)
+    {
+        $this->version = $version;
+        $this->headers = $headers;
+        $this->body = null === $body ? new Stream() : $body;
+    }
+
+    public function getProtocolVersion()
+    {
+        return $this->version;
+    }
+
+    public function withProtocolVersion($version)
+    {
+        throw new \BadMethodCallException('Not implemented.');
+    }
+
+    public function getHeaders()
+    {
+        return $this->headers;
+    }
+
+    public function hasHeader($name)
+    {
+        return isset($this->headers[$name]);
+    }
+
+    public function getHeader($name)
+    {
+        return $this->hasHeader($name) ? $this->headers[$name] : array();
+    }
+
+    public function getHeaderLine($name)
+    {
+        return $this->hasHeader($name) ? implode(',', $this->headers[$name]) : '';
+    }
+
+    public function withHeader($name, $value)
+    {
+        throw new \BadMethodCallException('Not implemented.');
+    }
+
+    public function withAddedHeader($name, $value)
+    {
+        throw new \BadMethodCallException('Not implemented.');
+    }
+
+    public function withoutHeader($name)
+    {
+        throw new \BadMethodCallException('Not implemented.');
+    }
+
+    public function getBody()
+    {
+        return $this->body;
+    }
+
+    public function withBody(StreamInterface $body)
+    {
+        throw new \BadMethodCallException('Not implemented.');
+    }
+}
diff --git a/core/vendor/symfony/psr-http-message-bridge/Tests/Fixtures/Response.php b/core/vendor/symfony/psr-http-message-bridge/Tests/Fixtures/Response.php
new file mode 100644
index 000000000..0fd85c285
--- /dev/null
+++ b/core/vendor/symfony/psr-http-message-bridge/Tests/Fixtures/Response.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\PsrHttpMessage\Tests\Fixtures;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\StreamInterface;
+
+/**
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+class Response extends Message implements ResponseInterface
+{
+    private $statusCode;
+
+    public function __construct($version = '1.1', array $headers = array(), StreamInterface $body = null, $statusCode = 200)
+    {
+        parent::__construct($version, $headers, $body);
+
+        $this->statusCode = $statusCode;
+    }
+
+    public function getStatusCode()
+    {
+        return $this->statusCode;
+    }
+
+    public function withStatus($code, $reasonPhrase = '')
+    {
+        throw new \BadMethodCallException('Not implemented.');
+    }
+
+    public function getReasonPhrase()
+    {
+        throw new \BadMethodCallException('Not implemented.');
+    }
+}
diff --git a/core/vendor/symfony/psr-http-message-bridge/Tests/Fixtures/ServerRequest.php b/core/vendor/symfony/psr-http-message-bridge/Tests/Fixtures/ServerRequest.php
new file mode 100644
index 000000000..63b8c0681
--- /dev/null
+++ b/core/vendor/symfony/psr-http-message-bridge/Tests/Fixtures/ServerRequest.php
@@ -0,0 +1,141 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\PsrHttpMessage\Tests\Fixtures;
+
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\StreamInterface;
+use Psr\Http\Message\UriInterface;
+
+/**
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+class ServerRequest extends Message implements ServerRequestInterface
+{
+    private $requestTarget;
+    private $method;
+    private $uri;
+    private $server;
+    private $cookies;
+    private $query;
+    private $uploadedFiles;
+    private $data;
+    private $attributes;
+
+    public function __construct($version = '1.1', array $headers = array(), StreamInterface $body = null, $requestTarget = '/', $method = 'GET', $uri = null, array $server = array(), array $cookies = array(), array $query = array(), array $uploadedFiles = array(), $data = null, array $attributes = array())
+    {
+        parent::__construct($version, $headers, $body);
+
+        $this->requestTarget = $requestTarget;
+        $this->method = $method;
+        $this->uri = $uri;
+        $this->server = $server;
+        $this->cookies = $cookies;
+        $this->query = $query;
+        $this->uploadedFiles = $uploadedFiles;
+        $this->data = $data;
+        $this->attributes = $attributes;
+    }
+
+    public function getRequestTarget()
+    {
+        return $this->requestTarget;
+    }
+
+    public function withRequestTarget($requestTarget)
+    {
+        throw new \BadMethodCallException('Not implemented.');
+    }
+
+    public function getMethod()
+    {
+        return $this->method;
+    }
+
+    public function withMethod($method)
+    {
+    }
+
+    public function getUri()
+    {
+        return $this->uri;
+    }
+
+    public function withUri(UriInterface $uri, $preserveHost = false)
+    {
+        throw new \BadMethodCallException('Not implemented.');
+    }
+
+    public function getServerParams()
+    {
+        return $this->server;
+    }
+
+    public function getCookieParams()
+    {
+        return $this->cookies;
+    }
+
+    public function withCookieParams(array $cookies)
+    {
+        throw new \BadMethodCallException('Not implemented.');
+    }
+
+    public function getQueryParams()
+    {
+        return $this->query;
+    }
+
+    public function withQueryParams(array $query)
+    {
+        throw new \BadMethodCallException('Not implemented.');
+    }
+
+    public function getUploadedFiles()
+    {
+        return $this->uploadedFiles;
+    }
+
+    public function withUploadedFiles(array $uploadedFiles)
+    {
+        throw new \BadMethodCallException('Not implemented.');
+    }
+
+    public function getParsedBody()
+    {
+        return $this->data;
+    }
+
+    public function withParsedBody($data)
+    {
+        throw new \BadMethodCallException('Not implemented.');
+    }
+
+    public function getAttributes()
+    {
+        return $this->attributes;
+    }
+
+    public function getAttribute($name, $default = null)
+    {
+        return isset($this->attributes[$name]) ? $this->attributes[$name] : $default;
+    }
+
+    public function withAttribute($name, $value)
+    {
+        throw new \BadMethodCallException('Not implemented.');
+    }
+
+    public function withoutAttribute($name)
+    {
+        throw new \BadMethodCallException('Not implemented.');
+    }
+}
diff --git a/core/vendor/symfony/psr-http-message-bridge/Tests/Fixtures/Stream.php b/core/vendor/symfony/psr-http-message-bridge/Tests/Fixtures/Stream.php
new file mode 100644
index 000000000..aeca3d835
--- /dev/null
+++ b/core/vendor/symfony/psr-http-message-bridge/Tests/Fixtures/Stream.php
@@ -0,0 +1,95 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\PsrHttpMessage\Tests\Fixtures;
+
+use Psr\Http\Message\StreamInterface;
+
+/**
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+class Stream implements StreamInterface
+{
+    private $stringContent;
+
+    public function __construct($stringContent = '')
+    {
+        $this->stringContent = $stringContent;
+    }
+
+    public function __toString()
+    {
+        return $this->stringContent;
+    }
+
+    public function close()
+    {
+    }
+
+    public function detach()
+    {
+    }
+
+    public function getSize()
+    {
+    }
+
+    public function tell()
+    {
+        return 0;
+    }
+
+    public function eof()
+    {
+        return true;
+    }
+
+    public function isSeekable()
+    {
+        return false;
+    }
+
+    public function seek($offset, $whence = SEEK_SET)
+    {
+    }
+
+    public function rewind()
+    {
+    }
+
+    public function isWritable()
+    {
+        return false;
+    }
+
+    public function write($string)
+    {
+    }
+
+    public function isReadable()
+    {
+        return true;
+    }
+
+    public function read($length)
+    {
+        return $this->stringContent;
+    }
+
+    public function getContents()
+    {
+        return $this->stringContent;
+    }
+
+    public function getMetadata($key = null)
+    {
+    }
+}
diff --git a/core/vendor/symfony/psr-http-message-bridge/Tests/Fixtures/UploadedFile.php b/core/vendor/symfony/psr-http-message-bridge/Tests/Fixtures/UploadedFile.php
new file mode 100644
index 000000000..4cfa98b3c
--- /dev/null
+++ b/core/vendor/symfony/psr-http-message-bridge/Tests/Fixtures/UploadedFile.php
@@ -0,0 +1,65 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\PsrHttpMessage\Tests\Fixtures;
+
+use Psr\Http\Message\UploadedFileInterface;
+
+/**
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+class UploadedFile implements UploadedFileInterface
+{
+    private $filePath;
+    private $size;
+    private $error;
+    private $clientFileName;
+    private $clientMediaType;
+
+    public function __construct($filePath, $size = null, $error = UPLOAD_ERR_OK, $clientFileName = null, $clientMediaType = null)
+    {
+        $this->filePath = $filePath;
+        $this->size = $size;
+        $this->error = $error;
+        $this->clientFileName = $clientFileName;
+        $this->clientMediaType = $clientMediaType;
+    }
+
+    public function getStream()
+    {
+        throw new \RuntimeException('No stream is available.');
+    }
+
+    public function moveTo($targetPath)
+    {
+        rename($this->filePath, $targetPath);
+    }
+
+    public function getSize()
+    {
+        return $this->size;
+    }
+
+    public function getError()
+    {
+        return $this->error;
+    }
+
+    public function getClientFilename()
+    {
+        return $this->clientFileName;
+    }
+
+    public function getClientMediaType()
+    {
+        return $this->clientMediaType;
+    }
+}
diff --git a/core/vendor/symfony/psr-http-message-bridge/composer.json b/core/vendor/symfony/psr-http-message-bridge/composer.json
new file mode 100644
index 000000000..9dc9ce701
--- /dev/null
+++ b/core/vendor/symfony/psr-http-message-bridge/composer.json
@@ -0,0 +1,33 @@
+{
+    "name": "symfony/psr-http-message-bridge",
+    "type": "symfony-bridge",
+    "description": "PSR HTTP message bridge",
+    "keywords": ["http", "psr-7", "http-message"],
+    "homepage": "http://symfony.com",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Fabien Potencier",
+            "email": "fabien@symfony.com"
+        },
+        {
+            "name": "Symfony Community",
+            "homepage": "http://symfony.com/contributors"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.3",
+        "psr/http-message": "~1.0",
+        "symfony/http-foundation": "~2.3|~3.0"
+    },
+    "require-dev": {
+        "symfony/phpunit-bridge": "~2.7|~3.0"
+    },
+    "suggest": {
+        "zendframework/zend-diactoros": "To use the Zend Diactoros factory"
+    },
+    "autoload": {
+        "psr-4": { "Symfony\\Bridge\\PsrHttpMessage\\": "" }
+    },
+    "minimum-stability": "dev"
+}
diff --git a/core/vendor/react/promise/phpunit.xml.dist b/core/vendor/symfony/psr-http-message-bridge/phpunit.xml.dist
similarity index 56%
rename from core/vendor/react/promise/phpunit.xml.dist
rename to core/vendor/symfony/psr-http-message-bridge/phpunit.xml.dist
index 0200d463f..9a6e477b1 100644
--- a/core/vendor/react/promise/phpunit.xml.dist
+++ b/core/vendor/symfony/psr-http-message-bridge/phpunit.xml.dist
@@ -9,17 +9,22 @@
          processIsolation="false"
          stopOnFailure="false"
          syntaxCheck="false"
-         bootstrap="tests/bootstrap.php"
+         bootstrap="vendor/autoload.php"
 >
     <testsuites>
-        <testsuite name="Promise Test Suite">
-            <directory>./tests/</directory>
+        <testsuite name="Symfony PSR-7 HTTP message Bridge Test Suite">
+            <directory>./Tests/</directory>
         </testsuite>
     </testsuites>
 
     <filter>
         <whitelist>
-            <directory>./src/</directory>
+            <directory>./</directory>
+            <exclude>
+                <directory>./Resources</directory>
+                <directory>./Tests</directory>
+                <directory>./vendor</directory>
+            </exclude>
         </whitelist>
     </filter>
 </phpunit>
diff --git a/core/vendor/symfony/routing/.gitignore b/core/vendor/symfony/routing/.gitignore
new file mode 100644
index 000000000..c49a5d8df
--- /dev/null
+++ b/core/vendor/symfony/routing/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/core/vendor/symfony/routing/Annotation/Route.php b/core/vendor/symfony/routing/Annotation/Route.php
index af2158250..7e7e056bd 100644
--- a/core/vendor/symfony/routing/Annotation/Route.php
+++ b/core/vendor/symfony/routing/Annotation/Route.php
@@ -48,7 +48,7 @@ class Route
         foreach ($data as $key => $value) {
             $method = 'set'.str_replace('_', '', $key);
             if (!method_exists($this, $method)) {
-                throw new \BadMethodCallException(sprintf("Unknown property '%s' on annotation '%s'.", $key, get_class($this)));
+                throw new \BadMethodCallException(sprintf('Unknown property "%s" on annotation "%s".', $key, get_class($this)));
             }
             $this->$method($value);
         }
@@ -59,7 +59,7 @@ class Route
      */
     public function setPattern($pattern)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. Use the setPath() method instead and use the "path" option instead of the "pattern" option in the route definition.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. Use the setPath() method instead and use the "path" option instead of the "pattern" option in the route definition.', E_USER_DEPRECATED);
 
         $this->path = $pattern;
     }
@@ -69,7 +69,7 @@ class Route
      */
     public function getPattern()
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. Use the getPath() method instead and use the "path" option instead of the "pattern" option in the route definition.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. Use the getPath() method instead and use the "path" option instead of the "pattern" option in the route definition.', E_USER_DEPRECATED);
 
         return $this->path;
     }
@@ -106,6 +106,22 @@ class Route
 
     public function setRequirements($requirements)
     {
+        if (isset($requirements['_method'])) {
+            if (0 === count($this->methods)) {
+                $this->methods = explode('|', $requirements['_method']);
+            }
+
+            @trigger_error('The "_method" requirement is deprecated since version 2.2 and will be removed in 3.0. Use the "methods" option instead.', E_USER_DEPRECATED);
+        }
+
+        if (isset($requirements['_scheme'])) {
+            if (0 === count($this->schemes)) {
+                $this->schemes = explode('|', $requirements['_scheme']);
+            }
+
+            @trigger_error('The "_scheme" requirement is deprecated since version 2.2 and will be removed in 3.0. Use the "schemes" option instead.', E_USER_DEPRECATED);
+        }
+
         $this->requirements = $requirements;
     }
 
diff --git a/core/vendor/symfony/routing/Loader/XmlFileLoader.php b/core/vendor/symfony/routing/Loader/XmlFileLoader.php
index 81bd5de6f..e8c7f6b14 100644
--- a/core/vendor/symfony/routing/Loader/XmlFileLoader.php
+++ b/core/vendor/symfony/routing/Loader/XmlFileLoader.php
@@ -122,7 +122,7 @@ class XmlFileLoader extends FileLoader
                 throw new \InvalidArgumentException(sprintf('The <route> element in file "%s" cannot define both a "path" and a "pattern" attribute. Use only "path".', $path));
             }
 
-            trigger_error(sprintf('The "pattern" option in file "%s" is deprecated since version 2.2 and will be removed in 3.0. Use the "path" option in the route definition instead.', $path), E_USER_DEPRECATED);
+            @trigger_error(sprintf('The "pattern" option in file "%s" is deprecated since version 2.2 and will be removed in 3.0. Use the "path" option in the route definition instead.', $path), E_USER_DEPRECATED);
 
             $node->setAttribute('path', $node->getAttribute('pattern'));
             $node->removeAttribute('pattern');
@@ -133,6 +133,24 @@ class XmlFileLoader extends FileLoader
 
         list($defaults, $requirements, $options, $condition) = $this->parseConfigs($node, $path);
 
+        if (isset($requirements['_method'])) {
+            if (0 === count($methods)) {
+                $methods = explode('|', $requirements['_method']);
+            }
+
+            unset($requirements['_method']);
+            @trigger_error(sprintf('The "_method" requirement of route "%s" in file "%s" is deprecated since version 2.2 and will be removed in 3.0. Use the "methods" attribute instead.', $id, $path), E_USER_DEPRECATED);
+        }
+
+        if (isset($requirements['_scheme'])) {
+            if (0 === count($schemes)) {
+                $schemes = explode('|', $requirements['_scheme']);
+            }
+
+            unset($requirements['_scheme']);
+            @trigger_error(sprintf('The "_scheme" requirement of route "%s" in file "%s" is deprecated since version 2.2 and will be removed in 3.0. Use the "schemes" attribute instead.', $id, $path), E_USER_DEPRECATED);
+        }
+
         $route = new Route($node->getAttribute('path'), $defaults, $requirements, $options, $node->getAttribute('host'), $schemes, $methods, $condition);
         $collection->add($id, $route);
     }
diff --git a/core/vendor/symfony/routing/Loader/YamlFileLoader.php b/core/vendor/symfony/routing/Loader/YamlFileLoader.php
index f004fd14a..d30da91d2 100644
--- a/core/vendor/symfony/routing/Loader/YamlFileLoader.php
+++ b/core/vendor/symfony/routing/Loader/YamlFileLoader.php
@@ -81,7 +81,7 @@ class YamlFileLoader extends FileLoader
                     throw new \InvalidArgumentException(sprintf('The file "%s" cannot define both a "path" and a "pattern" attribute. Use only "path".', $path));
                 }
 
-                trigger_error(sprintf('The "pattern" option in file "%s" is deprecated since version 2.2 and will be removed in 3.0. Use the "path" option in the route definition instead.', $path), E_USER_DEPRECATED);
+                @trigger_error(sprintf('The "pattern" option in file "%s" is deprecated since version 2.2 and will be removed in 3.0. Use the "path" option in the route definition instead.', $path), E_USER_DEPRECATED);
 
                 $config['path'] = $config['pattern'];
                 unset($config['pattern']);
@@ -127,6 +127,24 @@ class YamlFileLoader extends FileLoader
         $methods = isset($config['methods']) ? $config['methods'] : array();
         $condition = isset($config['condition']) ? $config['condition'] : null;
 
+        if (isset($requirements['_method'])) {
+            if (0 === count($methods)) {
+                $methods = explode('|', $requirements['_method']);
+            }
+
+            unset($requirements['_method']);
+            @trigger_error(sprintf('The "_method" requirement of route "%s" in file "%s" is deprecated since version 2.2 and will be removed in 3.0. Use the "methods" option instead.', $name, $path), E_USER_DEPRECATED);
+        }
+
+        if (isset($requirements['_scheme'])) {
+            if (0 === count($schemes)) {
+                $schemes = explode('|', $requirements['_scheme']);
+            }
+
+            unset($requirements['_scheme']);
+            @trigger_error(sprintf('The "_scheme" requirement of route "%s" in file "%s" is deprecated since version 2.2 and will be removed in 3.0. Use the "schemes" option instead.', $name, $path), E_USER_DEPRECATED);
+        }
+
         $route = new Route($config['path'], $defaults, $requirements, $options, $host, $schemes, $methods, $condition);
 
         $collection->add($name, $route);
diff --git a/core/vendor/symfony/routing/Matcher/ApacheUrlMatcher.php b/core/vendor/symfony/routing/Matcher/ApacheUrlMatcher.php
index 058ced4de..c0474f22f 100644
--- a/core/vendor/symfony/routing/Matcher/ApacheUrlMatcher.php
+++ b/core/vendor/symfony/routing/Matcher/ApacheUrlMatcher.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Routing\Matcher;
 
-trigger_error('The '.__NAMESPACE__.'\ApacheUrlMatcher class is deprecated since version 2.5 and will be removed in 3.0. It\'s hard to replicate the behaviour of the PHP implementation and the performance gains are minimal.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\ApacheUrlMatcher class is deprecated since version 2.5 and will be removed in 3.0. It\'s hard to replicate the behaviour of the PHP implementation and the performance gains are minimal.', E_USER_DEPRECATED);
 
 use Symfony\Component\Routing\Exception\MethodNotAllowedException;
 
diff --git a/core/vendor/symfony/routing/Matcher/Dumper/ApacheMatcherDumper.php b/core/vendor/symfony/routing/Matcher/Dumper/ApacheMatcherDumper.php
index d1c14a6f8..1eb51852a 100644
--- a/core/vendor/symfony/routing/Matcher/Dumper/ApacheMatcherDumper.php
+++ b/core/vendor/symfony/routing/Matcher/Dumper/ApacheMatcherDumper.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Routing\Matcher\Dumper;
 
-trigger_error('The '.__NAMESPACE__.'\ApacheMatcherDumper class is deprecated since version 2.5 and will be removed in 3.0. It\'s hard to replicate the behaviour of the PHP implementation and the performance gains are minimal.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\ApacheMatcherDumper class is deprecated since version 2.5 and will be removed in 3.0. It\'s hard to replicate the behaviour of the PHP implementation and the performance gains are minimal.', E_USER_DEPRECATED);
 
 use Symfony\Component\Routing\Route;
 
diff --git a/core/vendor/symfony/routing/Matcher/Dumper/PhpMatcherDumper.php b/core/vendor/symfony/routing/Matcher/Dumper/PhpMatcherDumper.php
index de414480f..aa7df8a78 100644
--- a/core/vendor/symfony/routing/Matcher/Dumper/PhpMatcherDumper.php
+++ b/core/vendor/symfony/routing/Matcher/Dumper/PhpMatcherDumper.php
@@ -229,11 +229,11 @@ EOF;
                 $conditions[] = sprintf("rtrim(\$pathinfo, '/') === %s", var_export(rtrim(str_replace('\\', '', $m['url']), '/'), true));
                 $hasTrailingSlash = true;
             } else {
-                $conditions[] = sprintf("\$pathinfo === %s", var_export(str_replace('\\', '', $m['url']), true));
+                $conditions[] = sprintf('$pathinfo === %s', var_export(str_replace('\\', '', $m['url']), true));
             }
         } else {
             if ($compiledRoute->getStaticPrefix() && $compiledRoute->getStaticPrefix() !== $parentPrefix) {
-                $conditions[] = sprintf("0 === strpos(\$pathinfo, %s)", var_export($compiledRoute->getStaticPrefix(), true));
+                $conditions[] = sprintf('0 === strpos($pathinfo, %s)', var_export($compiledRoute->getStaticPrefix(), true));
             }
 
             $regex = $compiledRoute->getRegex();
@@ -241,7 +241,7 @@ EOF;
                 $regex = substr($regex, 0, $pos).'/?$'.substr($regex, $pos + 2);
                 $hasTrailingSlash = true;
             }
-            $conditions[] = sprintf("preg_match(%s, \$pathinfo, \$matches)", var_export($regex, true));
+            $conditions[] = sprintf('preg_match(%s, $pathinfo, $matches)', var_export($regex, true));
 
             $matches = true;
         }
diff --git a/core/vendor/symfony/routing/Route.php b/core/vendor/symfony/routing/Route.php
index a7b6ad1fd..19a48f13b 100644
--- a/core/vendor/symfony/routing/Route.php
+++ b/core/vendor/symfony/routing/Route.php
@@ -151,7 +151,7 @@ class Route implements \Serializable
      */
     public function getPattern()
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. Use the getPath() method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. Use the getPath() method instead.', E_USER_DEPRECATED);
 
         return $this->path;
     }
@@ -169,7 +169,7 @@ class Route implements \Serializable
      */
     public function setPattern($pattern)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. Use the setPath() method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. Use the setPath() method instead.', E_USER_DEPRECATED);
 
         return $this->setPath($pattern);
     }
@@ -549,9 +549,9 @@ class Route implements \Serializable
     public function getRequirement($key)
     {
         if ('_scheme' === $key) {
-            trigger_error('The "_scheme" requirement is deprecated since version 2.2 and will be removed in 3.0. Use getSchemes() instead.', E_USER_DEPRECATED);
+            @trigger_error('The "_scheme" requirement is deprecated since version 2.2 and will be removed in 3.0. Use getSchemes() instead.', E_USER_DEPRECATED);
         } elseif ('_method' === $key) {
-            trigger_error('The "_method" requirement is deprecated since version 2.2 and will be removed in 3.0. Use getMethods() instead.', E_USER_DEPRECATED);
+            @trigger_error('The "_method" requirement is deprecated since version 2.2 and will be removed in 3.0. Use getMethods() instead.', E_USER_DEPRECATED);
         }
 
         return isset($this->requirements[$key]) ? $this->requirements[$key] : null;
@@ -655,11 +655,11 @@ class Route implements \Serializable
 
         // this is to keep BC and will be removed in a future version
         if ('_scheme' === $key) {
-            trigger_error('The "_scheme" requirement is deprecated since version 2.2 and will be removed in 3.0. Use the setSchemes() method instead or the "schemes" option in the route definition.', E_USER_DEPRECATED);
+            @trigger_error('The "_scheme" requirement is deprecated since version 2.2 and will be removed in 3.0. Use the setSchemes() method instead.', E_USER_DEPRECATED);
 
             $this->setSchemes(explode('|', $regex));
         } elseif ('_method' === $key) {
-            trigger_error('The "_method" requirement is deprecated since version 2.2 and will be removed in 3.0. Use the setMethods() method instead or the "methods" option in the route definition.', E_USER_DEPRECATED);
+            @trigger_error('The "_method" requirement is deprecated since version 2.2 and will be removed in 3.0. Use the setMethods() method instead.', E_USER_DEPRECATED);
 
             $this->setMethods(explode('|', $regex));
         }
diff --git a/core/vendor/symfony/routing/Tests/Annotation/RouteTest.php b/core/vendor/symfony/routing/Tests/Annotation/RouteTest.php
index 5eda4064f..3b340b33e 100644
--- a/core/vendor/symfony/routing/Tests/Annotation/RouteTest.php
+++ b/core/vendor/symfony/routing/Tests/Annotation/RouteTest.php
@@ -52,8 +52,6 @@ class RouteTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacyGetPattern()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $route = new Route(array('value' => '/Blog'));
         $this->assertEquals($route->getPattern(), '/Blog');
     }
diff --git a/core/vendor/symfony/routing/Tests/Generator/Dumper/PhpGeneratorDumperTest.php b/core/vendor/symfony/routing/Tests/Generator/Dumper/PhpGeneratorDumperTest.php
index 6fbf7e220..525b9f569 100644
--- a/core/vendor/symfony/routing/Tests/Generator/Dumper/PhpGeneratorDumperTest.php
+++ b/core/vendor/symfony/routing/Tests/Generator/Dumper/PhpGeneratorDumperTest.php
@@ -39,7 +39,7 @@ class PhpGeneratorDumperTest extends \PHPUnit_Framework_TestCase
 
         $this->routeCollection = new RouteCollection();
         $this->generatorDumper = new PhpGeneratorDumper($this->routeCollection);
-        $this->testTmpFilepath = sys_get_temp_dir().DIRECTORY_SEPARATOR.'php_generator.php';
+        $this->testTmpFilepath = sys_get_temp_dir().DIRECTORY_SEPARATOR.'php_generator.'.$this->getName().'.php';
         @unlink($this->testTmpFilepath);
     }
 
diff --git a/core/vendor/symfony/routing/Tests/Generator/UrlGeneratorTest.php b/core/vendor/symfony/routing/Tests/Generator/UrlGeneratorTest.php
index 0005e3a53..29460c7ae 100644
--- a/core/vendor/symfony/routing/Tests/Generator/UrlGeneratorTest.php
+++ b/core/vendor/symfony/routing/Tests/Generator/UrlGeneratorTest.php
@@ -461,8 +461,6 @@ class UrlGeneratorTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacyGenerateNetworkPath()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $routes = $this->getRoutes('test', new Route('/{name}', array(), array('_scheme' => 'http'), array(), '{locale}.example.com'));
 
         $this->assertSame('//fr.example.com/app.php/Fabien', $this->getGenerator($routes)->generate('test',
diff --git a/core/vendor/symfony/routing/Tests/Loader/XmlFileLoaderTest.php b/core/vendor/symfony/routing/Tests/Loader/XmlFileLoaderTest.php
index 37bbc0cd6..78065070a 100644
--- a/core/vendor/symfony/routing/Tests/Loader/XmlFileLoaderTest.php
+++ b/core/vendor/symfony/routing/Tests/Loader/XmlFileLoaderTest.php
@@ -50,8 +50,6 @@ class XmlFileLoaderTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacyRouteDefinitionLoading()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $loader = new XmlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures')));
         $routeCollection = $loader->load('legacy_validpattern.xml');
         $route = $routeCollection->get('blog_show_legacy');
diff --git a/core/vendor/symfony/routing/Tests/Loader/YamlFileLoaderTest.php b/core/vendor/symfony/routing/Tests/Loader/YamlFileLoaderTest.php
index f9b7547a1..17e07dab1 100644
--- a/core/vendor/symfony/routing/Tests/Loader/YamlFileLoaderTest.php
+++ b/core/vendor/symfony/routing/Tests/Loader/YamlFileLoaderTest.php
@@ -86,8 +86,6 @@ class YamlFileLoaderTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacyRouteDefinitionLoading()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $loader = new YamlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures')));
         $routeCollection = $loader->load('legacy_validpattern.yml');
         $route = $routeCollection->get('blog_show_legacy');
diff --git a/core/vendor/symfony/routing/Tests/Matcher/Dumper/LegacyApacheMatcherDumperTest.php b/core/vendor/symfony/routing/Tests/Matcher/Dumper/LegacyApacheMatcherDumperTest.php
index 6d34c96d5..4bf513e9a 100644
--- a/core/vendor/symfony/routing/Tests/Matcher/Dumper/LegacyApacheMatcherDumperTest.php
+++ b/core/vendor/symfony/routing/Tests/Matcher/Dumper/LegacyApacheMatcherDumperTest.php
@@ -27,11 +27,6 @@ class LegacyApacheMatcherDumperTest extends \PHPUnit_Framework_TestCase
         self::$fixturesPath = realpath(__DIR__.'/../../Fixtures/');
     }
 
-    protected function setUp()
-    {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-    }
-
     public function testDump()
     {
         $dumper = new ApacheMatcherDumper($this->getRouteCollection());
diff --git a/core/vendor/symfony/routing/Tests/Matcher/LegacyApacheUrlMatcherTest.php b/core/vendor/symfony/routing/Tests/Matcher/LegacyApacheUrlMatcherTest.php
index f42b7f206..931f910df 100644
--- a/core/vendor/symfony/routing/Tests/Matcher/LegacyApacheUrlMatcherTest.php
+++ b/core/vendor/symfony/routing/Tests/Matcher/LegacyApacheUrlMatcherTest.php
@@ -24,7 +24,6 @@ class LegacyApacheUrlMatcherTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
         $this->server = $_SERVER;
     }
 
diff --git a/core/vendor/symfony/routing/Tests/RouteTest.php b/core/vendor/symfony/routing/Tests/RouteTest.php
index 11c0cd8dc..85273a696 100644
--- a/core/vendor/symfony/routing/Tests/RouteTest.php
+++ b/core/vendor/symfony/routing/Tests/RouteTest.php
@@ -169,8 +169,6 @@ class RouteTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacySchemeRequirement()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $route = new Route('/');
         $route->setRequirement('_scheme', 'http|https');
         $this->assertEquals('http|https', $route->getRequirement('_scheme'));
@@ -199,8 +197,6 @@ class RouteTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacyMethodRequirement()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $route = new Route('/');
         $route->setRequirement('_method', 'GET|POST');
         $this->assertEquals('GET|POST', $route->getRequirement('_method'));
@@ -233,8 +229,6 @@ class RouteTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacyPattern()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $route = new Route('/{foo}');
         $this->assertEquals('/{foo}', $route->getPattern());
 
diff --git a/core/vendor/symfony/serializer/.gitignore b/core/vendor/symfony/serializer/.gitignore
new file mode 100644
index 000000000..c49a5d8df
--- /dev/null
+++ b/core/vendor/symfony/serializer/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/core/vendor/symfony/serializer/Annotation/Groups.php b/core/vendor/symfony/serializer/Annotation/Groups.php
index e88ffa71d..519837a55 100644
--- a/core/vendor/symfony/serializer/Annotation/Groups.php
+++ b/core/vendor/symfony/serializer/Annotation/Groups.php
@@ -30,21 +30,22 @@ class Groups
 
     /**
      * @param array $data
-     * @throws \InvalidArgumentException
+     *
+     * @throws InvalidArgumentException
      */
     public function __construct(array $data)
     {
         if (!isset($data['value']) || !$data['value']) {
-            throw new InvalidArgumentException(sprintf("Parameter of annotation '%s' cannot be empty.", get_class($this)));
+            throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" cannot be empty.', get_class($this)));
         }
 
         if (!is_array($data['value'])) {
-            throw new InvalidArgumentException(sprintf("Parameter of annotation '%s' must be an array of strings.", get_class($this)));
+            throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" must be an array of strings.', get_class($this)));
         }
 
         foreach ($data['value'] as $group) {
             if (!is_string($group)) {
-                throw new InvalidArgumentException(sprintf("Parameter of annotation '%s' must be an array of strings.", get_class($this)));
+                throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" must be an array of strings.', get_class($this)));
             }
         }
 
@@ -52,7 +53,7 @@ class Groups
     }
 
     /**
-     * Gets groups
+     * Gets groups.
      *
      * @return array
      */
diff --git a/core/vendor/symfony/serializer/Encoder/JsonDecode.php b/core/vendor/symfony/serializer/Encoder/JsonDecode.php
index 14c1a752c..1067296f9 100644
--- a/core/vendor/symfony/serializer/Encoder/JsonDecode.php
+++ b/core/vendor/symfony/serializer/Encoder/JsonDecode.php
@@ -62,7 +62,7 @@ class JsonDecode implements DecoderInterface
      */
     public function getLastError()
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Catch the exception raised by the decode() method instead to get the last JSON decoding error.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Catch the exception raised by the decode() method instead to get the last JSON decoding error.', E_USER_DEPRECATED);
 
         return $this->lastError;
     }
diff --git a/core/vendor/symfony/serializer/Encoder/JsonEncode.php b/core/vendor/symfony/serializer/Encoder/JsonEncode.php
index 76345bed6..37f384b25 100644
--- a/core/vendor/symfony/serializer/Encoder/JsonEncode.php
+++ b/core/vendor/symfony/serializer/Encoder/JsonEncode.php
@@ -40,7 +40,7 @@ class JsonEncode implements EncoderInterface
      */
     public function getLastError()
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Catch the exception raised by the encode() method instead to get the last JSON encoding error.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Catch the exception raised by the encode() method instead to get the last JSON encoding error.', E_USER_DEPRECATED);
 
         return $this->lastError;
     }
diff --git a/core/vendor/symfony/serializer/Encoder/JsonEncoder.php b/core/vendor/symfony/serializer/Encoder/JsonEncoder.php
index 1f7a1fb0e..284f579a0 100644
--- a/core/vendor/symfony/serializer/Encoder/JsonEncoder.php
+++ b/core/vendor/symfony/serializer/Encoder/JsonEncoder.php
@@ -45,7 +45,7 @@ class JsonEncoder implements EncoderInterface, DecoderInterface
      */
     public function getLastEncodingError()
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Catch the exception raised by the Symfony\Component\Serializer\Encoder\JsonEncode::encode() method instead to get the last JSON encoding error.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Catch the exception raised by the Symfony\Component\Serializer\Encoder\JsonEncode::encode() method instead to get the last JSON encoding error.', E_USER_DEPRECATED);
 
         return $this->encodingImpl->getLastError();
     }
@@ -59,7 +59,7 @@ class JsonEncoder implements EncoderInterface, DecoderInterface
      */
     public function getLastDecodingError()
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Catch the exception raised by the Symfony\Component\Serializer\Encoder\JsonDecode::decode() method instead to get the last JSON decoding error.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Catch the exception raised by the Symfony\Component\Serializer\Encoder\JsonDecode::decode() method instead to get the last JSON decoding error.', E_USER_DEPRECATED);
 
         return $this->decodingImpl->getLastError();
     }
diff --git a/core/vendor/symfony/serializer/Mapping/ClassMetadata.php b/core/vendor/symfony/serializer/Mapping/ClassMetadata.php
index 3794a7451..55ddf52a6 100644
--- a/core/vendor/symfony/serializer/Mapping/ClassMetadata.php
+++ b/core/vendor/symfony/serializer/Mapping/ClassMetadata.php
@@ -110,7 +110,7 @@ class ClassMetadata implements ClassMetadataInterface
     {
         return array(
             'name',
-            'attributes',
+            'attributesMetadata',
         );
     }
 }
diff --git a/core/vendor/symfony/serializer/Normalizer/AbstractNormalizer.php b/core/vendor/symfony/serializer/Normalizer/AbstractNormalizer.php
index 8e89dd509..78c82ff99 100644
--- a/core/vendor/symfony/serializer/Normalizer/AbstractNormalizer.php
+++ b/core/vendor/symfony/serializer/Normalizer/AbstractNormalizer.php
@@ -153,7 +153,7 @@ abstract class AbstractNormalizer extends SerializerAwareNormalizer implements N
      */
     public function setCamelizedAttributes(array $camelizedAttributes)
     {
-        trigger_error(sprintf('%s is deprecated since version 2.7 and will be removed in 3.0. Use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter instead.', __METHOD__), E_USER_DEPRECATED);
+        @trigger_error(sprintf('%s is deprecated since version 2.7 and will be removed in 3.0. Use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter instead.', __METHOD__), E_USER_DEPRECATED);
 
         if ($this->nameConverter && !$this->nameConverter instanceof CamelCaseToSnakeCaseNameConverter) {
             throw new LogicException(sprintf('%s cannot be called if a custom Name Converter is defined.', __METHOD__));
@@ -232,7 +232,7 @@ abstract class AbstractNormalizer extends SerializerAwareNormalizer implements N
      */
     protected function formatAttribute($attributeName)
     {
-        trigger_error(sprintf('%s is deprecated since version 2.7 and will be removed in 3.0. Use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter instead.', __METHOD__), E_USER_DEPRECATED);
+        @trigger_error(sprintf('%s is deprecated since version 2.7 and will be removed in 3.0. Use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter instead.', __METHOD__), E_USER_DEPRECATED);
 
         return $this->nameConverter ? $this->nameConverter->normalize($attributeName) : $attributeName;
     }
@@ -288,7 +288,7 @@ abstract class AbstractNormalizer extends SerializerAwareNormalizer implements N
     }
 
     /**
-     * Instantiates an object using contructor parameters when needed.
+     * Instantiates an object using constructor parameters when needed.
      *
      * This method also allows to denormalize data into an existing object if
      * it is present in the context with the object_to_populate key.
diff --git a/core/vendor/symfony/serializer/Tests/Annotation/GroupsTest.php b/core/vendor/symfony/serializer/Tests/Annotation/GroupsTest.php
index b427325f0..72b877729 100644
--- a/core/vendor/symfony/serializer/Tests/Annotation/GroupsTest.php
+++ b/core/vendor/symfony/serializer/Tests/Annotation/GroupsTest.php
@@ -19,7 +19,7 @@ use Symfony\Component\Serializer\Annotation\Groups;
 class GroupsTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @expectedException \InvalidArgumentException
+     * @expectedException \Symfony\Component\Serializer\Exception\InvalidArgumentException
      */
     public function testEmptyGroupsParameter()
     {
@@ -27,7 +27,7 @@ class GroupsTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * @expectedException \InvalidArgumentException
+     * @expectedException \Symfony\Component\Serializer\Exception\InvalidArgumentException
      */
     public function testNotAnArrayGroupsParameter()
     {
@@ -35,7 +35,7 @@ class GroupsTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * @expectedException \InvalidArgumentException
+     * @expectedException \Symfony\Component\Serializer\Exception\InvalidArgumentException
      */
     public function testInvalidGroupsParameter()
     {
diff --git a/core/vendor/symfony/serializer/Tests/Mapping/AttributeMetadataTest.php b/core/vendor/symfony/serializer/Tests/Mapping/AttributeMetadataTest.php
index f22746bc5..4a32831cb 100644
--- a/core/vendor/symfony/serializer/Tests/Mapping/AttributeMetadataTest.php
+++ b/core/vendor/symfony/serializer/Tests/Mapping/AttributeMetadataTest.php
@@ -54,4 +54,14 @@ class AttributeMetadataTest extends \PHPUnit_Framework_TestCase
 
         $this->assertEquals(array('a', 'b', 'c'), $attributeMetadata1->getGroups());
     }
+
+    public function testSerialize()
+    {
+        $attributeMetadata = new AttributeMetadata('attribute');
+        $attributeMetadata->addGroup('a');
+        $attributeMetadata->addGroup('b');
+
+        $serialized = serialize($attributeMetadata);
+        $this->assertEquals($attributeMetadata, unserialize($serialized));
+    }
 }
diff --git a/core/vendor/symfony/serializer/Tests/Mapping/ClassMetadataTest.php b/core/vendor/symfony/serializer/Tests/Mapping/ClassMetadataTest.php
index 90017580a..629c17b78 100644
--- a/core/vendor/symfony/serializer/Tests/Mapping/ClassMetadataTest.php
+++ b/core/vendor/symfony/serializer/Tests/Mapping/ClassMetadataTest.php
@@ -62,4 +62,21 @@ class ClassMetadataTest extends \PHPUnit_Framework_TestCase
 
         $this->assertEquals(array('a1' => $ac1), $classMetadata2->getAttributesMetadata());
     }
+
+    public function testSerialize()
+    {
+        $classMetadata = new ClassMetadata('a');
+
+        $a1 = $this->getMock('Symfony\Component\Serializer\Mapping\AttributeMetadataInterface');
+        $a1->method('getName')->willReturn('b1');
+
+        $a2 = $this->getMock('Symfony\Component\Serializer\Mapping\AttributeMetadataInterface');
+        $a2->method('getName')->willReturn('b2');
+
+        $classMetadata->addAttributeMetadata($a1);
+        $classMetadata->addAttributeMetadata($a2);
+
+        $serialized = serialize($classMetadata);
+        $this->assertEquals($classMetadata, unserialize($serialized));
+    }
 }
diff --git a/core/vendor/symfony/serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php b/core/vendor/symfony/serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
index e8156dd10..92051863d 100644
--- a/core/vendor/symfony/serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
+++ b/core/vendor/symfony/serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
@@ -105,8 +105,6 @@ class GetSetMethodNormalizerTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacyDenormalizeOnCamelCaseFormat()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $this->normalizer->setCamelizedAttributes(array('camel_case'));
         $obj = $this->normalizer->denormalize(
             array('camel_case' => 'camelCase'),
@@ -136,8 +134,6 @@ class GetSetMethodNormalizerTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacyCamelizedAttributesNormalize()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $obj = new GetCamelizedDummy('dunglas.fr');
         $obj->setFooBar('les-tilleuls.coop');
         $obj->setBar_foo('lostinthesupermarket.fr');
@@ -162,8 +158,6 @@ class GetSetMethodNormalizerTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacyCamelizedAttributesDenormalize()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $obj = new GetCamelizedDummy('dunglas.fr');
         $obj->setFooBar('les-tilleuls.coop');
         $obj->setBar_foo('lostinthesupermarket.fr');
diff --git a/core/vendor/symfony/serializer/Tests/Normalizer/ObjectNormalizerTest.php b/core/vendor/symfony/serializer/Tests/Normalizer/ObjectNormalizerTest.php
index 14a268f5b..7d9da645c 100644
--- a/core/vendor/symfony/serializer/Tests/Normalizer/ObjectNormalizerTest.php
+++ b/core/vendor/symfony/serializer/Tests/Normalizer/ObjectNormalizerTest.php
@@ -102,8 +102,6 @@ class ObjectNormalizerTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacyDenormalizeOnCamelCaseFormat()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $this->normalizer->setCamelizedAttributes(array('camel_case'));
         $obj = $this->normalizer->denormalize(
             array('camel_case' => 'camelCase'),
diff --git a/core/vendor/symfony/serializer/Tests/Normalizer/PropertyNormalizerTest.php b/core/vendor/symfony/serializer/Tests/Normalizer/PropertyNormalizerTest.php
index 52ce54087..62e6d5d92 100644
--- a/core/vendor/symfony/serializer/Tests/Normalizer/PropertyNormalizerTest.php
+++ b/core/vendor/symfony/serializer/Tests/Normalizer/PropertyNormalizerTest.php
@@ -68,8 +68,6 @@ class PropertyNormalizerTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacyDenormalizeOnCamelCaseFormat()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $this->normalizer->setCamelizedAttributes(array('camel_case'));
         $obj = $this->normalizer->denormalize(
             array('camel_case' => 'value'),
@@ -83,8 +81,6 @@ class PropertyNormalizerTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacyCamelizedAttributesNormalize()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $obj = new PropertyCamelizedDummy('dunglas.fr');
         $obj->fooBar = 'les-tilleuls.coop';
         $obj->bar_foo = 'lostinthesupermarket.fr';
@@ -109,8 +105,6 @@ class PropertyNormalizerTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacyCamelizedAttributesDenormalize()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $obj = new PropertyCamelizedDummy('dunglas.fr');
         $obj->fooBar = 'les-tilleuls.coop';
         $obj->bar_foo = 'lostinthesupermarket.fr';
diff --git a/core/vendor/symfony/translation/.gitignore b/core/vendor/symfony/translation/.gitignore
new file mode 100644
index 000000000..c49a5d8df
--- /dev/null
+++ b/core/vendor/symfony/translation/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/core/vendor/symfony/translation/Loader/JsonFileLoader.php b/core/vendor/symfony/translation/Loader/JsonFileLoader.php
index 8327c63b5..81717f3d9 100644
--- a/core/vendor/symfony/translation/Loader/JsonFileLoader.php
+++ b/core/vendor/symfony/translation/Loader/JsonFileLoader.php
@@ -20,7 +20,7 @@ use Symfony\Component\Config\Resource\FileResource;
  *
  * @author singles
  */
-class JsonFileLoader extends ArrayLoader implements LoaderInterface
+class JsonFileLoader extends ArrayLoader
 {
     /**
      * {@inheritdoc}
@@ -35,10 +35,13 @@ class JsonFileLoader extends ArrayLoader implements LoaderInterface
             throw new NotFoundResourceException(sprintf('File "%s" not found.', $resource));
         }
 
-        $messages = json_decode(file_get_contents($resource), true);
+        $messages = array();
+        if ($data = file_get_contents($resource)) {
+            $messages = json_decode($data, true);
 
-        if (0 < $errorCode = json_last_error()) {
-            throw new InvalidResourceException(sprintf('Error parsing JSON - %s', $this->getJSONErrorMessage($errorCode)));
+            if (0 < $errorCode = json_last_error()) {
+                throw new InvalidResourceException(sprintf('Error parsing JSON - %s', $this->getJSONErrorMessage($errorCode)));
+            }
         }
 
         if (null === $messages) {
diff --git a/core/vendor/symfony/translation/Loader/MoFileLoader.php b/core/vendor/symfony/translation/Loader/MoFileLoader.php
index ab4e7a957..746fd5290 100644
--- a/core/vendor/symfony/translation/Loader/MoFileLoader.php
+++ b/core/vendor/symfony/translation/Loader/MoFileLoader.php
@@ -116,7 +116,7 @@ class MoFileLoader extends ArrayLoader
 
         $messages = array();
 
-        for ($i = 0; $i < $count; $i++) {
+        for ($i = 0; $i < $count; ++$i) {
             $singularId = $pluralId = null;
             $translated = null;
 
diff --git a/core/vendor/symfony/translation/Loader/XliffFileLoader.php b/core/vendor/symfony/translation/Loader/XliffFileLoader.php
index 99761e7f2..d2b5407f8 100644
--- a/core/vendor/symfony/translation/Loader/XliffFileLoader.php
+++ b/core/vendor/symfony/translation/Loader/XliffFileLoader.php
@@ -148,7 +148,7 @@ class XliffFileLoader implements LoaderInterface
         $source = str_replace('http://www.w3.org/2001/xml.xsd', $location, $source);
 
         if (!@$dom->schemaValidateSource($source)) {
-            throw new InvalidResourceException(implode("\n", $this->getXmlErrors($internalErrors)));
+            throw new InvalidResourceException(sprintf('Invalid resource provided: "%s"; Errors: %s', $file, implode("\n", $this->getXmlErrors($internalErrors))));
         }
 
         $dom->normalizeDocument();
diff --git a/core/vendor/symfony/translation/MessageSelector.php b/core/vendor/symfony/translation/MessageSelector.php
index 9f5430cfe..f7fde31ad 100644
--- a/core/vendor/symfony/translation/MessageSelector.php
+++ b/core/vendor/symfony/translation/MessageSelector.php
@@ -57,7 +57,7 @@ class MessageSelector
         foreach ($parts as $part) {
             $part = trim($part);
 
-            if (preg_match('/^(?P<interval>'.Interval::getIntervalRegexp().')\s*(?P<message>.*?)$/x', $part, $matches)) {
+            if (preg_match('/^(?P<interval>'.Interval::getIntervalRegexp().')\s*(?P<message>.*?)$/xs', $part, $matches)) {
                 $explicitRules[$matches['interval']] = $matches['message'];
             } elseif (preg_match('/^\w+\:\s*(.*?)$/', $part, $matches)) {
                 $standardRules[] = $matches[1];
diff --git a/core/vendor/symfony/translation/PluralizationRules.php b/core/vendor/symfony/translation/PluralizationRules.php
index e1eac82ce..3ef8f00b6 100644
--- a/core/vendor/symfony/translation/PluralizationRules.php
+++ b/core/vendor/symfony/translation/PluralizationRules.php
@@ -55,6 +55,7 @@ class PluralizationRules
          * Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
          */
         switch ($locale) {
+            case 'az':
             case 'bo':
             case 'dz':
             case 'id':
@@ -73,7 +74,6 @@ class PluralizationRules
                 break;
 
             case 'af':
-            case 'az':
             case 'bn':
             case 'bg':
             case 'ca':
diff --git a/core/vendor/symfony/translation/Tests/MessageSelectorTest.php b/core/vendor/symfony/translation/Tests/MessageSelectorTest.php
index d5a4f3e3d..f89bed16d 100644
--- a/core/vendor/symfony/translation/Tests/MessageSelectorTest.php
+++ b/core/vendor/symfony/translation/Tests/MessageSelectorTest.php
@@ -93,6 +93,38 @@ class MessageSelectorTest extends \PHPUnit_Framework_TestCase
             array('There are no apples', '{0} There are no apples|]0,1[There are %count% apples|{1} There is one apple|[1,Inf] There is more than one apple', 0),
             array('There are no apples', '{0} There are no apples|]0,1[There are %count% apples|{1} There is one apple|[1,Inf] There is more than one apple', 0.0),
             array('There are no apples', '{0.0} There are no apples|]0,1[There are %count% apples|{1} There is one apple|[1,Inf] There is more than one apple', 0),
+
+            // Test texts with new-lines
+            // with double-quotes and \n in id & double-quotes and actual newlines in text
+            array("This is a text with a\n            new-line in it. Selector = 0.", '{0}This is a text with a
+            new-line in it. Selector = 0.|{1}This is a text with a
+            new-line in it. Selector = 1.|[1,Inf]This is a text with a
+            new-line in it. Selector > 1.', 0),
+            // with double-quotes and \n in id and single-quotes and actual newlines in text
+            array("This is a text with a\n            new-line in it. Selector = 1.", '{0}This is a text with a
+            new-line in it. Selector = 0.|{1}This is a text with a
+            new-line in it. Selector = 1.|[1,Inf]This is a text with a
+            new-line in it. Selector > 1.', 1),
+            array("This is a text with a\n            new-line in it. Selector > 1.", '{0}This is a text with a
+            new-line in it. Selector = 0.|{1}This is a text with a
+            new-line in it. Selector = 1.|[1,Inf]This is a text with a
+            new-line in it. Selector > 1.', 5),
+            // with double-quotes and id split accros lines
+            array('This is a text with a
+            new-line in it. Selector = 1.', '{0}This is a text with a
+            new-line in it. Selector = 0.|{1}This is a text with a
+            new-line in it. Selector = 1.|[1,Inf]This is a text with a
+            new-line in it. Selector > 1.', 1),
+            // with single-quotes and id split accros lines
+            array('This is a text with a
+            new-line in it. Selector > 1.', '{0}This is a text with a
+            new-line in it. Selector = 0.|{1}This is a text with a
+            new-line in it. Selector = 1.|[1,Inf]This is a text with a
+            new-line in it. Selector > 1.', 5),
+            // with single-quotes and \n in text
+            array('This is a text with a\nnew-line in it. Selector = 0.', '{0}This is a text with a\nnew-line in it. Selector = 0.|{1}This is a text with a\nnew-line in it. Selector = 1.|[1,Inf]This is a text with a\nnew-line in it. Selector > 1.', 0),
+            // with double-quotes and id split accros lines
+            array("This is a text with a\nnew-line in it. Selector = 1.", "{0}This is a text with a\nnew-line in it. Selector = 0.|{1}This is a text with a\nnew-line in it. Selector = 1.|[1,Inf]This is a text with a\nnew-line in it. Selector > 1.", 1),
         );
     }
 }
diff --git a/core/vendor/symfony/translation/Tests/PluralizationRulesTest.php b/core/vendor/symfony/translation/Tests/PluralizationRulesTest.php
index 1e8ee704f..066e07f5a 100644
--- a/core/vendor/symfony/translation/Tests/PluralizationRulesTest.php
+++ b/core/vendor/symfony/translation/Tests/PluralizationRulesTest.php
@@ -112,7 +112,7 @@ class PluralizationRulesTest extends \PHPUnit_Framework_TestCase
     {
         $matrix = array();
         foreach ($langCodes as $langCode) {
-            for ($count = 0; $count < 200; $count++) {
+            for ($count = 0; $count < 200; ++$count) {
                 $plural = PluralizationRules::get($count, $langCode);
                 $matrix[$langCode][$count] = $plural;
             }
diff --git a/core/vendor/symfony/translation/Tests/TranslatorCacheTest.php b/core/vendor/symfony/translation/Tests/TranslatorCacheTest.php
index d5d463998..abe364c73 100644
--- a/core/vendor/symfony/translation/Tests/TranslatorCacheTest.php
+++ b/core/vendor/symfony/translation/Tests/TranslatorCacheTest.php
@@ -74,41 +74,6 @@ class TranslatorCacheTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals('OK', $translator->trans($msgid), '-> caching does not work in '.($debug ? 'debug' : 'production'));
     }
 
-    public function testRefreshCacheWhenResourcesChange()
-    {
-        // prime the cache
-        $loader = $this->getMock('Symfony\Component\Translation\Loader\LoaderInterface');
-        $loader
-            ->method('load')
-            ->will($this->returnValue($this->getCatalogue('fr', array(
-                'foo' => 'foo A',
-            ))))
-        ;
-
-        $translator = new Translator('fr', null, $this->tmpDir, true);
-        $translator->setLocale('fr');
-        $translator->addLoader('loader', $loader);
-        $translator->addResource('loader', 'foo', 'fr');
-
-        $this->assertEquals('foo A', $translator->trans('foo'));
-
-        // add a new resource to refresh the cache
-        $loader = $this->getMock('Symfony\Component\Translation\Loader\LoaderInterface');
-        $loader
-            ->method('load')
-            ->will($this->returnValue($this->getCatalogue('fr', array(
-                'foo' => 'foo B',
-            ))))
-        ;
-
-        $translator = new Translator('fr', null, $this->tmpDir, true);
-        $translator->setLocale('fr');
-        $translator->addLoader('loader', $loader);
-        $translator->addResource('loader', 'bar', 'fr');
-
-        $this->assertEquals('foo B', $translator->trans('foo'));
-    }
-
     public function testCatalogueIsReloadedWhenResourcesAreNoLongerFresh()
     {
         /*
@@ -150,32 +115,6 @@ class TranslatorCacheTest extends \PHPUnit_Framework_TestCase
         $translator->trans($msgid);
     }
 
-    /**
-     * @dataProvider runForDebugAndProduction
-     */
-    public function testDifferentTranslatorsForSameLocaleDoNotInterfere($debug)
-    {
-        $locale = 'any_locale';
-        $format = 'some_format';
-        $msgid = 'test';
-
-        // Create a Translator and prime its cache
-        $translator = new Translator($locale, null, $this->tmpDir, $debug);
-        $translator->addLoader($format, new ArrayLoader());
-        $translator->addResource($format, array($msgid => 'FAIL'), $locale);
-        $translator->trans($msgid);
-
-        /*
-         * Create another Translator with the same locale but a different resource.
-         * It should not use the first translator's cache but return the value from its own resource.
-         */
-        $translator = new Translator($locale, null, $this->tmpDir, $debug);
-        $translator->addLoader($format, new ArrayLoader());
-        $translator->addResource($format, array($msgid => 'OK'), $locale);
-
-        $this->assertEquals('OK', $translator->trans($msgid), '-> different translators for the same domain interfere in '.($debug ? 'debug' : 'production'));
-    }
-
     /**
      * @dataProvider runForDebugAndProduction
      */
diff --git a/core/vendor/symfony/translation/Tests/TranslatorTest.php b/core/vendor/symfony/translation/Tests/TranslatorTest.php
index 3ee9be019..cb3618318 100644
--- a/core/vendor/symfony/translation/Tests/TranslatorTest.php
+++ b/core/vendor/symfony/translation/Tests/TranslatorTest.php
@@ -502,7 +502,7 @@ class TranslatorTest extends \PHPUnit_Framework_TestCase
     public function testGetMessages($resources, $locale, $expected)
     {
         $locales = array_keys($resources);
-        $_locale = !is_null($locale) ? $locale : reset($locales);
+        $_locale = null !== $locale ? $locale : reset($locales);
         $locales = array_slice($locales, 0, array_search($_locale, $locales));
 
         $translator = new Translator($_locale, new MessageSelector());
diff --git a/core/vendor/symfony/translation/Translator.php b/core/vendor/symfony/translation/Translator.php
index ec315066f..9b1b73550 100644
--- a/core/vendor/symfony/translation/Translator.php
+++ b/core/vendor/symfony/translation/Translator.php
@@ -177,7 +177,7 @@ class Translator implements TranslatorInterface, TranslatorBagInterface
      */
     public function setFallbackLocale($locales)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Use the setFallbackLocales() method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Use the setFallbackLocales() method instead.', E_USER_DEPRECATED);
 
         $this->setFallbackLocales(is_array($locales) ? $locales : array($locales));
     }
@@ -419,12 +419,7 @@ EOF
 
     private function getCatalogueCachePath($locale)
     {
-        $catalogueHash = sha1(serialize(array(
-            'resources' => isset($this->resources[$locale]) ? $this->resources[$locale] : array(),
-            'fallback_locales' => $this->fallbackLocales,
-        )));
-
-        return $this->cacheDir.'/catalogue.'.$locale.'.'.$catalogueHash.'.php';
+        return $this->cacheDir.'/catalogue.'.$locale.'.'.sha1(serialize($this->fallbackLocales)).'.php';
     }
 
     private function doLoadCatalogue($locale)
diff --git a/core/vendor/symfony/validator/.gitignore b/core/vendor/symfony/validator/.gitignore
new file mode 100644
index 000000000..c49a5d8df
--- /dev/null
+++ b/core/vendor/symfony/validator/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/core/vendor/symfony/validator/ConstraintValidator.php b/core/vendor/symfony/validator/ConstraintValidator.php
index 7a412737b..3b5d6bc16 100644
--- a/core/vendor/symfony/validator/ConstraintValidator.php
+++ b/core/vendor/symfony/validator/ConstraintValidator.php
@@ -65,7 +65,7 @@ abstract class ConstraintValidator implements ConstraintValidatorInterface
      */
     protected function buildViolation($message, array $parameters = array())
     {
-        trigger_error('The '.__METHOD__.' is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
 
         if ($this->context instanceof ExecutionContextInterface2Dot5) {
             return $this->context->buildViolation($message, $parameters);
@@ -88,7 +88,7 @@ abstract class ConstraintValidator implements ConstraintValidatorInterface
      */
     protected function buildViolationInContext(ExecutionContextInterface $context, $message, array $parameters = array())
     {
-        trigger_error('The '.__METHOD__.' is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
 
         if ($context instanceof ExecutionContextInterface2Dot5) {
             return $context->buildViolation($message, $parameters);
diff --git a/core/vendor/symfony/validator/ConstraintViolation.php b/core/vendor/symfony/validator/ConstraintViolation.php
index 7df3f3fad..31b44d23c 100644
--- a/core/vendor/symfony/validator/ConstraintViolation.php
+++ b/core/vendor/symfony/validator/ConstraintViolation.php
@@ -147,7 +147,7 @@ class ConstraintViolation implements ConstraintViolationInterface
      */
     public function getMessageParameters()
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.7, to be removed in 3.0. Use the ConstraintViolation::getParameters() method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.7, to be removed in 3.0. Use the ConstraintViolation::getParameters() method instead.', E_USER_DEPRECATED);
 
         return $this->parameters;
     }
@@ -168,7 +168,7 @@ class ConstraintViolation implements ConstraintViolationInterface
      */
     public function getMessagePluralization()
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.7, to be removed in 3.0. Use the ConstraintViolation::getPlural() method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.7, to be removed in 3.0. Use the ConstraintViolation::getPlural() method instead.', E_USER_DEPRECATED);
 
         return $this->plural;
     }
diff --git a/core/vendor/symfony/validator/Constraints/Callback.php b/core/vendor/symfony/validator/Constraints/Callback.php
index bb8c076e0..d1d05fa26 100644
--- a/core/vendor/symfony/validator/Constraints/Callback.php
+++ b/core/vendor/symfony/validator/Constraints/Callback.php
@@ -48,7 +48,7 @@ class Callback extends Constraint
         }
 
         if (is_array($options) && isset($options['methods'])) {
-            trigger_error('The "methods" option of the '.__CLASS__.' class is deprecated since version 2.4 and will be removed in 3.0. Use the "callback" option instead.', E_USER_DEPRECATED);
+            @trigger_error('The "methods" option of the '.__CLASS__.' class is deprecated since version 2.4 and will be removed in 3.0. Use the "callback" option instead.', E_USER_DEPRECATED);
         }
 
         if (is_array($options) && !isset($options['callback']) && !isset($options['methods']) && !isset($options['groups'])) {
diff --git a/core/vendor/symfony/validator/Constraints/CallbackValidator.php b/core/vendor/symfony/validator/Constraints/CallbackValidator.php
index 9939306cb..eaf2f3c01 100644
--- a/core/vendor/symfony/validator/Constraints/CallbackValidator.php
+++ b/core/vendor/symfony/validator/Constraints/CallbackValidator.php
@@ -60,7 +60,7 @@ class CallbackValidator extends ConstraintValidator
                 call_user_func($method, $object, $this->context);
             } elseif (null !== $object) {
                 if (!method_exists($object, $method)) {
-                    throw new ConstraintDefinitionException(sprintf('Method "%s" targeted by Callback constraint does not exist', $method));
+                    throw new ConstraintDefinitionException(sprintf('Method "%s" targeted by Callback constraint does not exist in class %s', $method, get_class($object)));
                 }
 
                 $reflMethod = new \ReflectionMethod($object, $method);
diff --git a/core/vendor/symfony/validator/Constraints/CardSchemeValidator.php b/core/vendor/symfony/validator/Constraints/CardSchemeValidator.php
index 708ae0939..229e0d2c1 100644
--- a/core/vendor/symfony/validator/Constraints/CardSchemeValidator.php
+++ b/core/vendor/symfony/validator/Constraints/CardSchemeValidator.php
@@ -24,6 +24,7 @@ use Symfony\Component\Validator\Exception\UnexpectedTypeException;
  *
  * @see http://en.wikipedia.org/wiki/Bank_card_number
  * @see http://www.regular-expressions.info/creditcard.html
+ * @see http://www.barclaycard.co.uk/business/files/Ranges_and_Rules_September_2014.pdf
  */
 class CardSchemeValidator extends ConstraintValidator
 {
@@ -64,10 +65,13 @@ class CardSchemeValidator extends ConstraintValidator
         'LASER' => array(
             '/^(6304|670[69]|6771)[0-9]{12,15}$/',
         ),
-        // Maestro cards begin with either 5018, 5020, 5038, 5893, 6304, 6759, 6761, 6762, 6763 or 0604
-        // They have between 12 and 19 digits.
+        // Maestro international cards begin with 675900..675999 and have between 12 and 19 digits.
+        // Maestro UK cards begin with either 500000..509999 or 560000..699999 and have between 12 and 19 digits.
         'MAESTRO' => array(
-            '/^(5018|5020|5038|6304|6759|6761|676[23]|0604)[0-9]{8,15}$/',
+            '/^(6759[0-9]{2})[0-9]{6,13}$/',
+            '/^(50[0-9]{4})[0-9]{6,13}$/',
+            '/^5[6-9][0-9]{10,17}$/',
+            '/^6[0-9]{11,18}$/',
         ),
         // All MasterCard numbers start with the numbers 51 through 55. All have 16 digits.
         'MASTERCARD' => array(
diff --git a/core/vendor/symfony/validator/Constraints/Collection/Optional.php b/core/vendor/symfony/validator/Constraints/Collection/Optional.php
index cd9af50b9..68471f925 100644
--- a/core/vendor/symfony/validator/Constraints/Collection/Optional.php
+++ b/core/vendor/symfony/validator/Constraints/Collection/Optional.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Validator\Constraints\Collection;
 
-trigger_error('The '.__NAMESPACE__.'\Optional class is deprecated since version 2.3 and will be removed in 3.0. Use the Symfony\Component\Validator\Constraints\Optional class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\Optional class is deprecated since version 2.3 and will be removed in 3.0. Use the Symfony\Component\Validator\Constraints\Optional class instead.', E_USER_DEPRECATED);
 
 use Symfony\Component\Validator\Constraints\Optional as BaseOptional;
 
diff --git a/core/vendor/symfony/validator/Constraints/Collection/Required.php b/core/vendor/symfony/validator/Constraints/Collection/Required.php
index 55041020b..4b062bb55 100644
--- a/core/vendor/symfony/validator/Constraints/Collection/Required.php
+++ b/core/vendor/symfony/validator/Constraints/Collection/Required.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Validator\Constraints\Collection;
 
-trigger_error('The '.__NAMESPACE__.'\Required class is deprecated since version 2.3 and will be removed in 3.0. Use the Symfony\Component\Validator\Constraints\Required class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\Required class is deprecated since version 2.3 and will be removed in 3.0. Use the Symfony\Component\Validator\Constraints\Required class instead.', E_USER_DEPRECATED);
 
 use Symfony\Component\Validator\Constraints\Required as BaseRequired;
 
diff --git a/core/vendor/symfony/validator/Constraints/EmailValidator.php b/core/vendor/symfony/validator/Constraints/EmailValidator.php
index 95f9aa123..ab1e9ba8f 100644
--- a/core/vendor/symfony/validator/Constraints/EmailValidator.php
+++ b/core/vendor/symfony/validator/Constraints/EmailValidator.php
@@ -25,8 +25,6 @@ use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 class EmailValidator extends ConstraintValidator
 {
     /**
-     * isStrict
-     *
      * @var bool
      */
     private $isStrict;
@@ -81,7 +79,7 @@ class EmailValidator extends ConstraintValidator
 
                 return;
             }
-        } elseif (!preg_match('/.+\@.+\..+/', $value)) {
+        } elseif (!preg_match('/^.+\@\S+\.\S+$/', $value)) {
             if ($this->context instanceof ExecutionContextInterface) {
                 $this->context->buildViolation($constraint->message)
                     ->setParameter('{{ value }}', $this->formatValue($value))
diff --git a/core/vendor/symfony/validator/Constraints/False.php b/core/vendor/symfony/validator/Constraints/False.php
index 166878863..1e103ade5 100644
--- a/core/vendor/symfony/validator/Constraints/False.php
+++ b/core/vendor/symfony/validator/Constraints/False.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
-trigger_error('The '.__NAMESPACE__.'\False class is deprecated since version 2.7 and will be removed in 3.0. Use the IsFalse class in the same namespace instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\False class is deprecated since version 2.7 and will be removed in 3.0. Use the IsFalse class in the same namespace instead.', E_USER_DEPRECATED);
 
 /**
  * @Annotation
diff --git a/core/vendor/symfony/validator/Constraints/FalseValidator.php b/core/vendor/symfony/validator/Constraints/FalseValidator.php
index 24eb91010..9614c3037 100644
--- a/core/vendor/symfony/validator/Constraints/FalseValidator.php
+++ b/core/vendor/symfony/validator/Constraints/FalseValidator.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
-trigger_error('The '.__NAMESPACE__.'\FalseValidator class is deprecated since version 2.7 and will be removed in 3.0. Use the IsFalseValidator class in the same namespace instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\FalseValidator class is deprecated since version 2.7 and will be removed in 3.0. Use the IsFalseValidator class in the same namespace instead.', E_USER_DEPRECATED);
 
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
diff --git a/core/vendor/symfony/validator/Constraints/File.php b/core/vendor/symfony/validator/Constraints/File.php
index ae0ad6739..f35f93cdb 100644
--- a/core/vendor/symfony/validator/Constraints/File.php
+++ b/core/vendor/symfony/validator/Constraints/File.php
@@ -40,7 +40,6 @@ class File extends Constraint
         self::INVALID_MIME_TYPE_ERROR => 'INVALID_MIME_TYPE_ERROR',
     );
 
-    public $maxSize;
     public $binaryFormat;
     public $mimeTypes = array();
     public $notFoundMessage = 'The file could not be found.';
@@ -58,29 +57,56 @@ class File extends Constraint
     public $uploadExtensionErrorMessage = 'A PHP extension caused the upload to fail.';
     public $uploadErrorMessage = 'The file could not be uploaded.';
 
+    protected $maxSize;
+
     public function __construct($options = null)
     {
         parent::__construct($options);
 
-        if ($this->maxSize) {
-            if (ctype_digit((string) $this->maxSize)) {
-                $this->maxSize = (int) $this->maxSize;
-                $this->binaryFormat = null === $this->binaryFormat ? false : $this->binaryFormat;
-            } elseif (preg_match('/^\d++k$/i', $this->maxSize)) {
-                $this->maxSize = $this->maxSize * 1000;
-                $this->binaryFormat = null === $this->binaryFormat ? false : $this->binaryFormat;
-            } elseif (preg_match('/^\d++M$/i', $this->maxSize)) {
-                $this->maxSize = $this->maxSize * 1000000;
-                $this->binaryFormat = null === $this->binaryFormat ? false : $this->binaryFormat;
-            } elseif (preg_match('/^\d++Ki$/i', $this->maxSize)) {
-                $this->maxSize = $this->maxSize << 10;
-                $this->binaryFormat = null === $this->binaryFormat ? true : $this->binaryFormat;
-            } elseif (preg_match('/^\d++Mi$/i', $this->maxSize)) {
-                $this->maxSize = $this->maxSize << 20;
-                $this->binaryFormat = null === $this->binaryFormat ? true : $this->binaryFormat;
-            } else {
-                throw new ConstraintDefinitionException(sprintf('"%s" is not a valid maximum size', $this->maxSize));
-            }
+        if (null !== $this->maxSize) {
+            $this->normalizeBinaryFormat($this->maxSize);
+        }
+    }
+
+    public function __set($option, $value)
+    {
+        if ('maxSize' === $option) {
+            $this->normalizeBinaryFormat($value);
+
+            return;
+        }
+
+        parent::__set($option, $value);
+    }
+
+    public function __get($option)
+    {
+        if ('maxSize' === $option) {
+            return $this->maxSize;
+        }
+
+        return parent::__get($option);
+    }
+
+    private function normalizeBinaryFormat($maxSize)
+    {
+        if (ctype_digit((string) $maxSize)) {
+            $this->maxSize = (int) $maxSize;
+            $this->binaryFormat = null === $this->binaryFormat ? false : $this->binaryFormat;
+        } elseif (preg_match('/^\d++k$/i', $maxSize)) {
+            $this->maxSize = $maxSize * 1000;
+            $this->binaryFormat = null === $this->binaryFormat ? false : $this->binaryFormat;
+        } elseif (preg_match('/^\d++M$/i', $maxSize)) {
+            $this->maxSize = $maxSize * 1000000;
+            $this->binaryFormat = null === $this->binaryFormat ? false : $this->binaryFormat;
+        } elseif (preg_match('/^\d++Ki$/i', $maxSize)) {
+            $this->maxSize = $maxSize << 10;
+            $this->binaryFormat = null === $this->binaryFormat ? true : $this->binaryFormat;
+        } elseif (preg_match('/^\d++Mi$/i', $maxSize)) {
+            $this->maxSize = $maxSize << 20;
+            $this->binaryFormat = null === $this->binaryFormat ? true : $this->binaryFormat;
+        } else {
+            throw new ConstraintDefinitionException(sprintf('"%s" is not a valid maximum size', $this->maxSize));
         }
     }
 }
diff --git a/core/vendor/symfony/validator/Constraints/GroupSequence.php b/core/vendor/symfony/validator/Constraints/GroupSequence.php
index 52d753943..b74f92caa 100644
--- a/core/vendor/symfony/validator/Constraints/GroupSequence.php
+++ b/core/vendor/symfony/validator/Constraints/GroupSequence.php
@@ -107,7 +107,7 @@ class GroupSequence implements \ArrayAccess, \IteratorAggregate, \Countable
      */
     public function getIterator()
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
 
         return new \ArrayIterator($this->groups);
     }
@@ -125,7 +125,7 @@ class GroupSequence implements \ArrayAccess, \IteratorAggregate, \Countable
      */
     public function offsetExists($offset)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
 
         return isset($this->groups[$offset]);
     }
@@ -145,7 +145,7 @@ class GroupSequence implements \ArrayAccess, \IteratorAggregate, \Countable
      */
     public function offsetGet($offset)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
 
         if (!isset($this->groups[$offset])) {
             throw new OutOfBoundsException(sprintf(
@@ -169,7 +169,7 @@ class GroupSequence implements \ArrayAccess, \IteratorAggregate, \Countable
      */
     public function offsetSet($offset, $value)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
 
         if (null !== $offset) {
             $this->groups[$offset] = $value;
@@ -191,7 +191,7 @@ class GroupSequence implements \ArrayAccess, \IteratorAggregate, \Countable
      */
     public function offsetUnset($offset)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
 
         unset($this->groups[$offset]);
     }
@@ -207,7 +207,7 @@ class GroupSequence implements \ArrayAccess, \IteratorAggregate, \Countable
      */
     public function count()
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
 
         return count($this->groups);
     }
diff --git a/core/vendor/symfony/validator/Constraints/IsbnValidator.php b/core/vendor/symfony/validator/Constraints/IsbnValidator.php
index ccdf4e88d..301a82177 100644
--- a/core/vendor/symfony/validator/Constraints/IsbnValidator.php
+++ b/core/vendor/symfony/validator/Constraints/IsbnValidator.php
@@ -49,10 +49,10 @@ class IsbnValidator extends ConstraintValidator
 
         if (null === $constraint->type) {
             if ($constraint->isbn10 && !$constraint->isbn13) {
-                trigger_error('The "isbn10" option of the Isbn constraint is deprecated since version 2.5 and will be removed in 3.0. Use the "type" option instead.', E_USER_DEPRECATED);
+                @trigger_error('The "isbn10" option of the Isbn constraint is deprecated since version 2.5 and will be removed in 3.0. Use the "type" option instead.', E_USER_DEPRECATED);
                 $constraint->type = 'isbn10';
             } elseif ($constraint->isbn13 && !$constraint->isbn10) {
-                trigger_error('The "isbn13" option of the Isbn constraint is deprecated since version 2.5 and will be removed in 3.0. Use the "type" option instead.', E_USER_DEPRECATED);
+                @trigger_error('The "isbn13" option of the Isbn constraint is deprecated since version 2.5 and will be removed in 3.0. Use the "type" option instead.', E_USER_DEPRECATED);
                 $constraint->type = 'isbn13';
             }
         }
diff --git a/core/vendor/symfony/validator/Constraints/Null.php b/core/vendor/symfony/validator/Constraints/Null.php
index 934b8eedc..705d93fc4 100644
--- a/core/vendor/symfony/validator/Constraints/Null.php
+++ b/core/vendor/symfony/validator/Constraints/Null.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
-trigger_error('The '.__NAMESPACE__.'\Null class is deprecated since version 2.7 and will be removed in 3.0. Use the IsNull class in the same namespace instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\Null class is deprecated since version 2.7 and will be removed in 3.0. Use the IsNull class in the same namespace instead.', E_USER_DEPRECATED);
 
 /**
  * @Annotation
diff --git a/core/vendor/symfony/validator/Constraints/NullValidator.php b/core/vendor/symfony/validator/Constraints/NullValidator.php
index 0900c8cd2..bd17eab52 100644
--- a/core/vendor/symfony/validator/Constraints/NullValidator.php
+++ b/core/vendor/symfony/validator/Constraints/NullValidator.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
-trigger_error('The '.__NAMESPACE__.'\NullValidator class is deprecated since version 2.7 and will be removed in 3.0. Use the IsNullValidator class in the same namespace instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\NullValidator class is deprecated since version 2.7 and will be removed in 3.0. Use the IsNullValidator class in the same namespace instead.', E_USER_DEPRECATED);
 
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
diff --git a/core/vendor/symfony/validator/Constraints/True.php b/core/vendor/symfony/validator/Constraints/True.php
index 376f69ff3..b9efff375 100644
--- a/core/vendor/symfony/validator/Constraints/True.php
+++ b/core/vendor/symfony/validator/Constraints/True.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
-trigger_error('The '.__NAMESPACE__.'\True class is deprecated since version 2.7 and will be removed in 3.0. Use the IsTrue class in the same namespace instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\True class is deprecated since version 2.7 and will be removed in 3.0. Use the IsTrue class in the same namespace instead.', E_USER_DEPRECATED);
 
 /**
  * @Annotation
diff --git a/core/vendor/symfony/validator/Constraints/TrueValidator.php b/core/vendor/symfony/validator/Constraints/TrueValidator.php
index 1cb252ae3..14d879808 100644
--- a/core/vendor/symfony/validator/Constraints/TrueValidator.php
+++ b/core/vendor/symfony/validator/Constraints/TrueValidator.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
-trigger_error('The '.__NAMESPACE__.'\TrueValidator class is deprecated since version 2.7 and will be removed in 3.0. Use the IsTrueValidator class in the same namespace instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\TrueValidator class is deprecated since version 2.7 and will be removed in 3.0. Use the IsTrueValidator class in the same namespace instead.', E_USER_DEPRECATED);
 
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
diff --git a/core/vendor/symfony/validator/Constraints/Valid.php b/core/vendor/symfony/validator/Constraints/Valid.php
index cb520c93d..9fc001563 100644
--- a/core/vendor/symfony/validator/Constraints/Valid.php
+++ b/core/vendor/symfony/validator/Constraints/Valid.php
@@ -41,7 +41,7 @@ class Valid extends Constraint
         }
 
         if (is_array($options) && array_key_exists('deep', $options)) {
-            trigger_error('The "deep" option for the Valid constraint is deprecated since version 2.5 and will be removed in 3.0. When traversing arrays, nested arrays are always traversed. When traversing nested objects, their traversal strategy is used.', E_USER_DEPRECATED);
+            @trigger_error('The "deep" option for the Valid constraint is deprecated since version 2.5 and will be removed in 3.0. When traversing arrays, nested arrays are always traversed. When traversing nested objects, their traversal strategy is used.', E_USER_DEPRECATED);
         }
 
         parent::__construct($options);
diff --git a/core/vendor/symfony/validator/Context/ExecutionContext.php b/core/vendor/symfony/validator/Context/ExecutionContext.php
index 39f7d1506..39f92fbc6 100644
--- a/core/vendor/symfony/validator/Context/ExecutionContext.php
+++ b/core/vendor/symfony/validator/Context/ExecutionContext.php
@@ -188,7 +188,7 @@ class ExecutionContext implements ExecutionContextInterface
         // API, as they are not present in the new interface anymore.
         // You should use buildViolation() instead.
         if (func_num_args() > 2) {
-            trigger_error('The parameters $invalidValue, $plural and $code in method '.__METHOD__.' are deprecated since version 2.5 and will be removed in 3.0. Use the '.__CLASS__.'::buildViolation method instead.', E_USER_DEPRECATED);
+            @trigger_error('The parameters $invalidValue, $plural and $code in method '.__METHOD__.' are deprecated since version 2.5 and will be removed in 3.0. Use the '.__CLASS__.'::buildViolation method instead.', E_USER_DEPRECATED);
 
             $this
                 ->buildViolation($message, $parameters)
@@ -317,7 +317,7 @@ class ExecutionContext implements ExecutionContextInterface
      */
     public function addViolationAt($subPath, $message, array $parameters = array(), $invalidValue = null, $plural = null, $code = null)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Use the '.__CLASS__.'::buildViolation method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Use the '.__CLASS__.'::buildViolation method instead.', E_USER_DEPRECATED);
 
         if (func_num_args() > 2) {
             $this
@@ -344,7 +344,7 @@ class ExecutionContext implements ExecutionContextInterface
      */
     public function validate($value, $subPath = '', $groups = null, $traverse = false, $deep = false)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Use the '.__CLASS__.'::getValidator() method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Use the '.__CLASS__.'::getValidator() method instead.', E_USER_DEPRECATED);
 
         if (is_array($value)) {
             // The $traverse flag is ignored for arrays
@@ -382,7 +382,7 @@ class ExecutionContext implements ExecutionContextInterface
      */
     public function validateValue($value, $constraints, $subPath = '', $groups = null)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Use the '.__CLASS__.'::getValidator() method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Use the '.__CLASS__.'::getValidator() method instead.', E_USER_DEPRECATED);
 
         return $this
             ->getValidator()
@@ -397,7 +397,7 @@ class ExecutionContext implements ExecutionContextInterface
      */
     public function getMetadataFactory()
     {
-        trigger_error('The '.__METHOD__.' is deprecated since version 2.5 and will be removed in 3.0. Use the new Symfony\Component\Validator\Context\ExecutionContext::getValidator method in combination with Symfony\Component\Validator\Validator\ValidatorInterface::getMetadataFor or Symfony\Component\Validator\Validator\ValidatorInterface::hasMetadataFor method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' is deprecated since version 2.5 and will be removed in 3.0. Use the new Symfony\Component\Validator\Context\ExecutionContext::getValidator method in combination with Symfony\Component\Validator\Validator\ValidatorInterface::getMetadataFor or Symfony\Component\Validator\Validator\ValidatorInterface::hasMetadataFor method instead.', E_USER_DEPRECATED);
 
         $validator = $this->getValidator();
 
diff --git a/core/vendor/symfony/validator/Context/LegacyExecutionContext.php b/core/vendor/symfony/validator/Context/LegacyExecutionContext.php
index 5ee7a228c..4d5be451d 100644
--- a/core/vendor/symfony/validator/Context/LegacyExecutionContext.php
+++ b/core/vendor/symfony/validator/Context/LegacyExecutionContext.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Validator\Context;
 
-trigger_error('The '.__NAMESPACE__.'\LegacyExecutionContext class is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\LegacyExecutionContext class is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
 
 use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Validator\MetadataFactoryInterface;
diff --git a/core/vendor/symfony/validator/Context/LegacyExecutionContextFactory.php b/core/vendor/symfony/validator/Context/LegacyExecutionContextFactory.php
index 31fb4cbdd..9e8498a6b 100644
--- a/core/vendor/symfony/validator/Context/LegacyExecutionContextFactory.php
+++ b/core/vendor/symfony/validator/Context/LegacyExecutionContextFactory.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Validator\Context;
 
-trigger_error('The '.__NAMESPACE__.'\LegacyExecutionContextFactory class is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\LegacyExecutionContextFactory class is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
 
 use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Validator\MetadataFactoryInterface;
diff --git a/core/vendor/symfony/validator/DefaultTranslator.php b/core/vendor/symfony/validator/DefaultTranslator.php
index 37c9c170f..85853d8d8 100644
--- a/core/vendor/symfony/validator/DefaultTranslator.php
+++ b/core/vendor/symfony/validator/DefaultTranslator.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Validator;
 
-trigger_error('The class '.__NAMESPACE__.'\DefaultTranslator is deprecated since version 2.7 and will be removed in 3.0. Use Symfony\Component\Translation\IdentityTranslator instead.', E_USER_DEPRECATED);
+@trigger_error('The class '.__NAMESPACE__.'\DefaultTranslator is deprecated since version 2.7 and will be removed in 3.0. Use Symfony\Component\Translation\IdentityTranslator instead.', E_USER_DEPRECATED);
 
 use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Validator\Exception\BadMethodCallException;
diff --git a/core/vendor/symfony/validator/ExecutionContext.php b/core/vendor/symfony/validator/ExecutionContext.php
index d21dd780f..5875e94ef 100644
--- a/core/vendor/symfony/validator/ExecutionContext.php
+++ b/core/vendor/symfony/validator/ExecutionContext.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Validator;
 
-trigger_error('The '.__NAMESPACE__.'\ExecutionContext class is deprecated since version 2.5 and will be removed in 3.0. Use the Symfony\Component\Validator\Context\ExecutionContext class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\ExecutionContext class is deprecated since version 2.5 and will be removed in 3.0. Use the Symfony\Component\Validator\Context\ExecutionContext class instead.', E_USER_DEPRECATED);
 
 use Symfony\Component\Translation\TranslatorInterface;
 
diff --git a/core/vendor/symfony/validator/ExecutionContextInterface.php b/core/vendor/symfony/validator/ExecutionContextInterface.php
index 3fedfe15d..2b6cd01e1 100644
--- a/core/vendor/symfony/validator/ExecutionContextInterface.php
+++ b/core/vendor/symfony/validator/ExecutionContextInterface.php
@@ -91,6 +91,8 @@ interface ExecutionContextInterface
     /**
      * Adds a violation at the current node of the validation graph.
      *
+     * Note: the parameters $invalidValue, $plural and $code are deprecated since version 2.5 and will be removed in 3.0.
+     *
      * @param string   $message      The error message
      * @param array    $params       The parameters substituted in the error message
      * @param mixed    $invalidValue The invalid, validated value
@@ -98,8 +100,6 @@ interface ExecutionContextInterface
      * @param int|null $code         The violation code
      *
      * @api
-     *
-     * @deprecated the parameters $invalidValue, $plural and $code are deprecated since version 2.5 and will be removed in 3.0.
      */
     public function addViolation($message, array $params = array(), $invalidValue = null, $plural = null, $code = null);
 
diff --git a/core/vendor/symfony/validator/Mapping/BlackholeMetadataFactory.php b/core/vendor/symfony/validator/Mapping/BlackholeMetadataFactory.php
index ad5a980e4..01b80138d 100644
--- a/core/vendor/symfony/validator/Mapping/BlackholeMetadataFactory.php
+++ b/core/vendor/symfony/validator/Mapping/BlackholeMetadataFactory.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Validator\Mapping;
 
-trigger_error('The '.__NAMESPACE__.'\BlackholeMetadataFactory class is deprecated since version 2.5 and will be removed in 3.0. Use the Symfony\Component\Validator\Mapping\Factory\BlackHoleMetadataFactory class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\BlackholeMetadataFactory class is deprecated since version 2.5 and will be removed in 3.0. Use the Symfony\Component\Validator\Mapping\Factory\BlackHoleMetadataFactory class instead.', E_USER_DEPRECATED);
 
 use Symfony\Component\Validator\Mapping\Factory\BlackHoleMetadataFactory as MappingBlackHoleMetadataFactory;
 
diff --git a/core/vendor/symfony/validator/Mapping/Cache/ApcCache.php b/core/vendor/symfony/validator/Mapping/Cache/ApcCache.php
index 5dbe9f406..63fc8ac05 100644
--- a/core/vendor/symfony/validator/Mapping/Cache/ApcCache.php
+++ b/core/vendor/symfony/validator/Mapping/Cache/ApcCache.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Validator\Mapping\Cache;
 
-trigger_error('The '.__NAMESPACE__.'\ApcCache class is deprecated since version 2.5 and will be removed in 3.0. Use DoctrineCache with the Doctrine\Common\Cache\ApcCache class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\ApcCache class is deprecated since version 2.5 and will be removed in 3.0. Use DoctrineCache with the Doctrine\Common\Cache\ApcCache class instead.', E_USER_DEPRECATED);
 
 use Symfony\Component\Validator\Mapping\ClassMetadata;
 
diff --git a/core/vendor/symfony/validator/Mapping/ClassMetadata.php b/core/vendor/symfony/validator/Mapping/ClassMetadata.php
index 5991f3489..3f4f51b83 100644
--- a/core/vendor/symfony/validator/Mapping/ClassMetadata.php
+++ b/core/vendor/symfony/validator/Mapping/ClassMetadata.php
@@ -133,7 +133,7 @@ class ClassMetadata extends ElementMetadata implements ClassMetadataInterface
      */
     public function accept(ValidationVisitorInterface $visitor, $value, $group, $propertyPath, $propagatedGroup = null)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
 
         if (null === $propagatedGroup && Constraint::DEFAULT_GROUP === $group
                 && ($this->hasGroupSequence() || $this->isGroupSequenceProvider())) {
@@ -377,7 +377,7 @@ class ClassMetadata extends ElementMetadata implements ClassMetadataInterface
      */
     protected function addMemberMetadata(MemberMetadata $metadata)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the addPropertyMetadata() method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the addPropertyMetadata() method instead.', E_USER_DEPRECATED);
 
         $this->addPropertyMetadata($metadata);
     }
@@ -393,7 +393,7 @@ class ClassMetadata extends ElementMetadata implements ClassMetadataInterface
      */
     public function hasMemberMetadatas($property)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the hasPropertyMetadata() method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the hasPropertyMetadata() method instead.', E_USER_DEPRECATED);
 
         return $this->hasPropertyMetadata($property);
     }
@@ -409,7 +409,7 @@ class ClassMetadata extends ElementMetadata implements ClassMetadataInterface
      */
     public function getMemberMetadatas($property)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the getPropertyMetadata() method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the getPropertyMetadata() method instead.', E_USER_DEPRECATED);
 
         return $this->getPropertyMetadata($property);
     }
diff --git a/core/vendor/symfony/validator/Mapping/ClassMetadataFactory.php b/core/vendor/symfony/validator/Mapping/ClassMetadataFactory.php
index 92cc85b2e..4069b3fbc 100644
--- a/core/vendor/symfony/validator/Mapping/ClassMetadataFactory.php
+++ b/core/vendor/symfony/validator/Mapping/ClassMetadataFactory.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Validator\Mapping;
 
-trigger_error('The '.__NAMESPACE__.'\ClassMetadataFactory class is deprecated since version 2.5 and will be removed in 3.0. Use the Symfony\Component\Validator\Mapping\Factory\LazyLoadingMetadataFactory class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\ClassMetadataFactory class is deprecated since version 2.5 and will be removed in 3.0. Use the Symfony\Component\Validator\Mapping\Factory\LazyLoadingMetadataFactory class instead.', E_USER_DEPRECATED);
 
 use Symfony\Component\Validator\Mapping\Factory\LazyLoadingMetadataFactory;
 
diff --git a/core/vendor/symfony/validator/Mapping/ElementMetadata.php b/core/vendor/symfony/validator/Mapping/ElementMetadata.php
index 1783864e0..69fe8bfa7 100644
--- a/core/vendor/symfony/validator/Mapping/ElementMetadata.php
+++ b/core/vendor/symfony/validator/Mapping/ElementMetadata.php
@@ -24,7 +24,7 @@ abstract class ElementMetadata extends GenericMetadata
     public function __construct()
     {
         if (!$this instanceof MemberMetadata && !$this instanceof ClassMetadata) {
-            trigger_error('The '.__CLASS__.' class is deprecated since version 2.5 and will be removed in 3.0. Use the Symfony\Component\Validator\Mapping\GenericMetadata class instead.', E_USER_DEPRECATED);
+            @trigger_error('The '.__CLASS__.' class is deprecated since version 2.5 and will be removed in 3.0. Use the Symfony\Component\Validator\Mapping\GenericMetadata class instead.', E_USER_DEPRECATED);
         }
     }
 }
diff --git a/core/vendor/symfony/validator/Mapping/MemberMetadata.php b/core/vendor/symfony/validator/Mapping/MemberMetadata.php
index 394fa2059..0def24843 100644
--- a/core/vendor/symfony/validator/Mapping/MemberMetadata.php
+++ b/core/vendor/symfony/validator/Mapping/MemberMetadata.php
@@ -82,7 +82,7 @@ abstract class MemberMetadata extends ElementMetadata implements PropertyMetadat
      */
     public function accept(ValidationVisitorInterface $visitor, $value, $group, $propertyPath, $propagatedGroup = null)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
 
         $visitor->visit($this, $value, $group, $propertyPath);
 
@@ -192,7 +192,7 @@ abstract class MemberMetadata extends ElementMetadata implements PropertyMetadat
      */
     public function isCascaded()
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Use the getCascadingStrategy() method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Use the getCascadingStrategy() method instead.', E_USER_DEPRECATED);
 
         return (bool) ($this->cascadingStrategy & CascadingStrategy::CASCADE);
     }
@@ -208,7 +208,7 @@ abstract class MemberMetadata extends ElementMetadata implements PropertyMetadat
      */
     public function isCollectionCascaded()
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Use the getTraversalStrategy() method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Use the getTraversalStrategy() method instead.', E_USER_DEPRECATED);
 
         return (bool) ($this->traversalStrategy & (TraversalStrategy::IMPLICIT | TraversalStrategy::TRAVERSE));
     }
@@ -224,7 +224,7 @@ abstract class MemberMetadata extends ElementMetadata implements PropertyMetadat
      */
     public function isCollectionCascadedDeeply()
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Use the getTraversalStrategy() method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Use the getTraversalStrategy() method instead.', E_USER_DEPRECATED);
 
         return !($this->traversalStrategy & TraversalStrategy::STOP_RECURSION);
     }
diff --git a/core/vendor/symfony/validator/Resources/translations/validators.it.xlf b/core/vendor/symfony/validator/Resources/translations/validators.it.xlf
index 5a411eaa0..b1dcb1e7b 100644
--- a/core/vendor/symfony/validator/Resources/translations/validators.it.xlf
+++ b/core/vendor/symfony/validator/Resources/translations/validators.it.xlf
@@ -40,7 +40,7 @@
             </trans-unit>
             <trans-unit id="10">
                 <source>This field is missing.</source>
-                <target>Questo campo è manca.</target>
+                <target>Questo campo è mancante.</target>
             </trans-unit>
             <trans-unit id="11">
                 <source>This value is not a valid date.</source>
diff --git a/core/vendor/symfony/validator/Tests/Constraints/AbstractConstraintValidatorTest.php b/core/vendor/symfony/validator/Tests/Constraints/AbstractConstraintValidatorTest.php
index 55ddbfe9c..b5e2a7a97 100644
--- a/core/vendor/symfony/validator/Tests/Constraints/AbstractConstraintValidatorTest.php
+++ b/core/vendor/symfony/validator/Tests/Constraints/AbstractConstraintValidatorTest.php
@@ -51,10 +51,6 @@ abstract class AbstractConstraintValidatorTest extends \PHPUnit_Framework_TestCa
 
     protected function setUp()
     {
-        if (Validation::API_VERSION_2_5 !== $this->getApiVersion()) {
-            $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-        }
-
         $this->group = 'MyGroup';
         $this->metadata = null;
         $this->object = null;
@@ -260,7 +256,7 @@ abstract class AbstractConstraintValidatorTest extends \PHPUnit_Framework_TestCa
      */
     protected function assertViolation($message, array $parameters = array(), $propertyPath = 'property.path', $invalidValue = 'InvalidValue', $plural = null, $code = null)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Use the buildViolation() method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Use the buildViolation() method instead.', E_USER_DEPRECATED);
 
         $this->buildViolation($message)
             ->setParameters($parameters)
@@ -279,7 +275,7 @@ abstract class AbstractConstraintValidatorTest extends \PHPUnit_Framework_TestCa
      */
     protected function assertViolations(array $expected)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Use the buildViolation() method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Use the buildViolation() method instead.', E_USER_DEPRECATED);
 
         $violations = $this->context->getViolations();
 
diff --git a/core/vendor/symfony/validator/Tests/Constraints/CallbackValidatorTest.php b/core/vendor/symfony/validator/Tests/Constraints/CallbackValidatorTest.php
index b53f6c699..b61929166 100644
--- a/core/vendor/symfony/validator/Tests/Constraints/CallbackValidatorTest.php
+++ b/core/vendor/symfony/validator/Tests/Constraints/CallbackValidatorTest.php
@@ -191,8 +191,6 @@ class CallbackValidatorTest extends AbstractConstraintValidatorTest
      */
     public function testLegacySingleMethodBc()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $object = new CallbackValidatorTest_Object();
         $constraint = new Callback(array('validate'));
 
@@ -209,8 +207,6 @@ class CallbackValidatorTest extends AbstractConstraintValidatorTest
      */
     public function testLegacySingleMethodBcExplicitName()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $object = new CallbackValidatorTest_Object();
         $constraint = new Callback(array('methods' => array('validate')));
 
@@ -227,8 +223,6 @@ class CallbackValidatorTest extends AbstractConstraintValidatorTest
      */
     public function testLegacyMultipleMethodsBc()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $object = new CallbackValidatorTest_Object();
         $constraint = new Callback(array('validate', 'validateStatic'));
 
@@ -247,8 +241,6 @@ class CallbackValidatorTest extends AbstractConstraintValidatorTest
      */
     public function testLegacyMultipleMethodsBcExplicitName()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $object = new CallbackValidatorTest_Object();
         $constraint = new Callback(array(
             'methods' => array('validate', 'validateStatic'),
@@ -269,8 +261,6 @@ class CallbackValidatorTest extends AbstractConstraintValidatorTest
      */
     public function testLegacySingleStaticMethodBc()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $object = new CallbackValidatorTest_Object();
         $constraint = new Callback(array(
             array(__CLASS__.'_Class', 'validateCallback'),
@@ -289,8 +279,6 @@ class CallbackValidatorTest extends AbstractConstraintValidatorTest
      */
     public function testLegacySingleStaticMethodBcExplicitName()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $object = new CallbackValidatorTest_Object();
         $constraint = new Callback(array(
             'methods' => array(array(__CLASS__.'_Class', 'validateCallback')),
@@ -329,8 +317,6 @@ class CallbackValidatorTest extends AbstractConstraintValidatorTest
      */
     public function testLegacyExpectEitherCallbackOrMethods()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $object = new CallbackValidatorTest_Object();
 
         $this->validator->validate($object, new Callback(array(
diff --git a/core/vendor/symfony/validator/Tests/Constraints/CardSchemeValidatorTest.php b/core/vendor/symfony/validator/Tests/Constraints/CardSchemeValidatorTest.php
index aab54e590..2d623c978 100644
--- a/core/vendor/symfony/validator/Tests/Constraints/CardSchemeValidatorTest.php
+++ b/core/vendor/symfony/validator/Tests/Constraints/CardSchemeValidatorTest.php
@@ -97,8 +97,10 @@ class CardSchemeValidatorTest extends AbstractConstraintValidatorTest
             array('LASER', '6771656738314582216'),
             array('MAESTRO', '6759744069209'),
             array('MAESTRO', '5020507657408074712'),
+            array('MAESTRO', '5612559223580173965'),
             array('MAESTRO', '6759744069209'),
             array('MAESTRO', '6759744069209'),
+            array('MAESTRO', '6594371785970435599'),
             array('MASTERCARD', '5555555555554444'),
             array('MASTERCARD', '5105105105105100'),
             array('VISA', '4111111111111111'),
diff --git a/core/vendor/symfony/validator/Tests/Constraints/EmailValidatorTest.php b/core/vendor/symfony/validator/Tests/Constraints/EmailValidatorTest.php
index 0361333fd..7e7a5cc70 100644
--- a/core/vendor/symfony/validator/Tests/Constraints/EmailValidatorTest.php
+++ b/core/vendor/symfony/validator/Tests/Constraints/EmailValidatorTest.php
@@ -91,6 +91,7 @@ class EmailValidatorTest extends AbstractConstraintValidatorTest
             array('example'),
             array('example@'),
             array('example@localhost'),
+            array('foo@example.com bar'),
         );
     }
 
diff --git a/core/vendor/symfony/validator/Tests/Constraints/FileTest.php b/core/vendor/symfony/validator/Tests/Constraints/FileTest.php
index 2ee46813b..fbd4b0742 100644
--- a/core/vendor/symfony/validator/Tests/Constraints/FileTest.php
+++ b/core/vendor/symfony/validator/Tests/Constraints/FileTest.php
@@ -12,13 +12,14 @@
 namespace Symfony\Component\Validator\Tests\Constraints;
 
 use Symfony\Component\Validator\Constraints\File;
+use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
 
 class FileTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @param mixed $maxSize
-     * @param int   bytes
-     * @param bool  $bytes
+     * @param int   $bytes
+     * @param bool  $binaryFormat
      * @dataProvider provideValidSizes
      */
     public function testMaxSize($maxSize, $bytes, $binaryFormat)
@@ -29,11 +30,55 @@ class FileTest extends \PHPUnit_Framework_TestCase
         $this->assertSame($binaryFormat, $file->binaryFormat);
     }
 
+    /**
+     * @dataProvider provideValidSizes
+     *
+     * @param int|string $maxSize
+     * @param int        $bytes
+     * @param string     $binaryFormat
+     */
+    public function testMaxSizeCanBeSetAfterInitialization($maxSize, $bytes, $binaryFormat)
+    {
+        $file = new File();
+        $file->maxSize = $maxSize;
+
+        $this->assertSame($bytes, $file->maxSize);
+        $this->assertSame($binaryFormat, $file->binaryFormat);
+    }
+
+    /**
+     * @dataProvider provideInvalidSizes
+     * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
+     *
+     * @param int|string $maxSize
+     */
+    public function testInvalidValueForMaxSizeThrowsExceptionAfterInitialization($maxSize)
+    {
+        $file = new File(array('maxSize' => 1000));
+        $file->maxSize = $maxSize;
+    }
+
+    /**
+     * @dataProvider provideInvalidSizes
+     *
+     * @param int|string $maxSize
+     */
+    public function testMaxSizeCannotBeSetToInvalidValueAfterInitialization($maxSize)
+    {
+        $file = new File(array('maxSize' => 1000));
+
+        try {
+            $file->maxSize = $maxSize;
+        } catch (ConstraintDefinitionException $e) {
+        }
+
+        $this->assertSame(1000, $file->maxSize);
+    }
+
     /**
      * @param mixed $maxSize
-     * @param int   $bytes
      * @dataProvider provideInValidSizes
-     * @expectedException Symfony\Component\Validator\Exception\ConstraintDefinitionException
+     * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
      */
     public function testInvalideMaxSize($maxSize)
     {
diff --git a/core/vendor/symfony/validator/Tests/Constraints/GroupSequenceTest.php b/core/vendor/symfony/validator/Tests/Constraints/GroupSequenceTest.php
index 30f024537..aa2d60104 100644
--- a/core/vendor/symfony/validator/Tests/Constraints/GroupSequenceTest.php
+++ b/core/vendor/symfony/validator/Tests/Constraints/GroupSequenceTest.php
@@ -37,8 +37,6 @@ class GroupSequenceTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacyIterate()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $sequence = new GroupSequence(array('Group 1', 'Group 2'));
 
         $this->assertSame(array('Group 1', 'Group 2'), iterator_to_array($sequence));
@@ -49,8 +47,6 @@ class GroupSequenceTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacyCount()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $sequence = new GroupSequence(array('Group 1', 'Group 2'));
 
         $this->assertCount(2, $sequence);
@@ -61,8 +57,6 @@ class GroupSequenceTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacyArrayAccess()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $sequence = new GroupSequence(array('Group 1', 'Group 2'));
 
         $this->assertSame('Group 1', $sequence[0]);
@@ -85,8 +79,6 @@ class GroupSequenceTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacyGetExpectsExistingKey()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $sequence = new GroupSequence(array('Group 1', 'Group 2'));
 
         $sequence[2];
@@ -97,8 +89,6 @@ class GroupSequenceTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacyUnsetIgnoresNonExistingKeys()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $sequence = new GroupSequence(array('Group 1', 'Group 2'));
 
         // should not fail
diff --git a/core/vendor/symfony/validator/Tests/LegacyExecutionContextTest.php b/core/vendor/symfony/validator/Tests/LegacyExecutionContextTest.php
index 4fec2aacb..f0139c0da 100644
--- a/core/vendor/symfony/validator/Tests/LegacyExecutionContextTest.php
+++ b/core/vendor/symfony/validator/Tests/LegacyExecutionContextTest.php
@@ -41,8 +41,6 @@ class LegacyExecutionContextTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $this->visitor = $this->getMockBuilder('Symfony\Component\Validator\ValidationVisitor')
             ->disableOriginalConstructor()
             ->getMock();
diff --git a/core/vendor/symfony/validator/Tests/Mapping/Cache/LegacyApcCacheTest.php b/core/vendor/symfony/validator/Tests/Mapping/Cache/LegacyApcCacheTest.php
index bb69cf5e7..9d3978428 100644
--- a/core/vendor/symfony/validator/Tests/Mapping/Cache/LegacyApcCacheTest.php
+++ b/core/vendor/symfony/validator/Tests/Mapping/Cache/LegacyApcCacheTest.php
@@ -20,8 +20,6 @@ class LegacyApcCacheTest extends \PHPUnit_Framework_TestCase
 {
     protected function setUp()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         if (!extension_loaded('apc') || !ini_get('apc.enable_cli')) {
             $this->markTestSkipped('APC is not loaded.');
         }
diff --git a/core/vendor/symfony/validator/Tests/Mapping/LegacyElementMetadataTest.php b/core/vendor/symfony/validator/Tests/Mapping/LegacyElementMetadataTest.php
index c77e6fe9a..b68c88293 100644
--- a/core/vendor/symfony/validator/Tests/Mapping/LegacyElementMetadataTest.php
+++ b/core/vendor/symfony/validator/Tests/Mapping/LegacyElementMetadataTest.php
@@ -24,8 +24,6 @@ class LegacyElementMetadataTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $this->metadata = new TestElementMetadata();
     }
 
diff --git a/core/vendor/symfony/validator/Tests/Mapping/MemberMetadataTest.php b/core/vendor/symfony/validator/Tests/Mapping/MemberMetadataTest.php
index a4473bc68..fafde341a 100644
--- a/core/vendor/symfony/validator/Tests/Mapping/MemberMetadataTest.php
+++ b/core/vendor/symfony/validator/Tests/Mapping/MemberMetadataTest.php
@@ -40,8 +40,6 @@ class MemberMetadataTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacyAddValidSetsMemberToCascaded()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $result = $this->metadata->addConstraint(new Valid());
 
         $this->assertEquals(array(), $this->metadata->getConstraints());
@@ -54,8 +52,6 @@ class MemberMetadataTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacyAddOtherConstraintDoesNotSetMemberToCascaded()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $result = $this->metadata->addConstraint($constraint = new ConstraintA());
 
         $this->assertEquals(array($constraint), $this->metadata->getConstraints());
diff --git a/core/vendor/symfony/validator/Tests/Validator/Abstract2Dot5ApiTest.php b/core/vendor/symfony/validator/Tests/Validator/Abstract2Dot5ApiTest.php
index 4a041afbf..12c8d87f2 100644
--- a/core/vendor/symfony/validator/Tests/Validator/Abstract2Dot5ApiTest.php
+++ b/core/vendor/symfony/validator/Tests/Validator/Abstract2Dot5ApiTest.php
@@ -75,6 +75,12 @@ abstract class Abstract2Dot5ApiTest extends AbstractValidatorTest
         $this->assertCount(1, $violations);
     }
 
+    public function testValidateWithEmptyArrayAsConstraint()
+    {
+        $violations = $this->validator->validate('value', array());
+        $this->assertCount(0, $violations);
+    }
+
     public function testGroupSequenceAbortsAfterFailedGroup()
     {
         $entity = new Entity();
@@ -578,8 +584,6 @@ abstract class Abstract2Dot5ApiTest extends AbstractValidatorTest
      */
     public function testLegacyPropertyMetadataMustImplementPropertyMetadataInterface()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $entity = new Entity();
 
         // Legacy interface
diff --git a/core/vendor/symfony/validator/Tests/Validator/AbstractLegacyApiTest.php b/core/vendor/symfony/validator/Tests/Validator/AbstractLegacyApiTest.php
index 77ec10212..5f4167dcd 100644
--- a/core/vendor/symfony/validator/Tests/Validator/AbstractLegacyApiTest.php
+++ b/core/vendor/symfony/validator/Tests/Validator/AbstractLegacyApiTest.php
@@ -42,8 +42,6 @@ abstract class AbstractLegacyApiTest extends AbstractValidatorTest
 
     protected function setUp()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         parent::setUp();
 
         $this->validator = $this->createValidator($this->metadataFactory);
diff --git a/core/vendor/symfony/validator/Tests/Validator/AbstractValidatorTest.php b/core/vendor/symfony/validator/Tests/Validator/AbstractValidatorTest.php
index d8833dedc..69c025d45 100644
--- a/core/vendor/symfony/validator/Tests/Validator/AbstractValidatorTest.php
+++ b/core/vendor/symfony/validator/Tests/Validator/AbstractValidatorTest.php
@@ -844,8 +844,6 @@ abstract class AbstractValidatorTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacyValidatePropertyFailsIfPropertiesNotSupported()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         // $metadata does not implement PropertyMetadataContainerInterface
         $metadata = $this->getMock('Symfony\Component\Validator\MetadataInterface');
 
@@ -977,8 +975,6 @@ abstract class AbstractValidatorTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacyValidatePropertyValueFailsIfPropertiesNotSupported()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         // $metadata does not implement PropertyMetadataContainerInterface
         $metadata = $this->getMock('Symfony\Component\Validator\MetadataInterface');
 
diff --git a/core/vendor/symfony/validator/Tests/Validator/RecursiveValidator2Dot5ApiTest.php b/core/vendor/symfony/validator/Tests/Validator/RecursiveValidator2Dot5ApiTest.php
index 05961269a..b27e6454b 100644
--- a/core/vendor/symfony/validator/Tests/Validator/RecursiveValidator2Dot5ApiTest.php
+++ b/core/vendor/symfony/validator/Tests/Validator/RecursiveValidator2Dot5ApiTest.php
@@ -15,6 +15,7 @@ use Symfony\Component\Translation\IdentityTranslator;
 use Symfony\Component\Validator\ConstraintValidatorFactory;
 use Symfony\Component\Validator\Context\ExecutionContextFactory;
 use Symfony\Component\Validator\MetadataFactoryInterface;
+use Symfony\Component\Validator\Tests\Fixtures\Entity;
 use Symfony\Component\Validator\Validator\RecursiveValidator;
 
 class RecursiveValidator2Dot5ApiTest extends Abstract2Dot5ApiTest
@@ -29,4 +30,28 @@ class RecursiveValidator2Dot5ApiTest extends Abstract2Dot5ApiTest
 
         return new RecursiveValidator($contextFactory, $metadataFactory, $validatorFactory, $objectInitializers);
     }
+
+    public function testEmptyGroupsArrayDoesNotTriggerDeprecation()
+    {
+        $entity = new Entity();
+
+        $validatorContext = $this->getMock('Symfony\Component\Validator\Validator\ContextualValidatorInterface');
+        $validatorContext
+            ->expects($this->once())
+            ->method('validate')
+            ->with($entity, null, array())
+            ->willReturnSelf();
+
+        $validator = $this
+            ->getMockBuilder('Symfony\Component\Validator\Validator\RecursiveValidator')
+            ->disableOriginalConstructor()
+            ->setMethods(array('startContext'))
+            ->getMock();
+        $validator
+            ->expects($this->once())
+            ->method('startContext')
+            ->willReturn($validatorContext);
+
+        $validator->validate($entity, null, array());
+    }
 }
diff --git a/core/vendor/symfony/validator/ValidationVisitor.php b/core/vendor/symfony/validator/ValidationVisitor.php
index c7e06554b..838646260 100644
--- a/core/vendor/symfony/validator/ValidationVisitor.php
+++ b/core/vendor/symfony/validator/ValidationVisitor.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Validator;
 
-trigger_error('The '.__NAMESPACE__.'\ValidationVisitor class is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\ValidationVisitor class is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
 
 use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Validator\Exception\NoSuchMetadataException;
diff --git a/core/vendor/symfony/validator/Validator.php b/core/vendor/symfony/validator/Validator.php
index 8243f17ac..4da27e7b3 100644
--- a/core/vendor/symfony/validator/Validator.php
+++ b/core/vendor/symfony/validator/Validator.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Validator;
 
-trigger_error('The '.__NAMESPACE__.'\Validator class is deprecated since version 2.5 and will be removed in 3.0. Use the Symfony\Component\Validator\Validator\RecursiveValidator class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\Validator class is deprecated since version 2.5 and will be removed in 3.0. Use the Symfony\Component\Validator\Validator\RecursiveValidator class instead.', E_USER_DEPRECATED);
 
 use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Validator\Constraints\Valid;
diff --git a/core/vendor/symfony/validator/Validator/LegacyValidator.php b/core/vendor/symfony/validator/Validator/LegacyValidator.php
index 6c5a10c35..0b0934bd3 100644
--- a/core/vendor/symfony/validator/Validator/LegacyValidator.php
+++ b/core/vendor/symfony/validator/Validator/LegacyValidator.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Validator\Validator;
 
-trigger_error('The '.__NAMESPACE__.'\LegacyValidator class is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\LegacyValidator class is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
 
 /**
  * A validator that supports both the API of Symfony < 2.5 and Symfony 2.5+.
diff --git a/core/vendor/symfony/validator/Validator/RecursiveValidator.php b/core/vendor/symfony/validator/Validator/RecursiveValidator.php
index c825bfa6f..e4dc0fb05 100644
--- a/core/vendor/symfony/validator/Validator/RecursiveValidator.php
+++ b/core/vendor/symfony/validator/Validator/RecursiveValidator.php
@@ -25,6 +25,7 @@ use Symfony\Component\Validator\ValidatorInterface as LegacyValidatorInterface;
  * Recursive implementation of {@link ValidatorInterface}.
  *
  * @since  2.5
+ *
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
 class RecursiveValidator implements ValidatorInterface, LegacyValidatorInterface
@@ -124,7 +125,7 @@ class RecursiveValidator implements ValidatorInterface, LegacyValidatorInterface
             $constraints = $groups;
             $groups = $traverse;
         } else {
-            trigger_error('The Symfony\Component\Validator\ValidatorInterface::validate method is deprecated in version 2.5 and will be removed in version 3.0. Use the Symfony\Component\Validator\Validator\ValidatorInterface::validate method instead.', E_USER_DEPRECATED);
+            @trigger_error('The Symfony\Component\Validator\ValidatorInterface::validate method is deprecated in version 2.5 and will be removed in version 3.0. Use the Symfony\Component\Validator\Validator\ValidatorInterface::validate method instead.', E_USER_DEPRECATED);
 
             $constraints = new Valid(array('traverse' => $traverse, 'deep' => $deep));
         }
@@ -160,7 +161,7 @@ class RecursiveValidator implements ValidatorInterface, LegacyValidatorInterface
      */
     public function validateValue($value, $constraints, $groups = null)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated in version 2.5 and will be removed in version 3.0. Use the Symfony\Component\Validator\Validator\ValidatorInterface::validate method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated in version 2.5 and will be removed in version 3.0. Use the Symfony\Component\Validator\Validator\ValidatorInterface::validate method instead.', E_USER_DEPRECATED);
 
         return $this->validate($value, $constraints, $groups);
     }
@@ -170,18 +171,18 @@ class RecursiveValidator implements ValidatorInterface, LegacyValidatorInterface
      */
     public function getMetadataFactory()
     {
-        trigger_error('The '.__METHOD__.' method is deprecated in version 2.5 and will be removed in version 3.0. Use the Symfony\Component\Validator\Validator\ValidatorInterface::getMetadataFor or Symfony\Component\Validator\Validator\ValidatorInterface::hasMetadataFor method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated in version 2.5 and will be removed in version 3.0. Use the Symfony\Component\Validator\Validator\ValidatorInterface::getMetadataFor or Symfony\Component\Validator\Validator\ValidatorInterface::hasMetadataFor method instead.', E_USER_DEPRECATED);
 
         return $this->metadataFactory;
     }
 
     private static function testConstraints($constraints)
     {
-        return null === $constraints || $constraints instanceof Constraint || (is_array($constraints) && current($constraints) instanceof Constraint);
+        return null === $constraints || $constraints instanceof Constraint || (is_array($constraints) && (0 === count($constraints) || current($constraints) instanceof Constraint));
     }
 
     private static function testGroups($groups)
     {
-        return null === $groups || is_string($groups) || $groups instanceof GroupSequence || (is_array($groups) && (is_string(current($groups)) || current($groups) instanceof GroupSequence));
+        return null === $groups || is_string($groups) || $groups instanceof GroupSequence || (is_array($groups) && (0 === count($groups) || is_string(current($groups)) || current($groups) instanceof GroupSequence));
     }
 }
diff --git a/core/vendor/symfony/validator/ValidatorBuilder.php b/core/vendor/symfony/validator/ValidatorBuilder.php
index dd772cf38..4a69976ed 100644
--- a/core/vendor/symfony/validator/ValidatorBuilder.php
+++ b/core/vendor/symfony/validator/ValidatorBuilder.php
@@ -300,7 +300,7 @@ class ValidatorBuilder implements ValidatorBuilderInterface
      */
     public function setPropertyAccessor(PropertyAccessorInterface $propertyAccessor)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. The validator will function without a property accessor.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. The validator will function without a property accessor.', E_USER_DEPRECATED);
 
         if (null !== $this->validatorFactory) {
             throw new ValidatorException('You cannot set a property accessor after setting a custom validator factory. Configure your validator factory instead.');
@@ -318,7 +318,7 @@ class ValidatorBuilder implements ValidatorBuilderInterface
      */
     public function setApiVersion($apiVersion)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated in version 2.7 and will be removed in version 3.0.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated in version 2.7 and will be removed in version 3.0.', E_USER_DEPRECATED);
 
         if (!in_array($apiVersion, array(Validation::API_VERSION_2_4, Validation::API_VERSION_2_5, Validation::API_VERSION_2_5_BC))) {
             throw new InvalidArgumentException(sprintf('The requested API version is invalid: "%s"', $apiVersion));
diff --git a/core/vendor/symfony/validator/Violation/LegacyConstraintViolationBuilder.php b/core/vendor/symfony/validator/Violation/LegacyConstraintViolationBuilder.php
index 0ce6da906..7410b0a6f 100644
--- a/core/vendor/symfony/validator/Violation/LegacyConstraintViolationBuilder.php
+++ b/core/vendor/symfony/validator/Violation/LegacyConstraintViolationBuilder.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Validator\Violation;
 
-trigger_error('The '.__NAMESPACE__.'\LegacyConstraintViolationBuilder class is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\LegacyConstraintViolationBuilder class is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
 
 use Symfony\Component\Validator\ExecutionContextInterface;
 
diff --git a/core/vendor/symfony/yaml/.gitignore b/core/vendor/symfony/yaml/.gitignore
new file mode 100644
index 000000000..c49a5d8df
--- /dev/null
+++ b/core/vendor/symfony/yaml/.gitignore
@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+phpunit.xml
diff --git a/core/vendor/symfony/yaml/Inline.php b/core/vendor/symfony/yaml/Inline.php
index 52ea724cf..6e3877bff 100644
--- a/core/vendor/symfony/yaml/Inline.php
+++ b/core/vendor/symfony/yaml/Inline.php
@@ -48,7 +48,7 @@ class Inline
 
         $value = trim($value);
 
-        if (0 == strlen($value)) {
+        if ('' === $value) {
             return '';
         }
 
diff --git a/core/vendor/symfony/yaml/Parser.php b/core/vendor/symfony/yaml/Parser.php
index d72c7639c..cd5e1dc57 100644
--- a/core/vendor/symfony/yaml/Parser.php
+++ b/core/vendor/symfony/yaml/Parser.php
@@ -546,9 +546,9 @@ class Parser
 
         // deal with trailing newlines as indicated
         if ('' === $indicator) {
-            $text = preg_replace('/\n+$/s', "\n", $text);
+            $text = preg_replace('/\n+$/', "\n", $text);
         } elseif ('-' === $indicator) {
-            $text = preg_replace('/\n+$/s', '', $text);
+            $text = preg_replace('/\n+$/', '', $text);
         }
 
         return $text;
@@ -647,7 +647,7 @@ class Parser
             $value = $trimmedValue;
 
             // remove end of the document marker (...)
-            $value = preg_replace('#\.\.\.\s*$#s', '', $value);
+            $value = preg_replace('#\.\.\.\s*$#', '', $value);
         }
 
         return $value;
diff --git a/core/vendor/symfony/yaml/Tests/InlineTest.php b/core/vendor/symfony/yaml/Tests/InlineTest.php
index 320eb5072..0776e4fa8 100644
--- a/core/vendor/symfony/yaml/Tests/InlineTest.php
+++ b/core/vendor/symfony/yaml/Tests/InlineTest.php
@@ -50,15 +50,19 @@ class InlineTest extends \PHPUnit_Framework_TestCase
             $this->markTestSkipped('Your platform does not support locales.');
         }
 
-        $required_locales = array('fr_FR.UTF-8', 'fr_FR.UTF8', 'fr_FR.utf-8', 'fr_FR.utf8', 'French_France.1252');
-        if (false === setlocale(LC_ALL, $required_locales)) {
-            $this->markTestSkipped('Could not set any of required locales: '.implode(', ', $required_locales));
+        try {
+            $requiredLocales = array('fr_FR.UTF-8', 'fr_FR.UTF8', 'fr_FR.utf-8', 'fr_FR.utf8', 'French_France.1252');
+            if (false === setlocale(LC_NUMERIC, $requiredLocales)) {
+                $this->markTestSkipped('Could not set any of required locales: '.implode(', ', $requiredLocales));
+            }
+
+            $this->assertEquals('1.2', Inline::dump(1.2));
+            $this->assertContains('fr', strtolower(setlocale(LC_NUMERIC, 0)));
+            setlocale(LC_NUMERIC, $locale);
+        } catch (\Exception $e) {
+            setlocale(LC_NUMERIC, $locale);
+            throw $e;
         }
-
-        $this->assertEquals('1.2', Inline::dump(1.2));
-        $this->assertContains('fr', strtolower(setlocale(LC_NUMERIC, 0)));
-
-        setlocale(LC_ALL, $locale);
     }
 
     public function testHashStringsResemblingExponentialNumericsShouldNotBeChangedToINF()
diff --git a/core/vendor/symfony/yaml/Tests/YamlTest.php b/core/vendor/symfony/yaml/Tests/YamlTest.php
index a7261562d..8db65e399 100644
--- a/core/vendor/symfony/yaml/Tests/YamlTest.php
+++ b/core/vendor/symfony/yaml/Tests/YamlTest.php
@@ -28,8 +28,6 @@ class YamlTest extends \PHPUnit_Framework_TestCase
      */
     public function testLegacyParseFromFile()
     {
-        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
-
         $filename = __DIR__.'/Fixtures/index.yml';
         $contents = file_get_contents($filename);
         $parsedByFilename = Yaml::parse($filename);
diff --git a/core/vendor/symfony/yaml/Yaml.php b/core/vendor/symfony/yaml/Yaml.php
index e17698a07..b6def5174 100644
--- a/core/vendor/symfony/yaml/Yaml.php
+++ b/core/vendor/symfony/yaml/Yaml.php
@@ -38,6 +38,8 @@ class Yaml
      * you must validate the input before calling this method. Passing a file
      * as an input is a deprecated feature and will be removed in 3.0.
      *
+     * Note: the ability to pass file names to the Yaml::parse method is deprecated since version 2.2 and will be removed in 3.0. Pass the YAML contents of the file instead.
+     *
      * @param string $input                  Path to a YAML file or a string containing YAML
      * @param bool   $exceptionOnInvalidType True if an exception must be thrown on invalid types false otherwise
      * @param bool   $objectSupport          True if object support is enabled, false otherwise
@@ -47,8 +49,6 @@ class Yaml
      *
      * @throws ParseException If the YAML is not valid
      *
-     * @deprecated The ability to pass file names to the Yaml::parse method is deprecated since version 2.2 and will be removed in 3.0. Pass the YAML contents of the file instead.
-     *
      * @api
      */
     public static function parse($input, $exceptionOnInvalidType = false, $objectSupport = false, $objectForMap = false)
@@ -56,7 +56,7 @@ class Yaml
         // if input is a file, process it
         $file = '';
         if (strpos($input, "\n") === false && is_file($input)) {
-            trigger_error('The ability to pass file names to the '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. Pass the YAML contents of the file instead.', E_USER_DEPRECATED);
+            @trigger_error('The ability to pass file names to the '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. Pass the YAML contents of the file instead.', E_USER_DEPRECATED);
 
             if (false === is_readable($input)) {
                 throw new ParseException(sprintf('Unable to parse "%s" as the file is not readable.', $input));
diff --git a/core/vendor/zendframework/zend-diactoros/.coveralls.yml b/core/vendor/zendframework/zend-diactoros/.coveralls.yml
new file mode 100644
index 000000000..53bda829c
--- /dev/null
+++ b/core/vendor/zendframework/zend-diactoros/.coveralls.yml
@@ -0,0 +1,3 @@
+coverage_clover: clover.xml
+json_path: coveralls-upload.json
+src_dir: src
diff --git a/core/vendor/zendframework/zend-diactoros/CHANGELOG.md b/core/vendor/zendframework/zend-diactoros/CHANGELOG.md
new file mode 100644
index 000000000..7fdf2106a
--- /dev/null
+++ b/core/vendor/zendframework/zend-diactoros/CHANGELOG.md
@@ -0,0 +1,231 @@
+# Changelog
+
+All notable changes to this project will be documented in this file, in reverse chronological order by release.
+
+## 1.1.0 - 2015-06-24
+
+### Added
+
+- [#52](https://github.com/zendframework/zend-diactoros/pull/52),
+  [#58](https://github.com/zendframework/zend-diactoros/pull/58),
+  [#59](https://github.com/zendframework/zend-diactoros/pull/59), and
+  [#61](https://github.com/zendframework/zend-diactoros/pull/61) create several
+  custom response types for simplifying response creation:
+
+  - `Zend\Diactoros\Response\HtmlResponse` accepts HTML content via its
+    constructor, and sets the `Content-Type` to `text/html`.
+  - `Zend\Diactoros\Response\JsonResponse` accepts data to serialize to JSON via
+    its constructor, and sets the `Content-Type` to `application/json`.
+  - `Zend\Diactoros\Response\EmptyResponse` allows creating empty, read-only
+    responses, with a default status code of 204.
+  - `Zend\Diactoros\Response\RedirectResponse` allows specifying a URI for the
+    `Location` header in the constructor, with a default status code of 302.
+
+  Each also accepts an optional status code, and optional headers (which can
+  also be used to provide an alternate `Content-Type` in the case of the HTML
+  and JSON responses).
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- [#43](https://github.com/zendframework/zend-diactoros/pull/43) removed both
+  `ServerRequestFactory::marshalUri()` and `ServerRequestFactory::marshalHostAndPort()`,
+  which were deprecated prior to the 1.0 release.
+
+### Fixed
+
+- [#29](https://github.com/zendframework/zend-diactoros/pull/29) fixes request
+  method validation to allow any valid token as defined by [RFC
+  7230](http://tools.ietf.org/html/rfc7230#appendix-B). This allows usage of
+  custom request methods, vs a static, hard-coded list.
+
+## 1.0.5 - 2015-06-24
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#60](https://github.com/zendframework/zend-diactoros/pull/60) fixes
+  the behavior of `UploadedFile` when the `$errorStatus` provided at
+  instantiation is not `UPLOAD_ERR_OK`. Prior to the fix, an
+  `InvalidArgumentException` would occur at instantiation due to the fact that
+  the upload file was missing or invalid. With the fix, no exception is raised
+  until a call to `moveTo()` or `getStream()` is made.
+
+## 1.0.4 - 2015-06-23
+
+This is a security release.
+
+A patch has been applied to `Zend\Diactoros\Uri::filterPath()` that ensures that
+paths can only begin with a single leading slash. This prevents the following
+potential security issues:
+
+- XSS vectors. If the URI path is used for links or form targets, this prevents
+  cases where the first segment of the path resembles a domain name, thus
+  creating scheme-relative links such as `//example.com/foo`. With the patch,
+  the leading double slash is reduced to a single slash, preventing the XSS
+  vector.
+- Open redirects. If the URI path is used for `Location` or `Link` headers,
+  without a scheme and authority, potential for open redirects exist if clients
+  do not prepend the scheme and authority. Again, preventing a double slash
+  corrects the vector.
+
+If you are using `Zend\Diactoros\Uri` for creating links, form targets, or
+redirect paths, and only using the path segment, we recommend upgrading
+immediately.
+
+### Added
+
+- [#25](https://github.com/zendframework/zend-diactoros/pull/25) adds
+  documentation. Documentation is written in markdown, and can be converted to
+  HTML using [bookdown](http://bookdown.io). New features now MUST include
+  documentation for acceptance.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#51](https://github.com/zendframework/zend-diactoros/pull/51) fixes
+  `MessageTrait::getHeaderLine()` to return an empty string instead of `null` if
+  the header is undefined (which is the behavior specified in PSR-7).
+- [#57](https://github.com/zendframework/zend-diactoros/pull/57) fixes the
+  behavior of how the `ServerRequestFactory` marshals upload files when they are
+  represented as a nested associative array.
+- [#49](https://github.com/zendframework/zend-diactoros/pull/49) provides several 
+  fixes that ensure that Diactoros complies with the PSR-7 specification:
+  - `MessageInterface::getHeaderLine()` MUST return a string (that string CAN be
+    empty). Previously, Diactoros would return `null`.
+  - If no `Host` header is set, the `$preserveHost` flag MUST be ignored when
+    calling `withUri()` (previously, Diactoros would not set the `Host` header
+    if `$preserveHost` was `true`, but no `Host` header was present).
+  - The request method MUST be a string; it CAN be empty. Previously, Diactoros
+    would return `null`.
+  - The request MUST return a `UriInterface` instance from `getUri()`; that
+    instance CAN be empty. Previously, Diactoros would return `null`; now it
+    lazy-instantiates an empty `Uri` instance on initialization.
+- [ZF2015-05](http://framework.zend.com/security/advisory/ZF2015-05) was
+  addressed by altering `Uri::filterPath()` to prevent emitting a path prepended
+  with multiple slashes.
+
+## 1.0.3 - 2015-06-04
+
+### Added
+
+- [#48](https://github.com/zendframework/zend-diactoros/pull/48) drops the
+  minimum supported PHP version to 5.4, to allow an easier upgrade path for
+  Symfony 2.7 users, and potential Drupal 8 usage.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
+## 1.0.2 - 2015-06-04
+
+### Added
+
+- [#27](https://github.com/zendframework/zend-diactoros/pull/27) adds phonetic
+  pronunciation of "Diactoros" to the README file.
+- [#36](https://github.com/zendframework/zend-diactoros/pull/36) adds property
+  annotations to the class-level docblock of `Zend\Diactoros\RequestTrait` to
+  ensure properties inherited from the `MessageTrait` are inherited by
+  implementations.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+-
+### Fixed
+
+- [#41](https://github.com/zendframework/zend-diactoros/pull/41) fixes the
+  namespace for test files to begin with `ZendTest` instead of `Zend`.
+- [#46](https://github.com/zendframework/zend-diactoros/pull/46) ensures that
+  the cookie and query params for the `ServerRequest` implementation are
+  initialized as arrays.
+- [#47](https://github.com/zendframework/zend-diactoros/pull/47) modifies the
+  internal logic in `HeaderSecurity::isValid()` to use a regular expression
+  instead of character-by-character comparisons, improving performance.
+
+## 1.0.1 - 2015-05-26
+
+### Added
+
+- [#10](https://github.com/zendframework/zend-diactoros/pull/10) adds
+  `Zend\Diactoros\RelativeStream`, which will return stream contents relative to
+  a given offset (i.e., a subset of the stream).  `AbstractSerializer` was
+  updated to create a `RelativeStream` when creating the body of a message,
+  which will prevent duplication of the stream in-memory.
+- [#21](https://github.com/zendframework/zend-diactoros/pull/21) adds a
+  `.gitattributes` file that excludes directories and files not needed for
+  production; this will further minify the package for production use cases.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#9](https://github.com/zendframework/zend-diactoros/pull/9) ensures that
+  attributes are initialized to an empty array, ensuring that attempts to
+  retrieve single attributes when none are defined will not produce errors.
+- [#14](https://github.com/zendframework/zend-diactoros/pull/14) updates
+  `Zend\Diactoros\Request` to use a `php://temp` stream by default instead of
+  `php://memory`, to ensure requests do not create an out-of-memory condition.
+- [#15](https://github.com/zendframework/zend-diactoros/pull/15) updates
+  `Zend\Diactoros\Stream` to ensure that write operations trigger an exception
+  if the stream is not writeable. Additionally, it adds more robust logic for
+  determining if a stream is writeable.
+
+## 1.0.0 - 2015-05-21
+
+First stable release, and first release as `zend-diactoros`.
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
diff --git a/core/vendor/zendframework/zend-diactoros/CONTRIBUTING.md b/core/vendor/zendframework/zend-diactoros/CONTRIBUTING.md
new file mode 100644
index 000000000..d99a16cb0
--- /dev/null
+++ b/core/vendor/zendframework/zend-diactoros/CONTRIBUTING.md
@@ -0,0 +1,223 @@
+# CONTRIBUTING
+
+## RESOURCES
+
+If you wish to contribute to Zend Framework, please be sure to
+read/subscribe to the following resources:
+
+ -  [Coding Standards](https://github.com/zendframework/zf2/wiki/Coding-Standards)
+ -  [Contributor's Guide](http://framework.zend.com/participate/contributor-guide)
+ -  ZF Contributor's mailing list:
+    Archives: http://zend-framework-community.634137.n4.nabble.com/ZF-Contributor-f680267.html
+    Subscribe: zf-contributors-subscribe@lists.zend.com
+ -  ZF Contributor's IRC channel:
+    #zftalk.dev on Freenode.net
+
+If you are working on new features or refactoring [create a proposal](https://github.com/zendframework/zend-diactoros/issues/new).
+
+## Reporting Potential Security Issues
+
+If you have encountered a potential security vulnerability, please **DO NOT** report it on the public
+issue tracker: send it to us at [zf-security@zend.com](mailto:zf-security@zend.com) instead.
+We will work with you to verify the vulnerability and patch it as soon as possible.
+
+When reporting issues, please provide the following information:
+
+- Component(s) affected
+- A description indicating how to reproduce the issue
+- A summary of the security vulnerability and impact
+
+We request that you contact us via the email address above and give the project
+contributors a chance to resolve the vulnerability and issue a new release prior
+to any public exposure; this helps protect users and provides them with a chance
+to upgrade and/or update in order to protect their applications.
+
+For sensitive email communications, please use [our PGP key](http://framework.zend.com/zf-security-pgp-key.asc).
+
+## Documentation
+
+Documentation is in [GitHub Flavored Markdown](https://help.github.com/articles/github-flavored-markdown/),
+and rendered using [bookdown](http://bookdown.io). Please read and follow the [general documentation
+guidelines](https://github.com/zendframework/documentation/blob/master/CONTRIBUTING.md) when
+providing documentation.
+
+All new features **must** include documentation before they may be accepted and merged.
+
+## RUNNING TESTS
+
+To run tests:
+
+- Clone the repository:
+
+  ```console
+  $ git clone git@github.com:zendframework/zend-diactoros.git
+  $ cd
+  ```
+
+- Install dependencies via composer:
+
+  ```console
+  $ curl -sS https://getcomposer.org/installer | php --
+  $ ./composer.phar install
+  ```
+
+  If you don't have `curl` installed, you can also download `composer.phar` from https://getcomposer.org/
+
+- Run the tests via `phpunit` and the provided PHPUnit config, like in this example:
+
+  ```console
+  $ ./vendor/bin/phpunit
+  ```
+
+## Running Coding Standards Checks
+
+This component uses [phpcs](https://github.com/squizlabs/PHP_CodeSniffer) for coding
+standards checks, and provides configuration for our selected checks.
+`phpcs` is installed by default via Composer.
+
+To run checks only:
+
+```console
+$ ./vendor/bin/phpcs --standard=PSR2 src test
+```
+
+`phpcs` also installs a tool named `phpcbf` which can attempt to fix problems
+for you:
+
+```console
+$ ./vendor/bin/phpcbf --standard=PSR2 src test
+```
+
+If you allow phpcbf to fix CS issues, please re-run the tests to ensure
+they pass, and make sure you add and commit the changes after verification.
+
+## Recommended Workflow for Contributions
+
+Your first step is to establish a public repository from which we can
+pull your work into the master repository. We recommend using
+[GitHub](https://github.com), as that is where the component is already hosted.
+
+1. Setup a [GitHub account](http://github.com/), if you haven't yet
+2. Fork the repository (http://github.com/zendframework/zend-diactoros)
+3. Clone the canonical repository locally and enter it.
+
+   ```console
+   $ git clone git://github.com:zendframework/zend-diactoros.git
+   $ cd zend-diactoros
+   ```
+
+4. Add a remote to your fork; substitute your GitHub username in the command
+   below.
+
+   ```console
+   $ git remote add {username} git@github.com:{username}/zend-diactoros.git
+   $ git fetch {username}
+   ```
+
+### Keeping Up-to-Date
+
+Periodically, you should update your fork or personal repository to
+match the canonical repository. Assuming you have setup your local repository
+per the instructions above, you can do the following:
+
+
+```console
+$ git checkout master
+$ git fetch origin
+$ git rebase origin/master
+# OPTIONALLY, to keep your remote up-to-date -
+$ git push {username} master:master
+```
+
+If you're tracking other branches -- for example, the "develop" branch, where
+new feature development occurs -- you'll want to do the same operations for that
+branch; simply substitute  "develop" for "master".
+
+### Working on a patch
+
+We recommend you do each new feature or bugfix in a new branch. This simplifies
+the task of code review as well as the task of merging your changes into the
+canonical repository.
+
+A typical workflow will then consist of the following:
+
+1. Create a new local branch based off either your master or develop branch.
+2. Switch to your new local branch. (This step can be combined with the
+   previous step with the use of `git checkout -b`.)
+3. Do some work, commit, repeat as necessary.
+4. Push the local branch to your remote repository.
+5. Send a pull request.
+
+The mechanics of this process are actually quite trivial. Below, we will
+create a branch for fixing an issue in the tracker.
+
+```console
+$ git checkout -b hotfix/9295
+Switched to a new branch 'hotfix/9295'
+```
+
+... do some work ...
+
+
+```console
+$ git commit
+```
+
+... write your log message ...
+
+
+```console
+$ git push {username} hotfix/9295:hotfix/9295
+Counting objects: 38, done.
+Delta compression using up to 2 threads.
+Compression objects: 100% (18/18), done.
+Writing objects: 100% (20/20), 8.19KiB, done.
+Total 20 (delta 12), reused 0 (delta 0)
+To ssh://git@github.com/{username}/zend-diactoros.git
+   b5583aa..4f51698  HEAD -> master
+```
+
+To send a pull request, you have two options.
+
+If using GitHub, you can do the pull request from there. Navigate to
+your repository, select the branch you just created, and then select the
+"Pull Request" button in the upper right. Select the user/organization
+"zendframework" as the recipient.
+
+If using your own repository - or even if using GitHub - you can use `git
+format-patch` to create a patchset for us to apply; in fact, this is
+**recommended** for security-related patches. If you use `format-patch`, please
+send the patches as attachments to:
+
+-  zf-devteam@zend.com for patches without security implications
+-  zf-security@zend.com for security patches
+
+#### What branch to issue the pull request against?
+
+Which branch should you issue a pull request against?
+
+- For fixes against the stable release, issue the pull request against the
+  "master" branch.
+- For new features, or fixes that introduce new elements to the public API (such
+  as new public methods or properties), issue the pull request against the
+  "develop" branch.
+
+### Branch Cleanup
+
+As you might imagine, if you are a frequent contributor, you'll start to
+get a ton of branches both locally and on your remote.
+
+Once you know that your changes have been accepted to the master
+repository, we suggest doing some cleanup of these branches.
+
+-  Local branch cleanup
+
+   ```console
+   $ git branch -d <branchname>
+   ```
+
+-  Remote branch removal
+
+   ```console
+   $ git push {username} :<branchname>
+   ```
diff --git a/core/vendor/zendframework/zend-diactoros/LICENSE.md b/core/vendor/zendframework/zend-diactoros/LICENSE.md
new file mode 100644
index 000000000..b401e72de
--- /dev/null
+++ b/core/vendor/zendframework/zend-diactoros/LICENSE.md
@@ -0,0 +1,12 @@
+Copyright (c) 2015, Zend Technologies USA, Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+- Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+- Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+- Neither the name of Zend Technologies USA, Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/core/vendor/zendframework/zend-diactoros/README.md b/core/vendor/zendframework/zend-diactoros/README.md
new file mode 100644
index 000000000..477ac6dca
--- /dev/null
+++ b/core/vendor/zendframework/zend-diactoros/README.md
@@ -0,0 +1,40 @@
+# zend-diactoros
+
+Master:
+[![Build status][Master image]][Master]
+[![Coverage Status][Master coverage image]][Master coverage]
+Develop:
+[![Build status][Develop image]][Develop]
+[![Coverage Status][Develop coverage image]][Develop coverage]
+
+> Diactoros (pronunciation: `/dɪʌktɒrɒs/`): an epithet for Hermes, meaning literally, "the messenger."
+
+This package supercedes and replaces [phly/http](https://github.com/phly/http).
+
+`zend-diactoros` is a PHP package containing implementations of the [accepted PSR-7 HTTP message interfaces](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-7-http-message.md), as well as a "server" implementation similar to [node's http.Server](http://nodejs.org/api/http.html).
+
+* File issues at https://github.com/zendframework/zend-diactoros/issues
+* Issue patches to https://github.com/zendframework/zend-diactoros/pulls
+
+## Documentation
+
+Documentation is [in the doc tree](doc/), and can be compiled using [bookdown](http://bookdown.io):
+
+```console
+$ bookdown doc/bookdown.json
+$ php -S 0.0.0.0:8080 -t doc/html/ # then browse to http://localhost:8080/
+```
+
+> ### Bookdown
+>
+> You can install bookdown globally using `composer global require bookdown/bookdown`. If you do
+> this, make sure that `$HOME/.composer/vendor/bin` is on your `$PATH`.
+
+  [Master]: https://travis-ci.org/zendframework/zend-diactoros
+  [Master image]: https://secure.travis-ci.org/zendframework/zend-diactoros.svg?branch=master
+  [Master coverage image]: https://img.shields.io/coveralls/zendframework/zend-diactoros/master.svg
+  [Master coverage]: https://coveralls.io/r/zendframework/zend-diactoros?branch=master
+  [Develop]: https://github.com/zendframeowork/zend-diactoros/tree/develop
+  [Develop image]:  https://secure.travis-ci.org/zendframework/zend-diactoros.svg?branch=develop
+  [Develop coverage image]: https://coveralls.io/repos/zendframework/zend-diactoros/badge.svg?branch=develop
+  [Develop coverage]: https://coveralls.io/r/zendframework/zend-diactoros?branch=develop
diff --git a/core/vendor/zendframework/zend-diactoros/composer.json b/core/vendor/zendframework/zend-diactoros/composer.json
new file mode 100644
index 000000000..fee75d9a0
--- /dev/null
+++ b/core/vendor/zendframework/zend-diactoros/composer.json
@@ -0,0 +1,47 @@
+{
+  "name": "zendframework/zend-diactoros",
+  "description": "PSR HTTP Message implementations",
+  "type": "library",
+  "license": "BSD-2-Clause",
+  "keywords": [
+    "http",
+    "psr",
+    "psr-7"
+  ],
+  "homepage": "https://github.com/zendframework/zend-diactoros",
+  "support": {
+    "issues": "https://github.com/zendframework/zend-diactoros/issues",
+    "source": "https://github.com/zendframework/zend-diactoros"
+  },
+  "extra": {
+    "branch-alias": {
+      "dev-master": "1.0-dev",
+      "dev-develop": "1.1-dev"
+    }
+  },
+  "require": {
+    "php": ">=5.4",
+    "psr/http-message": "~1.0"
+  },
+  "require-dev": {
+    "phpunit/PHPUnit": "~4.6",
+    "squizlabs/php_codesniffer": "^2.3.1"
+  },
+  "provide": {
+    "psr/http-message-implementation": "~1.0.0"
+  },
+  "autoload": {
+    "psr-4": {
+      "Zend\\Diactoros\\": "src/"
+    }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "ZendTest\\Diactoros\\": "test/"
+    },
+    "files": [
+      "test/TestAsset/Functions.php",
+      "test/TestAsset/SapiResponse.php"
+    ]
+  }
+}
diff --git a/core/vendor/zendframework/zend-diactoros/phpcs.xml b/core/vendor/zendframework/zend-diactoros/phpcs.xml
new file mode 100644
index 000000000..e994eae10
--- /dev/null
+++ b/core/vendor/zendframework/zend-diactoros/phpcs.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<ruleset name="Zend Framework coding standard">
+    <description>Zend Framework coding standard</description>
+
+    <!-- display progress -->
+    <arg value="p"/>
+    <arg name="colors"/>
+
+    <!-- inherit rules from: -->
+    <rule ref="PSR2"/>
+    <rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
+    <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace">
+        <properties>
+            <property name="ignoreBlankLines" value="false"/>
+        </properties>
+    </rule>
+
+    <!-- Paths to check -->
+    <file>src</file>
+    <file>test</file>
+</ruleset>
diff --git a/core/vendor/zendframework/zend-diactoros/src/AbstractSerializer.php b/core/vendor/zendframework/zend-diactoros/src/AbstractSerializer.php
new file mode 100644
index 000000000..a55ca5a3f
--- /dev/null
+++ b/core/vendor/zendframework/zend-diactoros/src/AbstractSerializer.php
@@ -0,0 +1,152 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
+ * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Diactoros;
+
+use Psr\Http\Message\StreamInterface;
+use UnexpectedValueException;
+
+/**
+ * Provides base functionality for request and response de/serialization
+ * strategies, including functionality for retrieving a line at a time from
+ * the message, splitting headers from the body, and serializing headers.
+ */
+abstract class AbstractSerializer
+{
+    const CR  = "\r";
+    const EOL = "\r\n";
+    const LF  = "\n";
+
+    /**
+     * Retrieve a single line from the stream.
+     *
+     * Retrieves a line from the stream; a line is defined as a sequence of
+     * characters ending in a CRLF sequence.
+     *
+     * @param StreamInterface $stream
+     * @return string
+     * @throws UnexpectedValueException if the sequence contains a CR or LF in
+     *     isolation, or ends in a CR.
+     */
+    protected static function getLine(StreamInterface $stream)
+    {
+        $line    = '';
+        $crFound = false;
+        while (! $stream->eof()) {
+            $char = $stream->read(1);
+
+            if ($crFound && $char === self::LF) {
+                $crFound = false;
+                break;
+            }
+
+            // CR NOT followed by LF
+            if ($crFound && $char !== self::LF) {
+                throw new UnexpectedValueException('Unexpected carriage return detected');
+            }
+
+            // LF in isolation
+            if (! $crFound && $char === self::LF) {
+                throw new UnexpectedValueException('Unexpected line feed detected');
+            }
+
+            // CR found; do not append
+            if ($char === self::CR) {
+                $crFound = true;
+                continue;
+            }
+
+            // Any other character: append
+            $line .= $char;
+        }
+
+        // CR found at end of stream
+        if ($crFound) {
+            throw new UnexpectedValueException("Unexpected end of headers");
+        }
+
+        return $line;
+    }
+
+    /**
+     * Split the stream into headers and body content.
+     *
+     * Returns an array containing two elements
+     *
+     * - The first is an array of headers
+     * - The second is a StreamInterface containing the body content
+     *
+     * @param StreamInterface $stream
+     * @return array
+     * @throws UnexpectedValueException For invalid headers.
+     */
+    protected static function splitStream(StreamInterface $stream)
+    {
+        $headers       = [];
+        $currentHeader = false;
+
+        while ($line = self::getLine($stream)) {
+            if (preg_match(';^(?P<name>[!#$%&\'*+.^_`\|~0-9a-zA-Z-]+):(?P<value>.*)$;', $line, $matches)) {
+                $currentHeader = $matches['name'];
+                if (! isset($headers[$currentHeader])) {
+                    $headers[$currentHeader] = [];
+                }
+                $headers[$currentHeader][] = ltrim($matches['value']);
+                continue;
+            }
+
+            if (! $currentHeader) {
+                throw new UnexpectedValueException('Invalid header detected');
+            }
+
+            if (! preg_match('#^[ \t]#', $line)) {
+                throw new UnexpectedValueException('Invalid header continuation');
+            }
+
+            // Append continuation to last header value found
+            $value = array_pop($headers[$currentHeader]);
+            $headers[$currentHeader][] = $value . ltrim($line);
+        }
+
+        // use RelativeStream to avoid copying initial stream into memory
+        return [$headers, new RelativeStream($stream, $stream->tell())];
+    }
+
+    /**
+     * Serialize headers to string values.
+     *
+     * @param array $headers
+     * @return string
+     */
+    protected static function serializeHeaders(array $headers)
+    {
+        $lines = [];
+        foreach ($headers as $header => $values) {
+            $normalized = self::filterHeader($header);
+            foreach ($values as $value) {
+                $lines[] = sprintf('%s: %s', $normalized, $value);
+            }
+        }
+
+        return implode("\r\n", $lines);
+    }
+
+    /**
+     * Filter a header name to wordcase
+     *
+     * @param string $header
+     * @return string
+     */
+    protected static function filterHeader($header)
+    {
+        $filtered = str_replace('-', ' ', $header);
+        $filtered = ucwords($filtered);
+        return str_replace(' ', '-', $filtered);
+    }
+}
diff --git a/core/vendor/zendframework/zend-diactoros/src/Exception/DeprecatedMethodException.php b/core/vendor/zendframework/zend-diactoros/src/Exception/DeprecatedMethodException.php
new file mode 100644
index 000000000..bdef44a1c
--- /dev/null
+++ b/core/vendor/zendframework/zend-diactoros/src/Exception/DeprecatedMethodException.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
+ * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Diactoros\Exception;
+
+use BadMethodCallException;
+
+/**
+ * Exception indicating a deprecated method.
+ */
+class DeprecatedMethodException extends BadMethodCallException implements ExceptionInterface
+{
+}
diff --git a/core/vendor/zendframework/zend-diactoros/src/Exception/ExceptionInterface.php b/core/vendor/zendframework/zend-diactoros/src/Exception/ExceptionInterface.php
new file mode 100644
index 000000000..a2b22fbfd
--- /dev/null
+++ b/core/vendor/zendframework/zend-diactoros/src/Exception/ExceptionInterface.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
+ * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Diactoros\Exception;
+
+/**
+ * Marker interface for package-specific exceptions.
+ */
+interface ExceptionInterface
+{
+}
diff --git a/core/vendor/zendframework/zend-diactoros/src/HeaderSecurity.php b/core/vendor/zendframework/zend-diactoros/src/HeaderSecurity.php
new file mode 100644
index 000000000..231beac06
--- /dev/null
+++ b/core/vendor/zendframework/zend-diactoros/src/HeaderSecurity.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
+ * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Diactoros;
+
+use InvalidArgumentException;
+
+/**
+ * Provide security tools around HTTP headers to prevent common injection vectors.
+ *
+ * Code is largely lifted from the Zend\Http\Header\HeaderValue implementation in
+ * Zend Framework, released with the copyright and license below.
+ *
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+final class HeaderSecurity
+{
+    /**
+     * Private constructor; non-instantiable.
+     */
+    private function __construct()
+    {
+    }
+
+    /**
+     * Filter a header value
+     *
+     * Ensures CRLF header injection vectors are filtered.
+     *
+     * Per RFC 7230, only VISIBLE ASCII characters, spaces, and horizontal
+     * tabs are allowed in values; header continuations MUST consist of
+     * a single CRLF sequence followed by a space or horizontal tab.
+     *
+     * This method filters any values not allowed from the string, and is
+     * lossy.
+     *
+     * @see http://en.wikipedia.org/wiki/HTTP_response_splitting
+     * @param string $value
+     * @return string
+     */
+    public static function filter($value)
+    {
+        $value  = (string) $value;
+        $length = strlen($value);
+        $string = '';
+        for ($i = 0; $i < $length; $i += 1) {
+            $ascii = ord($value[$i]);
+
+            // Detect continuation sequences
+            if ($ascii === 13) {
+                $lf = ord($value[$i + 1]);
+                $ws = ord($value[$i + 2]);
+                if ($lf === 10 && in_array($ws, [9, 32], true)) {
+                    $string .= $value[$i] . $value[$i + 1];
+                    $i += 1;
+                }
+
+                continue;
+            }
+
+            // Non-visible, non-whitespace characters
+            // 9 === horizontal tab
+            // 32-126, 128-254 === visible
+            // 127 === DEL
+            // 255 === null byte
+            if (($ascii < 32 && $ascii !== 9)
+                || $ascii === 127
+                || $ascii > 254
+            ) {
+                continue;
+            }
+
+            $string .= $value[$i];
+        }
+
+        return $string;
+    }
+
+    /**
+     * Validate a header value.
+     *
+     * Per RFC 7230, only VISIBLE ASCII characters, spaces, and horizontal
+     * tabs are allowed in values; header continuations MUST consist of
+     * a single CRLF sequence followed by a space or horizontal tab.
+     *
+     * @see http://en.wikipedia.org/wiki/HTTP_response_splitting
+     * @param string $value
+     * @return bool
+     */
+    public static function isValid($value)
+    {
+        $value  = (string) $value;
+
+        // Look for:
+        // \n not preceded by \r, OR
+        // \r not followed by \n, OR
+        // \r\n not followed by space or horizontal tab; these are all CRLF attacks
+        if (preg_match("#(?:(?:(?<!\r)\n)|(?:\r(?!\n))|(?:\r\n(?![ \t])))#", $value)) {
+            return false;
+        }
+
+        // Non-visible, non-whitespace characters
+        // 9 === horizontal tab
+        // 10 === line feed
+        // 13 === carriage return
+        // 32-126, 128-254 === visible
+        // 127 === DEL (disallowed)
+        // 255 === null byte (disallowed)
+        if (preg_match('/[^\x09\x0a\x0d\x20-\x7E\x80-\xFE]/', $value)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Assert a header value is valid.
+     *
+     * @param string $value
+     * @throws InvalidArgumentException for invalid values
+     */
+    public static function assertValid($value)
+    {
+        if (! self::isValid($value)) {
+            throw new InvalidArgumentException('Invalid header value');
+        }
+    }
+
+    /**
+     * Assert whether or not a header name is valid.
+     *
+     * @see http://tools.ietf.org/html/rfc7230#section-3.2
+     * @param mixed $name
+     * @throws InvalidArgumentException
+     */
+    public static function assertValidName($name)
+    {
+        if (! preg_match('/^[a-zA-Z0-9\'`#$%&*+.^_|~!-]+$/', $name)) {
+            throw new InvalidArgumentException('Invalid header name');
+        }
+    }
+}
diff --git a/core/vendor/zendframework/zend-diactoros/src/MessageTrait.php b/core/vendor/zendframework/zend-diactoros/src/MessageTrait.php
new file mode 100644
index 000000000..1b3fc6f51
--- /dev/null
+++ b/core/vendor/zendframework/zend-diactoros/src/MessageTrait.php
@@ -0,0 +1,383 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
+ * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Diactoros;
+
+use InvalidArgumentException;
+use Psr\Http\Message\StreamInterface;
+
+/**
+ * Trait implementing the various methods defined in MessageInterface.
+ *
+ * @see https://github.com/php-fig/http-message/tree/master/src/MessageInterface.php
+ */
+trait MessageTrait
+{
+    /**
+     * List of all registered headers, as key => array of values.
+     *
+     * @var array
+     */
+    protected $headers = [];
+
+    /**
+     * Map of normalized header name to original name used to register header.
+     *
+     * @var array
+     */
+    protected $headerNames = [];
+
+    /**
+     * @var string
+     */
+    private $protocol = '1.1';
+
+    /**
+     * @var StreamInterface
+     */
+    private $stream;
+
+    /**
+     * Retrieves the HTTP protocol version as a string.
+     *
+     * The string MUST contain only the HTTP version number (e.g., "1.1", "1.0").
+     *
+     * @return string HTTP protocol version.
+     */
+    public function getProtocolVersion()
+    {
+        return $this->protocol;
+    }
+
+    /**
+     * Return an instance with the specified HTTP protocol version.
+     *
+     * The version string MUST contain only the HTTP version number (e.g.,
+     * "1.1", "1.0").
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * new protocol version.
+     *
+     * @param string $version HTTP protocol version
+     * @return static
+     */
+    public function withProtocolVersion($version)
+    {
+        $new = clone $this;
+        $new->protocol = $version;
+        return $new;
+    }
+
+    /**
+     * Retrieves all message headers.
+     *
+     * The keys represent the header name as it will be sent over the wire, and
+     * each value is an array of strings associated with the header.
+     *
+     *     // Represent the headers as a string
+     *     foreach ($message->getHeaders() as $name => $values) {
+     *         echo $name . ": " . implode(", ", $values);
+     *     }
+     *
+     *     // Emit headers iteratively:
+     *     foreach ($message->getHeaders() as $name => $values) {
+     *         foreach ($values as $value) {
+     *             header(sprintf('%s: %s', $name, $value), false);
+     *         }
+     *     }
+     *
+     * @return array Returns an associative array of the message's headers. Each
+     *     key MUST be a header name, and each value MUST be an array of strings.
+     */
+    public function getHeaders()
+    {
+        return $this->headers;
+    }
+
+    /**
+     * Checks if a header exists by the given case-insensitive name.
+     *
+     * @param string $header Case-insensitive header name.
+     * @return bool Returns true if any header names match the given header
+     *     name using a case-insensitive string comparison. Returns false if
+     *     no matching header name is found in the message.
+     */
+    public function hasHeader($header)
+    {
+        return array_key_exists(strtolower($header), $this->headerNames);
+    }
+
+    /**
+     * Retrieves a message header value by the given case-insensitive name.
+     *
+     * This method returns an array of all the header values of the given
+     * case-insensitive header name.
+     *
+     * If the header does not appear in the message, this method MUST return an
+     * empty array.
+     *
+     * @param string $header Case-insensitive header field name.
+     * @return string[] An array of string values as provided for the given
+     *    header. If the header does not appear in the message, this method MUST
+     *    return an empty array.
+     */
+    public function getHeader($header)
+    {
+        if (! $this->hasHeader($header)) {
+            return [];
+        }
+
+        $header = $this->headerNames[strtolower($header)];
+        $value  = $this->headers[$header];
+        $value  = is_array($value) ? $value : [$value];
+
+        return $value;
+    }
+
+    /**
+     * Retrieves a comma-separated string of the values for a single header.
+     *
+     * This method returns all of the header values of the given
+     * case-insensitive header name as a string concatenated together using
+     * a comma.
+     *
+     * NOTE: Not all header values may be appropriately represented using
+     * comma concatenation. For such headers, use getHeader() instead
+     * and supply your own delimiter when concatenating.
+     *
+     * If the header does not appear in the message, this method MUST return
+     * an empty string.
+     *
+     * @param string $name Case-insensitive header field name.
+     * @return string A string of values as provided for the given header
+     *    concatenated together using a comma. If the header does not appear in
+     *    the message, this method MUST return an empty string.
+     */
+    public function getHeaderLine($name)
+    {
+        $value = $this->getHeader($name);
+        if (empty($value)) {
+            return '';
+        }
+
+        return implode(',', $value);
+    }
+
+    /**
+     * Return an instance with the provided header, replacing any existing
+     * values of any headers with the same case-insensitive name.
+     *
+     * While header names are case-insensitive, the casing of the header will
+     * be preserved by this function, and returned from getHeaders().
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * new and/or updated header and value.
+     *
+     * @param string $header Case-insensitive header field name.
+     * @param string|string[] $value Header value(s).
+     * @return static
+     * @throws \InvalidArgumentException for invalid header names or values.
+     */
+    public function withHeader($header, $value)
+    {
+        if (is_string($value)) {
+            $value = [$value];
+        }
+
+        if (! is_array($value) || ! $this->arrayContainsOnlyStrings($value)) {
+            throw new InvalidArgumentException(
+                'Invalid header value; must be a string or array of strings'
+            );
+        }
+
+        HeaderSecurity::assertValidName($header);
+        self::assertValidHeaderValue($value);
+
+        $normalized = strtolower($header);
+
+        $new = clone $this;
+        $new->headerNames[$normalized] = $header;
+        $new->headers[$header]         = $value;
+
+        return $new;
+    }
+
+    /**
+     * Return an instance with the specified header appended with the
+     * given value.
+     *
+     * Existing values for the specified header will be maintained. The new
+     * value(s) will be appended to the existing list. If the header did not
+     * exist previously, it will be added.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * new header and/or value.
+     *
+     * @param string $header Case-insensitive header field name to add.
+     * @param string|string[] $value Header value(s).
+     * @return static
+     * @throws \InvalidArgumentException for invalid header names or values.
+     */
+    public function withAddedHeader($header, $value)
+    {
+        if (is_string($value)) {
+            $value = [ $value ];
+        }
+
+        if (! is_array($value) || ! $this->arrayContainsOnlyStrings($value)) {
+            throw new InvalidArgumentException(
+                'Invalid header value; must be a string or array of strings'
+            );
+        }
+
+        HeaderSecurity::assertValidName($header);
+        self::assertValidHeaderValue($value);
+
+        if (! $this->hasHeader($header)) {
+            return $this->withHeader($header, $value);
+        }
+
+        $normalized = strtolower($header);
+        $header     = $this->headerNames[$normalized];
+
+        $new = clone $this;
+        $new->headers[$header] = array_merge($this->headers[$header], $value);
+        return $new;
+    }
+
+    /**
+     * Return an instance without the specified header.
+     *
+     * Header resolution MUST be done without case-sensitivity.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that removes
+     * the named header.
+     *
+     * @param string $header Case-insensitive header field name to remove.
+     * @return static
+     */
+    public function withoutHeader($header)
+    {
+        if (! $this->hasHeader($header)) {
+            return clone $this;
+        }
+
+        $normalized = strtolower($header);
+        $original   = $this->headerNames[$normalized];
+
+        $new = clone $this;
+        unset($new->headers[$original], $new->headerNames[$normalized]);
+        return $new;
+    }
+
+    /**
+     * Gets the body of the message.
+     *
+     * @return StreamInterface Returns the body as a stream.
+     */
+    public function getBody()
+    {
+        return $this->stream;
+    }
+
+    /**
+     * Return an instance with the specified message body.
+     *
+     * The body MUST be a StreamInterface object.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return a new instance that has the
+     * new body stream.
+     *
+     * @param StreamInterface $body Body.
+     * @return static
+     * @throws \InvalidArgumentException When the body is not valid.
+     */
+    public function withBody(StreamInterface $body)
+    {
+        $new = clone $this;
+        $new->stream = $body;
+        return $new;
+    }
+
+    /**
+     * Test that an array contains only strings
+     *
+     * @param array $array
+     * @return bool
+     */
+    private function arrayContainsOnlyStrings(array $array)
+    {
+        return array_reduce($array, [__CLASS__, 'filterStringValue'], true);
+    }
+
+    /**
+     * Filter a set of headers to ensure they are in the correct internal format.
+     *
+     * Used by message constructors to allow setting all initial headers at once.
+     *
+     * @param array $originalHeaders Headers to filter.
+     * @return array Filtered headers and names.
+     */
+    private function filterHeaders(array $originalHeaders)
+    {
+        $headerNames = $headers = [];
+        foreach ($originalHeaders as $header => $value) {
+            if (! is_string($header)) {
+                continue;
+            }
+
+            if (! is_array($value) && ! is_string($value)) {
+                continue;
+            }
+
+            if (! is_array($value)) {
+                $value = [ $value ];
+            }
+
+            $headerNames[strtolower($header)] = $header;
+            $headers[$header] = $value;
+        }
+
+        return [$headerNames, $headers];
+    }
+
+    /**
+     * Test if a value is a string
+     *
+     * Used with array_reduce.
+     *
+     * @param bool $carry
+     * @param mixed $item
+     * @return bool
+     */
+    private static function filterStringValue($carry, $item)
+    {
+        if (! is_string($item)) {
+            return false;
+        }
+        return $carry;
+    }
+
+    /**
+     * Assert that the provided header values are valid.
+     *
+     * @see http://tools.ietf.org/html/rfc7230#section-3.2
+     * @param string[] $values
+     * @throws InvalidArgumentException
+     */
+    private static function assertValidHeaderValue(array $values)
+    {
+        array_walk($values, __NAMESPACE__ . '\HeaderSecurity::assertValid');
+    }
+}
diff --git a/core/vendor/zendframework/zend-diactoros/src/PhpInputStream.php b/core/vendor/zendframework/zend-diactoros/src/PhpInputStream.php
new file mode 100644
index 000000000..a035234e0
--- /dev/null
+++ b/core/vendor/zendframework/zend-diactoros/src/PhpInputStream.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
+ * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Diactoros;
+
+/**
+ * Caching version of php://input
+ */
+class PhpInputStream extends Stream
+{
+    /**
+     * @var string
+     */
+    private $cache = '';
+
+    /**
+     * @var bool
+     */
+    private $reachedEof = false;
+
+    /**
+     * @param  string|resource $stream
+     * @param  string $mode
+     */
+    public function __construct($stream = 'php://input', $mode = 'r')
+    {
+        $mode = 'r';
+        parent::__construct($stream, $mode);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __toString()
+    {
+        if ($this->reachedEof) {
+            return $this->cache;
+        }
+
+        $this->getContents();
+        return $this->cache;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isWritable()
+    {
+        return false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function read($length)
+    {
+        $content = parent::read($length);
+        if ($content && ! $this->reachedEof) {
+            $this->cache .= $content;
+        }
+
+        if ($this->eof()) {
+            $this->reachedEof = true;
+        }
+
+        return $content;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getContents($maxLength = -1)
+    {
+        if ($this->reachedEof) {
+            return $this->cache;
+        }
+
+        $contents     = stream_get_contents($this->resource, $maxLength);
+        $this->cache .= $contents;
+
+        if ($maxLength === -1 || $this->eof()) {
+            $this->reachedEof = true;
+        }
+
+        return $contents;
+    }
+}
diff --git a/core/vendor/zendframework/zend-diactoros/src/RelativeStream.php b/core/vendor/zendframework/zend-diactoros/src/RelativeStream.php
new file mode 100644
index 000000000..f293d519e
--- /dev/null
+++ b/core/vendor/zendframework/zend-diactoros/src/RelativeStream.php
@@ -0,0 +1,168 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
+ * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Diactoros;
+
+use Psr\Http\Message\StreamInterface;
+
+/**
+ * Class RelativeStream
+ *
+ * Wrapper for default Stream class, representing subpart (starting from given offset) of initial stream.
+ * It can be used to avoid copying full stream, conserving memory.
+ * @example see Zend\Diactoros\AbstractSerializer::splitStream()
+ */
+final class RelativeStream implements StreamInterface
+{
+    /**
+     * @var StreamInterface
+     */
+    private $decoratedStream;
+
+    /**
+     * @var int
+     */
+    private $offset;
+
+    /**
+     * Class constructor
+     *
+     * @param StreamInterface $decoratedStream
+     * @param int $offset
+     */
+    public function __construct(StreamInterface $decoratedStream, $offset)
+    {
+        $this->decoratedStream = $decoratedStream;
+        $this->offset = (int)$offset;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __toString()
+    {
+        $this->seek(0);
+        return $this->getContents();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function close()
+    {
+        $this->decoratedStream->close();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function detach()
+    {
+        return $this->decoratedStream->detach();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getSize()
+    {
+        return $this->decoratedStream->getSize() - $this->offset;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function tell()
+    {
+        return $this->decoratedStream->tell() - $this->offset;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function eof()
+    {
+        return $this->decoratedStream->eof();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isSeekable()
+    {
+        return $this->decoratedStream->isSeekable();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function seek($offset, $whence = SEEK_SET)
+    {
+        if ($whence == SEEK_SET) {
+            return $this->decoratedStream->seek($offset + $this->offset, $whence);
+        }
+        return $this->decoratedStream->seek($offset, $whence);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function rewind()
+    {
+        return $this->seek(0);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isWritable()
+    {
+        return $this->decoratedStream->isWritable();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function write($string)
+    {
+        return $this->decoratedStream->write($string);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isReadable()
+    {
+        return $this->decoratedStream->isReadable();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function read($length)
+    {
+        return $this->decoratedStream->read($length);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getContents()
+    {
+        return $this->decoratedStream->getContents();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getMetadata($key = null)
+    {
+        return $this->decoratedStream->getMetadata($key);
+    }
+}
diff --git a/core/vendor/zendframework/zend-diactoros/src/Request.php b/core/vendor/zendframework/zend-diactoros/src/Request.php
new file mode 100644
index 000000000..6e00c2529
--- /dev/null
+++ b/core/vendor/zendframework/zend-diactoros/src/Request.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
+ * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Diactoros;
+
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\StreamInterface;
+
+/**
+ * HTTP Request encapsulation
+ *
+ * Requests are considered immutable; all methods that might change state are
+ * implemented such that they retain the internal state of the current
+ * message and return a new instance that contains the changed state.
+ */
+class Request implements RequestInterface
+{
+    use MessageTrait, RequestTrait;
+
+    /**
+     * @param null|string $uri URI for the request, if any.
+     * @param null|string $method HTTP method for the request, if any.
+     * @param string|resource|StreamInterface $body Message body, if any.
+     * @param array $headers Headers for the message, if any.
+     * @throws \InvalidArgumentException for any invalid value.
+     */
+    public function __construct($uri = null, $method = null, $body = 'php://temp', array $headers = [])
+    {
+        $this->initialize($uri, $method, $body, $headers);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getHeaders()
+    {
+        $headers = $this->headers;
+        if (! $this->hasHeader('host')
+            && ($this->uri && $this->uri->getHost())
+        ) {
+            $headers['Host'] = [$this->getHostFromUri()];
+        }
+
+        return $headers;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getHeader($header)
+    {
+        if (! $this->hasHeader($header)) {
+            if (strtolower($header) === 'host'
+                && ($this->uri && $this->uri->getHost())
+            ) {
+                return [$this->getHostFromUri()];
+            }
+
+            return [];
+        }
+
+        $header = $this->headerNames[strtolower($header)];
+        $value  = $this->headers[$header];
+        $value  = is_array($value) ? $value : [$value];
+
+        return $value;
+    }
+}
diff --git a/core/vendor/zendframework/zend-diactoros/src/Request/Serializer.php b/core/vendor/zendframework/zend-diactoros/src/Request/Serializer.php
new file mode 100644
index 000000000..d7c8d131b
--- /dev/null
+++ b/core/vendor/zendframework/zend-diactoros/src/Request/Serializer.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
+ * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Diactoros\Request;
+
+use InvalidArgumentException;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\StreamInterface;
+use UnexpectedValueException;
+use Zend\Diactoros\AbstractSerializer;
+use Zend\Diactoros\Request;
+use Zend\Diactoros\Stream;
+use Zend\Diactoros\Uri;
+
+/**
+ * Serialize (cast to string) or deserialize (cast string to Request) messages.
+ *
+ * This class provides functionality for serializing a RequestInterface instance
+ * to a string, as well as the reverse operation of creating a Request instance
+ * from a string/stream representing a message.
+ */
+final class Serializer extends AbstractSerializer
+{
+    /**
+     * Deserialize a request string to a request instance.
+     *
+     * Internally, casts the message to a stream and invokes fromStream().
+     *
+     * @param string $message
+     * @return Request
+     * @throws UnexpectedValueException when errors occur parsing the message.
+     */
+    public static function fromString($message)
+    {
+        $stream = new Stream('php://temp', 'wb+');
+        $stream->write($message);
+        return self::fromStream($stream);
+    }
+
+    /**
+     * Deserialize a request stream to a request instance.
+     *
+     * @param StreamInterface $stream
+     * @return Request
+     * @throws UnexpectedValueException when errors occur parsing the message.
+     */
+    public static function fromStream(StreamInterface $stream)
+    {
+        if (! $stream->isReadable() || ! $stream->isSeekable()) {
+            throw new InvalidArgumentException('Message stream must be both readable and seekable');
+        }
+
+        $stream->rewind();
+
+        list($method, $requestTarget, $version) = self::getRequestLine($stream);
+        $uri = self::createUriFromRequestTarget($requestTarget);
+
+        list($headers, $body) = self::splitStream($stream);
+
+        return (new Request($uri, $method, $body, $headers))
+            ->withProtocolVersion($version)
+            ->withRequestTarget($requestTarget);
+    }
+
+    /**
+     * Serialize a request message to a string.
+     *
+     * @param RequestInterface $request
+     * @return string
+     */
+    public static function toString(RequestInterface $request)
+    {
+        $headers = self::serializeHeaders($request->getHeaders());
+        $body    = (string) $request->getBody();
+        $format  = '%s %s HTTP/%s%s%s';
+
+        if (! empty($headers)) {
+            $headers = "\r\n" . $headers;
+        }
+        if (! empty($body)) {
+            $headers .= "\r\n\r\n";
+        }
+
+        return sprintf(
+            $format,
+            $request->getMethod(),
+            $request->getRequestTarget(),
+            $request->getProtocolVersion(),
+            $headers,
+            $body
+        );
+    }
+
+    /**
+     * Retrieve the components of the request line.
+     *
+     * Retrieves the first line of the stream and parses it, raising an
+     * exception if it does not follow specifications; if valid, returns a list
+     * with the method, target, and version, in that order.
+     *
+     * @param StreamInterface $stream
+     * @return array
+     */
+    private static function getRequestLine(StreamInterface $stream)
+    {
+        $requestLine = self::getLine($stream);
+
+        if (! preg_match(
+            '#^(?P<method>[!\#$%&\'*+.^_`|~a-zA-Z0-9-]+) (?P<target>[^\s]+) HTTP/(?P<version>[1-9]\d*\.\d+)$#',
+            $requestLine,
+            $matches
+        )) {
+            throw new UnexpectedValueException('Invalid request line detected');
+        }
+
+        return [$matches['method'], $matches['target'], $matches['version']];
+    }
+
+    /**
+     * Create and return a Uri instance based on the provided request target.
+     *
+     * If the request target is of authority or asterisk form, an empty Uri
+     * instance is returned; otherwise, the value is used to create and return
+     * a new Uri instance.
+     *
+     * @param string $requestTarget
+     * @return Uri
+     */
+    private static function createUriFromRequestTarget($requestTarget)
+    {
+        if (preg_match('#^https?://#', $requestTarget)) {
+            return new Uri($requestTarget);
+        }
+
+        if (preg_match('#^(\*|[^/])#', $requestTarget)) {
+            return new Uri();
+        }
+
+        return new Uri($requestTarget);
+    }
+}
diff --git a/core/vendor/zendframework/zend-diactoros/src/RequestTrait.php b/core/vendor/zendframework/zend-diactoros/src/RequestTrait.php
new file mode 100644
index 000000000..8a96762c9
--- /dev/null
+++ b/core/vendor/zendframework/zend-diactoros/src/RequestTrait.php
@@ -0,0 +1,309 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
+ * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Diactoros;
+
+use InvalidArgumentException;
+use Psr\Http\Message\StreamInterface;
+use Psr\Http\Message\UriInterface;
+
+/**
+ * Trait with common request behaviors.
+ *
+ * Server and client-side requests differ slightly in how the Host header is
+ * handled; on client-side, it should be calculated on-the-fly from the
+ * composed URI (if present), while on server-side, it will be calculated from
+ * the environment. As such, this trait exists to provide the common code
+ * between both client-side and server-side requests, and each can then
+ * use the headers functionality required by their implementations.
+ *
+ * @property array $headers
+ * @property array $headerNames
+ * @property StreamInterface $stream
+ * @method bool hasHeader(string $header)
+ */
+trait RequestTrait
+{
+    /**
+     * @var string
+     */
+    private $method = '';
+
+    /**
+     * The request-target, if it has been provided or calculated.
+     *
+     * @var null|string
+     */
+    private $requestTarget;
+
+    /**
+     * @var null|UriInterface
+     */
+    private $uri;
+
+    /**
+     * Initialize request state.
+     *
+     * Used by constructors.
+     *
+     * @param null|string $uri URI for the request, if any.
+     * @param null|string $method HTTP method for the request, if any.
+     * @param string|resource|StreamInterface $body Message body, if any.
+     * @param array $headers Headers for the message, if any.
+     * @throws InvalidArgumentException for any invalid value.
+     */
+    private function initialize($uri = null, $method = null, $body = 'php://memory', array $headers = [])
+    {
+        if (! $uri instanceof UriInterface && ! is_string($uri) && null !== $uri) {
+            throw new InvalidArgumentException(
+                'Invalid URI provided; must be null, a string, or a Psr\Http\Message\UriInterface instance'
+            );
+        }
+
+        $this->validateMethod($method);
+
+        if (! is_string($body) && ! is_resource($body) && ! $body instanceof StreamInterface) {
+            throw new InvalidArgumentException(
+                'Body must be a string stream resource identifier, '
+                . 'an actual stream resource, '
+                . 'or a Psr\Http\Message\StreamInterface implementation'
+            );
+        }
+
+        if (is_string($uri)) {
+            $uri = new Uri($uri);
+        }
+
+        $this->method = $method ?: '';
+        $this->uri    = $uri ?: new Uri();
+        $this->stream = ($body instanceof StreamInterface) ? $body : new Stream($body, 'r');
+
+        list($this->headerNames, $headers) = $this->filterHeaders($headers);
+        $this->assertHeaders($headers);
+        $this->headers = $headers;
+    }
+
+    /**
+     * Retrieves the message's request target.
+     *
+     * Retrieves the message's request-target either as it will appear (for
+     * clients), as it appeared at request (for servers), or as it was
+     * specified for the instance (see withRequestTarget()).
+     *
+     * In most cases, this will be the origin-form of the composed URI,
+     * unless a value was provided to the concrete implementation (see
+     * withRequestTarget() below).
+     *
+     * If no URI is available, and no request-target has been specifically
+     * provided, this method MUST return the string "/".
+     *
+     * @return string
+     */
+    public function getRequestTarget()
+    {
+        if (null !== $this->requestTarget) {
+            return $this->requestTarget;
+        }
+
+        if (! $this->uri) {
+            return '/';
+        }
+
+        $target = $this->uri->getPath();
+        if ($this->uri->getQuery()) {
+            $target .= '?' . $this->uri->getQuery();
+        }
+
+        if (empty($target)) {
+            $target = '/';
+        }
+
+        return $target;
+    }
+
+    /**
+     * Create a new instance with a specific request-target.
+     *
+     * If the request needs a non-origin-form request-target — e.g., for
+     * specifying an absolute-form, authority-form, or asterisk-form —
+     * this method may be used to create an instance with the specified
+     * request-target, verbatim.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return a new instance that has the
+     * changed request target.
+     *
+     * @link http://tools.ietf.org/html/rfc7230#section-2.7 (for the various
+     *     request-target forms allowed in request messages)
+     * @param mixed $requestTarget
+     * @return static
+     * @throws InvalidArgumentException if the request target is invalid.
+     */
+    public function withRequestTarget($requestTarget)
+    {
+        if (preg_match('#\s#', $requestTarget)) {
+            throw new InvalidArgumentException(
+                'Invalid request target provided; cannot contain whitespace'
+            );
+        }
+
+        $new = clone $this;
+        $new->requestTarget = $requestTarget;
+        return $new;
+    }
+
+    /**
+     * Retrieves the HTTP method of the request.
+     *
+     * @return string Returns the request method.
+     */
+    public function getMethod()
+    {
+        return $this->method;
+    }
+
+    /**
+     * Return an instance with the provided HTTP method.
+     *
+     * While HTTP method names are typically all uppercase characters, HTTP
+     * method names are case-sensitive and thus implementations SHOULD NOT
+     * modify the given string.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * changed request method.
+     *
+     * @param string $method Case-insensitive method.
+     * @return static
+     * @throws InvalidArgumentException for invalid HTTP methods.
+     */
+    public function withMethod($method)
+    {
+        $this->validateMethod($method);
+        $new = clone $this;
+        $new->method = $method;
+        return $new;
+    }
+
+    /**
+     * Retrieves the URI instance.
+     *
+     * This method MUST return a UriInterface instance.
+     *
+     * @link http://tools.ietf.org/html/rfc3986#section-4.3
+     * @return UriInterface Returns a UriInterface instance
+     *     representing the URI of the request, if any.
+     */
+    public function getUri()
+    {
+        return $this->uri;
+    }
+
+    /**
+     * Returns an instance with the provided URI.
+     *
+     * This method will update the Host header of the returned request by
+     * default if the URI contains a host component. If the URI does not
+     * contain a host component, any pre-existing Host header will be carried
+     * over to the returned request.
+     *
+     * You can opt-in to preserving the original state of the Host header by
+     * setting `$preserveHost` to `true`. When `$preserveHost` is set to
+     * `true`, the returned request will not update the Host header of the
+     * returned message -- even if the message contains no Host header. This
+     * means that a call to `getHeader('Host')` on the original request MUST
+     * equal the return value of a call to `getHeader('Host')` on the returned
+     * request.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * new UriInterface instance.
+     *
+     * @link http://tools.ietf.org/html/rfc3986#section-4.3
+     * @param UriInterface $uri New request URI to use.
+     * @param bool $preserveHost Preserve the original state of the Host header.
+     * @return static
+     */
+    public function withUri(UriInterface $uri, $preserveHost = false)
+    {
+        $new = clone $this;
+        $new->uri = $uri;
+
+        if ($preserveHost && $this->hasHeader('Host')) {
+            return $new;
+        }
+
+        if (! $uri->getHost()) {
+            return $new;
+        }
+
+        $host = $uri->getHost();
+        if ($uri->getPort()) {
+            $host .= ':' . $uri->getPort();
+        }
+
+        $new->headerNames['host'] = 'Host';
+        $new->headers['Host'] = [$host];
+
+        return $new;
+    }
+
+    /**
+     * Validate the HTTP method
+     *
+     * @param null|string $method
+     * @throws InvalidArgumentException on invalid HTTP method.
+     */
+    private function validateMethod($method)
+    {
+        if (null === $method) {
+            return;
+        }
+
+        if (! is_string($method)) {
+            throw new InvalidArgumentException(sprintf(
+                'Unsupported HTTP method; must be a string, received %s',
+                (is_object($method) ? get_class($method) : gettype($method))
+            ));
+        }
+
+        if (! preg_match('/^[!#$%&\'*+.^_`\|~0-9a-z-]+$/i', $method)) {
+            throw new InvalidArgumentException(sprintf(
+                'Unsupported HTTP method "%s" provided',
+                $method
+            ));
+        }
+    }
+
+    /**
+     * Retrieve the host from the URI instance
+     *
+     * @return string
+     */
+    private function getHostFromUri()
+    {
+        $host  = $this->uri->getHost();
+        $host .= $this->uri->getPort() ? ':' . $this->uri->getPort() : '';
+        return $host;
+    }
+
+    /**
+     * Ensure header names and values are valid.
+     *
+     * @param array $headers
+     * @throws InvalidArgumentException
+     */
+    private function assertHeaders(array $headers)
+    {
+        foreach ($headers as $name => $headerValues) {
+            HeaderSecurity::assertValidName($name);
+            array_walk($headerValues, __NAMESPACE__ . '\HeaderSecurity::assertValid');
+        }
+    }
+}
diff --git a/core/vendor/zendframework/zend-diactoros/src/Response.php b/core/vendor/zendframework/zend-diactoros/src/Response.php
new file mode 100644
index 000000000..ef250e6a0
--- /dev/null
+++ b/core/vendor/zendframework/zend-diactoros/src/Response.php
@@ -0,0 +1,202 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
+ * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Diactoros;
+
+use InvalidArgumentException;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\StreamInterface;
+
+/**
+ * HTTP response encapsulation.
+ *
+ * Responses are considered immutable; all methods that might change state are
+ * implemented such that they retain the internal state of the current
+ * message and return a new instance that contains the changed state.
+ */
+class Response implements ResponseInterface
+{
+    use MessageTrait;
+
+    /**
+     * Map of standard HTTP status code/reason phrases
+     *
+     * @var array
+     */
+    private $phrases = [
+        // INFORMATIONAL CODES
+        100 => 'Continue',
+        101 => 'Switching Protocols',
+        102 => 'Processing',
+        // SUCCESS CODES
+        200 => 'OK',
+        201 => 'Created',
+        202 => 'Accepted',
+        203 => 'Non-Authoritative Information',
+        204 => 'No Content',
+        205 => 'Reset Content',
+        206 => 'Partial Content',
+        207 => 'Multi-status',
+        208 => 'Already Reported',
+        // REDIRECTION CODES
+        300 => 'Multiple Choices',
+        301 => 'Moved Permanently',
+        302 => 'Found',
+        303 => 'See Other',
+        304 => 'Not Modified',
+        305 => 'Use Proxy',
+        306 => 'Switch Proxy', // Deprecated
+        307 => 'Temporary Redirect',
+        // CLIENT ERROR
+        400 => 'Bad Request',
+        401 => 'Unauthorized',
+        402 => 'Payment Required',
+        403 => 'Forbidden',
+        404 => 'Not Found',
+        405 => 'Method Not Allowed',
+        406 => 'Not Acceptable',
+        407 => 'Proxy Authentication Required',
+        408 => 'Request Time-out',
+        409 => 'Conflict',
+        410 => 'Gone',
+        411 => 'Length Required',
+        412 => 'Precondition Failed',
+        413 => 'Request Entity Too Large',
+        414 => 'Request-URI Too Large',
+        415 => 'Unsupported Media Type',
+        416 => 'Requested range not satisfiable',
+        417 => 'Expectation Failed',
+        418 => 'I\'m a teapot',
+        422 => 'Unprocessable Entity',
+        423 => 'Locked',
+        424 => 'Failed Dependency',
+        425 => 'Unordered Collection',
+        426 => 'Upgrade Required',
+        428 => 'Precondition Required',
+        429 => 'Too Many Requests',
+        431 => 'Request Header Fields Too Large',
+        // SERVER ERROR
+        500 => 'Internal Server Error',
+        501 => 'Not Implemented',
+        502 => 'Bad Gateway',
+        503 => 'Service Unavailable',
+        504 => 'Gateway Time-out',
+        505 => 'HTTP Version not supported',
+        506 => 'Variant Also Negotiates',
+        507 => 'Insufficient Storage',
+        508 => 'Loop Detected',
+        511 => 'Network Authentication Required',
+    ];
+
+    /**
+     * @var string
+     */
+    private $reasonPhrase = '';
+
+    /**
+     * @var int
+     */
+    private $statusCode = 200;
+
+    /**
+     * @param string|resource|StreamInterface $stream Stream identifier and/or actual stream resource
+     * @param int $status Status code for the response, if any.
+     * @param array $headers Headers for the response, if any.
+     * @throws InvalidArgumentException on any invalid element.
+     */
+    public function __construct($body = 'php://memory', $status = 200, array $headers = [])
+    {
+        if (! is_string($body) && ! is_resource($body) && ! $body instanceof StreamInterface) {
+            throw new InvalidArgumentException(
+                'Stream must be a string stream resource identifier, '
+                . 'an actual stream resource, '
+                . 'or a Psr\Http\Message\StreamInterface implementation'
+            );
+        }
+
+        if (null !== $status) {
+            $this->validateStatus($status);
+        }
+
+        $this->stream     = ($body instanceof StreamInterface) ? $body : new Stream($body, 'wb+');
+        $this->statusCode = $status ? (int) $status : 200;
+
+        list($this->headerNames, $headers) = $this->filterHeaders($headers);
+        $this->assertHeaders($headers);
+        $this->headers = $headers;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getStatusCode()
+    {
+        return $this->statusCode;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getReasonPhrase()
+    {
+        if (! $this->reasonPhrase
+            && isset($this->phrases[$this->statusCode])
+        ) {
+            $this->reasonPhrase = $this->phrases[$this->statusCode];
+        }
+
+        return $this->reasonPhrase;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function withStatus($code, $reasonPhrase = '')
+    {
+        $this->validateStatus($code);
+        $new = clone $this;
+        $new->statusCode   = (int) $code;
+        $new->reasonPhrase = $reasonPhrase;
+        return $new;
+    }
+
+    /**
+     * Validate a status code.
+     *
+     * @param int|string $code
+     * @throws InvalidArgumentException on an invalid status code.
+     */
+    private function validateStatus($code)
+    {
+        if (! is_numeric($code)
+            || is_float($code)
+            || $code < 100
+            || $code >= 600
+        ) {
+            throw new InvalidArgumentException(sprintf(
+                'Invalid status code "%s"; must be an integer between 100 and 599, inclusive',
+                (is_scalar($code) ? $code : gettype($code))
+            ));
+        }
+    }
+
+    /**
+     * Ensure header names and values are valid.
+     *
+     * @param array $headers
+     * @throws InvalidArgumentException
+     */
+    private function assertHeaders(array $headers)
+    {
+        foreach ($headers as $name => $headerValues) {
+            HeaderSecurity::assertValidName($name);
+            array_walk($headerValues, __NAMESPACE__ . '\HeaderSecurity::assertValid');
+        }
+    }
+}
diff --git a/core/vendor/zendframework/zend-diactoros/src/Response/EmitterInterface.php b/core/vendor/zendframework/zend-diactoros/src/Response/EmitterInterface.php
new file mode 100644
index 000000000..25ea7f397
--- /dev/null
+++ b/core/vendor/zendframework/zend-diactoros/src/Response/EmitterInterface.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
+ * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Diactoros\Response;
+
+use Psr\Http\Message\ResponseInterface;
+
+interface EmitterInterface
+{
+    /**
+     * Emit a response.
+     *
+     * Emits a response, including status line, headers, and the message body,
+     * according to the environment.
+     *
+     * Implementations of this method may be written in such a way as to have
+     * side effects, such as usage of header() or pushing output to the
+     * output buffer.
+     *
+     * Implementations MAY raise exceptions if they are unable to emit the
+     * response; e.g., if headers have already been sent.
+     *
+     * @param ResponseInterface $response
+     */
+    public function emit(ResponseInterface $response);
+}
diff --git a/core/vendor/zendframework/zend-diactoros/src/Response/EmptyResponse.php b/core/vendor/zendframework/zend-diactoros/src/Response/EmptyResponse.php
new file mode 100644
index 000000000..911030694
--- /dev/null
+++ b/core/vendor/zendframework/zend-diactoros/src/Response/EmptyResponse.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
+ * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Diactoros\Response;
+
+use Zend\Diactoros\Response;
+use Zend\Diactoros\Stream;
+
+/**
+ * A class representing empty HTTP responses.
+ */
+class EmptyResponse extends Response
+{
+    /**
+     * Create an empty response with the given status code.
+     *
+     * @param int $status Status code for the response, if any.
+     * @param array $headers Headers for the response, if any.
+     */
+    public function __construct($status = 204, array $headers = [])
+    {
+        $body = new Stream('php://temp', 'r');
+        parent::__construct($body, $status, $headers);
+    }
+
+    /**
+     * Create an empty response with the given headers.
+     *
+     * @param array $headers Headers for the response.
+     * @return EmptyResponse
+     */
+    public static function withHeaders(array $headers)
+    {
+        return new static(204, $headers);
+    }
+}
diff --git a/core/vendor/zendframework/zend-diactoros/src/Response/HtmlResponse.php b/core/vendor/zendframework/zend-diactoros/src/Response/HtmlResponse.php
new file mode 100644
index 000000000..d298ee01e
--- /dev/null
+++ b/core/vendor/zendframework/zend-diactoros/src/Response/HtmlResponse.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
+ * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Diactoros\Response;
+
+use InvalidArgumentException;
+use Psr\Http\Message\StreamInterface;
+use Zend\Diactoros\Response;
+use Zend\Diactoros\Stream;
+
+/**
+ * HTML response.
+ *
+ * Allows creating a response by passing an HTML string to the constructor;
+ * by default, sets a status code of 200 and sets the Content-Type header to
+ * text/html.
+ */
+class HtmlResponse extends Response
+{
+    use InjectContentTypeTrait;
+
+    /**
+     * Create an HTML response.
+     *
+     * Produces an HTML response with a Content-Type of text/html and a default
+     * status of 200.
+     *
+     * @param string|StreamInterface $html HTML or stream for the message body.
+     * @param int $status Integer status code for the response; 200 by default.
+     * @param array $headers Array of headers to use at initialization.
+     * @throws InvalidArgumentException if $html is neither a string or stream.
+     */
+    public function __construct($html, $status = 200, array $headers = [])
+    {
+        parent::__construct(
+            $this->createBody($html),
+            $status,
+            $this->injectContentType('text/html', $headers)
+        );
+    }
+
+    /**
+     * Create the message body.
+     *
+     * @param string|StreamInterface $html
+     * @return StreamInterface
+     * @throws InvalidArgumentException if $html is neither a string or stream.
+     */
+    private function createBody($html)
+    {
+        if ($html instanceof StreamInterface) {
+            return $html;
+        }
+
+        if (! is_string($html)) {
+            throw new InvalidArgumentException(sprintf(
+                'Invalid content (%s) provided to %s',
+                (is_object($html) ? get_class($html) : gettype($html)),
+                __CLASS__
+            ));
+        }
+
+        $body = new Stream('php://temp', 'wb+');
+        $body->write($html);
+        return $body;
+    }
+}
diff --git a/core/vendor/zendframework/zend-diactoros/src/Response/InjectContentTypeTrait.php b/core/vendor/zendframework/zend-diactoros/src/Response/InjectContentTypeTrait.php
new file mode 100644
index 000000000..00fd21716
--- /dev/null
+++ b/core/vendor/zendframework/zend-diactoros/src/Response/InjectContentTypeTrait.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
+ * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Diactoros\Response;
+
+trait InjectContentTypeTrait
+{
+    /**
+     * Inject the provided Content-Type, if none is already present.
+     *
+     * @param string $contentType
+     * @param array $headers
+     * @return array Headers with injected Content-Type
+     */
+    private function injectContentType($contentType, array $headers)
+    {
+        $hasContentType = array_reduce(array_keys($headers), function ($carry, $item) {
+            return $carry ?: (strtolower($item) === 'content-type');
+        }, false);
+
+        if (! $hasContentType) {
+            $headers['content-type'] = [$contentType];
+        }
+
+        return $headers;
+    }
+}
diff --git a/core/vendor/zendframework/zend-diactoros/src/Response/JsonResponse.php b/core/vendor/zendframework/zend-diactoros/src/Response/JsonResponse.php
new file mode 100644
index 000000000..fc508089d
--- /dev/null
+++ b/core/vendor/zendframework/zend-diactoros/src/Response/JsonResponse.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
+ * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Diactoros\Response;
+
+use ArrayObject;
+use InvalidArgumentException;
+use Zend\Diactoros\Response;
+use Zend\Diactoros\Stream;
+
+/**
+ * HTML response.
+ *
+ * Allows creating a response by passing an HTML string to the constructor;
+ * by default, sets a status code of 200 and sets the Content-Type header to
+ * text/html.
+ */
+class JsonResponse extends Response
+{
+    use InjectContentTypeTrait;
+
+    /**
+     * Create a JSON response with the given array of data.
+     *
+     * If the data provided is null, an empty ArrayObject is used; if the data
+     * is scalar, it is cast to an array prior to serialization.
+     *
+     * Default JSON encoding is performed with the following options, which
+     * produces RFC4627-compliant JSON, capable of embedding into HTML.
+     *
+     * - JSON_HEX_TAG
+     * - JSON_HEX_APOS
+     * - JSON_HEX_AMP
+     * - JSON_HEX_QUOT
+     *
+     * @param string $data Data to convert to JSON.
+     * @param int $status Integer status code for the response; 200 by default.
+     * @param array $headers Array of headers to use at initialization.
+     * @param int $encodingOptions JSON encoding options to use.
+     * @throws InvalidArgumentException if unable to encode the $data to JSON.
+     */
+    public function __construct($data, $status = 200, array $headers = [], $encodingOptions = 15)
+    {
+        $body = new Stream('php://temp', 'wb+');
+        $body->write($this->jsonEncode($data, $encodingOptions));
+
+        $headers = $this->injectContentType('application/json', $headers);
+
+        parent::__construct($body, $status, $headers);
+    }
+
+    /**
+     * Encode the provided data to JSON.
+     *
+     * @param mixed $data
+     * @param int $encodingOptions
+     * @return string
+     * @throws InvalidArgumentException if unable to encode the $data to JSON.
+     */
+    private function jsonEncode($data, $encodingOptions)
+    {
+        if (is_resource($data)) {
+            throw new InvalidArgumentException('Cannot JSON encode resources');
+        }
+
+        if ($data === null) {
+            // Use an ArrayObject to force an empty JSON object.
+            $data = new ArrayObject();
+        }
+
+        if (is_scalar($data)) {
+            $data = (array) $data;
+        }
+
+        // Clear json_last_error()
+        json_encode(null);
+
+        $json = json_encode($data, $encodingOptions);
+
+        if (JSON_ERROR_NONE !== json_last_error()) {
+            throw new InvalidArgumentException(sprintf(
+                'Unable to encode data to JSON in %s: %s',
+                __CLASS__,
+                json_last_error_msg()
+            ));
+        }
+
+        return $json;
+    }
+}
diff --git a/core/vendor/zendframework/zend-diactoros/src/Response/RedirectResponse.php b/core/vendor/zendframework/zend-diactoros/src/Response/RedirectResponse.php
new file mode 100644
index 000000000..26911f0ae
--- /dev/null
+++ b/core/vendor/zendframework/zend-diactoros/src/Response/RedirectResponse.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
+ * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Diactoros\Response;
+
+use InvalidArgumentException;
+use Psr\Http\Message\UriInterface;
+use Zend\Diactoros\Response;
+use Zend\Diactoros\Stream;
+
+/**
+ * Produce a redirect response.
+ */
+class RedirectResponse extends Response
+{
+    /**
+     * Create a redirect response.
+     *
+     * Produces a redirect response with a Location header and the given status
+     * (302 by default).
+     *
+     * Note: this method overwrites the `location` $headers value.
+     *
+     * @param string|UriInterface $uri URI for the Location header.
+     * @param int $status Integer status code for the redirect; 302 by default.
+     * @param array $headers Array of headers to use at initialization.
+     */
+    public function __construct($uri, $status = 302, array $headers = [])
+    {
+        if (! is_string($uri) && ! $uri instanceof UriInterface) {
+            throw new InvalidArgumentException(sprintf(
+                'Uri provided to %s MUST be a string or Psr\Http\Message\UriInterface instance; received "%s"',
+                __CLASS__,
+                (is_object($uri) ? get_class($uri) : gettype($uri))
+            ));
+        }
+
+        $headers['location'] = [(string) $uri];
+        parent::__construct('php://temp', $status, $headers);
+    }
+}
diff --git a/core/vendor/zendframework/zend-diactoros/src/Response/SapiEmitter.php b/core/vendor/zendframework/zend-diactoros/src/Response/SapiEmitter.php
new file mode 100644
index 000000000..bba291e30
--- /dev/null
+++ b/core/vendor/zendframework/zend-diactoros/src/Response/SapiEmitter.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
+ * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Diactoros\Response;
+
+use Psr\Http\Message\ResponseInterface;
+use RuntimeException;
+
+class SapiEmitter implements EmitterInterface
+{
+    /**
+     * Emits a response for a PHP SAPI environment.
+     *
+     * Emits the status line and headers via the header() function, and the
+     * body content via the output buffer.
+     *
+     * @param ResponseInterface $response
+     * @param null|int $maxBufferLevel Maximum output buffering level to unwrap.
+     */
+    public function emit(ResponseInterface $response, $maxBufferLevel = null)
+    {
+        if (headers_sent()) {
+            throw new RuntimeException('Unable to emit response; headers already sent');
+        }
+
+        $this->emitStatusLine($response);
+        $this->emitHeaders($response);
+        $this->emitBody($response, $maxBufferLevel);
+    }
+
+    /**
+     * Emit the status line.
+     *
+     * Emits the status line using the protocol version and status code from
+     * the response; if a reason phrase is availble, it, too, is emitted.
+     *
+     * @param ResponseInterface $response
+     */
+    private function emitStatusLine(ResponseInterface $response)
+    {
+        $reasonPhrase = $response->getReasonPhrase();
+        header(sprintf(
+            'HTTP/%s %d%s',
+            $response->getProtocolVersion(),
+            $response->getStatusCode(),
+            ($reasonPhrase ? ' ' . $reasonPhrase : '')
+        ));
+    }
+
+    /**
+     * Emit response headers.
+     *
+     * Loops through each header, emitting each; if the header value
+     * is an array with multiple values, ensures that each is sent
+     * in such a way as to create aggregate headers (instead of replace
+     * the previous).
+     *
+     * @param ResponseInterface $response
+     */
+    private function emitHeaders(ResponseInterface $response)
+    {
+        foreach ($response->getHeaders() as $header => $values) {
+            $name  = $this->filterHeader($header);
+            $first = true;
+            foreach ($values as $value) {
+                header(sprintf(
+                    '%s: %s',
+                    $name,
+                    $value
+                ), $first);
+                $first = false;
+            }
+        }
+    }
+
+    /**
+     * Emit the message body.
+     *
+     * Loops through the output buffer, flushing each, before emitting
+     * the response body using `echo()`.
+     *
+     * @param ResponseInterface $response
+     * @param int $maxBufferLevel Flush up to this buffer level.
+     */
+    private function emitBody(ResponseInterface $response, $maxBufferLevel)
+    {
+        if (null === $maxBufferLevel) {
+            $maxBufferLevel = ob_get_level();
+        }
+
+        while (ob_get_level() > $maxBufferLevel) {
+            ob_end_flush();
+        }
+
+        echo $response->getBody();
+    }
+
+    /**
+     * Filter a header name to wordcase
+     *
+     * @param string $header
+     * @return string
+     */
+    private function filterHeader($header)
+    {
+        $filtered = str_replace('-', ' ', $header);
+        $filtered = ucwords($filtered);
+        return str_replace(' ', '-', $filtered);
+    }
+}
diff --git a/core/vendor/zendframework/zend-diactoros/src/Response/Serializer.php b/core/vendor/zendframework/zend-diactoros/src/Response/Serializer.php
new file mode 100644
index 000000000..8da835da9
--- /dev/null
+++ b/core/vendor/zendframework/zend-diactoros/src/Response/Serializer.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
+ * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Diactoros\Response;
+
+use InvalidArgumentException;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\StreamInterface;
+use UnexpectedValueException;
+use Zend\Diactoros\AbstractSerializer;
+use Zend\Diactoros\Response;
+use Zend\Diactoros\Stream;
+
+final class Serializer extends AbstractSerializer
+{
+    /**
+     * Deserialize a response string to a response instance.
+     *
+     * @param string $message
+     * @return Response
+     * @throws UnexpectedValueException when errors occur parsing the message.
+     */
+    public static function fromString($message)
+    {
+        $stream = new Stream('php://temp', 'wb+');
+        $stream->write($message);
+        return static::fromStream($stream);
+    }
+
+    /**
+     * Parse a response from a stream.
+     *
+     * @param StreamInterface $stream
+     * @return ResponseInterface
+     * @throws InvalidArgumentException when the stream is not readable.
+     * @throws UnexpectedValueException when errors occur parsing the message.
+     */
+    public static function fromStream(StreamInterface $stream)
+    {
+        if (! $stream->isReadable() || ! $stream->isSeekable()) {
+            throw new InvalidArgumentException('Message stream must be both readable and seekable');
+        }
+
+        $stream->rewind();
+
+        list($version, $status, $reasonPhrase) = self::getStatusLine($stream);
+        list($headers, $body)                  = self::splitStream($stream);
+
+        return (new Response($body, $status, $headers))
+            ->withProtocolVersion($version)
+            ->withStatus($status, $reasonPhrase);
+    }
+
+    /**
+     * Create a string representation of a response.
+     *
+     * @param ResponseInterface $response
+     * @return string
+     */
+    public static function toString(ResponseInterface $response)
+    {
+        $reasonPhrase = $response->getReasonPhrase();
+        $headers      = self::serializeHeaders($response->getHeaders());
+        $body         = (string) $response->getBody();
+        $format       = 'HTTP/%s %d%s%s%s';
+
+        if (! empty($headers)) {
+            $headers = "\r\n" . $headers;
+        }
+        if (! empty($body)) {
+            $headers .= "\r\n\r\n";
+        }
+
+        return sprintf(
+            $format,
+            $response->getProtocolVersion(),
+            $response->getStatusCode(),
+            ($reasonPhrase ? ' ' . $reasonPhrase : ''),
+            $headers,
+            $body
+        );
+    }
+
+    /**
+     * Retrieve the status line for the message.
+     *
+     * @param StreamInterface $stream
+     * @return array Array with three elements: 0 => version, 1 => status, 2 => reason
+     * @throws UnexpectedValueException if line is malformed
+     */
+    private static function getStatusLine(StreamInterface $stream)
+    {
+        $line = self::getLine($stream);
+
+        if (! preg_match(
+            '#^HTTP/(?P<version>[1-9]\d*\.\d) (?P<status>[1-5]\d{2})(\s+(?P<reason>.+))?$#',
+            $line,
+            $matches
+        )) {
+            throw new UnexpectedValueException('No status line detected');
+        }
+
+        return [$matches['version'], $matches['status'], isset($matches['reason']) ? $matches['reason'] : ''];
+    }
+}
diff --git a/core/vendor/zendframework/zend-diactoros/src/Server.php b/core/vendor/zendframework/zend-diactoros/src/Server.php
new file mode 100644
index 000000000..e3c9b3088
--- /dev/null
+++ b/core/vendor/zendframework/zend-diactoros/src/Server.php
@@ -0,0 +1,188 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
+ * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Diactoros;
+
+use OutOfBoundsException;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\ResponseInterface;
+
+/**
+ * "Serve" incoming HTTP requests
+ *
+ * Given a callback, takes an incoming request, dispatches it to the
+ * callback, and then sends a response.
+ */
+class Server
+{
+    /**
+     * @var callable
+     */
+    private $callback;
+
+    /**
+     * Response emitter to use; by default, uses Response\SapiEmitter.
+     *
+     * @var Response\EmitterInterface
+     */
+    private $emitter;
+
+    /**
+     * @var ServerRequestInterface
+     */
+    private $request;
+
+    /**
+     * @var ResponseInterface
+     */
+    private $response;
+
+    /**
+     * Constructor
+     *
+     * Given a callback, a request, and a response, we can create a server.
+     *
+     * @param callable $callback
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     */
+    public function __construct(
+        callable $callback,
+        ServerRequestInterface $request,
+        ResponseInterface $response
+    ) {
+        $this->callback = $callback;
+        $this->request  = $request;
+        $this->response = $response;
+    }
+
+    /**
+     * Allow retrieving the request, response and callback as properties
+     *
+     * @param string $name
+     * @return mixed
+     * @throws OutOfBoundsException for invalid properties
+     */
+    public function __get($name)
+    {
+        if (! property_exists($this, $name)) {
+            throw new OutOfBoundsException('Cannot retrieve arbitrary properties from server');
+        }
+        return $this->{$name};
+    }
+
+    /**
+     * Set alternate response emitter to use.
+     *
+     * @param Response\EmitterInterface $emitter
+     */
+    public function setEmitter(Response\EmitterInterface $emitter)
+    {
+        $this->emitter = $emitter;
+    }
+
+    /**
+     * Create a Server instance
+     *
+     * Creates a server instance from the callback and the following
+     * PHP environmental values:
+     *
+     * - server; typically this will be the $_SERVER superglobal
+     * - query; typically this will be the $_GET superglobal
+     * - body; typically this will be the $_POST superglobal
+     * - cookies; typically this will be the $_COOKIE superglobal
+     * - files; typically this will be the $_FILES superglobal
+     *
+     * @param callable $callback
+     * @param array $server
+     * @param array $query
+     * @param array $body
+     * @param array $cookies
+     * @param array $files
+     * @return static
+     */
+    public static function createServer(
+        callable $callback,
+        array $server,
+        array $query,
+        array $body,
+        array $cookies,
+        array $files
+    ) {
+        $request  = ServerRequestFactory::fromGlobals($server, $query, $body, $cookies, $files);
+        $response = new Response();
+        return new static($callback, $request, $response);
+    }
+
+    /**
+     * Create a Server instance from an existing request object
+     *
+     * Provided a callback, an existing request object, and optionally an
+     * existing response object, create and return the Server instance.
+     *
+     * If no Response object is provided, one will be created.
+     *
+     * @param callable $callback
+     * @param ServerRequestInterface $request
+     * @param null|ResponseInterface $response
+     * @return static
+     */
+    public static function createServerFromRequest(
+        callable $callback,
+        ServerRequestInterface $request,
+        ResponseInterface $response = null
+    ) {
+        if (! $response) {
+            $response = new Response();
+        }
+        return new static($callback, $request, $response);
+    }
+
+    /**
+     * "Listen" to an incoming request
+     *
+     * If provided a $finalHandler, that callable will be used for
+     * incomplete requests.
+     *
+     * Output buffering is enabled prior to invoking the attached
+     * callback; any output buffered will be sent prior to any
+     * response body content.
+     *
+     * @param null|callable $finalHandler
+     */
+    public function listen(callable $finalHandler = null)
+    {
+        $callback = $this->callback;
+
+        ob_start();
+        $bufferLevel = ob_get_level();
+
+        $response = $callback($this->request, $this->response, $finalHandler);
+        if (! $response instanceof ResponseInterface) {
+            $response = $this->response;
+        }
+        $this->getEmitter()->emit($response, $bufferLevel);
+    }
+
+    /**
+     * Retrieve the current response emitter.
+     *
+     * If none has been registered, lazy-loads a Response\SapiEmitter.
+     *
+     * @return Response\EmitterInterface
+     */
+    private function getEmitter()
+    {
+        if (! $this->emitter) {
+            $this->emitter = new Response\SapiEmitter();
+        }
+
+        return $this->emitter;
+    }
+}
diff --git a/core/vendor/zendframework/zend-diactoros/src/ServerRequest.php b/core/vendor/zendframework/zend-diactoros/src/ServerRequest.php
new file mode 100644
index 000000000..67a04b40b
--- /dev/null
+++ b/core/vendor/zendframework/zend-diactoros/src/ServerRequest.php
@@ -0,0 +1,297 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
+ * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Diactoros;
+
+use InvalidArgumentException;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\StreamInterface;
+use Psr\Http\Message\UploadedFileInterface;
+
+/**
+ * Server-side HTTP request
+ *
+ * Extends the Request definition to add methods for accessing incoming data,
+ * specifically server parameters, cookies, matched path parameters, query
+ * string arguments, body parameters, and upload file information.
+ *
+ * "Attributes" are discovered via decomposing the request (and usually
+ * specifically the URI path), and typically will be injected by the application.
+ *
+ * Requests are considered immutable; all methods that might change state are
+ * implemented such that they retain the internal state of the current
+ * message and return a new instance that contains the changed state.
+ */
+class ServerRequest implements ServerRequestInterface
+{
+    use MessageTrait, RequestTrait;
+
+    /**
+     * @var array
+     */
+    private $attributes = [];
+
+    /**
+     * @var array
+     */
+    private $cookieParams = [];
+
+    /**
+     * @var null|array|object
+     */
+    private $parsedBody;
+
+    /**
+     * @var array
+     */
+    private $queryParams = [];
+
+    /**
+     * @var array
+     */
+    private $serverParams;
+
+    /**
+     * @var array
+     */
+    private $uploadedFiles;
+
+    /**
+     * @param array $serverParams Server parameters, typically from $_SERVER
+     * @param array $uploadedFiles Upload file information, a tree of UploadedFiles
+     * @param null|string $uri URI for the request, if any.
+     * @param null|string $method HTTP method for the request, if any.
+     * @param string|resource|StreamInterface $body Message body, if any.
+     * @param array $headers Headers for the message, if any.
+     * @throws InvalidArgumentException for any invalid value.
+     */
+    public function __construct(
+        array $serverParams = [],
+        array $uploadedFiles = [],
+        $uri = null,
+        $method = null,
+        $body = 'php://input',
+        array $headers = []
+    ) {
+        $this->validateUploadedFiles($uploadedFiles);
+
+        $body = $this->getStream($body);
+        $this->initialize($uri, $method, $body, $headers);
+        $this->serverParams  = $serverParams;
+        $this->uploadedFiles = $uploadedFiles;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getServerParams()
+    {
+        return $this->serverParams;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getUploadedFiles()
+    {
+        return $this->uploadedFiles;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function withUploadedFiles(array $uploadedFiles)
+    {
+        $this->validateUploadedFiles($uploadedFiles);
+        $new = clone $this;
+        $new->uploadedFiles = $uploadedFiles;
+        return $new;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getCookieParams()
+    {
+        return $this->cookieParams;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function withCookieParams(array $cookies)
+    {
+        $new = clone $this;
+        $new->cookieParams = $cookies;
+        return $new;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getQueryParams()
+    {
+        return $this->queryParams;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function withQueryParams(array $query)
+    {
+        $new = clone $this;
+        $new->queryParams = $query;
+        return $new;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getParsedBody()
+    {
+        return $this->parsedBody;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function withParsedBody($data)
+    {
+        $new = clone $this;
+        $new->parsedBody = $data;
+        return $new;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAttributes()
+    {
+        return $this->attributes;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAttribute($attribute, $default = null)
+    {
+        if (! array_key_exists($attribute, $this->attributes)) {
+            return $default;
+        }
+
+        return $this->attributes[$attribute];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function withAttribute($attribute, $value)
+    {
+        $new = clone $this;
+        $new->attributes[$attribute] = $value;
+        return $new;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function withoutAttribute($attribute)
+    {
+        if (! isset($this->attributes[$attribute])) {
+            return clone $this;
+        }
+
+        $new = clone $this;
+        unset($new->attributes[$attribute]);
+        return $new;
+    }
+
+    /**
+     * Proxy to receive the request method.
+     *
+     * This overrides the parent functionality to ensure the method is never
+     * empty; if no method is present, it returns 'GET'.
+     *
+     * @return string
+     */
+    public function getMethod()
+    {
+        if (empty($this->method)) {
+            return 'GET';
+        }
+        return $this->method;
+    }
+
+    /**
+     * Set the request method.
+     *
+     * Unlike the regular Request implementation, the server-side
+     * normalizes the method to uppercase to ensure consistency
+     * and make checking the method simpler.
+     *
+     * This methods returns a new instance.
+     *
+     * @param string $method
+     * @return self
+     */
+    public function withMethod($method)
+    {
+        $this->validateMethod($method);
+        $new = clone $this;
+        $new->method = $method;
+        return $new;
+    }
+
+    /**
+     * Set the body stream
+     *
+     * @param string|resource|StreamInterface $stream
+     * @return StreamInterface
+     */
+    private function getStream($stream)
+    {
+        if ($stream === 'php://input') {
+            return new PhpInputStream();
+        }
+
+        if (! is_string($stream) && ! is_resource($stream) && ! $stream instanceof StreamInterface) {
+            throw new InvalidArgumentException(
+                'Stream must be a string stream resource identifier, '
+                . 'an actual stream resource, '
+                . 'or a Psr\Http\Message\StreamInterface implementation'
+            );
+        }
+
+        if (! $stream instanceof StreamInterface) {
+            return new Stream($stream, 'r');
+        }
+
+        return $stream;
+    }
+
+    /**
+     * Recursively validate the structure in an uploaded files array.
+     *
+     * @param array $uploadedFiles
+     * @throws InvalidArgumentException if any leaf is not an UploadedFileInterface instance.
+     */
+    private function validateUploadedFiles(array $uploadedFiles)
+    {
+        foreach ($uploadedFiles as $file) {
+            if (is_array($file)) {
+                $this->validateUploadedFiles($file);
+                continue;
+            }
+
+            if (! $file instanceof UploadedFileInterface) {
+                throw new InvalidArgumentException('Invalid leaf in uploaded files structure');
+            }
+        }
+    }
+}
diff --git a/core/vendor/zendframework/zend-diactoros/src/ServerRequestFactory.php b/core/vendor/zendframework/zend-diactoros/src/ServerRequestFactory.php
new file mode 100644
index 000000000..e23dfe58b
--- /dev/null
+++ b/core/vendor/zendframework/zend-diactoros/src/ServerRequestFactory.php
@@ -0,0 +1,458 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
+ * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Diactoros;
+
+use InvalidArgumentException;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\MessageInterface;
+use Psr\Http\Message\UploadedFileInterface;
+use stdClass;
+
+/**
+ * Class for marshaling a request object from the current PHP environment.
+ *
+ * Logic largely refactored from the ZF2 Zend\Http\PhpEnvironment\Request class.
+ *
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+abstract class ServerRequestFactory
+{
+    /**
+     * Function to use to get apache request headers; present only to simplify mocking.
+     *
+     * @var callable
+     */
+    private static $apacheRequestHeaders = 'apache_request_headers';
+
+    /**
+     * Create a request from the supplied superglobal values.
+     *
+     * If any argument is not supplied, the corresponding superglobal value will
+     * be used.
+     *
+     * The ServerRequest created is then passed to the fromServer() method in
+     * order to marshal the request URI and headers.
+     *
+     * @see fromServer()
+     * @param array $server $_SERVER superglobal
+     * @param array $query $_GET superglobal
+     * @param array $body $_POST superglobal
+     * @param array $cookies $_COOKIE superglobal
+     * @param array $files $_FILES superglobal
+     * @return ServerRequest
+     * @throws InvalidArgumentException for invalid file values
+     */
+    public static function fromGlobals(
+        array $server = null,
+        array $query = null,
+        array $body = null,
+        array $cookies = null,
+        array $files = null
+    ) {
+        $server  = static::normalizeServer($server ?: $_SERVER);
+        $files   = static::normalizeFiles($files ?: $_FILES);
+        $headers = static::marshalHeaders($server);
+        $request = new ServerRequest(
+            $server,
+            $files,
+            static::marshalUriFromServer($server, $headers),
+            static::get('REQUEST_METHOD', $server, 'GET'),
+            'php://input',
+            $headers
+        );
+
+        return $request
+            ->withCookieParams($cookies ?: $_COOKIE)
+            ->withQueryParams($query ?: $_GET)
+            ->withParsedBody($body ?: $_POST);
+    }
+
+    /**
+     * Access a value in an array, returning a default value if not found
+     *
+     * Will also do a case-insensitive search if a case sensitive search fails.
+     *
+     * @param string $key
+     * @param array $values
+     * @param mixed $default
+     * @return mixed
+     */
+    public static function get($key, array $values, $default = null)
+    {
+        if (array_key_exists($key, $values)) {
+            return $values[$key];
+        }
+
+        return $default;
+    }
+
+    /**
+     * Search for a header value.
+     *
+     * Does a case-insensitive search for a matching header.
+     *
+     * If found, it is returned as a string, using comma concatenation.
+     *
+     * If not, the $default is returned.
+     *
+     * @param string $header
+     * @param array $headers
+     * @param mixed $default
+     * @return string
+     */
+    public static function getHeader($header, array $headers, $default = null)
+    {
+        $header  = strtolower($header);
+        $headers = array_change_key_case($headers, CASE_LOWER);
+        if (array_key_exists($header, $headers)) {
+            $value = is_array($headers[$header]) ? implode(', ', $headers[$header]) : $headers[$header];
+            return $value;
+        }
+
+        return $default;
+    }
+
+    /**
+     * Marshal the $_SERVER array
+     *
+     * Pre-processes and returns the $_SERVER superglobal.
+     *
+     * @param array $server
+     * @return array
+     */
+    public static function normalizeServer(array $server)
+    {
+        // This seems to be the only way to get the Authorization header on Apache
+        $apacheRequestHeaders = self::$apacheRequestHeaders;
+        if (isset($server['HTTP_AUTHORIZATION'])
+            || ! is_callable($apacheRequestHeaders)
+        ) {
+            return $server;
+        }
+
+        $apacheRequestHeaders = $apacheRequestHeaders();
+        if (isset($apacheRequestHeaders['Authorization'])) {
+            $server['HTTP_AUTHORIZATION'] = $apacheRequestHeaders['Authorization'];
+            return $server;
+        }
+
+        if (isset($apacheRequestHeaders['authorization'])) {
+            $server['HTTP_AUTHORIZATION'] = $apacheRequestHeaders['authorization'];
+            return $server;
+        }
+
+        return $server;
+    }
+
+    /**
+     * Normalize uploaded files
+     *
+     * Transforms each value into an UploadedFileInterface instance, and ensures
+     * that nested arrays are normalized.
+     *
+     * @param array $files
+     * @return array
+     * @throws InvalidArgumentException for unrecognized values
+     */
+    public static function normalizeFiles(array $files)
+    {
+        $normalized = [];
+        foreach ($files as $key => $value) {
+            if ($value instanceof UploadedFileInterface) {
+                $normalized[$key] = $value;
+                continue;
+            }
+
+            if (is_array($value) && isset($value['tmp_name'])) {
+                $normalized[$key] = self::createUploadedFileFromSpec($value);
+                continue;
+            }
+
+            if (is_array($value)) {
+                $normalized[$key] = self::normalizeFiles($value);
+                continue;
+            }
+
+            throw new InvalidArgumentException('Invalid value in files specification');
+        }
+        return $normalized;
+    }
+
+    /**
+     * Marshal headers from $_SERVER
+     *
+     * @param array $server
+     * @return array
+     */
+    public static function marshalHeaders(array $server)
+    {
+        $headers = [];
+        foreach ($server as $key => $value) {
+            if (strpos($key, 'HTTP_COOKIE') === 0) {
+                // Cookies are handled using the $_COOKIE superglobal
+                continue;
+            }
+
+            if ($value && strpos($key, 'HTTP_') === 0) {
+                $name = strtr(substr($key, 5), '_', ' ');
+                $name = strtr(ucwords(strtolower($name)), ' ', '-');
+                $name = strtolower($name);
+
+                $headers[$name] = $value;
+                continue;
+            }
+
+            if ($value && strpos($key, 'CONTENT_') === 0) {
+                $name = substr($key, 8); // Content-
+                $name = 'Content-' . (($name == 'MD5') ? $name : ucfirst(strtolower($name)));
+                $name = strtolower($name);
+                $headers[$name] = $value;
+                continue;
+            }
+        }
+
+        return $headers;
+    }
+
+    /**
+     * Marshal the URI from the $_SERVER array and headers
+     *
+     * @param array $server
+     * @param array $headers
+     * @return Uri
+     */
+    public static function marshalUriFromServer(array $server, array $headers)
+    {
+        $uri = new Uri('');
+
+        // URI scheme
+        $scheme = 'http';
+        $https  = self::get('HTTPS', $server);
+        if (($https && 'off' !== $https)
+            || self::getHeader('x-forwarded-proto', $headers, false) === 'https'
+        ) {
+            $scheme = 'https';
+        }
+        if (! empty($scheme)) {
+            $uri = $uri->withScheme($scheme);
+        }
+
+        // Set the host
+        $accumulator = (object) ['host' => '', 'port' => null];
+        self::marshalHostAndPortFromHeaders($accumulator, $server, $headers);
+        $host = $accumulator->host;
+        $port = $accumulator->port;
+        if (! empty($host)) {
+            $uri = $uri->withHost($host);
+            if (! empty($port)) {
+                $uri = $uri->withPort($port);
+            }
+        }
+
+        // URI path
+        $path = self::marshalRequestUri($server);
+        $path = self::stripQueryString($path);
+
+        // URI query
+        $query = '';
+        if (isset($server['QUERY_STRING'])) {
+            $query = ltrim($server['QUERY_STRING'], '?');
+        }
+
+        return $uri
+            ->withPath($path)
+            ->withQuery($query);
+    }
+
+    /**
+     * Marshal the host and port from HTTP headers and/or the PHP environment
+     *
+     * @param stdClass $accumulator
+     * @param array $server
+     * @param array $headers
+     */
+    public static function marshalHostAndPortFromHeaders(stdClass $accumulator, array $server, array $headers)
+    {
+        if (self::getHeader('host', $headers, false)) {
+            self::marshalHostAndPortFromHeader($accumulator, self::getHeader('host', $headers));
+            return;
+        }
+
+        if (! isset($server['SERVER_NAME'])) {
+            return;
+        }
+
+        $accumulator->host = $server['SERVER_NAME'];
+        if (isset($server['SERVER_PORT'])) {
+            $accumulator->port = (int) $server['SERVER_PORT'];
+        }
+
+        if (! isset($server['SERVER_ADDR']) || ! preg_match('/^\[[0-9a-fA-F\:]+\]$/', $accumulator->host)) {
+            return;
+        }
+
+        // Misinterpreted IPv6-Address
+        // Reported for Safari on Windows
+        self::marshalIpv6HostAndPort($accumulator, $server);
+    }
+
+    /**
+     * Detect the base URI for the request
+     *
+     * Looks at a variety of criteria in order to attempt to autodetect a base
+     * URI, including rewrite URIs, proxy URIs, etc.
+     *
+     * From ZF2's Zend\Http\PhpEnvironment\Request class
+     * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+     * @license   http://framework.zend.com/license/new-bsd New BSD License
+     *
+     * @param array $server
+     * @return string
+     */
+    public static function marshalRequestUri(array $server)
+    {
+        // IIS7 with URL Rewrite: make sure we get the unencoded url
+        // (double slash problem).
+        $iisUrlRewritten = self::get('IIS_WasUrlRewritten', $server);
+        $unencodedUrl    = self::get('UNENCODED_URL', $server, '');
+        if ('1' == $iisUrlRewritten && ! empty($unencodedUrl)) {
+            return $unencodedUrl;
+        }
+
+        $requestUri = self::get('REQUEST_URI', $server);
+
+        // Check this first so IIS will catch.
+        $httpXRewriteUrl = self::get('HTTP_X_REWRITE_URL', $server);
+        if ($httpXRewriteUrl !== null) {
+            $requestUri = $httpXRewriteUrl;
+        }
+
+        // Check for IIS 7.0 or later with ISAPI_Rewrite
+        $httpXOriginalUrl = self::get('HTTP_X_ORIGINAL_URL', $server);
+        if ($httpXOriginalUrl !== null) {
+            $requestUri = $httpXOriginalUrl;
+        }
+
+        if ($requestUri !== null) {
+            return preg_replace('#^[^/:]+://[^/]+#', '', $requestUri);
+        }
+
+        $origPathInfo = self::get('ORIG_PATH_INFO', $server);
+        if (empty($origPathInfo)) {
+            return '/';
+        }
+
+        return $origPathInfo;
+    }
+
+    /**
+     * Strip the query string from a path
+     *
+     * @param mixed $path
+     * @return string
+     */
+    public static function stripQueryString($path)
+    {
+        if (($qpos = strpos($path, '?')) !== false) {
+            return substr($path, 0, $qpos);
+        }
+        return $path;
+    }
+
+    /**
+     * Marshal the host and port from the request header
+     *
+     * @param stdClass $accumulator
+     * @param string|array $host
+     * @return void
+     */
+    private static function marshalHostAndPortFromHeader(stdClass $accumulator, $host)
+    {
+        if (is_array($host)) {
+            $host = implode(', ', $host);
+        }
+
+        $accumulator->host = $host;
+        $accumulator->port = null;
+
+        // works for regname, IPv4 & IPv6
+        if (preg_match('|\:(\d+)$|', $accumulator->host, $matches)) {
+            $accumulator->host = substr($accumulator->host, 0, -1 * (strlen($matches[1]) + 1));
+            $accumulator->port = (int) $matches[1];
+        }
+    }
+
+    /**
+     * Marshal host/port from misinterpreted IPv6 address
+     *
+     * @param stdClass $accumulator
+     * @param array $server
+     */
+    private static function marshalIpv6HostAndPort(stdClass $accumulator, array $server)
+    {
+        $accumulator->host = '[' . $server['SERVER_ADDR'] . ']';
+        $accumulator->port = $accumulator->port ?: 80;
+        if ($accumulator->port . ']' === substr($accumulator->host, strrpos($accumulator->host, ':') + 1)) {
+            // The last digit of the IPv6-Address has been taken as port
+            // Unset the port so the default port can be used
+            $accumulator->port = null;
+        }
+    }
+
+    /**
+     * Create and return an UploadedFile instance from a $_FILES specification.
+     *
+     * If the specification represents an array of values, this method will
+     * delegate to normalizeNestedFileSpec() and return that return value.
+     *
+     * @param array $value $_FILES struct
+     * @return array|UploadedFileInterface
+     */
+    private static function createUploadedFileFromSpec(array $value)
+    {
+        if (is_array($value['tmp_name'])) {
+            return self::normalizeNestedFileSpec($value);
+        }
+
+        return new UploadedFile(
+            $value['tmp_name'],
+            $value['size'],
+            $value['error'],
+            $value['name'],
+            $value['type']
+        );
+    }
+
+    /**
+     * Normalize an array of file specifications.
+     *
+     * Loops through all nested files and returns a normalized array of
+     * UploadedFileInterface instances.
+     *
+     * @param array $files
+     * @return UploadedFileInterface[]
+     */
+    private static function normalizeNestedFileSpec(array $files = [])
+    {
+        $normalizedFiles = [];
+        foreach (array_keys($files['tmp_name']) as $key) {
+            $spec = [
+                'tmp_name' => $files['tmp_name'][$key],
+                'size'     => $files['size'][$key],
+                'error'    => $files['error'][$key],
+                'name'     => $files['name'][$key],
+                'type'     => $files['type'][$key],
+            ];
+            $normalizedFiles[$key] = self::createUploadedFileFromSpec($spec);
+        }
+        return $normalizedFiles;
+    }
+}
diff --git a/core/vendor/zendframework/zend-diactoros/src/Stream.php b/core/vendor/zendframework/zend-diactoros/src/Stream.php
new file mode 100644
index 000000000..d92211e53
--- /dev/null
+++ b/core/vendor/zendframework/zend-diactoros/src/Stream.php
@@ -0,0 +1,326 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
+ * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Diactoros;
+
+use InvalidArgumentException;
+use RuntimeException;
+use Psr\Http\Message\StreamInterface;
+
+/**
+ * Implementation of PSR HTTP streams
+ */
+class Stream implements StreamInterface
+{
+    /**
+     * @var resource
+     */
+    protected $resource;
+
+    /**
+     * @var string|resource
+     */
+    protected $stream;
+
+    /**
+     * @param string|resource $stream
+     * @param string $mode Mode with which to open stream
+     * @throws InvalidArgumentException
+     */
+    public function __construct($stream, $mode = 'r')
+    {
+        $this->stream = $stream;
+
+        if (is_resource($stream)) {
+            $this->resource = $stream;
+        } elseif (is_string($stream)) {
+            set_error_handler(function ($errno, $errstr) {
+                throw new InvalidArgumentException(
+                    'Invalid file provided for stream; must be a valid path with valid permissions'
+                );
+            }, E_WARNING);
+            $this->resource = fopen($stream, $mode);
+            restore_error_handler();
+        } else {
+            throw new InvalidArgumentException(
+                'Invalid stream provided; must be a string stream identifier or resource'
+            );
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __toString()
+    {
+        if (! $this->isReadable()) {
+            return '';
+        }
+
+        try {
+            $this->rewind();
+            return $this->getContents();
+        } catch (RuntimeException $e) {
+            return '';
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function close()
+    {
+        if (! $this->resource) {
+            return;
+        }
+
+        $resource = $this->detach();
+        fclose($resource);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function detach()
+    {
+        $resource = $this->resource;
+        $this->resource = null;
+        return $resource;
+    }
+
+    /**
+     * Attach a new stream/resource to the instance.
+     *
+     * @param string|resource $resource
+     * @param string $mode
+     * @throws InvalidArgumentException for stream identifier that cannot be
+     *     cast to a resource
+     * @throws InvalidArgumentException for non-resource stream
+     */
+    public function attach($resource, $mode = 'r')
+    {
+        $error = null;
+        if (! is_resource($resource) && is_string($resource)) {
+            set_error_handler(function ($e) use (&$error) {
+                $error = $e;
+            }, E_WARNING);
+            $resource = fopen($resource, $mode);
+            restore_error_handler();
+        }
+
+        if ($error) {
+            throw new InvalidArgumentException('Invalid stream reference provided');
+        }
+
+        if (! is_resource($resource)) {
+            throw new InvalidArgumentException(
+                'Invalid stream provided; must be a string stream identifier or resource'
+            );
+        }
+
+        $this->resource = $resource;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getSize()
+    {
+        if (null === $this->resource) {
+            return null;
+        }
+
+        $stats = fstat($this->resource);
+        return $stats['size'];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function tell()
+    {
+        if (! $this->resource) {
+            throw new RuntimeException('No resource available; cannot tell position');
+        }
+
+        $result = ftell($this->resource);
+        if (! is_int($result)) {
+            throw new RuntimeException('Error occurred during tell operation');
+        }
+
+        return $result;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function eof()
+    {
+        if (! $this->resource) {
+            return true;
+        }
+
+        return feof($this->resource);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isSeekable()
+    {
+        if (! $this->resource) {
+            return false;
+        }
+
+        $meta = stream_get_meta_data($this->resource);
+        return $meta['seekable'];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function seek($offset, $whence = SEEK_SET)
+    {
+        if (! $this->resource) {
+            throw new RuntimeException('No resource available; cannot seek position');
+        }
+
+        if (! $this->isSeekable()) {
+            throw new RuntimeException('Stream is not seekable');
+        }
+
+        $result = fseek($this->resource, $offset, $whence);
+
+        if (0 !== $result) {
+            throw new RuntimeException('Error seeking within stream');
+        }
+
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function rewind()
+    {
+        return $this->seek(0);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isWritable()
+    {
+        if (! $this->resource) {
+            return false;
+        }
+
+        $meta = stream_get_meta_data($this->resource);
+        $mode = $meta['mode'];
+
+        return (
+            strstr($mode, 'x')
+            || strstr($mode, 'w')
+            || strstr($mode, 'c')
+            || strstr($mode, 'a')
+            || strstr($mode, '+')
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function write($string)
+    {
+        if (! $this->resource) {
+            throw new RuntimeException('No resource available; cannot write');
+        }
+
+        if (! $this->isWritable()) {
+            throw new RuntimeException('Stream is not writable');
+        }
+
+        $result = fwrite($this->resource, $string);
+
+        if (false === $result) {
+            throw new RuntimeException('Error writing to stream');
+        }
+        return $result;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isReadable()
+    {
+        if (! $this->resource) {
+            return false;
+        }
+
+        $meta = stream_get_meta_data($this->resource);
+        $mode = $meta['mode'];
+
+        return (strstr($mode, 'r') || strstr($mode, '+'));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function read($length)
+    {
+        if (! $this->resource) {
+            throw new RuntimeException('No resource available; cannot read');
+        }
+
+        if (! $this->isReadable()) {
+            throw new RuntimeException('Stream is not readable');
+        }
+
+        $result = fread($this->resource, $length);
+
+        if (false === $result) {
+            throw new RuntimeException('Error reading stream');
+        }
+
+        return $result;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getContents()
+    {
+        if (! $this->isReadable()) {
+            throw new RuntimeException('Stream is not readable');
+        }
+
+        $result = stream_get_contents($this->resource);
+        if (false === $result) {
+            throw new RuntimeException('Error reading from stream');
+        }
+        return $result;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getMetadata($key = null)
+    {
+        if (null === $key) {
+            return stream_get_meta_data($this->resource);
+        }
+
+        $metadata = stream_get_meta_data($this->resource);
+        if (! array_key_exists($key, $metadata)) {
+            return null;
+        }
+
+        return $metadata[$key];
+    }
+}
diff --git a/core/vendor/zendframework/zend-diactoros/src/UploadedFile.php b/core/vendor/zendframework/zend-diactoros/src/UploadedFile.php
new file mode 100644
index 000000000..77d6559fb
--- /dev/null
+++ b/core/vendor/zendframework/zend-diactoros/src/UploadedFile.php
@@ -0,0 +1,233 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
+ * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Diactoros;
+
+use InvalidArgumentException;
+use Psr\Http\Message\StreamInterface;
+use Psr\Http\Message\UploadedFileInterface;
+use RuntimeException;
+
+class UploadedFile implements UploadedFileInterface
+{
+    /**
+     * @var string
+     */
+    private $clientFilename;
+
+    /**
+     * @var string
+     */
+    private $clientMediaType;
+
+    /**
+     * @var int
+     */
+    private $error;
+
+    /**
+     * @var null|string
+     */
+    private $file;
+
+    /**
+     * @var bool
+     */
+    private $moved = false;
+
+    /**
+     * @var int
+     */
+    private $size;
+
+    /**
+     * @var null|StreamInterface
+     */
+    private $stream;
+
+    public function __construct($streamOrFile, $size, $errorStatus, $clientFilename = null, $clientMediaType = null)
+    {
+        if ($errorStatus === UPLOAD_ERR_OK) {
+            if (is_string($streamOrFile)) {
+                $this->file = $streamOrFile;
+            }
+            if (is_resource($streamOrFile)) {
+                $this->stream = new Stream($streamOrFile);
+            }
+
+            if (! $this->file && ! $this->stream) {
+                if (! $streamOrFile instanceof StreamInterface) {
+                    throw new InvalidArgumentException('Invalid stream or file provided for UploadedFile');
+                }
+                $this->stream = $streamOrFile;
+            }
+        }
+
+        if (! is_int($size)) {
+            throw new InvalidArgumentException('Invalid size provided for UploadedFile; must be an int');
+        }
+        $this->size = $size;
+
+        if (! is_int($errorStatus)
+            || 0 > $errorStatus
+            || 8 < $errorStatus
+        ) {
+            throw new InvalidArgumentException(
+                'Invalid error status for UploadedFile; must be an UPLOAD_ERR_* constant'
+            );
+        }
+        $this->error = $errorStatus;
+
+        if (null !== $clientFilename && ! is_string($clientFilename)) {
+            throw new InvalidArgumentException(
+                'Invalid client filename provided for UploadedFile; must be null or a string'
+            );
+        }
+        $this->clientFilename = $clientFilename;
+
+        if (null !== $clientMediaType && ! is_string($clientMediaType)) {
+            throw new InvalidArgumentException(
+                'Invalid client media type provided for UploadedFile; must be null or a string'
+            );
+        }
+        $this->clientMediaType = $clientMediaType;
+    }
+
+    /**
+     * {@inheritdoc}
+     * @throws \RuntimeException if the upload was not successful.
+     */
+    public function getStream()
+    {
+        if ($this->error !== UPLOAD_ERR_OK) {
+            throw new RuntimeException('Cannot retrieve stream due to upload error');
+        }
+
+        if ($this->moved) {
+            throw new RuntimeException('Cannot retrieve stream after it has already been moved');
+        }
+
+        if ($this->stream instanceof StreamInterface) {
+            return $this->stream;
+        }
+
+        $this->stream = new Stream($this->file);
+        return $this->stream;
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @see http://php.net/is_uploaded_file
+     * @see http://php.net/move_uploaded_file
+     * @param string $targetPath Path to which to move the uploaded file.
+     * @throws \RuntimeException if the upload was not successful.
+     * @throws \InvalidArgumentException if the $path specified is invalid.
+     * @throws \RuntimeException on any error during the move operation, or on
+     *     the second or subsequent call to the method.
+     */
+    public function moveTo($targetPath)
+    {
+        if ($this->error !== UPLOAD_ERR_OK) {
+            throw new RuntimeException('Cannot retrieve stream due to upload error');
+        }
+
+        if (! is_string($targetPath)) {
+            throw new InvalidArgumentException(
+                'Invalid path provided for move operation; must be a string'
+            );
+        }
+
+        if (empty($targetPath)) {
+            throw new InvalidArgumentException(
+                'Invalid path provided for move operation; must be a non-empty string'
+            );
+        }
+
+        if ($this->moved) {
+            throw new RuntimeException('Cannot move file; already moved!');
+        }
+
+        $sapi = PHP_SAPI;
+        switch (true) {
+            case (empty($sapi) || 0 === strpos($sapi, 'cli') || ! $this->file):
+                // Non-SAPI environment, or no filename present
+                $this->writeFile($targetPath);
+                break;
+            default:
+                // SAPI environment, with file present
+                if (false === move_uploaded_file($this->file, $targetPath)) {
+                    throw new RuntimeException('Error occurred while moving uploaded file');
+                }
+                break;
+        }
+
+        $this->moved = true;
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return int|null The file size in bytes or null if unknown.
+     */
+    public function getSize()
+    {
+        return $this->size;
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @see http://php.net/manual/en/features.file-upload.errors.php
+     * @return int One of PHP's UPLOAD_ERR_XXX constants.
+     */
+    public function getError()
+    {
+        return $this->error;
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return string|null The filename sent by the client or null if none
+     *     was provided.
+     */
+    public function getClientFilename()
+    {
+        return $this->clientFilename;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getClientMediaType()
+    {
+        return $this->clientMediaType;
+    }
+
+    /**
+     * Write internal stream to given path
+     *
+     * @param string $path
+     */
+    private function writeFile($path)
+    {
+        $handle = fopen($path, 'wb+');
+        if (false === $handle) {
+            throw new RuntimeException('Unable to write to designated path');
+        }
+
+        $this->stream->rewind();
+        while (! $this->stream->eof()) {
+            fwrite($handle, $this->stream->read(4096));
+        }
+
+        fclose($handle);
+    }
+}
diff --git a/core/vendor/zendframework/zend-diactoros/src/Uri.php b/core/vendor/zendframework/zend-diactoros/src/Uri.php
new file mode 100644
index 000000000..350bff1fb
--- /dev/null
+++ b/core/vendor/zendframework/zend-diactoros/src/Uri.php
@@ -0,0 +1,624 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
+ * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Diactoros;
+
+use InvalidArgumentException;
+use Psr\Http\Message\UriInterface;
+
+/**
+ * Implementation of Psr\Http\UriInterface.
+ *
+ * Provides a value object representing a URI for HTTP requests.
+ *
+ * Instances of this class  are considered immutable; all methods that
+ * might change state are implemented such that they retain the internal
+ * state of the current instance and return a new instance that contains the
+ * changed state.
+ */
+class Uri implements UriInterface
+{
+    /**
+     * Sub-delimiters used in query strings and fragments.
+     *
+     * @const string
+     */
+    const CHAR_SUB_DELIMS = '!\$&\'\(\)\*\+,;=';
+
+    /**
+     * Unreserved characters used in paths, query strings, and fragments.
+     *
+     * @const string
+     */
+    const CHAR_UNRESERVED = 'a-zA-Z0-9_\-\.~';
+
+    /**
+     * @var int[] Array indexed by valid scheme names to their corresponding ports.
+     */
+    protected $allowedSchemes = [
+        'http'  => 80,
+        'https' => 443,
+    ];
+
+    /**
+     * @var string
+     */
+    private $scheme = '';
+
+    /**
+     * @var string
+     */
+    private $userInfo = '';
+
+    /**
+     * @var string
+     */
+    private $host = '';
+
+    /**
+     * @var int
+     */
+    private $port;
+
+    /**
+     * @var string
+     */
+    private $path = '';
+
+    /**
+     * @var string
+     */
+    private $query = '';
+
+    /**
+     * @var string
+     */
+    private $fragment = '';
+
+    /**
+     * generated uri string cache
+     * @var string|null
+     */
+    private $uriString;
+
+    /**
+     * @param string $uri
+     * @throws InvalidArgumentException on non-string $uri argument
+     */
+    public function __construct($uri = '')
+    {
+        if (! is_string($uri)) {
+            throw new InvalidArgumentException(sprintf(
+                'URI passed to constructor must be a string; received "%s"',
+                (is_object($uri) ? get_class($uri) : gettype($uri))
+            ));
+        }
+
+        if (! empty($uri)) {
+            $this->parseUri($uri);
+        }
+    }
+
+    /**
+     * Operations to perform on clone.
+     *
+     * Since cloning usually is for purposes of mutation, we reset the
+     * $uriString property so it will be re-calculated.
+     */
+    public function __clone()
+    {
+        $this->uriString = null;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __toString()
+    {
+        if (null !== $this->uriString) {
+            return $this->uriString;
+        }
+
+        $this->uriString = static::createUriString(
+            $this->scheme,
+            $this->getAuthority(),
+            $this->getPath(), // Absolute URIs should use a "/" for an empty path
+            $this->query,
+            $this->fragment
+        );
+
+        return $this->uriString;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getScheme()
+    {
+        return $this->scheme;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthority()
+    {
+        if (empty($this->host)) {
+            return '';
+        }
+
+        $authority = $this->host;
+        if (! empty($this->userInfo)) {
+            $authority = $this->userInfo . '@' . $authority;
+        }
+
+        if ($this->isNonStandardPort($this->scheme, $this->host, $this->port)) {
+            $authority .= ':' . $this->port;
+        }
+
+        return $authority;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getUserInfo()
+    {
+        return $this->userInfo;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getHost()
+    {
+        return $this->host;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getPort()
+    {
+        return $this->isNonStandardPort($this->scheme, $this->host, $this->port)
+            ? $this->port
+            : null;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getPath()
+    {
+        return $this->path;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getQuery()
+    {
+        return $this->query;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getFragment()
+    {
+        return $this->fragment;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function withScheme($scheme)
+    {
+        $scheme = $this->filterScheme($scheme);
+
+        if ($scheme === $this->scheme) {
+            // Do nothing if no change was made.
+            return clone $this;
+        }
+
+        $new = clone $this;
+        $new->scheme = $scheme;
+
+        return $new;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function withUserInfo($user, $password = null)
+    {
+        $info = $user;
+        if ($password) {
+            $info .= ':' . $password;
+        }
+
+        if ($info === $this->userInfo) {
+            // Do nothing if no change was made.
+            return clone $this;
+        }
+
+        $new = clone $this;
+        $new->userInfo = $info;
+
+        return $new;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function withHost($host)
+    {
+        if ($host === $this->host) {
+            // Do nothing if no change was made.
+            return clone $this;
+        }
+
+        $new = clone $this;
+        $new->host = $host;
+
+        return $new;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function withPort($port)
+    {
+        if (! is_numeric($port)) {
+            throw new InvalidArgumentException(sprintf(
+                'Invalid port "%s" specified; must be an integer or integer string',
+                (is_object($port) ? get_class($port) : gettype($port))
+            ));
+        }
+
+        $port = (int) $port;
+
+        if ($port === $this->port) {
+            // Do nothing if no change was made.
+            return clone $this;
+        }
+
+        if ($port < 1 || $port > 65535) {
+            throw new InvalidArgumentException(sprintf(
+                'Invalid port "%d" specified; must be a valid TCP/UDP port',
+                $port
+            ));
+        }
+
+        $new = clone $this;
+        $new->port = $port;
+
+        return $new;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function withPath($path)
+    {
+        if (! is_string($path)) {
+            throw new InvalidArgumentException(
+                'Invalid path provided; must be a string'
+            );
+        }
+
+        if (strpos($path, '?') !== false) {
+            throw new InvalidArgumentException(
+                'Invalid path provided; must not contain a query string'
+            );
+        }
+
+        if (strpos($path, '#') !== false) {
+            throw new InvalidArgumentException(
+                'Invalid path provided; must not contain a URI fragment'
+            );
+        }
+
+        $path = $this->filterPath($path);
+
+        if ($path === $this->path) {
+            // Do nothing if no change was made.
+            return clone $this;
+        }
+
+        $new = clone $this;
+        $new->path = $path;
+
+        return $new;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function withQuery($query)
+    {
+        if (! is_string($query)) {
+            throw new InvalidArgumentException(
+                'Query string must be a string'
+            );
+        }
+
+        if (strpos($query, '#') !== false) {
+            throw new InvalidArgumentException(
+                'Query string must not include a URI fragment'
+            );
+        }
+
+        $query = $this->filterQuery($query);
+
+        if ($query === $this->query) {
+            // Do nothing if no change was made.
+            return clone $this;
+        }
+
+        $new = clone $this;
+        $new->query = $query;
+
+        return $new;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function withFragment($fragment)
+    {
+        $fragment = $this->filterFragment($fragment);
+
+        if ($fragment === $this->fragment) {
+            // Do nothing if no change was made.
+            return clone $this;
+        }
+
+        $new = clone $this;
+        $new->fragment = $fragment;
+
+        return $new;
+    }
+
+    /**
+     * Parse a URI into its parts, and set the properties
+     *
+     * @param string $uri
+     */
+    private function parseUri($uri)
+    {
+        $parts = parse_url($uri);
+
+        if (false === $parts) {
+            throw new \InvalidArgumentException(
+                'The source URI string appears to be malformed'
+            );
+        }
+
+        $this->scheme    = isset($parts['scheme'])   ? $this->filterScheme($parts['scheme']) : '';
+        $this->userInfo  = isset($parts['user'])     ? $parts['user']     : '';
+        $this->host      = isset($parts['host'])     ? $parts['host']     : '';
+        $this->port      = isset($parts['port'])     ? $parts['port']     : null;
+        $this->path      = isset($parts['path'])     ? $this->filterPath($parts['path']) : '';
+        $this->query     = isset($parts['query'])    ? $this->filterQuery($parts['query']) : '';
+        $this->fragment  = isset($parts['fragment']) ? $this->filterFragment($parts['fragment']) : '';
+
+        if (isset($parts['pass'])) {
+            $this->userInfo .= ':' . $parts['pass'];
+        }
+    }
+
+    /**
+     * Create a URI string from its various parts
+     *
+     * @param string $scheme
+     * @param string $authority
+     * @param string $path
+     * @param string $query
+     * @param string $fragment
+     * @return string
+     */
+    private static function createUriString($scheme, $authority, $path, $query, $fragment)
+    {
+        $uri = '';
+
+        if (! empty($scheme)) {
+            $uri .= sprintf('%s://', $scheme);
+        }
+
+        if (! empty($authority)) {
+            $uri .= $authority;
+        }
+
+        if ($path) {
+            if (empty($path) || '/' !== substr($path, 0, 1)) {
+                $path = '/' . $path;
+            }
+
+            $uri .= $path;
+        }
+
+        if ($query) {
+            $uri .= sprintf('?%s', $query);
+        }
+
+        if ($fragment) {
+            $uri .= sprintf('#%s', $fragment);
+        }
+
+        return $uri;
+    }
+
+    /**
+     * Is a given port non-standard for the current scheme?
+     *
+     * @param string $scheme
+     * @param string $host
+     * @param int $port
+     * @return bool
+     */
+    private function isNonStandardPort($scheme, $host, $port)
+    {
+        if (! $scheme) {
+            return true;
+        }
+
+        if (! $host || ! $port) {
+            return false;
+        }
+
+        return ! isset($this->allowedSchemes[$scheme]) || $port !== $this->allowedSchemes[$scheme];
+    }
+
+    /**
+     * Filters the scheme to ensure it is a valid scheme.
+     *
+     * @param string $scheme Scheme name.
+     *
+     * @return string Filtered scheme.
+     */
+    private function filterScheme($scheme)
+    {
+        $scheme = strtolower($scheme);
+        $scheme = preg_replace('#:(//)?$#', '', $scheme);
+
+        if (empty($scheme)) {
+            return '';
+        }
+
+        if (! array_key_exists($scheme, $this->allowedSchemes)) {
+            throw new InvalidArgumentException(sprintf(
+                'Unsupported scheme "%s"; must be any empty string or in the set (%s)',
+                $scheme,
+                implode(', ', array_keys($this->allowedSchemes))
+            ));
+        }
+
+        return $scheme;
+    }
+
+    /**
+     * Filters the path of a URI to ensure it is properly encoded.
+     *
+     * @param string $path
+     * @return string
+     */
+    private function filterPath($path)
+    {
+        $path = preg_replace_callback(
+            '/(?:[^' . self::CHAR_UNRESERVED . ':@&=\+\$,\/;%]+|%(?![A-Fa-f0-9]{2}))/',
+            [$this, 'urlEncodeChar'],
+            $path
+        );
+
+        if (empty($path)) {
+            // No path
+            return $path;
+        }
+
+        if ($path[0] !== '/') {
+            // Relative path
+            return $path;
+        }
+
+        // Ensure only one leading slash, to prevent XSS attempts.
+        return '/' . ltrim($path, '/');
+    }
+
+    /**
+     * Filter a query string to ensure it is propertly encoded.
+     *
+     * Ensures that the values in the query string are properly urlencoded.
+     *
+     * @param string $query
+     * @return string
+     */
+    private function filterQuery($query)
+    {
+        if (! empty($query) && strpos($query, '?') === 0) {
+            $query = substr($query, 1);
+        }
+
+        $parts = explode('&', $query);
+        foreach ($parts as $index => $part) {
+            list($key, $value) = $this->splitQueryValue($part);
+            if ($value === null) {
+                $parts[$index] = $this->filterQueryOrFragment($key);
+                continue;
+            }
+            $parts[$index] = sprintf(
+                '%s=%s',
+                $this->filterQueryOrFragment($key),
+                $this->filterQueryOrFragment($value)
+            );
+        }
+
+        return implode('&', $parts);
+    }
+
+    /**
+     * Split a query value into a key/value tuple.
+     *
+     * @param string $value
+     * @return array A value with exactly two elements, key and value
+     */
+    private function splitQueryValue($value)
+    {
+        $data = explode('=', $value, 2);
+        if (1 === count($data)) {
+            $data[] = null;
+        }
+        return $data;
+    }
+
+    /**
+     * Filter a fragment value to ensure it is properly encoded.
+     *
+     * @param null|string $fragment
+     * @return string
+     */
+    private function filterFragment($fragment)
+    {
+        if (null === $fragment) {
+            $fragment = '';
+        }
+
+        if (! empty($fragment) && strpos($fragment, '#') === 0) {
+            $fragment = substr($fragment, 1);
+        }
+
+        return $this->filterQueryOrFragment($fragment);
+    }
+
+    /**
+     * Filter a query string key or value, or a fragment.
+     *
+     * @param string $value
+     * @return string
+     */
+    private function filterQueryOrFragment($value)
+    {
+        return preg_replace_callback(
+            '/(?:[^' . self::CHAR_UNRESERVED . self::CHAR_SUB_DELIMS . '%:@\/\?]+|%(?![A-Fa-f0-9]{2}))/',
+            [$this, 'urlEncodeChar'],
+            $value
+        );
+    }
+
+    /**
+     * URL encode a character returned by a regex.
+     *
+     * @param array $matches
+     * @return string
+     */
+    private function urlEncodeChar(array $matches)
+    {
+        return rawurlencode($matches[0]);
+    }
+}
diff --git a/modules/README.txt b/modules/README.txt
index 18845ef38..529c31b2b 100644
--- a/modules/README.txt
+++ b/modules/README.txt
@@ -22,6 +22,10 @@ contributed modules, and "custom" for custom modules. Note that if you move a
 module to a subdirectory after it has been enabled, you may need to clear the
 Drupal cache so it can be found.
 
+There are number of directories that are ignored when looking for modules. These
+are 'src', 'lib', 'vendor', 'assets', 'css', 'files', 'images', 'js', 'misc',
+'templates', 'includes', 'fixtures' and 'Drupal'.
+
 MULTISITE CONFIGURATION
 -----------------------
 
diff --git a/sites/default/default.services.yml b/sites/default/default.services.yml
index ecb1c43b2..ecaa7b2b0 100644
--- a/sites/default/default.services.yml
+++ b/sites/default/default.services.yml
@@ -82,8 +82,8 @@ parameters:
     # The Renderer will automatically associate these cache contexts with every
     # render array, hence varying every render array by these cache contexts.
     #
-    # @default ['languages:language_interface', 'theme']
-    required_cache_contexts: ['languages:language_interface', 'theme']
+    # @default ['languages:language_interface', 'theme', 'user.permissions']
+    required_cache_contexts: ['languages:language_interface', 'theme', 'user.permissions']
   factory.keyvalue:
     {}
     # Default key/value storage service to use.
@@ -96,3 +96,18 @@ parameters:
     # Default key/value expirable storage service to use.
     # @default keyvalue.database.expirable
     # default: keyvalue.database.expirable
+  # Allowed protocols for URL generation.
+  filter_protocols:
+    - http
+    - https
+    - ftp
+    - news
+    - nntp
+    - tel
+    - telnet
+    - mailto
+    - irc
+    - ssh
+    - sftp
+    - webcal
+    - rtsp
diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php
index 330cc560e..9ad5cae55 100644
--- a/sites/default/default.settings.php
+++ b/sites/default/default.settings.php
@@ -632,6 +632,15 @@ if ($settings['hash_salt']) {
  */
 $settings['container_yamls'][] = __DIR__ . '/services.yml';
 
+/**
+ * Override the default service container class.
+ *
+ * This is useful for example to trace the service container for performance
+ * tracking purposes, for testing a service container with an error condition or
+ * to test a service container that throws an exception.
+ */
+# $settings['container_base_class'] = '\Drupal\Core\DependencyInjection\Container';
+
 /**
  * Trusted host configuration.
  *
diff --git a/sites/example.settings.local.php b/sites/example.settings.local.php
index 4cc2109f6..34b4e191c 100644
--- a/sites/example.settings.local.php
+++ b/sites/example.settings.local.php
@@ -11,6 +11,24 @@
  * mention 'settings.local.php'.
  */
 
+/**
+ * Assertions.
+ *
+ * The Drupal project primarily uses runtime assertions to enforce the
+ * expectations of the API by failing when incorrect calls are made by code
+ * under development.
+ *
+ * @see http://php.net/assert
+ * @see https://www.drupal.org/node/2492225
+ *
+ * If you are using PHP 7.0 it is strongly recommended that you set
+ * zend.assertions=1 in the PHP.ini file (It cannot be changed from .htaccess
+ * or runtime) on development machines and to 0 in production.
+ *
+ * @see https://wiki.php.net/rfc/expectations
+ */
+assert_options(ASSERT_ACTIVE, 1);
+
 /**
  * Enable local development services.
  */
@@ -18,6 +36,9 @@ $settings['container_yamls'][] = DRUPAL_ROOT . '/sites/development.services.yml'
 
 /**
  * Show all error messages, with backtrace information.
+ *
+ * In case the error level could not be fetched from the database, as for
+ * example the database connection failed, we rely only on this value.
  */
 $config['system.logging']['error_level'] = 'verbose';