Merge remote-tracking branch 'upstream/pull/5613'

diff --combined config/eslint.js
index f70cbc6c057d9eaf8cdeca902d7a9a6d3a6172a7,8307b15d6cc1a63dc49721560a0e3739587b2320..90040f7bfae41cdaf6e7deb55f79d4bc29d86e4f
--- 1/config/eslint.js
--- 2/config/eslint.js
+++ b/config/eslint.js
@@@ -86,7 -86,7 +86,7 @@@ module.exports = 
        "curly": ["error", "multi-line", "consistent"],
        "dot-notation": "error",
        "eqeqeq": ["error", "smart"],
 -      "no-alert": "warn",
 +      "no-alert": "error",
        "no-array-constructor": "error",
        "no-caller": "error",
        "no-console": "warn",
@@@ -97,7 -97,7 +97,7 @@@
        "no-extra-bind": "error",
        "no-extra-label": "error",
        "no-implicit-coercion": "warn",
-       "no-implicit-globals": "warn",
+       "no-implicit-globals": "error",
        "no-implied-eval": "error",
        "no-invalid-this": "error",
        "no-iterator": "error",