Merge branch 'master' into greenkeeper/nyc-10.2.0

Author: KnisterPeter

package.json

@@ -40,7 +40,7 @@
     "@types/babel-generator": "6.7.14",
     "@types/chalk": "0.4.31",
     "@types/diff": "0.0.31",
-    "@types/node": "7.0.11",
+    "@types/node": "7.0.12",
     "@types/react": "15.0.18",
     "ava": "0.18.2",
     "babel-core": "6.24.0",