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

.gitattributes

@@ -0,0 +1,13 @@
+.gitattributes export-ignore
+behat.yml export-ignore
+build.properties.default export-ignore
+build.xml export-ignore
+changelog-definitions.default export-ignore
+CONTRIBUTING.md export-ignore
+dependent-modules.default export-ignore
+Makefile export-ignore
+phpunit.teamcity.mssql.xml export-ignore
+phpunit.teamcity.postgresql.xml export-ignore
+phpunit.teamcity.sqlite3.xml export-ignore
+phpunit.teamcity.xml export-ignore
+phpunit.xml.dist export-ignore

behat.yml

@@ -1,13 +1,9 @@
 default:
   extensions:
 
-    SilverStripe\BehatExtension\Extension:
-      framework_path: framework
-
-    Behat\MinkExtension\Extension:
-      # Adjust this to your own website URL.
-      # Uncomment, or set through environment variable:
-      # > export BEHAT_PARAMS="extensions[Behat\MinkExtension\Extension][base_url]=http://localhost/"
+    SilverStripe\BehatExtension\MinkExtension:
+      # Adjust "base_url" to your own website URL.
+      # Can be set via environment variables or _ss_environment.php/$_FILE_TO_URL_MAPPING as well.
       # 
       # base_url:  http://localhost/
 
@@ -18,3 +14,5 @@ default:
       goutte: ~
       selenium2:
         browser: firefox
+
+    SilverStripe\BehatExtension\Extension: ~

composer.json

@@ -7,12 +7,6 @@
 		"silverstripe/framework": "3.1.x-dev",
 		"silverstripe-themes/simple": "*"
 	},
-	"require-dev": {
-		"silverstripe/docsviewer": "*",
-		"silverstripe/behat-extension": "*",
-		"silverstripe/buildtools": "*",
-		"phpunit/phpunit": "3.7.*"
-	},
 	"config": {
 		"process-timeout": 600	
 	},

web.config

@@ -3,7 +3,7 @@
 		<security>
 			<requestFiltering>
 				<hiddenSegments>
-					<add segment="silverstripe-cache/" />
+					<add segment="silverstripe-cache" />
 					<add segment="vendor" />
 					<add segment="composer.json" />
 					<add segment="composer.lock" />