diff --git a/CHANGES.rst b/CHANGES.rst
index 72a325281..3be965fab 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,20 @@
+Changes in 0.6.17 (2018-06-01)
+===============================================
+
+Improvements:
+ * Upgrade MatrixKit version (v0.7.14).
+ * Send Stickers (#1860).
+ * Settings: Add deactivate account (#1870).
+ * Widgets: Update from UIWebView to WKWebView to improve performance.
+ 
+Bug fix:
+ * Quotes (by themselves) render as white blocks (#1877).
+ * GDPR: consent screen could not be closed (#1883).
+ * GDPR: Do not display error alert when receiving GDPR Consent not given (#1886).
+ 
+Translations:
+ * Enable Icelandic.
+
 Changes in 0.6.16 (2018-05-23)
 ===============================================
 
diff --git a/Podfile b/Podfile
index f00ef7e3f..8901c7ffc 100644
--- a/Podfile
+++ b/Podfile
@@ -9,7 +9,7 @@ source 'https://github.com/CocoaPods/Specs.git'
 
 # Different flavours of pods to MatrixKit
 # The current MatrixKit pod version
-$matrixKitVersion = '0.7.12'
+$matrixKitVersion = '0.7.14'
 
 # The develop branch version
 #$matrixKitVersion = 'develop'
diff --git a/Podfile.lock b/Podfile.lock
index f99897a29..01b0c1cae 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -43,34 +43,34 @@ PODS:
   - GZIP (1.2.1)
   - HPGrowingTextView (1.1)
   - libPhoneNumber-iOS (0.9.13)
-  - MatrixKit (0.7.12):
+  - MatrixKit (0.7.14):
     - cmark (~> 0.24.1)
     - DTCoreText (~> 1.6.21)
     - HPGrowingTextView (~> 1.1)
     - libPhoneNumber-iOS (~> 0.9.13)
-    - MatrixKit/Core (= 0.7.12)
-    - MatrixSDK (= 0.10.10)
-  - MatrixKit/AppExtension (0.7.12):
+    - MatrixKit/Core (= 0.7.14)
+    - MatrixSDK (= 0.10.11)
+  - MatrixKit/AppExtension (0.7.14):
     - cmark (~> 0.24.1)
     - DTCoreText (~> 1.6.21)
     - DTCoreText/Extension
     - HPGrowingTextView (~> 1.1)
     - libPhoneNumber-iOS (~> 0.9.13)
-    - MatrixSDK (= 0.10.10)
-  - MatrixKit/Core (0.7.12):
+    - MatrixSDK (= 0.10.11)
+  - MatrixKit/Core (0.7.14):
     - cmark (~> 0.24.1)
     - DTCoreText (~> 1.6.21)
     - HPGrowingTextView (~> 1.1)
     - libPhoneNumber-iOS (~> 0.9.13)
-    - MatrixSDK (= 0.10.10)
-  - MatrixSDK (0.10.10):
-    - MatrixSDK/Core (= 0.10.10)
-  - MatrixSDK/Core (0.10.10):
+    - MatrixSDK (= 0.10.11)
+  - MatrixSDK (0.10.11):
+    - MatrixSDK/Core (= 0.10.11)
+  - MatrixSDK/Core (0.10.11):
     - AFNetworking (~> 3.2.0)
     - GZIP (~> 1.2.1)
     - OLMKit (~> 2.2.2)
     - Realm (~> 3.3.2)
-  - MatrixSDK/JingleCallStack (0.10.10):
+  - MatrixSDK/JingleCallStack (0.10.11):
     - MatrixSDK/Core
     - WebRTC (= 63.11.20455)
   - OLMKit (2.2.2):
@@ -90,14 +90,14 @@ DEPENDENCIES:
   - cmark
   - DTCoreText
   - GBDeviceInfo (~> 5.1.0)
-  - MatrixKit (= 0.7.12)
-  - MatrixKit/AppExtension (= 0.7.12)
+  - MatrixKit (= 0.7.14)
+  - MatrixKit/AppExtension (= 0.7.14)
   - MatrixSDK/JingleCallStack
   - OLMKit
   - PiwikTracker (from `https://github.com/manuroe/matomo-sdk-ios.git`, branch `feature/CustomVariables`)
 
 SPEC REPOS:
-  https://github.com/CocoaPods/Specs.git:
+  https://github.com/cocoapods/specs.git:
     - AFNetworking
     - cmark
     - DTCoreText
@@ -131,13 +131,13 @@ SPEC CHECKSUMS:
   GZIP: 7ee835f989fb3c6ea79005fc90b8fa6af710a70d
   HPGrowingTextView: 88a716d97fb853bcb08a4a08e4727da17efc9b19
   libPhoneNumber-iOS: e444379ac18bbfbdefad571da735b2cd7e096caa
-  MatrixKit: ac91b2667d1be1895994ee78654d6193a6644b09
-  MatrixSDK: c74ed8b41e3e55b7510d7bddf612ed1985816e04
+  MatrixKit: ca192403abc03229f5cc5c193bd24a292e302304
+  MatrixSDK: abb44d24e0426f3734630362c736d96446a629a3
   OLMKit: b9d8c0ffee9ea8c45bc0aaa9afb47f93fba7efbd
   PiwikTracker: 42862c7b13028065c3dfd36b4dc38db8a5765acf
   Realm: d927fbf66df5532cfafc08afb5f7e53ded37b894
   WebRTC: f2a6203584745fe53532633397557876b5d71640
 
-PODFILE CHECKSUM: ba3cdb1f77ff6463e50f031aefd807535f5612ad
+PODFILE CHECKSUM: f62acabc542b9493f2d704d8c5163a53051b1979
 
-COCOAPODS: 1.5.0
+COCOAPODS: 1.5.3
diff --git a/Riot/Info.plist b/Riot/Info.plist
index d00816a35..cbd7ee6ea 100644
--- a/Riot/Info.plist
+++ b/Riot/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.6.16</string>
+	<string>0.6.17</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.6.16</string>
+	<string>0.6.17</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<true/>
 	<key>ITSEncryptionExportComplianceCode</key>
diff --git a/RiotShareExtension/Info.plist b/RiotShareExtension/Info.plist
index 3a95c6092..733c119fa 100644
--- a/RiotShareExtension/Info.plist
+++ b/RiotShareExtension/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.6.16</string>
+	<string>0.6.17</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>NSExtension</key>
diff --git a/SiriIntents/Info.plist b/SiriIntents/Info.plist
index c914d2e10..b9785df49 100644
--- a/SiriIntents/Info.plist
+++ b/SiriIntents/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.6.16</string>
+	<string>0.6.17</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>NSExtension</key>