Merge remote-tracking branch 'origin/develop' into release-v0.8.7

src/BasePlatform.js

@@ -82,4 +82,12 @@ export default class BasePlatform {
     screenCaptureErrorString() {
         return "Not implemented";
     }
+
+    /**
+     * Restarts the application, without neccessarily reloading
+     * any application code
+     */
+    reload() {
+        throw new Error("reload not implemented!");
+    }
 }

src/components/structures/UserSettings.js

@@ -441,10 +441,11 @@ module.exports = React.createClass({
     },
 
     _onClearCacheClicked: function() {
+        if (!PlatformPeg.get()) return;
+
+        MatrixClientPeg.get().stopClient();
         MatrixClientPeg.get().store.deleteAllData().done(() => {
-            // forceReload=false since we don't really need new HTML/JS files
-            // we just need to restart the JS runtime.
-            window.location.reload(false);
+            PlatformPeg.get().reload();
         });
     },