Merge remote-tracking branch 'origin/3.1' into 3

Conflicts:
	composer.json

.htaccess

@@ -23,7 +23,20 @@
 ErrorDocument 404 /assets/error-404.html
 ErrorDocument 500 /assets/error-500.html
 
+<IfModule mod_env.c>
+	# Ensure that X-Forwarded-Host is only allowed to determine the request
+	# hostname for servers ips defined by SS_TRUSTED_PROXY_IPS in your _ss_environment.php
+	# Note that in a future release this setting will be always on.
+	SetEnv BlockUntrustedIPs true
+</IfModule>
+
 <IfModule mod_rewrite.c>
+
+	# Turn off index.php handling requests to the homepage fixes issue in apache >=2.4
+	<IfModule mod_dir.c>
+		DirectoryIndex disabled
+	</IfModule>
+
 	SetEnv HTTP_MOD_REWRITE On
 	RewriteEngine On
 

behat.yml

@@ -1,3 +1,7 @@
+# Behat integration test setup (see behat.org).
+# More information about running these tests can be found under
+# https://github.com/silverstripe-labs/silverstripe-behat-extension.
+# It is safe to remove this file for normal website operation.
 default:
   filters:
     tags: "~@todo"

build.xml

@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!-- 
-# phing installation
-sudo pear channel-discover pear.phing.info
-sudo pear install phing/phing
-sudo pear install pear/VersionControl_Git-0.4.4
+Phing build tooling for SilverStripe releases (see phing.info).
+Install through "pear channel-discover pear.phing.info && pear install phing/phing".
+Most tooling is placed in a separate module, install with "composer require silverstripe/buildtools".
+It is safe to remove this file for normal website operation.
 -->
 
 <project name="silverstripe-installer" default="help" phingVersion="2.4.5">
 
-	<!-- Install with "composer require silverstripe/buildtools" -->
 	<import file="buildtools/build.xml" optional="true" />
 
 	<property name="basedir" value="." override="true" />

composer.json

@@ -15,5 +15,8 @@
 			"3.x-dev": "3.2.x-dev"
 		}
 	},
+	"config": {
+		"process-timeout": 600
+	},
 	"minimum-stability": "dev"
 }

phpunit.xml.dist

@@ -13,6 +13,8 @@
 	More information:
 	- http://www.phpunit.de/manual/current/en/textui.html
 	- http://doc.silverstripe.org/framework/en/topics/testing/#configuration
+
+	It is safe to remove this file for normal website operation.
 -->
 <phpunit bootstrap="framework/tests/bootstrap.php" colors="true">
 

web.config

@@ -1,3 +1,4 @@
+<--! Routing configuration for Microsoft IIS web server -->
 <configuration>
 	<system.webServer>
 		<security>