Merge remote-tracking branch 'origin/master'

# Conflicts:
#	package-lock.json

package-lock.json

@@ -3862,11 +3862,6 @@
         "domelementtype": "1"
       }
     },
-    "dommatrix": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmmirror.com/dommatrix/-/dommatrix-1.0.3.tgz",
-      "integrity": "sha512-l32Xp/TLgWb8ReqbVJAFIvXmY7go4nTxxlWiAFyhoQw9RKEOHBZNnyGvJWqDVSPmq3Y9HlM4npqF/T6VMOXhww=="
-    },
     "domready": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/domready/-/domready-1.0.8.tgz",
@@ -15195,12 +15190,12 @@
       }
     },
     "pdfjs-dist": {
-      "version": "2.16.105",
-      "resolved": "https://registry.npmmirror.com/pdfjs-dist/-/pdfjs-dist-2.16.105.tgz",
-      "integrity": "sha512-J4dn41spsAwUxCpEoVf6GVoz908IAA3mYiLmNxg8J9kfRXc2jxpbUepcP0ocp0alVNLFthTAM8DZ1RaHh8sU0A==",
+      "version": "2.0.943",
+      "resolved": "https://registry.npmmirror.com/pdfjs-dist/-/pdfjs-dist-2.0.943.tgz",
+      "integrity": "sha512-iLhNcm4XceTHRaSU5o22ZGCm4YpuW5+rf4+BJFH/feBhMQLbCGBry+Jet8Q419QDI4qgARaIQzXuiNrsNWS8Yw==",
       "requires": {
-        "dommatrix": "^1.0.3",
-        "web-streams-polyfill": "^3.2.1"
+        "node-ensure": "^0.0.0",
+        "worker-loader": "^2.0.0"
       }
     },
     "performance-now": {
@@ -19738,13 +19733,9 @@
           "integrity": "sha1-Z9ZgFLZqaoqqDAg8X9WN9OTpdgI="
         },
         "pdfjs-dist": {
-          "version": "2.0.943",
-          "resolved": "https://registry.npmmirror.com/pdfjs-dist/-/pdfjs-dist-2.0.943.tgz",
-          "integrity": "sha512-iLhNcm4XceTHRaSU5o22ZGCm4YpuW5+rf4+BJFH/feBhMQLbCGBry+Jet8Q419QDI4qgARaIQzXuiNrsNWS8Yw==",
-          "requires": {
-            "node-ensure": "^0.0.0",
-            "worker-loader": "^2.0.0"
-          }
+          "version": "2.6.347",
+          "resolved": "https://rg.cnpmjs.org/pdfjs-dist/download/pdfjs-dist-2.6.347.tgz",
+          "integrity": "sha1-8lftZug76QDND9KFJKIYf7niXNU="
         },
         "raw-loader": {
           "version": "4.0.2",
@@ -19875,11 +19866,6 @@
         "minimalistic-assert": "^1.0.0"
       }
     },
-    "web-streams-polyfill": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmmirror.com/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz",
-      "integrity": "sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q=="
-    },
     "webidl-conversions": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",