Merge branch 'master' into develop

package.json

@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "3.5.0",
+  "version": "3.6.0",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {
@@ -78,7 +78,7 @@
     "is-ip": "^2.0.0",
     "linkifyjs": "^2.1.9",
     "lodash": "^4.17.19",
-    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
+    "matrix-js-sdk": "8.5.0",
     "matrix-widget-api": "^0.1.0-beta.3",
     "minimist": "^1.2.5",
     "pako": "^1.0.11",