Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`
  conflict because of the poll option limit being different than upstream's

package.json

@@ -69,9 +69,9 @@
     "@babel/plugin-transform-react-jsx-self": "^7.2.0",
     "@babel/plugin-transform-react-jsx-source": "^7.5.0",
     "@babel/plugin-transform-runtime": "^7.5.5",
-    "@babel/preset-env": "^7.6.0",
-    "@babel/preset-react": "^7.0.0",
-    "@babel/runtime": "^7.5.4",
+    "@babel/preset-env": "^7.7.1",
+    "@babel/preset-react": "^7.6.3",
+    "@babel/runtime": "^7.7.1",
     "@clusterws/cws": "^0.15.2",
     "array-includes": "^3.0.3",
     "atrament": "^0.2.3",
@@ -101,7 +101,7 @@
     "file-loader": "^4.2.0",
     "favico.js": "^0.3.10",
     "font-awesome": "^4.7.0",
-    "glob": "^7.1.1",
+    "glob": "^7.1.5",
     "history": "^4.10.1",
     "http-link-header": "^1.0.2",
     "immutable": "^3.8.2",
@@ -156,17 +156,17 @@
     "requestidlecallback": "^0.3.0",
     "reselect": "^4.0.0",
     "rimraf": "^3.0.0",
-    "sass": "^1.23.1",
-    "sass-loader": "^7.0.3",
+    "sass": "^1.23.3",
+    "sass-loader": "^8.0.0",
     "stringz": "^2.0.0",
     "substring-trie": "^1.0.2",
     "terser-webpack-plugin": "^2.2.1",
-    "tesseract.js": "^2.0.0-alpha.16",
+    "tesseract.js": "^2.0.0-beta.2",
     "throng": "^4.0.0",
     "tiny-queue": "^0.2.1",
     "uuid": "^3.1.0",
     "wavesurfer.js": "^3.2.0",
-    "webpack": "^4.35.3",
+    "webpack": "^4.41.2",
     "webpack-assets-manifest": "^3.1.1",
     "webpack-bundle-analyzer": "^3.6.0",
     "webpack-cli": "^3.3.10",