Merge branch '2.0' into 2

.editorconfig

@@ -13,5 +13,8 @@ trim_trailing_whitespace = true
 [{*.yml,*.json}]
 indent_size = 2
 
+[composer.json]
+indent_size = 4
+
 # The indent size used in the package.json file cannot be changed:
 # https://github.com/npm/npm/pull/3180#issuecomment-16336516

composer.json

@@ -18,11 +18,6 @@
         "composer/installers": "*",
         "silverstripe/framework": "^4@dev"
     },
-  "extra": {
-    "branch-alias": {
-      "dev-master": "2.0.x-dev"
-    }
-  },
     "scripts": {
         "lint": "phpcs -s src/ tests/"
     },