Merge branch '3.next' of github.com:cakephp/cakephp into 3.next

composer.json

@@ -69,5 +69,10 @@
         "cakephp/orm": "self.version",
         "cakephp/utility": "self.version",
         "cakephp/validation": "self.version"
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-3.next": "dev-3.3.0"
+        }
     }
 }