Merge remote-tracking branch 'origin/1.2' into 1.3

.travis.yml

@@ -1,6 +1,8 @@
 # See https://github.com/silverstripe/silverstripe-travis-support for setup details
 
-language: php 
+language: php
+
+sudo: false
 
 sudo: false
 
@@ -31,6 +33,6 @@ before_script:
  - php ~/travis-support/travis_setup_selenium.php --if-env BEHAT_TEST
  - php ~/travis-support/travis_setup_php54_webserver.php --if-env BEHAT_TEST
 
-script: 
+script:
  - "if [ \"$BEHAT_TEST\" = \"\" ]; then vendor/bin/phpunit subsites/tests; fi"
  - "if [ \"$BEHAT_TEST\" = \"1\" ]; then vendor/bin/behat @subsites; fi"

composer.json

@@ -17,5 +17,5 @@
 	},
 	"require-dev": {
 		"phpunit/PHPUnit": "~3.7@stable"
-    }
+	}
 }