Merge branch 'master' into v1.7-dev

Author: jakezatecky

package.json

@@ -37,7 +37,6 @@
     "@babel/register": "^7.0.0",
     "@types/react": "^16.4.13",
     "@wojtekmaj/enzyme-adapter-react-17": "^0.6.1",
-    "babel-eslint": "^10.0.1",
     "babel-loader": "^8.0.0",
     "browser-sync": "^2.18.6",
     "chai": "^4.0.0",