Merge branch 'release-4.0'

webapp/package.json

@@ -23,9 +23,9 @@
     "jquery": "3.2.1",
     "key-mirror": "1.0.1",
     "localforage": "1.5.0",
-    "marked": "mattermost/marked#8f5902fff9bad793cd6c66e0c44002c9e79e1317",
+    "marked": "mattermost/marked#c0b5f4a651b0af63e974522b20b93b7999490c53",
     "match-at": "0.1.0",
-    "mattermost-redux": "mattermost/mattermost-redux#webapp-master",
+    "mattermost-redux": "mattermost/mattermost-redux#webapp-4.0",
     "object-assign": "4.1.1",
     "pdfjs-dist": "1.8.474",
     "perfect-scrollbar": "0.7.1",