Merge branch '4.7' into bugfix/parse-build-task-class

.editorconfig

@@ -10,8 +10,22 @@ indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[{*.yml,package.json}]
+[*.md]
+trim_trailing_whitespace = false
+
+[*.{yml,js,json,css,scss,eslintrc,feature}]
 indent_size = 2
+indent_style = space
+
+[composer.json]
+indent_size = 4
+
+# Don't perform any clean-up on thirdparty files
+
+[thirdparty/**]
+trim_trailing_whitespace = false
+insert_final_newline = false
 
-# The indent size used in the package.json file cannot be changed:
-# https://github.com/npm/npm/pull/3180#issuecomment-16336516
+[admin/thirdparty/**]
+trim_trailing_whitespace = false
+insert_final_newline = false

.travis.yml

@@ -2,3 +2,7 @@ version: ~> 1.0
 
 import:
   - silverstripe/silverstripe-travis-shared:config/provision/standard-jobs-range.yml
+
+env:
+  global:
+    - REQUIRE_RECIPE="4.7.x-dev || "