Merge remote-tracking branch 'origin/4.0' into 4

# Conflicts:
#	.cow.json
#	composer.json

README.md

@@ -1,6 +1,6 @@
 ## Overview
 
-Base project folder for a SilverStripe ([http://silverstripe.org](http://silverstripe.org)) installation. Required modules are installed via [http://github.com/silverstripe/recipe-cms](silverstripe/recipe-cms). For information on how to change the dependencies in a recipe, please have a look at [https://github.com/silverstripe/recipe-plugin](silverstripe/recipe-plugin). In addition, installer includes [theme/simple](https://github.com/silverstripe-themes/silverstripe-simple) as a default theme.
+Base project folder for a SilverStripe ([http://silverstripe.org](http://silverstripe.org)) installation. Required modules are installed via [http://github.com/silverstripe/recipe-cms](http://github.com/silverstripe/recipe-cms). For information on how to change the dependencies in a recipe, please have a look at [https://github.com/silverstripe/recipe-plugin](https://github.com/silverstripe/recipe-plugin). In addition, installer includes [theme/simple](https://github.com/silverstripe-themes/silverstripe-simple) as a default theme.
 
 ## Installation ##
 
@@ -11,7 +11,7 @@ and [installation from source](http://doc.silverstripe.org/framework/en/installa
 
 Bugs are tracked on github.com ([framework issues](https://github.com/silverstripe/silverstripe-framework/issues),
 [cms issues](https://github.com/silverstripe/silverstripe-cms/issues)).
-Please read our [issue reporting guidelines](http://doc.silverstripe.org/framework/en/misc/contributing/issues).
+Please read our [issue reporting guidelines](https://docs.silverstripe.org/en/4/contributing/issues_and_bugs/).
 
 ## Development and Contribution ##
 

composer.json

@@ -4,12 +4,12 @@
     "description": "The SilverStripe Framework Installer",
     "require": {
         "php": ">=5.6.0",
-        "silverstripe/recipe-plugin": ">=0.1@dev <1.0",
+        "silverstripe/recipe-plugin": "^1",
         "silverstripe/recipe-cms": "1.1.x-dev",
         "silverstripe-themes/simple": "~3.2.0"
     },
     "require-dev": {
-        "phpunit/PHPUnit": "^5.7"
+        "phpunit/phpunit": "^5.7"
     },
     "extra": {
         "project-files": [

phpcs.xml.dist

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <ruleset name="SS3">
-    <description>Coding standard for SilverStripe 3.x</description>
+    <description>Coding standard for SilverStripe 4.x</description>
 
     <!-- Don't sniff third party libraries -->
     <exclude-pattern>*/vendor/*</exclude-pattern>

phpunit.xml.dist

@@ -1,7 +1,7 @@
 <!--
 	PHPUnit configuration for SilverStripe
 
-	Requires PHPUnit 3.5+
+	Requires PHPUnit 5+
 
 	Usage:
 	 - "phpunit": Runs all tests in all folders