MAGETWO-84346: Merge release branch into 2.1-develop

Author: fascinosum

composer.json

@@ -2,7 +2,7 @@
     "name": "magento/magento2ce",
     "description": "Magento 2 (Community Edition)",
     "type": "project",
-    "version": "2.1.11",
+    "version": "2.1.13-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"