Merge branch 'master' into develop

package.json

@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "electron_app/src/electron-main.js",
-  "version": "0.10.1",
+  "version": "0.10.2",
   "description": "A feature-rich client for Matrix.org",
   "author": "Vector Creations Ltd.",
   "repository": {
@@ -66,7 +66,7 @@
     "highlight.js": "^9.0.0",
     "linkifyjs": "^2.1.3",
     "matrix-js-sdk": "0.7.10",
-    "matrix-react-sdk": "0.9.1",
+    "matrix-react-sdk": "0.9.2",
     "modernizr": "^3.1.0",
     "pako": "^1.0.5",
     "q": "^1.4.1",