Merge branch '3.3' into 3.4

.travis.yml

@@ -1,4 +1,12 @@
 version: ~> 1.0
 
 import:
+<<<<<<< HEAD
   - silverstripe/silverstripe-travis-shared:config/provision/standard-jobs-range.yml
+=======
+  - silverstripe/silverstripe-travis-shared:config/provision/standard-jobs-range-npm.yml
+
+env:
+  global:
+    - REQUIRE_EXTRA:"ezyang/htmlpurifier:*"
+>>>>>>> 3.3

package.json

@@ -12,7 +12,7 @@
     "build": "yarn && NODE_ENV=production webpack -p --bail --progress",
     "watch": "yarn && NODE_ENV=development webpack --watch --progress",
     "css": "yarn && WEBPACK_CHILD=css webpack -p --bail --progress",
-    "test": "jest",
+    "test": "true",
     "coverage": "jest --coverage",
     "lint": "eslint client/src && sass-lint -v client/src"
   },