diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000..6caffdb01
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,55 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+
+
+
+
+### Description
+
+Describe here the problem that you are experiencing, or the feature you are requesting.
+
+### Steps to reproduce
+
+- For bugs, list the steps
+- that reproduce the bug
+- using hyphens as bullet points
+
+Describe how what happens differs from what you expected.
+
+Log: sent/not sent?
+
+
+
+### Version information
+
+
+
+- **Platform**: web (in-browser) or desktop?
+
+For the web app:
+
+- **Browser**: Chrome, Safari, Firefox? which version?
+- **OS**: Windows, macOS, Ubuntu, Arch Linux, etc?
+- **URL**: riot.im/develop / riot.im/app / somewhere else? If a private server, what version of riot-web?
+
+For the desktop app:
+
+- **OS**: Windows, macOS, Ubuntu, Arch Linux, etc?
+- **Version**: 0.x.y
diff --git a/.github/ISSUE_TEMPLATE/redesign_issue.md b/.github/ISSUE_TEMPLATE/redesign_issue.md
new file mode 100644
index 000000000..162d0a128
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/redesign_issue.md
@@ -0,0 +1,32 @@
+---
+name: Redesign Issue
+about: Bugs, feedback or feature requests specifically associated with the Redesign
+ project (https://riot.im/experimental)
+title: ''
+labels: redesign
+assignees: ''
+
+---
+
+
+
+- **Browser**: Chrome, Safari, Firefox? which version?
+- **OS**: Windows, macOS, Ubuntu, Arch Linux, etc?
+
+### Description
+
+Describe here the problem that you are experiencing, or the feature you are requesting.
+Include screenshots if possible: you can drag and drop images below.
+
+### Steps to reproduce
+
+- For bugs, list the steps
+- that reproduce the bug
+- using hyphens as bullet points
+
+Describe how what happens differs from what you expected.
+
+Log: sent/not sent?
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d2f8d343..ba5de1758 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,29 @@
+Changes in [0.17.9](https://github.com/vector-im/riot-web/releases/tag/v0.17.9) (2019-01-22)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.17.9-rc.1...v0.17.9)
+
+ * Bugfix in react-sdk for setting DM rooms
+
+Changes in [0.17.9-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.17.9-rc.1) (2019-01-17)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.17.8...v0.17.9-rc.1)
+
+ * Merge develop into experimental
+ [\#8003](https://github.com/vector-im/riot-web/pull/8003)
+ * Electron: Load app from custom protocol
+ [\#7943](https://github.com/vector-im/riot-web/pull/7943)
+ * Fix the IndexedDB worker
+ [\#7920](https://github.com/vector-im/riot-web/pull/7920)
+ * Make clear that the Debian package is for desktop
+ [\#7919](https://github.com/vector-im/riot-web/pull/7919)
+ * Run the Desktop app in a sandbox
+ [\#7907](https://github.com/vector-im/riot-web/pull/7907)
+ * Update to new electron single instance API
+ [\#7908](https://github.com/vector-im/riot-web/pull/7908)
+ * Update the tests to match https://github.com/matrix-org/matrix-react-
+ sdk/pull/2340
+ [\#7834](https://github.com/vector-im/riot-web/pull/7834)
+
Changes in [0.17.8](https://github.com/vector-im/riot-web/releases/tag/v0.17.8) (2018-12-10)
============================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.17.8-rc.1...v0.17.8)
diff --git a/docs/shortcuts.md b/docs/shortcuts.md
new file mode 100644
index 000000000..f29fc2bed
--- /dev/null
+++ b/docs/shortcuts.md
@@ -0,0 +1,11 @@
+# Keyboard Shortcuts
+
+The modifier is Ctrl on Windows & Linux and ⌘ on Mac.
+
+- Ctrl/⌘+m - toggle markdown
+- Ctrl/⌘+d - toggle mic mute
+- Ctrl/⌘+e - toggle video on/off
+- Ctrl/⌘+k - jump to named room
+- ↑/↓ - navigate within room list
+- PageUp/PageDown - scroll timeline up/down
+- Ctrl/⌘+Home/End - jump to timeline start/end
diff --git a/electron_app/package.json b/electron_app/package.json
index f9ab11454..8d8814055 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": "0.17.8",
+ "version": "0.17.9",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"dependencies": {
diff --git a/package.json b/package.json
index 537f48296..e5c56cdac 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "electron_app/src/electron-main.js",
- "version": "0.17.8",
+ "version": "0.17.9",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
@@ -70,8 +70,8 @@
"gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279",
"gfm.css": "^1.1.2",
"highlight.js": "^9.13.1",
- "matrix-js-sdk": "0.14.2",
- "matrix-react-sdk": "0.14.7",
+ "matrix-js-sdk": "0.14.3",
+ "matrix-react-sdk": "0.14.8",
"modernizr": "^3.6.0",
"prop-types": "^15.6.2",
"react": "^15.6.0",
diff --git a/release.sh b/release.sh
index b5bdb010c..67869bc3c 100755
--- a/release.sh
+++ b/release.sh
@@ -47,4 +47,4 @@ git commit package.json -m "$tag"
cd ..
-exec ./node_modules/matrix-js-sdk/release.sh -z "$orig_args"
+exec ./node_modules/matrix-js-sdk/release.sh -u vector-im -z "$orig_args"