Merge branch '3.0' into 3.1

Author: GrahamCampbell

composer.json

@@ -41,7 +41,5 @@
     },
     "config": {
         "preferred-install": "dist"
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true
+    }
 }