Merge branch 'master' into update/linters

Author: sokra

package.json

@@ -16,7 +16,7 @@
     "ajv-keywords": "^3.1.0",
     "chrome-trace-event": "^1.0.0",
     "enhanced-resolve": "^4.1.0",
-    "eslint-scope": "^3.7.1",
+    "eslint-scope": "^4.0.0",
     "json-parse-better-errors": "^1.0.2",
     "loader-runner": "^2.3.0",
     "loader-utils": "^1.1.0",