Merge remote-tracking branch 'origin/develop' into develop

CHANGELOG.md

@@ -1,3 +1,13 @@
+Changes in [0.11.4](https://github.com/vector-im/riot-web/releases/tag/v0.11.4) (2017-06-22)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.11.3...v0.11.4)
+
+ * Update matrix-js-sdk and react-sdk to fix a regression where the
+   background indexedb worker was disabled, failures to open indexeddb
+   causing the app to fail to start, a race when starting that could break
+   switching to rooms, and the inability to to invite user with mixed case
+   usernames.
+
 Changes in [0.11.3](https://github.com/vector-im/riot-web/releases/tag/v0.11.3) (2017-06-20)
 ============================================================================================
 [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.11.2...v0.11.3)

electron_app/package.json

@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "src/electron-main.js",
-  "version": "0.11.3",
+  "version": "0.11.4",
   "description": "A feature-rich client for Matrix.org",
   "author": "Vector Creations Ltd.",
   "dependencies": {

package.json

@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "electron_app/src/electron-main.js",
-  "version": "0.11.3",
+  "version": "0.11.4",
   "description": "A feature-rich client for Matrix.org",
   "author": "Vector Creations Ltd.",
   "repository": {
@@ -65,8 +65,8 @@
     "gfm.css": "^1.1.1",
     "highlight.js": "^9.0.0",
     "linkifyjs": "^2.1.3",
-    "matrix-js-sdk": "0.7.12",
+    "matrix-js-sdk": "0.7.13",
-    "matrix-react-sdk": "0.9.6",
+    "matrix-react-sdk": "0.9.7",
     "modernizr": "^3.1.0",
     "pako": "^1.0.5",
     "q": "^1.4.1",