Merge branch '3.10' into 3

Author: GuySartorelli

_config.php

@@ -46,4 +46,4 @@
     "license": "BSD-3-Clause",
     "minimum-stability": "dev",
     "prefer-stable": true
-}
+}