Merge branches '2.2.5' and 'master' of https://github.com/magento/magento-cloud

Author: shiftedreality

.magento.app.yaml

@@ -51,7 +51,7 @@ web:
             root: "pub/media"
             allow: true
             scripts: false
-            passthru: "/index.php"
+            passthru: "/get.php"
         "/static":
             root: "pub/static"
             allow: true