Merge remote-tracking branch 'origin/master' into 2.6.0

composer.json

@@ -51,6 +51,7 @@
         "ext-tidy": "*",
         "ext-tokenizer": "*",
         "ext-xml": "*",
+        "composer": "< 2.3",
         "babdev/pagerfanta-bundle": "^2.5",
         "bdunogier/guzzle-site-authenticator": "^1.0.0",
         "craue/config-bundle": "^2.3.0",
@@ -65,6 +66,7 @@
         "doctrine/migrations": "^1.8",
         "doctrine/orm": "^2.6",
         "doctrine/persistence": "^1.3",
+        "enshrined/svg-sanitize": "^0.15.4",
         "friendsofsymfony/jsrouting-bundle": "^2.2",
         "friendsofsymfony/oauth-server-bundle": "^1.5",
         "friendsofsymfony/rest-bundle": "~2.1",