Merge branch 'master' into greenkeeper-jsdom-9.4.1

Author: nutgaard

package.json

@@ -42,7 +42,7 @@
     "babel-preset-react": "6.11.1",
     "babel-preset-stage-2": "6.11.0",
     "chai": "3.5.0",
-    "enzyme": "2.4.0",
+    "enzyme": "2.4.1",
     "eslint": "2.13.1",
     "eslint-config-airbnb": "9.0.1",
     "eslint-plugin-import": "1.10.1",