Merge branch '3' into 4.0

Author: GuySartorelli

composer.json

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