diff --git a/.github/ISSUE_TEMPLATE/user-interface-or-usability-bug-report.md b/.github/ISSUE_TEMPLATE/user-interface-or-usability-bug-report.md
index df9cfe4f2e..ffb8971b2d 100644
--- a/.github/ISSUE_TEMPLATE/user-interface-or-usability-bug-report.md
+++ b/.github/ISSUE_TEMPLATE/user-interface-or-usability-bug-report.md
@@ -2,7 +2,7 @@
 name: User Interface or Usability Bug report
 about: Please include screenshots in UI/UX bug reports
 title: ''
-labels: ''
+labels: bug, ui/ux
 assignees: ''
 
 ---
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ad3028923..90bd05d12a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+Changes in [1.1.2](https://github.com/vector-im/riot-web/releases/tag/v1.1.2) (2019-05-15)
+==========================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.1.1...v1.1.2)
+
+ * react-sdk v1.1.2 to fix single sign-on and GIF autoplaying
+
+Changes in [1.1.1](https://github.com/vector-im/riot-web/releases/tag/v1.1.1) (2019-05-14)
+==========================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.1.0...v1.1.1)
+
+ * react-sdk v1.1.1 to fix regressions with registration
+
 Changes in [1.1.0](https://github.com/vector-im/riot-web/releases/tag/v1.1.0) (2019-05-07)
 ==========================================================================================
 [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.1.0-rc.1...v1.1.0)
diff --git a/Dockerfile b/Dockerfile
index 79ee1f68c3..e601595c1c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,7 @@ WORKDIR /src
 
 COPY . /src
 RUN dos2unix /src/scripts/docker-link-repos.sh && sh /src/scripts/docker-link-repos.sh
-RUN yarn install
+RUN yarn --network-timeout=100000 install
 RUN yarn build
 
 # Copy the config now so that we don't create another layer in the app image
diff --git a/config.sample.json b/config.sample.json
index d4eb8df052..beb9c9f0ab 100644
--- a/config.sample.json
+++ b/config.sample.json
@@ -21,7 +21,8 @@
     "features": {
         "feature_groups": "labs",
         "feature_pinning": "labs",
-        "feature_reactions": "labs"
+        "feature_reactions": "labs",
+        "feature_message_editing": "labs"
     },
     "default_federate": true,
     "default_theme": "light",
diff --git a/docs/labs.md b/docs/labs.md
index 65b71b3466..3d568a2b85 100644
--- a/docs/labs.md
+++ b/docs/labs.md
@@ -35,4 +35,11 @@ That's it. Now should see your new counter under the header.
 reactions from other people. This feature is currently under active development,
 and only portions have been implemented so far.
 
+## Message editing
+
+`feature_message_editing` allows editing messages after they have been sent,
+accessible from the reaction/context bar when hovering a message.
+This feature is currently under active development,
+and only portions have been implemented so far.
+
 [#riot-web:matrix.org]: https://matrix.to/#/#riot-web:matrix.org
diff --git a/electron_app/package.json b/electron_app/package.json
index e4c024bbc7..ad426ee107 100644
--- a/electron_app/package.json
+++ b/electron_app/package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "src/electron-main.js",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "dependencies": {
diff --git a/package.json b/package.json
index 5ec2ea3390..6b47f8faad 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "electron_app/src/electron-main.js",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "repository": {
@@ -74,7 +74,7 @@
     "gfm.css": "^1.1.2",
     "highlight.js": "^9.13.1",
     "matrix-js-sdk": "1.1.0",
-    "matrix-react-sdk": "1.1.0",
+    "matrix-react-sdk": "1.1.2",
     "modernizr": "^3.6.0",
     "olm": "https://packages.matrix.org/npm/olm/olm-3.1.0.tgz",
     "prop-types": "^15.6.2",
diff --git a/scripts/docker-link-repos.sh b/scripts/docker-link-repos.sh
index 816b2e040c..9f17188ed6 100644
--- a/scripts/docker-link-repos.sh
+++ b/scripts/docker-link-repos.sh
@@ -13,7 +13,7 @@ git clone $JS_SDK_REPO js-sdk
 cd js-sdk
 git checkout $JS_SDK_BRANCH
 yarn link
-yarn install
+yarn --network-timeout=100000 install
 cd ../
 
 echo "Linking react-sdk"
@@ -22,7 +22,7 @@ cd react-sdk
 git checkout $REACT_SDK_BRANCH
 yarn link
 yarn link matrix-js-sdk
-yarn install
+yarn --network-timeout=100000 install
 cd ../
 
 echo "Setting up riot-web with react-sdk and js-sdk packages"
diff --git a/yarn.lock b/yarn.lock
index 2609cb95a9..72c023a187 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5769,10 +5769,10 @@ matrix-mock-request@^1.2.3:
     bluebird "^3.5.0"
     expect "^1.20.2"
 
-matrix-react-sdk@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.1.0.tgz#3f1c139cb4c33190b9dcb36a6e776d3ad53334f6"
-  integrity sha512-3JjyzbrmokzCl5Ss/0dWjUyc8EuO3uWvD3LBHZhTkFHe1uSiHjC2+Oy8hiJha8tubJtCWnQPE7tXIffkYmvdAQ==
+matrix-react-sdk@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.1.2.tgz#bff86db4fc521deb3076467707dcc338bbff0542"
+  integrity sha512-MKALTgxSULFSJZagts9+oMu/SZFNHHfZcMKgDWJELdgTIcHUg/rIOFt2y1ghkbpWJjC2wGM8J5E0TAsL0aeWcQ==
   dependencies:
     babel-plugin-syntax-dynamic-import "^6.18.0"
     babel-runtime "^6.26.0"