Merge remote-tracking branch 'origin/2.4' into post-2.4

Conflicts:
	composer.json

.mergesources.yml

@@ -1,8 +0,0 @@
-# Data source for the "arb" svn merge tool (see http://github.com/sminnee/arborist).
-# Keeps track of all opensource branches of submodules 
-# that could be merged back to the current submodule paths.
-trunk:
-  .: /open/phpinstaller/trunk
-  sapphire: /open/modules/sapphire/trunk
-  cms: /open/modules/cms/trunk
-  jsparty: /open/modules/jsparty/trunk

composer.json

@@ -1,20 +1,6 @@
 {
 	"name": "silverstripe/installer",
 	"description": "The SilverStripe Framework Installer",
-	"repositories": [
-		{
-			"type": "git",
-			"url": "https://github.com/silverstripe/silverstripe-cms.git"
-		},
-		{
-			"type": "git",
-			"url": "https://github.com/silverstripe/sapphire.git"
-		},
-		{
-			"type": "git",
-			"url": "https://github.com/silverstripe-themes/silverstripe-blackcandy.git"
-		}
-	],
 	"require": {
 		"php": ">=5.2.4",
 		"silverstripe/cms": "2.4.x-dev",

phpunit.xml.dist

@@ -18,6 +18,7 @@
 >
 	<testsuite name="Default">
 		<directory>./</directory>
+		<exclude>vendor/</exclude>
 	</testsuite>
 	
 	<filter>