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

Conflicts:
	.travis.yml

.travis.yml

@@ -1,27 +1,24 @@
 language: php 
 
-php: 
- - 5.3
- - 5.4
+php:
+  - 5.3
 
 env:
- - DB=MYSQL CORE_RELEASE=3.1
- - DB=PGSQL CORE_RELEASE=3.1
- - DB=SQLITE3 CORE_RELEASE=3.1
- - PHPCS=1 CORE_RELEASE=3.1
+  - DB=MYSQL CORE_RELEASE=3.1
 
 matrix:
-  exclude:
-    - php: 5.4
+  include:
+    - php: 5.3
       env: DB=PGSQL CORE_RELEASE=3.1
+    - php: 5.3
+      env: DB=SQLITE CORE_RELEASE=3.1
     - php: 5.4
-      env: DB=SQLITE3 CORE_RELEASE=3.1
-    - php: 5.4
-      env: PHPCS=1 CORE_RELEASE=3.1
+      env: DB=MYSQL CORE_RELEASE=3.1
+    - php: 5.5
+      env: DB=MYSQL CORE_RELEASE=3.1
   allow_failures:
-    - env: DB=PGSQL CORE_RELEASE=3.1
-    - env: DB=SQLITE3 CORE_RELEASE=3.1
-    - env: PHPCS=1 CORE_RELEASE=3.1
+    - php: 5.5
+      env: DB=MYSQL CORE_RELEASE=3.1
 
 before_script:
  - git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support
@@ -43,4 +40,4 @@ branches:
 notifications:
   irc:
     channels:
-     - "irc.freenode.org#silverstripe"
+     - "irc.freenode.org#silverstripe"