diff --git a/.eslintrc b/.eslintrc
index d84c9eb64c..0f2d2c8743 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -28,7 +28,6 @@
     "currentURL": true,
     "define": true,
     "Discourse": true,
-    "Em": true,
     "Ember": true,
     "exists": true,
     "expandSelectKit": true,
@@ -63,6 +62,7 @@
     "triggerEvent": true,
     "visible": true,
     "visit": true,
+    "pauseTest": true
   },
   "rules": {
     "block-scoped-var": 2,
diff --git a/.travis.yml b/.travis.yml
index 08be3437dc..6e2677a58a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -49,7 +49,7 @@ before_install:
   - wget -qO- https://raw.githubusercontent.com/discourse/discourse_docker/master/image/base/install-pngquant | sudo sh
   - nvm install node
   - node --version
-  - gem install bundler
+  - gem install bundler -v 1.17.3
   - git clone --depth=1 https://github.com/discourse/discourse-backup-uploads-to-s3.git plugins/discourse-backup-uploads-to-s3
   - git clone --depth=1 https://github.com/discourse/discourse-spoiler-alert.git plugins/discourse-spoiler-alert
   - git clone --depth=1 https://github.com/discourse/discourse-cakeday.git plugins/discourse-cakeday
diff --git a/Gemfile b/Gemfile
index f8435e308b..345d8e7d82 100644
--- a/Gemfile
+++ b/Gemfile
@@ -36,13 +36,13 @@ gem 'redis-namespace'
 
 gem 'active_model_serializers', '~> 0.8.3'
 
-gem 'onebox', '1.8.71'
+gem 'onebox', '1.8.76'
 
 gem 'http_accept_language', '~>2.0.5', require: false
 
 gem 'ember-rails', '0.18.5'
-gem 'ember-source', '2.13.3'
-gem 'ember-handlebars-template', '0.7.5'
+gem 'discourse-ember-source', '~> 3.5.1'
+gem 'ember-handlebars-template', '0.8.0'
 gem 'barber'
 
 # message bus 2.2.0 should be very stable
diff --git a/Gemfile.lock b/Gemfile.lock
index 7377a8727c..8641fa950e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -83,7 +83,7 @@ GEM
       open4 (~> 1.3)
     coderay (1.1.2)
     colored2 (3.1.2)
-    concurrent-ruby (1.1.3)
+    concurrent-ruby (1.1.4)
     connection_pool (2.2.2)
     cork (0.3.0)
       colored2 (~> 3.1)
@@ -105,6 +105,7 @@ GEM
       terminal-table (~> 1)
     debug_inspector (0.0.3)
     diff-lcs (1.3)
+    discourse-ember-source (3.5.1.3)
     discourse_image_optim (0.26.2)
       exifr (~> 1.2, >= 1.2.2)
       fspath (~> 3.0)
@@ -114,9 +115,9 @@ GEM
     email_reply_trimmer (0.1.12)
     ember-data-source (3.0.2)
       ember-source (>= 2, < 3.0)
-    ember-handlebars-template (0.7.5)
+    ember-handlebars-template (0.8.0)
       barber (>= 0.11.0)
-      sprockets (>= 3.3, < 4)
+      sprockets (>= 3.3, < 4.1)
     ember-rails (0.18.5)
       active_model_serializers
       ember-data-source (>= 1.0.0.beta.5)
@@ -124,7 +125,7 @@ GEM
       ember-source (>= 1.1.0)
       jquery-rails (>= 1.0.17)
       railties (>= 3.1)
-    ember-source (2.13.3)
+    ember-source (2.18.2)
     erubi (1.7.1)
     excon (0.62.0)
     execjs (2.7.0)
@@ -258,7 +259,7 @@ GEM
     omniauth-twitter (1.4.0)
       omniauth-oauth (~> 1.1)
       rack
-    onebox (1.8.71)
+    onebox (1.8.76)
       htmlentities (~> 4.3)
       moneta (~> 1.0)
       multi_json (~> 1.11)
@@ -435,9 +436,9 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    webpush (0.3.2)
+    webpush (0.3.6)
       hkdf (~> 0.2)
-      jwt
+      jwt (~> 2.0)
 
 PLATFORMS
   ruby
@@ -462,11 +463,11 @@ DEPENDENCIES
   colored2
   cppjieba_rb
   danger
+  discourse-ember-source (~> 3.5.1)
   discourse_image_optim
   email_reply_trimmer (~> 0.1)
-  ember-handlebars-template (= 0.7.5)
+  ember-handlebars-template (= 0.8.0)
   ember-rails (= 0.18.5)
-  ember-source (= 2.13.3)
   excon
   execjs
   fabrication
@@ -512,7 +513,7 @@ DEPENDENCIES
   omniauth-oauth2
   omniauth-openid
   omniauth-twitter
-  onebox (= 1.8.71)
+  onebox (= 1.8.76)
   openid-redis-store
   pg
   pry-nav
@@ -557,4 +558,4 @@ DEPENDENCIES
   webpush
 
 BUNDLED WITH
-   1.17.2
+   1.17.3
diff --git a/app/assets/javascripts/admin/components/admin-user-field-item.js.es6 b/app/assets/javascripts/admin/components/admin-user-field-item.js.es6
index 64e95cecf9..bdb22e258c 100644
--- a/app/assets/javascripts/admin/components/admin-user-field-item.js.es6
+++ b/app/assets/javascripts/admin/components/admin-user-field-item.js.es6
@@ -83,26 +83,14 @@ export default Ember.Component.extend(bufferedProperty("userField"), {
         .catch(popupAjaxError);
     },
 
-    moveUp() {
-      this.sendAction("moveUpAction", this.get("userField"));
-    },
-
-    moveDown() {
-      this.sendAction("moveDownAction", this.get("userField"));
-    },
-
     edit() {
       this.set("editing", true);
     },
 
-    destroy() {
-      this.sendAction("destroyAction", this.get("userField"));
-    },
-
     cancel() {
       const id = this.get("userField.id");
       if (Ember.isEmpty(id)) {
-        this.sendAction("destroyAction", this.get("userField"));
+        this.destroyAction(this.get("userField"));
       } else {
         this.rollbackBuffer();
         this.set("editing", false);
diff --git a/app/assets/javascripts/admin/components/admin-watched-word.js.es6 b/app/assets/javascripts/admin/components/admin-watched-word.js.es6
index d1283e8b3a..53f7a8a056 100644
--- a/app/assets/javascripts/admin/components/admin-watched-word.js.es6
+++ b/app/assets/javascripts/admin/components/admin-watched-word.js.es6
@@ -14,7 +14,7 @@ export default Ember.Component.extend(
       this.get("word")
         .destroy()
         .then(() => {
-          this.sendAction("action", this.get("word"));
+          this.action(this.get("word"));
         })
         .catch(e => {
           bootbox.alert(
diff --git a/app/assets/javascripts/admin/components/color-input.js.es6 b/app/assets/javascripts/admin/components/color-input.js.es6
index 17ae5a9296..2880143662 100644
--- a/app/assets/javascripts/admin/components/color-input.js.es6
+++ b/app/assets/javascripts/admin/components/color-input.js.es6
@@ -34,7 +34,7 @@ export default Ember.Component.extend({
   didInsertElement() {
     loadScript("/javascripts/spectrum.js").then(() => {
       loadCSS("/javascripts/spectrum.css").then(() => {
-        Em.run.schedule("afterRender", () => {
+        Ember.run.schedule("afterRender", () => {
           this.$(".picker")
             .spectrum({ color: "#" + this.get("hexValue") })
             .on("change.spectrum", (me, color) => {
@@ -44,7 +44,7 @@ export default Ember.Component.extend({
         });
       });
     });
-    Em.run.schedule("afterRender", () => {
+    Ember.run.schedule("afterRender", () => {
       this.hexValueChanged();
     });
   }
diff --git a/app/assets/javascripts/admin/components/embeddable-host.js.es6 b/app/assets/javascripts/admin/components/embeddable-host.js.es6
index 7264d42c1c..8dda74d221 100644
--- a/app/assets/javascripts/admin/components/embeddable-host.js.es6
+++ b/app/assets/javascripts/admin/components/embeddable-host.js.es6
@@ -61,7 +61,7 @@ export default Ember.Component.extend(bufferedProperty("host"), {
           this.get("host")
             .destroyRecord()
             .then(() => {
-              this.sendAction("deleteHost", this.get("host"));
+              this.deleteHost(this.get("host"));
             });
         }
       });
@@ -70,7 +70,7 @@ export default Ember.Component.extend(bufferedProperty("host"), {
     cancel() {
       const host = this.get("host");
       if (host.get("isNew")) {
-        this.sendAction("deleteHost", host);
+        this.deleteHost(host);
       } else {
         this.rollbackBuffer();
         this.set("editToggled", false);
diff --git a/app/assets/javascripts/admin/components/inline-edit-checkbox.js.es6 b/app/assets/javascripts/admin/components/inline-edit-checkbox.js.es6
index f14ba62201..fb93625716 100644
--- a/app/assets/javascripts/admin/components/inline-edit-checkbox.js.es6
+++ b/app/assets/javascripts/admin/components/inline-edit-checkbox.js.es6
@@ -4,13 +4,17 @@ import {
 } from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
+  classNames: ["inline-edit"],
+
+  checked: null,
+  checkedInternal: null,
+
   init() {
-    this._super();
+    this._super(...arguments);
+
     this.set("checkedInternal", this.get("checked"));
   },
 
-  classNames: ["inline-edit"],
-
   @observes("checked")
   checkedChanged() {
     this.set("checkedInternal", this.get("checked"));
@@ -33,7 +37,7 @@ export default Ember.Component.extend({
 
     finished() {
       this.set("checked", this.get("checkedInternal"));
-      this.sendAction();
+      this.action();
     }
   }
 });
diff --git a/app/assets/javascripts/admin/components/ip-lookup.js.es6 b/app/assets/javascripts/admin/components/ip-lookup.js.es6
index 357ba10d5f..1ddb37faf7 100644
--- a/app/assets/javascripts/admin/components/ip-lookup.js.es6
+++ b/app/assets/javascripts/admin/components/ip-lookup.js.es6
@@ -21,7 +21,7 @@ export default Ember.Component.extend({
         ajax("/admin/users/ip-info", {
           data: { ip: this.get("ip") }
         }).then(function(location) {
-          self.set("location", Em.Object.create(location));
+          self.set("location", Ember.Object.create(location));
         });
       }
 
diff --git a/app/assets/javascripts/admin/components/permalink-form.js.es6 b/app/assets/javascripts/admin/components/permalink-form.js.es6
index 969840a308..c0c2f24b32 100644
--- a/app/assets/javascripts/admin/components/permalink-form.js.es6
+++ b/app/assets/javascripts/admin/components/permalink-form.js.es6
@@ -33,8 +33,8 @@ export default Ember.Component.extend({
             self.set("url", "");
             self.set("permalink_type_value", "");
             self.set("formSubmitted", false);
-            self.sendAction("action", Permalink.create(result.permalink));
-            Em.run.schedule("afterRender", function() {
+            self.action(Permalink.create(result.permalink));
+            Ember.run.schedule("afterRender", function() {
               self.$(".permalink-url").focus();
             });
           },
@@ -60,7 +60,7 @@ export default Ember.Component.extend({
   didInsertElement: function() {
     var self = this;
     self._super();
-    Em.run.schedule("afterRender", function() {
+    Ember.run.schedule("afterRender", function() {
       self.$(".external-url").keydown(function(e) {
         if (e.keyCode === 13) {
           // enter key
diff --git a/app/assets/javascripts/admin/components/resumable-upload.js.es6 b/app/assets/javascripts/admin/components/resumable-upload.js.es6
index 4a8545b3ab..e462d9e32c 100644
--- a/app/assets/javascripts/admin/components/resumable-upload.js.es6
+++ b/app/assets/javascripts/admin/components/resumable-upload.js.es6
@@ -8,8 +8,8 @@ import { bufferedRender } from "discourse-common/lib/buffered-render";
 
     {{resumable-upload
         target="/admin/backups/upload"
-        success="successAction"
-        error="errorAction"
+        success=(action "successAction")
+        error=(action "errorAction")
         uploadText="UPLOAD"
     }}
 **/
@@ -55,7 +55,7 @@ export default Ember.Component.extend(
       if (this.get("isUploading")) {
         this.resumable.cancel();
         var self = this;
-        Em.run.later(function() {
+        Ember.run.later(function() {
           self._reset();
         });
         return false;
@@ -83,40 +83,40 @@ export default Ember.Component.extend(
         // automatically upload the selected file
         self.resumable.upload();
         // mark as uploading
-        Em.run.later(function() {
+        Ember.run.later(function() {
           self.set("isUploading", true);
         });
       });
 
       this.resumable.on("fileProgress", function(file) {
         // update progress
-        Em.run.later(function() {
+        Ember.run.later(function() {
           self.set("progress", parseInt(file.progress() * 100, 10));
         });
       });
 
       this.resumable.on("fileSuccess", function(file) {
-        Em.run.later(function() {
+        Ember.run.later(function() {
           // mark as not uploading anymore
           self._reset();
           // fire an event to allow the parent route to reload its model
-          self.sendAction("success", file.fileName);
+          self.success(file.fileName);
         });
       });
 
       this.resumable.on("fileError", function(file, message) {
-        Em.run.later(function() {
+        Ember.run.later(function() {
           // mark as not uploading anymore
           self._reset();
           // fire an event to allow the parent route to display the error message
-          self.sendAction("error", file.fileName, message);
+          self.error(file.fileName, message);
         });
       });
     }.on("init"),
 
     _assignBrowse: function() {
       var self = this;
-      Em.run.schedule("afterRender", function() {
+      Ember.run.schedule("afterRender", function() {
         self.resumable.assignBrowse(self.$());
       });
     }.on("didInsertElement"),
diff --git a/app/assets/javascripts/admin/components/save-controls.js.es6 b/app/assets/javascripts/admin/components/save-controls.js.es6
index 51adbaf3c5..cade010e5b 100644
--- a/app/assets/javascripts/admin/components/save-controls.js.es6
+++ b/app/assets/javascripts/admin/components/save-controls.js.es6
@@ -8,11 +8,5 @@ export default Ember.Component.extend({
   @computed("model.isSaving")
   savingText(saving) {
     return saving ? "saving" : "save";
-  },
-
-  actions: {
-    saveChanges() {
-      this.sendAction();
-    }
   }
 });
diff --git a/app/assets/javascripts/admin/components/screened-ip-address-form.js.es6 b/app/assets/javascripts/admin/components/screened-ip-address-form.js.es6
index 6197bfc320..64fd7eeb38 100644
--- a/app/assets/javascripts/admin/components/screened-ip-address-form.js.es6
+++ b/app/assets/javascripts/admin/components/screened-ip-address-form.js.es6
@@ -2,7 +2,7 @@
   A form to create an IP address that will be blocked or whitelisted.
   Example usage:
 
-    {{screened-ip-address-form action="recordAdded"}}
+    {{screened-ip-address-form action=(action "recordAdded")}}
 
   where action is a callback on the controller or route that will get called after
   the new record is successfully saved. It is called with the new ScreenedIpAddress record
@@ -60,10 +60,7 @@ export default Ember.Component.extend({
           .save()
           .then(result => {
             this.setProperties({ ip_address: "", formSubmitted: false });
-            this.sendAction(
-              "action",
-              ScreenedIpAddress.create(result.screened_ip_address)
-            );
+            this.action(ScreenedIpAddress.create(result.screened_ip_address));
             Ember.run.schedule("afterRender", () =>
               this.$(".ip-address-input").focus()
             );
diff --git a/app/assets/javascripts/admin/components/site-text-summary.js.es6 b/app/assets/javascripts/admin/components/site-text-summary.js.es6
index 48ceb2fefd..177448b102 100644
--- a/app/assets/javascripts/admin/components/site-text-summary.js.es6
+++ b/app/assets/javascripts/admin/components/site-text-summary.js.es6
@@ -30,11 +30,5 @@ export default Ember.Component.extend({
     }
 
     return this.get("term");
-  },
-
-  actions: {
-    edit() {
-      this.sendAction("editAction", this.get("siteText"));
-    }
   }
 });
diff --git a/app/assets/javascripts/admin/components/tags-uploader.js.es6 b/app/assets/javascripts/admin/components/tags-uploader.js.es6
index 621045b731..1373792f24 100644
--- a/app/assets/javascripts/admin/components/tags-uploader.js.es6
+++ b/app/assets/javascripts/admin/components/tags-uploader.js.es6
@@ -1,9 +1,9 @@
 import UploadMixin from "discourse/mixins/upload";
 
-export default Em.Component.extend(UploadMixin, {
+export default Ember.Component.extend(UploadMixin, {
   type: "csv",
   uploadUrl: "/tags/upload",
-  addDisabled: Em.computed.alias("uploading"),
+  addDisabled: Ember.computed.alias("uploading"),
   elementId: "tag-uploader",
 
   validateUploadedFilesOptions() {
@@ -12,8 +12,8 @@ export default Em.Component.extend(UploadMixin, {
 
   uploadDone() {
     bootbox.alert(I18n.t("tagging.upload_successful"), () => {
-      this.sendAction("refresh");
-      this.sendAction("closeModal");
+      this.refresh();
+      this.closeModal();
     });
   }
 });
diff --git a/app/assets/javascripts/admin/components/themes-list-item.js.es6 b/app/assets/javascripts/admin/components/themes-list-item.js.es6
index 0bd69f92d2..fad6702a3c 100644
--- a/app/assets/javascripts/admin/components/themes-list-item.js.es6
+++ b/app/assets/javascripts/admin/components/themes-list-item.js.es6
@@ -9,9 +9,9 @@ export default Ember.Component.extend({
   childrenExpanded: false,
   classNames: ["themes-list-item"],
   classNameBindings: ["theme.selected:selected"],
-  hasComponents: Em.computed.gt("children.length", 0),
-  displayComponents: Em.computed.and("hasComponents", "theme.isActive"),
-  displayHasMore: Em.computed.gt("theme.childThemes.length", MAX_COMPONENTS),
+  hasComponents: Ember.computed.gt("children.length", 0),
+  displayComponents: Ember.computed.and("hasComponents", "theme.isActive"),
+  displayHasMore: Ember.computed.gt("theme.childThemes.length", MAX_COMPONENTS),
 
   click(e) {
     if (!$(e.target).hasClass("others-count")) {
diff --git a/app/assets/javascripts/admin/components/themes-list.js.es6 b/app/assets/javascripts/admin/components/themes-list.js.es6
index da14b6492a..abb03af476 100644
--- a/app/assets/javascripts/admin/components/themes-list.js.es6
+++ b/app/assets/javascripts/admin/components/themes-list.js.es6
@@ -7,12 +7,12 @@ export default Ember.Component.extend({
 
   classNames: ["themes-list"],
 
-  hasThemes: Em.computed.gt("themesList.length", 0),
-  hasUserThemes: Em.computed.gt("userThemes.length", 0),
-  hasInactiveThemes: Em.computed.gt("inactiveThemes.length", 0),
+  hasThemes: Ember.computed.gt("themesList.length", 0),
+  hasUserThemes: Ember.computed.gt("userThemes.length", 0),
+  hasInactiveThemes: Ember.computed.gt("inactiveThemes.length", 0),
 
-  themesTabActive: Em.computed.equal("currentTab", THEMES),
-  componentsTabActive: Em.computed.equal("currentTab", COMPONENTS),
+  themesTabActive: Ember.computed.equal("currentTab", THEMES),
+  componentsTabActive: Ember.computed.equal("currentTab", COMPONENTS),
 
   @computed("themes", "components", "currentTab")
   themesList(themes, components) {
@@ -79,7 +79,7 @@ export default Ember.Component.extend({
       }
     },
     navigateToTheme(theme) {
-      Em.getOwner(this)
+      Ember.getOwner(this)
         .lookup("router:main")
         .transitionTo("adminCustomizeThemes.show", theme);
     }
diff --git a/app/assets/javascripts/admin/components/watched-word-form.js.es6 b/app/assets/javascripts/admin/components/watched-word-form.js.es6
index c9a61965e8..bdfafc12af 100644
--- a/app/assets/javascripts/admin/components/watched-word-form.js.es6
+++ b/app/assets/javascripts/admin/components/watched-word-form.js.es6
@@ -64,7 +64,7 @@ export default Ember.Component.extend({
               showMessage: true,
               message: I18n.t("admin.watched_words.form.success")
             });
-            this.sendAction("action", WatchedWord.create(result));
+            this.action(WatchedWord.create(result));
             Ember.run.schedule("afterRender", () =>
               this.$(".watched-word-input").focus()
             );
diff --git a/app/assets/javascripts/admin/components/watched-word-uploader.js.es6 b/app/assets/javascripts/admin/components/watched-word-uploader.js.es6
index e5ff9a1fd7..5f047a2bc6 100644
--- a/app/assets/javascripts/admin/components/watched-word-uploader.js.es6
+++ b/app/assets/javascripts/admin/components/watched-word-uploader.js.es6
@@ -1,11 +1,11 @@
 import computed from "ember-addons/ember-computed-decorators";
 import UploadMixin from "discourse/mixins/upload";
 
-export default Em.Component.extend(UploadMixin, {
+export default Ember.Component.extend(UploadMixin, {
   type: "csv",
   classNames: "watched-words-uploader",
   uploadUrl: "/admin/logs/watched_words/upload",
-  addDisabled: Em.computed.alias("uploading"),
+  addDisabled: Ember.computed.alias("uploading"),
 
   validateUploadedFilesOptions() {
     return { csvOnly: true };
@@ -19,7 +19,7 @@ export default Em.Component.extend(UploadMixin, {
   uploadDone() {
     if (this) {
       bootbox.alert(I18n.t("admin.watched_words.form.upload_successful"));
-      this.sendAction("done");
+      this.done();
     }
   }
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-backups-logs.js.es6 b/app/assets/javascripts/admin/controllers/admin-backups-logs.js.es6
index 38bdd6f571..ee2fd2f95d 100644
--- a/app/assets/javascripts/admin/controllers/admin-backups-logs.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-backups-logs.js.es6
@@ -1,5 +1,5 @@
 export default Ember.Controller.extend({
   logs: [],
   adminBackups: Ember.inject.controller(),
-  status: Em.computed.alias("adminBackups.model")
+  status: Ember.computed.alias("adminBackups.model")
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6
index 351d8e44c6..5bf29b0788 100644
--- a/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6
@@ -1,8 +1,8 @@
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import BufferedContent from "discourse/mixins/buffered-content";
+import { bufferedProperty } from "discourse/mixins/buffered-content";
 import { propertyNotEqual } from "discourse/lib/computed";
 
-export default Ember.Controller.extend(BufferedContent, {
+export default Ember.Controller.extend(bufferedProperty("model"), {
   adminBadges: Ember.inject.controller(),
   saving: false,
   savingStatus: "",
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-colors-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-colors-show.js.es6
index 9b83dbaeb8..e49e87fc4b 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-colors-show.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-customize-colors-show.js.es6
@@ -51,7 +51,7 @@ export default Ember.Controller.extend({
     },
 
     copy() {
-      var newColorScheme = Em.copy(this.get("model"), true);
+      var newColorScheme = Ember.copy(this.get("model"), true);
       newColorScheme.set(
         "name",
         I18n.t("admin.customize.colors.copy_name_prefix") +
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-colors.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-colors.js.es6
index 60a0af98b8..88ab2b8846 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-colors.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-customize-colors.js.es6
@@ -10,7 +10,7 @@ export default Ember.Controller.extend({
   }.property("model.@each.id"),
 
   baseColors: function() {
-    var baseColorsHash = Em.Object.create({});
+    var baseColorsHash = Ember.Object.create({});
     this.get("baseColorScheme.colors").forEach(color => {
       baseColorsHash.set(color.get("name"), color);
     });
@@ -23,7 +23,7 @@ export default Ember.Controller.extend({
         "base_scheme_id",
         baseKey
       );
-      const newColorScheme = Em.copy(base, true);
+      const newColorScheme = Ember.copy(base, true);
       newColorScheme.set("name", I18n.t("admin.customize.colors.new_name"));
       newColorScheme.set("base_scheme_id", base.get("base_scheme_id"));
       newColorScheme.save().then(() => {
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js.es6
index a8acc0e2f0..0b31a299bb 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js.es6
@@ -179,7 +179,7 @@ export default Ember.Controller.extend({
 
     toggleMaximize: function() {
       this.toggleProperty("maximized");
-      Em.run.next(() => {
+      Ember.run.next(() => {
         this.appEvents.trigger("ace:resize");
       });
     }
diff --git a/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js.es6
index 78a98c5560..a5a703ceb9 100644
--- a/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js.es6
@@ -10,7 +10,7 @@ const THEME_UPLOAD_VAR = 2;
 export default Ember.Controller.extend({
   downloadUrl: url("model.id", "/admin/themes/%@"),
   previewUrl: url("model.id", "/admin/themes/%@/preview"),
-  addButtonDisabled: Em.computed.empty("selectedChildThemeId"),
+  addButtonDisabled: Ember.computed.empty("selectedChildThemeId"),
   editRouteName: "adminCustomizeThemes.edit",
 
   @computed("model", "allThemes", "model.component")
@@ -48,7 +48,7 @@ export default Ember.Controller.extend({
     return colorSchemeId !== existingId;
   },
 
-  @computed("availableChildThemes", "model.childThemes.@each", "model")
+  @computed("availableChildThemes", "model.childThemes.[]", "model")
   selectableChildThemes(available, childThemes) {
     if (available) {
       const themes = !childThemes
diff --git a/app/assets/javascripts/admin/controllers/admin-email-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-index.js.es6
index 1bab3fe297..cbbd1563b0 100644
--- a/app/assets/javascripts/admin/controllers/admin-email-index.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-email-index.js.es6
@@ -5,7 +5,7 @@ export default Ember.Controller.extend({
 
     @property sendTestEmailDisabled
   **/
-  sendTestEmailDisabled: Em.computed.empty("testEmailAddress"),
+  sendTestEmailDisabled: Ember.computed.empty("testEmailAddress"),
 
   /**
     Clears the 'sentTestEmail' property on successful send.
diff --git a/app/assets/javascripts/admin/controllers/admin-search-logs-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-search-logs-index.js.es6
index c46b7d1cd1..50f3d7c5ef 100644
--- a/app/assets/javascripts/admin/controllers/admin-search-logs-index.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-search-logs-index.js.es6
@@ -1,6 +1,6 @@
 export default Ember.Controller.extend({
   loading: false,
-  period: "all",
+  period: "yearly",
   searchType: "all",
 
   searchTypeOptions: [
diff --git a/app/assets/javascripts/admin/controllers/admin-user-fields.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-fields.js.es6
index bd65bb9c14..f92a8ebd94 100644
--- a/app/assets/javascripts/admin/controllers/admin-user-fields.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-user-fields.js.es6
@@ -4,7 +4,7 @@ const MAX_FIELDS = 20;
 
 export default Ember.Controller.extend({
   fieldTypes: null,
-  createDisabled: Em.computed.gte("model.length", MAX_FIELDS),
+  createDisabled: Ember.computed.gte("model.length", MAX_FIELDS),
 
   fieldSortOrder: ["position"],
   sortedFields: Ember.computed.sort("model", "fieldSortOrder"),
diff --git a/app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6
index 057a9b532b..16b148f951 100644
--- a/app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6
@@ -14,15 +14,15 @@ export default Ember.Controller.extend(CanCheckEmails, {
   listFilter: null,
   selectAll: false,
 
-  queryNew: Em.computed.equal("query", "new"),
-  queryPending: Em.computed.equal("query", "pending"),
-  queryHasApproval: Em.computed.or("queryNew", "queryPending"),
-  showApproval: Em.computed.and(
+  queryNew: Ember.computed.equal("query", "new"),
+  queryPending: Ember.computed.equal("query", "pending"),
+  queryHasApproval: Ember.computed.or("queryNew", "queryPending"),
+  showApproval: Ember.computed.and(
     "siteSettings.must_approve_users",
     "queryHasApproval"
   ),
   searchHint: i18n("search_hint"),
-  hasSelection: Em.computed.gt("selectedCount", 0),
+  hasSelection: Ember.computed.gt("selectedCount", 0),
 
   selectedCount: function() {
     var model = this.get("model");
diff --git a/app/assets/javascripts/admin/controllers/admin-watched-words-action.js.es6 b/app/assets/javascripts/admin/controllers/admin-watched-words-action.js.es6
index e29bc70702..41a9e4a755 100644
--- a/app/assets/javascripts/admin/controllers/admin-watched-words-action.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-watched-words-action.js.es6
@@ -43,7 +43,7 @@ export default Ember.Controller.extend({
       if (a) {
         a.words.unshiftObject(arg);
         a.incrementProperty("count");
-        Em.run.schedule("afterRender", () => {
+        Ember.run.schedule("afterRender", () => {
           // remove from other actions lists
           let match = null;
           this.get("adminWatchedWords.model").forEach(action => {
diff --git a/app/assets/javascripts/admin/controllers/admin-web-hooks-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-web-hooks-show.js.es6
index 55e6b007fd..1f28c96723 100644
--- a/app/assets/javascripts/admin/controllers/admin-web-hooks-show.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-web-hooks-show.js.es6
@@ -62,9 +62,21 @@ export default Ember.Controller.extend({
     }
   },
 
-  @computed("model.isSaving", "secretValidation", "eventTypeValidation")
-  saveButtonDisabled(isSaving, secretValidation, eventTypeValidation) {
-    return isSaving ? false : secretValidation || eventTypeValidation;
+  @computed(
+    "model.isSaving",
+    "secretValidation",
+    "eventTypeValidation",
+    "model.payload_url"
+  )
+  saveButtonDisabled(
+    isSaving,
+    secretValidation,
+    eventTypeValidation,
+    payloadUrl
+  ) {
+    return isSaving
+      ? false
+      : secretValidation || eventTypeValidation || Ember.isEmpty(payloadUrl);
   },
 
   actions: {
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-add-upload.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-add-upload.js.es6
index 766892e0e7..24e00b50d4 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-add-upload.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-add-upload.js.es6
@@ -63,8 +63,8 @@ export default Ember.Controller.extend(ModalFunctionality, {
     this.set("fileSelected", false);
   },
 
-  enabled: Em.computed.and("nameValid", "fileSelected"),
-  disabled: Em.computed.not("enabled"),
+  enabled: Ember.computed.and("nameValid", "fileSelected"),
+  disabled: Ember.computed.not("enabled"),
 
   @computed("name", "adminCustomizeThemesShow.model.theme_fields")
   errorMessage(name, themeFields) {
@@ -105,7 +105,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
   actions: {
     updateName() {
       let name = this.get("name");
-      if (Em.isEmpty(name)) {
+      if (Ember.isEmpty(name)) {
         name = $("#file-input")[0].files[0].name;
         this.set("name", name.split(".")[0]);
       }
diff --git a/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6
index f609427512..1a195149b3 100644
--- a/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6
+++ b/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6
@@ -4,7 +4,7 @@ import ModalFunctionality from "discourse/mixins/modal-functionality";
 export default Ember.Controller.extend(ModalFunctionality, {
   modelChanged: function() {
     const model = this.get("model");
-    const copy = Em.A();
+    const copy = Ember.A();
     const store = this.store;
 
     if (model) {
diff --git a/app/assets/javascripts/admin/mixins/setting-component.js.es6 b/app/assets/javascripts/admin/mixins/setting-component.js.es6
index 1d6184c85e..a0552766a5 100644
--- a/app/assets/javascripts/admin/mixins/setting-component.js.es6
+++ b/app/assets/javascripts/admin/mixins/setting-component.js.es6
@@ -17,7 +17,7 @@ const CUSTOM_TYPES = [
 ];
 
 export default Ember.Mixin.create({
-  classNameBindings: [":row", ":setting", "setting.overridden", "typeClass"],
+  classNameBindings: [":row", ":setting", "overridden", "typeClass"],
   content: Ember.computed.alias("setting"),
   validationMessage: null,
   isSecret: Ember.computed.oneWay("setting.secret"),
@@ -81,12 +81,16 @@ export default Ember.Mixin.create({
     return "site-settings/" + typeClass;
   },
 
+  @computed("setting.default", "buffered.value")
+  overridden(settingDefault, bufferedValue) {
+    return settingDefault !== bufferedValue;
+  },
+
   _watchEnterKey: function() {
-    const self = this;
-    this.$().on("keydown.setting-enter", ".input-setting-string", function(e) {
+    this.$().on("keydown.setting-enter", ".input-setting-string", e => {
       if (e.keyCode === 13) {
         // enter key
-        self.send("save");
+        this.send("save");
       }
     });
   }.on("didInsertElement"),
@@ -96,7 +100,7 @@ export default Ember.Mixin.create({
   }.on("willDestroyElement"),
 
   _save() {
-    Em.warn("You should define a `_save` method", {
+    Ember.warn("You should define a `_save` method", {
       id: "admin.mixins.setting-component"
     });
     return Ember.RSVP.resolve();
@@ -124,7 +128,6 @@ export default Ember.Mixin.create({
 
     resetDefault() {
       this.set("buffered.value", this.get("setting.default"));
-      this.send("save");
     },
 
     toggleSecret() {
diff --git a/app/assets/javascripts/admin/models/admin-user.js.es6 b/app/assets/javascripts/admin/models/admin-user.js.es6
index d98e148a5a..b9a8fc7618 100644
--- a/app/assets/javascripts/admin/models/admin-user.js.es6
+++ b/app/assets/javascripts/admin/models/admin-user.js.es6
@@ -305,7 +305,7 @@ const AdminUser = Discourse.User.extend({
     return this.get("trust_level") < 4;
   }.property("trust_level"),
 
-  canSuspend: Em.computed.not("staff"),
+  canSuspend: Ember.computed.not("staff"),
 
   suspendDuration: function() {
     const suspended_at = moment(this.suspended_at),
diff --git a/app/assets/javascripts/admin/models/backup-status.js.es6 b/app/assets/javascripts/admin/models/backup-status.js.es6
index cc62304601..2eb856c3be 100644
--- a/app/assets/javascripts/admin/models/backup-status.js.es6
+++ b/app/assets/javascripts/admin/models/backup-status.js.es6
@@ -1,7 +1,7 @@
 import computed from "ember-addons/ember-computed-decorators";
 
 export default Discourse.Model.extend({
-  restoreDisabled: Em.computed.not("restoreEnabled"),
+  restoreDisabled: Ember.computed.not("restoreEnabled"),
 
   @computed("allowRestore", "isOperationRunning")
   restoreEnabled(allowRestore, isOperationRunning) {
diff --git a/app/assets/javascripts/admin/models/color-scheme.js.es6 b/app/assets/javascripts/admin/models/color-scheme.js.es6
index e781320c29..fc24331fb8 100644
--- a/app/assets/javascripts/admin/models/color-scheme.js.es6
+++ b/app/assets/javascripts/admin/models/color-scheme.js.es6
@@ -30,7 +30,7 @@ const ColorScheme = Discourse.Model.extend(Ember.Copyable, {
     var newScheme = ColorScheme.create({
       name: this.get("name"),
       can_edit: true,
-      colors: Em.A()
+      colors: Ember.A()
     });
     this.get("colors").forEach(c => {
       newScheme.colors.pushObject(
diff --git a/app/assets/javascripts/admin/models/theme.js.es6 b/app/assets/javascripts/admin/models/theme.js.es6
index da881abf9b..83f42d962e 100644
--- a/app/assets/javascripts/admin/models/theme.js.es6
+++ b/app/assets/javascripts/admin/models/theme.js.es6
@@ -10,9 +10,9 @@ const SETTINGS_TYPE_ID = 5;
 
 const Theme = RestModel.extend({
   FIELDS_IDS: [0, 1],
-  isActive: Em.computed.or("default", "user_selectable"),
-  isPendingUpdates: Em.computed.gt("remote_theme.commits_behind", 0),
-  hasEditedFields: Em.computed.gt("editedFields.length", 0),
+  isActive: Ember.computed.or("default", "user_selectable"),
+  isPendingUpdates: Ember.computed.gt("remote_theme.commits_behind", 0),
+  hasEditedFields: Ember.computed.gt("editedFields.length", 0),
 
   @computed("theme_fields")
   themeFields(fields) {
@@ -30,7 +30,7 @@ const Theme = RestModel.extend({
     return hash;
   },
 
-  @computed("theme_fields", "theme_fields.@each")
+  @computed("theme_fields", "theme_fields.[]")
   uploads(fields) {
     if (!fields) {
       return [];
@@ -47,10 +47,10 @@ const Theme = RestModel.extend({
     );
   },
 
-  @computed("theme_fields.@each")
+  @computed("theme_fields.[]")
   editedFields(fields) {
     return fields.filter(
-      field => !Em.isBlank(field.value) && field.type_id !== SETTINGS_TYPE_ID
+      field => !Ember.isBlank(field.value) && field.type_id !== SETTINGS_TYPE_ID
     );
   },
 
@@ -67,11 +67,11 @@ const Theme = RestModel.extend({
 
   hasEdited(target, name) {
     if (name) {
-      return !Em.isEmpty(this.getField(target, name));
+      return !Ember.isEmpty(this.getField(target, name));
     } else {
       let fields = this.get("theme_fields") || [];
       return fields.any(
-        field => field.target === target && !Em.isEmpty(field.value)
+        field => field.target === target && !Ember.isEmpty(field.value)
       );
     }
   },
@@ -130,7 +130,7 @@ const Theme = RestModel.extend({
     }
   },
 
-  @computed("childThemes.@each")
+  @computed("childThemes.[]")
   child_theme_ids(childThemes) {
     if (childThemes) {
       return childThemes.map(theme => Ember.get(theme, "id"));
diff --git a/app/assets/javascripts/admin/models/watched-word.js.es6 b/app/assets/javascripts/admin/models/watched-word.js.es6
index cdf5e29e8a..d7d781227d 100644
--- a/app/assets/javascripts/admin/models/watched-word.js.es6
+++ b/app/assets/javascripts/admin/models/watched-word.js.es6
@@ -21,7 +21,7 @@ const WatchedWord = Discourse.Model.extend({
 
 WatchedWord.reopenClass({
   findAll() {
-    return ajax("/admin/logs/watched_words").then(list => {
+    return ajax("/admin/logs/watched_words.json").then(list => {
       const actions = {};
       list.words.forEach(s => {
         if (!actions[s.action]) {
diff --git a/app/assets/javascripts/admin/routes/admin-backups-logs.js.es6 b/app/assets/javascripts/admin/routes/admin-backups-logs.js.es6
index 200d33f28e..a0febc3d1d 100644
--- a/app/assets/javascripts/admin/routes/admin-backups-logs.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-backups-logs.js.es6
@@ -15,7 +15,7 @@ export default Ember.Route.extend({
             return log.message.length === 0 || log.message[0] === "[";
           })
           .map(function(log) {
-            return Em.Object.create(log);
+            return Ember.Object.create(log);
           })
           .value();
         logs.pushObjects(newLogs);
diff --git a/app/assets/javascripts/admin/routes/admin-backups.js.es6 b/app/assets/javascripts/admin/routes/admin-backups.js.es6
index 4514eec205..28ec187f22 100644
--- a/app/assets/javascripts/admin/routes/admin-backups.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-backups.js.es6
@@ -41,7 +41,7 @@ export default Discourse.Route.extend({
       } else {
         this.controllerFor("adminBackupsLogs")
           .get("logs")
-          .pushObject(Em.Object.create(log));
+          .pushObject(Ember.Object.create(log));
       }
     });
   },
diff --git a/app/assets/javascripts/admin/routes/admin-badges-show.js.es6 b/app/assets/javascripts/admin/routes/admin-badges-show.js.es6
index 6507170256..7837d1b30d 100644
--- a/app/assets/javascripts/admin/routes/admin-badges-show.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-badges-show.js.es6
@@ -4,7 +4,7 @@ import showModal from "discourse/lib/show-modal";
 
 export default Ember.Route.extend({
   serialize(m) {
-    return { badge_id: Em.get(m, "id") || "new" };
+    return { badge_id: Ember.get(m, "id") || "new" };
   },
 
   model(params) {
@@ -49,7 +49,7 @@ export default Ember.Route.extend({
         })
         .catch(function(error) {
           badge.set("preview_loading", false);
-          Em.Logger.error(error);
+          Ember.Logger.error(error);
           bootbox.alert("Network error");
         });
     }
diff --git a/app/assets/javascripts/admin/routes/admin-user.js.es6 b/app/assets/javascripts/admin/routes/admin-user.js.es6
index 9eab70c84d..c25f750c25 100644
--- a/app/assets/javascripts/admin/routes/admin-user.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-user.js.es6
@@ -9,7 +9,7 @@ export default Discourse.Route.extend({
   },
 
   model(params) {
-    return AdminUser.find(Em.get(params, "user_id"));
+    return AdminUser.find(Ember.get(params, "user_id"));
   },
 
   renderTemplate() {
diff --git a/app/assets/javascripts/admin/templates/api-keys.hbs b/app/assets/javascripts/admin/templates/api-keys.hbs
index e256e127cf..1b85311b6e 100644
--- a/app/assets/javascripts/admin/templates/api-keys.hbs
+++ b/app/assets/javascripts/admin/templates/api-keys.hbs
@@ -19,8 +19,8 @@
           {{/if}}
         </td>
         <td class="key-controls">
-          {{d-button class="btn-default" action="regenerateKey" actionParam=k icon="undo" label='admin.api.regenerate'}}
-          {{d-button class="btn-default" action="revokeKey" actionParam=k icon="times" label='admin.api.revoke'}}
+          {{d-button class="btn-default" action=(action "regenerateKey") actionParam=k icon="undo" label='admin.api.regenerate'}}
+          {{d-button class="btn-default" action=(action "revokeKey") actionParam=k icon="times" label='admin.api.revoke'}}
         </td>
       </tr>
     {{/each}}
diff --git a/app/assets/javascripts/admin/templates/backups-index.hbs b/app/assets/javascripts/admin/templates/backups-index.hbs
index 3e69cbff2c..46a0dafaf2 100644
--- a/app/assets/javascripts/admin/templates/backups-index.hbs
+++ b/app/assets/javascripts/admin/templates/backups-index.hbs
@@ -1,14 +1,14 @@
      <div class="backup-options">
         {{#if localBackupStorage}}
-        {{resumable-upload target="/admin/backups/upload" success="uploadSuccess" error="uploadError" uploadText=uploadLabel title="admin.backups.upload.title" class="btn-default"}}
+        {{resumable-upload target="/admin/backups/upload" success=(route-action "uploadSuccess") error=(route-action "uploadError") uploadText=uploadLabel title="admin.backups.upload.title" class="btn-default"}}
         {{else}}
-          {{backup-uploader done="remoteUploadSuccess"}}
+          {{backup-uploader done=(route-action "remoteUploadSuccess")}}
         {{/if}}
 
         {{#if site.isReadOnly}}
-          {{d-button class="btn-default" icon="far-eye" action="toggleReadOnlyMode" disabled=status.isOperationRunning title="admin.backups.read_only.disable.title" label="admin.backups.read_only.disable.label"}}
+          {{d-button class="btn-default" icon="far-eye" action=(action "toggleReadOnlyMode") disabled=status.isOperationRunning title="admin.backups.read_only.disable.title" label="admin.backups.read_only.disable.label"}}
         {{else}}
-          {{d-button class="btn-default" icon="far-eye" action="toggleReadOnlyMode" disabled=status.isOperationRunning title="admin.backups.read_only.enable.title" label="admin.backups.read_only.enable.label"}}
+          {{d-button class="btn-default" icon="far-eye" action=(action "toggleReadOnlyMode") disabled=status.isOperationRunning title="admin.backups.read_only.enable.title" label="admin.backups.read_only.enable.label"}}
         {{/if}}
       </div>
 <table class="grid">
@@ -25,17 +25,17 @@
       <td class="backup-controls">
         <div>
           {{d-button class="btn-default download"
-                     action="download"
+                     action=(action "download")
                      actionParam=backup
                      icon="download"
                      title="admin.backups.operations.download.title"
                      label="admin.backups.operations.download.label"}}
           {{#if status.isOperationRunning}}
-            {{d-button icon="far-trash-alt" action="destroyBackup" actionParam=backup class="btn-danger" disabled="true" title="admin.backups.operations.is_running"}}
-            {{d-button icon="play" action="startRestore" actionParam=backup disabled=status.restoreDisabled class="btn-default" title=restoreTitle label="admin.backups.operations.restore.label"}}
+            {{d-button icon="far-trash-alt" action=(route-action "destroyBackup") actionParam=backup class="btn-danger" disabled="true" title="admin.backups.operations.is_running"}}
+            {{d-button icon="play" action=(route-action "startRestore") actionParam=backup disabled=status.restoreDisabled class="btn-default" title=restoreTitle label="admin.backups.operations.restore.label"}}
           {{else}}
-            {{d-button icon="far-trash-alt" action="destroyBackup" actionParam=backup class="btn-danger" title="admin.backups.operations.destroy.title"}}
-            {{d-button icon="play" action="startRestore" actionParam=backup disabled=status.restoreDisabled class="btn-default" title=restoreTitle label="admin.backups.operations.restore.label"}}
+            {{d-button icon="far-trash-alt" action=(route-action "destroyBackup") actionParam=backup class="btn-danger" title="admin.backups.operations.destroy.title"}}
+            {{d-button icon="play" action=(route-action "startRestore") actionParam=backup disabled=status.restoreDisabled class="btn-default" title=restoreTitle label="admin.backups.operations.restore.label"}}
           {{/if}}
         </div>
       </td>
diff --git a/app/assets/javascripts/admin/templates/backups.hbs b/app/assets/javascripts/admin/templates/backups.hbs
index 21b104a9b2..38810c41ec 100644
--- a/app/assets/javascripts/admin/templates/backups.hbs
+++ b/app/assets/javascripts/admin/templates/backups.hbs
@@ -7,7 +7,7 @@
         {{plugin-outlet name="downloader" tagName=""}}
         <div class="admin-actions">
           {{#if model.canRollback}}
-            {{d-button action="rollback"
+            {{d-button action=(route-action "rollback")
                        class="btn-default btn-rollback"
                        label="admin.backups.operations.rollback.label"
                        title="admin.backups.operations.rollback.title"
@@ -15,13 +15,13 @@
                        disabled=rollbackDisabled}}
           {{/if}}
           {{#if model.isOperationRunning}}
-            {{d-button action="cancelOperation"
+            {{d-button action=(route-action "cancelOperation")
                        class="btn-danger"
                        title="admin.backups.operations.cancel.title"
                        label="admin.backups.operations.cancel.label"
                        icon="times"}}
           {{else}}
-            {{d-button action="showStartBackupModal"
+            {{d-button action=(route-action "showStartBackupModal")
                        class="btn-primary"
                        title="admin.backups.operations.backup.title"
                        label="admin.backups.operations.backup.label"
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-table.hbs b/app/assets/javascripts/admin/templates/components/admin-report-table.hbs
index 2e6c528acc..6011407673 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report-table.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report-table.hbs
@@ -55,7 +55,7 @@
   {{#each pages as |pageState|}}
     {{d-button
       translatedLabel=pageState.page
-      action="changePage"
+      action=(action "changePage")
       actionParam=pageState.index
       class=pageState.class}}
   {{/each}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-report.hbs b/app/assets/javascripts/admin/templates/components/admin-report.hbs
index 69ec7a3fd8..1c82ee5a20 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report.hbs
@@ -115,7 +115,7 @@
           <div class="modes">
             {{#each displayedModes as |displayedMode|}}
               {{d-button
-                action="changeMode"
+                action=(action "changeMode")
                 actionParam=displayedMode.mode
                 class=displayedMode.cssClass
                 icon=displayedMode.icon}}
@@ -178,7 +178,7 @@
             <div class="input">
               {{d-button
                 class="btn-default export-csv-btn"
-                action="exportCsv"
+                action=(action "exportCsv")
                 label="admin.export_csv.button_text"
                 icon="download"}}
             </div>
@@ -190,7 +190,7 @@
             <div class="input">
               {{d-button
                 class="refresh-report-btn btn-primary"
-                action="refreshReport"
+                action=(action "refreshReport")
                 label="admin.dashboard.reports.refresh_report"
                 icon="refresh"}}
             </div>
diff --git a/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs b/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs
index 0074c99f1a..46c6ac46ae 100644
--- a/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs
@@ -34,8 +34,8 @@
   {{/admin-form-row}}
 
   {{#admin-form-row}}
-    {{d-button action="save" class="btn-primary" icon="check" label="admin.user_fields.save"}}
-    {{d-button action="cancel" class="btn-danger" icon="times" label="admin.user_fields.cancel"}}
+    {{d-button action=(action "save") class="btn-primary" icon="check" label="admin.user_fields.save"}}
+    {{d-button action=(action "cancel") class="btn-danger" icon="times" label="admin.user_fields.cancel"}}
   {{/admin-form-row}}
 {{else}}
   <div class="row">
@@ -46,10 +46,11 @@
     </div>
     <div class='form-display'>{{fieldName}}</div>
     <div class='form-element controls'>
-      {{d-button action="edit" class="btn-default" icon="pencil" label="admin.user_fields.edit"}}
-      {{d-button action="destroy" class="btn-danger" icon="trash-o" label="admin.user_fields.delete"}}
-      {{d-button action="moveUp" class="btn-default" icon="arrow-up" disabled=cantMoveUp}}
-      {{d-button action="moveDown" class="btn-default" icon="arrow-down" disabled=cantMoveDown}}
+      {{d-button action=(action "edit") class="btn-default" icon="pencil" label="admin.user_fields.edit"}}
+
+      {{d-button action=destroyAction actionParam=userField class="btn-danger" icon="trash-o" label="admin.user_fields.delete"}}
+      {{d-button action=moveUpAction actionParam=userField class="btn-default" icon="arrow-up" disabled=cantMoveUp}}
+      {{d-button action=moveDownAction actionParam=userField class="btn-default" icon="arrow-down" disabled=cantMoveDown}}
     </div>
   </div>
   <div class="row">{{flags}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/admin-web-hook-event.hbs b/app/assets/javascripts/admin/templates/components/admin-web-hook-event.hbs
index 026b6daae2..a98f8684f0 100644
--- a/app/assets/javascripts/admin/templates/components/admin-web-hook-event.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-web-hook-event.hbs
@@ -5,13 +5,13 @@
 <div class="col timestamp">{{createdAt}}</div>
 <div class="col completion">{{completion}}</div>
 <div class="col actions">
-  {{d-button icon='ellipsis-v' action='toggleRequest' label='admin.web_hooks.events.request'}}
-  {{d-button icon='ellipsis-v' action='toggleResponse' label='admin.web_hooks.events.response'}}
-  {{d-button icon='refresh' action='redeliver' label='admin.web_hooks.events.redeliver'}}
+  {{d-button icon="ellipsis-v" action=(action "toggleRequest") label="admin.web_hooks.events.request"}}
+  {{d-button icon="ellipsis-v" action=(action "toggleResponse") label="admin.web_hooks.events.response"}}
+  {{d-button icon="refresh" action=(action "redeliver") label="admin.web_hooks.events.redeliver"}}
 </div>
 {{#if expandDetails}}
   <div class="details">
-    <h3>{{i18n 'admin.web_hooks.events.headers'}}</h3>
+    <h3>{{i18n "admin.web_hooks.events.headers"}}</h3>
     <pre><code>{{headers}}</code></pre>
     <h3>{{bodyLabel}}</h3>
     <pre><code>{{body}}</code></pre>
diff --git a/app/assets/javascripts/admin/templates/components/embeddable-host.hbs b/app/assets/javascripts/admin/templates/components/embeddable-host.hbs
index 07f635bcf6..0c5acf8322 100644
--- a/app/assets/javascripts/admin/templates/components/embeddable-host.hbs
+++ b/app/assets/javascripts/admin/templates/components/embeddable-host.hbs
@@ -1,23 +1,23 @@
 {{#if editing}}
   <td class="editing-input">
     <div class="label">{{i18n "admin.embedding.host"}}</div>
-    {{input value=buffered.host placeholder="example.com" enter="save" class="host-name"}}
+    {{input value=buffered.host placeholder="example.com" enter=(action "save") class="host-name"}}
   </td>
 	<td class="editing-input">
     <div class="label">{{i18n "admin.embedding.class_name"}}</div>
-    {{input value=buffered.class_name placeholder="class" enter="save" class="class-name"}}
+    {{input value=buffered.class_name placeholder="class" enter=(action "save") class="class-name"}}
 	</td>
   <td class="editing-input">
     <div class="label">{{i18n "admin.embedding.path_whitelist"}}</div>
-    {{input value=buffered.path_whitelist placeholder="/blog/.*" enter="save" class="path-whitelist"}}
+    {{input value=buffered.path_whitelist placeholder="/blog/.*" enter=(action "save") class="path-whitelist"}}
   </td>
   <td class="editing-input">
     <div class="label">{{i18n "admin.embedding.category"}}</div>
     {{category-chooser value=categoryId class="small"}}
   </td>
   <td class="editing-controls">
-    {{d-button icon="check" action="save" class="btn-primary" disabled=cantSave}}
-    {{d-button icon="times" action="cancel" class="btn-danger" disabled=host.isSaving}}
+    {{d-button icon="check" action=(action "save") class="btn-primary" disabled=cantSave}}
+    {{d-button icon="times" action=(action "cancel") class="btn-danger" disabled=host.isSaving}}
   </td>
 {{else}}
   <td><div class="label">{{i18n "admin.embedding.host"}}</div>{{host.host}}</td>
@@ -25,7 +25,7 @@
   <td><div class="label">{{i18n "admin.embedding.path_whitelist"}}</div>{{host.path_whitelist}}</td>
   <td><div class="label">{{i18n "admin.embedding.category"}}</div>{{category-badge host.category}}</td>
   <td class="controls">
-    {{d-button icon="pencil" action="edit"}}
-    {{d-button icon="trash-o" action="delete" class='btn-danger'}}
+    {{d-button icon="pencil" action=(action "edit")}}
+    {{d-button icon="trash-o" action=(action "delete") class='btn-danger'}}
   </td>
-{{/if}}
\ No newline at end of file
+{{/if}}
diff --git a/app/assets/javascripts/admin/templates/components/flagged-post.hbs b/app/assets/javascripts/admin/templates/components/flagged-post.hbs
index 0ef0f3d8a4..98d0120bd6 100644
--- a/app/assets/javascripts/admin/templates/components/flagged-post.hbs
+++ b/app/assets/javascripts/admin/templates/components/flagged-post.hbs
@@ -78,14 +78,14 @@
           {{d-button
             title="admin.flags.disagree_flag_unhide_post_title"
             class="btn-default disagree-flag"
-            action="disagree"
+            action=(action "disagree")
             icon="thumbs-o-down"
             label="admin.flags.disagree_flag_unhide_post"}}
         {{else}}
           {{d-button
             title="admin.flags.disagree_flag_title"
             class="btn-default disagree-flag"
-            action="disagree"
+            action=(action "disagree")
             icon="thumbs-o-down"
             label="admin.flags.disagree_flag"}}
         {{/if}}
@@ -93,7 +93,7 @@
         {{d-button
           class="btn-default defer-flag"
           title="admin.flags.ignore_flag_title"
-          action="defer"
+          action=(action "defer")
           icon="external-link"
           label="admin.flags.ignore_flag"}}
 
diff --git a/app/assets/javascripts/admin/templates/components/inline-edit-checkbox.hbs b/app/assets/javascripts/admin/templates/components/inline-edit-checkbox.hbs
index 3a651ad0df..7c8e0f280e 100644
--- a/app/assets/javascripts/admin/templates/components/inline-edit-checkbox.hbs
+++ b/app/assets/javascripts/admin/templates/components/inline-edit-checkbox.hbs
@@ -3,6 +3,6 @@
   {{label}}
 </label>
 {{#if changed}}
-  {{d-button action="finished" class="btn-primary btn-small submit-edit" icon="check"}}
-  {{d-button action="cancelled" class="btn-small cancel-edit" icon="times"}}
+  {{d-button action=(action "finished") class="btn-primary btn-small submit-edit" icon="check"}}
+  {{d-button action=(action "cancelled") class="btn-small cancel-edit" icon="times"}}
 {{/if}}
diff --git a/app/assets/javascripts/admin/templates/components/permalink-form.hbs b/app/assets/javascripts/admin/templates/components/permalink-form.hbs
index dc37c00991..7357ede526 100644
--- a/app/assets/javascripts/admin/templates/components/permalink-form.hbs
+++ b/app/assets/javascripts/admin/templates/components/permalink-form.hbs
@@ -2,4 +2,4 @@
 {{text-field value=url disabled=formSubmitted class="permalink-url" placeholderKey="admin.permalink.url" autocorrect="off" autocapitalize="off"}}
 {{combo-box content=permalinkTypes value=permalinkType}}
 {{text-field value=permalink_type_value disabled=formSubmitted class="external-url" placeholderKey=permalinkTypePlaceholder autocorrect="off" autocapitalize="off"}}
-{{d-button class="btn-default" action="submit" disabled=formSubmitted label="admin.permalink.form.add"}}
+{{d-button class="btn-default" action=(action "submit") disabled=formSubmitted label="admin.permalink.form.add"}}
diff --git a/app/assets/javascripts/admin/templates/components/save-controls.hbs b/app/assets/javascripts/admin/templates/components/save-controls.hbs
index 00ac91331f..d6974ea108 100644
--- a/app/assets/javascripts/admin/templates/components/save-controls.hbs
+++ b/app/assets/javascripts/admin/templates/components/save-controls.hbs
@@ -1,4 +1,4 @@
-{{d-button action="saveChanges" disabled=buttonDisabled label=savingText class="btn-primary save-changes"}}
+{{d-button action=action disabled=buttonDisabled label=savingText class="btn-primary save-changes"}}
 {{yield}}
 <div class='save-messages'>
   {{#if saved}}
diff --git a/app/assets/javascripts/admin/templates/components/screened-ip-address-form.hbs b/app/assets/javascripts/admin/templates/components/screened-ip-address-form.hbs
index 82fb3162e2..6bc99fdbd1 100644
--- a/app/assets/javascripts/admin/templates/components/screened-ip-address-form.hbs
+++ b/app/assets/javascripts/admin/templates/components/screened-ip-address-form.hbs
@@ -1,4 +1,4 @@
 <b>{{i18n 'admin.logs.screened_ips.form.label'}}</b>
 {{text-field value=ip_address disabled=formSubmitted class="ip-address-input" placeholderKey="admin.logs.screened_ips.form.ip_address" autocorrect="off" autocapitalize="off"}}
 {{combo-box content=actionNames value=actionName}}
-{{d-button class="btn-default" action="submit" disabled=formSubmitted label="admin.logs.screened_ips.form.add"}}
+{{d-button class="btn-default" action=(action "submit") disabled=formSubmitted label="admin.logs.screened_ips.form.add"}}
diff --git a/app/assets/javascripts/admin/templates/components/secret-value-list.hbs b/app/assets/javascripts/admin/templates/components/secret-value-list.hbs
index a2f44f1553..5674d6d7d7 100644
--- a/app/assets/javascripts/admin/templates/components/secret-value-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/secret-value-list.hbs
@@ -2,7 +2,7 @@
   <div class="values">
     {{#each collection as |value index|}}
       <div class="value" data-index={{index}}>
-        {{d-button action="removeValue"
+        {{d-button action=(action "removeValue")
                    actionParam=value
                    icon="times"
                    class="remove-value-btn btn-small"}}
@@ -16,7 +16,7 @@
 <div class="value">
   {{text-field value=newKey class="new-value-input key" placeholder=setting.placeholder.key}}
   {{input type="password" value=newSecret class="new-value-input secret" placeholder=setting.placeholder.value}}
-  {{d-button action="addValue"
+  {{d-button action=(action "addValue")
              icon="plus"
              class="add-value-btn btn-small"}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/components/site-setting.hbs b/app/assets/javascripts/admin/templates/components/site-setting.hbs
index a832080ea7..03f6342cda 100644
--- a/app/assets/javascripts/admin/templates/components/site-setting.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-setting.hbs
@@ -6,12 +6,12 @@
 </div>
 {{#if dirty}}
   <div class='setting-controls'>
-    {{d-button class="ok" action="save" icon="check"}}
-    {{d-button class="cancel" action="cancel" icon="times"}}
+    {{d-button class="ok" action=(action "save") icon="check"}}
+    {{d-button class="cancel" action=(action "cancel") icon="times"}}
   </div>
 {{else if setting.overridden}}
   {{#if setting.secret}}
-    {{d-button action="toggleSecret" icon="eye-slash"}}
+    {{d-button action=(action "toggleSecret") icon="eye-slash"}}
   {{/if}}
-  {{d-button class="btn-default undo" action="resetDefault" icon="undo" label="admin.settings.reset"}}
+  {{d-button class="btn-default undo" action=(action "resetDefault") icon="undo" label="admin.settings.reset"}}
 {{/if}}
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs b/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs
index 3de2abc489..86750e634d 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs
@@ -1,2 +1,2 @@
-{{d-button label="admin.site_settings.uploaded_image_list.label" action="showUploadModal" actionParam=(hash value=value setting=setting)}}
+{{d-button label="admin.site_settings.uploaded_image_list.label" action=(action "showUploadModal") actionParam=(hash value=value setting=setting)}}
 <div class='desc'>{{{unbound setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/site-text-summary.hbs b/app/assets/javascripts/admin/templates/components/site-text-summary.hbs
index 60cfc9843d..c0c7063309 100644
--- a/app/assets/javascripts/admin/templates/components/site-text-summary.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-text-summary.hbs
@@ -1,4 +1,4 @@
-{{d-button label="admin.site_text.edit" class='btn-default edit' action="edit"}}
+{{d-button label="admin.site_text.edit" class='btn-default edit' action=editAction actionParam=siteText}}
 <h3 class='site-text-id'>{{siteText.id}}</h3>
 <div class='site-text-value'>{{siteText.value}}</div>
 
diff --git a/app/assets/javascripts/admin/templates/components/tags-uploader.hbs b/app/assets/javascripts/admin/templates/components/tags-uploader.hbs
index dab22c2ed7..db3c9aa301 100644
--- a/app/assets/javascripts/admin/templates/components/tags-uploader.hbs
+++ b/app/assets/javascripts/admin/templates/components/tags-uploader.hbs
@@ -1,6 +1,6 @@
-  <label class="btn {{if addDisabled 'disabled'}}">
-    {{d-icon "upload"}}
-    {{i18n 'admin.watched_words.form.upload'}}
-    <input class="hidden-upload-field" disabled={{addDisabled}} type="file" accept="text/plain,text/csv" />
-  </label>
-  <span class="instructions">{{i18n 'tagging.upload_instructions'}}</span>
+<label class="btn {{if addDisabled 'disabled'}}">
+  {{d-icon "upload"}}
+  {{i18n 'admin.watched_words.form.upload'}}
+  <input class="hidden-upload-field" disabled={{addDisabled}} type="file" accept="text/plain,text/csv" />
+</label>
+<span class="instructions">{{i18n 'tagging.upload_instructions'}}</span>
diff --git a/app/assets/javascripts/admin/templates/components/value-list.hbs b/app/assets/javascripts/admin/templates/components/value-list.hbs
index d74b600ca4..372de2ac1d 100644
--- a/app/assets/javascripts/admin/templates/components/value-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/value-list.hbs
@@ -2,7 +2,7 @@
   <div class='values'>
     {{#each collection as |value index|}}
       <div class='value' data-index={{index}}>
-        {{d-button action="removeValue"
+        {{d-button action=(action "removeValue")
                    actionParam=value
                    icon="times"
                    class="btn-default remove-value-btn btn-small"}}
diff --git a/app/assets/javascripts/admin/templates/components/watched-word-form.hbs b/app/assets/javascripts/admin/templates/components/watched-word-form.hbs
index 2b109e7385..13454f21a5 100644
--- a/app/assets/javascripts/admin/templates/components/watched-word-form.hbs
+++ b/app/assets/javascripts/admin/templates/components/watched-word-form.hbs
@@ -1,6 +1,6 @@
 <b>{{i18n 'admin.watched_words.form.label'}}</b>
 {{text-field value=word disabled=formSubmitted class="watched-word-input" autocorrect="off" autocapitalize="off" placeholderKey=placeholderKey}}
-{{d-button class="btn-default" action="submit" disabled=formSubmitted label="admin.watched_words.form.add"}}
+{{d-button class="btn-default" action=(action "submit") disabled=formSubmitted label="admin.watched_words.form.add"}}
 
 {{#if showMessage}}
   <span class="success-message">{{message}}</span>
diff --git a/app/assets/javascripts/admin/templates/customize-email-templates-edit.hbs b/app/assets/javascripts/admin/templates/customize-email-templates-edit.hbs
index c23e3caef0..a1e3910e11 100644
--- a/app/assets/javascripts/admin/templates/customize-email-templates-edit.hbs
+++ b/app/assets/javascripts/admin/templates/customize-email-templates-edit.hbs
@@ -10,9 +10,9 @@
   <label>{{i18n "admin.customize.email_templates.body"}}</label>
   {{d-editor value=buffered.body}}
 
-  {{#save-controls model=emailTemplate action="saveChanges" saved=saved}}
+  {{#save-controls model=emailTemplate action=(action "saveChanges") saved=saved}}
     {{#if emailTemplate.can_revert}}
-      {{d-button action="revertChanges" label="admin.customize.email_templates.revert"}}
+      {{d-button action=(action "revertChanges") label="admin.customize.email_templates.revert"}}
     {{/if}}
   {{/save-controls}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/customize-themes-edit.hbs b/app/assets/javascripts/admin/templates/customize-themes-edit.hbs
index 0ec171dfa8..4807209639 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-edit.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-edit.hbs
@@ -69,7 +69,7 @@
       </div>
 
       <div class='buttons'>
-        {{#d-button action="save" disabled=saveDisabled class='btn-primary'}}
+        {{#d-button action=(action "save") disabled=saveDisabled class='btn-primary'}}
           {{saveButtonText}}
         {{/d-button}}
       </div>
diff --git a/app/assets/javascripts/admin/templates/customize-themes-show.hbs b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
index fd540a694e..c1922f4ff1 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-show.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
@@ -2,8 +2,8 @@
   <div class="title">
     {{#if editingName}}
       {{text-field value=model.name autofocus="true"}}
-      {{d-button action="finishedEditingName" class="btn-primary btn-small submit-edit" icon="check"}}
-      {{d-button action="cancelEditingName" class="btn-small cancel-edit" icon="times"}}
+      {{d-button action=(action "finishedEditingName") class="btn-primary submit-edit" icon="check"}}
+      {{d-button action=(action "cancelEditingName") class="btn-default cancel-edit" icon="times"}}
     {{else}}
       {{model.name}} <a {{action "startEditingName"}}>{{d-icon "pencil"}}</a>
     {{/if}}
@@ -36,8 +36,8 @@
 
   {{#unless model.component}}
     <div class="control-unit">
-      {{inline-edit-checkbox action="applyDefault" labelKey="admin.customize.theme.is_default" checked=model.default}}
-      {{inline-edit-checkbox action="applyUserSelectable" labelKey="admin.customize.theme.user_selectable" checked=model.user_selectable}}
+      {{inline-edit-checkbox action=(action "applyDefault") labelKey="admin.customize.theme.is_default" checked=model.default}}
+      {{inline-edit-checkbox action=(action "applyUserSelectable") labelKey="admin.customize.theme.user_selectable" checked=model.user_selectable}}
     </div>
 
     <div class="control-unit">
@@ -49,8 +49,8 @@
                                        value=colorSchemeId
                                        icon="paint-brush"}}
          {{#if colorSchemeChanged}}
-            {{d-button action="changeScheme" class="btn-primary btn-small submit-edit" icon="check"}}
-            {{d-button action="cancelChangeScheme" class="btn-default btn-small cancel-edit" icon="times"}}
+            {{d-button action=(action "changeScheme") class="btn-primary submit-edit" icon="check"}}
+            {{d-button action=(action "cancelChangeScheme") class="btn-default cancel-edit" icon="times"}}
          {{/if}}
       </div>
       {{#link-to 'adminCustomize.colors' class="btn btn-default edit"}}{{i18n 'admin.customize.colors.edit'}}{{/link-to}}
@@ -74,13 +74,13 @@
 
     {{#if model.remote_theme}}
       {{#if model.remote_theme.commits_behind}}
-        {{#d-button action="updateToLatest" icon="download" class='btn-primary'}}{{i18n "admin.customize.theme.update_to_latest"}}{{/d-button}}
+        {{#d-button action=(action "updateToLatest") icon="download" class='btn-primary'}}{{i18n "admin.customize.theme.update_to_latest"}}{{/d-button}}
       {{else}}
-        {{#d-button action="checkForThemeUpdates" icon="refresh" class="btn-default"}}{{i18n "admin.customize.theme.check_for_updates"}}{{/d-button}}
+        {{#d-button action=(action "checkForThemeUpdates") icon="refresh" class="btn-default"}}{{i18n "admin.customize.theme.check_for_updates"}}{{/d-button}}
       {{/if}}
     {{/if}}
 
-    {{#d-button action="editTheme" class="btn btn-default edit"}}{{i18n 'admin.customize.theme.edit_css_html'}}{{/d-button}}
+    {{#d-button action=(action "editTheme") class="btn btn-default edit"}}{{i18n 'admin.customize.theme.edit_css_html'}}{{/d-button}}
     {{#if model.remote_theme}}
       <span class='status-message'>
         {{#if updatingRemote}}
@@ -119,7 +119,7 @@
         <li>
           <span class='col'>${{upload.name}}: <a href={{upload.url}} target='_blank'>{{upload.filename}}</a></span>
           <span class='col'>
-            {{d-button action="removeUpload" actionParam=upload class="second btn-default btn-small cancel-edit" icon="times"}}
+            {{d-button action=(action "removeUpload") actionParam=upload class="second btn-default btn-default cancel-edit" icon="times"}}
           </span>
         </li>
         {{/each}}
@@ -127,7 +127,7 @@
     {{else}}
       <div class="description">{{i18n "admin.customize.theme.no_uploads"}}</div>
     {{/if}}
-    {{#d-button action="addUploadModal" class="btn-default" icon="plus"}}{{i18n "admin.customize.theme.add"}}{{/d-button}}
+    {{#d-button action=(action "addUploadModal") class="btn-default" icon="plus"}}{{i18n "admin.customize.theme.add"}}{{/d-button}}
   </div>
 
   {{#if hasSettings}}
@@ -147,14 +147,14 @@
       {{#if model.childThemes.length}}
         <ul class='removable-list'>
           {{#each model.childThemes as |child|}}
-            <li>{{#link-to 'adminCustomizeThemes.show' child replace=true class='col'}}{{child.name}}{{/link-to}} {{d-button action="removeChildTheme" actionParam=child class="btn-default btn-small cancel-edit col" icon="times"}}</li>
+            <li>{{#link-to 'adminCustomizeThemes.show' child replace=true class='col'}}{{child.name}}{{/link-to}} {{d-button action=(action "removeChildTheme") actionParam=child class="btn-default cancel-edit col" icon="times"}}</li>
           {{/each}}
         </ul>
       {{/if}}
       {{#if selectableChildThemes}}
         <div class="description">
           {{combo-box forceEscape=true filterable=true content=selectableChildThemes value=selectedChildThemeId none="admin.customize.theme.select_component"}}
-          {{#d-button action="addChildTheme" icon="plus" disabled=addButtonDisabled class="btn-default add-component-button"}}{{i18n "admin.customize.theme.add"}}{{/d-button}}
+          {{#d-button action=(action "addChildTheme") icon="plus" disabled=addButtonDisabled class="btn-default add-component-button"}}{{i18n "admin.customize.theme.add"}}{{/d-button}}
         </div>
       {{/if}}
     </div>
@@ -163,6 +163,6 @@
   <a href='{{previewUrl}}' title="{{i18n 'admin.customize.explain_preview'}}" target='_blank' class='btn btn-default'>{{d-icon 'desktop'}}{{i18n 'admin.customize.theme.preview'}}</a>
   <a class="btn btn-default export" target="_blank" href={{downloadUrl}}>{{d-icon "download"}} {{i18n 'admin.export_json.button_text'}}</a>
 
-  {{d-button action="switchType" label="admin.customize.theme.convert" icon=convertIcon class="btn-default btn-normal" title=convertTooltip}}
-  {{d-button action="destroy" label="admin.customize.delete" icon="trash" class="btn-danger"}}
+  {{d-button action=(action "switchType") label="admin.customize.theme.convert" icon=convertIcon class="btn-default btn-normal" title=convertTooltip}}
+  {{d-button action=(action "destroy") label="admin.customize.delete" icon="trash" class="btn-danger"}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/customize-themes.hbs b/app/assets/javascripts/admin/templates/customize-themes.hbs
index 82985568c2..268febd435 100644
--- a/app/assets/javascripts/admin/templates/customize-themes.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes.hbs
@@ -3,8 +3,8 @@
 
 
     <div class="create-actions">
-      {{d-button label="admin.customize.new" icon="plus" action="showCreateModal" class="btn-primary"}}
-      {{d-button action="importModal" icon="upload" label="admin.customize.import" class="btn-default"}}
+      {{d-button label="admin.customize.new" icon="plus" action=(route-action "showCreateModal") class="btn-primary"}}
+      {{d-button action=(route-action "importModal") icon="upload" label="admin.customize.import" class="btn-default"}}
     </div>
   </div>
   {{themes-list themes=fullThemes components=childThemes currentTab=currentTab}}
diff --git a/app/assets/javascripts/admin/templates/dashboard-problems.hbs b/app/assets/javascripts/admin/templates/dashboard-problems.hbs
index c0c6b9ca0b..a97d800540 100644
--- a/app/assets/javascripts/admin/templates/dashboard-problems.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard-problems.hbs
@@ -18,8 +18,8 @@
         </div>
 
         <p class="actions">
-          <small>{{i18n 'admin.dashboard.last_checked'}}: {{problemsTimestamp}}</small>
-          {{d-button action="refreshProblems" class="btn-default btn-small" icon="refresh" label="admin.dashboard.refresh_problems"}}
+          {{d-button action=(action "refreshProblems") class="btn-default" icon="refresh" label="admin.dashboard.refresh_problems"}}
+          {{i18n 'admin.dashboard.last_checked'}}: {{problemsTimestamp}}
         </p>
       {{/conditional-loading-section}}
     </div>
diff --git a/app/assets/javascripts/admin/templates/dashboard_next_general.hbs b/app/assets/javascripts/admin/templates/dashboard_next_general.hbs
index a9bfd44c19..000fcf152c 100644
--- a/app/assets/javascripts/admin/templates/dashboard_next_general.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard_next_general.hbs
@@ -9,7 +9,7 @@
             {{i18n "admin.dashboard.community_health"}}
           </a>
         </h2>
-        {{period-chooser period=period action="changePeriod" content=availablePeriods fullDay=true}}
+        {{period-chooser period=period action=(action "changePeriod") content=availablePeriods fullDay=true}}
       </div>
 
       <div class="section-body">
diff --git a/app/assets/javascripts/admin/templates/dashboard_next_moderation.hbs b/app/assets/javascripts/admin/templates/dashboard_next_moderation.hbs
index 8959bac021..300b7c36e7 100644
--- a/app/assets/javascripts/admin/templates/dashboard_next_moderation.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard_next_moderation.hbs
@@ -10,7 +10,7 @@
       </h2>
       {{period-chooser
         period=period
-        action="changePeriod"
+        action=(action "changePeriod")
         content=availablePeriods
         fullDay=true}}
     </div>
diff --git a/app/assets/javascripts/admin/templates/email-bounced.hbs b/app/assets/javascripts/admin/templates/email-bounced.hbs
index 9ebbb7d316..dc9c2e2b7f 100644
--- a/app/assets/javascripts/admin/templates/email-bounced.hbs
+++ b/app/assets/javascripts/admin/templates/email-bounced.hbs
@@ -1,4 +1,4 @@
-{{#load-more selector=".email-list tr" action="loadMore"}}
+{{#load-more selector=".email-list tr" action=(action "loadMore")}}
   <table class='table email-list'>
     <thead>
       <tr>
diff --git a/app/assets/javascripts/admin/templates/email-received.hbs b/app/assets/javascripts/admin/templates/email-received.hbs
index c1e679b179..8a164e3ff8 100644
--- a/app/assets/javascripts/admin/templates/email-received.hbs
+++ b/app/assets/javascripts/admin/templates/email-received.hbs
@@ -1,4 +1,4 @@
-{{#load-more selector=".email-list tr" action="loadMore"}}
+{{#load-more selector=".email-list tr" action=(action "loadMore")}}
   <table class='table email-list'>
     <thead>
       <tr>
diff --git a/app/assets/javascripts/admin/templates/email-rejected.hbs b/app/assets/javascripts/admin/templates/email-rejected.hbs
index 310a5bba16..43744a919b 100644
--- a/app/assets/javascripts/admin/templates/email-rejected.hbs
+++ b/app/assets/javascripts/admin/templates/email-rejected.hbs
@@ -1,4 +1,4 @@
-{{#load-more selector=".email-list tr" action="loadMore"}}
+{{#load-more selector=".email-list tr" action=(action "loadMore")}}
   <table class='table email-list'>
     <thead>
       <tr>
diff --git a/app/assets/javascripts/admin/templates/email-sent.hbs b/app/assets/javascripts/admin/templates/email-sent.hbs
index a8b2d57fae..83bb5b56d8 100644
--- a/app/assets/javascripts/admin/templates/email-sent.hbs
+++ b/app/assets/javascripts/admin/templates/email-sent.hbs
@@ -1,4 +1,4 @@
-{{#load-more selector=".email-list tr" action="loadMore"}}
+{{#load-more selector=".email-list tr" action=(action "loadMore")}}
   <table class='table email-list'>
     <thead>
       <tr>
diff --git a/app/assets/javascripts/admin/templates/email-skipped.hbs b/app/assets/javascripts/admin/templates/email-skipped.hbs
index ce5bbaf874..0ca7fed0a7 100644
--- a/app/assets/javascripts/admin/templates/email-skipped.hbs
+++ b/app/assets/javascripts/admin/templates/email-skipped.hbs
@@ -1,4 +1,4 @@
-{{#load-more selector=".email-list tr" action="loadMore"}}
+{{#load-more selector=".email-list tr" action=(action "loadMore")}}
   <table class='table email-list'>
     <thead>
       <tr>
diff --git a/app/assets/javascripts/admin/templates/embedding.hbs b/app/assets/javascripts/admin/templates/embedding.hbs
index d9e97c1c5a..45f86da9f7 100644
--- a/app/assets/javascripts/admin/templates/embedding.hbs
+++ b/app/assets/javascripts/admin/templates/embedding.hbs
@@ -10,7 +10,7 @@
       </thead>
       <tbody>
       {{#each embedding.embeddable_hosts as |host|}}
-        {{embeddable-host host=host deleteHost="deleteHost"}}
+        {{embeddable-host host=host deleteHost=(action "deleteHost")}}
       {{/each}}
       </tbody>
     </table>
@@ -18,7 +18,7 @@
     <p>{{i18n "admin.embedding.get_started"}}</p>
   {{/if}}
 
-  {{d-button label="admin.embedding.add_host" action="addHost" icon="plus" class="btn-primary add-host"}}
+  {{d-button label="admin.embedding.add_host" action=(action "addHost") icon="plus" class="btn-primary add-host"}}
 </div>
 
 {{#if showSecondary}}
@@ -69,7 +69,7 @@
 
   <div class='embedding-secondary'>
     {{d-button label="admin.embedding.save"
-               action="saveChanges"
+               action=(action "saveChanges")
                class="btn-primary embed-save"
                disabled=embedding.isSaving}}
 
diff --git a/app/assets/javascripts/admin/templates/emojis.hbs b/app/assets/javascripts/admin/templates/emojis.hbs
index 4cf568fd45..479b7421d6 100644
--- a/app/assets/javascripts/admin/templates/emojis.hbs
+++ b/app/assets/javascripts/admin/templates/emojis.hbs
@@ -3,7 +3,7 @@
 
   <p class="desc">{{i18n 'admin.emoji.help'}}</p>
 
-  <p>{{emoji-uploader done="emojiUploaded"}}</p>
+  <p>{{emoji-uploader done=(action "emojiUploaded")}}</p>
 
   {{#if sortedEmojis}}
     <div>
diff --git a/app/assets/javascripts/admin/templates/flags-topics-index.hbs b/app/assets/javascripts/admin/templates/flags-topics-index.hbs
index 9a37bc78fc..73cd022fc1 100644
--- a/app/assets/javascripts/admin/templates/flags-topics-index.hbs
+++ b/app/assets/javascripts/admin/templates/flags-topics-index.hbs
@@ -16,7 +16,10 @@
         {{plugin-outlet name="flagged-topic-row" noTags=true args=(hash topic=ft.topic)}}
 
         <td class="topic-title">
-          <a href={{ft.topic.relative_url}} target="_blank">{{replace-emoji ft.topic.fancy_title}}</a>
+          <div class='combined-title'>
+            {{topic-status topic=ft.topic}}
+            <a href={{ft.topic.relative_url}} target="_blank">{{replace-emoji ft.topic.fancy_title}}</a>
+          </div>
         </td>
         <td class="flag-counts">
           {{#each ft.flag_counts as |fc|}}
diff --git a/app/assets/javascripts/admin/templates/logs/screened-emails.hbs b/app/assets/javascripts/admin/templates/logs/screened-emails.hbs
index 2d96b2a38e..532e68c29c 100644
--- a/app/assets/javascripts/admin/templates/logs/screened-emails.hbs
+++ b/app/assets/javascripts/admin/templates/logs/screened-emails.hbs
@@ -30,7 +30,7 @@
           <td class="created_at"><div class="label">{{i18n 'admin.logs.created_at'}}</div>{{age-with-tooltip item.created_at}}</td>
           <td class="ip_address">{{item.ip_address}}</td>
           <td class="action">
-            {{d-button action="clearBlock" actionParam=item icon="check" label="admin.logs.screened_emails.actions.allow"}}
+            {{d-button action=(action "clearBlock") actionParam=item icon="check" label="admin.logs.screened_emails.actions.allow"}}
           </td>
         </tr>
       {{/each}}
diff --git a/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs b/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs
index ea7bc1da7d..68a7bbc568 100644
--- a/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs
+++ b/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs
@@ -3,10 +3,10 @@
 <div class="screened-ip-controls">
   <div class="filter-screened-ip-address"> 
     {{text-field value=filter class="ip-address-input" placeholderKey="admin.logs.screened_ips.form.filter" autocorrect="off" autocapitalize="off"}}
-    {{d-button class="btn-default" action="rollUp" title="admin.logs.screened_ips.roll_up.title" label="admin.logs.screened_ips.roll_up.text"}}
-    {{d-button class="btn-default" action="exportScreenedIpList" icon="download" title="admin.export_csv.button_title.screened_ip" label="admin.export_csv.button_text"}}
+    {{d-button class="btn-default" action=(action "rollUp") title="admin.logs.screened_ips.roll_up.title" label="admin.logs.screened_ips.roll_up.text"}}
+    {{d-button class="btn-default" action=(action "exportScreenedIpList") icon="download" title="admin.export_csv.button_title.screened_ip" label="admin.export_csv.button_text"}}
   </div>
-    {{screened-ip-address-form action="recordAdded"}}
+    {{screened-ip-address-form action=(action "recordAdded")}}
 </div>
 
 
@@ -57,15 +57,15 @@
           </td>
           <td class="col actions">
             {{#unless item.editing}}
-              {{d-button class="btn-default" action="destroy" actionParam=item icon="trash-o" class="btn-danger"}}
-              {{d-button class="btn-default"action="edit" actionParam=item icon="pencil"}}
+              {{d-button class="btn-default" action=(action "destroy") actionParam=item icon="trash-o" class="btn-danger"}}
+              {{d-button class="btn-default"action=(action "edit") actionParam=item icon="pencil"}}
               {{#if item.isBlocked}}
-                {{d-button class="btn-default" action="allow" actionParam=item icon="check" label="admin.logs.screened_ips.actions.do_nothing"}}
+                {{d-button class="btn-default" action=(action "allow") actionParam=item icon="check" label="admin.logs.screened_ips.actions.do_nothing"}}
               {{else}}
-                {{d-button class="btn-default" action="block" actionParam=item icon="ban" label="admin.logs.screened_ips.actions.block"}}
+                {{d-button class="btn-default" action=(action "block") actionParam=item icon="ban" label="admin.logs.screened_ips.actions.block"}}
               {{/if}}
             {{else}}
-              {{d-button class="btn-default" action="save" actionParam=item label="admin.logs.save"}}
+              {{d-button class="btn-default" action=(action "save") actionParam=item label="admin.logs.save"}}
               <a {{action "cancel" item}}>{{i18n 'cancel'}}</a>
             {{/unless}}
           </td>
diff --git a/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
index 63ce3d41ab..822dfce0a7 100644
--- a/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
+++ b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
@@ -33,7 +33,7 @@
     {{i18n "admin.logs.staff_actions.filter"}} {{combo-box content=userHistoryActions value=filterActionId none="admin.logs.staff_actions.all"}}
   {{/if}}
 
-  {{d-button class="btn-default" action="exportStaffActionLogs" label="admin.export_csv.button_text" icon="download"}}
+  {{d-button class="btn-default" action=(action "exportStaffActionLogs") label="admin.export_csv.button_text" icon="download"}}
 </div>
 <div class="clearfix"></div>
 
diff --git a/app/assets/javascripts/admin/templates/modal/admin-add-upload.hbs b/app/assets/javascripts/admin/templates/modal/admin-add-upload.hbs
index decedce611..f59c73b89e 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-add-upload.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-add-upload.hbs
@@ -17,6 +17,6 @@
 {{/d-modal-body}}
 
 <div class="modal-footer">
-  {{d-button action="upload" disabled=disabled class='btn btn-primary' icon='upload' label='admin.customize.theme.upload'}}
-  {{d-modal-cancel close=(action "closeModal")}}
+  {{d-button action=(action "upload") disabled=disabled class='btn btn-primary' icon='upload' label='admin.customize.theme.upload'}}
+  {{d-modal-cancel close=(route-action "closeModal")}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/modal/admin-create-theme.hbs b/app/assets/javascripts/admin/templates/modal/admin-create-theme.hbs
index 2d5c8d6939..788aa03a8d 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-create-theme.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-create-theme.hbs
@@ -25,6 +25,6 @@
 {{/d-modal-body}}
 
 <div class="modal-footer">
-  {{d-button class="btn btn-primary" label="admin.customize.theme.create" action="createTheme" disabled=saving}}
-  {{d-modal-cancel close=(action "closeModal")}}
+  {{d-button class="btn btn-primary" label="admin.customize.theme.create" action=(action "createTheme") disabled=saving}}
+  {{d-modal-cancel close=(route-action "closeModal")}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/modal/admin-edit-badge-groupings.hbs b/app/assets/javascripts/admin/templates/modal/admin-edit-badge-groupings.hbs
index 3776f949fb..958467e6b7 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-edit-badge-groupings.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-edit-badge-groupings.hbs
@@ -26,5 +26,5 @@
 
 <div class="modal-footer">
   <button class='btn btn-primary' {{action "saveAll"}} disabled={{submitDisabled}}>{{i18n 'admin.badges.save'}}</button>
-  {{d-modal-cancel close=(action "closeModal")}}
+  {{d-modal-cancel close=(route-action "closeModal")}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/modal/admin-import-theme.hbs b/app/assets/javascripts/admin/templates/modal/admin-import-theme.hbs
index b5fbe4a078..e252638589 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-import-theme.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-import-theme.hbs
@@ -44,6 +44,6 @@
 {{/d-modal-body}}
 
 <div class="modal-footer">
-  {{d-button action="importTheme" disabled=importDisabled class='btn btn-primary' icon='upload' label='admin.customize.import'}}
-  {{d-modal-cancel close=(action "closeModal")}}
+  {{d-button action=(action "importTheme") disabled=importDisabled class='btn btn-primary' icon='upload' label='admin.customize.import'}}
+  {{d-modal-cancel close=(route-action "closeModal")}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/modal/admin-moderation-history.hbs b/app/assets/javascripts/admin/templates/modal/admin-moderation-history.hbs
index 4abc13e7f3..b79f4bdf30 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-moderation-history.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-moderation-history.hbs
@@ -19,5 +19,5 @@
   {{/conditional-loading-spinner}}
 {{/d-modal-body}}
 <div class="modal-footer">
-  {{d-button action=(action "closeModal") label="close"}}
+  {{d-button action=(route-action "closeModal") label="close"}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/modal/admin-silence-user.hbs b/app/assets/javascripts/admin/templates/modal/admin-silence-user.hbs
index 035c773897..fc4d223ac7 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-silence-user.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-silence-user.hbs
@@ -27,10 +27,10 @@
 <div class="modal-footer">
   {{d-button
     class="btn-danger perform-silence"
-    action="silence"
+    action=(action "silence")
     disabled=submitDisabled
     icon="microphone-slash"
     label="admin.user.silence"}}
-  {{d-modal-cancel close=(action "closeModal")}}
+  {{d-modal-cancel close=(route-action "closeModal")}}
   {{conditional-loading-spinner condition=loading size="small"}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/modal/admin-staff-action-log-details.hbs b/app/assets/javascripts/admin/templates/modal/admin-staff-action-log-details.hbs
index e8e8cd8d2e..3039e95b13 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-staff-action-log-details.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-staff-action-log-details.hbs
@@ -2,5 +2,5 @@
   <pre>{{model.details}}</pre>
 {{/d-modal-body}}
 <div class="modal-footer">
-  {{d-button action=(action "closeModal") label="close"}}
+  {{d-button action=(route-action "closeModal") label="close"}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs b/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs
index cd7031bb8a..6a1c9c28f4 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs
@@ -34,10 +34,10 @@
 <div class="modal-footer">
   {{d-button
     class="btn-danger perform-suspend"
-    action="suspend"
+    action=(action "suspend")
     disabled=submitDisabled
     icon="ban"
     label="admin.user.suspend"}}
-  {{d-modal-cancel close=(action "closeModal")}}
+  {{d-modal-cancel close=(route-action "closeModal")}}
   {{conditional-loading-spinner condition=loading size="small"}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/modal/admin-theme-change.hbs b/app/assets/javascripts/admin/templates/modal/admin-theme-change.hbs
index 3fbaf0ac86..1b6b06870a 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-theme-change.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-theme-change.hbs
@@ -3,6 +3,6 @@
     {{{diff}}}
   {{/d-modal-body}}
   <div class="modal-footer">
-    <button class='btn btn-primary' {{action "closeModal"}}>{{i18n 'close'}}</button>
+    {{d-button class="btn btn-primary" action=(route-action "closeModal") label="close"}}
   </div>
 </div>
diff --git a/app/assets/javascripts/admin/templates/modal/admin-uploaded-image-list.hbs b/app/assets/javascripts/admin/templates/modal/admin-uploaded-image-list.hbs
index 72d0fe94b8..10af81306c 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-uploaded-image-list.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-uploaded-image-list.hbs
@@ -11,5 +11,5 @@
 {{/d-modal-body}}
 <div class="modal-footer">
   {{d-button action=(action "close") label="close"}}
-  {{images-uploader uploading=uploading done="uploadDone" class="pull-right"}}
+  {{images-uploader uploading=uploading done=(action "uploadDone") class="pull-right"}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/permalinks.hbs b/app/assets/javascripts/admin/templates/permalinks.hbs
index 4dd4300599..75d3d6edce 100644
--- a/app/assets/javascripts/admin/templates/permalinks.hbs
+++ b/app/assets/javascripts/admin/templates/permalinks.hbs
@@ -4,7 +4,7 @@
 <div class="permalink-search">
   {{text-field value=filter class="url-input" placeholderKey="admin.permalink.form.filter" autocorrect="off" autocapitalize="off"}}
 </div>
-{{permalink-form action="recordAdded"}}
+{{permalink-form action=(action "recordAdded")}}
 <br/>
 
 {{#conditional-loading-spinner condition=loading}}
@@ -42,7 +42,7 @@
             {{/if}}
           </td>
           <td class="col action">
-            {{d-button action="destroy" actionParam=pl icon="trash-o" class="btn-danger"}}
+            {{d-button action=(action "destroy") actionParam=pl icon="trash-o" class="btn-danger"}}
           </td>
         </tr>
       {{/each}}
diff --git a/app/assets/javascripts/admin/templates/plugins-index.hbs b/app/assets/javascripts/admin/templates/plugins-index.hbs
index 5704ca76e8..873053a6e2 100644
--- a/app/assets/javascripts/admin/templates/plugins-index.hbs
+++ b/app/assets/javascripts/admin/templates/plugins-index.hbs
@@ -49,7 +49,7 @@
           <td class="settings">
             {{#if currentUser.admin}}
               {{#if plugin.enabled_setting}}
-                {{d-button class="btn-default" action="showSettings" actionParam=plugin icon="gear" label="admin.plugins.change_settings_short"}}
+                {{d-button class="btn-default" action=(route-action "showSettings") actionParam=plugin icon="gear" label="admin.plugins.change_settings_short"}}
               {{/if}}
             {{/if}}
           </td>
diff --git a/app/assets/javascripts/admin/templates/plugins.hbs b/app/assets/javascripts/admin/templates/plugins.hbs
index 12d9c8c8f6..b2e0d77548 100644
--- a/app/assets/javascripts/admin/templates/plugins.hbs
+++ b/app/assets/javascripts/admin/templates/plugins.hbs
@@ -1,16 +1,16 @@
   <div class='admin-controls'>
 
   <div class='controls'>
-    {{d-button action="toggleMenu" class="menu-toggle" icon="bars"}}
+    {{d-button action=(action "toggleMenu") class="menu-toggle" icon="bars"}}
 
   {{#if currentUser.admin}}
     {{d-button label="admin.plugins.change_settings"
                icon="gear"
                class="btn-default settings-button"
-               action="showSettings"}}
+               action=(route-action "showSettings")}}
   {{/if}}
   </div>
-  
+
   </div>
 
 <div class="admin-nav pull-left">
diff --git a/app/assets/javascripts/admin/templates/site-settings.hbs b/app/assets/javascripts/admin/templates/site-settings.hbs
index 4cdf577962..56ddbcd551 100644
--- a/app/assets/javascripts/admin/templates/site-settings.hbs
+++ b/app/assets/javascripts/admin/templates/site-settings.hbs
@@ -1,9 +1,9 @@
 <div class='admin-controls'>
 
   <div class='controls'>
-    {{d-button action="toggleMenu" class="menu-toggle" icon="bars"}}
+    {{d-button action=(action "toggleMenu") class="menu-toggle" icon="bars"}}
     {{text-field id="setting-filter" value=filter placeholderKey="type_to_filter" class="no-blur"}}
-    {{d-button class="btn-default" id="clear-filter" action="clearFilter" label="admin.site_settings.clear_filter"}}
+    {{d-button class="btn-default" id="clear-filter" action=(action "clearFilter") label="admin.site_settings.clear_filter"}}
   </div>
   <div class='search controls'>
     <label>
diff --git a/app/assets/javascripts/admin/templates/site-text-edit.hbs b/app/assets/javascripts/admin/templates/site-text-edit.hbs
index 4e134433d8..6c271600aa 100644
--- a/app/assets/javascripts/admin/templates/site-text-edit.hbs
+++ b/app/assets/javascripts/admin/templates/site-text-edit.hbs
@@ -6,9 +6,9 @@
 
   {{expanding-text-area value=buffered.value rows="1" class="site-text-value"}}
 
-  {{#save-controls model=siteText action="saveChanges" saved=saved}}
+  {{#save-controls model=siteText action=(action "saveChanges") saved=saved}}
     {{#if siteText.can_revert}}
-      {{d-button action="revertChanges" label="admin.site_text.revert" class="revert-site-text"}}
+      {{d-button action=(action "revertChanges") label="admin.site_text.revert" class="revert-site-text"}}
     {{/if}}
   {{/save-controls}}
 
diff --git a/app/assets/javascripts/admin/templates/site-text-index.hbs b/app/assets/javascripts/admin/templates/site-text-index.hbs
index 6d0589f9cd..c84233348f 100644
--- a/app/assets/javascripts/admin/templates/site-text-index.hbs
+++ b/app/assets/javascripts/admin/templates/site-text-index.hbs
@@ -5,10 +5,10 @@
                placeholderKey="admin.site_text.search"
                class="no-blur site-text-search"
                autofocus="true"
-               key-up="search"}}
+               key-up=(action "search")}}
 
   <div class='extra-options'>
-    {{d-checkbox label="admin.site_text.show_overriden" checked=overridden change="search"}}
+    {{d-checkbox label="admin.site_text.show_overriden" checked=overridden change=(action "search")}}
   </div>
 </div>
 
@@ -18,6 +18,6 @@
   {{/if}}
 
   {{#each siteTexts as |siteText|}}
-    {{site-text-summary siteText=siteText editAction="edit" term=q searchRegex=siteTexts.extras.regex}}
+    {{site-text-summary siteText=siteText editAction=(action "edit") term=q searchRegex=siteTexts.extras.regex}}
   {{/each}}
 {{/conditional-loading-spinner}}
diff --git a/app/assets/javascripts/admin/templates/user-fields.hbs b/app/assets/javascripts/admin/templates/user-fields.hbs
index 72e4933052..a766d86269 100644
--- a/app/assets/javascripts/admin/templates/user-fields.hbs
+++ b/app/assets/javascripts/admin/templates/user-fields.hbs
@@ -9,15 +9,15 @@
                               fieldTypes=fieldTypes
                               firstField=sortedFields.firstObject
                               lastField=sortedFields.lastObject
-                              destroyAction="destroy"
-                              moveUpAction="moveUp"
-                              moveDownAction="moveDown"}}
+                              destroyAction=(action "destroy")
+                              moveUpAction=(action "moveUp")
+                              moveDownAction=(action "moveDown")}}
     {{/each}}
   {{/if}}
 
   {{d-button disabled=createDisabled
              class="btn-primary"
-             action="createField"
+             action=(action "createField")
              label="admin.user_fields.create"
              icon="plus"}}
 
diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs
index c5584645fe..f736dd988d 100644
--- a/app/assets/javascripts/admin/templates/user-index.hbs
+++ b/app/assets/javascripts/admin/templates/user-index.hbs
@@ -8,11 +8,11 @@
     {{/if}}
 
     {{#if model.can_view_action_logs}}
-      {{d-button action="viewActionLogs" class="btn-default" actionParam=model.username icon="list-alt" label="admin.user.action_logs"}}
+      {{d-button action=(action "viewActionLogs") class="btn-default" actionParam=model.username icon="list-alt" label="admin.user.action_logs"}}
     {{/if}}
     {{#if model.active}}
       {{#if currentUser.admin}}
-        {{d-button  class="btn-default" action="logOut" icon="power-off" label="admin.user.log_out"}}
+        {{d-button  class="btn-default" action=(action "logOut") icon="power-off" label="admin.user.log_out"}}
       {{/if}}
     {{/if}}
     {{plugin-outlet name="admin-user-controls-after" args=(hash model=model) tagName="" connectorTagName=""}}
@@ -44,7 +44,7 @@
         {{#if model.email}}
           <a href="mailto:{{unbound model.email}}">{{model.email}}</a>
         {{else}}
-          {{d-button  class="btn-default" action="checkEmail" actionParam=model icon="envelope-o" label="admin.users.check_email.text" title="admin.users.check_email.title"}}
+          {{d-button class="btn-default" action=(route-action "checkEmail") actionParam=model icon="envelope-o" label="admin.users.check_email.text" title="admin.users.check_email.title"}}
         {{/if}}
       </div>
     </div>
@@ -64,7 +64,7 @@
             {{i18n 'user.email.no_secondary'}}
           {{/if}}
         {{else}}
-          {{d-button action="checkEmail"
+          {{d-button action=(route-action "checkEmail")
               class="btn-default"
               actionParam=model
               icon="envelope-o"
@@ -79,7 +79,7 @@
       <div class='value'>{{model.bounceScore}}</div>
       <div class='controls'>
         {{#if model.canResetBounceScore}}
-          {{d-button class="btn-default" action="resetBounceScore" label="admin.user.reset_bounce_score.label" title="admin.user.reset_bounce_score.title"}}
+          {{d-button class="btn-default" action=(action "resetBounceScore") label="admin.user.reset_bounce_score.label" title="admin.user.reset_bounce_score.title"}}
         {{/if}}
         {{model.bounceScoreExplanation}}
       </div>
@@ -91,7 +91,7 @@
         {{#if associatedAccountsLoaded}}
           {{associatedAccounts}}
         {{else}}
-          {{d-button class="btn-default" action="checkEmail" actionParam=model icon="envelope-o" label="admin.users.check_email.text" title="admin.users.check_email.title"}}
+          {{d-button class="btn-default" action=(route-action "checkEmail") actionParam=model icon="envelope-o" label="admin.users.check_email.text" title="admin.users.check_email.title"}}
         {{/if}}
       </div>
     </div>
@@ -117,7 +117,7 @@
     <div class='value'>{{model.ip_address}}</div>
     <div class='controls'>
       {{#if currentUser.staff}}
-        {{d-button class="btn-default" action="refreshBrowsers" label="admin.user.refresh_browsers"}}
+        {{d-button class="btn-default" action=(action "refreshBrowsers") label="admin.user.refresh_browsers"}}
         {{ip-lookup ip=model.ip_address userId=model.id}}
       {{/if}}
     </div>
@@ -156,7 +156,7 @@
     </div>
     <div class='controls'>
       {{#if canDisableSecondFactor}}
-        {{d-button class="btn-default" action="disableSecondFactor" icon="unlock-alt" label="user.second_factor.disable"}}
+        {{d-button class="btn-default" action=(action "disableSecondFactor") icon="unlock-alt" label="user.second_factor.disable"}}
       {{/if}}
     </div>
   </div>
@@ -201,7 +201,7 @@
           {{i18n 'admin.user.approve_success'}}
         {{else}}
           {{#if model.can_approve}}
-            {{d-button class="btn-default" action="approve" icon="check" label="admin.user.approve"}}
+            {{d-button class="btn-default" action=(action "approve") icon="check" label="admin.user.approve"}}
           {{/if}}
         {{/if}}
       </div>
@@ -214,15 +214,15 @@
     <div class='controls'>
       {{#if model.active}}
         {{#if model.can_deactivate}}
-          {{d-button class="btn-default" action="deactivate" label="admin.user.deactivate_account"}}
+          {{d-button class="btn-default" action=(action "deactivate") label="admin.user.deactivate_account"}}
           {{i18n 'admin.user.deactivate_explanation'}}
         {{/if}}
       {{else}}
         {{#if model.can_send_activation_email}}
-          {{d-button class="btn-default" action="sendActivationEmail" icon="envelope" label="admin.user.send_activation_email"}}
+          {{d-button class="btn-default" action=(action "sendActivationEmail") icon="envelope" label="admin.user.send_activation_email"}}
         {{/if}}
         {{#if model.can_activate}}
-          {{d-button class="btn-default" action="activate" icon="check" label="admin.user.activate"}}
+          {{d-button class="btn-default" action=(action "activate") icon="check" label="admin.user.activate"}}
         {{/if}}
       {{/if}}
     </div>
@@ -240,15 +240,15 @@
       {{#if model.api_key}}
         <div class='long-value'>
           {{model.api_key.key}}
-          {{d-button class="btn-default" action="regenerateApiKey" icon="undo" label="admin.api.regenerate"}}
-          {{d-button class="btn-default" action="revokeApiKey" icon="times" label="admin.api.revoke"}}
+          {{d-button class="btn-default" action=(action "regenerateApiKey") icon="undo" label="admin.api.regenerate"}}
+          {{d-button class="btn-default" action=(action "revokeApiKey") icon="times" label="admin.api.revoke"}}
         </div>
       {{else}}
         <div class='value'>
           &mdash;
         </div>
         <div class='controls'>
-          {{d-button class="btn-default" action="generateApiKey" icon="key" label="admin.api.generate"}}
+          {{d-button class="btn-default" action=(action "generateApiKey") icon="key" label="admin.api.generate"}}
         </div>
       {{/if}}
     </div>
@@ -259,10 +259,10 @@
     <div class='value'>{{i18n-yes-no model.admin}}</div>
     <div class='controls'>
       {{#if model.can_revoke_admin}}
-        {{d-button class="btn-default" action="revokeAdmin" icon="shield" label="admin.user.revoke_admin"}}
+        {{d-button class="btn-default" action=(action "revokeAdmin") icon="shield" label="admin.user.revoke_admin"}}
       {{/if}}
       {{#if model.can_grant_admin}}
-        {{d-button class="btn-default" action="grantAdmin" icon="shield" label="admin.user.grant_admin"}}
+        {{d-button class="btn-default" action=(action "grantAdmin") icon="shield" label="admin.user.grant_admin"}}
       {{/if}}
     </div>
   </div>
@@ -272,10 +272,10 @@
     <div class='value'>{{i18n-yes-no model.moderator}}</div>
     <div class='controls'>
       {{#if model.can_revoke_moderation}}
-        {{d-button class="btn-default" action="revokeModeration" icon="shield" label="admin.user.revoke_moderation"}}
+        {{d-button class="btn-default" action=(action "revokeModeration") icon="shield" label="admin.user.revoke_moderation"}}
       {{/if}}
       {{#if model.can_grant_moderation}}
-        {{d-button class="btn-default" action="grantModeration" icon="shield" label="admin.user.grant_moderation"}}
+        {{d-button class="btn-default" action=(action "grantModeration") icon="shield" label="admin.user.grant_moderation"}}
       {{/if}}
     </div>
   </div>
@@ -286,8 +286,8 @@
       {{combo-box content=site.trustLevels value=model.trust_level nameProperty="detailedName"}}
       {{#if model.dirty}}
         <div>
-          {{d-button class="ok no-text" action="saveTrustLevel" icon="check"}}
-          {{d-button class="cancel no-text" action="restoreTrustLevel" icon="times"}}
+          {{d-button class="ok no-text" action=(action "saveTrustLevel") icon="check"}}
+          {{d-button class="cancel no-text" action=(action "restoreTrustLevel") icon="times"}}
         </div>
       {{/if}}
     </div>
@@ -295,10 +295,10 @@
       {{#if model.canLockTrustLevel}}
         {{#if hasLockedTrustLevel}}
           {{d-icon "lock" title="admin.user.trust_level_locked_tip"}}
-          {{d-button class="btn-default" action="lockTrustLevel" actionParam=false label="admin.user.unlock_trust_level"}}
+          {{d-button class="btn-default" action=(action "lockTrustLevel") actionParam=false label="admin.user.unlock_trust_level"}}
         {{else}}
           {{d-icon "unlock" title="admin.user.trust_level_unlocked_tip"}}
-          {{d-button class="btn-default" action="lockTrustLevel" actionParam=true label="admin.user.lock_trust_level"}}
+          {{d-button class="btn-default" action=(action "lockTrustLevel") actionParam=true label="admin.user.lock_trust_level"}}
         {{/if}}
       {{/if}}
       {{#if model.tl3Requirements}}
@@ -367,7 +367,7 @@
         {{#if model.silenced}}
           {{d-button
             class="btn-danger unsilence-user"
-            action="unsilence"
+            action=(action "unsilence")
             icon="microphone-slash"
             label="admin.user.unsilence"}}
           {{i18n 'admin.user.silence_explanation'}}
@@ -429,8 +429,8 @@
         </div>
         {{#if customGroupsDirty}}
           <div class='controls'>
-            {{d-button icon="check" class="ok" action="saveCustomGroups"}}
-            {{d-button icon="times" class="cancel" action="resetCustomGroups"}}
+            {{d-button icon="check" class="ok" action=(action "saveCustomGroups")}}
+            {{d-button icon="times" class="cancel" action=(action "resetCustomGroups")}}
           </div>
         {{/if}}
       </div>
@@ -442,8 +442,8 @@
           </div>
           {{#if primaryGroupDirty}}
             <div class='controls'>
-              {{d-button icon="check" class="ok" action="savePrimaryGroup"}}
-              {{d-button icon="times" class="cancel" action="resetPrimaryGroup"}}
+              {{d-button icon="check" class="ok" action=(action "savePrimaryGroup")}}
+              {{d-button icon="times" class="cancel" action=(action "resetPrimaryGroup")}}
             </div>
           {{/if}}
         </div>
@@ -480,7 +480,7 @@
     <div class='controls'>
       {{#if model.can_delete_all_posts}}
         {{#if model.post_count}}
-          {{d-button class="btn-danger" action="deleteAllPosts" icon="trash-o" label="admin.user.delete_all_posts"}}
+          {{d-button class="btn-danger" action=(action "deleteAllPosts") icon="trash-o" label="admin.user.delete_all_posts"}}
         {{/if}}
       {{else}}
         {{deleteAllPostsExplanation}}
@@ -563,7 +563,7 @@
   <div class="pull-right">
     {{#if model.active}}
       {{#if model.can_impersonate}}
-        {{d-button class="btn-danger" action="impersonate" icon="crosshairs" label="admin.impersonate.title" title="admin.impersonate.help"}}
+        {{d-button class="btn-danger" action=(action "impersonate") icon="crosshairs" label="admin.impersonate.title" title="admin.impersonate.help"}}
       {{/if}}
     {{/if}}
 
@@ -571,14 +571,14 @@
       {{d-button label="admin.user.anonymize"
                  icon="exclamation-triangle"
                  class="btn-danger"
-                 action="anonymize"}}
+                 action=(action "anonymize")}}
     {{/if}}
 
     {{#if model.canBeDeleted}}
       {{d-button label="admin.user.delete"
                  icon="exclamation-triangle"
                  class="btn-danger"
-                 action="destroy"}}
+                 action=(action "destroy")}}
     {{/if}}
   </div>
 
diff --git a/app/assets/javascripts/admin/templates/users-list.hbs b/app/assets/javascripts/admin/templates/users-list.hbs
index 92c5c689ad..d4d5be049f 100644
--- a/app/assets/javascripts/admin/templates/users-list.hbs
+++ b/app/assets/javascripts/admin/templates/users-list.hbs
@@ -14,10 +14,10 @@
       {{nav-item route='groups' label='groups.index.title'}}
       <div class="admin-actions">
     {{#unless siteSettings.enable_sso}}
-      {{d-button class="btn-default" action="sendInvites" title="admin.invite.button_title" icon="user-plus" label="admin.invite.button_text"}}
+      {{d-button class="btn-default" action=(route-action "sendInvites") title="admin.invite.button_title" icon="user-plus" label="admin.invite.button_text"}}
     {{/unless}}
     {{#if currentUser.admin}}
-      {{d-button class="btn-default" action="exportUsers" title="admin.export_csv.button_title.user" icon="download" label="admin.export_csv.button_text"}}
+      {{d-button class="btn-default" action=(route-action "exportUsers") title="admin.export_csv.button_title.user" icon="download" label="admin.export_csv.button_text"}}
     {{/if}}
   </div>
     </ul>
diff --git a/app/assets/javascripts/admin/templates/watched-words-action.hbs b/app/assets/javascripts/admin/templates/watched-words-action.hbs
index a9481675c0..ad04b20c5b 100644
--- a/app/assets/javascripts/admin/templates/watched-words-action.hbs
+++ b/app/assets/javascripts/admin/templates/watched-words-action.hbs
@@ -5,11 +5,11 @@
 <div class="watched-word-controls">
 {{watched-word-form
   actionKey=actionNameKey
-  action="recordAdded"
+  action=(action "recordAdded")
   filteredContent=filteredContent
   regularExpressions=adminWatchedWords.regularExpressions}}
 
-{{watched-word-uploader uploading=uploading actionKey=actionNameKey done="uploadComplete"}}
+{{watched-word-uploader uploading=uploading actionKey=actionNameKey done=(action "uploadComplete")}}
 </div>
 <div>
   <label class="show-words-checkbox">
@@ -20,7 +20,7 @@
 <div class="watched-words-list">
   {{#if showWordsList}}
     {{#each filteredContent as |word| }}
-      <div class="watched-word-box">{{admin-watched-word word=word action="recordRemoved"}}</div>
+      <div class="watched-word-box">{{admin-watched-word word=word action=(action "recordRemoved")}}</div>
     {{/each}}
   {{else}}
     {{i18n 'admin.watched_words.word_count' count=wordCount}}
diff --git a/app/assets/javascripts/admin/templates/watched-words.hbs b/app/assets/javascripts/admin/templates/watched-words.hbs
index cf5f50cc64..5fe3946dfb 100644
--- a/app/assets/javascripts/admin/templates/watched-words.hbs
+++ b/app/assets/javascripts/admin/templates/watched-words.hbs
@@ -1,8 +1,8 @@
 <div class='admin-controls'>
   <div class='controls'>
-    {{d-button action="toggleMenu" class="menu-toggle" icon="bars"}}
+    {{d-button action=(action "toggleMenu") class="menu-toggle" icon="bars"}}
     {{text-field value=filter placeholderKey="admin.watched_words.search" class="no-blur"}}
-    {{d-button action="clearFilter" label="admin.watched_words.clear_filter"}}
+    {{d-button action=(action "clearFilter") label="admin.watched_words.clear_filter"}}
   </div>
 </div>
 
diff --git a/app/assets/javascripts/admin/templates/web-hooks-show-events.hbs b/app/assets/javascripts/admin/templates/web-hooks-show-events.hbs
index a279199e1a..5b7b1e8e37 100644
--- a/app/assets/javascripts/admin/templates/web-hooks-show-events.hbs
+++ b/app/assets/javascripts/admin/templates/web-hooks-show-events.hbs
@@ -2,7 +2,7 @@
   {{#link-to 'adminWebHooks' tagName='button' classNames='btn'}}
     {{d-icon 'list'}} {{i18n 'admin.web_hooks.events.go_list'}}
   {{/link-to}}
-  {{d-button icon="paper-plane" label="admin.web_hooks.events.ping" action="ping" disabled=pingDisabled}}
+  {{d-button icon="paper-plane" label="admin.web_hooks.events.ping" action=(action "ping") disabled=pingDisabled}}
   {{#link-to 'adminWebHooks.show' model.extras.web_hook_id tagName='button' classNames='btn'}}
     {{d-icon 'far-edit'}} {{i18n 'admin.web_hooks.events.go_details'}}
   {{/link-to}}
@@ -10,7 +10,7 @@
 
 <div class='web-hook-events-listing'>
 {{#if model}}
-  {{#load-more selector=".web-hook-events li" action="loadMore"}}
+  {{#load-more selector=".web-hook-events li" action=(action "loadMore")}}
     <div class='web-hook-events content-list'>
       <div class='heading-container'>
         <div class='col heading first status'>{{i18n 'admin.web_hooks.events.status'}}</div>
diff --git a/app/assets/javascripts/admin/templates/web-hooks-show.hbs b/app/assets/javascripts/admin/templates/web-hooks-show.hbs
index bf408bf11c..3cd6db8c0d 100644
--- a/app/assets/javascripts/admin/templates/web-hooks-show.hbs
+++ b/app/assets/javascripts/admin/templates/web-hooks-show.hbs
@@ -81,9 +81,10 @@
   </form>
 
   <div class='controls'>
-    <button class='btn btn-default' {{action 'save'}} disabled={{saveButtonDisabled}}>{{saveButtonText}}</button>
+    {{d-button class="btn-default" translatedLabel=saveButtonText action=(action "save") disabled=saveButtonDisabled}}
+
     {{#unless model.isNew}}
-      {{d-button class="btn-danger" label="admin.web_hooks.destroy" action="destroy"}}
+      {{d-button class="btn-danger" label="admin.web_hooks.destroy" action=(action "destroy")}}
       {{#link-to 'adminWebHooks.showEvents' model.id class="btn"}}
         {{i18n 'admin.web_hooks.events.go_events'}}
       {{/link-to}}
diff --git a/app/assets/javascripts/admin/templates/web-hooks.hbs b/app/assets/javascripts/admin/templates/web-hooks.hbs
index 2e2a76a75e..b48c0e37c3 100644
--- a/app/assets/javascripts/admin/templates/web-hooks.hbs
+++ b/app/assets/javascripts/admin/templates/web-hooks.hbs
@@ -7,7 +7,7 @@
     {{/link-to}}
   </div>
 {{#if model}}
-  {{#load-more selector=".web-hooks tr" action="loadMore"}}
+  {{#load-more selector=".web-hooks tr" action=(action "loadMore")}}
     <table class='web-hooks grid'>
       <thead>
         <tr>
@@ -25,7 +25,7 @@
             <td class='description'>{{webHook.description}}</td>
             <td class='controls'>
               {{#link-to 'adminWebHooks.show' webHook tagName='button' classNames='btn btn-default no-text'}}{{d-icon 'far-edit'}}{{/link-to}}
-              {{d-button class="destroy btn-danger" action='destroy' actionParam=webHook icon="remove"}}
+              {{d-button class="destroy btn-danger" action=(action "destroy") actionParam=webHook icon="remove"}}
             </td>
           </tr>
         {{/each}}
diff --git a/app/assets/javascripts/authentication-complete.js.no-module.es6 b/app/assets/javascripts/authentication-complete.js.no-module.es6
deleted file mode 100644
index ad768b6426..0000000000
--- a/app/assets/javascripts/authentication-complete.js.no-module.es6
+++ /dev/null
@@ -1,17 +0,0 @@
-(function() {
-  const authenticationData = JSON.parse(
-    document.getElementById("data-authentication").dataset.authenticationData
-  );
-
-  Discourse.showingSignup = true;
-  require("discourse/routes/application").default.reopen({
-    actions: {
-      didTransition: function() {
-        Em.run.next(function() {
-          Discourse.authenticationComplete(authenticationData);
-        });
-        return this._super();
-      }
-    }
-  });
-})();
diff --git a/app/assets/javascripts/discourse-common/lib/raw-handlebars.js.es6 b/app/assets/javascripts/discourse-common/lib/raw-handlebars.js.es6
index 1e6039ad0d..5922fc55c8 100644
--- a/app/assets/javascripts/discourse-common/lib/raw-handlebars.js.es6
+++ b/app/assets/javascripts/discourse-common/lib/raw-handlebars.js.es6
@@ -24,11 +24,7 @@ RawHandlebars.helpers["get"] = function(context, options) {
     context = context.slice(context.indexOf(".") + 1);
   }
 
-  if (val && val.isDescriptor) {
-    return Em.get(firstContext, context);
-  }
-
-  return val === undefined ? Em.get(firstContext, context) : val;
+  return val === undefined ? Ember.get(firstContext, context) : val;
 };
 
 // adds compatability so this works with stringParams
@@ -49,7 +45,7 @@ RawHandlebars.registerHelper("each", function(
   contextName,
   options
 ) {
-  var list = Em.get(this, contextName);
+  var list = Ember.get(this, contextName);
   var output = [];
   var innerContext = objectCreate(this);
   for (var i = 0; i < list.length; i++) {
diff --git a/app/assets/javascripts/discourse/components/auth-token-dropdown.es6 b/app/assets/javascripts/discourse/components/auth-token-dropdown.es6
index ecb72e3e58..2dceb6e59c 100644
--- a/app/assets/javascripts/discourse/components/auth-token-dropdown.es6
+++ b/app/assets/javascripts/discourse/components/auth-token-dropdown.es6
@@ -29,10 +29,10 @@ export default DropdownSelectBoxComponent.extend({
     onSelect(id) {
       switch (id) {
         case "notYou":
-          this.sendAction("showToken", this.get("token"));
+          this.showToken(this.get("token"));
           break;
         case "logOut":
-          this.sendAction("revokeAuthToken", this.get("token"));
+          this.revokeAuthToken(this.get("token"));
           break;
       }
     }
diff --git a/app/assets/javascripts/discourse/components/avatar-uploader.js.es6 b/app/assets/javascripts/discourse/components/avatar-uploader.js.es6
index 5eaa13d46a..5fe9aecec6 100644
--- a/app/assets/javascripts/discourse/components/avatar-uploader.js.es6
+++ b/app/assets/javascripts/discourse/components/avatar-uploader.js.es6
@@ -1,7 +1,7 @@
 import computed from "ember-addons/ember-computed-decorators";
 import UploadMixin from "discourse/mixins/upload";
 
-export default Em.Component.extend(UploadMixin, {
+export default Ember.Component.extend(UploadMixin, {
   type: "avatar",
   tagName: "span",
   imageIsNotASquare: false,
@@ -24,7 +24,7 @@ export default Em.Component.extend(UploadMixin, {
       uploadedAvatarId: upload.id
     });
 
-    this.sendAction("done");
+    this.done();
   },
 
   @computed("user_id")
diff --git a/app/assets/javascripts/discourse/components/backup-uploader.js.es6 b/app/assets/javascripts/discourse/components/backup-uploader.js.es6
index 62fbb81b85..04588987be 100644
--- a/app/assets/javascripts/discourse/components/backup-uploader.js.es6
+++ b/app/assets/javascripts/discourse/components/backup-uploader.js.es6
@@ -2,7 +2,7 @@ import { ajax } from "discourse/lib/ajax";
 import computed from "ember-addons/ember-computed-decorators";
 import UploadMixin from "discourse/mixins/upload";
 
-export default Em.Component.extend(UploadMixin, {
+export default Ember.Component.extend(UploadMixin, {
   tagName: "span",
 
   @computed("uploading", "uploadProgress")
@@ -17,7 +17,7 @@ export default Em.Component.extend(UploadMixin, {
   },
 
   uploadDone() {
-    this.sendAction("done");
+    this.done();
   },
 
   calculateUploadUrl() {
diff --git a/app/assets/javascripts/discourse/components/badge-button.js.es6 b/app/assets/javascripts/discourse/components/badge-button.js.es6
index 6cae62b165..443bf28e09 100644
--- a/app/assets/javascripts/discourse/components/badge-button.js.es6
+++ b/app/assets/javascripts/discourse/components/badge-button.js.es6
@@ -9,5 +9,5 @@ export default Ember.Component.extend({
     return $("<div>" + this.get("badge.description") + "</div>").text();
   }.property("badge.description"),
   attributeBindings: ["data-badge-name", "title"],
-  "data-badge-name": Em.computed.alias("badge.name")
+  "data-badge-name": Ember.computed.alias("badge.name")
 });
diff --git a/app/assets/javascripts/discourse/components/basic-topic-list.js.es6 b/app/assets/javascripts/discourse/components/basic-topic-list.js.es6
index 922e4ed759..3682f873d2 100644
--- a/app/assets/javascripts/discourse/components/basic-topic-list.js.es6
+++ b/app/assets/javascripts/discourse/components/basic-topic-list.js.es6
@@ -66,11 +66,5 @@ export default Ember.Component.extend({
       }
       return false;
     }
-  },
-
-  actions: {
-    showInserted() {
-      this.sendAction("showInserted");
-    }
   }
 });
diff --git a/app/assets/javascripts/discourse/components/bread-crumbs.js.es6 b/app/assets/javascripts/discourse/components/bread-crumbs.js.es6
index 74012f4817..ded546ec17 100644
--- a/app/assets/javascripts/discourse/components/bread-crumbs.js.es6
+++ b/app/assets/javascripts/discourse/components/bread-crumbs.js.es6
@@ -2,9 +2,9 @@
 export default Ember.Component.extend({
   classNameBindings: ["hidden:hidden", ":category-breadcrumb"],
   tagName: "ol",
-  parentCategory: Em.computed.alias("category.parentCategory"),
+  parentCategory: Ember.computed.alias("category.parentCategory"),
 
-  parentCategories: Em.computed.filter("categories", function(c) {
+  parentCategories: Ember.computed.filter("categories", function(c) {
     if (
       c.id === this.site.get("uncategorized_category_id") &&
       !this.siteSettings.allow_uncategorized_topics
diff --git a/app/assets/javascripts/discourse/components/bulk-select-button.js.es6 b/app/assets/javascripts/discourse/components/bulk-select-button.js.es6
index 2581c3c103..46a5731b85 100644
--- a/app/assets/javascripts/discourse/components/bulk-select-button.js.es6
+++ b/app/assets/javascripts/discourse/components/bulk-select-button.js.es6
@@ -12,7 +12,11 @@ export default Ember.Component.extend({
         },
         title: "topics.bulk.actions"
       });
-      controller.set("refreshClosure", () => this.sendAction());
+
+      const action = this.get("action");
+      if (action) {
+        controller.set("refreshClosure", () => action());
+      }
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/components/choose-message.js.es6 b/app/assets/javascripts/discourse/components/choose-message.js.es6
index b05dd54629..3bbbf83f09 100644
--- a/app/assets/javascripts/discourse/components/choose-message.js.es6
+++ b/app/assets/javascripts/discourse/components/choose-message.js.es6
@@ -29,14 +29,15 @@ export default Ember.Component.extend({
   search: debounce(function(title) {
     const currentTopicId = this.get("currentTopicId");
 
-    if (Em.isEmpty(title)) {
+    if (Ember.isEmpty(title)) {
       this.setProperties({ messages: null, loading: false });
       return;
     }
 
     searchForTerm(title, {
       typeFilter: "private_messages",
-      searchForId: true
+      searchForId: true,
+      restrictToArchetype: "private_message"
     }).then(results => {
       if (results && results.posts && results.posts.length > 0) {
         this.set(
@@ -53,7 +54,7 @@ export default Ember.Component.extend({
 
   actions: {
     chooseMessage(message) {
-      const messageId = Em.get(message, "id");
+      const messageId = Ember.get(message, "id");
       this.set("selectedTopicId", messageId);
       Ember.run.next(() =>
         $(`#choose-message-${messageId}`).prop("checked", "true")
diff --git a/app/assets/javascripts/discourse/components/choose-topic.js.es6 b/app/assets/javascripts/discourse/components/choose-topic.js.es6
index 4719be5455..3d787d5843 100644
--- a/app/assets/javascripts/discourse/components/choose-topic.js.es6
+++ b/app/assets/javascripts/discourse/components/choose-topic.js.es6
@@ -27,30 +27,32 @@ export default Ember.Component.extend({
     const self = this,
       currentTopicId = this.get("currentTopicId");
 
-    if (Em.isEmpty(title)) {
+    if (Ember.isEmpty(title)) {
       self.setProperties({ topics: null, loading: false });
       return;
     }
 
-    searchForTerm(title, { typeFilter: "topic", searchForId: true }).then(
-      function(results) {
-        if (results && results.posts && results.posts.length > 0) {
-          self.set(
-            "topics",
-            results.posts
-              .mapBy("topic")
-              .filter(t => t.get("id") !== currentTopicId)
-          );
-        } else {
-          self.setProperties({ topics: null, loading: false });
-        }
+    searchForTerm(title, {
+      typeFilter: "topic",
+      searchForId: true,
+      restrictToArchetype: "regular"
+    }).then(function(results) {
+      if (results && results.posts && results.posts.length > 0) {
+        self.set(
+          "topics",
+          results.posts
+            .mapBy("topic")
+            .filter(t => t.get("id") !== currentTopicId)
+        );
+      } else {
+        self.setProperties({ topics: null, loading: false });
       }
-    );
+    });
   }, 300),
 
   actions: {
     chooseTopic(topic) {
-      const topicId = Em.get(topic, "id");
+      const topicId = Ember.get(topic, "id");
       this.set("selectedTopicId", topicId);
       Ember.run.next(() =>
         $("#choose-topic-" + topicId).prop("checked", "true")
diff --git a/app/assets/javascripts/discourse/components/color-picker-choice.js.es6 b/app/assets/javascripts/discourse/components/color-picker-choice.js.es6
index aeba801023..01bac55369 100644
--- a/app/assets/javascripts/discourse/components/color-picker-choice.js.es6
+++ b/app/assets/javascripts/discourse/components/color-picker-choice.js.es6
@@ -22,6 +22,6 @@ export default Ember.Component.extend({
 
   click(e) {
     e.preventDefault();
-    this.sendAction("selectColor", this.get("color"));
+    this.selectColor(this.get("color"));
   }
 });
diff --git a/app/assets/javascripts/discourse/components/composer-body.js.es6 b/app/assets/javascripts/discourse/components/composer-body.js.es6
index 2b71fc260f..e2eea66f3c 100644
--- a/app/assets/javascripts/discourse/components/composer-body.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-body.js.es6
@@ -58,7 +58,7 @@ export default Ember.Component.extend(KeyEnterEscape, {
   },
 
   keyUp() {
-    this.sendAction("typed");
+    this.typed();
 
     const lastKeyUp = new Date();
     this._lastKeyUp = lastKeyUp;
@@ -117,6 +117,6 @@ export default Ember.Component.extend(KeyEnterEscape, {
   },
 
   click() {
-    this.sendAction("openIfDraft");
+    this.openIfDraft();
   }
 });
diff --git a/app/assets/javascripts/discourse/components/composer-editor.js.es6 b/app/assets/javascripts/discourse/components/composer-editor.js.es6
index 32058c6bc4..341f038029 100644
--- a/app/assets/javascripts/discourse/components/composer-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-editor.js.es6
@@ -546,7 +546,7 @@ export default Ember.Component.extend({
         const $e = $(e);
         var name = $e.data("name");
         if (found.indexOf(name) === -1) {
-          this.sendAction("groupsMentioned", [
+          this.groupsMentioned([
             {
               name: name,
               user_count: $e.data("mentionable-user-count"),
@@ -583,14 +583,14 @@ export default Ember.Component.extend({
         if (found.indexOf(name) === -1) {
           // add a delay to allow for typing, so you don't open the warning right away
           // previously we would warn after @bob even if you were about to mention @bob2
-          Em.run.later(
+          Ember.run.later(
             this,
             () => {
               if (
                 $preview.find('.mention.cannot-see[data-name="' + name + '"]')
                   .length > 0
               ) {
-                this.sendAction("cannotSeeMention", [{ name: name }]);
+                this.cannotSeeMention([{ name }]);
                 found.push(name);
               }
             },
@@ -760,106 +760,6 @@ export default Ember.Component.extend({
         $("#mobile-uploader").click();
       });
     }
-
-    this._firefoxPastingHack();
-  },
-
-  // Believe it or not pasting an image in Firefox doesn't work without this code
-  _firefoxPastingHack() {
-    const uaMatch = navigator.userAgent.match(/Firefox\/(\d+)\.\d/);
-    if (uaMatch) {
-      let uaVersion = parseInt(uaMatch[1]);
-      if (uaVersion < 24 || 50 <= uaVersion) {
-        // The hack is no longer required in FF 50 and later.
-        // See: https://bugzilla.mozilla.org/show_bug.cgi?id=906420
-        return;
-      }
-      this.$().append(
-        Ember.$(
-          "<div id='contenteditable' contenteditable='true' style='height: 0; width: 0; overflow: hidden'></div>"
-        )
-      );
-      this.$("textarea").off("keydown.contenteditable");
-      this.$("textarea").on("keydown.contenteditable", event => {
-        // Catch Ctrl+v / Cmd+v and hijack focus to a contenteditable div. We can't
-        // use the onpaste event because for some reason the paste isn't resumed
-        // after we switch focus, probably because it is being executed too late.
-        if ((event.ctrlKey || event.metaKey) && event.keyCode === 86) {
-          // Save the current textarea selection.
-          const textarea = this.$("textarea")[0];
-          const selectionStart = textarea.selectionStart;
-          const selectionEnd = textarea.selectionEnd;
-
-          // Focus the contenteditable div.
-          const contentEditableDiv = this.$("#contenteditable");
-          contentEditableDiv.focus();
-
-          // The paste doesn't finish immediately and we don't have any onpaste
-          // event, so wait for 100ms which _should_ be enough time.
-          Ember.run.later(() => {
-            const pastedImg = contentEditableDiv.find("img");
-
-            if (pastedImg.length === 1) {
-              pastedImg.remove();
-            }
-
-            // For restoring the selection.
-            textarea.focus();
-            const textareaContent = $(textarea).val(),
-              startContent = textareaContent.substring(0, selectionStart),
-              endContent = textareaContent.substring(selectionEnd);
-
-            const restoreSelection = function(pastedText) {
-              $(textarea).val(startContent + pastedText + endContent);
-              textarea.selectionStart = selectionStart + pastedText.length;
-              textarea.selectionEnd = textarea.selectionStart;
-            };
-
-            if (contentEditableDiv.html().length > 0) {
-              // If the image wasn't the only pasted content we just give up and
-              // fall back to the original pasted text.
-              contentEditableDiv.find("br").replaceWith("\n");
-              restoreSelection(contentEditableDiv.text());
-            } else {
-              // Depending on how the image is pasted in, we may get either a
-              // normal URL or a data URI. If we get a data URI we can convert it
-              // to a Blob and upload that, but if it is a regular URL that
-              // operation is prevented for security purposes. When we get a regular
-              // URL let's just create an <img> tag for the image.
-              const imageSrc = pastedImg.attr("src");
-
-              if (imageSrc.match(/^data:image/)) {
-                // Restore the cursor position, and remove any selected text.
-                restoreSelection("");
-
-                // Create a Blob to upload.
-                const image = new Image();
-                image.onload = () => {
-                  // Create a new canvas.
-                  const canvas = document.createElementNS(
-                    "http://www.w3.org/1999/xhtml",
-                    "canvas"
-                  );
-                  canvas.height = image.height;
-                  canvas.width = image.width;
-                  const ctx = canvas.getContext("2d");
-                  ctx.drawImage(image, 0, 0);
-
-                  canvas.toBlob(blob =>
-                    this.$().fileupload("add", { files: blob })
-                  );
-                };
-                image.src = imageSrc;
-              } else {
-                restoreSelection("<img src='" + imageSrc + "'>");
-              }
-            }
-
-            contentEditableDiv.html("");
-          }, 100);
-        }
-      });
-    }
   },
 
   @on("willDestroyElement")
@@ -889,23 +789,27 @@ export default Ember.Component.extend({
       this._teardownInputPreviewSync();
   },
 
+  showUploadSelector(toolbarEvent) {
+    this.send("showUploadSelector", toolbarEvent);
+  },
+
+  onExpandPopupMenuOptions(toolbarEvent) {
+    const selected = toolbarEvent.selected;
+    toolbarEvent.selectText(selected.start, selected.end - selected.start);
+    this.storeToolbarState(toolbarEvent);
+  },
+
   actions: {
     importQuote(toolbarEvent) {
-      this.sendAction("importQuote", toolbarEvent);
+      this.importQuote(toolbarEvent);
     },
 
     onExpandPopupMenuOptions(toolbarEvent) {
-      const selected = toolbarEvent.selected;
-      toolbarEvent.selectText(selected.start, selected.end - selected.start);
-      this.sendAction("storeToolbarState", toolbarEvent);
+      this.onExpandPopupMenuOptions(toolbarEvent);
     },
 
     togglePreview() {
-      this.sendAction("togglePreview");
-    },
-
-    showUploadModal(toolbarEvent) {
-      this.sendAction("showUploadSelector", toolbarEvent);
+      this.togglePreview();
     },
 
     extraButtons(toolbar) {
@@ -913,7 +817,7 @@ export default Ember.Component.extend({
         id: "quote",
         group: "fontStyles",
         icon: "comment-o",
-        sendAction: "importQuote",
+        sendAction: this.get("importQuote"),
         title: "composer.quote_post_title",
         unshift: true
       });
@@ -924,7 +828,7 @@ export default Ember.Component.extend({
           group: "insertions",
           icon: this.get("uploadIcon"),
           title: "upload",
-          sendAction: "showUploadModal"
+          sendAction: this.get("showUploadModal")
         });
       }
 
@@ -933,7 +837,7 @@ export default Ember.Component.extend({
         group: "extras",
         icon: "gear",
         title: "composer.options",
-        sendAction: "onExpandPopupMenuOptions",
+        sendAction: this.onExpandPopupMenuOptions.bind(this),
         popupMenu: true
       });
 
@@ -943,7 +847,7 @@ export default Ember.Component.extend({
           group: "mobileExtras",
           icon: "television",
           title: "composer.show_preview",
-          sendAction: "togglePreview"
+          sendAction: this.get("togglePreview")
         });
       }
     },
@@ -1052,7 +956,7 @@ export default Ember.Component.extend({
       }
 
       this.trigger("previewRefreshed", $preview);
-      this.sendAction("afterRefresh", $preview);
+      this.afterRefresh($preview);
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/components/composer-message.js.es6 b/app/assets/javascripts/discourse/components/composer-message.js.es6
index fab940b847..64acf1399d 100644
--- a/app/assets/javascripts/discourse/components/composer-message.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-message.js.es6
@@ -16,7 +16,7 @@ export default Ember.Component.extend({
 
   actions: {
     closeMessage() {
-      this.sendAction("closeMessage", this.get("message"));
+      this.closeMessage(this.get("message"));
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/components/composer-messages.js.es6 b/app/assets/javascripts/discourse/components/composer-messages.js.es6
index 1ac68616f8..b24657b864 100644
--- a/app/assets/javascripts/discourse/components/composer-messages.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-messages.js.es6
@@ -166,7 +166,7 @@ export default Ember.Component.extend({
       if (similarTopics.get("length") > 0) {
         message.set("similarTopics", similarTopics);
         this.send("popup", message);
-      } else if (message) {
+      } else if (message && !(this.isDestroyed || this.isDestroying)) {
         this.send("hideMessage", message);
       }
     });
@@ -200,10 +200,7 @@ export default Ember.Component.extend({
       // Checking composer messages on replies can give us a list of links to check for
       // duplicates
       if (messages.extras && messages.extras.duplicate_lookup) {
-        this.sendAction(
-          "addLinkLookup",
-          new LinkLookup(messages.extras.duplicate_lookup)
-        );
+        this.addLinkLookup(new LinkLookup(messages.extras.duplicate_lookup));
       }
 
       this.set("checkedMessages", true);
diff --git a/app/assets/javascripts/discourse/components/composer-title.js.es6 b/app/assets/javascripts/discourse/components/composer-title.js.es6
index 1ec43f321b..65b32b2227 100644
--- a/app/assets/javascripts/discourse/components/composer-title.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-title.js.es6
@@ -79,7 +79,7 @@ export default Ember.Component.extend({
     }
 
     if (Ember.testing) {
-      Em.run.next(() =>
+      Ember.run.next(() =>
         // not ideal but we don't want to run this in current
         // runloop to avoid an error in console
         this._checkForUrl()
diff --git a/app/assets/javascripts/discourse/components/cook-text.js.es6 b/app/assets/javascripts/discourse/components/cook-text.js.es6
index d38a549f6d..2799b736ec 100644
--- a/app/assets/javascripts/discourse/components/cook-text.js.es6
+++ b/app/assets/javascripts/discourse/components/cook-text.js.es6
@@ -11,7 +11,7 @@ const CookText = Ember.Component.extend({
       this.set("cooked", cooked);
       // no choice but to defer this cause
       // pretty text may only be loaded now
-      Em.run.next(() =>
+      Ember.run.next(() =>
         window
           .requireModule("pretty-text/image-short-url")
           .resolveAllShortUrls(ajax)
diff --git a/app/assets/javascripts/discourse/components/create-account.js.es6 b/app/assets/javascripts/discourse/components/create-account.js.es6
index a7bfb54b9f..eb7490d46e 100644
--- a/app/assets/javascripts/discourse/components/create-account.js.es6
+++ b/app/assets/javascripts/discourse/components/create-account.js.es6
@@ -12,7 +12,7 @@ export default Ember.Component.extend({
       if (!this.get("disabled") && e.keyCode === 13) {
         e.preventDefault();
         e.stopPropagation();
-        this.sendAction();
+        this.action();
         return false;
       }
     });
diff --git a/app/assets/javascripts/discourse/components/csv-uploader.js.es6 b/app/assets/javascripts/discourse/components/csv-uploader.js.es6
index d5c6124fc1..f080dcf755 100644
--- a/app/assets/javascripts/discourse/components/csv-uploader.js.es6
+++ b/app/assets/javascripts/discourse/components/csv-uploader.js.es6
@@ -1,7 +1,7 @@
 import computed from "ember-addons/ember-computed-decorators";
 import UploadMixin from "discourse/mixins/upload";
 
-export default Em.Component.extend(UploadMixin, {
+export default Ember.Component.extend(UploadMixin, {
   type: "csv",
   tagName: "span",
   uploadUrl: "/invites/upload_csv",
diff --git a/app/assets/javascripts/discourse/components/d-button.js.es6 b/app/assets/javascripts/discourse/components/d-button.js.es6
index 4b5bdfcc64..70a409327e 100644
--- a/app/assets/javascripts/discourse/components/d-button.js.es6
+++ b/app/assets/javascripts/discourse/components/d-button.js.es6
@@ -37,7 +37,12 @@ export default Ember.Component.extend({
   },
 
   click() {
-    this.sendAction("action", this.get("actionParam"));
+    if (typeof this.get("action") === "string") {
+      this.sendAction("action", this.get("actionParam"));
+    } else {
+      this.get("action")(this.get("actionParam"));
+    }
+
     return false;
   }
 });
diff --git a/app/assets/javascripts/discourse/components/d-checkbox.js.es6 b/app/assets/javascripts/discourse/components/d-checkbox.js.es6
index 2c8f038411..7bbb682582 100644
--- a/app/assets/javascripts/discourse/components/d-checkbox.js.es6
+++ b/app/assets/javascripts/discourse/components/d-checkbox.js.es6
@@ -13,7 +13,7 @@ export default Ember.Component.extend({
     // In Ember 13.3 we can use action on the checkbox `{{input}}` but not in 1.11
     this.$("input").on("click.d-checkbox", () => {
       Ember.run.scheduleOnce("afterRender", () =>
-        this.sendAction("change", this.$("input").prop("checked"))
+        this.change(this.$("input").prop("checked"))
       );
     });
   },
diff --git a/app/assets/javascripts/discourse/components/d-editor-modal.js.es6 b/app/assets/javascripts/discourse/components/d-editor-modal.js.es6
index 454c41c447..885d5c1706 100644
--- a/app/assets/javascripts/discourse/components/d-editor-modal.js.es6
+++ b/app/assets/javascripts/discourse/components/d-editor-modal.js.es6
@@ -51,7 +51,7 @@ export default Ember.Component.extend({
   actions: {
     ok() {
       this.set("hidden", true);
-      this.sendAction("okAction");
+      this.okAction();
     },
 
     cancel() {
diff --git a/app/assets/javascripts/discourse/components/d-editor.js.es6 b/app/assets/javascripts/discourse/components/d-editor.js.es6
index cddb33cbdf..4c265a8a36 100644
--- a/app/assets/javascripts/discourse/components/d-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/d-editor.js.es6
@@ -7,9 +7,6 @@ import {
 import { categoryHashtagTriggerRule } from "discourse/lib/category-hashtags";
 import { search as searchCategoryTag } from "discourse/lib/category-tag-search";
 import { cookAsync } from "discourse/lib/text";
-import { translations } from "pretty-text/emoji/data";
-import { emojiSearch, isSkinTonableEmoji } from "pretty-text/emoji";
-import { emojiUrlFor } from "discourse/lib/text";
 import { getRegister } from "discourse-common/lib/get-owner";
 import { findRawTemplate } from "discourse/lib/raw-templates";
 import { siteDir } from "discourse/lib/text-direction";
@@ -20,6 +17,9 @@ import {
 import toMarkdown from "discourse/lib/to-markdown";
 import deprecated from "discourse-common/lib/deprecated";
 import { wantsNewWindow } from "discourse/lib/intercept-click";
+import { translations } from "pretty-text/emoji/data";
+import { emojiSearch, isSkinTonableEmoji } from "pretty-text/emoji";
+import { emojiUrlFor } from "discourse/lib/text";
 
 // Our head can be a static string or a function that returns a string
 // based on input (like for numbered lists).
@@ -55,6 +55,7 @@ class Toolbar {
   constructor(opts) {
     const { site, siteSettings } = opts;
     this.shortcuts = {};
+    this.context = null;
 
     this.groups = [
       { group: "fontStyles", buttons: [] },
@@ -87,7 +88,7 @@ class Toolbar {
         id: "link",
         group: "insertions",
         shortcut: "K",
-        action: "showLinkModal"
+        action: (...args) => this.context.send("showLinkModal", args)
       });
     }
 
@@ -107,7 +108,7 @@ class Toolbar {
       id: "code",
       group: "insertions",
       shortcut: "Shift+C",
-      action: "formatCode"
+      action: (...args) => this.context.send("formatCode", args)
     });
 
     this.addButton({
@@ -158,7 +159,7 @@ class Toolbar {
       className: button.className || button.id,
       label: button.label,
       icon: button.label ? null : button.icon || button.id,
-      action: button.action || "toolbarButton",
+      action: button.action || (a => this.context.send("toolbarButton", a)),
       perform: button.perform || function() {},
       trimLeading: button.trimLeading,
       popupMenu: button.popupMenu || false
@@ -220,8 +221,8 @@ export default Ember.Component.extend({
   linkText: "",
   lastSel: null,
   _mouseTrap: null,
-  emojiPickerIsActive: false,
   showLink: true,
+  emojiPickerIsActive: false,
 
   @computed("placeholder")
   placeholderTranslated(placeholder) {
@@ -238,15 +239,15 @@ export default Ember.Component.extend({
   },
 
   init() {
-    this._super();
+    this._super(...arguments);
+
     this.register = getRegister(this);
   },
 
   didInsertElement() {
-    this._super();
+    this._super(...arguments);
 
     const $editorInput = this.$(".d-editor-input");
-
     this._applyEmojiAutocomplete($editorInput);
     this._applyCategoryHashtagAutocomplete($editorInput);
 
@@ -267,7 +268,7 @@ export default Ember.Component.extend({
     Object.keys(shortcuts).forEach(sc => {
       const button = shortcuts[sc];
       mouseTrap.bind(sc, () => {
-        this.send(button.action, button);
+        button.action(button);
         return false;
       });
     });
@@ -331,8 +332,13 @@ export default Ember.Component.extend({
     const toolbar = new Toolbar(
       this.getProperties("site", "siteSettings", "showLink")
     );
+    toolbar.context = this;
+
     _createCallbacks.forEach(cb => cb(toolbar));
-    this.sendAction("extraButtons", toolbar);
+
+    if (this.extraButtons) {
+      this.extraButtons(toolbar);
+    }
     return toolbar;
   },
 
@@ -355,7 +361,10 @@ export default Ember.Component.extend({
         }
         const $preview = this.$(".d-editor-preview");
         if ($preview.length === 0) return;
-        this.sendAction("previewUpdated", $preview);
+
+        if (this.previewUpdated) {
+          this.previewUpdated($preview);
+        }
       });
     });
   },
@@ -410,17 +419,10 @@ export default Ember.Component.extend({
       },
 
       onKeyUp(text, cp) {
-        // Regular expressions used to extract emoji name from text.
-        // The space version requires a ' ' (space) before the emoji name
-        // (i.e. ' :smile'), while the other one does not and is used
-        // when enable_inline_emoji_translation is true.
-        const noSpaceColonEmoji = /(:(?!:).?[\w-]*:?(?!:)(?:t\d?)?:?) ?$/gi;
-        const spaceColonEmoji = /(?:^|[^a-z])(:(?!:).?[\w-]*:?(?!:)(?:t\d?)?:?) ?$/gi;
+        const matches = /(?:^|[^a-z])(:(?!:).?[\w-]*:?(?!:)(?:t\d?)?:?) ?$/gi.exec(
+          text.substring(0, cp)
+        );
 
-        const regex = self.siteSettings.enable_inline_emoji_translation
-          ? noSpaceColonEmoji
-          : spaceColonEmoji;
-        const matches = regex.exec(text.substring(0, cp));
         if (matches && matches[1]) {
           return [matches[1]];
         }
@@ -455,8 +457,8 @@ export default Ember.Component.extend({
 
           const match = term.match(/^:?(.*?):t([2-6])?$/);
           if (match) {
-            let name = match[1];
-            let scale = match[2];
+            const name = match[1];
+            const scale = match[2];
 
             if (isSkinTonableEmoji(name)) {
               if (scale) {
@@ -837,10 +839,17 @@ export default Ember.Component.extend({
   },
 
   actions: {
+    emoji() {
+      if (this.get("disabled")) {
+        return;
+      }
+
+      this.set("emojiPickerIsActive", !this.get("emojiPickerIsActive"));
+    },
+
     emojiSelected(code) {
       let selected = this._getSelected();
       const captures = selected.pre.match(/\B:(\w*)$/);
-
       if (_.isEmpty(captures)) {
         this._addText(selected, `:${code}:`);
       } else {
@@ -875,7 +884,7 @@ export default Ember.Component.extend({
       };
 
       if (button.sendAction) {
-        return this.sendAction(button.sendAction, toolbarEvent);
+        return button.sendAction(toolbarEvent);
       } else {
         button.perform(toolbarEvent);
       }
@@ -962,13 +971,6 @@ export default Ember.Component.extend({
           this._selectText(sel.start + 1, origLink.length);
         }
       }
-    },
-
-    emoji() {
-      if (this.get("disabled")) {
-        return;
-      }
-      this.set("emojiPickerIsActive", !this.get("emojiPickerIsActive"));
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/components/d-modal.js.es6 b/app/assets/javascripts/discourse/components/d-modal.js.es6
index efb05b38fc..44792ecfc0 100644
--- a/app/assets/javascripts/discourse/components/d-modal.js.es6
+++ b/app/assets/javascripts/discourse/components/d-modal.js.es6
@@ -23,7 +23,7 @@ export default Ember.Component.extend({
   setUp() {
     $("html").on("keydown.discourse-modal", e => {
       if (e.which === 27 && this.get("dismissable")) {
-        Em.run.next(() => $(".modal-header a.close").click());
+        Ember.run.next(() => $(".modal-header a.close").click());
       }
     });
 
diff --git a/app/assets/javascripts/discourse/components/desktop-notification-config.js.es6 b/app/assets/javascripts/discourse/components/desktop-notification-config.js.es6
index ab8def1558..604c53791f 100644
--- a/app/assets/javascripts/discourse/components/desktop-notification-config.js.es6
+++ b/app/assets/javascripts/discourse/components/desktop-notification-config.js.es6
@@ -89,13 +89,13 @@ export default Ember.Component.extend({
 
   actions: {
     recheckPermission() {
-      this.propertyDidChange("notificationsPermission");
+      this.notifyPropertyChange("notificationsPermission");
     },
 
     turnoff() {
       if (this.get("isEnabledDesktop")) {
         this.set("notificationsDisabled", "disabled");
-        this.propertyDidChange("notificationsPermission");
+        this.notifyPropertyChange("notificationsPermission");
       }
       if (this.get("isEnabledPush")) {
         unsubscribePushNotification(this.currentUser, () => {
@@ -113,7 +113,7 @@ export default Ember.Component.extend({
         this.set("notificationsDisabled", "");
         Notification.requestPermission(() => {
           confirmNotification();
-          this.propertyDidChange("notificationsPermission");
+          this.notifyPropertyChange("notificationsPermission");
         });
       }
     }
diff --git a/app/assets/javascripts/discourse/components/discourse-linked-text.js.es6 b/app/assets/javascripts/discourse/components/discourse-linked-text.js.es6
index dec769ca60..0a45c0bc1b 100644
--- a/app/assets/javascripts/discourse/components/discourse-linked-text.js.es6
+++ b/app/assets/javascripts/discourse/components/discourse-linked-text.js.es6
@@ -10,7 +10,7 @@ export default Ember.Component.extend({
 
   click(event) {
     if (event.target.tagName.toUpperCase() === "A") {
-      this.sendAction("action", this.get("actionParam"));
+      this.action(this.get("actionParam"));
     }
 
     return false;
diff --git a/app/assets/javascripts/discourse/components/edit-category-general.js.es6 b/app/assets/javascripts/discourse/components/edit-category-general.js.es6
index 2cc6b2b3a5..79f0d9c092 100644
--- a/app/assets/javascripts/discourse/components/edit-category-general.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-category-general.js.es6
@@ -6,7 +6,9 @@ import computed from "ember-addons/ember-computed-decorators";
 
 export default buildCategoryPanel("general", {
   foregroundColors: ["FFFFFF", "000000"],
-  canSelectParentCategory: Em.computed.not("category.isUncategorizedCategory"),
+  canSelectParentCategory: Ember.computed.not(
+    "category.isUncategorizedCategory"
+  ),
 
   // background colors are available as a pipe-separated string
   @computed
diff --git a/app/assets/javascripts/discourse/components/edit-category-images.js.es6 b/app/assets/javascripts/discourse/components/edit-category-images.js.es6
index c896945540..f7b03702ec 100644
--- a/app/assets/javascripts/discourse/components/edit-category-images.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-category-images.js.es6
@@ -1,8 +1,5 @@
 import { buildCategoryPanel } from "discourse/components/edit-category-panel";
-import {
-  default as computed,
-  observes
-} from "ember-addons/ember-computed-decorators";
+import { default as computed } from "ember-addons/ember-computed-decorators";
 
 export default buildCategoryPanel("images").extend({
   @computed("category.uploaded_background.url")
@@ -10,39 +7,45 @@ export default buildCategoryPanel("images").extend({
     return uploadedBackgroundUrl || "";
   },
 
-  @computed("category.uploaded_background.id")
-  backgroundImageId(uploadedBackgroundId) {
-    return uploadedBackgroundId || null;
-  },
-
   @computed("category.uploaded_logo.url")
   logoImageUrl(uploadedLogoUrl) {
     return uploadedLogoUrl || "";
   },
 
-  @computed("category.uploaded_logo.id")
-  logoImageId(uploadedLogoId) {
-    return uploadedLogoId || null;
+  actions: {
+    logoUploadDone(upload) {
+      this._setFromUpload("category.uploaded_logo", upload);
+    },
+
+    logoUploadDeleted() {
+      this._deleteUpload("category.uploaded_logo");
+    },
+
+    backgroundUploadDone(upload) {
+      this._setFromUpload("category.uploaded_background", upload);
+    },
+
+    backgroundUploadDeleted() {
+      this._deleteUpload("category.uploaded_background");
+    }
   },
 
-  @observes("backgroundImageUrl", "backgroundImageId")
-  _setBackgroundUpload() {
+  _deleteUpload(path) {
     this.set(
-      "category.uploaded_background",
+      path,
       Ember.Object.create({
-        id: this.get("backgroundImageId"),
-        url: this.get("backgroundImageUrl")
+        id: null,
+        url: null
       })
     );
   },
 
-  @observes("logoImageUrl", "logoImageId")
-  _setLogoUpload() {
+  _setFromUpload(path, upload) {
     this.set(
-      "category.uploaded_logo",
+      path,
       Ember.Object.create({
-        id: this.get("logoImageId"),
-        url: this.get("logoImageUrl")
+        url: upload.url,
+        id: upload.id
       })
     );
   }
diff --git a/app/assets/javascripts/discourse/components/edit-category-settings.js.es6 b/app/assets/javascripts/discourse/components/edit-category-settings.js.es6
index b7ebf139a5..455418f13c 100644
--- a/app/assets/javascripts/discourse/components/edit-category-settings.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-category-settings.js.es6
@@ -5,12 +5,12 @@ import computed from "ember-addons/ember-computed-decorators";
 export default buildCategoryPanel("settings", {
   emailInEnabled: setting("email_in"),
   showPositionInput: setting("fixed_category_positions"),
-  isParentCategory: Em.computed.empty("category.parent_category_id"),
-  showSubcategoryListStyle: Em.computed.and(
+  isParentCategory: Ember.computed.empty("category.parent_category_id"),
+  showSubcategoryListStyle: Ember.computed.and(
     "category.show_subcategory_list",
     "isParentCategory"
   ),
-  isDefaultSortOrder: Em.computed.empty("category.sort_order"),
+  isDefaultSortOrder: Ember.computed.empty("category.sort_order"),
 
   @computed
   availableSubcategoryListStyles() {
diff --git a/app/assets/javascripts/discourse/components/edit-category-tab.js.es6 b/app/assets/javascripts/discourse/components/edit-category-tab.js.es6
index e48a390d7b..f8b8d962ad 100644
--- a/app/assets/javascripts/discourse/components/edit-category-tab.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-category-tab.js.es6
@@ -1,6 +1,6 @@
 import { propertyEqual } from "discourse/lib/computed";
 
-export default Em.Component.extend({
+export default Ember.Component.extend({
   tagName: "li",
   classNameBindings: ["active", "tabClassName"],
 
diff --git a/app/assets/javascripts/discourse/components/edit-topic-timer-form.js.es6 b/app/assets/javascripts/discourse/components/edit-topic-timer-form.js.es6
index d231539ccf..f3eb28e7c7 100644
--- a/app/assets/javascripts/discourse/components/edit-topic-timer-form.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-topic-timer-form.js.es6
@@ -9,7 +9,8 @@ import {
   OPEN_STATUS_TYPE,
   DELETE_STATUS_TYPE,
   REMINDER_TYPE,
-  CLOSE_STATUS_TYPE
+  CLOSE_STATUS_TYPE,
+  BUMP_TYPE
 } from "discourse/controllers/edit-topic-timer";
 
 export default Ember.Component.extend({
@@ -17,12 +18,18 @@ export default Ember.Component.extend({
   autoOpen: Ember.computed.equal("selection", OPEN_STATUS_TYPE),
   autoClose: Ember.computed.equal("selection", CLOSE_STATUS_TYPE),
   autoDelete: Ember.computed.equal("selection", DELETE_STATUS_TYPE),
+  autoBump: Ember.computed.equal("selection", BUMP_TYPE),
   publishToCategory: Ember.computed.equal(
     "selection",
     PUBLISH_TO_CATEGORY_STATUS_TYPE
   ),
   reminder: Ember.computed.equal("selection", REMINDER_TYPE),
-  showTimeOnly: Ember.computed.or("autoOpen", "autoDelete", "reminder"),
+  showTimeOnly: Ember.computed.or(
+    "autoOpen",
+    "autoDelete",
+    "reminder",
+    "autoBump"
+  ),
 
   @computed(
     "topicTimer.updateTime",
@@ -65,7 +72,9 @@ export default Ember.Component.extend({
   @observes("selection")
   _updateBasedOnLastPost() {
     if (!this.get("autoClose")) {
-      this.set("topicTimer.based_on_last_post", false);
+      Ember.run.schedule("afterRender", () => {
+        this.set("topicTimer.based_on_last_post", false);
+      });
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/components/emoji-picker.js.es6 b/app/assets/javascripts/discourse/components/emoji-picker.js.es6
index 628588ef20..22fac50e4f 100644
--- a/app/assets/javascripts/discourse/components/emoji-picker.js.es6
+++ b/app/assets/javascripts/discourse/components/emoji-picker.js.es6
@@ -333,7 +333,7 @@ export default Ember.Component.extend({
         this._trackEmojiUsage(code);
       }
 
-      this.sendAction("emojiSelected", code);
+      this.emojiSelected(code);
 
       if (this.$modal.hasClass("fadeIn")) {
         this.set("active", false);
diff --git a/app/assets/javascripts/discourse/components/emoji-uploader.js.es6 b/app/assets/javascripts/discourse/components/emoji-uploader.js.es6
index f1c7f6384a..f6ccab1c5a 100644
--- a/app/assets/javascripts/discourse/components/emoji-uploader.js.es6
+++ b/app/assets/javascripts/discourse/components/emoji-uploader.js.es6
@@ -1,11 +1,11 @@
 import UploadMixin from "discourse/mixins/upload";
 
-export default Em.Component.extend(UploadMixin, {
+export default Ember.Component.extend(UploadMixin, {
   type: "emoji",
   uploadUrl: "/admin/customize/emojis",
 
-  hasName: Em.computed.notEmpty("name"),
-  addDisabled: Em.computed.not("hasName"),
+  hasName: Ember.computed.notEmpty("name"),
+  addDisabled: Ember.computed.not("hasName"),
 
   data: function() {
     return Ember.isBlank(this.get("name")) ? {} : { name: this.get("name") };
@@ -17,6 +17,6 @@ export default Em.Component.extend(UploadMixin, {
 
   uploadDone(upload) {
     this.set("name", null);
-    this.sendAction("done", upload);
+    this.done(upload);
   }
 });
diff --git a/app/assets/javascripts/discourse/components/flag-action-type.js.es6 b/app/assets/javascripts/discourse/components/flag-action-type.js.es6
index 7ab41c4e2a..6a7a713d4e 100644
--- a/app/assets/javascripts/discourse/components/flag-action-type.js.es6
+++ b/app/assets/javascripts/discourse/components/flag-action-type.js.es6
@@ -23,9 +23,9 @@ export default Ember.Component.extend({
     return flag === selectedFlag;
   },
 
-  showMessageInput: Em.computed.and("flag.is_custom_flag", "selected"),
-  showDescription: Em.computed.not("showMessageInput"),
-  isNotifyUser: Em.computed.equal("flag.name_key", "notify_user"),
+  showMessageInput: Ember.computed.and("flag.is_custom_flag", "selected"),
+  showDescription: Ember.computed.not("showMessageInput"),
+  isNotifyUser: Ember.computed.equal("flag.name_key", "notify_user"),
 
   @computed("flag.description", "flag.short_description")
   description(long_description, short_description) {
@@ -57,7 +57,7 @@ export default Ember.Component.extend({
 
   actions: {
     changePostActionType(at) {
-      this.sendAction("changePostActionType", at);
+      this.changePostActionType(at);
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/components/group-card-contents.js.es6 b/app/assets/javascripts/discourse/components/group-card-contents.js.es6
index 5fd388adf8..78e9389631 100644
--- a/app/assets/javascripts/discourse/components/group-card-contents.js.es6
+++ b/app/assets/javascripts/discourse/components/group-card-contents.js.es6
@@ -56,9 +56,8 @@ export default Ember.Component.extend(CardContentsBase, CleansUp, {
 
   _close() {
     this._super();
-    this.setProperties({
-      group: null
-    });
+
+    this.set("group", null);
   },
 
   cleanUp() {
@@ -77,16 +76,12 @@ export default Ember.Component.extend(CardContentsBase, CleansUp, {
       this._close();
     },
 
-    composePrivateMessage(...args) {
-      this.sendAction("composePrivateMessage", ...args);
-    },
-
     messageGroup() {
-      this.sendAction("createNewMessageViaParams", this.get("group.name"));
+      this.createNewMessageViaParams(this.get("group.name"));
     },
 
-    showGroup() {
-      this.sendAction("showGroup", this.get("group"));
+    showGroup(group) {
+      this.showGroup(group);
       this._close();
     }
   }
diff --git a/app/assets/javascripts/discourse/components/group-manage-logs-filter.js.es6 b/app/assets/javascripts/discourse/components/group-manage-logs-filter.js.es6
index 12b05339d3..0944c3ddf1 100644
--- a/app/assets/javascripts/discourse/components/group-manage-logs-filter.js.es6
+++ b/app/assets/javascripts/discourse/components/group-manage-logs-filter.js.es6
@@ -17,7 +17,7 @@ export default Ember.Component.extend({
 
   actions: {
     clearFilter(param) {
-      this.sendAction("clearFilter", param);
+      this.clearFilter(param);
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/components/group-member-dropdown.js.es6 b/app/assets/javascripts/discourse/components/group-member-dropdown.js.es6
index 92770a2d14..5e7ea9ec53 100644
--- a/app/assets/javascripts/discourse/components/group-member-dropdown.js.es6
+++ b/app/assets/javascripts/discourse/components/group-member-dropdown.js.es6
@@ -52,13 +52,13 @@ export default DropdownSelectBoxComponent.extend({
   mutateValue(id) {
     switch (id) {
       case "removeMember":
-        this.sendAction("removeMember", this.get("member"));
+        this.removeMember(this.get("member"));
         break;
       case "makeOwner":
-        this.sendAction("makeOwner", this.get("member.username"));
+        this.makeOwner(this.get("member.username"));
         break;
       case "removeOwner":
-        this.sendAction("removeOwner", this.get("member"));
+        this.removeOwner(this.get("member"));
         break;
     }
   }
diff --git a/app/assets/javascripts/discourse/components/group-member.js.es6 b/app/assets/javascripts/discourse/components/group-member.js.es6
index 6421dfc58c..019867d525 100644
--- a/app/assets/javascripts/discourse/components/group-member.js.es6
+++ b/app/assets/javascripts/discourse/components/group-member.js.es6
@@ -3,7 +3,7 @@ export default Ember.Component.extend({
 
   actions: {
     remove() {
-      this.sendAction("removeAction", this.get("member"));
+      this.removeAction(this.get("member"));
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/components/group-members-input.js.es6 b/app/assets/javascripts/discourse/components/group-members-input.js.es6
index f05fda3eb0..637cfca41b 100644
--- a/app/assets/javascripts/discourse/components/group-members-input.js.es6
+++ b/app/assets/javascripts/discourse/components/group-members-input.js.es6
@@ -28,7 +28,7 @@ export default Ember.Component.extend({
     return !usernames || !(usernames.length > 0);
   },
 
-  showingFirst: Em.computed.lte("currentPage", 1),
+  showingFirst: Ember.computed.lte("currentPage", 1),
   showingLast: propertyEqual("currentPage", "totalPages"),
 
   actions: {
@@ -60,7 +60,7 @@ export default Ember.Component.extend({
     },
 
     addMembers() {
-      if (Em.isEmpty(this.get("model.usernames"))) {
+      if (Ember.isEmpty(this.get("model.usernames"))) {
         return;
       }
       this.get("model")
diff --git a/app/assets/javascripts/discourse/components/group-membership-button.js.es6 b/app/assets/javascripts/discourse/components/group-membership-button.js.es6
index d816b328be..420a3f1c9a 100644
--- a/app/assets/javascripts/discourse/components/group-membership-button.js.es6
+++ b/app/assets/javascripts/discourse/components/group-membership-button.js.es6
@@ -26,7 +26,7 @@ export default Ember.Component.extend({
   },
 
   _showLoginModal() {
-    this.sendAction("showLogin");
+    this.showLogin();
     $.cookie("destination_url", window.location.href);
   },
 
diff --git a/app/assets/javascripts/discourse/components/image-uploader.js.es6 b/app/assets/javascripts/discourse/components/image-uploader.js.es6
index 433d1c9549..db580fb71f 100644
--- a/app/assets/javascripts/discourse/components/image-uploader.js.es6
+++ b/app/assets/javascripts/discourse/components/image-uploader.js.es6
@@ -1,12 +1,12 @@
 import computed from "ember-addons/ember-computed-decorators";
 import UploadMixin from "discourse/mixins/upload";
 
-export default Em.Component.extend(UploadMixin, {
+export default Ember.Component.extend(UploadMixin, {
   classNames: ["image-uploader"],
 
   @computed("imageUrl")
   backgroundStyle(imageUrl) {
-    if (Em.isEmpty(imageUrl)) {
+    if (Ember.isEmpty(imageUrl)) {
       return "".htmlSafe();
     }
 
@@ -23,14 +23,20 @@ export default Em.Component.extend(UploadMixin, {
   },
 
   uploadDone(upload) {
-    this.set("imageUrl", upload.url);
-    this.set("imageId", upload.id);
+    this.setProperties({ imageUrl: upload.url, imageId: upload.id });
+
+    if (this.onUploadDone) {
+      this.onUploadDone(upload);
+    }
   },
 
   actions: {
     trash() {
-      this.set("imageUrl", null);
-      this.set("imageId", null);
+      this.setProperties({ imageUrl: null, imageId: null });
+
+      if (this.onUploadDeleted) {
+        this.onUploadDeleted();
+      }
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/components/images-uploader.js.es6 b/app/assets/javascripts/discourse/components/images-uploader.js.es6
index 8c4bca5125..5fd63d0d01 100644
--- a/app/assets/javascripts/discourse/components/images-uploader.js.es6
+++ b/app/assets/javascripts/discourse/components/images-uploader.js.es6
@@ -1,7 +1,7 @@
 import computed from "ember-addons/ember-computed-decorators";
 import UploadMixin from "discourse/mixins/upload";
 
-export default Em.Component.extend(UploadMixin, {
+export default Ember.Component.extend(UploadMixin, {
   type: "avatar",
   tagName: "span",
 
@@ -17,6 +17,6 @@ export default Em.Component.extend(UploadMixin, {
   },
 
   uploadDone(upload) {
-    this.sendAction("done", upload);
+    this.done(upload);
   }
 });
diff --git a/app/assets/javascripts/discourse/components/input-tip.js.es6 b/app/assets/javascripts/discourse/components/input-tip.js.es6
index c7fae12455..6c7688c094 100644
--- a/app/assets/javascripts/discourse/components/input-tip.js.es6
+++ b/app/assets/javascripts/discourse/components/input-tip.js.es6
@@ -6,8 +6,8 @@ export default Ember.Component.extend(
     classNameBindings: [":tip", "good", "bad"],
     rerenderTriggers: ["validation"],
 
-    bad: Em.computed.alias("validation.failed"),
-    good: Em.computed.not("bad"),
+    bad: Ember.computed.alias("validation.failed"),
+    good: Ember.computed.not("bad"),
 
     buildBuffer(buffer) {
       const reason = this.get("validation.reason");
diff --git a/app/assets/javascripts/discourse/components/load-more.js.es6 b/app/assets/javascripts/discourse/components/load-more.js.es6
index aae44e6585..a4b37f72dd 100644
--- a/app/assets/javascripts/discourse/components/load-more.js.es6
+++ b/app/assets/javascripts/discourse/components/load-more.js.es6
@@ -2,13 +2,14 @@ import LoadMore from "discourse/mixins/load-more";
 
 export default Ember.Component.extend(LoadMore, {
   init() {
-    this._super();
+    this._super(...arguments);
+
     this.set("eyelineSelector", this.get("selector"));
   },
 
   actions: {
     loadMore() {
-      this.sendAction();
+      this.action();
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/components/login-buttons.js.es6 b/app/assets/javascripts/discourse/components/login-buttons.js.es6
index c9fd5109c4..4f0697fc63 100644
--- a/app/assets/javascripts/discourse/components/login-buttons.js.es6
+++ b/app/assets/javascripts/discourse/components/login-buttons.js.es6
@@ -20,12 +20,8 @@ export default Ember.Component.extend({
   },
 
   actions: {
-    emailLogin() {
-      this.sendAction("emailLogin");
-    },
-
     externalLogin(provider) {
-      this.sendAction("externalLogin", provider);
+      this.externalLogin(provider);
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/components/mobile-nav.js.es6 b/app/assets/javascripts/discourse/components/mobile-nav.js.es6
index 71e3356090..3638eaca8f 100644
--- a/app/assets/javascripts/discourse/components/mobile-nav.js.es6
+++ b/app/assets/javascripts/discourse/components/mobile-nav.js.es6
@@ -20,7 +20,7 @@ export default Ember.Component.extend({
   @observes("currentPath")
   currentPathChanged() {
     this.set("expanded", false);
-    Em.run.next(() => this._updateSelectedHtml());
+    Ember.run.next(() => this._updateSelectedHtml());
   },
 
   _updateSelectedHtml() {
@@ -38,7 +38,7 @@ export default Ember.Component.extend({
     toggleExpanded() {
       this.toggleProperty("expanded");
 
-      Em.run.next(() => {
+      Ember.run.next(() => {
         if (this.get("expanded")) {
           $(window)
             .off("click.mobile-nav")
diff --git a/app/assets/javascripts/discourse/components/navigation-bar.js.es6 b/app/assets/javascripts/discourse/components/navigation-bar.js.es6
index 7d0c8f7ac7..674ad8f943 100644
--- a/app/assets/javascripts/discourse/components/navigation-bar.js.es6
+++ b/app/assets/javascripts/discourse/components/navigation-bar.js.es6
@@ -68,7 +68,7 @@ export default Ember.Component.extend({
       if (this.get("expanded")) {
         DiscourseURL.appEvents.on("dom:clean", this, this.ensureDropClosed);
 
-        Em.run.next(() => {
+        Ember.run.next(() => {
           if (!this.get("expanded")) {
             return;
           }
diff --git a/app/assets/javascripts/discourse/components/preference-checkbox.js.es6 b/app/assets/javascripts/discourse/components/preference-checkbox.js.es6
index f4f968f8a6..6088f4a4a6 100644
--- a/app/assets/javascripts/discourse/components/preference-checkbox.js.es6
+++ b/app/assets/javascripts/discourse/components/preference-checkbox.js.es6
@@ -1,4 +1,4 @@
-export default Em.Component.extend({
+export default Ember.Component.extend({
   classNames: ["controls"],
 
   label: function() {
@@ -9,7 +9,7 @@ export default Em.Component.extend({
     const warning = this.get("warning");
 
     if (warning && this.get("checked")) {
-      this.sendAction("warning");
+      this.warning();
       return false;
     }
 
diff --git a/app/assets/javascripts/discourse/components/queued-post.js.es6 b/app/assets/javascripts/discourse/components/queued-post.js.es6
index 33248b815a..8711819bf0 100644
--- a/app/assets/javascripts/discourse/components/queued-post.js.es6
+++ b/app/assets/javascripts/discourse/components/queued-post.js.es6
@@ -16,7 +16,7 @@ function updateState(state, opts) {
     post
       .update(args)
       .then(() => {
-        this.sendAction("removePost", post);
+        this.removePost(post);
       })
       .catch(popupAjaxError);
   };
diff --git a/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6 b/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6
index a55bce8fcf..248c362db5 100644
--- a/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6
+++ b/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6
@@ -203,7 +203,7 @@ export default MountWidget.extend({
             }
           });
         };
-        this.sendAction("topVisibleChanged", {
+        this.topVisibleChanged({
           post: first,
           refresh: topRefresh
         });
@@ -212,14 +212,14 @@ export default MountWidget.extend({
       const last = posts.objectAt(onscreen[onscreen.length - 1]);
       if (this._bottomVisible !== last) {
         this._bottomVisible = last;
-        this.sendAction("bottomVisibleChanged", { post: last, refresh });
+        this.bottomVisibleChanged({ post: last, refresh });
       }
 
       const changedPost = this._currentPost !== currentPost;
       if (changedPost) {
         this._currentPost = currentPost;
         const post = posts.objectAt(currentPost);
-        this.sendAction("currentPostChanged", { post });
+        this.currentPostChanged({ post });
       }
 
       if (percent !== null) {
@@ -227,7 +227,7 @@ export default MountWidget.extend({
 
         if (changedPost || this._currentPercent !== percent) {
           this._currentPercent = percent;
-          this.sendAction("currentPostScrolled", { percent });
+          this.currentPostScrolled({ percent });
         }
       }
     } else {
diff --git a/app/assets/javascripts/discourse/components/search-advanced-options.js.es6 b/app/assets/javascripts/discourse/components/search-advanced-options.js.es6
index 408064686d..8ae88ca19f 100644
--- a/app/assets/javascripts/discourse/components/search-advanced-options.js.es6
+++ b/app/assets/javascripts/discourse/components/search-advanced-options.js.es6
@@ -28,7 +28,7 @@ const REGEXP_POST_TIME_WHEN = /^(before|after)/gi;
 
 const IN_OPTIONS_MAPPING = { images: "with" };
 
-export default Em.Component.extend({
+export default Ember.Component.extend({
   classNames: ["search-advanced-options"],
 
   inOptionsForUsers: [
diff --git a/app/assets/javascripts/discourse/components/share-popup.js.es6 b/app/assets/javascripts/discourse/components/share-popup.js.es6
index 757fc377a4..c0aafab997 100644
--- a/app/assets/javascripts/discourse/components/share-popup.js.es6
+++ b/app/assets/javascripts/discourse/components/share-popup.js.es6
@@ -165,7 +165,7 @@ export default Ember.Component.extend({
       const postId =
         this.get("postId") || postStream.findPostIdForPostNumber(1);
       const post = postStream.findLoadedPost(postId);
-      this.sendAction("replyAsNewTopic", post);
+      this.get("replyAsNewTopic")(post);
       this.send("close");
     },
 
diff --git a/app/assets/javascripts/discourse/components/share-source.js.es6 b/app/assets/javascripts/discourse/components/share-source.js.es6
index 94c1fcb810..0eb7020886 100644
--- a/app/assets/javascripts/discourse/components/share-source.js.es6
+++ b/app/assets/javascripts/discourse/components/share-source.js.es6
@@ -3,7 +3,7 @@ export default Ember.Component.extend({
 
   actions: {
     share: function(source) {
-      this.sendAction("action", source);
+      this.action(source);
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/components/signup-cta.js.es6 b/app/assets/javascripts/discourse/components/signup-cta.js.es6
index 04ff9ec91d..dbbc7ad1d5 100644
--- a/app/assets/javascripts/discourse/components/signup-cta.js.es6
+++ b/app/assets/javascripts/discourse/components/signup-cta.js.es6
@@ -9,10 +9,10 @@ export default Ember.Component.extend({
     hideForSession() {
       this.session.set("hideSignupCta", true);
       this.keyValueStore.setItem("anon-cta-hidden", new Date().getTime());
-      Em.run.later(() => this.session.set("showSignupCta", false), 20 * 1000);
-    },
-    showCreateAccount() {
-      this.sendAction();
+      Ember.run.later(
+        () => this.session.set("showSignupCta", false),
+        20 * 1000
+      );
     }
   },
 
diff --git a/app/assets/javascripts/discourse/components/site-header.js.es6 b/app/assets/javascripts/discourse/components/site-header.js.es6
index ab765a065c..a0dd8a2f9a 100644
--- a/app/assets/javascripts/discourse/components/site-header.js.es6
+++ b/app/assets/javascripts/discourse/components/site-header.js.es6
@@ -367,7 +367,7 @@ const SiteHeaderComponent = MountWidget.extend(Docking, PanEvents, {
           $headerCloak.show();
         }
 
-        const menuTop = this.site.mobileView ? 0 : headerHeight();
+        const menuTop = this.site.mobileView ? headerTop() : headerHeight();
 
         let height;
         const winHeightOffset = 16;
@@ -386,6 +386,7 @@ const SiteHeaderComponent = MountWidget.extend(Docking, PanEvents, {
         }
         if (style.top !== menuTop + "px" || style.height !== height) {
           $panel.css({ top: menuTop + "px", height });
+          $(".header-cloak").css({ top: menuTop + "px" });
         }
         $("body").removeClass("drop-down-mode");
       }
@@ -434,3 +435,10 @@ export function headerHeight() {
     $header.outerHeight() + headerOffsetTop - $(window).scrollTop()
   );
 }
+
+export function headerTop() {
+  const $header = $("header.d-header");
+  const headerOffset = $header.offset();
+  const headerOffsetTop = headerOffset ? headerOffset.top : 0;
+  return parseInt(headerOffsetTop - $(window).scrollTop());
+}
diff --git a/app/assets/javascripts/discourse/components/suggested-topics.js.es6 b/app/assets/javascripts/discourse/components/suggested-topics.js.es6
index 78d512aae0..da1ae4f00a 100644
--- a/app/assets/javascripts/discourse/components/suggested-topics.js.es6
+++ b/app/assets/javascripts/discourse/components/suggested-topics.js.es6
@@ -32,7 +32,7 @@ export default Ember.Component.extend({
 
     if (
       category &&
-      Em.get(category, "id") ===
+      Ember.get(category, "id") ===
         Discourse.Site.currentProp("uncategorized_category_id")
     ) {
       category = null;
diff --git a/app/assets/javascripts/discourse/components/tags-admin-dropdown.js.es6 b/app/assets/javascripts/discourse/components/tags-admin-dropdown.js.es6
index 3fdbdf563c..2fc80dc687 100644
--- a/app/assets/javascripts/discourse/components/tags-admin-dropdown.js.es6
+++ b/app/assets/javascripts/discourse/components/tags-admin-dropdown.js.es6
@@ -6,6 +6,7 @@ export default DropdownSelectBoxComponent.extend({
   showFullTitle: false,
   allowInitialValueMutation: false,
   headerIcon: ["bars", "caret-down"],
+  actionsMapping: null,
 
   autoHighlight() {},
 
@@ -15,32 +16,35 @@ export default DropdownSelectBoxComponent.extend({
         id: "manageGroups",
         name: I18n.t("tagging.manage_groups"),
         description: I18n.t("tagging.manage_groups_description"),
-        icon: "wrench"
+        icon: "wrench",
+        __sk_row_type: "noopRow"
       },
       {
         id: "uploadTags",
         name: I18n.t("tagging.upload"),
         description: I18n.t("tagging.upload_description"),
-        icon: "upload"
+        icon: "upload",
+        __sk_row_type: "noopRow"
       },
       {
         id: "deleteUnusedTags",
         name: I18n.t("tagging.delete_unused"),
         description: I18n.t("tagging.delete_unused_description"),
-        icon: "trash"
+        icon: "trash",
+        __sk_row_type: "noopRow"
       }
     ];
 
     return items;
   },
 
-  actionNames: {
-    manageGroups: "showTagGroups",
-    uploadTags: "showUploader",
-    deleteUnusedTags: "deleteUnused"
-  },
+  actions: {
+    onSelect(id) {
+      const action = this.get("actionsMapping")[id];
 
-  mutateValue(id) {
-    this.sendAction(`actionNames.${id}`);
+      if (action) {
+        action();
+      }
+    }
   }
 });
diff --git a/app/assets/javascripts/discourse/components/top-period-buttons.js.es6 b/app/assets/javascripts/discourse/components/top-period-buttons.js.es6
index 4c5d7cd102..237a4c6cfe 100644
--- a/app/assets/javascripts/discourse/components/top-period-buttons.js.es6
+++ b/app/assets/javascripts/discourse/components/top-period-buttons.js.es6
@@ -8,7 +8,7 @@ export default Ember.Component.extend({
 
   actions: {
     changePeriod(p) {
-      this.sendAction("action", p);
+      this.action(p);
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/components/topic-list-item.js.es6 b/app/assets/javascripts/discourse/components/topic-list-item.js.es6
index 45a27b7ccd..b2cc394344 100644
--- a/app/assets/javascripts/discourse/components/topic-list-item.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-list-item.js.es6
@@ -39,7 +39,7 @@ export default Ember.Component.extend(
       "topic.visited"
     ],
     attributeBindings: ["data-topic-id"],
-    "data-topic-id": Em.computed.alias("topic.id"),
+    "data-topic-id": Ember.computed.alias("topic.id"),
 
     @computed
     newDotText() {
@@ -104,6 +104,7 @@ export default Ember.Component.extend(
       return this.get("topic.op_like_count") > 0;
     },
 
+    @computed
     expandPinned: function() {
       const pinned = this.get("topic.pinned");
       if (!pinned) {
@@ -132,7 +133,7 @@ export default Ember.Component.extend(
       }
 
       return false;
-    }.property(),
+    },
 
     showEntrance,
 
diff --git a/app/assets/javascripts/discourse/components/topic-list.js.es6 b/app/assets/javascripts/discourse/components/topic-list.js.es6
index c159e733a1..a91ee52c0b 100644
--- a/app/assets/javascripts/discourse/components/topic-list.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-list.js.es6
@@ -129,7 +129,7 @@ export default Ember.Component.extend({
     };
 
     onClick("button.bulk-select", function() {
-      this.sendAction("toggleBulkSelect");
+      this.toggleBulkSelect();
       this.rerender();
     });
 
@@ -142,7 +142,7 @@ export default Ember.Component.extend({
     });
 
     onClick("th.sortable", function(e2) {
-      this.sendAction("changeSort", e2.data("sort-order"));
+      this.changeSort(e2.data("sort-order"));
       this.rerender();
     });
   }
diff --git a/app/assets/javascripts/discourse/components/topic-timeline.js.es6 b/app/assets/javascripts/discourse/components/topic-timeline.js.es6
index 2d6926d3a7..e276e7a397 100644
--- a/app/assets/javascripts/discourse/components/topic-timeline.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-timeline.js.es6
@@ -86,7 +86,7 @@ export default MountWidget.extend(Docking, {
     this._super();
 
     if (this.get("fullscreen") && !this.get("addShowClass")) {
-      Em.run.next(() => {
+      Ember.run.next(() => {
         this.set("addShowClass", true);
         this.queueRerender();
       });
diff --git a/app/assets/javascripts/discourse/components/topic-timer-info.js.es6 b/app/assets/javascripts/discourse/components/topic-timer-info.js.es6
index 6a3306a55a..8fcb580dad 100644
--- a/app/assets/javascripts/discourse/components/topic-timer-info.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-timer-info.js.es6
@@ -77,7 +77,7 @@ export default Ember.Component.extend(
 
     willDestroyElement() {
       if (this._delayedRerender) {
-        Em.run.cancel(this._delayedRerender);
+        Ember.run.cancel(this._delayedRerender);
       }
     },
 
diff --git a/app/assets/javascripts/discourse/components/user-card-contents.js.es6 b/app/assets/javascripts/discourse/components/user-card-contents.js.es6
index 0bd5682570..0f34c1eb2c 100644
--- a/app/assets/javascripts/discourse/components/user-card-contents.js.es6
+++ b/app/assets/javascripts/discourse/components/user-card-contents.js.es6
@@ -185,21 +185,18 @@ export default Ember.Component.extend(
         this._close();
       },
 
-      composePrivateMessage(...args) {
-        this.sendAction("composePrivateMessage", ...args);
-      },
-
       togglePosts() {
-        this.sendAction("togglePosts", this.get("user"));
+        this.togglePosts(this.get("user"));
         this._close();
       },
 
       deleteUser() {
-        this.sendAction("deleteUser", this.get("user"));
+        this.get("user").delete();
+        this._close();
       },
 
       showUser() {
-        this.sendAction("showUser", this.get("user"));
+        this.showUser(this.get("user"));
         this._close();
       },
 
diff --git a/app/assets/javascripts/discourse/components/user-info.js.es6 b/app/assets/javascripts/discourse/components/user-info.js.es6
index 825b822cd4..e507b30570 100644
--- a/app/assets/javascripts/discourse/components/user-info.js.es6
+++ b/app/assets/javascripts/discourse/components/user-info.js.es6
@@ -15,10 +15,10 @@ export default Ember.Component.extend({
     return userPath(username);
   },
 
-  "data-username": Em.computed.alias("user.username"),
+  "data-username": Ember.computed.alias("user.username"),
 
   // TODO: In later ember releases `hasBlock` works without this
-  hasBlock: Em.computed.alias("template"),
+  hasBlock: Ember.computed.alias("template"),
 
   @computed("user.name", "user.username")
   name(name, username) {
diff --git a/app/assets/javascripts/discourse/components/user-selector.js.es6 b/app/assets/javascripts/discourse/components/user-selector.js.es6
index cafd20aa67..cdd9aba280 100644
--- a/app/assets/javascripts/discourse/components/user-selector.js.es6
+++ b/app/assets/javascripts/discourse/components/user-selector.js.es6
@@ -96,7 +96,7 @@ export default TextField.extend({
           self.set("hasGroups", hasGroups);
 
           selected = items;
-          if (self.get("onChangeCallback")) self.sendAction("onChangeCallback");
+          if (self.get("onChangeCallback")) self.onChangeCallback();
         },
 
         reverseTransform(i) {
@@ -114,7 +114,7 @@ export default TextField.extend({
   @observes("usernames")
   _clearInput: function() {
     if (arguments.length > 1) {
-      if (Em.isEmpty(this.get("usernames"))) {
+      if (Ember.isEmpty(this.get("usernames"))) {
         this.$()
           .parent()
           .find("a")
diff --git a/app/assets/javascripts/discourse/components/user-stream.js.es6 b/app/assets/javascripts/discourse/components/user-stream.js.es6
index f28c296849..59408144df 100644
--- a/app/assets/javascripts/discourse/components/user-stream.js.es6
+++ b/app/assets/javascripts/discourse/components/user-stream.js.es6
@@ -13,7 +13,7 @@ export default Ember.Component.extend(LoadMore, {
   classNames: ["user-stream"],
 
   _scrollTopOnModelChange: function() {
-    Em.run.schedule("afterRender", () => $(document).scrollTop(0));
+    Ember.run.schedule("afterRender", () => $(document).scrollTop(0));
   }.observes("stream.user.id"),
 
   _inserted: function() {
diff --git a/app/assets/javascripts/discourse/controllers/bulk-notification-level.js.es6 b/app/assets/javascripts/discourse/controllers/bulk-notification-level.js.es6
index 07dbe955f3..744e28a13a 100644
--- a/app/assets/javascripts/discourse/controllers/bulk-notification-level.js.es6
+++ b/app/assets/javascripts/discourse/controllers/bulk-notification-level.js.es6
@@ -17,7 +17,7 @@ export default Ember.Controller.extend({
     });
   },
 
-  disabled: Em.computed.empty("notificationLevelId"),
+  disabled: Ember.computed.empty("notificationLevelId"),
 
   actions: {
     changeNotificationLevel() {
diff --git a/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6 b/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6
index c409ca31ef..87df9f226a 100644
--- a/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6
+++ b/app/assets/javascripts/discourse/controllers/change-timestamp.js.es6
@@ -47,7 +47,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
         .then(function() {
           self.send("closeModal");
           self.setProperties({ date: "", time: "", saving: false });
-          Em.run.next(() => {
+          Ember.run.next(() => {
             DiscourseURL.routeTo(topic.get("url"));
           });
         })
diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6
index 1897724ee6..1ae4cfffd6 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/composer.js.es6
@@ -80,11 +80,11 @@ export default Ember.Controller.extend({
   topicController: Ember.inject.controller("topic"),
   application: Ember.inject.controller(),
 
-  replyAsNewTopicDraft: Em.computed.equal(
+  replyAsNewTopicDraft: Ember.computed.equal(
     "model.draftKey",
     Composer.REPLY_AS_NEW_TOPIC_KEY
   ),
-  replyAsNewPrivateMessageDraft: Em.computed.equal(
+  replyAsNewPrivateMessageDraft: Ember.computed.equal(
     "model.draftKey",
     Composer.REPLY_AS_NEW_PRIVATE_MESSAGE_KEY
   ),
@@ -155,7 +155,7 @@ export default Ember.Controller.extend({
     return "title";
   },
 
-  showToolbar: Em.computed({
+  showToolbar: Ember.computed({
     get() {
       const keyValueStore = getOwner(this).lookup("key-value-store:main");
       const storedVal = keyValueStore.get("toolbar-enabled");
@@ -198,7 +198,7 @@ export default Ember.Controller.extend({
     return currentUser && currentUser.get("staff");
   },
 
-  canUnlistTopic: Em.computed.and("model.creatingTopic", "isStaffUser"),
+  canUnlistTopic: Ember.computed.and("model.creatingTopic", "isStaffUser"),
 
   @computed("canWhisper", "model.post")
   showWhisperToggle(canWhisper, repliedToPost) {
@@ -298,6 +298,40 @@ export default Ember.Controller.extend({
   uploadIcon: () => uploadIcon(),
 
   actions: {
+    togglePreview() {
+      this.toggleProperty("showPreview");
+    },
+
+    closeComposer() {
+      this.close();
+    },
+
+    openComposer(options, post, topic) {
+      this.open(options).then(() => {
+        let url;
+        if (post) url = post.get("url");
+        if (!post && topic) url = topic.get("url");
+
+        let topicTitle;
+        if (topic) topicTitle = topic.get("title");
+
+        if (!url || !topicTitle) return;
+
+        url = `${location.protocol}//${location.host}${url}`;
+        const link = `[${Handlebars.escapeExpression(topicTitle)}](${url})`;
+        const continueDiscussion = I18n.t("post.continue_discussion", {
+          postLink: link
+        });
+
+        const reply = this.get("model.reply");
+        if (!reply || !reply.includes(continueDiscussion)) {
+          this.get("model").prependText(continueDiscussion, {
+            new_line: true
+          });
+        }
+      });
+    },
+
     cancelUpload() {
       this.set("model.uploadCancelled", true);
     },
@@ -310,10 +344,6 @@ export default Ember.Controller.extend({
       this.set("toolbarEvent", toolbarEvent);
     },
 
-    togglePreview() {
-      this.toggleProperty("showPreview");
-    },
-
     typed() {
       this.checkReplyLength();
       this.get("model").typing();
@@ -724,15 +754,10 @@ export default Ember.Controller.extend({
       scopedCategoryId: null
     });
 
-    // If we show the subcategory list, scope the categories drop down to
-    // the category we opened the composer with.
+    // Scope the categories drop down to the category we opened the composer with.
     if (opts.categoryId && opts.draftKey !== "reply_as_new_topic") {
       const category = this.site.categories.findBy("id", opts.categoryId);
-      if (
-        category &&
-        (category.get("show_subcategory_list") ||
-          category.get("parentCategory.show_subcategory_list"))
-      ) {
+      if (category) {
         this.set("scopedCategoryId", opts.categoryId);
       }
     }
diff --git a/app/assets/javascripts/discourse/controllers/create-account.js.es6 b/app/assets/javascripts/discourse/controllers/create-account.js.es6
index aa1b5e8ca0..cb38b10d30 100644
--- a/app/assets/javascripts/discourse/controllers/create-account.js.es6
+++ b/app/assets/javascripts/discourse/controllers/create-account.js.es6
@@ -24,14 +24,14 @@ export default Ember.Controller.extend(
     accountPasswordConfirm: 0,
     accountChallenge: 0,
     formSubmitted: false,
-    rejectedEmails: Em.A([]),
+    rejectedEmails: Ember.A([]),
     prefilledUsername: null,
     userFields: null,
     isDeveloper: false,
 
-    hasAuthOptions: Em.computed.notEmpty("authOptions"),
+    hasAuthOptions: Ember.computed.notEmpty("authOptions"),
     canCreateLocal: setting("enable_local_logins"),
-    showCreateForm: Em.computed.or("hasAuthOptions", "canCreateLocal"),
+    showCreateForm: Ember.computed.or("hasAuthOptions", "canCreateLocal"),
 
     resetForm() {
       // We wrap the fields in a structure so we can assign a value
@@ -185,14 +185,13 @@ export default Ember.Controller.extend(
     @on("init")
     fetchConfirmationValue() {
       return ajax(userPath("hp.json")).then(json => {
-        this.set("accountPasswordConfirm", json.value);
-        this.set(
-          "accountChallenge",
-          json.challenge
+        this.setProperties({
+          accountPasswordConfirm: json.value,
+          accountChallenge: json.challenge
             .split("")
             .reverse()
             .join("")
-        );
+        });
       });
     },
 
diff --git a/app/assets/javascripts/discourse/controllers/discovery.js.es6 b/app/assets/javascripts/discourse/controllers/discovery.js.es6
index 3fdf27d1ac..c19e0f7fb1 100644
--- a/app/assets/javascripts/discourse/controllers/discovery.js.es6
+++ b/app/assets/javascripts/discourse/controllers/discovery.js.es6
@@ -7,10 +7,10 @@ export default Ember.Controller.extend({
 
   loading: false,
 
-  category: Em.computed.alias("navigationCategory.category"),
-  noSubcategories: Em.computed.alias("navigationCategory.noSubcategories"),
+  category: Ember.computed.alias("navigationCategory.category"),
+  noSubcategories: Ember.computed.alias("navigationCategory.noSubcategories"),
 
-  loadedAllItems: Em.computed.not("discoveryTopics.model.canLoadMore"),
+  loadedAllItems: Ember.computed.not("discoveryTopics.model.canLoadMore"),
 
   _showFooter: function() {
     this.set("application.showFooter", this.get("loadedAllItems"));
diff --git a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 b/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
index 8d5e89cf8c..aa522af0f1 100644
--- a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
+++ b/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
@@ -43,7 +43,7 @@ const controllerOpts = {
       const tracker = this.topicTrackingState;
 
       // Move inserted into topics
-      this.get("content").loadBefore(tracker.get("newIncoming"), true);
+      this.get("model").loadBefore(tracker.get("newIncoming"), true);
       tracker.resetTracking();
       return false;
     },
@@ -115,16 +115,16 @@ const controllerOpts = {
     );
   }.property("model.filter", "model.topics.length"),
 
-  hasTopics: Em.computed.gt("model.topics.length", 0),
-  allLoaded: Em.computed.empty("model.more_topics_url"),
+  hasTopics: Ember.computed.gt("model.topics.length", 0),
+  allLoaded: Ember.computed.empty("model.more_topics_url"),
   latest: endWith("model.filter", "latest"),
   new: endWith("model.filter", "new"),
-  top: Em.computed.notEmpty("period"),
-  yearly: Em.computed.equal("period", "yearly"),
-  quarterly: Em.computed.equal("period", "quarterly"),
-  monthly: Em.computed.equal("period", "monthly"),
-  weekly: Em.computed.equal("period", "weekly"),
-  daily: Em.computed.equal("period", "daily"),
+  top: Ember.computed.notEmpty("period"),
+  yearly: Ember.computed.equal("period", "yearly"),
+  quarterly: Ember.computed.equal("period", "quarterly"),
+  monthly: Ember.computed.equal("period", "monthly"),
+  weekly: Ember.computed.equal("period", "weekly"),
+  daily: Ember.computed.equal("period", "daily"),
 
   footerMessage: function() {
     if (!this.get("allLoaded")) {
diff --git a/app/assets/javascripts/discourse/controllers/edit-topic-timer.js.es6 b/app/assets/javascripts/discourse/controllers/edit-topic-timer.js.es6
index 205bc1e6ef..07d6cb83fc 100644
--- a/app/assets/javascripts/discourse/controllers/edit-topic-timer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/edit-topic-timer.js.es6
@@ -8,6 +8,7 @@ export const OPEN_STATUS_TYPE = "open";
 export const PUBLISH_TO_CATEGORY_STATUS_TYPE = "publish_to_category";
 export const DELETE_STATUS_TYPE = "delete";
 export const REMINDER_TYPE = "reminder";
+export const BUMP_TYPE = "bump";
 
 export default Ember.Controller.extend(ModalFunctionality, {
   loading: false,
@@ -31,6 +32,10 @@ export default Ember.Controller.extend(ModalFunctionality, {
       {
         id: PUBLISH_TO_CATEGORY_STATUS_TYPE,
         name: I18n.t("topic.publish_to_category.title")
+      },
+      {
+        id: BUMP_TYPE,
+        name: I18n.t("topic.auto_bump.title")
       }
     ];
     if (this.currentUser.get("staff")) {
@@ -71,7 +76,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
         if (time) {
           this.send("closeModal");
 
-          this.get("topicTimer").setProperties({
+          Ember.setProperties(this.get("topicTimer"), {
             execute_at: result.execute_at,
             duration: result.duration,
             category_id: result.category_id
diff --git a/app/assets/javascripts/discourse/controllers/exception.js.es6 b/app/assets/javascripts/discourse/controllers/exception.js.es6
index 8ac67d5275..331dc5e694 100644
--- a/app/assets/javascripts/discourse/controllers/exception.js.es6
+++ b/app/assets/javascripts/discourse/controllers/exception.js.es6
@@ -33,10 +33,10 @@ export default Ember.Controller.extend({
     return false;
   }.property(),
 
-  isNotFound: Em.computed.equal("thrown.status", 404),
-  isForbidden: Em.computed.equal("thrown.status", 403),
-  isServer: Em.computed.gte("thrown.status", 500),
-  isUnknown: Em.computed.none("isNetwork", "isServer"),
+  isNotFound: Ember.computed.equal("thrown.status", 404),
+  isForbidden: Ember.computed.equal("thrown.status", 403),
+  isServer: Ember.computed.gte("thrown.status", 500),
+  isUnknown: Ember.computed.none("isNetwork", "isServer"),
 
   // TODO
   // make ajax requests to /srv/status with exponential backoff
@@ -63,7 +63,7 @@ export default Ember.Controller.extend({
     }
   }.property("isNetwork", "isServer", "isUnknown"),
 
-  requestUrl: Em.computed.alias("thrown.requestedUrl"),
+  requestUrl: Ember.computed.alias("thrown.requestedUrl"),
 
   desc: function() {
     if (this.get("networkFixed")) {
@@ -100,7 +100,7 @@ export default Ember.Controller.extend({
     tryLoading: function() {
       this.set("loading", true);
       var self = this;
-      Em.run.schedule("afterRender", function() {
+      Ember.run.schedule("afterRender", function() {
         self.get("lastTransition").retry();
         self.set("loading", false);
       });
diff --git a/app/assets/javascripts/discourse/controllers/flag.js.es6 b/app/assets/javascripts/discourse/controllers/flag.js.es6
index f2fdc87716..a6fbef909e 100644
--- a/app/assets/javascripts/discourse/controllers/flag.js.es6
+++ b/app/assets/javascripts/discourse/controllers/flag.js.es6
@@ -56,7 +56,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
       return flagsAvailable;
     } else {
       // flagging topic
-      let lookup = Em.Object.create();
+      let lookup = Ember.Object.create();
       let model = this.get("model");
       model.get("actions_summary").forEach(a => {
         a.flagTopic = model;
@@ -94,7 +94,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
     return true;
   }.property("selected.is_custom_flag", "message.length"),
 
-  submitDisabled: Em.computed.not("submitEnabled"),
+  submitDisabled: Ember.computed.not("submitEnabled"),
 
   // Staff accounts can "take action"
   @computed("flagTopic", "selected.is_custom_flag")
diff --git a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6 b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
index 0e1984ff49..7822ad94b8 100644
--- a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
+++ b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
@@ -50,7 +50,7 @@ export default Ember.Controller.extend({
 
   @computed("q")
   hasAutofocus(q) {
-    return Em.isEmpty(q);
+    return Ember.isEmpty(q);
   },
 
   @computed("q")
diff --git a/app/assets/javascripts/discourse/controllers/group-add-members.js.es6 b/app/assets/javascripts/discourse/controllers/group-add-members.js.es6
index c3a70c3a87..6c46b360e3 100644
--- a/app/assets/javascripts/discourse/controllers/group-add-members.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group-add-members.js.es6
@@ -17,7 +17,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
 
       const model = this.get("model");
       const usernames = model.get("usernames");
-      if (Em.isEmpty(usernames)) {
+      if (Ember.isEmpty(usernames)) {
         return;
       }
       let promise;
diff --git a/app/assets/javascripts/discourse/controllers/group.js.es6 b/app/assets/javascripts/discourse/controllers/group.js.es6
index 6347d787f9..f23f675fa1 100644
--- a/app/assets/javascripts/discourse/controllers/group.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group.js.es6
@@ -119,7 +119,8 @@ export default Ember.Controller.extend({
                 this.transitionToRoute("groups.index");
               })
               .catch(error => {
-                Ember.Logger.error(error);
+                // eslint-disable-next-line no-console
+                console.error(error);
                 bootbox.alert(I18n.t("admin.groups.delete_failed"));
               })
               .finally(() => this.set("destroying", false));
diff --git a/app/assets/javascripts/discourse/controllers/history.js.es6 b/app/assets/javascripts/discourse/controllers/history.js.es6
index e6c76c40aa..b42a99f1dd 100644
--- a/app/assets/javascripts/discourse/controllers/history.js.es6
+++ b/app/assets/javascripts/discourse/controllers/history.js.es6
@@ -31,10 +31,12 @@ export default Ember.Controller.extend(ModalFunctionality, {
     }
   },
 
-  previousFeaturedLink: Em.computed.alias(
+  previousFeaturedLink: Ember.computed.alias(
     "model.featured_link_changes.previous"
   ),
-  currentFeaturedLink: Em.computed.alias("model.featured_link_changes.current"),
+  currentFeaturedLink: Ember.computed.alias(
+    "model.featured_link_changes.current"
+  ),
 
   previousTagChanges: customTagArray("model.tags_changes.previous"),
   currentTagChanges: customTagArray("model.tags_changes.current"),
@@ -188,9 +190,9 @@ export default Ember.Controller.extend(ModalFunctionality, {
     }
   },
 
-  displayingInline: Em.computed.equal("viewMode", "inline"),
-  displayingSideBySide: Em.computed.equal("viewMode", "side_by_side"),
-  displayingSideBySideMarkdown: Em.computed.equal(
+  displayingInline: Ember.computed.equal("viewMode", "inline"),
+  displayingSideBySide: Ember.computed.equal("viewMode", "side_by_side"),
+  displayingSideBySideMarkdown: Ember.computed.equal(
     "viewMode",
     "side_by_side_markdown"
   ),
diff --git a/app/assets/javascripts/discourse/controllers/invite.js.es6 b/app/assets/javascripts/discourse/controllers/invite.js.es6
index 2227d2c8c5..b6144dd7b0 100644
--- a/app/assets/javascripts/discourse/controllers/invite.js.es6
+++ b/app/assets/javascripts/discourse/controllers/invite.js.es6
@@ -120,13 +120,13 @@ export default Ember.Controller.extend(ModalFunctionality, {
   topicId: Ember.computed.alias("model.id"),
 
   // Is Private Topic? (i.e. visible only to specific group members)
-  isPrivateTopic: Em.computed.and(
+  isPrivateTopic: Ember.computed.and(
     "invitingToTopic",
     "model.category.read_restricted"
   ),
 
   // Is Private Message?
-  isMessage: Em.computed.equal("model.archetype", "private_message"),
+  isMessage: Ember.computed.equal("model.archetype", "private_message"),
 
   // Allow Existing Members? (username autocomplete)
   allowExistingMembers: Ember.computed.alias("invitingToTopic"),
diff --git a/app/assets/javascripts/discourse/controllers/invites-show.js.es6 b/app/assets/javascripts/discourse/controllers/invites-show.js.es6
index 78c6bbcf0c..b710b3018f 100644
--- a/app/assets/javascripts/discourse/controllers/invites-show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/invites-show.js.es6
@@ -94,8 +94,9 @@ export default Ember.Controller.extend(
                 "successMessage",
                 result.message || I18n.t("invites.success")
               );
-              this.set("redirectTo", result.redirect_to);
-              DiscourseURL.redirectTo(result.redirect_to || "/");
+              if (result.redirect_to) {
+                DiscourseURL.redirectTo(result.redirect_to);
+              }
             } else {
               if (
                 result.errors &&
diff --git a/app/assets/javascripts/discourse/controllers/login.js.es6 b/app/assets/javascripts/discourse/controllers/login.js.es6
index 75fa364e91..34ca143444 100644
--- a/app/assets/javascripts/discourse/controllers/login.js.es6
+++ b/app/assets/javascripts/discourse/controllers/login.js.es6
@@ -32,10 +32,10 @@ export default Ember.Controller.extend(ModalFunctionality, {
 
   canLoginLocal: setting("enable_local_logins"),
   canLoginLocalWithEmail: setting("enable_local_logins_via_email"),
-  loginRequired: Em.computed.alias("application.loginRequired"),
+  loginRequired: Ember.computed.alias("application.loginRequired"),
   secondFactorMethod: SECOND_FACTOR_METHODS.TOTP,
 
-  resetForm: function() {
+  resetForm() {
     this.setProperties({
       authenticate: null,
       loggingIn: false,
@@ -67,19 +67,17 @@ export default Ember.Controller.extend(ModalFunctionality, {
     return loggingIn ? "login.logging_in" : "login.title";
   },
 
-  loginDisabled: Em.computed.or("loggingIn", "loggedIn"),
+  loginDisabled: Ember.computed.or("loggingIn", "loggedIn"),
 
-  showSignupLink: function() {
-    return (
-      this.get("application.canSignUp") &&
-      !this.get("loggingIn") &&
-      Ember.isEmpty(this.get("authenticate"))
-    );
-  }.property("loggingIn", "authenticate"),
+  @computed("loggingIn", "authenticate", "application.canSignUp")
+  showSignupLink(loggingIn, authenticate, canSignUp) {
+    return canSignUp && !loggingIn && Ember.isEmpty(authenticate);
+  },
 
-  showSpinner: function() {
-    return this.get("loggingIn") || this.get("authenticate");
-  }.property("loggingIn", "authenticate"),
+  @computed("loggingIn", "authenticate")
+  showSpinner(loggingIn, authenticate) {
+    return loggingIn || authenticate;
+  },
 
   @computed("canLoginLocalWithEmail", "processingEmailLink")
   showLoginWithEmailLink(canLoginLocalWithEmail, processingEmailLink) {
@@ -204,11 +202,11 @@ export default Ember.Controller.extend(ModalFunctionality, {
       return false;
     },
 
-    externalLogin: function(loginMethod) {
+    externalLogin(loginMethod) {
       loginMethod.doLogin();
     },
 
-    createAccount: function() {
+    createAccount() {
       const createAccountController = this.get("createAccount");
       if (createAccountController) {
         createAccountController.resetForm();
@@ -222,7 +220,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
       this.send("showCreateAccount");
     },
 
-    forgotPassword: function() {
+    forgotPassword() {
       const forgotPasswordController = this.get("forgotPassword");
       if (forgotPasswordController) {
         forgotPasswordController.set(
diff --git a/app/assets/javascripts/discourse/controllers/navigation/category.js.es6 b/app/assets/javascripts/discourse/controllers/navigation/category.js.es6
index da630bcee0..a54af35e2a 100644
--- a/app/assets/javascripts/discourse/controllers/navigation/category.js.es6
+++ b/app/assets/javascripts/discourse/controllers/navigation/category.js.es6
@@ -1,8 +1,8 @@
 import NavigationDefaultController from "discourse/controllers/navigation/default";
 
 export default NavigationDefaultController.extend({
-  showingParentCategory: Em.computed.none("category.parentCategory"),
-  showingSubcategoryList: Em.computed.and(
+  showingParentCategory: Ember.computed.none("category.parentCategory"),
+  showingSubcategoryList: Ember.computed.and(
     "category.show_subcategory_list",
     "showingParentCategory"
   )
diff --git a/app/assets/javascripts/discourse/controllers/preferences/account.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
index 5ec24d7aca..d98fe128b1 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
@@ -28,8 +28,8 @@ export default Ember.Controller.extend(
 
     showAllAuthTokens: false,
 
-    cannotDeleteAccount: Em.computed.not("currentUser.can_delete_account"),
-    deleteDisabled: Em.computed.or(
+    cannotDeleteAccount: Ember.computed.not("currentUser.can_delete_account"),
+    deleteDisabled: Ember.computed.or(
       "model.isSaving",
       "deleting",
       "cannotDeleteAccount"
diff --git a/app/assets/javascripts/discourse/controllers/preferences/email.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/email.js.es6
index e8ab816739..90936b5284 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/email.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/email.js.es6
@@ -10,8 +10,8 @@ export default Ember.Controller.extend({
   success: false,
   newEmail: null,
 
-  newEmailEmpty: Em.computed.empty("newEmail"),
-  saveDisabled: Em.computed.or(
+  newEmailEmpty: Ember.computed.empty("newEmail"),
+  saveDisabled: Ember.computed.or(
     "saving",
     "newEmailEmpty",
     "taken",
@@ -20,7 +20,7 @@ export default Ember.Controller.extend({
   ),
   unchanged: propertyEqual("newEmailLower", "currentUser.email"),
 
-  reset: function() {
+  reset() {
     this.setProperties({
       taken: false,
       saving: false,
@@ -30,16 +30,16 @@ export default Ember.Controller.extend({
     });
   },
 
-  newEmailLower: function() {
-    return this.get("newEmail")
-      .toLowerCase()
-      .trim();
-  }.property("newEmail"),
+  @computed("newEmail")
+  newEmailLower(newEmail) {
+    return newEmail.toLowerCase().trim();
+  },
 
-  saveButtonText: function() {
-    if (this.get("saving")) return I18n.t("saving");
+  @computed("saving")
+  saveButtonText(saving) {
+    if (saving) return I18n.t("saving");
     return I18n.t("user.change");
-  }.property("saving"),
+  },
 
   @computed("newEmail")
   invalidEmail(newEmail) {
@@ -57,16 +57,15 @@ export default Ember.Controller.extend({
   },
 
   actions: {
-    changeEmail: function() {
-      var self = this;
+    changeEmail() {
+      const self = this;
       this.set("saving", true);
-      return this.get("content")
+
+      return this.get("model")
         .changeEmail(this.get("newEmail"))
         .then(
-          function() {
-            self.set("success", true);
-          },
-          function(e) {
+          () => self.set("success", true),
+          e => {
             self.setProperties({ error: true, saving: false });
             if (
               e.jqXHR.responseJSON &&
diff --git a/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6
index 97cab16b0d..c9b8d796e7 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6
@@ -20,6 +20,8 @@ const USER_HOMES = {
   5: "top"
 };
 
+const TEXT_SIZES = ["normal", "larger", "largest"];
+
 export default Ember.Controller.extend(PreferencesTabController, {
   @computed("makeThemeDefault")
   saveAttrNames(makeDefault) {
@@ -32,7 +34,8 @@ export default Ember.Controller.extend(PreferencesTabController, {
       "automatically_unpin_topics",
       "allow_private_messages",
       "homepage_id",
-      "hide_profile_and_presence"
+      "hide_profile_and_presence",
+      "text_size"
     ];
 
     if (makeDefault) {
@@ -55,6 +58,13 @@ export default Ember.Controller.extend(PreferencesTabController, {
     return currentThemeId();
   },
 
+  @computed
+  textSizes() {
+    return TEXT_SIZES.map(value => {
+      return { name: I18n.t(`user.text_size.${value}`), value };
+    });
+  },
+
   userSelectableThemes: function() {
     return listThemes(this.site);
   }.property(),
@@ -114,6 +124,22 @@ export default Ember.Controller.extend(PreferencesTabController, {
           this.homeChanged();
         })
         .catch(popupAjaxError);
+    },
+
+    selectTextSize(newSize) {
+      const classList = document.documentElement.classList;
+
+      TEXT_SIZES.forEach(name => {
+        const className = `text-size-${name}`;
+        if (newSize === name) {
+          classList.add(className);
+        } else {
+          classList.remove(className);
+        }
+      });
+
+      // Force refresh when leaving this screen
+      Discourse.set("assetVersion", "forceRefresh");
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/preferences/second-factor-backup.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/second-factor-backup.js.es6
index 33802b1010..e0b703b52d 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/second-factor-backup.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/second-factor-backup.js.es6
@@ -58,7 +58,7 @@ export default Ember.Controller.extend({
 
       this.set("loading", true);
 
-      this.get("content")
+      this.get("model")
         .toggleSecondFactor(this.get("secondFactorToken"), false, 2)
         .then(response => {
           if (response.error) {
@@ -68,7 +68,7 @@ export default Ember.Controller.extend({
 
           this.set("errorMessage", null);
 
-          const usernameLower = this.get("content").username.toLowerCase();
+          const usernameLower = this.get("model").username.toLowerCase();
           DiscourseURL.redirectTo(userPath(`${usernameLower}/preferences`));
         })
         .catch(popupAjaxError)
@@ -78,7 +78,7 @@ export default Ember.Controller.extend({
     generateSecondFactorCodes() {
       if (!this.get("secondFactorToken")) return;
       this.set("loading", true);
-      this.get("content")
+      this.get("model")
         .generateSecondFactorCodes(this.get("secondFactorToken"))
         .then(response => {
           if (response.error) {
diff --git a/app/assets/javascripts/discourse/controllers/preferences/second-factor.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/second-factor.js.es6
index e483885c91..af6e78eb6d 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/second-factor.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/second-factor.js.es6
@@ -40,24 +40,23 @@ export default Ember.Controller.extend({
     if (!this.get("secondFactorToken")) return;
     this.set("loading", true);
 
-    this.get("content")
+    this.get("model")
       .toggleSecondFactor(this.get("secondFactorToken"), enable, 1)
       .then(response => {
         if (response.error) {
           this.set("errorMessage", response.error);
-          this.set("loading", false);
           return;
         }
 
         this.set("errorMessage", null);
         DiscourseURL.redirectTo(
-          userPath(`${this.get("content").username.toLowerCase()}/preferences`)
+          userPath(`${this.get("model").username.toLowerCase()}/preferences`)
         );
       })
       .catch(error => {
-        this.set("loading", false);
         popupAjaxError(error);
-      });
+      })
+      .finally(() => this.set("loading", false));
   },
 
   actions: {
@@ -65,7 +64,7 @@ export default Ember.Controller.extend({
       if (!this.get("password")) return;
       this.set("loading", true);
 
-      this.get("content")
+      this.get("model")
         .loadSecondFactorCodes(this.get("password"))
         .then(response => {
           if (response.error) {
diff --git a/app/assets/javascripts/discourse/controllers/preferences/username.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/username.js.es6
index 6982d76ecd..a6d1c99ad5 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/username.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/username.js.es6
@@ -15,8 +15,8 @@ export default Ember.Controller.extend({
 
   maxLength: setting("max_username_length"),
   minLength: setting("min_username_length"),
-  newUsernameEmpty: Em.computed.empty("newUsername"),
-  saveDisabled: Em.computed.or(
+  newUsernameEmpty: Ember.computed.empty("newUsername"),
+  saveDisabled: Ember.computed.or(
     "saving",
     "newUsernameEmpty",
     "taken",
@@ -41,7 +41,7 @@ export default Ember.Controller.extend({
       Discourse.User.checkUsername(
         newUsername,
         undefined,
-        this.get("content.id")
+        this.get("model.id")
       ).then(result => {
         if (result.errors) {
           this.set("errorMessage", result.errors.join(" "));
@@ -71,7 +71,7 @@ export default Ember.Controller.extend({
         result => {
           if (result) {
             this.set("saving", true);
-            this.get("content")
+            this.get("model")
               .changeUsername(this.get("newUsername"))
               .then(() => {
                 DiscourseURL.redirectTo(
diff --git a/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6 b/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6
index 943bdc8342..6c246e031c 100644
--- a/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6
+++ b/app/assets/javascripts/discourse/controllers/reorder-categories.js.es6
@@ -104,7 +104,7 @@ export default Ember.Controller.extend(ModalFunctionality, Ember.Evented, {
           bc.applyBufferedChanges();
         }
       });
-      this.propertyDidChange("categoriesBuffered");
+      this.notifyPropertyChange("categoriesBuffered");
     },
 
     saveOrder() {
diff --git a/app/assets/javascripts/discourse/controllers/static.js.es6 b/app/assets/javascripts/discourse/controllers/static.js.es6
index 8238d5fad9..82fd514e16 100644
--- a/app/assets/javascripts/discourse/controllers/static.js.es6
+++ b/app/assets/javascripts/discourse/controllers/static.js.es6
@@ -5,7 +5,7 @@ import { userPath } from "discourse/lib/url";
 export default Ember.Controller.extend({
   application: Ember.inject.controller(),
 
-  showLoginButton: Em.computed.equal("model.path", "login"),
+  showLoginButton: Ember.computed.equal("model.path", "login"),
 
   @computed("model.path")
   bodyClass: path => `static-${path}`,
diff --git a/app/assets/javascripts/discourse/controllers/tags-index.js.es6 b/app/assets/javascripts/discourse/controllers/tags-index.js.es6
index 00c53920d2..07bd964daf 100644
--- a/app/assets/javascripts/discourse/controllers/tags-index.js.es6
+++ b/app/assets/javascripts/discourse/controllers/tags-index.js.es6
@@ -21,6 +21,15 @@ export default Ember.Controller.extend({
     }
   },
 
+  @computed
+  actionsMapping() {
+    return {
+      manageGroups: () => this.send("showTagGroups"),
+      uploadTags: () => this.send("showUploader"),
+      deleteUnusedTags: () => this.send("deleteUnused")
+    };
+  },
+
   actions: {
     sortByCount() {
       this.setProperties({
diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6
index 71e4e47a05..0b92cd9a48 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/topic.js.es6
@@ -1,4 +1,4 @@
-import BufferedContent from "discourse/mixins/buffered-content";
+import { bufferedProperty } from "discourse/mixins/buffered-content";
 import Composer from "discourse/models/composer";
 import DiscourseURL from "discourse/lib/url";
 import Post from "discourse/models/post";
@@ -32,7 +32,7 @@ export function registerCustomPostMessageCallback(type, callback) {
   customPostMessageCallbacks[type] = callback;
 }
 
-export default Ember.Controller.extend(BufferedContent, {
+export default Ember.Controller.extend(bufferedProperty("model"), {
   composer: Ember.inject.controller(),
   application: Ember.inject.controller(),
   multiSelect: false,
@@ -52,6 +52,7 @@ export default Ember.Controller.extend(BufferedContent, {
   username_filters: null,
   filter: null,
   quoteState: null,
+
   canRemoveTopicFeaturedLink: Ember.computed.and(
     "canEditTopicFeaturedLink",
     "buffered.featured_link"
@@ -205,10 +206,6 @@ export default Ember.Controller.extend(BufferedContent, {
       return this.send("showFlags", post);
     },
 
-    topicRouteAction(name, model) {
-      return this.send(name, model);
-    },
-
     openFeatureTopic() {
       this.send("showFeatureTopic");
     },
@@ -411,11 +408,11 @@ export default Ember.Controller.extend(BufferedContent, {
       quoteState.clear();
 
       if (
-        composerController.get("content.topic.id") === topic.get("id") &&
-        composerController.get("content.action") === Composer.REPLY
+        composerController.get("model.topic.id") === topic.get("id") &&
+        composerController.get("model.action") === Composer.REPLY
       ) {
-        composerController.set("content.post", post);
-        composerController.set("content.composeState", Composer.OPEN);
+        composerController.set("model.post", post);
+        composerController.set("model.composeState", Composer.OPEN);
         this.appEvents.trigger("composer:insert-block", quotedText.trim());
       } else {
         const opts = {
@@ -785,13 +782,13 @@ export default Ember.Controller.extend(BufferedContent, {
     },
 
     toggleVisibility() {
-      this.get("content").toggleStatus("visible");
+      this.get("model").toggleStatus("visible");
     },
 
     toggleClosed() {
-      const topic = this.get("content");
+      const topic = this.get("model");
 
-      this.get("content")
+      this.get("model")
         .toggleStatus("closed")
         .then(result => {
           topic.set("topic_status_update", result.topic_status_update);
@@ -799,20 +796,20 @@ export default Ember.Controller.extend(BufferedContent, {
     },
 
     recoverTopic() {
-      this.get("content").recover();
+      this.get("model").recover();
     },
 
     makeBanner() {
-      this.get("content").makeBanner();
+      this.get("model").makeBanner();
     },
 
     removeBanner() {
-      this.get("content").removeBanner();
+      this.get("model").removeBanner();
     },
 
     togglePinned() {
       const value = this.get("model.pinned_at") ? false : true,
-        topic = this.get("content"),
+        topic = this.get("model"),
         until = this.get("model.pinnedInCategoryUntil");
 
       // optimistic update
@@ -826,7 +823,7 @@ export default Ember.Controller.extend(BufferedContent, {
     },
 
     pinGlobally() {
-      const topic = this.get("content"),
+      const topic = this.get("model"),
         until = this.get("model.pinnedGloballyUntil");
 
       // optimistic update
@@ -840,16 +837,16 @@ export default Ember.Controller.extend(BufferedContent, {
     },
 
     toggleArchived() {
-      this.get("content").toggleStatus("archived");
+      this.get("model").toggleStatus("archived");
     },
 
     clearPin() {
-      this.get("content").clearPin();
+      this.get("model").clearPin();
     },
 
     togglePinnedForUser() {
       if (this.get("model.pinned_at")) {
-        const topic = this.get("content");
+        const topic = this.get("model");
         if (topic.get("pinned")) {
           topic.clearPin();
         } else {
@@ -892,7 +889,7 @@ export default Ember.Controller.extend(BufferedContent, {
       composerController
         .open(options)
         .then(() => {
-          return Em.isEmpty(quotedText) ? "" : quotedText;
+          return Ember.isEmpty(quotedText) ? "" : quotedText;
         })
         .then(q => {
           const postUrl = `${location.protocol}//${location.host}${post.get(
@@ -940,11 +937,11 @@ export default Ember.Controller.extend(BufferedContent, {
     },
 
     convertToPublicTopic() {
-      this.get("content").convertTopic("public");
+      this.get("model").convertTopic("public");
     },
 
     convertToPrivateMessage() {
-      this.get("content").convertTopic("private");
+      this.get("model").convertTopic("private");
     },
 
     removeFeaturedLink() {
@@ -952,7 +949,7 @@ export default Ember.Controller.extend(BufferedContent, {
     },
 
     resetBumpDate() {
-      this.get("content").resetBumpDate();
+      this.get("model").resetBumpDate();
     }
   },
 
@@ -1002,7 +999,8 @@ export default Ember.Controller.extend(BufferedContent, {
 
   _jumpToPostId(postId) {
     if (!postId) {
-      Ember.Logger.warn(
+      // eslint-disable-next-line no-console
+      console.warn(
         "jump-post code broken - requested an index outside the stream array"
       );
       return;
@@ -1157,11 +1155,11 @@ export default Ember.Controller.extend(BufferedContent, {
   },
 
   recoverTopic() {
-    this.get("content").recover();
+    this.get("model").recover();
   },
 
   deleteTopic() {
-    this.get("content").destroy(this.currentUser);
+    this.get("model").destroy(this.currentUser);
   },
 
   subscribe() {
@@ -1245,7 +1243,7 @@ export default Ember.Controller.extend(BufferedContent, {
             if (callback) {
               callback(this, data);
             } else {
-              Em.Logger.warn("unknown topic bus message type", data);
+              Ember.Logger.warn("unknown topic bus message type", data);
             }
           }
         }
@@ -1284,7 +1282,7 @@ export default Ember.Controller.extend(BufferedContent, {
 
   unsubscribe() {
     // never unsubscribe when navigating from topic to topic
-    if (!this.get("content.id")) return;
+    if (!this.get("model.id")) return;
     this.messageBus.unsubscribe("/topic/*");
   },
 
diff --git a/app/assets/javascripts/discourse/controllers/user-invited-show.js.es6 b/app/assets/javascripts/discourse/controllers/user-invited-show.js.es6
index de8d645ca4..9d6c3c4c4d 100644
--- a/app/assets/javascripts/discourse/controllers/user-invited-show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-invited-show.js.es6
@@ -35,7 +35,7 @@ export default Ember.Controller.extend({
     });
   }, 250).observes("searchTerm"),
 
-  inviteRedeemed: Em.computed.equal("filter", "redeemed"),
+  inviteRedeemed: Ember.computed.equal("filter", "redeemed"),
 
   showBulkActionButtons: function() {
     return (
diff --git a/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6 b/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6
index 97a74ea36b..6091a569c0 100644
--- a/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-private-messages.js.es6
@@ -7,11 +7,11 @@ export default Ember.Controller.extend({
   user: Ember.inject.controller(),
 
   pmView: false,
-  viewingSelf: Em.computed.alias("user.viewingSelf"),
-  isGroup: Em.computed.equal("pmView", "groups"),
-  currentPath: Em.computed.alias("application.currentPath"),
-  selected: Em.computed.alias("userTopicsList.selected"),
-  bulkSelectEnabled: Em.computed.alias("userTopicsList.bulkSelectEnabled"),
+  viewingSelf: Ember.computed.alias("user.viewingSelf"),
+  isGroup: Ember.computed.equal("pmView", "groups"),
+  currentPath: Ember.computed.alias("application.currentPath"),
+  selected: Ember.computed.alias("userTopicsList.selected"),
+  bulkSelectEnabled: Ember.computed.alias("userTopicsList.bulkSelectEnabled"),
   showToggleBulkSelect: true,
   pmTaggingEnabled: Ember.computed.alias("site.can_tag_pms"),
   tagId: null,
diff --git a/app/assets/javascripts/discourse/controllers/user.js.es6 b/app/assets/javascripts/discourse/controllers/user.js.es6
index 80162bff88..e0b31bd172 100644
--- a/app/assets/javascripts/discourse/controllers/user.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user.js.es6
@@ -53,7 +53,7 @@ export default Ember.Controller.extend(CanCheckEmails, {
     return !suspended || isStaff;
   },
 
-  linkWebsite: Em.computed.not("model.isBasic"),
+  linkWebsite: Ember.computed.not("model.isBasic"),
 
   @computed("model.trust_level")
   removeNoFollow(trustLevel) {
diff --git a/app/assets/javascripts/discourse/helpers/category-link.js.es6 b/app/assets/javascripts/discourse/helpers/category-link.js.es6
index bf3df520f5..3b62c82170 100644
--- a/app/assets/javascripts/discourse/helpers/category-link.js.es6
+++ b/app/assets/javascripts/discourse/helpers/category-link.js.es6
@@ -2,7 +2,7 @@ import { registerUnbound } from "discourse-common/lib/helpers";
 import { isRTL } from "discourse/lib/text-direction";
 import { iconHTML } from "discourse-common/lib/icon-library";
 
-var get = Em.get,
+var get = Ember.get,
   escapeExpression = Handlebars.Utils.escapeExpression;
 
 let _renderer = defaultCategoryLinkRenderer;
diff --git a/app/assets/javascripts/discourse/helpers/user-avatar.js.es6 b/app/assets/javascripts/discourse/helpers/user-avatar.js.es6
index 60e8137b08..ff09e4e2fc 100644
--- a/app/assets/javascripts/discourse/helpers/user-avatar.js.es6
+++ b/app/assets/javascripts/discourse/helpers/user-avatar.js.es6
@@ -30,9 +30,9 @@ function renderAvatar(user, options) {
   options = options || {};
 
   if (user) {
-    const name = Em.get(user, options.namePath || "name");
-    const username = Em.get(user, options.usernamePath || "username");
-    const avatarTemplate = Em.get(
+    const name = Ember.get(user, options.namePath || "name");
+    const username = Ember.get(user, options.usernamePath || "username");
+    const avatarTemplate = Ember.get(
       user,
       options.avatarTemplatePath || "avatar_template"
     );
@@ -46,11 +46,11 @@ function renderAvatar(user, options) {
     let title = options.title;
     if (!title && !options.ignoreTitle) {
       // first try to get a title
-      title = Em.get(user, "title");
+      title = Ember.get(user, "title");
       // if there was no title provided
       if (!title) {
         // try to retrieve a description
-        const description = Em.get(user, "description");
+        const description = Ember.get(user, "description");
         // if a description has been provided
         if (description && description.length > 0) {
           // preprend the username before the description
@@ -61,7 +61,7 @@ function renderAvatar(user, options) {
 
     return avatarImg({
       size: options.imageSize,
-      extraClasses: Em.get(user, "extras") || options.extraClasses,
+      extraClasses: Ember.get(user, "extras") || options.extraClasses,
       title: title || displayName,
       avatarTemplate: avatarTemplate
     });
diff --git a/app/assets/javascripts/discourse/initializers/auth-complete.js.es6 b/app/assets/javascripts/discourse/initializers/auth-complete.js.es6
index 3e9d88d0e0..cecf831405 100644
--- a/app/assets/javascripts/discourse/initializers/auth-complete.js.es6
+++ b/app/assets/javascripts/discourse/initializers/auth-complete.js.es6
@@ -1,15 +1,26 @@
 export default {
   name: "auth-complete",
   after: "inject-objects",
-  initialize() {
+  initialize(container) {
+    let lastAuthResult;
+
     if (window.location.search.indexOf("authComplete=true") !== -1) {
-      const lastAuthResult = localStorage.getItem("lastAuthResult");
+      // Happens when a popup social login loses connection to the parent window
+      lastAuthResult = localStorage.getItem("lastAuthResult");
       localStorage.removeItem("lastAuthResult");
-      if (lastAuthResult) {
+    } else if (document.getElementById("data-authentication")) {
+      // Happens for full screen logins
+      lastAuthResult = document.getElementById("data-authentication").dataset
+        .authenticationData;
+    }
+
+    if (lastAuthResult) {
+      const router = container.lookup("router:main");
+      router.one("didTransition", () => {
         Ember.run.next(() =>
           Discourse.authenticationComplete(JSON.parse(lastAuthResult))
         );
-      }
+      });
     }
   }
 };
diff --git a/app/assets/javascripts/discourse/initializers/banner.js.es6 b/app/assets/javascripts/discourse/initializers/banner.js.es6
index 61298501da..c8b422c937 100644
--- a/app/assets/javascripts/discourse/initializers/banner.js.es6
+++ b/app/assets/javascripts/discourse/initializers/banner.js.es6
@@ -5,7 +5,7 @@ export default {
   after: "message-bus",
 
   initialize(container) {
-    const banner = Em.Object.create(PreloadStore.get("banner")),
+    const banner = Ember.Object.create(PreloadStore.get("banner")),
       site = container.lookup("site:main");
 
     site.set("banner", banner);
@@ -16,7 +16,7 @@ export default {
     }
 
     messageBus.subscribe("/site/banner", function(ban) {
-      site.set("banner", Em.Object.create(ban));
+      site.set("banner", Ember.Object.create(ban));
     });
   }
 };
diff --git a/app/assets/javascripts/discourse/initializers/enable-emoji.js.es6 b/app/assets/javascripts/discourse/initializers/enable-emoji.js.es6
index ca49dcfd5a..d7df51ce65 100644
--- a/app/assets/javascripts/discourse/initializers/enable-emoji.js.es6
+++ b/app/assets/javascripts/discourse/initializers/enable-emoji.js.es6
@@ -17,7 +17,7 @@ export default {
           id: "emoji",
           group: "extras",
           icon: "smile-o",
-          action: "emoji",
+          action: () => toolbar.context.send("emoji"),
           title: "composer.emoji"
         });
       });
diff --git a/app/assets/javascripts/discourse/initializers/message-bus.js.es6 b/app/assets/javascripts/discourse/initializers/message-bus.js.es6
index 9abd2c70ed..6730825e8a 100644
--- a/app/assets/javascripts/discourse/initializers/message-bus.js.es6
+++ b/app/assets/javascripts/discourse/initializers/message-bus.js.es6
@@ -4,7 +4,7 @@ import { handleLogoff } from "discourse/lib/ajax";
 
 function ajax(opts) {
   if (opts.complete) {
-    let oldComplete = opts.complete;
+    const oldComplete = opts.complete;
     opts.complete = function(xhr, stat) {
       handleLogoff(xhr);
       oldComplete(xhr, stat);
diff --git a/app/assets/javascripts/discourse/initializers/register-service-worker.js.es6 b/app/assets/javascripts/discourse/initializers/register-service-worker.js.es6
index 4afbd11158..5248a76e27 100644
--- a/app/assets/javascripts/discourse/initializers/register-service-worker.js.es6
+++ b/app/assets/javascripts/discourse/initializers/register-service-worker.js.es6
@@ -28,7 +28,8 @@ export default {
         navigator.serviceWorker
           .register(`${Discourse.BaseUri}/${Discourse.ServiceWorkerURL}`)
           .catch(error => {
-            Ember.Logger.info(`Failed to register Service Worker: ${error}`);
+            // eslint-disable-next-line no-console
+            console.info(`Failed to register Service Worker: ${error}`);
           });
       } else {
         navigator.serviceWorker.getRegistrations().then(registrations => {
diff --git a/app/assets/javascripts/discourse/initializers/sharing-sources.js.es6 b/app/assets/javascripts/discourse/initializers/sharing-sources.js.es6
index 953aed8cb7..b619969ac5 100644
--- a/app/assets/javascripts/discourse/initializers/sharing-sources.js.es6
+++ b/app/assets/javascripts/discourse/initializers/sharing-sources.js.es6
@@ -35,17 +35,6 @@ export default {
       shouldOpenInPopup: true
     });
 
-    Sharing.addSource({
-      id: "google+",
-      icon: "fab-google-plus-square",
-      title: I18n.t("share.google+"),
-      generateUrl: function(link) {
-        return "https://plus.google.com/share?url=" + encodeURIComponent(link);
-      },
-      shouldOpenInPopup: true,
-      popupHeight: 600
-    });
-
     Sharing.addSource({
       id: "email",
       icon: "envelope-square",
diff --git a/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6 b/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6
index 96ea1ef8d0..651f23e130 100644
--- a/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6
+++ b/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6
@@ -82,7 +82,7 @@ export default {
               }
               oldNotifications.insertAt(
                 insertPosition,
-                Em.Object.create(lastNotification)
+                Ember.Object.create(lastNotification)
               );
             }
 
diff --git a/app/assets/javascripts/discourse/lib/ajax-error.js.es6 b/app/assets/javascripts/discourse/lib/ajax-error.js.es6
index 1b47aba3e5..8e7366d3c5 100644
--- a/app/assets/javascripts/discourse/lib/ajax-error.js.es6
+++ b/app/assets/javascripts/discourse/lib/ajax-error.js.es6
@@ -1,10 +1,12 @@
 export function extractError(error, defaultMessage) {
   if (error instanceof Error) {
-    Ember.Logger.error(error.stack);
+    // eslint-disable-next-line no-console
+    console.error(error.stack);
   }
 
   if (typeof error === "string") {
-    Ember.Logger.error(error);
+    // eslint-disable-next-line no-console
+    console.error(error);
   }
 
   if (error.jqXHR) {
@@ -22,7 +24,8 @@ export function extractError(error, defaultMessage) {
       parsedJSON = $.parseJSON(error.responseText);
     } catch (ex) {
       // in case the JSON doesn't parse
-      Ember.Logger.error(ex.stack);
+      // eslint-disable-next-line no-console
+      console.error(ex.stack);
     }
   }
 
diff --git a/app/assets/javascripts/discourse/lib/computed.js.es6 b/app/assets/javascripts/discourse/lib/computed.js.es6
index 7c01519388..c70d80d515 100644
--- a/app/assets/javascripts/discourse/lib/computed.js.es6
+++ b/app/assets/javascripts/discourse/lib/computed.js.es6
@@ -8,7 +8,7 @@ import addonFmt from "ember-addons/fmt";
   @return {Function} computedProperty function
 **/
 export function propertyEqual(p1, p2) {
-  return Em.computed(function() {
+  return Ember.computed(function() {
     return this.get(p1) === this.get(p2);
   }).property(p1, p2);
 }
@@ -22,7 +22,7 @@ export function propertyEqual(p1, p2) {
   @return {Function} computedProperty function
 **/
 export function propertyNotEqual(p1, p2) {
-  return Em.computed(function() {
+  return Ember.computed(function() {
     return this.get(p1) !== this.get(p2);
   }).property(p1, p2);
 }
@@ -57,7 +57,7 @@ export function i18n(...args) {
 
 /**
   Uses an Ember String `fmt` call to format a string. See:
-  http://emberjs.com/api/classes/Em.String.html#method_fmt
+  http://emberjs.com/api/classes/Ember.String.html#method_fmt
 
   @method fmt
   @params {String} properties* to format
@@ -100,7 +100,7 @@ export function url(...args) {
 export function endWith() {
   const args = Array.prototype.slice.call(arguments, 0);
   const substring = args.pop();
-  const computed = Em.computed(function() {
+  const computed = Ember.computed(function() {
     const self = this;
     return _.all(
       args.map(function(a) {
@@ -124,7 +124,7 @@ export function endWith() {
   @param {String} name of site setting
 **/
 export function setting(name) {
-  return Em.computed(function() {
+  return Ember.computed(function() {
     return Discourse.SiteSettings[name];
   }).property();
 }
diff --git a/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6 b/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6
index 5b26fce0eb..41b86bc30e 100644
--- a/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6
+++ b/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6
@@ -26,14 +26,14 @@ function init(messageBus, appEvents) {
   try {
     keyValueStore.getItem(focusTrackerKey);
   } catch (e) {
-    Em.Logger.info(
+    Ember.Logger.info(
       "Discourse desktop notifications are disabled - localStorage denied."
     );
     return;
   }
 
   if (!("Notification" in window)) {
-    Em.Logger.info(
+    Ember.Logger.info(
       "Discourse desktop notifications are disabled - not supported by browser"
     );
     return;
@@ -47,7 +47,7 @@ function init(messageBus, appEvents) {
       return;
     }
   } catch (e) {
-    Em.Logger.warn(
+    Ember.Logger.warn(
       "Unexpected error, Notification is defined on window but not a responding correctly " +
         e
     );
@@ -58,7 +58,7 @@ function init(messageBus, appEvents) {
     // Preliminary checks passed, continue with setup
     setupNotifications(appEvents);
   } catch (e) {
-    Em.Logger.error(e);
+    Ember.Logger.error(e);
   }
 }
 
diff --git a/app/assets/javascripts/discourse/lib/highlight-syntax.js.es6 b/app/assets/javascripts/discourse/lib/highlight-syntax.js.es6
index bfc24afb4d..48543dcd1d 100644
--- a/app/assets/javascripts/discourse/lib/highlight-syntax.js.es6
+++ b/app/assets/javascripts/discourse/lib/highlight-syntax.js.es6
@@ -1,4 +1,5 @@
 /*global hljs:true */
+let _moreLanguages = [];
 
 import loadScript from "discourse/lib/load-script";
 
@@ -14,6 +15,21 @@ export default function highlightSyntax($elem) {
 
   $(selector, $elem).each(function(i, e) {
     $(e).removeClass("lang-auto");
-    loadScript(path).then(() => hljs.highlightBlock(e));
+    loadScript(path).then(() => {
+      customHighlightJSLanguages();
+      hljs.highlightBlock(e);
+    });
+  });
+}
+
+export function registerHighlightJSLanguage(name, fn) {
+  _moreLanguages.push({ name: name, fn: fn });
+}
+
+function customHighlightJSLanguages() {
+  _moreLanguages.forEach(l => {
+    if (hljs.getLanguage(l.name) === undefined) {
+      hljs.registerLanguage(l.name, l.fn);
+    }
   });
 }
diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
index 0e43e1e97d..6036045616 100644
--- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
+++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
@@ -231,6 +231,8 @@ export default {
       type: "search",
       event
     });
+
+    return false;
   },
 
   toggleHamburgerMenu(event) {
@@ -317,10 +319,11 @@ export default {
         .findBy("id", selectedPostId);
       if (post) {
         // TODO: Use ember closure actions
-        let actionMethod = topicController._actions[action];
+
+        let actionMethod = topicController.actions[action];
         if (!actionMethod) {
           const topicRoute = container.lookup("route:topic");
-          actionMethod = topicRoute._actions[action];
+          actionMethod = topicRoute.actions[action];
         }
 
         const result = actionMethod.call(topicController, post);
diff --git a/app/assets/javascripts/discourse/lib/lazy-load-images.js.es6 b/app/assets/javascripts/discourse/lib/lazy-load-images.js.es6
index c159fe620a..8e0a2563e0 100644
--- a/app/assets/javascripts/discourse/lib/lazy-load-images.js.es6
+++ b/app/assets/javascripts/discourse/lib/lazy-load-images.js.es6
@@ -19,7 +19,8 @@ function hide(image) {
     src: image.src,
     srcset: image.srcset,
     width: image.width,
-    height: image.height
+    height: image.height,
+    className: image.className
   });
   image.removeAttribute("srcset");
 
@@ -47,10 +48,11 @@ function show(image) {
     copyImg.srcset = imageData.srcset || copyImg.srcset;
 
     copyImg.style.position = "absolute";
-    copyImg.style.top = 0;
-    copyImg.style.left = 0;
+    copyImg.style.top = `${image.offsetTop}px`;
+    copyImg.style.left = `${image.offsetLeft}px`;
     copyImg.style.width = imageData.width;
     copyImg.style.height = imageData.height;
+    copyImg.className = imageData.className;
 
     image.parentNode.appendChild(copyImg);
   } else {
diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
index ba10a5c2d9..ecaff63a63 100644
--- a/app/assets/javascripts/discourse/lib/plugin-api.js.es6
+++ b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
@@ -4,6 +4,7 @@ import ComposerEditor from "discourse/components/composer-editor";
 import DiscourseBanner from "discourse/components/discourse-banner";
 import { addButton } from "discourse/widgets/post-menu";
 import { includeAttributes } from "discourse/lib/transform-post";
+import { registerHighlightJSLanguage } from "discourse/lib/highlight-syntax";
 import { addToolbarCallback } from "discourse/components/d-editor";
 import { addWidgetCleanCallback } from "discourse/components/mount-widget";
 import {
@@ -40,7 +41,7 @@ import Sharing from "discourse/lib/sharing";
 import { addComposerUploadHandler } from "discourse/components/composer-editor";
 
 // If you add any methods to the API ensure you bump up this number
-const PLUGIN_API_VERSION = "0.8.26";
+const PLUGIN_API_VERSION = "0.8.27";
 
 class PluginApi {
   constructor(version, container) {
@@ -790,6 +791,23 @@ class PluginApi {
   replaceCategoryLinkRenderer(fn) {
     replaceCategoryLinkRenderer(fn);
   }
+
+  /**
+   * Registers custom languages for use with HighlightJS.
+   *
+   * See https://highlightjs.readthedocs.io/en/latest/language-guide.html
+   * for instructions on how to define a new language for HighlightJS.
+   * Build minified language file by running "node tools/build.js -t cdn" in the HighlightJS repo
+   * and use the minified output as the registering function.
+   *
+   * Example:
+   *
+   * let aLang = function(e){return{cI:!1,c:[{bK:"GET HEAD PUT POST DELETE PATCH",e:"$",c:[{cN:"title",b:"/?.+"}]},{b:"^{$",e:"^}$",sL:"json"}]}}
+   * api.registerHighlightJSLanguage("kibana", aLang);
+   **/
+  registerHighlightJSLanguage(name, fn) {
+    registerHighlightJSLanguage(name, fn);
+  }
 }
 
 let _pluginv01;
diff --git a/app/assets/javascripts/discourse/lib/posts-with-placeholders.js.es6 b/app/assets/javascripts/discourse/lib/posts-with-placeholders.js.es6
index 16e3fca352..49bb5cd5cf 100644
--- a/app/assets/javascripts/discourse/lib/posts-with-placeholders.js.es6
+++ b/app/assets/javascripts/discourse/lib/posts-with-placeholders.js.es6
@@ -19,11 +19,15 @@ export default Ember.Object.extend(Ember.Array, {
     );
   },
 
+  nextObject(index) {
+    return this.objectAt(index);
+  },
+
   _changeArray(cb, offset, removed, inserted) {
     this.arrayContentWillChange(offset, removed, inserted);
     cb();
     this.arrayContentDidChange(offset, removed, inserted);
-    this.propertyDidChange("length");
+    this.notifyPropertyChange("length");
   },
 
   clear(cb) {
diff --git a/app/assets/javascripts/discourse/lib/push-notifications.js.es6 b/app/assets/javascripts/discourse/lib/push-notifications.js.es6
index 086eecc312..00f15d0fab 100644
--- a/app/assets/javascripts/discourse/lib/push-notifications.js.es6
+++ b/app/assets/javascripts/discourse/lib/push-notifications.js.es6
@@ -91,7 +91,10 @@ export function register(user, mobileView, router, appEvents) {
         }
         setupActivityListeners(appEvents);
       })
-      .catch(e => Ember.Logger.error(e));
+      .catch(e => {
+        // eslint-disable-next-line no-console
+        console.error(e);
+      });
   });
 
   navigator.serviceWorker.addEventListener("message", event => {
@@ -115,7 +118,10 @@ export function subscribe(callback, applicationServerKey, mobileView) {
         sendSubscriptionToServer(subscription, true);
         if (callback) callback();
       })
-      .catch(e => Ember.Logger.error(e));
+      .catch(e => {
+        // eslint-disable-next-line no-console
+        console.error(e);
+      });
   });
 }
 
@@ -138,7 +144,10 @@ export function unsubscribe(user, callback, mobileView) {
           });
         }
       })
-      .catch(e => Ember.Logger.error(e));
+      .catch(e => {
+        // eslint-disable-next-line no-console
+        console.error(e);
+      });
 
     if (callback) callback();
   });
diff --git a/app/assets/javascripts/discourse/lib/search.js.es6 b/app/assets/javascripts/discourse/lib/search.js.es6
index c886eb00d9..8fab105cfe 100644
--- a/app/assets/javascripts/discourse/lib/search.js.es6
+++ b/app/assets/javascripts/discourse/lib/search.js.es6
@@ -97,7 +97,7 @@ export function translateResults(results, opts) {
     !results.categories.length
   );
 
-  return noResults ? null : Em.Object.create(results);
+  return noResults ? null : Ember.Object.create(results);
 }
 
 export function searchForTerm(term, opts) {
@@ -107,6 +107,8 @@ export function searchForTerm(term, opts) {
   const data = { term: term, include_blurbs: "true" };
   if (opts.typeFilter) data.type_filter = opts.typeFilter;
   if (opts.searchForId) data.search_for_id = true;
+  if (opts.restrictToArchetype)
+    data.restrict_to_archetype = opts.restrictToArchetype;
 
   if (opts.searchContext) {
     data.search_context = {
diff --git a/app/assets/javascripts/discourse/lib/text.js.es6 b/app/assets/javascripts/discourse/lib/text.js.es6
index a143cd7255..6986700fc6 100644
--- a/app/assets/javascripts/discourse/lib/text.js.es6
+++ b/app/assets/javascripts/discourse/lib/text.js.es6
@@ -46,9 +46,10 @@ export function sanitizeAsync(text, options) {
 
 function loadMarkdownIt() {
   if (Discourse.MarkdownItURL) {
-    return loadScript(Discourse.MarkdownItURL).catch(e =>
-      Ember.Logger.error(e)
-    );
+    return loadScript(Discourse.MarkdownItURL).catch(e => {
+      // eslint-disable-next-line no-console
+      console.error(e);
+    });
   } else {
     return Ember.RSVP.Promise.resolve();
   }
diff --git a/app/assets/javascripts/discourse/lib/url.js.es6 b/app/assets/javascripts/discourse/lib/url.js.es6
index d26dffa7b9..827ef44410 100644
--- a/app/assets/javascripts/discourse/lib/url.js.es6
+++ b/app/assets/javascripts/discourse/lib/url.js.es6
@@ -176,7 +176,7 @@ const DiscourseURL = Ember.Object.extend({
   routeTo(path, opts) {
     opts = opts || {};
 
-    if (Em.isEmpty(path)) {
+    if (Ember.isEmpty(path)) {
       return;
     }
 
diff --git a/app/assets/javascripts/discourse/lib/utilities.js.es6 b/app/assets/javascripts/discourse/lib/utilities.js.es6
index 0ab5c4c933..cb87d2639e 100644
--- a/app/assets/javascripts/discourse/lib/utilities.js.es6
+++ b/app/assets/javascripts/discourse/lib/utilities.js.es6
@@ -546,7 +546,6 @@ export function isAppleDevice() {
   // This will apply hack on all iDevices
   return (
     navigator.userAgent.match(/(iPad|iPhone|iPod)/g) &&
-    navigator.userAgent.match(/Safari/g) &&
     !navigator.userAgent.match(/Trident/g)
   );
 }
diff --git a/app/assets/javascripts/discourse/mixins/badge-select-controller.js.es6 b/app/assets/javascripts/discourse/mixins/badge-select-controller.js.es6
index 48244d894d..671de5801b 100644
--- a/app/assets/javascripts/discourse/mixins/badge-select-controller.js.es6
+++ b/app/assets/javascripts/discourse/mixins/badge-select-controller.js.es6
@@ -10,7 +10,7 @@ export default Ember.Mixin.create({
       return e.get("badge.name");
     });
     items.unshiftObject(
-      Em.Object.create({
+      Ember.Object.create({
         badge: Badge.create({ name: I18n.t("badges.none") })
       })
     );
@@ -36,5 +36,5 @@ export default Ember.Mixin.create({
     return selectedUserBadge;
   }.property("selectedUserBadgeId"),
 
-  disableSave: Em.computed.alias("saving")
+  disableSave: Ember.computed.alias("saving")
 });
diff --git a/app/assets/javascripts/discourse/mixins/buffered-content.js.es6 b/app/assets/javascripts/discourse/mixins/buffered-content.js.es6
index 076df29ee9..8630c29700 100644
--- a/app/assets/javascripts/discourse/mixins/buffered-content.js.es6
+++ b/app/assets/javascripts/discourse/mixins/buffered-content.js.es6
@@ -2,7 +2,7 @@
 export function bufferedProperty(property) {
   const mixin = {
     buffered: function() {
-      return Em.ObjectProxy.extend(BufferedProxy).create({
+      return Ember.ObjectProxy.extend(BufferedProxy).create({
         content: this.get(property)
       });
     }.property(property),
diff --git a/app/assets/javascripts/discourse/mixins/bulk-topic-selection.js.es6 b/app/assets/javascripts/discourse/mixins/bulk-topic-selection.js.es6
index 1b99e1f812..8db10c5d22 100644
--- a/app/assets/javascripts/discourse/mixins/bulk-topic-selection.js.es6
+++ b/app/assets/javascripts/discourse/mixins/bulk-topic-selection.js.es6
@@ -4,7 +4,7 @@ export default Ember.Mixin.create({
   bulkSelectEnabled: false,
   selected: null,
 
-  canBulkSelect: Em.computed.alias("currentUser.staff"),
+  canBulkSelect: Ember.computed.alias("currentUser.staff"),
 
   resetSelected: function() {
     this.set("selected", []);
diff --git a/app/assets/javascripts/discourse/mixins/can-check-emails.js.es6 b/app/assets/javascripts/discourse/mixins/can-check-emails.js.es6
index 9e74d03a73..b9d1142fa2 100644
--- a/app/assets/javascripts/discourse/mixins/can-check-emails.js.es6
+++ b/app/assets/javascripts/discourse/mixins/can-check-emails.js.es6
@@ -3,12 +3,12 @@ import { propertyEqual, setting } from "discourse/lib/computed";
 export default Ember.Mixin.create({
   isCurrentUser: propertyEqual("model.id", "currentUser.id"),
   showEmailOnProfile: setting("show_email_on_profile"),
-  canStaffCheckEmails: Em.computed.and(
+  canStaffCheckEmails: Ember.computed.and(
     "showEmailOnProfile",
     "currentUser.staff"
   ),
-  canAdminCheckEmails: Em.computed.alias("currentUser.admin"),
-  canCheckEmails: Em.computed.or(
+  canAdminCheckEmails: Ember.computed.alias("currentUser.admin"),
+  canCheckEmails: Ember.computed.or(
     "isCurrentUser",
     "canStaffCheckEmails",
     "canAdminCheckEmails"
diff --git a/app/assets/javascripts/discourse/mixins/card-contents-base.js.es6 b/app/assets/javascripts/discourse/mixins/card-contents-base.js.es6
index 7c00979de4..931d2356fe 100644
--- a/app/assets/javascripts/discourse/mixins/card-contents-base.js.es6
+++ b/app/assets/javascripts/discourse/mixins/card-contents-base.js.es6
@@ -16,6 +16,7 @@ export default Ember.Mixin.create({
   cardTarget: null,
   post: null,
   isFixed: false,
+  isDocked: false,
 
   _show(username, $target) {
     // No user card for anon
@@ -123,6 +124,7 @@ export default Ember.Mixin.create({
     });
 
     this.appEvents.on(`topic-header:trigger-${id}`, (username, $target) => {
+      this.setProperties({ isFixed: true, isDocked: true });
       return this._show(username, $target);
     });
   },
@@ -135,6 +137,7 @@ export default Ember.Mixin.create({
     const width = this.$().width();
     const height = 175;
     const isFixed = this.get("isFixed");
+    const isDocked = this.get("isDocked");
 
     let verticalAdjustments = 0;
 
@@ -183,9 +186,17 @@ export default Ember.Mixin.create({
               position.top = "unset";
             }
           }
+
+          const avatarOverflowSize = 44;
+          if (isDocked && position.top < avatarOverflowSize) {
+            position.top = avatarOverflowSize;
+          }
+
           this.$().css(position);
         }
 
+        this.$().toggleClass("docked-card", isDocked);
+
         // After the card is shown, focus on the first link
         //
         // note: we DO NOT use afterRender here cause _positionCard may
@@ -209,7 +220,8 @@ export default Ember.Mixin.create({
       loading: null,
       cardTarget: null,
       post: null,
-      isFixed: false
+      isFixed: false,
+      isDocked: false
     });
   },
 
diff --git a/app/assets/javascripts/discourse/mixins/grant-badge-controller.js.es6 b/app/assets/javascripts/discourse/mixins/grant-badge-controller.js.es6
index 949b4d5f59..1c777758a1 100644
--- a/app/assets/javascripts/discourse/mixins/grant-badge-controller.js.es6
+++ b/app/assets/javascripts/discourse/mixins/grant-badge-controller.js.es6
@@ -19,8 +19,8 @@ export default Ember.Mixin.create({
         );
       })
       .map(badge => {
-        if (badge.icon) {
-          badge.icon = convertIconClass(badge.icon);
+        if (badge.get("icon")) {
+          badge.set("icon", convertIconClass(badge.icon));
         }
         return badge;
       })
diff --git a/app/assets/javascripts/discourse/mixins/key-enter-escape.js.es6 b/app/assets/javascripts/discourse/mixins/key-enter-escape.js.es6
index 9628b45cfa..8019870114 100644
--- a/app/assets/javascripts/discourse/mixins/key-enter-escape.js.es6
+++ b/app/assets/javascripts/discourse/mixins/key-enter-escape.js.es6
@@ -2,11 +2,11 @@
 export default {
   keyDown(e) {
     if (e.which === 27) {
-      this.sendAction("cancelled");
+      this.cancelled();
       return false;
     } else if (e.which === 13 && (e.ctrlKey || e.metaKey)) {
       // CTRL+ENTER or CMD+ENTER
-      this.sendAction("save");
+      this.save();
       return false;
     }
   }
diff --git a/app/assets/javascripts/discourse/mixins/password-validation.js.es6 b/app/assets/javascripts/discourse/mixins/password-validation.js.es6
index ea174dd53b..7a05424e82 100644
--- a/app/assets/javascripts/discourse/mixins/password-validation.js.es6
+++ b/app/assets/javascripts/discourse/mixins/password-validation.js.es6
@@ -7,7 +7,7 @@ export default Ember.Mixin.create({
   init() {
     this._super();
     this.set("rejectedPasswords", []);
-    this.set("rejectedPasswordsMessages", Ember.Map.create());
+    this.set("rejectedPasswordsMessages", new Map());
   },
 
   @computed("passwordMinLength")
diff --git a/app/assets/javascripts/discourse/mixins/upload.js.es6 b/app/assets/javascripts/discourse/mixins/upload.js.es6
index 9bb4f0ec6a..cc48533315 100644
--- a/app/assets/javascripts/discourse/mixins/upload.js.es6
+++ b/app/assets/javascripts/discourse/mixins/upload.js.es6
@@ -4,12 +4,12 @@ import {
 } from "discourse/lib/utilities";
 import getUrl from "discourse-common/lib/get-url";
 
-export default Em.Mixin.create({
+export default Ember.Mixin.create({
   uploading: false,
   uploadProgress: 0,
 
   uploadDone() {
-    Em.warn("You should implement `uploadDone`");
+    Ember.warn("You should implement `uploadDone`");
   },
 
   validateUploadedFilesOptions() {
diff --git a/app/assets/javascripts/discourse/mixins/url-refresh.js.es6 b/app/assets/javascripts/discourse/mixins/url-refresh.js.es6
index 88826656d9..7720e92dc6 100644
--- a/app/assets/javascripts/discourse/mixins/url-refresh.js.es6
+++ b/app/assets/javascripts/discourse/mixins/url-refresh.js.es6
@@ -5,12 +5,14 @@
 // behavior of not refreshing when navigating to the same place.
 export default {
   didInsertElement() {
-    this._super();
-    this.appEvents.on("url:refresh", () => this.sendAction("refresh"));
+    this._super(...arguments);
+
+    this.appEvents.on("url:refresh", this.refresh);
   },
 
   willDestroyElement() {
-    this._super();
-    this.appEvents.off("url:refresh");
+    this._super(...arguments);
+
+    this.appEvents.off("url:refresh", this, this.refresh);
   }
 };
diff --git a/app/assets/javascripts/discourse/models/archetype.js.es6 b/app/assets/javascripts/discourse/models/archetype.js.es6
index 025909ef82..9ba6e6744b 100644
--- a/app/assets/javascripts/discourse/models/archetype.js.es6
+++ b/app/assets/javascripts/discourse/models/archetype.js.es6
@@ -2,7 +2,7 @@ import { propertyEqual } from "discourse/lib/computed";
 import RestModel from "discourse/models/rest";
 
 export default RestModel.extend({
-  hasOptions: Em.computed.gt("options.length", 0),
+  hasOptions: Ember.computed.gt("options.length", 0),
   isDefault: propertyEqual("id", "site.default_archetype"),
-  notDefault: Em.computed.not("isDefault")
+  notDefault: Ember.computed.not("isDefault")
 });
diff --git a/app/assets/javascripts/discourse/models/badge.js.es6 b/app/assets/javascripts/discourse/models/badge.js.es6
index 197d6e7aef..0658bd631f 100644
--- a/app/assets/javascripts/discourse/models/badge.js.es6
+++ b/app/assets/javascripts/discourse/models/badge.js.es6
@@ -3,7 +3,7 @@ import BadgeGrouping from "discourse/models/badge-grouping";
 import RestModel from "discourse/models/rest";
 
 const Badge = RestModel.extend({
-  newBadge: Em.computed.none("id"),
+  newBadge: Ember.computed.none("id"),
 
   url: function() {
     return Discourse.getURL(`/badges/${this.get("id")}/${this.get("slug")}`);
diff --git a/app/assets/javascripts/discourse/models/category.js.es6 b/app/assets/javascripts/discourse/models/category.js.es6
index 7c7d92bd9c..c8531986d4 100644
--- a/app/assets/javascripts/discourse/models/category.js.es6
+++ b/app/assets/javascripts/discourse/models/category.js.es6
@@ -160,7 +160,7 @@ const Category = RestModel.extend({
 
   @computed
   permissions() {
-    return Em.A([
+    return Ember.A([
       { group_name: "everyone", permission: PermissionType.create({ id: 1 }) },
       { group_name: "admins", permission: PermissionType.create({ id: 2 }) },
       { group_name: "crap", permission: PermissionType.create({ id: 3 }) }
@@ -219,15 +219,15 @@ Category.reopenClass({
   slugFor(category, separator = "/") {
     if (!category) return "";
 
-    const parentCategory = Em.get(category, "parentCategory");
+    const parentCategory = Ember.get(category, "parentCategory");
     let result = "";
 
     if (parentCategory) {
       result = Category.slugFor(parentCategory) + separator;
     }
 
-    const id = Em.get(category, "id"),
-      slug = Em.get(category, "slug");
+    const id = Ember.get(category, "id"),
+      slug = Ember.get(category, "slug");
 
     return !slug || slug.trim().length === 0
       ? `${result}${id}-category`
diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6
index 230cbffecf..69a40d35f9 100644
--- a/app/assets/javascripts/discourse/models/composer.js.es6
+++ b/app/assets/javascripts/discourse/models/composer.js.es6
@@ -117,10 +117,10 @@ const Composer = RestModel.extend({
       : null;
   },
 
-  creatingTopic: Em.computed.equal("action", CREATE_TOPIC),
-  creatingSharedDraft: Em.computed.equal("action", CREATE_SHARED_DRAFT),
-  creatingPrivateMessage: Em.computed.equal("action", PRIVATE_MESSAGE),
-  notCreatingPrivateMessage: Em.computed.not("creatingPrivateMessage"),
+  creatingTopic: Ember.computed.equal("action", CREATE_TOPIC),
+  creatingSharedDraft: Ember.computed.equal("action", CREATE_SHARED_DRAFT),
+  creatingPrivateMessage: Ember.computed.equal("action", PRIVATE_MESSAGE),
+  notCreatingPrivateMessage: Ember.computed.not("creatingPrivateMessage"),
 
   @computed("privateMessage", "archetype.hasOptions")
   showCategoryChooser(isPrivateMessage, hasOptions) {
@@ -136,17 +136,17 @@ const Composer = RestModel.extend({
     );
   },
 
-  topicFirstPost: Em.computed.or("creatingTopic", "editingFirstPost"),
+  topicFirstPost: Ember.computed.or("creatingTopic", "editingFirstPost"),
 
   @computed("action")
   editingPost: isEdit,
 
-  replyingToTopic: Em.computed.equal("action", REPLY),
+  replyingToTopic: Ember.computed.equal("action", REPLY),
 
-  viewOpen: Em.computed.equal("composeState", OPEN),
-  viewDraft: Em.computed.equal("composeState", DRAFT),
-  viewFullscreen: Em.computed.equal("composeState", FULLSCREEN),
-  viewOpenOrFullscreen: Em.computed.or("viewOpen", "viewFullscreen"),
+  viewOpen: Ember.computed.equal("composeState", OPEN),
+  viewDraft: Ember.computed.equal("composeState", DRAFT),
+  viewFullscreen: Ember.computed.equal("composeState", FULLSCREEN),
+  viewOpenOrFullscreen: Ember.computed.or("viewOpen", "viewFullscreen"),
 
   composeStateChanged: function() {
     let oldOpen = this.get("composerOpened"),
@@ -186,7 +186,7 @@ const Composer = RestModel.extend({
   }.property("archetypeId"),
 
   archetypeChanged: function() {
-    return this.set("metaData", Em.Object.create());
+    return this.set("metaData", Ember.Object.create());
   }.observes("archetype"),
 
   // view detected user is typing
@@ -199,16 +199,19 @@ const Composer = RestModel.extend({
     { leading: false, trailing: true }
   ),
 
-  editingFirstPost: Em.computed.and("editingPost", "post.firstPost"),
+  editingFirstPost: Ember.computed.and("editingPost", "post.firstPost"),
 
-  canEditTitle: Em.computed.or(
+  canEditTitle: Ember.computed.or(
     "creatingTopic",
     "creatingPrivateMessage",
     "editingFirstPost",
     "creatingSharedDraft"
   ),
 
-  canCategorize: Em.computed.and("canEditTitle", "notCreatingPrivateMessage"),
+  canCategorize: Ember.computed.and(
+    "canEditTitle",
+    "notCreatingPrivateMessage"
+  ),
 
   @computed("canEditTitle", "creatingPrivateMessage", "categoryId")
   canEditTopicFeaturedLink(canEditTitle, creatingPrivateMessage, categoryId) {
@@ -402,7 +405,7 @@ const Composer = RestModel.extend({
 
   hasMetaData: function() {
     const metaData = this.get("metaData");
-    return metaData ? Em.isEmpty(Em.keys(this.get("metaData"))) : false;
+    return metaData ? Ember.isEmpty(Ember.keys(this.get("metaData"))) : false;
   }.property("metaData"),
 
   /**
@@ -601,7 +604,7 @@ const Composer = RestModel.extend({
     if (!opts) opts = {};
     this.set("loading", false);
 
-    const replyBlank = Em.isEmpty(this.get("reply"));
+    const replyBlank = Ember.isEmpty(this.get("reply"));
 
     const composer = this;
     if (
@@ -647,7 +650,7 @@ const Composer = RestModel.extend({
 
     this.setProperties({
       archetypeId: opts.archetypeId || this.site.get("default_archetype"),
-      metaData: opts.metaData ? Em.Object.create(opts.metaData) : null,
+      metaData: opts.metaData ? Ember.Object.create(opts.metaData) : null,
       reply: opts.reply || this.get("reply") || ""
     });
 
@@ -990,7 +993,7 @@ const Composer = RestModel.extend({
     });
 
     if (this._clearingStatus) {
-      Em.run.cancel(this._clearingStatus);
+      Ember.run.cancel(this._clearingStatus);
       this._clearingStatus = null;
     }
 
@@ -1041,7 +1044,7 @@ const Composer = RestModel.extend({
     const self = this;
 
     if (draftStatus && !this._clearingStatus) {
-      this._clearingStatus = Em.run.later(
+      this._clearingStatus = Ember.run.later(
         this,
         function() {
           self.set("draftStatus", null);
diff --git a/app/assets/javascripts/discourse/models/group.js.es6 b/app/assets/javascripts/discourse/models/group.js.es6
index 1793be9524..c000b109a5 100644
--- a/app/assets/javascripts/discourse/models/group.js.es6
+++ b/app/assets/javascripts/discourse/models/group.js.es6
@@ -20,7 +20,7 @@ const Group = RestModel.extend({
 
   @computed("automatic_membership_email_domains")
   emailDomains(value) {
-    return Em.isEmpty(value) ? "" : value;
+    return Ember.isEmpty(value) ? "" : value;
   },
 
   @computed("automatic")
@@ -37,7 +37,7 @@ const Group = RestModel.extend({
   },
 
   findMembers(params) {
-    if (Em.isEmpty(this.get("name"))) {
+    if (Ember.isEmpty(this.get("name"))) {
       return;
     }
 
@@ -257,7 +257,7 @@ const Group = RestModel.extend({
           p.user = User.create(p.user);
           p.topic = Topic.create(p.topic);
           p.category = Category.findById(p.category_id);
-          return Em.Object.create(p);
+          return Ember.Object.create(p);
         });
       }
     );
diff --git a/app/assets/javascripts/discourse/models/invite.js.es6 b/app/assets/javascripts/discourse/models/invite.js.es6
index 1f2ad32ad0..6775f9d10a 100644
--- a/app/assets/javascripts/discourse/models/invite.js.es6
+++ b/app/assets/javascripts/discourse/models/invite.js.es6
@@ -35,14 +35,14 @@ Invite.reopenClass({
 
   findInvitedBy(user, filter, search, offset) {
     if (!user) {
-      return Em.RSVP.resolve();
+      return Ember.RSVP.resolve();
     }
 
     var data = {};
-    if (!Em.isNone(filter)) {
+    if (!Ember.isNone(filter)) {
       data.filter = filter;
     }
-    if (!Em.isNone(search)) {
+    if (!Ember.isNone(search)) {
       data.search = search;
     }
     data.offset = offset || 0;
@@ -54,17 +54,17 @@ Invite.reopenClass({
         return Invite.create(i);
       });
 
-      return Em.Object.create(result);
+      return Ember.Object.create(result);
     });
   },
 
   findInvitedCount(user) {
     if (!user) {
-      return Em.RSVP.resolve();
+      return Ember.RSVP.resolve();
     }
     return ajax(
       userPath(user.get("username_lower") + "/invited_count.json")
-    ).then(result => Em.Object.create(result.counts));
+    ).then(result => Ember.Object.create(result.counts));
   },
 
   reinviteAll() {
diff --git a/app/assets/javascripts/discourse/models/post-action-type.js.es6 b/app/assets/javascripts/discourse/models/post-action-type.js.es6
index 52799d48a8..fc83f6282a 100644
--- a/app/assets/javascripts/discourse/models/post-action-type.js.es6
+++ b/app/assets/javascripts/discourse/models/post-action-type.js.es6
@@ -3,5 +3,5 @@ import RestModel from "discourse/models/rest";
 export const MAX_MESSAGE_LENGTH = 500;
 
 export default RestModel.extend({
-  notCustomFlag: Em.computed.not("is_custom_flag")
+  notCustomFlag: Ember.computed.not("is_custom_flag")
 });
diff --git a/app/assets/javascripts/discourse/models/post-stream.js.es6 b/app/assets/javascripts/discourse/models/post-stream.js.es6
index 4b9b579554..8cc53ea0a7 100644
--- a/app/assets/javascripts/discourse/models/post-stream.js.es6
+++ b/app/assets/javascripts/discourse/models/post-stream.js.es6
@@ -317,7 +317,7 @@ export default RestModel.extend({
           });
 
           delete this.get("gaps.before")[postId];
-          this.get("stream").enumerableContentDidChange();
+          this.get("stream").arrayContentDidChange();
           this.get("postsWithPlaceholders").arrayContentDidChange(
             origIdx,
             0,
@@ -340,7 +340,7 @@ export default RestModel.extend({
       stream.pushObjects(gap);
       return this.appendMore().then(() => {
         delete this.get("gaps.after")[postId];
-        this.get("stream").enumerableContentDidChange();
+        this.get("stream").arrayContentDidChange();
       });
     }
     return Ember.RSVP.resolve();
diff --git a/app/assets/javascripts/discourse/models/post.js.es6 b/app/assets/javascripts/discourse/models/post.js.es6
index 4de7c3b347..8da229cfb2 100644
--- a/app/assets/javascripts/discourse/models/post.js.es6
+++ b/app/assets/javascripts/discourse/models/post.js.es6
@@ -28,13 +28,13 @@ const Post = RestModel.extend({
     }
   }.property("url"),
 
-  new_user: Em.computed.equal("trust_level", 0),
-  firstPost: Em.computed.equal("post_number", 1),
+  new_user: Ember.computed.equal("trust_level", 0),
+  firstPost: Ember.computed.equal("post_number", 1),
 
   // Posts can show up as deleted if the topic is deleted
-  deletedViaTopic: Em.computed.and("firstPost", "topic.deleted_at"),
-  deleted: Em.computed.or("deleted_at", "deletedViaTopic"),
-  notDeleted: Em.computed.not("deleted"),
+  deletedViaTopic: Ember.computed.and("firstPost", "topic.deleted_at"),
+  deleted: Ember.computed.or("deleted_at", "deletedViaTopic"),
+  notDeleted: Ember.computed.not("deleted"),
 
   showName: function() {
     const name = this.get("name");
@@ -91,18 +91,27 @@ const Post = RestModel.extend({
       .catch(popupAjaxError);
   },
 
-  internalLinks: function() {
+  @computed("link_counts.@each.internal")
+  internalLinks() {
     if (Ember.isEmpty(this.get("link_counts"))) return null;
+
     return this.get("link_counts")
       .filterBy("internal")
       .filterBy("title");
-  }.property("link_counts.@each.internal"),
+  },
+
+  @computed("actions_summary.@each.can_act")
+  flagsAvailable() {
+    // TODO: Investigate why `this.site` is sometimes null when running
+    // Search - Search with context
+    if (!this.site) {
+      return [];
+    }
 
-  flagsAvailable: function() {
     return this.site.get("flagTypes").filter(item => {
       return this.get(`actionByName.${item.get("name_key")}.can_act`);
     });
-  }.property("actions_summary.@each.can_act"),
+  },
 
   afterUpdate(res) {
     if (res.category) {
@@ -217,7 +226,7 @@ const Post = RestModel.extend({
       });
     }
 
-    return promise || Em.RSVP.Promise.resolve();
+    return promise || Ember.RSVP.Promise.resolve();
   },
 
   /**
@@ -271,7 +280,7 @@ const Post = RestModel.extend({
         if (key === "reply_to_user" && value && oldValue) {
           skip =
             value.username === oldValue.username ||
-            Em.get(value, "username") === Em.get(oldValue, "username");
+            Ember.get(value, "username") === Ember.get(oldValue, "username");
         }
 
         if (!skip) {
@@ -338,7 +347,7 @@ const Post = RestModel.extend({
 Post.reopenClass({
   munge(json) {
     if (json.actions_summary) {
-      const lookup = Em.Object.create();
+      const lookup = Ember.Object.create();
 
       // this area should be optimized, it is creating way too many objects per post
       json.actions_summary = json.actions_summary.map(function(a) {
diff --git a/app/assets/javascripts/discourse/models/site.js.es6 b/app/assets/javascripts/discourse/models/site.js.es6
index 70ec3bbc9a..82733e89e6 100644
--- a/app/assets/javascripts/discourse/models/site.js.es6
+++ b/app/assets/javascripts/discourse/models/site.js.es6
@@ -6,7 +6,7 @@ import RestModel from "discourse/models/rest";
 import PreloadStore from "preload-store";
 
 const Site = RestModel.extend({
-  isReadOnly: Em.computed.alias("is_readonly"),
+  isReadOnly: Ember.computed.alias("is_readonly"),
 
   @computed("notification_types")
   notificationLookup(notificationTypes) {
@@ -87,7 +87,7 @@ const Site = RestModel.extend({
 
   updateCategory(newCategory) {
     const categories = this.get("categories");
-    const categoryId = Em.get(newCategory, "id");
+    const categoryId = Ember.get(newCategory, "id");
     const existingCategory = categories.findBy("id", categoryId);
 
     // Don't update null permissions
@@ -159,7 +159,7 @@ Site.reopenClass(Singleton, {
     }
 
     if (result.post_action_types) {
-      result.postActionByIdLookup = Em.Object.create();
+      result.postActionByIdLookup = Ember.Object.create();
       result.post_action_types = result.post_action_types.map(p => {
         const actionType = PostActionType.create(p);
         result.postActionByIdLookup.set("action" + p.id, actionType);
@@ -168,7 +168,7 @@ Site.reopenClass(Singleton, {
     }
 
     if (result.topic_flag_types) {
-      result.topicFlagByIdLookup = Em.Object.create();
+      result.topicFlagByIdLookup = Ember.Object.create();
       result.topic_flag_types = result.topic_flag_types.map(p => {
         const actionType = PostActionType.create(p);
         result.topicFlagByIdLookup.set("action" + p.id, actionType);
diff --git a/app/assets/javascripts/discourse/models/topic-list.js.es6 b/app/assets/javascripts/discourse/models/topic-list.js.es6
index edd5e9b265..48964766ec 100644
--- a/app/assets/javascripts/discourse/models/topic-list.js.es6
+++ b/app/assets/javascripts/discourse/models/topic-list.js.es6
@@ -20,7 +20,7 @@ function displayCategoryInList(site, category) {
 }
 
 const TopicList = RestModel.extend({
-  canLoadMore: Em.computed.notEmpty("more_topics_url"),
+  canLoadMore: Ember.computed.notEmpty("more_topics_url"),
 
   forEachNew(topics, callback) {
     const topicIds = [];
diff --git a/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6 b/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6
index d29f1c83be..e2361e23d4 100644
--- a/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6
+++ b/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6
@@ -218,7 +218,7 @@ const TopicTrackingState = Discourse.Model.extend({
 
   // If we have a cached topic list, we can update it from our tracking information.
   updateTopics(topics) {
-    if (Em.isEmpty(topics)) {
+    if (Ember.isEmpty(topics)) {
       return;
     }
 
@@ -392,8 +392,8 @@ const TopicTrackingState = Discourse.Model.extend({
       );
     }
 
-    let categoryId = category ? Em.get(category, "id") : null;
-    let categoryName = category ? Em.get(category, "name") : null;
+    let categoryId = category ? Ember.get(category, "id") : null;
+    let categoryName = category ? Ember.get(category, "name") : null;
 
     if (name === "new") {
       return this.countNew(categoryId);
diff --git a/app/assets/javascripts/discourse/models/topic.js.es6 b/app/assets/javascripts/discourse/models/topic.js.es6
index a02e9c7a7a..18e1ede1c1 100644
--- a/app/assets/javascripts/discourse/models/topic.js.es6
+++ b/app/assets/javascripts/discourse/models/topic.js.es6
@@ -163,8 +163,8 @@ const Topic = RestModel.extend({
     });
   }.property(),
 
-  invisible: Em.computed.not("visible"),
-  deleted: Em.computed.notEmpty("deleted_at"),
+  invisible: Ember.computed.not("visible"),
+  deleted: Ember.computed.notEmpty("deleted_at"),
 
   searchContext: function() {
     return { type: "topic", id: this.get("id") };
@@ -297,8 +297,8 @@ const Topic = RestModel.extend({
     );
   }.property("archetype"),
 
-  isPrivateMessage: Em.computed.equal("archetype", "private_message"),
-  isBanner: Em.computed.equal("archetype", "banner"),
+  isPrivateMessage: Ember.computed.equal("archetype", "private_message"),
+  isBanner: Ember.computed.equal("archetype", "banner"),
 
   toggleStatus(property) {
     this.toggleProperty(property);
@@ -344,7 +344,7 @@ const Topic = RestModel.extend({
     this.set("bookmarking", true);
 
     const stream = this.get("postStream");
-    const posts = Em.get(stream, "posts");
+    const posts = Ember.get(stream, "posts");
     const firstPost =
       posts && posts[0] && posts[0].get("post_number") === 1 && posts[0];
     const bookmark = !this.get("bookmarked");
@@ -512,7 +512,7 @@ const Topic = RestModel.extend({
     return emojiUnescape(excerpt);
   },
 
-  hasExcerpt: Em.computed.notEmpty("excerpt"),
+  hasExcerpt: Ember.computed.notEmpty("excerpt"),
 
   excerptTruncated: function() {
     const e = this.get("excerpt");
@@ -520,7 +520,7 @@ const Topic = RestModel.extend({
   }.property("excerpt"),
 
   readLastPost: propertyEqual("last_read_post_number", "highest_post_number"),
-  canClearPin: Em.computed.and("pinned", "readLastPost"),
+  canClearPin: Ember.computed.and("pinned", "readLastPost"),
 
   archiveMessage() {
     this.set("archiving", true);
@@ -598,7 +598,7 @@ Topic.reopenClass({
 
   createActionSummary(result) {
     if (result.actions_summary) {
-      const lookup = Em.Object.create();
+      const lookup = Ember.Object.create();
       result.actions_summary = result.actions_summary.map(function(a) {
         a.post = result;
         a.actionType = Discourse.Site.current().postActionTypeById(a.id);
diff --git a/app/assets/javascripts/discourse/models/user-action.js.es6 b/app/assets/javascripts/discourse/models/user-action.js.es6
index a60f589823..4bb710d663 100644
--- a/app/assets/javascripts/discourse/models/user-action.js.es6
+++ b/app/assets/javascripts/discourse/models/user-action.js.es6
@@ -118,22 +118,22 @@ const UserAction = RestModel.extend({
     );
   },
 
-  replyType: Em.computed.equal("action_type", UserActionTypes.replies),
-  postType: Em.computed.equal("action_type", UserActionTypes.posts),
-  topicType: Em.computed.equal("action_type", UserActionTypes.topics),
-  bookmarkType: Em.computed.equal("action_type", UserActionTypes.bookmarks),
-  messageSentType: Em.computed.equal(
+  replyType: Ember.computed.equal("action_type", UserActionTypes.replies),
+  postType: Ember.computed.equal("action_type", UserActionTypes.posts),
+  topicType: Ember.computed.equal("action_type", UserActionTypes.topics),
+  bookmarkType: Ember.computed.equal("action_type", UserActionTypes.bookmarks),
+  messageSentType: Ember.computed.equal(
     "action_type",
     UserActionTypes.messages_sent
   ),
-  messageReceivedType: Em.computed.equal(
+  messageReceivedType: Ember.computed.equal(
     "action_type",
     UserActionTypes.messages_received
   ),
-  mentionType: Em.computed.equal("action_type", UserActionTypes.mentions),
-  isPM: Em.computed.or("messageSentType", "messageReceivedType"),
-  postReplyType: Em.computed.or("postType", "replyType"),
-  removableBookmark: Em.computed.and("bookmarkType", "sameUser"),
+  mentionType: Ember.computed.equal("action_type", UserActionTypes.mentions),
+  isPM: Ember.computed.or("messageSentType", "messageReceivedType"),
+  postReplyType: Ember.computed.or("postType", "replyType"),
+  removableBookmark: Ember.computed.and("bookmarkType", "sameUser"),
 
   addChild(action) {
     let groups = this.get("childGroups");
diff --git a/app/assets/javascripts/discourse/models/user-badge.js.es6 b/app/assets/javascripts/discourse/models/user-badge.js.es6
index fb361bc99c..d746efc2b8 100644
--- a/app/assets/javascripts/discourse/models/user-badge.js.es6
+++ b/app/assets/javascripts/discourse/models/user-badge.js.es6
@@ -94,7 +94,7 @@ UserBadge.reopenClass({
   **/
   findByUsername: function(username, options) {
     if (!username) {
-      return Em.RSVP.resolve([]);
+      return Ember.RSVP.resolve([]);
     }
     var url = "/user-badges/" + username + ".json";
     if (options && options.grouped) {
diff --git a/app/assets/javascripts/discourse/models/user-drafts-stream.js.es6 b/app/assets/javascripts/discourse/models/user-drafts-stream.js.es6
index b6d82f8a33..0b18349d57 100644
--- a/app/assets/javascripts/discourse/models/user-drafts-stream.js.es6
+++ b/app/assets/javascripts/discourse/models/user-drafts-stream.js.es6
@@ -70,7 +70,7 @@ export default RestModel.extend({
           this.set("noContentHelp", result.no_results_help);
         }
         if (result && result.drafts) {
-          const copy = Em.A();
+          const copy = Ember.A();
           result.drafts.forEach(draft => {
             let draftData = JSON.parse(draft.data);
             draft.post_number = draftData.postId || null;
diff --git a/app/assets/javascripts/discourse/models/user-stream.js.es6 b/app/assets/javascripts/discourse/models/user-stream.js.es6
index e9ff628294..3f1650c300 100644
--- a/app/assets/javascripts/discourse/models/user-stream.js.es6
+++ b/app/assets/javascripts/discourse/models/user-stream.js.es6
@@ -43,7 +43,7 @@ export default RestModel.extend({
 
   noContent: function() {
     return this.get("loaded") && this.get("content").length === 0;
-  }.property("loaded", "content.@each"),
+  }.property("loaded", "content.[]"),
 
   remove(userAction) {
     // 1) remove the user action from the child groups
@@ -93,7 +93,7 @@ export default RestModel.extend({
           self.set("noContentHelp", result.no_results_help);
         }
         if (result && result.user_actions) {
-          const copy = Em.A();
+          const copy = Ember.A();
           result.user_actions.forEach(function(action) {
             action.title = emojiUnescape(
               Handlebars.Utils.escapeExpression(action.title)
diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js.es6
index d6ff8c300a..70b6dbc7ac 100644
--- a/app/assets/javascripts/discourse/models/user.js.es6
+++ b/app/assets/javascripts/discourse/models/user.js.es6
@@ -26,9 +26,9 @@ export const SECOND_FACTOR_METHODS = { TOTP: 1, BACKUP_CODE: 2 };
 const isForever = dt => moment().diff(dt, "years") < -500;
 
 const User = RestModel.extend({
-  hasPMs: Em.computed.gt("private_messages_stats.all", 0),
-  hasStartedPMs: Em.computed.gt("private_messages_stats.mine", 0),
-  hasUnreadPMs: Em.computed.gt("private_messages_stats.unread", 0),
+  hasPMs: Ember.computed.gt("private_messages_stats.all", 0),
+  hasStartedPMs: Ember.computed.gt("private_messages_stats.mine", 0),
+  hasUnreadPMs: Ember.computed.gt("private_messages_stats.unread", 0),
 
   redirected_to_top: {
     reason: null
@@ -54,7 +54,7 @@ const User = RestModel.extend({
     return UserDraftsStream.create({ user: this });
   },
 
-  staff: Em.computed.or("admin", "moderator"),
+  staff: Ember.computed.or("admin", "moderator"),
 
   destroySession() {
     return ajax(`/session/${this.get("username")}`, { type: "DELETE" });
@@ -80,7 +80,7 @@ const User = RestModel.extend({
   @computed("profile_background")
   profileBackground(bgUrl) {
     if (
-      Em.isEmpty(bgUrl) ||
+      Ember.isEmpty(bgUrl) ||
       !Discourse.SiteSettings.allow_profile_backgrounds
     ) {
       return "".htmlSafe();
@@ -103,7 +103,7 @@ const User = RestModel.extend({
     const keys = this.get("user_api_keys");
     if (keys) {
       return keys.map(raw => {
-        let obj = Em.Object.create(raw);
+        let obj = Ember.Object.create(raw);
 
         obj.revoke = () => {
           this.revokeApiKey(obj);
@@ -190,10 +190,10 @@ const User = RestModel.extend({
     );
   },
 
-  isBasic: Em.computed.equal("trust_level", 0),
-  isLeader: Em.computed.equal("trust_level", 3),
-  isElder: Em.computed.equal("trust_level", 4),
-  canManageTopic: Em.computed.or("staff", "isElder"),
+  isBasic: Ember.computed.equal("trust_level", 0),
+  isLeader: Ember.computed.equal("trust_level", 3),
+  isElder: Ember.computed.equal("trust_level", 4),
+  canManageTopic: Ember.computed.or("staff", "isElder"),
 
   @computed("previous_visit_at")
   previousVisitAt(previous_visit_at) {
@@ -285,7 +285,8 @@ const User = RestModel.extend({
       "theme_ids",
       "allow_private_messages",
       "homepage_id",
-      "hide_profile_and_presence"
+      "hide_profile_and_presence",
+      "text_size"
     ];
 
     if (fields) {
@@ -337,7 +338,7 @@ const User = RestModel.extend({
     })
       .then(result => {
         this.set("bio_excerpt", result.user.bio_excerpt);
-        const userProps = Em.getProperties(
+        const userProps = Ember.getProperties(
           this.get("user_option"),
           "enable_quoting",
           "external_links_in_new_tab",
@@ -467,7 +468,7 @@ const User = RestModel.extend({
     return PreloadStore.getAndRemove(`user_${user.get("username")}`, () => {
       return ajax(userPath(`${user.get("username")}.json`), { data: options });
     }).then(json => {
-      if (!Em.isEmpty(json.user.stats)) {
+      if (!Ember.isEmpty(json.user.stats)) {
         json.user.stats = Discourse.User.groupStats(
           json.user.stats.map(s => {
             if (s.count) s.count = parseInt(s.count, 10);
@@ -476,7 +477,7 @@ const User = RestModel.extend({
         );
       }
 
-      if (!Em.isEmpty(json.user.groups)) {
+      if (!Ember.isEmpty(json.user.groups)) {
         const groups = [];
 
         for (let i = 0; i < json.user.groups.length; i++) {
@@ -492,7 +493,7 @@ const User = RestModel.extend({
         json.user.invited_by = Discourse.User.create(json.user.invited_by);
       }
 
-      if (!Em.isEmpty(json.user.featured_user_badge_ids)) {
+      if (!Ember.isEmpty(json.user.featured_user_badge_ids)) {
         const userBadgesMap = {};
         UserBadge.createFromJson(json).forEach(userBadge => {
           userBadgesMap[userBadge.get("id")] = userBadge;
@@ -633,7 +634,8 @@ const User = RestModel.extend({
   },
 
   summary() {
-    let { store } = this;
+    // let { store } = this; would fail in tests
+    const store = Discourse.__container__.lookup("service:store");
 
     return ajax(userPath(`${this.get("username_lower")}/summary.json`)).then(
       json => {
@@ -686,7 +688,7 @@ const User = RestModel.extend({
       : this.get("admin") || group.get("is_group_owner");
   },
 
-  @computed("groups.@each.title", "badges.@each")
+  @computed("groups.@each.title", "badges.[]")
   availableTitles() {
     let titles = [];
 
@@ -749,7 +751,7 @@ User.reopenClass(Singleton, {
       responses.set("count", responses.get("count") + stat.get("count"));
     });
 
-    const result = Em.A();
+    const result = Ember.A();
     result.pushObjects(stats.rejectBy("isResponse"));
 
     let insertAt = 0;
diff --git a/app/assets/javascripts/discourse/pre-initializers/inject-discourse-objects.js.es6 b/app/assets/javascripts/discourse/pre-initializers/inject-discourse-objects.js.es6
index 1cb65e9012..7e1d8142e7 100644
--- a/app/assets/javascripts/discourse/pre-initializers/inject-discourse-objects.js.es6
+++ b/app/assets/javascripts/discourse/pre-initializers/inject-discourse-objects.js.es6
@@ -25,8 +25,10 @@ export default {
     // backwards compatibility: remove when plugins have updated
     app.register("store:main", Store);
 
-    app.register("service:store", Store);
-    ALL_TARGETS.forEach(t => app.inject(t, "store", "service:store"));
+    if (!app.hasRegistration("service:store")) {
+      app.register("service:store", Store);
+      ALL_TARGETS.forEach(t => app.inject(t, "store", "service:store"));
+    }
 
     const messageBus = window.MessageBus;
     app.register("message-bus:main", messageBus, { instantiate: false });
diff --git a/app/assets/javascripts/discourse/pre-initializers/map-routes.js.es6 b/app/assets/javascripts/discourse/pre-initializers/map-routes.js.es6
index 3ca301db5b..312e56eee3 100644
--- a/app/assets/javascripts/discourse/pre-initializers/map-routes.js.es6
+++ b/app/assets/javascripts/discourse/pre-initializers/map-routes.js.es6
@@ -5,6 +5,7 @@ export default {
   after: "inject-discourse-objects",
 
   initialize(container, app) {
+    app.unregister("router:main");
     app.register("router:main", mapRoutes());
 
     // HACK to fix: https://github.com/emberjs/ember.js/issues/10310
diff --git a/app/assets/javascripts/discourse/pre-initializers/register-dom-templates.js.es6 b/app/assets/javascripts/discourse/pre-initializers/register-dom-templates.js.es6
index ff3bf5bc2c..748f38aabb 100644
--- a/app/assets/javascripts/discourse/pre-initializers/register-dom-templates.js.es6
+++ b/app/assets/javascripts/discourse/pre-initializers/register-dom-templates.js.es6
@@ -1,6 +1,5 @@
 export default {
   name: "register-discourse-dom-templates",
-  before: "domTemplates",
 
   initialize: function() {
     $('script[type="text/x-handlebars"]').each(function() {
diff --git a/app/assets/javascripts/discourse/pre-initializers/sniff-capabilities.js.es6 b/app/assets/javascripts/discourse/pre-initializers/sniff-capabilities.js.es6
index 66d1085692..a4decf58b5 100644
--- a/app/assets/javascripts/discourse/pre-initializers/sniff-capabilities.js.es6
+++ b/app/assets/javascripts/discourse/pre-initializers/sniff-capabilities.js.es6
@@ -1,17 +1,17 @@
-/*global Modernizr:true safari:true*/
+/*global safari:true*/
 
 // Initializes an object that lets us know about our capabilities.
 export default {
   name: "sniff-capabilities",
   initialize(container, application) {
     const $html = $("html"),
-      touch =
-        $html.hasClass("touch") ||
-        Modernizr.prefixed("MaxTouchPoints", navigator) > 1,
+      touch = navigator.maxTouchPoints > 1 || "ontouchstart" in window,
       caps = { touch };
 
     // Store the touch ability in our capabilities object
-    $html.addClass(touch ? "discourse-touch" : "discourse-no-touch");
+    $html.addClass(
+      touch ? "touch discourse-touch" : "no-touch discourse-no-touch"
+    );
 
     // Detect Devices
     if (navigator) {
diff --git a/app/assets/javascripts/discourse/routes/application.js.es6 b/app/assets/javascripts/discourse/routes/application.js.es6
index 0577786191..451ceceec6 100644
--- a/app/assets/javascripts/discourse/routes/application.js.es6
+++ b/app/assets/javascripts/discourse/routes/application.js.es6
@@ -207,7 +207,7 @@ const ApplicationRoute = Discourse.Route.extend(OpenComposer, {
 
   activate() {
     this._super();
-    Em.run.next(function() {
+    Ember.run.next(function() {
       // Support for callbacks once the application has activated
       ApplicationRoute.trigger("activate");
     });
diff --git a/app/assets/javascripts/discourse/routes/build-category-route.js.es6 b/app/assets/javascripts/discourse/routes/build-category-route.js.es6
index 4d9d3dd6ad..7f2d10d24c 100644
--- a/app/assets/javascripts/discourse/routes/build-category-route.js.es6
+++ b/app/assets/javascripts/discourse/routes/build-category-route.js.es6
@@ -49,7 +49,7 @@ export default (filterArg, params) => {
       }
 
       this._setupNavigation(model.category);
-      return Em.RSVP.all([
+      return Ember.RSVP.all([
         this._createSubcategoryList(model.category),
         this._retrieveTopicList(model.category, transition)
       ]);
@@ -77,7 +77,7 @@ export default (filterArg, params) => {
     _createSubcategoryList(category) {
       this._categoryList = null;
       if (
-        Em.isNone(category.get("parentCategory")) &&
+        Ember.isNone(category.get("parentCategory")) &&
         category.get("show_subcategory_list")
       ) {
         return CategoryList.listForParent(this.store, category).then(
@@ -86,7 +86,7 @@ export default (filterArg, params) => {
       }
 
       // If we're not loading a subcategory list just resolve
-      return Em.RSVP.resolve();
+      return Ember.RSVP.resolve();
     },
 
     _retrieveTopicList(category, transition) {
diff --git a/app/assets/javascripts/discourse/routes/build-topic-route.js.es6 b/app/assets/javascripts/discourse/routes/build-topic-route.js.es6
index 4bfb0ffeab..72db37455b 100644
--- a/app/assets/javascripts/discourse/routes/build-topic-route.js.es6
+++ b/app/assets/javascripts/discourse/routes/build-topic-route.js.es6
@@ -113,6 +113,7 @@ export default function(filter, extras) {
             model.get("for_period") ||
             (filter.indexOf("top/") >= 0 ? filter.split("/")[1] : ""),
           selected: [],
+          expandAllPinned: false,
           expandGloballyPinned: true
         };
 
diff --git a/app/assets/javascripts/discourse/routes/discourse.js.es6 b/app/assets/javascripts/discourse/routes/discourse.js.es6
index 6cc6825233..750d496109 100644
--- a/app/assets/javascripts/discourse/routes/discourse.js.es6
+++ b/app/assets/javascripts/discourse/routes/discourse.js.es6
@@ -1,4 +1,5 @@
 import Composer from "discourse/models/composer";
+import { getOwner } from "discourse-common/lib/get-owner";
 
 const DiscourseRoute = Ember.Route.extend({
   showFooter: false,
@@ -19,7 +20,8 @@ const DiscourseRoute = Ember.Route.extend({
       return this._super();
     }
 
-    if (!this.router._routerMicrolib.activeTransition) {
+    const router = getOwner(this).lookup("router:main");
+    if (!router._routerMicrolib.activeTransition) {
       const controller = this.controller,
         model = controller.get("model"),
         params = this.controller.getProperties(Object.keys(this.queryParams));
diff --git a/app/assets/javascripts/discourse/routes/discovery.js.es6 b/app/assets/javascripts/discourse/routes/discovery.js.es6
index e7ff98a591..aa71f49ece 100644
--- a/app/assets/javascripts/discourse/routes/discovery.js.es6
+++ b/app/assets/javascripts/discourse/routes/discovery.js.es6
@@ -36,12 +36,13 @@ export default Discourse.Route.extend(OpenComposer, {
       if (!this.session.get("topicListScrollPosition")) {
         scrollTop();
       }
+      return false;
     },
 
     didTransition() {
       this.controllerFor("discovery")._showFooter();
       this.send("loadingComplete");
-      return true;
+      return false;
     },
 
     // clear a pinned topic
diff --git a/app/assets/javascripts/discourse/routes/topic.js.es6 b/app/assets/javascripts/discourse/routes/topic.js.es6
index eef20e0d44..e1b36bfeba 100644
--- a/app/assets/javascripts/discourse/routes/topic.js.es6
+++ b/app/assets/javascripts/discourse/routes/topic.js.es6
@@ -61,11 +61,17 @@ const TopicRoute = Discourse.Route.extend({
 
     showTopicStatusUpdate() {
       const model = this.modelFor("topic");
-      model.set("topic_timer", Ember.Object.create(model.get("topic_timer")));
-      model.set(
-        "private_topic_timer",
-        Ember.Object.create(model.get("private_topic_timer"))
-      );
+
+      const topicTimer = model.get("topic_timer");
+      if (!topicTimer) {
+        model.set("topic_timer", {});
+      }
+
+      const privateTopicTimer = model.get("private_topic_timer");
+      if (!privateTopicTimer) {
+        model.set("private_topic_timer", {});
+      }
+
       showModal("edit-topic-timer", { model });
       this.controllerFor("modal").set("modalClass", "edit-topic-timer-modal");
     },
@@ -142,9 +148,9 @@ const TopicRoute = Discourse.Route.extend({
           postUrl += "/" + currentPost;
         }
 
-        Em.run.cancel(scheduledReplace);
+        Ember.run.cancel(scheduledReplace);
         lastScrollPos = parseInt($(document).scrollTop(), 10);
-        scheduledReplace = Em.run.later(
+        scheduledReplace = Ember.run.later(
           this,
           "_replaceUnlessScrolling",
           postUrl,
@@ -160,7 +166,7 @@ const TopicRoute = Discourse.Route.extend({
 
     willTransition() {
       this._super();
-      Em.run.cancel(scheduledReplace);
+      Ember.run.cancel(scheduledReplace);
       isTransitioning = true;
       return true;
     }
@@ -175,7 +181,7 @@ const TopicRoute = Discourse.Route.extend({
       return;
     }
     lastScrollPos = currentPos;
-    scheduledReplace = Em.run.later(
+    scheduledReplace = Ember.run.later(
       this,
       "_replaceUnlessScrolling",
       url,
@@ -185,13 +191,13 @@ const TopicRoute = Discourse.Route.extend({
 
   setupParams(topic, params) {
     const postStream = topic.get("postStream");
-    postStream.set("summary", Em.get(params, "filter") === "summary");
+    postStream.set("summary", Ember.get(params, "filter") === "summary");
 
-    const usernames = Em.get(params, "username_filters"),
+    const usernames = Ember.get(params, "username_filters"),
       userFilters = postStream.get("userFilters");
 
     userFilters.clear();
-    if (!Em.isEmpty(usernames) && usernames !== "undefined") {
+    if (!Ember.isEmpty(usernames) && usernames !== "undefined") {
       userFilters.addObjects(usernames.split(","));
     }
 
diff --git a/app/assets/javascripts/discourse/routes/user-summary.js.es6 b/app/assets/javascripts/discourse/routes/user-summary.js.es6
index 95db3c3ae1..698d2f4edc 100644
--- a/app/assets/javascripts/discourse/routes/user-summary.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-summary.js.es6
@@ -2,7 +2,7 @@ export default Discourse.Route.extend({
   showFooter: true,
 
   model() {
-    let user = this.modelFor("user");
+    const user = this.modelFor("user");
     if (user.get("profile_hidden")) {
       return this.replaceWith("user.profile-hidden");
     }
diff --git a/app/assets/javascripts/discourse/routes/user.js.es6 b/app/assets/javascripts/discourse/routes/user.js.es6
index 24093fd3a5..4757ccff07 100644
--- a/app/assets/javascripts/discourse/routes/user.js.es6
+++ b/app/assets/javascripts/discourse/routes/user.js.es6
@@ -59,7 +59,7 @@ export default Discourse.Route.extend({
 
   serialize(model) {
     if (!model) return {};
-    return { username: (Em.get(model, "username") || "").toLowerCase() };
+    return { username: (Ember.get(model, "username") || "").toLowerCase() };
   },
 
   setupController(controller, user) {
diff --git a/app/assets/javascripts/discourse/templates/account-created/edit-email.hbs b/app/assets/javascripts/discourse/templates/account-created/edit-email.hbs
index 53e5dd543e..dfbfaba92b 100644
--- a/app/assets/javascripts/discourse/templates/account-created/edit-email.hbs
+++ b/app/assets/javascripts/discourse/templates/account-created/edit-email.hbs
@@ -3,7 +3,7 @@
 </div>
 
 <div class='activation-controls'>
-  {{d-button action="changeEmail"
+  {{d-button action=(action "changeEmail")
              label="login.submit_new_email"
              disabled=submitDisabled
              class="btn-primary"}}
diff --git a/app/assets/javascripts/discourse/templates/badges/show.hbs b/app/assets/javascripts/discourse/templates/badges/show.hbs
index b586e4f379..a7078f10ca 100644
--- a/app/assets/javascripts/discourse/templates/badges/show.hbs
+++ b/app/assets/javascripts/discourse/templates/badges/show.hbs
@@ -13,9 +13,9 @@
           <div class='grant-info-item'>
             {{i18n 'badges.allow_title'}}
             {{d-button
-                    class='btn btn-small pad-left no-text'
-                    action='toggleSetUserTitle'
-                    icon='pencil'}}
+              class="btn btn-default pad-left no-text"
+              action=(action "toggleSetUserTitle")
+              icon="pencil"}}
           </div>
         {{/if}}
         {{#if model.multiple_grant}}
@@ -29,14 +29,14 @@
     {{#if canSelectTitle}}
       <div class='badge-set-title {{if hiddenSetTitle 'hidden' ''}}'>
         {{badge-title selectableUserBadges=selectableUserBadges user=user}}
-        <button class='btn btn-default close-btn' {{action "toggleSetUserTitle"}}>{{i18n 'close'}}</button>
+        {{d-button class="btn-default close-btn" action=(action "toggleSetUserTitle") label="close"}}
       </div>
     {{/if}}
   </div>
 
   {{#if userBadges}}
     <div class="user-badges {{model.slug}}">
-      {{#load-more selector=".badge-info" action="loadMore"}}
+      {{#load-more selector=".badge-info" action=(action "loadMore")}}
       <div class="badges-granted">
         {{#each userBadges as |ub|}}
           {{#user-info user=ub.user size="medium" class="badge-info" date=ub.granted_at}}
diff --git a/app/assets/javascripts/discourse/templates/components/backup-codes.hbs b/app/assets/javascripts/discourse/templates/components/backup-codes.hbs
index 3eba35b680..c8ddb725be 100644
--- a/app/assets/javascripts/discourse/templates/components/backup-codes.hbs
+++ b/app/assets/javascripts/discourse/templates/components/backup-codes.hbs
@@ -2,7 +2,7 @@
   <textarea id="backupCodes" class="backup-codes-area" readonly>{{formattedBackupCodes}}</textarea>
 
   {{d-button
-    action="copyToClipboard"
+    action=(action "copyToClipboard")
     class="backup-codes-copy-btn"
     icon="copy"}}
 
diff --git a/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs
index 8f1a6bf16f..ec15b78c9b 100644
--- a/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs
@@ -1,8 +1,8 @@
 {{#conditional-loading-spinner condition=loading}}
   {{#if hasIncoming}}
   <div class="show-mores">
-    <div class='alert alert-info clickable' {{action "showInserted"}}>
-      <a tabindex="0" href="" {{action "showInserted"}}>
+    <div class='alert alert-info clickable' {{action showInserted}}>
+      <a tabindex="0" href="" {{action showInserted}}>
         {{count-i18n key="topic_count_" suffix="latest" count=incomingCount}}
       </a>
     </div>
diff --git a/app/assets/javascripts/discourse/templates/components/bulk-select-button.hbs b/app/assets/javascripts/discourse/templates/components/bulk-select-button.hbs
index 822c97b544..eca71a610a 100644
--- a/app/assets/javascripts/discourse/templates/components/bulk-select-button.hbs
+++ b/app/assets/javascripts/discourse/templates/components/bulk-select-button.hbs
@@ -1,5 +1,5 @@
 {{#if selected}}
   <div id='bulk-select'>
-    {{d-button class="btn-default" action="showBulkActions" icon="wrench"}}
+    {{d-button class="btn-default" action=(action "showBulkActions") icon="wrench"}}
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/color-picker.hbs b/app/assets/javascripts/discourse/templates/components/color-picker.hbs
index 65f280ab75..9832ffdf7d 100644
--- a/app/assets/javascripts/discourse/templates/components/color-picker.hbs
+++ b/app/assets/javascripts/discourse/templates/components/color-picker.hbs
@@ -1,5 +1,5 @@
 {{#each colors as |c|}}
-  {{#color-picker-choice color=c usedColors=usedColors selectColor="selectColor"}}
+  {{#color-picker-choice color=c usedColors=usedColors selectColor=(action "selectColor")}}
     {{d-icon 'check'}}
   {{/color-picker-choice}}
 {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/composer-action-title.hbs b/app/assets/javascripts/discourse/templates/components/composer-action-title.hbs
index 0019b1d179..71368b2713 100644
--- a/app/assets/javascripts/discourse/templates/components/composer-action-title.hbs
+++ b/app/assets/javascripts/discourse/templates/components/composer-action-title.hbs
@@ -5,6 +5,8 @@
     composerModel=model
     options=model.replyOptions
     canWhisper=canWhisper
+    openComposer=openComposer
+    closeComposer=closeComposer
     action=model.action
     tabindex=tabindex}}
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/composer-editor.hbs b/app/assets/javascripts/discourse/templates/components/composer-editor.hbs
index 1e99d9108a..ea68f8598e 100644
--- a/app/assets/javascripts/discourse/templates/components/composer-editor.hbs
+++ b/app/assets/javascripts/discourse/templates/components/composer-editor.hbs
@@ -2,18 +2,18 @@
   tabindex="4"
   value=composer.reply
   placeholder=replyPlaceholder
-  previewUpdated="previewUpdated"
+  previewUpdated=(action "previewUpdated")
   markdownOptions=markdownOptions
-  extraButtons="extraButtons"
-  importQuote="importQuote"
-  showUploadModal="showUploadModal"
-  togglePreview="togglePreview"
+  extraButtons=(action "extraButtons")
+  importQuote=(action "importQuote")
+  showUploadModal=showUploadModal
+  togglePreview=(action "togglePreview")
   validation=validation
   loading=composer.loading
   forcePreview=forcePreview
   showLink=showLink
   composerEvents=true
-  onExpandPopupMenuOptions="onExpandPopupMenuOptions"
+  onExpandPopupMenuOptions=(action "onExpandPopupMenuOptions")
   onPopupMenuAction=onPopupMenuAction
   popupMenuOptions=popupMenuOptions
   disabled=disableTextarea
diff --git a/app/assets/javascripts/discourse/templates/components/composer-messages.hbs b/app/assets/javascripts/discourse/templates/components/composer-messages.hbs
index 0048c0c4c9..dbb104f2e5 100644
--- a/app/assets/javascripts/discourse/templates/components/composer-messages.hbs
+++ b/app/assets/javascripts/discourse/templates/components/composer-messages.hbs
@@ -1,3 +1,3 @@
 {{#each messages as |message|}}
-  {{composer-message message=message closeMessage="closeMessage"}}
+  {{composer-message message=message closeMessage=(action "closeMessage")}}
 {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs b/app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs
index 0722426f16..62473a5a82 100644
--- a/app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs
+++ b/app/assets/javascripts/discourse/templates/components/composer-user-selector.hbs
@@ -1,6 +1,6 @@
 {{#if showSelector}}
   {{user-selector topicId=topicId
-                  onChangeCallback='triggerResize'
+                  onChangeCallback=(action "triggerResize") 
                   id="private-message-users"
                   includeMessageableGroups='true'
                   placeholderKey="composer.users_placeholder"
@@ -11,6 +11,6 @@
 {{else}}
   <div class='ac-wrap composer-user-selector-limited' {{action "toggleSelector"}}>
     <span>{{limitedUsernames}}</span>
-    <span class='btn-small btn-primary'>{{hiddenUsersCount}}</span>
+    <span class='btn btn-primary'>{{hiddenUsersCount}}</span>
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/d-editor-modal.hbs b/app/assets/javascripts/discourse/templates/components/d-editor-modal.hbs
index e84f470955..3f9638fc07 100644
--- a/app/assets/javascripts/discourse/templates/components/d-editor-modal.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-editor-modal.hbs
@@ -2,6 +2,6 @@
 {{yield}}
 
 <div class='controls'>
-  {{d-button class="btn-primary" label="composer.modal_ok" action="ok"}}
-  {{d-button class="btn-danger" label="composer.modal_cancel" action="cancel"}}
+  {{d-button class="btn-primary" label="composer.modal_ok" action=(action "ok")}}
+  {{d-button class="btn-danger" label="composer.modal_cancel" action=(action "cancel")}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/d-editor.hbs b/app/assets/javascripts/discourse/templates/components/d-editor.hbs
index fe677e8203..4391669a79 100644
--- a/app/assets/javascripts/discourse/templates/components/d-editor.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-editor.hbs
@@ -1,7 +1,7 @@
 <div class='d-editor-overlay hidden'></div>
 
 <div class='d-editor-modals'>
-  {{#d-editor-modal class="insert-link" hidden=insertLinkHidden okAction="insertLink"}}
+  {{#d-editor-modal class="insert-link" hidden=insertLinkHidden okAction=(action "insertLink")}}
     <h3>{{i18n "composer.link_dialog_title"}}</h3>
     {{text-field value=linkUrl placeholderKey="composer.link_url_placeholder" class="link-url"}}
     {{text-field value=linkText placeholderKey="composer.link_optional_text" class="link-text"}}
diff --git a/app/assets/javascripts/discourse/templates/components/d-modal.hbs b/app/assets/javascripts/discourse/templates/components/d-modal.hbs
index f9b339428a..374868f5e8 100644
--- a/app/assets/javascripts/discourse/templates/components/d-modal.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-modal.hbs
@@ -4,7 +4,9 @@
       <div class="modal-header">
         {{#if dismissable}}
           <div class='modal-close'>
-            <a class="close" {{action closeModal}}>{{d-icon "times"}}</a>
+            <a class="close" href {{action closeModal}}>
+              {{d-icon "times"}}
+            </a>
           </div>
         {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/components/desktop-notification-config.hbs b/app/assets/javascripts/discourse/templates/components/desktop-notification-config.hbs
index bb94b11c99..a0d595707f 100644
--- a/app/assets/javascripts/discourse/templates/components/desktop-notification-config.hbs
+++ b/app/assets/javascripts/discourse/templates/components/desktop-notification-config.hbs
@@ -2,14 +2,14 @@
   {{d-button icon="bell-slash" class="btn-default" label="user.desktop_notifications.not_supported" disabled="true"}}
 {{/if}}
 {{#if isDeniedPermission}}
-  {{d-button icon="bell-slash" class="btn-default"  label="user.desktop_notifications.perm_denied_btn" action="recheckPermission" disabled='true'}}
+  {{d-button icon="bell-slash" class="btn-default"  label="user.desktop_notifications.perm_denied_btn" action=(action "recheckPermission") disabled='true'}}
   {{i18n "user.desktop_notifications.perm_denied_expl"}}
 {{else}}
   {{#if isEnabled}}
-    {{d-button icon="bell-slash-o" class="btn-default"  label="user.desktop_notifications.disable" action="turnoff"}}
+    {{d-button icon="bell-slash-o" class="btn-default"  label="user.desktop_notifications.disable" action=(action "turnoff")}}
     {{i18n "user.desktop_notifications.currently_enabled"}}
   {{else}}
-    {{d-button icon="bell-o" class="btn-default" label="user.desktop_notifications.enable" action="turnon"}}
+    {{d-button icon="bell-o" class="btn-default" label="user.desktop_notifications.enable" action=(action "turnon")}}
     {{i18n "user.desktop_notifications.currently_disabled"}}
   {{/if}}
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
index 96c88d76a2..c9f50287bc 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
@@ -31,7 +31,7 @@
       {{/if}}
       {{#if category.topic_url}}
         <br>
-        {{d-button class="btn-small" action="showCategoryTopic" icon="pencil" label="category.change_in_category_topic"}}
+        {{d-button class="btn-default" action=(action "showCategoryTopic") icon="pencil" label="category.change_in_category_topic"}}
       {{/if}}
     </section>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-images.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-images.hbs
index 56e2debffd..f84d3e88a1 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-images.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-images.hbs
@@ -1,16 +1,18 @@
 <section class='field'>
   <label>{{i18n 'category.logo'}}</label>
   {{image-uploader
-      imageId=logoImageId
-      imageUrl=logoImageUrl
-      type="category_logo"
-      class="no-repeat contain-image"}}
+    imageUrl=logoImageUrl
+    onUploadDone=(action "logoUploadDone")
+    onUploadDeleted=(action "logoUploadDeleted")
+    type="category_logo"
+    class="no-repeat contain-image"}}
 </section>
 
 <section class='field'>
   <label>{{i18n 'category.background_image'}}</label>
   {{image-uploader
-      imageId=backgroundImageId
-      imageUrl=backgroundImageUrl
-      type="category_background"}}
+    imageUrl=backgroundImageUrl
+    onUploadDone=(action "backgroundUploadDone")
+    onUploadDeleted=(action "backgroundUploadDeleted")
+    type="category_background"}}
 </section>
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
index dec825ae6a..e454439156 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
@@ -26,13 +26,13 @@
                   nameProperty="description"
                   content=category.availablePermissions
                   value=selectedPermission}}
-      <button {{action "addPermission" selectedGroup selectedPermission}} class="btn btn-small add-permission">
+      <button {{action "addPermission" selectedGroup selectedPermission}} class="btn btn-default add-permission">
         {{i18n 'category.add_permission'}}
       </button>
     {{/if}}
   {{else}}
     {{#unless category.is_special}}
-      <button {{action "editPermissions"}} class="btn btn-default btn-small edit-permission">{{i18n 'category.edit_permissions'}}</button>
+      <button {{action "editPermissions"}} class="btn btn-default btn-default edit-permission">{{i18n 'category.edit_permissions'}}</button>
     {{/unless}}
   {{/if}}
 </section>
diff --git a/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
index 5f05fe132c..ef3b6fe87a 100644
--- a/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
@@ -1,7 +1,7 @@
 {{#if visible}}
   <div class="card-content">
     <div class="group-card-avatar">
-      <a href={{groupPath}} {{action "showGroup"}} class="card-huge-avatar">
+      <a href={{groupPath}} {{action "showGroup" group}} class="card-huge-avatar">
         {{avatar-flair
           flairURL=group.flair_url
           flairBgColor=group.flair_bg_color
@@ -13,7 +13,7 @@
     <div class="names">
       <span>
         <h1 class="{{ group.name }}">
-          <a href={{groupPath}} {{action "showGroup"}}>{{ group.name }}</a>
+          <a href={{groupPath}} {{action "showGroup" group}}>{{ group.name }}</a>
         </h1>
         {{#if group.full_name}}
           <h2 class='full-name'>{{group.full_name}}</h2>
@@ -26,11 +26,11 @@
     <div class="usercard-controls group-details-button">
       {{group-membership-button
         model=group
-        showLogin='showLogin'}}
+        showLogin=(route-action "showLogin")}}
 
       {{#if group.messageable}}
         {{d-button
-          action="messageGroup"
+          action=(action "messageGroup")
           class="btn-primary group-message-button inline"
           icon="envelope"
           label="groups.message"}}
@@ -63,7 +63,7 @@
           <a href={{user.path}} {{action "showUser" user}} class="card-tiny-avatar">{{bound-avatar user "tiny"}}</a>
         {{/each}}
         {{#if showMoreMembers}}
-          <a href={{groupPath}} {{action "showGroup"}}>+{{ moreMembersCount }} {{i18n "more"}}</a>
+          <a href={{groupPath}} {{action "showGroup" group}}>+{{ moreMembersCount }} {{i18n "more"}}</a>
         {{/if}}
       </span>
     </div>
diff --git a/app/assets/javascripts/discourse/templates/components/group-manage-logs-filter.hbs b/app/assets/javascripts/discourse/templates/components/group-manage-logs-filter.hbs
index 1625fa5fc9..f4c4ef7a93 100644
--- a/app/assets/javascripts/discourse/templates/components/group-manage-logs-filter.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-manage-logs-filter.hbs
@@ -1,5 +1,5 @@
 {{#if value}}
-  {{#d-button class="btn-small group-manage-logs-filter" action="clearFilter" actionParam=type}}
+  {{#d-button class="btn-default group-manage-logs-filter" action=(action "clearFilter") actionParam=type}}
     <span>{{label}}</span>: {{filterText}}
     {{d-icon "times-circle"}}
   {{/d-button}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-manage-logs-row.hbs b/app/assets/javascripts/discourse/templates/components/group-manage-logs-row.hbs
index da955686e1..d7754b460c 100644
--- a/app/assets/javascripts/discourse/templates/components/group-manage-logs-row.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-manage-logs-row.hbs
@@ -1,6 +1,6 @@
 <tr class="group-manage-logs-row">
   <td>
-    {{#d-button class="btn-small" action="filter" actionParam=(hash value=log.action key="action")}}
+    {{#d-button class="btn-default" action=(action "filter") actionParam=(hash value=log.action key="action")}}
       {{log.actionTitle}}
     {{/d-button}}
   </td>
@@ -8,7 +8,7 @@
   <td>
     <span>{{avatar log.acting_user imageSize='tiny'}}</span>
 
-    {{#d-button class="btn-small" action="filter" actionParam=(hash value=log.acting_user.username key="acting_user")}}
+    {{#d-button class="btn-default" action=(action "filter") actionParam=(hash value=log.acting_user.username key="acting_user")}}
       {{log.acting_user.username}}
     {{/d-button}}
   </td>
@@ -17,7 +17,7 @@
     {{#if log.target_user}}
       <span>{{avatar log.target_user imageSize='tiny'}}</span>
 
-      {{#d-button class="btn-small" action="filter" actionParam=(hash value=log.target_user.username key="target_user")}}
+      {{#d-button class="btn-default" action=(action "filter") actionParam=(hash value=log.target_user.username key="target_user")}}
         {{log.target_user.username}}
       {{/d-button}}
     {{/if}}
@@ -25,7 +25,7 @@
 
   <td>
     {{#if log.subject}}
-      {{#d-button class="btn-small" action="filter" actionParam=(hash value=log.subject key="subject")}}
+      {{#d-button class="btn-default" action=(action "filter") actionParam=(hash value=log.subject key="subject")}}
         {{log.subject}}
       {{/d-button}}
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-manage-save-button.hbs b/app/assets/javascripts/discourse/templates/components/group-manage-save-button.hbs
index 0276ac16e5..6c7afbab65 100644
--- a/app/assets/javascripts/discourse/templates/components/group-manage-save-button.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-manage-save-button.hbs
@@ -1,5 +1,5 @@
 <div class='control-group buttons'>
-  {{#d-button action="save"
+  {{#d-button action=(action "save")
       disabled=saving
       class='btn btn-primary group-manage-save'}}
 
diff --git a/app/assets/javascripts/discourse/templates/components/group-members-input.hbs b/app/assets/javascripts/discourse/templates/components/group-members-input.hbs
index 036bf9b1ca..73c5820a85 100644
--- a/app/assets/javascripts/discourse/templates/components/group-members-input.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-members-input.hbs
@@ -8,7 +8,7 @@
   </div>
   <div class="ac-wrap clearfix">
     {{#each model.members as |member|}}
-      {{group-member member=member automatic=model.automatic removeAction="removeMember"}}
+      {{group-member member=member automatic=model.automatic removeAction=(action "removeMember")}}
     {{/each}}
   </div>
 {{/if}}
@@ -20,7 +20,7 @@
           id="member-selector"}}
 
     {{#if addButton}}
-      {{d-button action="addMembers"
+      {{d-button action=(action "addMembers")
           class="add"
           icon="plus"
           disabled=disableAddButton
diff --git a/app/assets/javascripts/discourse/templates/components/group-membership-button.hbs b/app/assets/javascripts/discourse/templates/components/group-membership-button.hbs
index a76aeb27bd..523d9ebf31 100644
--- a/app/assets/javascripts/discourse/templates/components/group-membership-button.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-membership-button.hbs
@@ -1,17 +1,17 @@
 {{#if canJoinGroup}}
-  {{d-button action="joinGroup"
+  {{d-button action=(action "joinGroup")
       class="group-index-join"
       icon="user-plus"
       label="groups.join"
       disabled=updatingMembership}}
 {{else if canLeaveGroup}}
-  {{d-button action="leaveGroup"
+  {{d-button action=(action "leaveGroup")
       class="btn-danger group-index-leave"
       icon="user-times"
       label="groups.leave"
       disabled=updatingMembership}}
 {{else if canRequestMembership}}
-  {{d-button action="showRequestMembershipForm"
+  {{d-button action=(action "showRequestMembershipForm")
       class="group-index-request"
       disabled=loading
       icon="user-plus"
diff --git a/app/assets/javascripts/discourse/templates/components/login-buttons.hbs b/app/assets/javascripts/discourse/templates/components/login-buttons.hbs
index cc950944ec..d8efc3b7e5 100644
--- a/app/assets/javascripts/discourse/templates/components/login-buttons.hbs
+++ b/app/assets/javascripts/discourse/templates/components/login-buttons.hbs
@@ -1,5 +1,5 @@
 {{#each buttons as |b|}}
-  <button class="btn btn-social {{b.name}}" {{action "externalLogin" b}}>
+  <button class="btn btn-social {{b.name}}" {{action externalLogin b}}>
     {{#if b.hasRegularIcon}}
       {{d-icon b.name}}
     {{else}}
@@ -11,7 +11,7 @@
 
 {{#if showLoginWithEmailLink}}
   {{d-button
-    action="emailLogin"
+    action=emailLogin
     label="email_login.button_label"
     disabled=processingEmailLink
     icon="far-envelope"
diff --git a/app/assets/javascripts/discourse/templates/components/modal-footer-close.hbs b/app/assets/javascripts/discourse/templates/components/modal-footer-close.hbs
index a1e59ab16b..8b21792616 100644
--- a/app/assets/javascripts/discourse/templates/components/modal-footer-close.hbs
+++ b/app/assets/javascripts/discourse/templates/components/modal-footer-close.hbs
@@ -1,3 +1,3 @@
 <div class="modal-footer">
-  <button class='btn btn-primary' {{action closeModal}}>{{i18n 'close'}}</button>
+  {{d-button class="btn btn-primary" action=(route-action "closeModal") label="close"}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/queued-post.hbs b/app/assets/javascripts/discourse/templates/components/queued-post.hbs
index 99162937d1..285337ea4b 100644
--- a/app/assets/javascripts/discourse/templates/components/queued-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/queued-post.hbs
@@ -57,34 +57,34 @@
 
     <div class='queue-controls'>
       {{#if editing}}
-        {{d-button action="confirmEdit"
+        {{d-button action=(action "confirmEdit")
                    label="queue.confirm"
                    disabled=post.isSaving
                    class="btn-primary confirm"}}
-        {{d-button action="cancelEdit"
+        {{d-button action=(action "cancelEdit")
                    label="queue.cancel"
                    icon="times"
                    disabled=post.isSaving
                    class="btn-danger cancel"}}
       {{else}}
-        {{d-button action="approve"
+        {{d-button action=(action "approve")
                    disabled=post.isSaving
                    label="queue.approve"
                    icon="check"
                    class="btn-primary approve"}}
-        {{d-button action="reject"
+        {{d-button action=(action "reject")
                    disabled=post.isSaving
                    label="queue.reject"
                    icon="times"
                    class="btn-danger reject"}}
         {{#if post.can_delete_user}}
-          {{d-button action="deleteUser"
+          {{d-button action=(action "deleteUser")
                      disabled=post.isSaving
                      label="queue.delete_user"
                      icon="trash"
                      class="btn-danger delete-user"}}
         {{/if}}
-        {{d-button action="edit"
+        {{d-button action=(action "edit")
                    disabled=post.isSaving
                    label="queue.edit"
                    icon="pencil"
diff --git a/app/assets/javascripts/discourse/templates/components/second-factor-form.hbs b/app/assets/javascripts/discourse/templates/components/second-factor-form.hbs
index c463fd5e6c..d0d7beb42b 100644
--- a/app/assets/javascripts/discourse/templates/components/second-factor-form.hbs
+++ b/app/assets/javascripts/discourse/templates/components/second-factor-form.hbs
@@ -6,7 +6,7 @@
     <p>
       {{discourse-linked-text
         class="toggle-second-factor-method"
-        action="toggleSecondFactorMethod"
+        action=(action "toggleSecondFactorMethod")
         text=linkText}}
     </p>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/share-popup.hbs b/app/assets/javascripts/discourse/templates/components/share-popup.hbs
index ad3dc852dd..eb8aa968f8 100644
--- a/app/assets/javascripts/discourse/templates/components/share-popup.hbs
+++ b/app/assets/javascripts/discourse/templates/components/share-popup.hbs
@@ -10,7 +10,7 @@
 </div>
 
 {{#each sources as |s|}}
-  {{share-source source=s title=model.title action="share"}}
+  {{share-source source=s title=model.title action=(action "share")}}
 {{/each}}
 
 {{#if topic.details.can_reply_as_new_topic}}
diff --git a/app/assets/javascripts/discourse/templates/components/signup-cta.hbs b/app/assets/javascripts/discourse/templates/components/signup-cta.hbs
index 8ee2d5b1aa..1498e7b005 100644
--- a/app/assets/javascripts/discourse/templates/components/signup-cta.hbs
+++ b/app/assets/javascripts/discourse/templates/components/signup-cta.hbs
@@ -8,8 +8,8 @@
     <p>{{replace-emoji (i18n "signup_cta.value_prop")}}</p>
 
     <div class="buttons">
-      {{d-button action="showCreateAccount" label="signup_cta.sign_up" icon="check" class="btn-primary"}}
-      {{d-button action="hideForSession" label="signup_cta.hide_session" class="no-icon"}}
+      {{d-button action=(route-action "showCreateAccount") label="signup_cta.sign_up" icon="check" class="btn-primary"}}
+      {{d-button action=(action "hideForSession") label="signup_cta.hide_session" class="no-icon"}}
       <a {{action "neverShow"}}>{{i18n "signup_cta.hide_forever"}}</a>
     </div>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/top-period-buttons.hbs b/app/assets/javascripts/discourse/templates/components/top-period-buttons.hbs
index 99d57408a6..a9686092d9 100644
--- a/app/assets/javascripts/discourse/templates/components/top-period-buttons.hbs
+++ b/app/assets/javascripts/discourse/templates/components/top-period-buttons.hbs
@@ -1,5 +1,5 @@
 {{#each periods as |p|}}
-  {{#d-button action="changePeriod" class="btn-default" actionParam=p}}
+  {{#d-button action=(action "changePeriod") class="btn-default" actionParam=p}}
     {{period-title p}}
   {{/d-button}}
 {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/topic-entrance.hbs b/app/assets/javascripts/discourse/templates/components/topic-entrance.hbs
index 377fa0fed4..7b7fb58b8b 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-entrance.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-entrance.hbs
@@ -1,7 +1,7 @@
-{{#d-button action="enterTop" class="full jump-top"}}
+{{#d-button action=(action "enterTop") class="full jump-top"}}
   {{d-icon 'step-backward'}} {{{topDate}}}
 {{/d-button}}
 
-{{#d-button action="enterBottom" class="full jump-bottom"}}
+{{#d-button action=(action "enterBottom") class="full jump-bottom"}}
   {{{bottomDate}}} {{d-icon 'step-forward'}}
 {{/d-button}}
diff --git a/app/assets/javascripts/discourse/templates/components/topic-progress.hbs b/app/assets/javascripts/discourse/templates/components/topic-progress.hbs
index e368600dda..ab4ea02ff4 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-progress.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-progress.hbs
@@ -4,7 +4,7 @@
 
 {{#if showBackButton}}
   <div class='progress-back-container'>
-    {{d-button label="topic.timeline.back" class="btn-primary progress-back" action="goBack" icon="arrow-down"}}
+    {{d-button label="topic.timeline.back" class="btn-primary progress-back" action=(action "goBack") icon="arrow-down"}}
   </div>
 {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
index 82f4c3d9bf..0ee844d9d4 100644
--- a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
@@ -44,7 +44,7 @@
         <li class='compose-pm'>
           {{d-button
             class="btn-primary"
-            action=(action "composePrivateMessage" user post)
+            action=(route-action "composePrivateMessage" user post)
             icon="envelope"
             label="user.private_message"}}
         </li>
@@ -63,7 +63,7 @@
       {{#if hasUserFilters}}
         <li>
           {{d-button
-            action="cancelFilter"
+            action=(action "cancelFilter")
             icon="times"
             label="topic.filters.cancel"}}
         </li>
@@ -73,7 +73,8 @@
         <li>
           {{d-button
             class="btn-danger"
-            action=(action "deleteUser" user)
+            action=(action "deleteUser")
+            actionParam=user
             icon="exclamation-triangle"
             label="admin.user.delete"}}
         </li>
@@ -136,7 +137,7 @@
               {{#if user.email}}
                 {{user.email}}
               {{else}}
-                {{d-button action="checkEmail" actionParam=user icon="envelope-o" label="admin.users.check_email.text" class="btn-primary"}}
+                {{d-button action=(action "checkEmail") actionParam=user icon="envelope-o" label="admin.users.check_email.text" class="btn-primary"}}
               {{/if}}
             </h3>
           {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index 4055f0e51a..a9c1275188 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -1,14 +1,14 @@
 {{#composer-body composer=model
                  showPreview=showPreview
-                 openIfDraft="openIfDraft"
-                 typed="typed"
-                 cancelled="cancelled"
-                 save="save"}}
+                 openIfDraft=(action "openIfDraft")
+                 typed=(action "typed")
+                 cancelled=(action "cancelled")
+                 save=(action "save")}}
 
   {{#if visible}}
       {{composer-messages composer=model
                           messageCount=messageCount
-                          addLinkLookup="addLinkLookup"}}
+                          addLinkLookup=(action "addLinkLookup")}}
       {{#if model.viewOpenOrFullscreen}}
         <div class="reply-area {{if canEditTags 'with-tags'}}">
           <div class='composer-fields'>
@@ -16,7 +16,12 @@
             <div class='reply-to'>
               {{#unless model.viewFullscreen}}
                 <div class="reply-details">
-                  {{composer-action-title model=model canWhisper=canWhisper tabindex=8}}
+                  {{composer-action-title
+                    model=model
+                    openComposer=(action "openComposer")
+                    closeComposer=(action "closeComposer")
+                    canWhisper=canWhisper
+                    tabindex=8}}
                   {{plugin-outlet name="composer-action-after" noTags=true args=(hash model=model)}}
 
                   {{#unless site.mobileView}}
@@ -91,8 +96,9 @@
                             composer=model
                             lastValidatedAt=lastValidatedAt
                             canWhisper=canWhisper
-                            storeToolbarState="storeToolbarState"
+                            storeToolbarState=(action "storeToolbarState")
                             onPopupMenuAction=(action "onPopupMenuAction")
+                            showUploadModal=(route-action "showUploadSelector")
                             popupMenuOptions=popupMenuOptions
                             draftStatus=model.draftStatus
                             isUploading=isUploading
@@ -102,11 +108,10 @@
                             uploadProgress=uploadProgress
                             groupsMentioned="groupsMentioned"
                             cannotSeeMention="cannotSeeMention"
-                            importQuote="importQuote"
-                            togglePreview="togglePreview"
+                            importQuote=(action "importQuote")
+                            togglePreview=(action "togglePreview")
                             showToolbar=showToolbar
-                            showUploadSelector="showUploadSelector"
-                            afterRefresh="afterRefresh"}}
+                            afterRefresh=(action "afterRefresh")}}
 
           <div class='submit-panel'>
             {{plugin-outlet name="composer-fields-below" args=(hash model=model)}}
@@ -169,7 +174,7 @@
                 {{/if}}
 
                 {{#if showPreview}}
-                  {{d-button action='togglePreview' class='hide-preview' label='composer.hide_preview'}}
+                  {{d-button action=(action "togglePreview") class="hide-preview" label="composer.hide_preview"}}
                 {{/if}}
               {{else}}
                 <a href {{action "togglePreview"}} class='toggle-preview'>{{{toggleText}}}</a>
diff --git a/app/assets/javascripts/discourse/templates/discovery/categories.hbs b/app/assets/javascripts/discourse/templates/discovery/categories.hbs
index ae53e4cc78..907b8646c4 100644
--- a/app/assets/javascripts/discourse/templates/discovery/categories.hbs
+++ b/app/assets/javascripts/discourse/templates/discovery/categories.hbs
@@ -1,4 +1,4 @@
-{{#discovery-categories refresh="refresh"}}
+{{#discovery-categories refresh=refresh}}
   {{component categoryPageStyle
               categories=model.categories
               latestTopicOnly=latestTopicOnly
diff --git a/app/assets/javascripts/discourse/templates/discovery/topics.hbs b/app/assets/javascripts/discourse/templates/discovery/topics.hbs
index 5b1ad516a5..a2d09bb8cc 100644
--- a/app/assets/javascripts/discourse/templates/discovery/topics.hbs
+++ b/app/assets/javascripts/discourse/templates/discovery/topics.hbs
@@ -24,12 +24,12 @@
     discoveryList=true}}
 {{/if}}
 
-{{bulk-select-button selected=selected action="refresh" category=category}}
+{{bulk-select-button selected=selected action=(action "refresh") category=category}}
 
-{{#discovery-topics-list model=model refresh="refresh" incomingCount=topicTrackingState.incomingCount}}
+{{#discovery-topics-list model=model refresh=(action "refresh") incomingCount=topicTrackingState.incomingCount}}
   {{#if top}}
     <div class='top-lists'>
-      {{period-chooser period=period action="changePeriod"}}
+      {{period-chooser period=period action=(action "changePeriod")}}
     </div>
   {{else}}
     {{#if topicTrackingState.hasIncoming}}
@@ -50,8 +50,8 @@
       showTopicPostBadges=showTopicPostBadges
       showPosters=true
       canBulkSelect=canBulkSelect
-      changeSort="changeSort"
-      toggleBulkSelect="toggleBulkSelect"
+      changeSort=(action "changeSort")
+      toggleBulkSelect=(action "toggleBulkSelect")
       hideCategory=model.hideCategory
       order=order
       ascending=ascending
@@ -81,7 +81,7 @@
         {{#if canCreateTopicOnCategory}}<a href {{action "createTopic"}}>{{i18n 'topic.suggest_create_topic'}}</a>.{{/if}}
       {{else if top}}
         {{#link-to "discovery.categories"}}{{i18n 'topic.browse_all_categories'}}{{/link-to}}, {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}} {{i18n 'or'}} {{i18n 'filters.top.other_periods'}}.
-        {{top-period-buttons period=period action="changePeriod"}}
+        {{top-period-buttons period=period action=(action "changePeriod")}}
       {{else}}
         {{#link-to "discovery.categories"}} {{i18n 'topic.browse_all_categories'}}{{/link-to}} {{i18n 'or'}} {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}}.
       {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs
index 2d62a72314..17f9c137a5 100644
--- a/app/assets/javascripts/discourse/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs
@@ -4,8 +4,8 @@
   <div class="search-advanced">
     {{#unless site.mobileView}}
       <div class="search-bar">
-        {{search-text-field value=searchTerm class="full-page-search search no-blur search-query" action="search" hasAutofocus=hasAutofocus}}
-        {{d-button action="search" icon="search" class="btn-primary search-cta" disabled=searching}}
+        {{search-text-field value=searchTerm class="full-page-search search no-blur search-query" enter=(action "search") hasAutofocus=hasAutofocus}}
+        {{d-button action=(action "search") icon="search" class="btn-primary search-cta" disabled=searching}}
       </div>
     {{/unless}}
 
@@ -34,8 +34,8 @@
         {{/if}}
 
         {{#if canBulkSelect}}
-          {{d-button icon="list" class="btn-default bulk-select" title="topics.bulk.toggle" action="toggleBulkSelect"}}
-          {{bulk-select-button selected=selected action="search"}}
+          {{d-button icon="list" class="btn-default bulk-select" title="topics.bulk.toggle" action=(action "toggleBulkSelect")}}
+          {{bulk-select-button selected=selected action=(action "search")}}
         {{/if}}
 
         {{#if bulkSelectEnabled}}
@@ -62,7 +62,7 @@
    {{plugin-outlet name="full-page-search-below-search-info" args=(hash search=searchTerm)}}
 
     <div class="search-results">
-      {{#load-more selector=".fps-result" action="loadMore"}}
+      {{#load-more selector=".fps-result" action=(action "loadMore")}}
         {{#each model.posts as |result|}}
           <div class='fps-result'>
             <div class='author'>
@@ -163,8 +163,8 @@
   <div class="search-advanced-sidebar">
     {{#if site.mobileView}}
       <div class="search-bar">
-        {{search-text-field value=searchTerm class="full-page-search search no-blur search-query" action="search" hasAutofocus=hasAutofocus}}
-        {{d-button action="search" icon="search" class="btn-primary search-cta" disabled=searching}}
+        {{search-text-field value=searchTerm class="full-page-search search no-blur search-query" enter=(action "search") hasAutofocus=hasAutofocus}}
+        {{d-button action=(action "search") icon="search" class="btn-primary search-cta" disabled=searching}}
       </div>
     {{/if}}
 
@@ -190,7 +190,7 @@
 
         {{d-button
           label="submit"
-          action="search"
+          action=(action "search")
           icon="search"
           class="btn-primary search-cta"
           disabled=searching}}
diff --git a/app/assets/javascripts/discourse/templates/group-activity-posts.hbs b/app/assets/javascripts/discourse/templates/group-activity-posts.hbs
index 7599c31cf2..f134929e6c 100644
--- a/app/assets/javascripts/discourse/templates/group-activity-posts.hbs
+++ b/app/assets/javascripts/discourse/templates/group-activity-posts.hbs
@@ -1,4 +1,4 @@
-{{#load-more selector=".user-stream-item" action="loadMore"}}
+{{#load-more selector=".user-stream-item" action=(action "loadMore")}}
   <div class="user-stream">
     {{#each model as |post|}}
       {{group-post post=post class="user-stream-item item"}}
diff --git a/app/assets/javascripts/discourse/templates/group-activity-topics.hbs b/app/assets/javascripts/discourse/templates/group-activity-topics.hbs
index 7e87f59d09..596ddb1941 100644
--- a/app/assets/javascripts/discourse/templates/group-activity-topics.hbs
+++ b/app/assets/javascripts/discourse/templates/group-activity-topics.hbs
@@ -1,4 +1,4 @@
-{{#load-more class="paginated-topics-list" selector=".paginated-topics-list .topic-list tr" action="loadMore"}}
+{{#load-more class="paginated-topics-list" selector=".paginated-topics-list .topic-list tr" action=(action "loadMore")}}
   {{basic-topic-list topicList=model
                      showPosters=true}}
   {{conditional-loading-spinner condition=model.loadingMore}}
diff --git a/app/assets/javascripts/discourse/templates/group-index.hbs b/app/assets/javascripts/discourse/templates/group-index.hbs
index 1a22155139..2b3aeda63c 100644
--- a/app/assets/javascripts/discourse/templates/group-index.hbs
+++ b/app/assets/javascripts/discourse/templates/group-index.hbs
@@ -6,12 +6,12 @@
   <div class="group-members-manage">
     {{#if canManageGroup}}
       {{d-button icon="plus"
-      action="showAddMembersModal"
+      action=(route-action "showAddMembersModal")
       label="groups.add_members.title"
       class="group-members-add"}}
       {{#if currentUser.admin}}
         {{d-button icon="plus"
-        action="showBulkAddModal"
+        action=(route-action "showBulkAddModal")
         label="admin.groups.bulk_add.title"
         class="group-bulk-add"}}
       {{/if}}
@@ -20,7 +20,7 @@
 </div>
 
 {{#if hasMembers}}
-  {{#load-more selector=".group-members tr" action="loadMore"}}
+  {{#load-more selector=".group-members tr" action=(action "loadMore")}}
     <table class='group-members'>
       <thead>
         {{group-index-toggle order=order desc=desc field='username_lower' i18nKey='username'}}
@@ -58,9 +58,9 @@
             <td>
               {{#if canManageGroup}}
                 {{group-member-dropdown
-                    removeMember="removeMember"
-                    makeOwner="makeOwner"
-                    removeOwner="removeOwner"
+                    removeMember=(action "removeMember")
+                    makeOwner=(action "makeOwner")
+                    removeOwner=(action "removeOwner")
                     member=m}}
               {{/if}}
             </td>
diff --git a/app/assets/javascripts/discourse/templates/group.hbs b/app/assets/javascripts/discourse/templates/group.hbs
index ffd45ca15a..669221a852 100644
--- a/app/assets/javascripts/discourse/templates/group.hbs
+++ b/app/assets/javascripts/discourse/templates/group.hbs
@@ -34,18 +34,18 @@
       {{group-membership-button
           class="inline"
           model=model
-          showLogin='showLogin'}}
+          showLogin=(route-action  "showLogin")}}
 
       {{#if displayGroupMessageButton}}
         {{d-button
-            action="messageGroup"
+            action=(action "messageGroup")
             class="btn-primary group-message-button inline"
             icon="envelope"
             label="groups.message"}}
       {{/if}}
 
       {{#if currentUser.admin}}
-        {{d-button action="destroy"
+        {{d-button action=(action "destroy")
             disabled=destroying
             icon="trash"
             class='btn-danger'
diff --git a/app/assets/javascripts/discourse/templates/group/manage/logs.hbs b/app/assets/javascripts/discourse/templates/group/manage/logs.hbs
index d21a3a98ae..96ee61cd8d 100644
--- a/app/assets/javascripts/discourse/templates/group/manage/logs.hbs
+++ b/app/assets/javascripts/discourse/templates/group/manage/logs.hbs
@@ -1,12 +1,12 @@
 {{#if model.logs}}
   <div class="group-manage-logs-controls">
-    {{group-manage-logs-filter clearFilter="clearFilter" value=filters.action type="action"}}
-    {{group-manage-logs-filter clearFilter="clearFilter" value=filters.acting_user type="acting_user"}}
-    {{group-manage-logs-filter clearFilter="clearFilter" value=filters.target_user type="target_user"}}
-    {{group-manage-logs-filter clearFilter="clearFilter" value=filters.subject type="subject"}}
+    {{group-manage-logs-filter clearFilter=(action "clearFilter") value=filters.action type="action"}}
+    {{group-manage-logs-filter clearFilter=(action "clearFilter") value=filters.acting_user type="acting_user"}}
+    {{group-manage-logs-filter clearFilter=(action "clearFilter") value=filters.target_user type="target_user"}}
+    {{group-manage-logs-filter clearFilter=(action "clearFilter") value=filters.subject type="subject"}}
   </div>
 
-  {{#load-more selector=".group-manage-logs .group-manage-logs-row" action="loadMore"}}
+  {{#load-more selector=".group-manage-logs .group-manage-logs-row" action=(action "loadMore")}}
     <table class="group-manage-logs">
       <thead>
         <th>{{i18n 'groups.manage.logs.action'}}</th>
diff --git a/app/assets/javascripts/discourse/templates/groups/index.hbs b/app/assets/javascripts/discourse/templates/groups/index.hbs
index 7581ca5c02..52f738a019 100644
--- a/app/assets/javascripts/discourse/templates/groups/index.hbs
+++ b/app/assets/javascripts/discourse/templates/groups/index.hbs
@@ -1,7 +1,7 @@
 {{#d-section pageClass="groups"}}
   <div class="groups-header">
     {{#if currentUser.admin}}
-      {{d-button action="new"
+      {{d-button action=(action "new")
           class="btn-default groups-header-new pull-right"
           icon="plus"
           label="admin.groups.new.title"}}
@@ -23,7 +23,7 @@
 
   {{#if model}}
     {{#conditional-loading-spinner condition=model.loading}}
-      {{#load-more selector=".groups-table .groups-table-row" action="loadMore"}}
+      {{#load-more selector=".groups-table .groups-table-row" action=(action "loadMore")}}
         <div class='container'>
           <table class="groups-table">
             <thead>
@@ -82,7 +82,7 @@
                       </span>
                     {{/if}}
 
-                    {{group-membership-button tagName='' model=group showLogin='showLogin'}}
+                    {{group-membership-button tagName='' model=group showLogin=(route-action "showLogin")}}
                   </td>
                 </tr>
               {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/groups/new.hbs b/app/assets/javascripts/discourse/templates/groups/new.hbs
index 2501e0be9f..270badf6c2 100644
--- a/app/assets/javascripts/discourse/templates/groups/new.hbs
+++ b/app/assets/javascripts/discourse/templates/groups/new.hbs
@@ -28,7 +28,7 @@
     {{groups-form-interaction-fields model=model}}
 
     <div class='control-group buttons'>
-      {{d-button action="save"
+      {{d-button action=(action "save")
           disabled=saving
           class='btn btn-primary group-form-save'
           label="admin.groups.new.create"}}
diff --git a/app/assets/javascripts/discourse/templates/invites/show.hbs b/app/assets/javascripts/discourse/templates/invites/show.hbs
index 65c775087b..e8877238d3 100644
--- a/app/assets/javascripts/discourse/templates/invites/show.hbs
+++ b/app/assets/javascripts/discourse/templates/invites/show.hbs
@@ -8,13 +8,12 @@
     </div>
 
     <div class="col-form">
-      <p>{{i18n 'invites.invited_by'}}</p>
-
-      <p>{{user-info user=invitedBy}}</p>
-
       {{#if successMessage}}
-        <p>{{successMessage}}</p>
+        <br/><br/>
+        <div class='alert alert-info'><p>{{{successMessage}}}</p></div>
       {{else}}
+        <p>{{i18n 'invites.invited_by'}}</p>
+        <p>{{user-info user=invitedBy}}</p>
 
         <p>{{{yourEmailMessage}}}
         {{#if externalAuthsEnabled}}
@@ -63,7 +62,6 @@
             <br/><br/>
             <div class='alert alert-error'>{{errorMessage}}</div>
           {{/if}}
-
         </form>
       {{/if}}
     </div>
diff --git a/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs b/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs
index d0b1077dd4..5b45e1b45d 100644
--- a/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs
@@ -17,25 +17,25 @@
     {{~raw "topic-status" topic=topic}}
     {{~topic-link topic class="raw-link raw-topic-link"}}
     {{~#if topic.featured_link}}
-      {{~topic-featured-link topic}}
+    {{~topic-featured-link topic}}
     {{~/if}}
     {{~raw-plugin-outlet name="topic-list-after-title"}}
     {{~#if showTopicPostBadges}}
-      {{~raw "topic-post-badges" unread=topic.unread newPosts=topic.displayNewPosts unseen=topic.unseen url=topic.lastUnreadUrl newDotText=newDotText}}
+    {{~raw "topic-post-badges" unread=topic.unread newPosts=topic.displayNewPosts unseen=topic.unseen url=topic.lastUnreadUrl newDotText=newDotText}}
     {{~/if}}
   </span>
   <div class="link-bottom-line">
-  {{#unless hideCategory}}
-    {{#unless topic.isPinnedUncategorized}}
-      {{category-link topic.category}}
+    {{#unless hideCategory}}
+      {{#unless topic.isPinnedUncategorized}}
+        {{category-link topic.category}}
+      {{/unless}}
     {{/unless}}
-  {{/unless}}
-  {{discourse-tags topic mode="list" tagsForUser=tagsForUser}}
+    {{discourse-tags topic mode="list" tagsForUser=tagsForUser}}
+    {{raw "list/action-list" topic=topic postNumbers=topic.liked_post_numbers className="likes" icon="heart"}}
+  </div>
   {{#if expandPinned}}
     {{raw "list/topic-excerpt" topic=topic}}
   {{/if}}
-  {{raw "list/action-list" topic=topic postNumbers=topic.liked_post_numbers className="likes" icon="heart"}}
-  </div>
 </td>
 
 {{#if showPosters}}
@@ -49,21 +49,21 @@
 {{/if}}
 
 {{#if showLikes}}
-<td class="num likes">
-  {{#if hasLikes}}
-    <a href='{{topic.summaryUrl}}'>
-      {{number topic.like_count}} {{d-icon "heart"}}</td>
-    </a>
-  {{/if}}
+  <td class="num likes">
+    {{#if hasLikes}}
+      <a href='{{topic.summaryUrl}}'>
+        {{number topic.like_count}} {{d-icon "heart"}}</td>
+  </a>
+{{/if}}
 {{/if}}
 
 {{#if showOpLikes}}
-<td class="num likes">
-  {{#if hasOpLikes}}
-    <a href='{{topic.summaryUrl}}'>
-      {{number topic.op_like_count}} {{d-icon "heart"}}</td>
-    </a>
-  {{/if}}
+  <td class="num likes">
+    {{#if hasOpLikes}}
+      <a href='{{topic.summaryUrl}}'>
+        {{number topic.op_like_count}} {{d-icon "heart"}}</td>
+  </a>
+{{/if}}
 {{/if}}
 
 <td class="num views {{topic.viewsHeat}}">{{number topic.views numberKey="views_long"}}</td>
diff --git a/app/assets/javascripts/discourse/templates/login-preferences.hbs b/app/assets/javascripts/discourse/templates/login-preferences.hbs
index 9ed1d27ca9..ac789d2e74 100644
--- a/app/assets/javascripts/discourse/templates/login-preferences.hbs
+++ b/app/assets/javascripts/discourse/templates/login-preferences.hbs
@@ -3,8 +3,8 @@
 
   <p style='margin-top: 1em'>{{i18n "login.preferences"}}</p>
 
-  {{d-button class="btn-primary" action="showLogin" label="log_in"}}
+  {{d-button class="btn-primary" action=(route-action "showLogin") label="log_in"}}
   {{#unless siteSettings.enable_sso}}
-    {{d-button action="showForgotPassword" label="login.forgot"}}
+    {{d-button action=(action "showForgotPassword") label="login.forgot"}}
   {{/unless}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
index 7e3929b326..01a640c159 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
@@ -1,7 +1,7 @@
 {{#conditional-loading-spinner condition=loading}}
   {{#if hasIncoming}}
   <div class="show-mores">
-    <div class='alert alert-info clickable' {{action "showInserted"}}>
+    <div class='alert alert-info clickable' {{action showInserted}}>
       {{count-i18n key="topic_count_" suffix="latest" count=incomingCount}}
     </div>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/mobile/discovery/categories.hbs b/app/assets/javascripts/discourse/templates/mobile/discovery/categories.hbs
index 29d0abb762..907b8646c4 100644
--- a/app/assets/javascripts/discourse/templates/mobile/discovery/categories.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/discovery/categories.hbs
@@ -1,6 +1,6 @@
-{{#discovery-categories refresh="refresh"}}
+{{#discovery-categories refresh=refresh}}
   {{component categoryPageStyle
               categories=model.categories
               latestTopicOnly=latestTopicOnly
               topics=model.topics}}
-{{/discovery-categories}}
\ No newline at end of file
+{{/discovery-categories}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs b/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs
index b7d3d2589b..b85e297bec 100644
--- a/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs
@@ -1,7 +1,7 @@
-{{#discovery-topics-list model=model refresh="refresh" incomingCount=topicTrackingState.incomingCount}}
+{{#discovery-topics-list model=model refresh=(action "refresh") incomingCount=topicTrackingState.incomingCount}}
   {{#if top}}
     <div class='top-lists'>
-      {{period-chooser period=period action="changePeriod"}}
+      {{period-chooser period=period action=(action "changePeriod")}}
     </div>
   {{else}}
     {{#if topicTrackingState.hasIncoming}}
@@ -43,7 +43,7 @@
         {{#if canCreateTopicOnCategory}}<a href {{action "createTopic"}}>{{i18n 'topic.suggest_create_topic'}}</a>.{{/if}}
       {{else if top}}
         {{#link-to "discovery.categories"}}{{i18n 'topic.browse_all_categories'}}{{/link-to}}, {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}} {{i18n 'or'}} {{i18n 'filters.top.other_periods'}}.
-        {{top-period-buttons period=period action="changePeriod"}}
+        {{top-period-buttons period=period action=(action "changePeriod")}}
       {{else}}
         {{#link-to "discovery.categories"}} {{i18n 'topic.browse_all_categories'}}{{/link-to}} {{i18n 'or'}} {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}}.
       {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/group-index.hbs b/app/assets/javascripts/discourse/templates/mobile/group-index.hbs
index 7df27a3c3d..4a2c5e8a81 100644
--- a/app/assets/javascripts/discourse/templates/mobile/group-index.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/group-index.hbs
@@ -6,20 +6,20 @@
   {{#if canManageGroup}}
     {{#if currentUser.admin}}
       {{group-members-dropdown
-          showAddMembersModal="showAddMembersModal"
-          showBulkAddModal="showBulkAddModal"}}
+        showAddMembersModal=(route-action "showAddMembersModal")
+        showBulkAddModal=(route-action "showBulkAddModal")}}
     {{else}}
       {{d-button
           icon="plus"
           label="groups.add_members.title"
           class="group-members-add"
-          action="showAddMembersModal"}}
+          action=(route-action "showAddMembersModal")}}
     {{/if}}
   {{/if}}
 </div>
 
 {{#if hasMembers}}
-  {{#load-more selector=".group-members .user-info" action="loadMore"}}
+  {{#load-more selector=".group-members .user-info" action=(action "loadMore")}}
     <div class="group-members">
       {{#each model.members as |user|}}
         <div class="group-member">
@@ -38,9 +38,9 @@
 
             {{#if canManageGroup}}
               {{group-member-dropdown
-                  removeMember="removeMember"
-                  makeOwner="makeOwner"
-                  removeOwner="removeOwner"
+                  removeMember=(action "removeMember")
+                  makeOwner=(action "makeOwner")
+                  removeOwner=(action "removeOwner")
                   member=user}}
             {{/if}}
           {{/user-info}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs b/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs
index 9707f41622..907d36744e 100644
--- a/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs
@@ -1,11 +1,11 @@
-{{#login-modal screenX=lastX screenY=lastY loginName=loginName loginPassword=loginPassword loginSecondFactor=loginSecondFactor action="login"}}
+{{#login-modal screenX=lastX screenY=lastY loginName=loginName loginPassword=loginPassword loginSecondFactor=loginSecondFactor action=(action "login")}}
   {{#d-modal-body title="login.title" class="login-modal"}}
     {{#if showLoginButtons}}
       {{login-buttons
         showLoginWithEmailLink=showLoginWithEmailLink
         processingEmailLink=processingEmailLink
-        emailLogin='emailLogin'
-        externalLogin='externalLogin'}}
+        emailLogin=(action "emailLogin")
+        externalLogin=(action "externalLogin")}}
     {{/if}}
 
     {{#if canLoginLocal}}
@@ -46,20 +46,20 @@
 
   <div class="modal-footer">
     {{#if authenticate}}
-      {{i18n 'login.authenticating'}}
+      {{i18n "login.authenticating"}}
     {{/if}}
 
     {{#if canLoginLocal}}
-      {{d-button action="login"
-          icon="unlock"
-          label=loginButtonLabel
-          disabled=loginDisabled
-          class='btn btn-large btn-primary'}}
+      {{d-button action=(action "login")
+        icon="unlock"
+        label=loginButtonLabel
+        disabled=loginDisabled
+        class="btn btn-large btn-primary"}}
 
       {{#if showSignupLink}}
-        <button class="btn btn-large" id="new-account-link" {{action "showCreateAccount"}}>
-          {{i18n 'create_account.title'}}
-        </button>
+        {{#d-button class="btn btn-large" id="new-account-link" action=(route-action "showCreateAccount")}}
+          {{i18n "create_account.title"}}
+        {{/d-button}}
       {{/if}}
     {{/if}}
   </div>
diff --git a/app/assets/javascripts/discourse/templates/mobile/users.hbs b/app/assets/javascripts/discourse/templates/mobile/users.hbs
index 605ce97fca..8cdd3fc7a1 100644
--- a/app/assets/javascripts/discourse/templates/mobile/users.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/users.hbs
@@ -1,4 +1,4 @@
-{{#load-more selector=".directory .user" action="loadMore"}}
+{{#load-more selector=".directory .user" action=(action "loadMore")}}
   <div class="container">
     <div class='directory'>
       {{plugin-outlet name="users-top" connectorTagName='div' args=(hash model=model)}}
diff --git a/app/assets/javascripts/discourse/templates/modal/activation-edit.hbs b/app/assets/javascripts/discourse/templates/modal/activation-edit.hbs
index 65fc599c24..55a759f088 100644
--- a/app/assets/javascripts/discourse/templates/modal/activation-edit.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/activation-edit.hbs
@@ -3,9 +3,9 @@
 {{/d-modal-body}}
 
 <div class="modal-footer">
-  {{d-button action="changeEmail"
+  {{d-button action=(action "changeEmail")
              label="login.submit_new_email"
              disabled=submitDisabled
              class="btn-primary"}}
-  {{d-button action="closeModal" label="close"}}
+  {{d-button action=(route-action "closeModal") label="close"}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs b/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs
index e694c838bf..5469574977 100644
--- a/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs
@@ -2,4 +2,4 @@
   {{{i18n 'login.sent_activation_email_again' currentEmail=currentEmail}}}
 {{/d-modal-body}}
 
-{{modal-footer-close closeModal=(action "closeModal")}}
+{{modal-footer-close closeModal=(route-action "closeModal")}}
diff --git a/app/assets/javascripts/discourse/templates/modal/auth-token.hbs b/app/assets/javascripts/discourse/templates/modal/auth-token.hbs
index 84a7aa9f90..b0871e8fc2 100644
--- a/app/assets/javascripts/discourse/templates/modal/auth-token.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/auth-token.hbs
@@ -30,6 +30,6 @@
 {{/d-modal-body}}
 
 <div class="modal-footer">
-  {{d-button class="btn btn-primary" icon="lock" label="user.auth_tokens.secure_account" action="highlightSecure"}}
-  {{d-modal-cancel close=(action "closeModal")}}
+  {{d-button class="btn btn-primary" icon="lock" label="user.auth_tokens.secure_account" action=(action "highlightSecure")}}
+  {{d-modal-cancel close=(route-action "closeModal")}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs b/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
index 8c06577f54..2c5de674dd 100644
--- a/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/avatar-selector.hbs
@@ -16,7 +16,7 @@
       {{radio-button id="gravatar" name="avatar" value="gravatar" selection=selected}}
       <label class="radio" for="gravatar">{{bound-avatar-template user.gravatar_avatar_template "large"}} {{{i18n 'user.change_avatar.gravatar'}}} {{user.email}}</label>
 
-      {{d-button action="refreshGravatar"
+      {{d-button action=(action "refreshGravatar")
                  title="user.change_avatar.refresh_gravatar_title"
                  disabled=gravatarRefreshDisabled
                  icon="refresh"
@@ -41,7 +41,7 @@
                           uploadedAvatarTemplate=user.custom_avatar_template
                           uploadedAvatarId=user.custom_avatar_upload_id
                           uploading=uploading
-                          done="uploadComplete"}}
+                          done=(action "uploadComplete")}}
       </div>
     {{/if}}
   {{/if}}
@@ -49,7 +49,7 @@
 
 {{#unless siteSettings.selectable_avatars_enabled}}
   <div class="modal-footer">
-    {{d-button action="saveAvatarSelection" class="btn-primary" disabled=uploading label="save"}}
-    {{d-modal-cancel close=(action "closeModal")}}
+    {{d-button action=(action "saveAvatarSelection") class="btn-primary" disabled=uploading label="save"}}
+    {{d-modal-cancel close=(route-action "closeModal")}}
   </div>
 {{/unless}}
diff --git a/app/assets/javascripts/discourse/templates/modal/bulk-change-category.hbs b/app/assets/javascripts/discourse/templates/modal/bulk-change-category.hbs
index cc96a49d6f..8726b3ff00 100644
--- a/app/assets/javascripts/discourse/templates/modal/bulk-change-category.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bulk-change-category.hbs
@@ -3,5 +3,5 @@
 <p>{{category-chooser value=newCategoryId}}</p>
 
 {{#conditional-loading-spinner condition=loading}}
-  {{d-button action="changeCategory" label="topics.bulk.change_category"}}
+  {{d-button action=(action "changeCategory") label="topics.bulk.change_category"}}
 {{/conditional-loading-spinner}}
diff --git a/app/assets/javascripts/discourse/templates/modal/create-account.hbs b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
index ed31247a81..7b084f376b 100644
--- a/app/assets/javascripts/discourse/templates/modal/create-account.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
@@ -1,11 +1,11 @@
-{{#create-account email=accountEmail disabled=submitDisabled action="createAccount"}}
+{{#create-account email=accountEmail disabled=submitDisabled action=(action "createAccount")}}
   {{#unless complete}}
     {{#d-modal-body title="create_account.title" class=(concat (if hasAtLeastOneLoginButton "has-alt-auth") " " (if userFields "has-user-fields"))}}
-          
+
       {{#unless hasAuthOptions}}
-        {{login-buttons externalLogin="externalLogin"}}
+        {{login-buttons externalLogin=(action "externalLogin")}}
       {{/unless}}
-      
+
       {{#if showCreateForm}}
         <div class="login-form">
           <form>
@@ -17,10 +17,10 @@
                 {{input type="email" value=accountEmail id="new-account-email" disabled=emailValidated name="email" autofocus="autofocus"}}
                 </td>
           </tr>
-          
+
           <tr class="instructions create-account-email">
             <td></td>
-                {{input-tip validation=emailValidation}}
+                {{input-tip validation=emailValidation id="account-email-validation"}}
                 <td><label>{{i18n 'user.email.instructions'}}</label></td>
           </tr>
 
@@ -113,10 +113,11 @@
     {{#if showCreateForm}}
       <div class="modal-footer">
         <button class='btn btn-large btn-primary' disabled={{submitDisabled}} {{action "createAccount"}}>{{i18n 'create_account.title'}}</button>
+
         {{#conditional-loading-spinner condition=formSubmitted size="small"}}
-          <button class="btn btn-large" id="login-link" {{action "showLogin"}}>
-            {{i18n 'log_in'}}
-          </button>
+          {{#d-button class="btn btn-large" id="login-link" action=(route-action "showLogin")}}
+            {{i18n "log_in"}}
+          {{/d-button}}
         {{/conditional-loading-spinner}}
 
       <div class='disclaimer'>{{{disclaimerHtml}}}</div>
diff --git a/app/assets/javascripts/discourse/templates/modal/delete-topic-disallowed.hbs b/app/assets/javascripts/discourse/templates/modal/delete-topic-disallowed.hbs
index 90c11afd65..e35eaecc19 100644
--- a/app/assets/javascripts/discourse/templates/modal/delete-topic-disallowed.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/delete-topic-disallowed.hbs
@@ -2,5 +2,5 @@
   <p>{{{i18n "post.controls.delete_topic_disallowed_modal"}}}</p>
 {{/d-modal-body}}
 <div class="modal-footer">
-  {{d-button action="closeModal" class="btn-primary" label="close"}}
+  {{d-button action=(route-action "closeModal") class="btn-primary" label="close"}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/edit-category.hbs b/app/assets/javascripts/discourse/templates/modal/edit-category.hbs
index 425633a06a..2366e00ea2 100644
--- a/app/assets/javascripts/discourse/templates/modal/edit-category.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/edit-category.hbs
@@ -19,19 +19,19 @@
   {{/d-modal-body}}
 
   <div class="modal-footer">
-    {{d-button id="save-category" class="btn-primary" disabled=disabled action="saveCategory" label=saveLabel}}
+    {{d-button id="save-category" class="btn-primary" disabled=disabled action=(action "saveCategory") label=saveLabel}}
 
     {{#if model.can_delete}}
       {{d-button class="btn-danger pull-right"
                  disabled=deleteDisabled
-                 action="deleteCategory"
+                 action=(action "deleteCategory")
                  icon="trash-o"
                  label="category.delete"}}
     {{else if model.id}}
       <div class="disable_info_wrap">
         {{d-button disabled=deleteDisabled
                    class="btn-default disable-no-hover"
-                   action="toggleDeleteTooltip"
+                   action=(action "toggleDeleteTooltip")
                    icon="question-circle"
                    label="category.delete"}}
 
diff --git a/app/assets/javascripts/discourse/templates/modal/edit-topic-timer.hbs b/app/assets/javascripts/discourse/templates/modal/edit-topic-timer.hbs
index 4de56698a3..95fee49f5b 100644
--- a/app/assets/javascripts/discourse/templates/modal/edit-topic-timer.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/edit-topic-timer.hbs
@@ -12,24 +12,23 @@
   </div>
 
   {{edit-topic-timer-form
-      topic=model
-      topicTimer=topicTimer
-      timerTypes=selections
-      updateTime=updateTime
-      closeModal="closeModal"}}
+    topic=model
+    topicTimer=topicTimer
+    timerTypes=selections
+    updateTime=updateTime}}
 {{/d-modal-body}}
 
 <div class="modal-footer">
   {{d-button class="btn-primary"
       disabled=saveDisabled
       label="topic.topic_status_update.save"
-      action="saveTimer"}}
+      action=(action "saveTimer")}}
 
   {{conditional-loading-spinner size="small" condition=loading}}
 
   {{#if topicTimer.execute_at}}
     {{d-button class="pull-right btn-danger"
-        action="removeTimer"
+        action=(action "removeTimer")
         label='topic.topic_status_update.remove'}}
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs b/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
index 7b6fc38d91..64ecae5288 100644
--- a/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
@@ -22,7 +22,7 @@
           <p>{{i18n "topic.feature_topic.pin_note"}}</p>
         {{/if}}
         <p>{{{unPinMessage}}}</p>
-        <p>{{d-button action="unpin" icon="thumb-tack" label="topic.feature.unpin" class="btn-primary"}}</p>
+        <p>{{d-button action=(action "unpin") icon="thumb-tack" label="topic.feature.unpin" class="btn-primary"}}</p>
       </div>
     </div>
   {{else}}
@@ -61,7 +61,7 @@
           </p>
         {{/if}}
         <p>
-          {{d-button action="pin" icon="thumb-tack" label="topic.feature.pin" class="btn-primary"}}
+          {{d-button action=(action "pin") icon="thumb-tack" label="topic.feature.pin" class="btn-primary"}}
         </p>
       </div>
     </div>
@@ -105,7 +105,7 @@
           </p>
         {{/if}}
         <p>
-          {{d-button action="pinGlobally" icon="thumb-tack" label="topic.feature.pin_globally" class="btn-primary"}}
+          {{d-button action=(action "pinGlobally") icon="thumb-tack" label="topic.feature.pin_globally" class="btn-primary"}}
         </p>
       </div>
     </div>
@@ -134,14 +134,14 @@
       </p>
       <p>
         {{#if model.isBanner}}
-          {{d-button action="removeBanner" icon="thumb-tack" label="topic.feature.remove_banner" class="btn-primary"}}
+          {{d-button action=(action "removeBanner") icon="thumb-tack" label="topic.feature.remove_banner" class="btn-primary"}}
         {{else}}
-          {{d-button action="makeBanner" icon="thumb-tack" label="topic.feature.make_banner" class="btn-primary"}}
+          {{d-button action=(action "makeBanner") icon="thumb-tack" label="topic.feature.make_banner" class="btn-primary"}}
         {{/if}}
       </p>
     </div>
   </div>
 {{/d-modal-body}}
 <div class="modal-footer">
-  {{d-modal-cancel close=(action "closeModal")}}
+  {{d-modal-cancel close=(route-action "closeModal")}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/flag.hbs b/app/assets/javascripts/discourse/templates/modal/flag.hbs
index e863fd7948..b085e8211d 100644
--- a/app/assets/javascripts/discourse/templates/modal/flag.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/flag.hbs
@@ -7,7 +7,7 @@
                          selectedFlag=selected
                          username=model.username
                          staffFlagsAvailable=staffFlagsAvailable
-                         changePostActionType="changePostActionType"}}
+                         changePostActionType=(action "changePostActionType")}}
    {{/flag-selection}}
   </form>
 {{/d-modal-body}}
@@ -43,7 +43,7 @@
   {{#if showDeleteSpammer}}
     {{d-button
       class="btn-danger"
-      action="deleteSpammer"
+      action=(action "deleteSpammer")
       disabled=submitDisabled
       icon="exclamation-triangle"
       label="flagging.delete_spammer"}}
diff --git a/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs b/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
index f2d00aac48..81e02f94bc 100644
--- a/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
@@ -9,18 +9,18 @@
   {{/d-modal-body}}
   <div class="modal-footer">
     {{#unless offerHelp}}
-      {{d-button action="resetPassword"
+      {{d-button action=(action "resetPassword")
                  label="forgot_password.reset"
                  disabled=submitDisabled
                  class="btn-primary forgot-password-reset"}}
     {{else}}
       {{d-button class="btn-large btn-primary"
                  label="forgot_password.button_ok"
-                 action="ok"}}
+                 action=(action "ok")}}
       {{#unless helpSeen}}
         {{d-button class="btn-large"
                    label="forgot_password.button_help"
-                   action="help"}}
+                   action=(action "help")}}
       {{/unless}}
     {{/unless}}
   </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/group-add-members.hbs b/app/assets/javascripts/discourse/templates/modal/group-add-members.hbs
index d32d729c07..c07c81a1d7 100644
--- a/app/assets/javascripts/discourse/templates/modal/group-add-members.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/group-add-members.hbs
@@ -28,7 +28,7 @@
 {{/d-modal-body}}
 
 <div class="modal-footer">
-  {{d-button action="addMembers"
+  {{d-button action=(action "addMembers")
       class="add btn-primary"
       icon="plus"
       disabled=disableAddButton
diff --git a/app/assets/javascripts/discourse/templates/modal/group-bulk-add.hbs b/app/assets/javascripts/discourse/templates/modal/group-bulk-add.hbs
index 887e5a9011..26b0b94188 100644
--- a/app/assets/javascripts/discourse/templates/modal/group-bulk-add.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/group-bulk-add.hbs
@@ -30,7 +30,7 @@
 {{/d-modal-body}}
 
 <div class="modal-footer">
-  {{d-button action="add"
+  {{d-button action=(action "add")
       class="add btn-primary"
       icon="plus"
       disabled=disableAddButton
diff --git a/app/assets/javascripts/discourse/templates/modal/history.hbs b/app/assets/javascripts/discourse/templates/modal/history.hbs
index ade69e80c0..2ff3bc1601 100644
--- a/app/assets/javascripts/discourse/templates/modal/history.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/history.hbs
@@ -1,38 +1,38 @@
 {{#d-modal-body title="history" maxHeight="70%"}}
   <div id="revision">
     <div id="revision-controls">
-      {{d-button class="btn-default" action="loadFirstVersion" icon="fast-backward" title="post.revisions.controls.first" disabled=loadFirstDisabled}}
-      {{d-button class="btn-default" action="loadPreviousVersion" icon="backward" title="post.revisions.controls.previous" disabled=loadPreviousDisabled}}
+      {{d-button class="btn-default" action=(action "loadFirstVersion") icon="fast-backward" title="post.revisions.controls.first" disabled=loadFirstDisabled}}
+      {{d-button class="btn-default" action=(action "loadPreviousVersion") icon="backward" title="post.revisions.controls.previous" disabled=loadPreviousDisabled}}
       <div id="revision-numbers" class="{{unless displayRevisions 'invisible'}}">
         {{#conditional-loading-spinner condition=loading size="small"}}
           {{{revisionsText}}}
         {{/conditional-loading-spinner}}
       </div>
-      {{d-button class="btn-default" action="loadNextVersion" icon="forward" title="post.revisions.controls.next" disabled=loadNextDisabled}}
-      {{d-button class="btn-default" action="loadLastVersion" icon="fast-forward" title="post.revisions.controls.last" disabled=loadLastDisabled}}
+      {{d-button class="btn-default" action=(action "loadNextVersion") icon="forward" title="post.revisions.controls.next" disabled=loadNextDisabled}}
+      {{d-button class="btn-default" action=(action "loadLastVersion") icon="fast-forward" title="post.revisions.controls.last" disabled=loadLastDisabled}}
     </div>
 
     {{#if displayEdit}}
-      {{d-button action="editPost"
+      {{d-button action=(action "editPost")
           class="btn-default"
           icon="pencil"
           label=editButtonLabel}}
     {{/if}}
 
     <div id="display-modes">
-      {{d-button action="displayInline"
+      {{d-button action=(action "displayInline")
           icon="square-o"
           label="post.revisions.displays.inline.button"
           title="post.revisions.displays.inline.title"
           class=inlineClass}}
       {{#unless site.mobileView}}
-        {{d-button action="displaySideBySide"
+        {{d-button action=(action "displaySideBySide")
             icon="columns"
             label="post.revisions.displays.side_by_side.button"
             title="post.revisions.displays.side_by_side.title"
             class=sideBySideClass}}
 
-        {{d-button action="displaySideBySideMarkdown"
+        {{d-button action=(action "displaySideBySideMarkdown")
             icon="columns"
             label="post.revisions.displays.side_by_side_markdown.button"
             title="post.revisions.displays.side_by_side_markdown.title"
@@ -124,19 +124,19 @@
 {{/d-modal-body}}
 <div class="modal-footer">
     {{#if displayRevert}}
-      {{d-button action="revertToVersion" icon="undo" label="post.revisions.controls.revert" class="btn-danger" disabled=loading}}
+      {{d-button action=(action "revertToVersion") icon="undo" label="post.revisions.controls.revert" class="btn-danger" disabled=loading}}
     {{/if}}
 
     {{#if displayHide}}
-      {{d-button action="hideVersion" icon="eye-slash" label="post.revisions.controls.hide" class="btn-danger" disabled=loading}}
+      {{d-button action=(action "hideVersion") icon="eye-slash" label="post.revisions.controls.hide" class="btn-danger" disabled=loading}}
     {{/if}}
 
     {{#if displayShow}}
-      {{d-button action="showVersion" icon="eye" label="post.revisions.controls.show" class="btn-default" disabled=loading}}
+      {{d-button action=(action "showVersion") icon="eye" label="post.revisions.controls.show" class="btn-default" disabled=loading}}
     {{/if}}
 
     {{#if displayEdit}}
-      {{d-button action="editPost"
+      {{d-button action=(action "editPost")
           icon="pencil"
           class="btn-default"
           label=editButtonLabel}}
diff --git a/app/assets/javascripts/discourse/templates/modal/invite.hbs b/app/assets/javascripts/discourse/templates/modal/invite.hbs
index b35e904c29..40deca7ac3 100644
--- a/app/assets/javascripts/discourse/templates/modal/invite.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/invite.hbs
@@ -33,7 +33,7 @@
     {{/if}}
 
     {{#if showCustomMessage}}
-      <label>{{discourse-linked-text class="optional" action="showCustomMessageBox" text="invite.custom_message"}}</label>
+      <label>{{discourse-linked-text class="optional" action=(action "showCustomMessageBox") text="invite.custom_message"}}</label>
       {{#if hasCustomMessage}}{{textarea value=customMessage placeholder=customMessagePlaceholder}}{{/if}}
     {{/if}}
 
@@ -42,11 +42,11 @@
 
 <div class="modal-footer">
   {{#if model.finished}}
-    {{d-button class="btn-primary" action="closeModal" label="close"}}
+    {{d-button class="btn-primary" action=(route-action "closeModal") label="close"}}
   {{else}}
-    {{d-button icon=inviteIcon action="createInvite" class="btn-primary" disabled=disabled label=buttonTitle}}
+    {{d-button icon=inviteIcon action=(action "createInvite") class="btn-primary" disabled=disabled label=buttonTitle}}
     {{#if showCopyInviteButton}}
-      {{d-button icon="link" action="generateInvitelink" class="btn-primary" disabled=disabledCopyLink label='user.invited.generate_link'}}
+      {{d-button icon="link" action=(action "generateInvitelink") class="btn-primary" disabled=disabledCopyLink label='user.invited.generate_link'}}
     {{/if}}
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/jump-to-post.hbs b/app/assets/javascripts/discourse/templates/modal/jump-to-post.hbs
index acce5e47d6..22e8fcb60a 100644
--- a/app/assets/javascripts/discourse/templates/modal/jump-to-post.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/jump-to-post.hbs
@@ -3,7 +3,7 @@
   <div class="jumpt-to-post-form">
     <div class="jump-to-post-control">
       <span class="index">#</span>
-      {{input id="post-jump" type="number" value=postNumber insert-newline="jump"}}
+      {{input id="post-jump" type="number" value=postNumber insert-newline=(action "jump")}}
       <span class='input-hint-text post-number'>
         {{i18n "topic.progress.jump_prompt_of" count=filteredPostsCount}}
       </span>
@@ -27,6 +27,6 @@
 {{/d-modal-body}}
 
 <div class='modal-footer'>
-  {{d-button class="btn-primary" action="jump" label="composer.modal_ok"}}
-  {{d-modal-cancel close=(action "closeModal")}}
+  {{d-button class="btn-primary" action=(action "jump") label="composer.modal_ok"}}
+  {{d-modal-cancel close=(route-action "closeModal")}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/login.hbs b/app/assets/javascripts/discourse/templates/modal/login.hbs
index 67463aed05..ef9742be6e 100644
--- a/app/assets/javascripts/discourse/templates/modal/login.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/login.hbs
@@ -1,4 +1,4 @@
-{{#login-modal screenX=lastX screenY=lastY loginName=loginName loginPassword=loginPassword loginSecondFactor=loginSecondFactor action="login"}}
+{{#login-modal screenX=lastX screenY=lastY loginName=loginName loginPassword=loginPassword loginSecondFactor=loginSecondFactor action=(action "login")}}
   {{#d-modal-body title="login.title" class=(concat "login-modal" " " (if hasAtLeastOneLoginButton "has-alt-auth"))}}
 
     {{#if canLoginLocal}}
@@ -30,14 +30,14 @@
       {{login-buttons
         showLoginWithEmailLink=showLoginWithEmailLink
         processingEmailLink=processingEmailLink
-        emailLogin='emailLogin'
-        externalLogin='externalLogin'}}
+        emailLogin=(action "emailLogin")
+        externalLogin=(action "externalLogin")}}
     {{/if}}
   {{/d-modal-body}}
 
   <div class="modal-footer">
     {{#if canLoginLocal}}
-      {{d-button action="login"
+      {{d-button action=(action "login")
           icon="unlock"
           label=loginButtonLabel
           disabled=loginDisabled
diff --git a/app/assets/javascripts/discourse/templates/modal/merge-topic.hbs b/app/assets/javascripts/discourse/templates/modal/merge-topic.hbs
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs b/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs
index 992e9bb8ac..ca50e9ade6 100644
--- a/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/post-enqueued.hbs
@@ -4,5 +4,5 @@
   <p>{{{i18n "queue.approval.pending_posts" count=model.pending_count}}}</p>
 {{/d-modal-body}}
 <div class="modal-footer">
-  {{d-button action="closeModal" class="btn-primary" label="queue.approval.ok"}}
+  {{d-button action=(route-action "closeModal") class="btn-primary" label="queue.approval.ok"}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/raw-email.hbs b/app/assets/javascripts/discourse/templates/modal/raw-email.hbs
index 4a59eef06f..489064f166 100644
--- a/app/assets/javascripts/discourse/templates/modal/raw-email.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/raw-email.hbs
@@ -1,13 +1,13 @@
 {{#d-modal-body title="raw_email.title" class="incoming-email-modal" maxHeight="80%"}}
   <div class="incoming-email-tabs">
-    {{d-button action="displayRaw"
+    {{d-button action=(action "displayRaw")
                label="post.raw_email.displays.raw.button"
                title="post.raw_email.displays.raw.title"
                class=(if showRawEmail 'active')
     }}
 
     {{#if textPart}}
-      {{d-button action="displayTextPart"
+      {{d-button action=(action "displayTextPart")
                  label="post.raw_email.displays.text_part.button"
                  title="post.raw_email.displays.text_part.title"
                  class=(if showTextPart 'active')
@@ -15,7 +15,7 @@
     {{/if}}
 
     {{#if htmlPart}}
-      {{d-button action="displayHtmlPart"
+      {{d-button action=(action "displayHtmlPart")
                  label="post.raw_email.displays.html_part.button"
                  title="post.raw_email.displays.html_part.title"
                  class=(if showHtmlPart 'active')
diff --git a/app/assets/javascripts/discourse/templates/modal/rename-tag.hbs b/app/assets/javascripts/discourse/templates/modal/rename-tag.hbs
index e54a61551a..eeb6b95c92 100644
--- a/app/assets/javascripts/discourse/templates/modal/rename-tag.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/rename-tag.hbs
@@ -7,7 +7,7 @@
 
 <div class="modal-footer">
   {{d-button class="btn-primary"
-             action="performRename"
+             action=(action "performRename")
              label="tagging.rename_tag"
              disabled=renameDisabled}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs b/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs
index 63b257a78f..91bd68f127 100644
--- a/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs
@@ -12,10 +12,10 @@
             &nbsp;&nbsp;&nbsp;&nbsp;
           {{/if}}
           {{number-field number=(readonly cat.position) change=(action 'change' cat)}}
-          {{d-button class="btn-default no-text" action="moveUp" actionParam=cat icon="arrow-up"}}
-          {{d-button class="btn-default no-text" action="moveDown" actionParam=cat icon="arrow-down"}}
+          {{d-button class="btn-default no-text" action=(action "moveUp") actionParam=cat icon="arrow-up"}}
+          {{d-button class="btn-default no-text" action=(action "moveDown") actionParam=cat icon="arrow-down"}}
           {{#if cat.hasBufferedChanges}}
-            {{d-button class="no-text ok" action="commit" icon="check"}}
+            {{d-button class="no-text ok" action=(action "commit") icon="check"}}
           {{/if}}
         </td>
         <td>{{category-badge cat allowUncategorized="true"}}</td>
@@ -27,8 +27,8 @@
 
 <div class="modal-footer">
   {{#if showApplyAll}}
-    {{d-button action="commit" icon="check" label="categories.reorder.apply_all"}}
+    {{d-button action=(action "commit") icon="check" label="categories.reorder.apply_all"}}
   {{else}}
-    {{d-button class="btn-primary" action="saveOrder" label="categories.reorder.save"}}
+    {{d-button class="btn-primary" action=(action "saveOrder") label="categories.reorder.save"}}
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/request-group-membership-form.hbs b/app/assets/javascripts/discourse/templates/modal/request-group-membership-form.hbs
index 7455c62be3..b8bcae7847 100644
--- a/app/assets/javascripts/discourse/templates/modal/request-group-membership-form.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/request-group-membership-form.hbs
@@ -13,9 +13,9 @@
     {{d-button class="btn-primary"
         disabled=disableSubmit
         label="groups.membership_request.submit"
-        action="requestMember"}}
+        action=(action "requestMember")}}
 
-    {{d-modal-cancel close=(action "closeModal")}}
+    {{d-modal-cancel close=(route-action "closeModal")}}
     {{conditional-loading-spinner size="small" condition=loading}}
   </div>
 </form>
diff --git a/app/assets/javascripts/discourse/templates/modal/split-topic.hbs b/app/assets/javascripts/discourse/templates/modal/split-topic.hbs
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/app/assets/javascripts/discourse/templates/modal/tag-upload.hbs b/app/assets/javascripts/discourse/templates/modal/tag-upload.hbs
index d79cb8de40..b33a394d20 100644
--- a/app/assets/javascripts/discourse/templates/modal/tag-upload.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/tag-upload.hbs
@@ -1,3 +1,3 @@
 {{#d-modal-body title='tagging.upload'}}
-    {{tags-uploader closeModal=(action "closeModal") refresh=(route-action "refresh")}}
+  {{tags-uploader refresh=(route-action "refresh") closeModal=(route-action "closeModal")}}
 {{/d-modal-body}}
diff --git a/app/assets/javascripts/discourse/templates/modal/upload-selector.hbs b/app/assets/javascripts/discourse/templates/modal/upload-selector.hbs
index 0720195f8b..16e63ce05d 100644
--- a/app/assets/javascripts/discourse/templates/modal/upload-selector.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/upload-selector.hbs
@@ -41,7 +41,7 @@
 {{/d-modal-body}}
 
 <div class="modal-footer">
-  {{d-button action="upload" class='btn-primary' icon=uploadIcon label='upload'}}
-  {{d-modal-cancel close=(action "closeModal")}}
+  {{d-button action=(action "upload") class='btn-primary' icon=uploadIcon label='upload'}}
+  {{d-modal-cancel close=(route-action "closeModal")}}
   {{#if remote}}<a {{action "toggleShowMore"}} class="pull-right">{{i18n 'show_more'}}</a>{{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/password-reset.hbs b/app/assets/javascripts/discourse/templates/password-reset.hbs
index 5a762a985a..e1c49121e0 100644
--- a/app/assets/javascripts/discourse/templates/password-reset.hbs
+++ b/app/assets/javascripts/discourse/templates/password-reset.hbs
@@ -28,7 +28,7 @@
                 secondFactorMethod=secondFactorMethod
             }}
           {{/second-factor-form}}
-          {{d-button action="submit" class='btn-primary' label='submit'}}
+          {{d-button action=(action "submit") class='btn-primary' label='submit'}}
         {{else}}
           <h2>{{i18n 'user.change_password.choose'}}</h2>
 
@@ -42,7 +42,7 @@
               {{d-icon "exclamation-triangle"}} {{i18n 'login.caps_lock_warning'}}</div>
           </div>
 
-          {{d-button action="submit" class='btn-primary' label='user.change_password.set_password'}}
+          {{d-button action=(action "submit") class='btn-primary' label='user.change_password.set_password'}}
         {{/if}}
 
         {{#if errorMessage}}
diff --git a/app/assets/javascripts/discourse/templates/preferences-about.hbs b/app/assets/javascripts/discourse/templates/preferences-about.hbs
index 6613c07732..86f496b132 100644
--- a/app/assets/javascripts/discourse/templates/preferences-about.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences-about.hbs
@@ -16,7 +16,7 @@
 
     <div class="control-group">
       <div class="controls">
-        {{#d-button action="changeAbout" class="btn btn-primary"}}
+        {{#d-button action=(route-action "changeAbout") class="btn btn-primary"}}
           {{saveButtonText}}
         {{/d-button}}
       </div>
diff --git a/app/assets/javascripts/discourse/templates/preferences-email.hbs b/app/assets/javascripts/discourse/templates/preferences-email.hbs
index 19a5b128c2..241e2a7248 100644
--- a/app/assets/javascripts/discourse/templates/preferences-email.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences-email.hbs
@@ -49,7 +49,9 @@
 
       <div class="control-group">
         <div class="controls">
-          <button {{action "changeEmail"}} disabled={{saveDisabled}} class="btn btn-primary">{{saveButtonText}}</button>
+          {{#d-button class="btn btn-primary" action=(action "changeEmail") disabled=saveDisabled}}
+            {{saveButtonText}}
+          {{/d-button}}
         </div>
       </div>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/preferences-second-factor-backup.hbs b/app/assets/javascripts/discourse/templates/preferences-second-factor-backup.hbs
index a8a9edc1b9..3511363614 100644
--- a/app/assets/javascripts/discourse/templates/preferences-second-factor-backup.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences-second-factor-backup.hbs
@@ -40,13 +40,13 @@
       <div class="controls">
         <div class="actions">
             {{d-button
-              action="generateSecondFactorCodes"
+              action=(action "generateSecondFactorCodes")
               class="btn btn-primary"
               disabled=isDisabledGenerateBackupCodeBtn
               label=generateBackupCodeBtnLabel}}
           {{#if backupEnabled}}
             {{d-button
-              action="disableSecondFactorBackup"
+              action=(action "disableSecondFactorBackup")
               class="btn btn-danger"
               disabled=isDisabledDisableBackupCodeBtn
               label="user.second_factor_backup.disable"}}
diff --git a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
index dcd1368fdd..797135fcdc 100644
--- a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
@@ -30,7 +30,7 @@
 
       <div class="control-group">
         <div class="controls">
-          {{d-button action="disableSecondFactor"
+          {{d-button action=(action "disableSecondFactor")
               class="btn btn-primary"
               disabled=loading
               label=disableButtonText}}
@@ -78,7 +78,7 @@
 
         <div class="control-group">
           <div class="controls">
-            {{d-button action="enableSecondFactor"
+            {{d-button action=(action "enableSecondFactor")
                 class="btn btn-primary"
                 disabled=loading
                 label=enableButtonText}}
@@ -105,12 +105,12 @@
 
         <div class="control-group">
           <div class="controls">
-            {{d-button action="confirmPassword"
+            {{d-button action=(action "confirmPassword")
                 class="btn btn-primary"
                 disabled=loading
                 label=submitButtonText}}
 
-            {{d-button action="resetPassword"
+            {{d-button action=(action "resetPassword")
                 class="btn"
                 disabled=resetPasswordLoading
                 icon="envelope"
diff --git a/app/assets/javascripts/discourse/templates/preferences/account.hbs b/app/assets/javascripts/discourse/templates/preferences/account.hbs
index 9ddf1cd6bd..93cf10f042 100644
--- a/app/assets/javascripts/discourse/templates/preferences/account.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/account.hbs
@@ -45,7 +45,7 @@
       </div>
     {{else}}
       <div class="controls">
-        {{d-button action="checkEmail" class="btn-default" actionParam=model title="admin.users.check_email.title" icon="envelope-o" label="admin.users.check_email.text"}}
+        {{d-button action=(route-action "checkEmail") class="btn-default" actionParam=model title="admin.users.check_email.title" icon="envelope-o" label="admin.users.check_email.text"}}
       </div>
     {{/if}}
   </div>
@@ -113,14 +113,14 @@
             <td>
               {{#if authProvider.method.can_revoke}}
                 {{#conditional-loading-spinner condition=revoking size='small'}}
-                  {{d-button action="revokeAccount" actionParam=authProvider.account title="user.associated_accounts.revoke" class="btn-danger no-text" icon="trash" }}
+                  {{d-button action=(action "revokeAccount") actionParam=authProvider.account title="user.associated_accounts.revoke" class="btn-danger no-text" icon="trash" }}
                 {{/conditional-loading-spinner}}
               {{/if}}
             </td>
           {{else}}
             <td colspan=2>
               {{#if authProvider.method.can_connect}}
-                {{d-button action="connectAccount" actionParam=authProvider.method label="user.associated_accounts.connect" icon="plug" disabled=disableConnectButtons}}
+                {{d-button action=(action "connectAccount") actionParam=authProvider.method label="user.associated_accounts.connect" class="btn-default" icon="plug" disabled=disableConnectButtons}}
               {{else}}
                 {{i18n 'user.associated_accounts.not_connected'}}
               {{/if}}
@@ -132,7 +132,7 @@
       </table>
     {{else}}
       <div class="controls">
-        {{d-button action="checkEmail" actionParam=model title="admin.users.check_email.title" icon="envelope-o" label="admin.users.check_email.text"}}
+        {{d-button action=(route-action "checkEmail") actionParam=model title="admin.users.check_email.title" icon="envelope-o" label="admin.users.check_email.text"}}
       </div>
     {{/if}}
   </div>
@@ -144,7 +144,7 @@
     <div class="controls">
       {{! we want the "huge" version even though we're downsizing it in CSS }}
       {{bound-avatar model "huge"}}
-      {{d-button action="showAvatarSelector" actionParam=model class="btn-default pad-left" icon="pencil"}}
+      {{d-button action=(route-action "showAvatarSelector") actionParam=model class="btn-default pad-left" icon="pencil"}}
     </div>
   </div>
 {{/unless}}
@@ -222,7 +222,7 @@
   <div class="control-group delete-account">
     <br/>
     <div class="controls">
-      {{d-button action="delete" disabled=deleteDisabled class="btn-danger" icon="trash-o" label="user.delete_account"}}
+      {{d-button action=(action "delete") disabled=deleteDisabled class="btn-danger" icon="trash-o" label="user.delete_account"}}
     </div>
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/apps.hbs b/app/assets/javascripts/discourse/templates/preferences/apps.hbs
index 4f24527b98..2add47b39c 100644
--- a/app/assets/javascripts/discourse/templates/preferences/apps.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/apps.hbs
@@ -6,9 +6,9 @@
     <div>
       <span>{{key.application_name}}</span>
       {{#if key.revoked}}
-        {{d-button action="undoRevokeApiKey" actionParam=key class="btn" label="user.undo_revoke_access"}}
+        {{d-button action=(route-action "undoRevokeApiKey") actionParam=key class="btn" label="user.undo_revoke_access"}}
       {{else}}
-        {{d-button action="revokeApiKey" actionParam=key class="btn" label="user.revoke_access"}}
+        {{d-button action=(route-action "revokeApiKey") actionParam=key class="btn" label="user.revoke_access"}}
       {{/if}}
       <p>
         <ul>
@@ -25,4 +25,4 @@
 </div>
 {{/if}}
 
-{{plugin-outlet name="user-preferences-apps" args=(hash model=model save=(action "save"))}}
+{{plugin-outlet name="user-preferences-apps" args=(hash model=model)}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/interface.hbs b/app/assets/javascripts/discourse/templates/preferences/interface.hbs
index da84c8c605..1be49ff9b5 100644
--- a/app/assets/javascripts/discourse/templates/preferences/interface.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/interface.hbs
@@ -10,6 +10,13 @@
 </div>
 {{/if}}
 
+<div class="control-group text-size">
+  <label class="control-label">{{i18n 'user.text_size.title'}}</label>
+  <div class="controls">
+    {{combo-box valueAttribute="value" content=textSizes value=model.user_option.text_size onSelect=(action "selectTextSize")}}
+  </div>
+</div>
+
 {{#if siteSettings.allow_user_locale}}
   <div class="control-group pref-locale">
     <label class="control-label">{{i18n 'user.locale.title'}}</label>
diff --git a/app/assets/javascripts/discourse/templates/queued-posts.hbs b/app/assets/javascripts/discourse/templates/queued-posts.hbs
index d266e2b9cd..22e24e0142 100644
--- a/app/assets/javascripts/discourse/templates/queued-posts.hbs
+++ b/app/assets/javascripts/discourse/templates/queued-posts.hbs
@@ -1,11 +1,11 @@
 <div class='container'>
   <div class='queued-posts'>
     {{#each model as |post|}}
-      {{queued-post post=post currentlyEditing=editing removePost="removePost"}}
+      {{queued-post post=post currentlyEditing=editing removePost=(route-action "removePost" post)}}
     {{else}}
       <p>{{i18n "queue.none"}}</p>
     {{/each}}
 
-    {{d-button action="refresh" label="refresh" icon="refresh" disabled=model.refreshing class="btn-default" id='refresh-queued'}}
+    {{d-button action=(route-action "refresh") label="refresh" icon="refresh" disabled=model.refreshing class="btn-default" id='refresh-queued'}}
   </div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/selected-posts.hbs b/app/assets/javascripts/discourse/templates/selected-posts.hbs
index 452fc8b187..4fc8598957 100644
--- a/app/assets/javascripts/discourse/templates/selected-posts.hbs
+++ b/app/assets/javascripts/discourse/templates/selected-posts.hbs
@@ -9,7 +9,7 @@
 {{/if}}
 
 {{#if canDeleteSelected}}
-  {{d-button action="deleteSelected" icon="trash-o" label="topic.multi_select.delete" class="btn-danger"}}
+  {{d-button action=(action "deleteSelected") icon="trash-o" label="topic.multi_select.delete" class="btn-danger"}}
 {{/if}}
 
 {{#if canMergeTopic}}
@@ -17,11 +17,11 @@
 {{/if}}
 
 {{#if canChangeOwner}}
-  {{d-button action="changeOwner" icon="user" label="topic.change_owner.action"}}
+  {{d-button action=(route-action "changeOwner") icon="user" label="topic.change_owner.action"}}
 {{/if}}
 
 {{#if canMergePosts}}
-  {{d-button action="mergePosts" icon="arrows-v" label="topic.merge_posts.action"}}
+  {{d-button action=(action "mergePosts") icon="arrows-v" label="topic.merge_posts.action"}}
 {{/if}}
 
 <p class='cancel'><a href {{action "toggleMultiSelect"}}>{{i18n 'topic.multi_select.cancel'}}</a></p>
diff --git a/app/assets/javascripts/discourse/templates/static.hbs b/app/assets/javascripts/discourse/templates/static.hbs
index c535f16fb3..107f4350f8 100644
--- a/app/assets/javascripts/discourse/templates/static.hbs
+++ b/app/assets/javascripts/discourse/templates/static.hbs
@@ -1,15 +1,15 @@
 {{#d-section bodyClass=bodyClass class="container"}}
-  {{#watch-read action="markFaqRead" path=model.path}}
+  {{#watch-read action=(action "markFaqRead") path=model.path}}
     <div class='contents clearfix body-page'>
       {{plugin-outlet name="above-static"}}
       {{{model.html}}}
 
       {{#if showSignupButton}}
-        {{d-button action="showCreateAccount" class="btn-primary sign-up-button" label="sign_up"}}
+        {{d-button action=(route-action "showCreateAccount") class="btn-primary sign-up-button" label="sign_up"}}
       {{/if}}
 
       {{#if showLoginButton}}
-        {{d-button action="showLogin" class="btn-primary login-button" icon="user" label="log_in"}}
+        {{d-button action=(route-action "showLogin") class="btn-primary login-button" icon="user" label="log_in"}}
       {{/if}}
     </div>
   {{/watch-read}}
diff --git a/app/assets/javascripts/discourse/templates/tag-groups-show.hbs b/app/assets/javascripts/discourse/templates/tag-groups-show.hbs
index 36657de0dc..8fbb0dad27 100644
--- a/app/assets/javascripts/discourse/templates/tag-groups-show.hbs
+++ b/app/assets/javascripts/discourse/templates/tag-groups-show.hbs
@@ -30,15 +30,15 @@
 
   <section class="group-visibility">
     <div>
-      {{radio-button class="tag-permissions-choice" name="tag-permissions-choice" value="public" id="public-permission" selection=model.permissionName onChange="changed"}}
+      {{radio-button class="tag-permissions-choice" name="tag-permissions-choice" value="public" id="public-permission" selection=model.permissionName}}
       <label class="radio" for="public-permission">{{i18n 'tagging.groups.everyone_can_use'}}</label>
     </div>
     <div>
-      {{radio-button class="tag-permissions-choice" name="tag-permissions-choice" value="visible" id="visible-permission" selection=model.permissionName onChange="changed"}}
+      {{radio-button class="tag-permissions-choice" name="tag-permissions-choice" value="visible" id="visible-permission" selection=model.permissionName}}
       <label class="radio" for="visible-permission">{{i18n 'tagging.groups.usable_only_by_staff'}}</label>
     </div>
     <div>
-      {{radio-button class="tag-permissions-choice" name="tag-permissions-choice" value="private" id="private-permission" selection=model.permissionName onChange="changed"}}
+      {{radio-button class="tag-permissions-choice" name="tag-permissions-choice" value="private" id="private-permission" selection=model.permissionName}}
       <label class="radio" for="private-permission">{{i18n 'tagging.groups.visible_only_to_staff'}}</label>
     </div>
   </section>
diff --git a/app/assets/javascripts/discourse/templates/tags/index.hbs b/app/assets/javascripts/discourse/templates/tags/index.hbs
index 4f40428f9f..b19016bd0a 100644
--- a/app/assets/javascripts/discourse/templates/tags/index.hbs
+++ b/app/assets/javascripts/discourse/templates/tags/index.hbs
@@ -5,7 +5,7 @@
 <div class="list-controls">
   <div class="container">
     {{#if canAdminTags}}
-      {{tags-admin-dropdown}}
+      {{tags-admin-dropdown actionsMapping=actionsMapping}}
     {{/if}}
     <h2>{{i18n "tagging.tags"}}</h2>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/tags/show.hbs b/app/assets/javascripts/discourse/templates/tags/show.hbs
index b5e601ac46..f4ce518846 100644
--- a/app/assets/javascripts/discourse/templates/tags/show.hbs
+++ b/app/assets/javascripts/discourse/templates/tags/show.hbs
@@ -28,7 +28,7 @@
 
     {{#if tagNotification}}
       {{#unless additionalTags}}
-        {{tag-notifications-button action="changeTagNotification"
+        {{tag-notifications-button action=(action "changeTagNotification")
                                    notificationLevel=tagNotification.notification_level}}
       {{/unless}}
     {{/if}}
@@ -40,8 +40,8 @@
       action=(route-action "createTopic")}}
 
      {{#if showAdminControls}}
-        {{d-button action="renameTag" actionParam=tag icon="pencil" class="admin-tag"}}
-        {{d-button action="deleteTag" icon="trash-o" class="admin-tag btn-danger"}}
+        {{d-button action=(route-action "renameTag") actionParam=tag icon="pencil" class="admin-tag"}}
+        {{d-button action=(action "deleteTag") icon="trash-o" class="admin-tag btn-danger"}}
       {{/if}}
     </section>
   </div>
@@ -56,18 +56,18 @@
 
       {{#unless loading}}
         {{#if list.topics}}
-          {{#discovery-topics-list model=list refresh="refresh"}}
-          {{bulk-select-button selected=selected action="refresh"}}
+          {{#discovery-topics-list model=list refresh=(action "refresh")}}
+          {{bulk-select-button selected=selected action=(action "refresh")}}
 
           {{topic-list topics=list.topics
                       canBulkSelect=canBulkSelect
-                      toggleBulkSelect="toggleBulkSelect"
+                      toggleBulkSelect=(action "toggleBulkSelect")
                       bulkSelectEnabled=bulkSelectEnabled
                       selected=selected
                       showPosters=true
                       order=order
                       ascending=ascending
-                      changeSort="changeSort"}}
+                      changeSort=(action "changeSort")}}
 
           {{/discovery-topics-list}}
         {{else}}
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index b87bf86c34..b92445f070 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -14,7 +14,7 @@
 
   {{#if model.postStream.loaded}}
     {{#if model.postStream.firstPostPresent}}
-      {{#topic-title cancelled="cancelEditingTopic" save="finishedEditingTopic" model=model}}
+      {{#topic-title cancelled=(action "cancelEditingTopic") save=(action "finishedEditingTopic") model=model}}
         {{#if editingTopic}}
           <div class="edit-topic-title">
           {{#if model.isPrivateMessage}}
@@ -31,8 +31,8 @@
 
             {{plugin-outlet name="edit-topic" args=(hash model=model buffered=buffered)}}
             <div class="edit-controls">
-              {{d-button action="finishedEditingTopic" class="btn-primary btn-small submit-edit" icon="check"}}
-              {{d-button action="cancelEditingTopic" class="btn-default btn-small cancel-edit" icon="times"}}
+              {{d-button action=(action "finishedEditingTopic") class="btn-primary submit-edit" icon="check"}}
+              {{d-button action=(action "cancelEditingTopic") class="btn-default cancel-edit" icon="times"}}
 
               {{#if canRemoveTopicFeaturedLink}}
                 <a href {{action "removeFeaturedLink"}} class="remove-featured-link" title="{{i18n "composer.remove_featured_link"}}">
@@ -91,9 +91,9 @@
               toggleClosed=(action "toggleClosed")
               toggleArchived=(action "toggleArchived")
               toggleVisibility=(action "toggleVisibility")
-              showTopicStatusUpdate=(action "topicRouteAction" "showTopicStatusUpdate")
-              showFeatureTopic=(action "topicRouteAction" "showFeatureTopic")
-              showChangeTimestamp=(action "topicRouteAction" "showChangeTimestamp")
+              showTopicStatusUpdate=(route-action "showTopicStatusUpdate")
+              showFeatureTopic=(route-action "showFeatureTopic")
+              showChangeTimestamp=(route-action "showChangeTimestamp")
               resetBumpDate=(action "resetBumpDate")
               convertToPublicTopic=(action "convertToPublicTopic")
               convertToPrivateMessage=(action "convertToPrivateMessage")}}
@@ -119,9 +119,9 @@
             toggleClosed=(action "toggleClosed")
             toggleArchived=(action "toggleArchived")
             toggleVisibility=(action "toggleVisibility")
-            showTopicStatusUpdate=(action "topicRouteAction" "showTopicStatusUpdate")
-            showFeatureTopic=(action "topicRouteAction" "showFeatureTopic")
-            showChangeTimestamp=(action "topicRouteAction" "showChangeTimestamp")
+            showTopicStatusUpdate=(route-action "showTopicStatusUpdate")
+            showFeatureTopic=(route-action "showFeatureTopic")
+            showChangeTimestamp=(route-action "showChangeTimestamp")
             resetBumpDate=(action "resetBumpDate")
             convertToPublicTopic=(action "convertToPublicTopic")
             convertToPrivateMessage=(action "convertToPrivateMessage")}}
@@ -143,9 +143,9 @@
                 toggleClosed=(action "toggleClosed")
                 toggleArchived=(action "toggleArchived")
                 toggleVisibility=(action "toggleVisibility")
-                showTopicStatusUpdate=(action "topicRouteAction" "showTopicStatusUpdate")
-                showFeatureTopic=(action "topicRouteAction" "showFeatureTopic")
-                showChangeTimestamp=(action "topicRouteAction" "showChangeTimestamp")
+                showTopicStatusUpdate=(route-action "showTopicStatusUpdate")
+                showFeatureTopic=(route-action "showFeatureTopic")
+                showChangeTimestamp=(route-action "showChangeTimestamp")
                 resetBumpDate=(action "resetBumpDate")
                 convertToPublicTopic=(action "convertToPublicTopic")
                 convertToPrivateMessage=(action "convertToPrivateMessage")}}
@@ -172,9 +172,9 @@
                 gaps=model.postStream.gaps
                 showFlags=(action "showPostFlags")
                 editPost=(action "editPost")
-                showHistory=(action "topicRouteAction" "showHistory")
-                showLogin=(action "topicRouteAction" "showLogin")
-                showRawEmail=(action "topicRouteAction" "showRawEmail")
+                showHistory=(route-action "showHistory")
+                showLogin=(route-action "showLogin")
+                showRawEmail=(route-action "showRawEmail")
                 deletePost=(action "deletePost")
                 recoverPost=(action "recoverPost")
                 expandHidden=(action "expandHidden")
@@ -192,7 +192,7 @@
                 toggleSummary=(action "toggleSummary")
                 removeAllowedUser=(action "removeAllowedUser")
                 removeAllowedGroup=(action "removeAllowedGroup")
-                showInvite=(action "topicRouteAction" "showInvite")
+                showInvite=(route-action "showInvite")
                 topVisibleChanged=(action "topVisibleChanged")
                 currentPostChanged=(action "currentPostChanged")
                 currentPostScrolled=(action "currentPostScrolled")
@@ -256,22 +256,22 @@
                     toggleClosed=(action "toggleClosed")
                     toggleArchived=(action "toggleArchived")
                     toggleVisibility=(action "toggleVisibility")
-                    showTopicStatusUpdate=(action "topicRouteAction" "showTopicStatusUpdate")
-                    showFeatureTopic=(action "topicRouteAction" "showFeatureTopic")
-                    showChangeTimestamp=(action "topicRouteAction" "showChangeTimestamp")
+                    showTopicStatusUpdate=(route-action "showTopicStatusUpdate")
+                    showFeatureTopic=(route-action "showFeatureTopic")
+                    showChangeTimestamp=(route-action "showChangeTimestamp")
                     resetBumpDate=(action "resetBumpDate")
                     convertToPublicTopic=(action "convertToPublicTopic")
                     convertToPrivateMessage=(action "convertToPrivateMessage")
                     toggleBookmark=(action "toggleBookmark")
-                    showFlagTopic=(action "topicRouteAction" "showFlagTopic")
-                    showInvite=(action "topicRouteAction" "showInvite")
+                    showFlagTopic=(route-action "showFlagTopic")
+                    showInvite=(route-action "showInvite")
                     toggleArchiveMessage=(action "toggleArchiveMessage")
                     editFirstPost=(action "editFirstPost")
                     replyToPost=(action "replyToPost")
                     }}
                 {{else}}
                   <div id="topic-footer-buttons">
-                    {{d-button icon="reply" class="btn-primary pull-right" action="showLogin" label="topic.reply.title"}}
+                    {{d-button icon="reply" class="btn-primary pull-right" action=(route-action "showLogin") label="topic.reply.title"}}
                   </div>
                 {{/if}}
               {{/if}}
@@ -308,10 +308,10 @@
             <div>{{model.message}}</div>
             {{#if model.noRetry}}
               {{#unless currentUser}}
-                {{d-button action="showLogin" class="btn-primary topic-retry" icon="user" label="log_in"}}
+                {{d-button action=(route-action "showLogin") class="btn-primary topic-retry" icon="user" label="log_in"}}
               {{/unless}}
             {{else}}
-              {{d-button action="retryLoading" class="btn-primary topic-retry" icon="refresh" label="errors.buttons.again"}}
+              {{d-button action=(action "retryLoading") class="btn-primary topic-retry" icon="refresh" label="errors.buttons.again"}}
             {{/if}}
           </div>
           {{conditional-loading-spinner condition=retrying}}
@@ -320,7 +320,7 @@
     </div>
   {{/if}}
 
-  {{share-popup topic=model replyAsNewTopic="replyAsNewTopic"}}
+  {{share-popup topic=model replyAsNewTopic=(action "replyAsNewTopic")}}
 
   {{#if embedQuoteButton}}
     {{quote-button quoteState=quoteState selectText=(action "selectText")}}
diff --git a/app/assets/javascripts/discourse/templates/user-card.hbs b/app/assets/javascripts/discourse/templates/user-card.hbs
index f2ad8f600d..b7e2924e17 100644
--- a/app/assets/javascripts/discourse/templates/user-card.hbs
+++ b/app/assets/javascripts/discourse/templates/user-card.hbs
@@ -1,17 +1,12 @@
 {{user-card-contents
   currentPath=application.currentPath
   topic=topic.model
-  showUser="showUser"
-  togglePosts="togglePosts"
-  composePrivateMessage="composePrivateMessage"
-  createNewMessageViaParams="createNewMessageViaParams"
-  deleteUser="deleteUser"}}
+  showUser=(action "showUser")
+  togglePosts=(action "togglePosts")
+  createNewMessageViaParams=(route-action "createNewMessageViaParams")}}
 
 {{group-card-contents
   currentPath=application.currentPath
   topic=topic.model
-  showUser="showUser"
-  togglePosts="togglePosts"
-  composePrivateMessage="composePrivateMessage"
-  createNewMessageViaParams="createNewMessageViaParams"
-  deleteUser="deleteUser"}}
+  showUser=(action "showUser")
+  createNewMessageViaParams=(route-action "createNewMessageViaParams")}}
diff --git a/app/assets/javascripts/discourse/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
index c02499e76b..9c27ab5847 100644
--- a/app/assets/javascripts/discourse/templates/user-invited-show.hbs
+++ b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
@@ -1,6 +1,6 @@
 {{#d-section pageClass="user-invites"}}
   {{#if canInviteToForum}}
-    {{#load-more class="paginated-topics-list" selector=".paginated-topics-list .user-invite-list tr" action="loadMore"}}
+    {{#load-more class="paginated-topics-list" selector=".paginated-topics-list .user-invite-list tr" action=(action "loadMore")}}
       <section class='user-content'>
         <h2>{{i18n 'user.invited.title'}}</h2>
 
@@ -14,7 +14,7 @@
             </nav>
 
             <div class="pull-right">
-              {{d-button icon="plus" action="showInvite" label="user.invited.create" class="btn"}}
+              {{d-button icon="plus" action=(route-action "showInvite") label="user.invited.create" class="btn"}}
               {{#if canBulkInvite}}
                 {{csv-uploader uploading=uploading}}
                 <a href="https://meta.discourse.org/t/sending-bulk-user-invites/16468" target="_blank" style="color:black;">{{d-icon "question-circle"}}</a>
@@ -23,12 +23,12 @@
                 {{#if rescindedAll}}
                   {{i18n 'user.invited.rescinded_all'}}
                 {{else}}
-                  {{d-button icon="times" action="rescindAll" class="btn" label="user.invited.rescind_all"}}
+                  {{d-button icon="times" action=(action "rescindAll") class="btn" label="user.invited.rescind_all"}}
                 {{/if}}
                 {{#if reinvitedAll}}
                   {{i18n 'user.invited.reinvited_all'}}
                 {{else}}
-                  {{d-button icon="refresh" action="reinviteAll" class="btn" label="user.invited.reinvite_all"}}
+                  {{d-button icon="refresh" action=(action "reinviteAll") class="btn" label="user.invited.reinvite_all"}}
                 {{/if}}
               {{/if}}
             </div>
@@ -87,13 +87,13 @@
                     {{#if invite.rescinded}}
                       {{i18n 'user.invited.rescinded'}}
                     {{else}}
-                      {{d-button icon="times" action="rescind" actionParam=invite class="btn" label="user.invited.rescind"}}
+                      {{d-button icon="times" action=(action "rescind") actionParam=invite class="btn" label="user.invited.rescind"}}
                     {{/if}}
                     &nbsp;&nbsp;&nbsp;&nbsp;
                     {{#if invite.reinvited}}
                       {{i18n 'user.invited.reinvited'}}
                     {{else}}
-                      {{d-button icon="refresh" action="reinvite" actionParam=invite class="btn" label="user.invited.reinvite"}}
+                      {{d-button icon="refresh" action=(action "reinvite") actionParam=invite class="btn" label="user.invited.reinvite"}}
                     {{/if}}
                   </td>
                 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/user-topics-list.hbs b/app/assets/javascripts/discourse/templates/user-topics-list.hbs
index 933e3dfe16..d0b5008101 100644
--- a/app/assets/javascripts/discourse/templates/user-topics-list.hbs
+++ b/app/assets/javascripts/discourse/templates/user-topics-list.hbs
@@ -1,4 +1,4 @@
-{{#load-more class="paginated-topics-list" selector=".paginated-topics-list .topic-list tr" action="loadMore"}}
+{{#load-more class="paginated-topics-list" selector=".paginated-topics-list .topic-list tr" action=(action "loadMore")}}
   {{basic-topic-list topicList=model
                      hideCategory=hideCategory
                      showParticipants=showParticipants
@@ -7,7 +7,7 @@
                      selected=selected
                      hasIncoming=hasIncoming
                      incomingCount=incomingCount
-                     showInserted="showInserted"
+                     showInserted=(action "showInserted")
                      tagsForUser=tagsForUser}}
 
   {{conditional-loading-spinner condition=model.loadingMore}}
diff --git a/app/assets/javascripts/discourse/templates/user.hbs b/app/assets/javascripts/discourse/templates/user.hbs
index b6173b6333..34287cacfc 100644
--- a/app/assets/javascripts/discourse/templates/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user.hbs
@@ -44,10 +44,10 @@
             <ul>
               {{#if model.can_send_private_message_to_user}}
               <li>
-                <a class='btn btn-primary compose-pm' {{action "composePrivateMessage" model}}>
+                {{#d-button class="btn btn-primary compose-pm" action=(route-action "composePrivateMessage" model)}}
                   {{d-icon "envelope"}}
-                  {{i18n 'user.private_message'}}
-                </a>
+                  {{i18n "user.private_message"}}
+                {{/d-button}}
               </li>
               {{/if}}
               {{#if currentUser.staff}}
@@ -165,7 +165,7 @@
               {{#if model.email}}
                 {{model.email}}
               {{else}}
-                {{d-button action="checkEmail" actionParam=model icon="envelope-o" label="admin.users.check_email.text" class="btn-primary"}}
+                {{d-button action=(route-action "checkEmail") actionParam=model icon="envelope-o" label="admin.users.check_email.text" class="btn-primary"}}
               {{/if}}
             </dd>
             </div>
@@ -186,7 +186,7 @@
           {{/if}}
 
           {{#if canDeleteUser}}
-            <div>{{d-button action="adminDelete" icon="exclamation-triangle" label="user.admin_delete" class="btn-danger"}}</div>
+            <div>{{d-button action=(action "adminDelete") icon="exclamation-triangle" label="user.admin_delete" class="btn-danger"}}</div>
           {{/if}}
         </dl>
         {{plugin-outlet name="user-profile-secondary" args=(hash model=model)}}
diff --git a/app/assets/javascripts/discourse/templates/user/activity.hbs b/app/assets/javascripts/discourse/templates/user/activity.hbs
index 716a853055..15b267e2f8 100644
--- a/app/assets/javascripts/discourse/templates/user/activity.hbs
+++ b/app/assets/javascripts/discourse/templates/user/activity.hbs
@@ -29,7 +29,7 @@
 
   {{#if canDownloadPosts}}
     <div class='user-archive'>
-      {{d-button action="exportUserArchive" class="btn-default" label="user.download_archive.button_text" icon="download"}}
+      {{d-button action=(action "exportUserArchive") class="btn-default" label="user.download_archive.button_text" icon="download"}}
     </div>
   {{/if}}
 {{/d-section}}
diff --git a/app/assets/javascripts/discourse/templates/user/messages.hbs b/app/assets/javascripts/discourse/templates/user/messages.hbs
index 60318347c3..44a55413ea 100644
--- a/app/assets/javascripts/discourse/templates/user/messages.hbs
+++ b/app/assets/javascripts/discourse/templates/user/messages.hbs
@@ -1,7 +1,7 @@
 {{#d-section class="user-navigation" pageClass="user-messages"}}
   {{#unless site.mobileView}}
     {{#if showNewPM}}
-      {{d-button class="btn-primary new-private-message" action="composePrivateMessage" icon="envelope" label="user.new_private_message"}}
+      {{d-button class="btn-primary new-private-message" action=(route-action "composePrivateMessage") icon="envelope" label="user.new_private_message"}}
     {{/if}}
   {{/unless}}
 
@@ -66,7 +66,7 @@
 
     {{#if site.mobileView}}
       {{#if showNewPM}}
-        {{d-button class="btn-primary new-private-message" action="composePrivateMessage" icon="envelope" label="user.new_private_message"}}
+        {{d-button class="btn-primary new-private-message" action=(route-action "composePrivateMessage") icon="envelope" label="user.new_private_message"}}
       {{/if}}
     {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/user/notifications.hbs b/app/assets/javascripts/discourse/templates/user/notifications.hbs
index ede14b75b9..2c520a5247 100644
--- a/app/assets/javascripts/discourse/templates/user/notifications.hbs
+++ b/app/assets/javascripts/discourse/templates/user/notifications.hbs
@@ -40,7 +40,7 @@
 {{/d-section}}
 
 <section class='user-right'>
-  {{#load-more class="notification-history user-stream" selector=".user-stream .notification" action="loadMore"}}
+  {{#load-more class="notification-history user-stream" selector=".user-stream .notification" action=(action "loadMore")}}
     {{outlet}}
     {{conditional-loading-spinner condition=model.loadingMore}}
   {{/load-more}}
diff --git a/app/assets/javascripts/discourse/templates/user/preferences/_save-button.hbs b/app/assets/javascripts/discourse/templates/user/preferences/_save-button.hbs
index bd933d084a..8a6c699742 100644
--- a/app/assets/javascripts/discourse/templates/user/preferences/_save-button.hbs
+++ b/app/assets/javascripts/discourse/templates/user/preferences/_save-button.hbs
@@ -1,4 +1,4 @@
-{{#d-button action="save" disabled=model.isSaving class="btn btn-primary save-user"}}
+{{#d-button action=(action "save") disabled=model.isSaving class="btn btn-primary save-user"}}
   {{saveButtonText}}
 {{/d-button}}
 
diff --git a/app/assets/javascripts/discourse/templates/users.hbs b/app/assets/javascripts/discourse/templates/users.hbs
index bfe29fb340..28abecc4a6 100644
--- a/app/assets/javascripts/discourse/templates/users.hbs
+++ b/app/assets/javascripts/discourse/templates/users.hbs
@@ -1,5 +1,5 @@
 {{#d-section pageClass="users"}}
-  {{#load-more selector=".directory tbody tr" action="loadMore"}}
+  {{#load-more selector=".directory tbody tr" action=(action "loadMore")}}
     <div class="container">
       <div class='directory'>
         {{plugin-outlet name="users-top" connectorTagName='div' args=(hash model=model)}}
diff --git a/app/assets/javascripts/discourse/widgets/component-connector.js.es6 b/app/assets/javascripts/discourse/widgets/component-connector.js.es6
index a1e92218a2..44add9ca7e 100644
--- a/app/assets/javascripts/discourse/widgets/component-connector.js.es6
+++ b/app/assets/javascripts/discourse/widgets/component-connector.js.es6
@@ -20,6 +20,12 @@ export default class ComponentConnector {
         .lookupFactory(`component:${componentName}`)
         .create(opts);
 
+      // component connector is not triggering didReceiveAttrs
+      // so we make sure to compute the component attrs
+      if (view.selectKitComponent) {
+        view._compute();
+      }
+
       if (Ember.setOwner) {
         Ember.setOwner(view, Ember.getOwner(mounted));
       }
diff --git a/app/assets/javascripts/discourse/widgets/glue.js.es6 b/app/assets/javascripts/discourse/widgets/glue.js.es6
index 24aa1ac6af..97fcbd3fe5 100644
--- a/app/assets/javascripts/discourse/widgets/glue.js.es6
+++ b/app/assets/javascripts/discourse/widgets/glue.js.es6
@@ -30,6 +30,16 @@ export default class WidgetGlue {
 
   rerenderWidget() {
     Ember.run.cancel(this._timeout);
+
+    // in test mode return early if store cannot be found
+    if (Ember.testing) {
+      try {
+        this.register.lookup("service:store");
+      } catch (e) {
+        return;
+      }
+    }
+
     const newTree = new this._widgetClass(this.attrs, this.register, {
       dirtyKeys: this.dirtyKeys
     });
diff --git a/app/assets/javascripts/discourse/widgets/home-logo.js.es6 b/app/assets/javascripts/discourse/widgets/home-logo.js.es6
index 5c7454df11..86bc33966a 100644
--- a/app/assets/javascripts/discourse/widgets/home-logo.js.es6
+++ b/app/assets/javascripts/discourse/widgets/home-logo.js.es6
@@ -17,7 +17,7 @@ export default createWidget("home-logo", {
   },
 
   logoUrl() {
-    return this.siteSettings.site_logo_url || "";
+    return this.siteSettings.site_home_logo_url || "";
   },
 
   mobileLogoUrl() {
diff --git a/app/assets/javascripts/discourse/widgets/post-cooked.js.es6 b/app/assets/javascripts/discourse/widgets/post-cooked.js.es6
index bf3a323752..84c6f70d6b 100644
--- a/app/assets/javascripts/discourse/widgets/post-cooked.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-cooked.js.es6
@@ -163,9 +163,10 @@ export default class PostCooked {
           $blockQuote.showHtml(div, "fast", finished);
         })
         .catch(e => {
-          if (e.jqXHR.status === 404) {
+          if ([403, 404].includes(e.jqXHR.status)) {
+            const icon = e.jqXHR.status === 403 ? "lock" : "trash-o";
             $blockQuote.showHtml(
-              $(`<div class='expanded-quote'>${iconHTML("trash-o")}</div>`),
+              $(`<div class='expanded-quote'>${iconHTML(icon)}</div>`),
               "fast",
               finished
             );
diff --git a/app/assets/javascripts/discourse/widgets/widget.js.es6 b/app/assets/javascripts/discourse/widgets/widget.js.es6
index 9b55573991..cae12c11bd 100644
--- a/app/assets/javascripts/discourse/widgets/widget.js.es6
+++ b/app/assets/javascripts/discourse/widgets/widget.js.es6
@@ -316,10 +316,10 @@ export default class Widget {
       }
 
       if (typeof method === "string") {
-        view.sendAction(method, param);
+        view[method](param);
         promise = Ember.RSVP.resolve();
       } else {
-        const target = view.get("targetObject") || view;
+        const target = view.get("target") || view;
         promise = method.call(target, param);
         if (!promise || !promise.then) {
           promise = Ember.RSVP.resolve(promise);
diff --git a/app/assets/javascripts/ember-addons/fmt.js.es6 b/app/assets/javascripts/ember-addons/fmt.js.es6
index f0882ec2af..5d3938ab2e 100644
--- a/app/assets/javascripts/ember-addons/fmt.js.es6
+++ b/app/assets/javascripts/ember-addons/fmt.js.es6
@@ -1,6 +1,5 @@
 import Ember from "ember";
 
-const inspect = Ember.inspect;
 const isArray = Ember.isArray;
 
 export default function(str, formats) {
@@ -19,6 +18,12 @@ export default function(str, formats) {
   return str.replace(/%@([0-9]+)?/g, function(s, argIndex) {
     argIndex = argIndex ? parseInt(argIndex, 10) - 1 : idx++;
     s = cachedFormats[argIndex];
-    return s === null ? "(null)" : s === undefined ? "" : inspect(s);
+    return typeof s === "string"
+      ? s
+      : s === null
+        ? "(null)"
+        : s === undefined
+          ? ""
+          : "" + s;
   });
 }
diff --git a/app/assets/javascripts/ember_jquery.js b/app/assets/javascripts/ember_jquery.js
index baed79b25d..be7d57d802 100644
--- a/app/assets/javascripts/ember_jquery.js
+++ b/app/assets/javascripts/ember_jquery.js
@@ -1,3 +1,4 @@
+//= require set-prototype-polyfill
 //= require env
 //= require jquery
 //= require ember_include
diff --git a/app/assets/javascripts/env.js b/app/assets/javascripts/env.js
index f561c7fad7..458b7caeb2 100644
--- a/app/assets/javascripts/env.js
+++ b/app/assets/javascripts/env.js
@@ -1,3 +1,4 @@
-window.ENV = { };
+window.ENV = {};
 window.EmberENV = window.EmberENV || {};
 window.EmberENV.FORCE_JQUERY = true;
+window.EmberENV.EXTEND_PROTOTYPES = window.EmberENV.EXTEND_PROTOTYPES || {};
diff --git a/app/assets/javascripts/locales/i18n.js b/app/assets/javascripts/locales/i18n.js
index 0d27ee2fca..74991a7561 100644
--- a/app/assets/javascripts/locales/i18n.js
+++ b/app/assets/javascripts/locales/i18n.js
@@ -307,7 +307,7 @@ I18n.enableVerboseLocalization = function() {
       if (!_.isEmpty(value)) {
         message += ", parameters: " + JSON.stringify(value);
       }
-      Em.Logger.info(message);
+      Ember.Logger.info(message);
     }
     return t.apply(I18n, [scope, value]) + " (#" + current + ")";
   };
diff --git a/app/assets/javascripts/polyfills.js b/app/assets/javascripts/polyfills.js
index a4a90dfe2c..69c3987afe 100644
--- a/app/assets/javascripts/polyfills.js
+++ b/app/assets/javascripts/polyfills.js
@@ -178,5 +178,4 @@ if (!Array.prototype.find) {
     writable: true
   });
 }
-
 /* eslint-enable */
diff --git a/app/assets/javascripts/preload-store.js.es6 b/app/assets/javascripts/preload-store.js.es6
index 6af6282777..b096afd4c1 100644
--- a/app/assets/javascripts/preload-store.js.es6
+++ b/app/assets/javascripts/preload-store.js.es6
@@ -19,7 +19,7 @@ export default {
   **/
   getAndRemove(key, finder) {
     if (this.data[key]) {
-      var promise = Em.RSVP.resolve(this.data[key]);
+      var promise = Ember.RSVP.resolve(this.data[key]);
       delete this.data[key];
       return promise;
     }
diff --git a/app/assets/javascripts/pretty-text/emoji/data.js.es6.erb b/app/assets/javascripts/pretty-text/emoji/data.js.es6.erb
index 765ecc3303..32a9b986bd 100644
--- a/app/assets/javascripts/pretty-text/emoji/data.js.es6.erb
+++ b/app/assets/javascripts/pretty-text/emoji/data.js.es6.erb
@@ -1,32 +1,5 @@
 export const emojis = <%= Emoji.standard.map(&:name).flatten.inspect %>;
 export const tonableEmojis = <%= Emoji.tonable_emojis.flatten.inspect %>;
 export const aliases = <%= Emoji.aliases.inspect.gsub("=>", ":") %>;
-export const searchAliases = <%= Emoji.searchAliases.inspect.gsub("=>", ":") %>;
-export const translations = {
-  ':)'   : 'slight_smile',
-  ':-)'  : 'slight_smile',
-  '^_^'  : 'slight_smile',
-  '^__^' : 'slight_smile',
-  ':('   : 'frowning',
-  ':-('  : 'frowning',
-  ';)'   : 'wink',
-  ';-)'  : 'wink',
-  ':\'(' : 'cry',
-  ':\'-(': 'cry',
-  ':-\'(': 'cry',
-  ':p'   : 'stuck_out_tongue',
-  ':P'   : 'stuck_out_tongue',
-  ':-P'  : 'stuck_out_tongue',
-  ':O'   : 'open_mouth',
-  ':-O'  : 'open_mouth',
-  ':D'   : 'smiley',
-  ':-D'  : 'smiley',
-  ':|'   : 'expressionless',
-  ':-|'  : 'expressionless',
-  ':/'   : 'confused',
-  '8-)'  : 'sunglasses',
-  ";P"   : 'stuck_out_tongue_winking_eye',
-  ";-P"  : 'stuck_out_tongue_winking_eye',
-  ":$"   : 'blush',
-  ":-$"  : 'blush'
-};
+export const searchAliases = <%= Emoji.search_aliases.inspect.gsub("=>", ":") %>;
+export const translations = <%= Emoji.translations.inspect.gsub("=>", ":") %>;
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js.es6
index 548cf74638..f1fc15e7aa 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js.es6
@@ -9,22 +9,18 @@ let translationTree = null;
 // We build a data structure that allows us to quickly
 // search through our N next chars to see if any match
 // one of our alias emojis.
-//
 function buildTranslationTree() {
   let tree = [];
   let lastNode;
 
-  Object.keys(translations).forEach(function(key) {
-    let i;
+  Object.keys(translations).forEach(key => {
     let node = tree;
 
-    for (i = 0; i < key.length; i++) {
+    for (let i = 0; i < key.length; i++) {
       let code = key.charCodeAt(i);
-      let j;
-
       let found = false;
 
-      for (j = 0; j < node.length; j++) {
+      for (let j = 0; j < node.length; j++) {
         if (node[j][0] === code) {
           node = node[j][1];
           found = true;
@@ -33,7 +29,7 @@ function buildTranslationTree() {
       }
 
       if (!found) {
-        // token, children, value
+        // code, children, value
         let tmp = [code, []];
         node.push(tmp);
         lastNode = tmp;
@@ -41,7 +37,7 @@ function buildTranslationTree() {
       }
     }
 
-    lastNode[1] = translations[key];
+    lastNode[2] = translations[key];
   });
 
   return tree;
@@ -121,28 +117,28 @@ function getEmojiTokenByName(name, state) {
 function getEmojiTokenByTranslation(content, pos, state) {
   translationTree = translationTree || buildTranslationTree();
 
-  let currentTree = translationTree;
-
-  let i;
-  let search = true;
-  let found = false;
+  let t = translationTree;
   let start = pos;
+  let found = null;
 
-  while (search) {
-    search = false;
+  while (t.length > 0 && pos < content.length) {
+    let matched = false;
     let code = content.charCodeAt(pos);
 
-    for (i = 0; i < currentTree.length; i++) {
-      if (currentTree[i][0] === code) {
-        currentTree = currentTree[i][1];
-        pos++;
-        search = true;
-        if (typeof currentTree === "string") {
-          found = currentTree;
-        }
+    for (let i = 0; i < t.length; i++) {
+      if (t[i][0] === code) {
+        matched = true;
+        found = t[i][2];
+        t = t[i][1];
         break;
       }
     }
+
+    if (!matched) {
+      return;
+    }
+
+    pos++;
   }
 
   if (!found) {
@@ -181,34 +177,31 @@ function applyEmoji(
   enableShortcuts,
   inlineEmoji
 ) {
-  let i;
   let result = null;
-  let contentToken = null;
-
   let start = 0;
 
   if (emojiUnicodeReplacer) {
     content = emojiUnicodeReplacer(content);
   }
 
-  let endToken = content.length;
+  let end = content.length;
 
-  for (i = 0; i < content.length - 1; i++) {
+  for (let i = 0; i < content.length - 1; i++) {
     let offset = 0;
-    const emojiName = getEmojiName(content, i, state, inlineEmoji);
     let token = null;
 
-    if (emojiName) {
-      token = getEmojiTokenByName(emojiName, state);
+    const name = getEmojiName(content, i, state, inlineEmoji);
+
+    if (name) {
+      token = getEmojiTokenByName(name, state);
       if (token) {
-        offset = emojiName.length + 2;
+        offset = name.length + 2;
       }
     }
 
     if (enableShortcuts && !token) {
       // handle aliases (note: we can't do this in inline cause ; is not a split point)
-      //
-      let info = getEmojiTokenByTranslation(content, i, state);
+      const info = getEmojiTokenByTranslation(content, i, state);
 
       if (info) {
         offset = info.pos - i;
@@ -218,21 +211,24 @@ function applyEmoji(
 
     if (token) {
       result = result || [];
+
       if (i - start > 0) {
-        contentToken = new state.Token("text", "", 0);
-        contentToken.content = content.slice(start, i);
-        result.push(contentToken);
+        let text = new state.Token("text", "", 0);
+        text.content = content.slice(start, i);
+        result.push(text);
       }
 
       result.push(token);
-      endToken = start = i + offset;
+
+      end = start = i + offset;
+      i += offset - 1;
     }
   }
 
-  if (endToken < content.length) {
-    contentToken = new state.Token("text", "", 0);
-    contentToken.content = content.slice(endToken);
-    result.push(contentToken);
+  if (end < content.length) {
+    let text = new state.Token("text", "", 0);
+    text.content = content.slice(end);
+    result.push(text);
   }
 
   return result;
diff --git a/app/assets/javascripts/select-kit/components/category-chooser.js.es6 b/app/assets/javascripts/select-kit/components/category-chooser.js.es6
index 5cc57a7f6c..87dcf59afe 100644
--- a/app/assets/javascripts/select-kit/components/category-chooser.js.es6
+++ b/app/assets/javascripts/select-kit/components/category-chooser.js.es6
@@ -30,6 +30,12 @@ export default ComboBoxComponent.extend({
       return computedContent;
     }
 
+    if (this.get("scopedCategoryId")) {
+      computedContent = this.categoriesByScope().map(c =>
+        this.computeContentItem(c)
+      );
+    }
+
     const _matchFunction = (f, text) => {
       return this._normalize(text).indexOf(f) > -1;
     };
@@ -111,11 +117,14 @@ export default ComboBoxComponent.extend({
   },
 
   computeContent() {
+    return this.categoriesByScope(this.get("scopedCategoryId"));
+  },
+
+  categoriesByScope(scopedCategoryId = null) {
     const categories = Discourse.SiteSettings.fixed_category_positions_on_create
       ? Category.list()
       : Category.listByActivity();
 
-    let scopedCategoryId = this.get("scopedCategoryId");
     if (scopedCategoryId) {
       const scopedCat = Category.findById(scopedCategoryId);
       scopedCategoryId =
diff --git a/app/assets/javascripts/select-kit/components/category-drop.js.es6 b/app/assets/javascripts/select-kit/components/category-drop.js.es6
index 0fd2d18751..3fa4470e96 100644
--- a/app/assets/javascripts/select-kit/components/category-drop.js.es6
+++ b/app/assets/javascripts/select-kit/components/category-drop.js.es6
@@ -159,6 +159,16 @@ export default ComboBoxComponent.extend({
       }
 
       let results = Discourse.Category.search(filter);
+
+      if (!this.siteSettings.allow_uncategorized_topics) {
+        results = results.filter(result => {
+          return (
+            result.id !==
+            Discourse.Site.currentProp("uncategorized_category_id")
+          );
+        });
+      }
+
       results = results.sort((a, b) => {
         if (a.parent_category_id && !b.parent_category_id) {
           return 1;
diff --git a/app/assets/javascripts/select-kit/components/composer-actions.js.es6 b/app/assets/javascripts/select-kit/components/composer-actions.js.es6
index dc63706985..7f19ae5bd1 100644
--- a/app/assets/javascripts/select-kit/components/composer-actions.js.es6
+++ b/app/assets/javascripts/select-kit/components/composer-actions.js.es6
@@ -19,7 +19,6 @@ export function _clearSnapshots() {
 }
 
 export default DropdownSelectBoxComponent.extend({
-  composerController: Ember.inject.controller("composer"),
   pluginApiIdentifiers: ["composer-actions"],
   classNames: "composer-actions",
   fullWidthOnMobile: true,
@@ -210,38 +209,14 @@ export default DropdownSelectBoxComponent.extend({
   },
 
   _replyFromExisting(options, post, topic) {
-    const reply = this.get("composerModel.reply");
+    this.closeComposer();
 
-    let url;
-    if (post) url = post.get("url");
-    if (!post && topic) url = topic.get("url");
-
-    let topicTitle;
-    if (topic) topicTitle = topic.get("title");
-
-    this.get("composerController").close();
-    this.get("composerController")
-      .open(options)
-      .then(() => {
-        if (!url || !topicTitle) return;
-
-        url = `${location.protocol}//${location.host}${url}`;
-        const link = `[${Handlebars.escapeExpression(topicTitle)}](${url})`;
-        const continueDiscussion = I18n.t("post.continue_discussion", {
-          postLink: link
-        });
-
-        if (!reply.includes(continueDiscussion)) {
-          this.get("composerController")
-            .get("model")
-            .prependText(continueDiscussion, { new_line: true });
-        }
-      });
+    this.openComposer(options, post, topic);
   },
 
   _openComposer(options) {
-    this.get("composerController").close();
-    this.get("composerController").open(options);
+    this.closeComposer();
+    this.openComposer(options);
   },
 
   toggleWhisperSelected(options, model) {
@@ -323,7 +298,8 @@ export default DropdownSelectBoxComponent.extend({
           model
         );
       } else {
-        Ember.Logger.error(`No method '${action}' found`);
+        // eslint-disable-next-line no-console
+        console.error(`No method '${action}' found`);
       }
     }
   }
diff --git a/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6 b/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6
index 0b2f9a7e95..f263fc1789 100644
--- a/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6
+++ b/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6
@@ -182,6 +182,7 @@ export default ComboBox.extend(TagsMixin, {
     let results = json.results;
 
     context.set("termMatchesForbidden", json.forbidden ? true : false);
+    context.set("termMatchErrorMessage", json.forbidden_message);
 
     if (context.get("siteSettings.tags_sort_alphabetically")) {
       results = results.sort((a, b) => a.id > b.id);
diff --git a/app/assets/javascripts/select-kit/components/multi-select/selected-name.js.es6 b/app/assets/javascripts/select-kit/components/multi-select/selected-name.js.es6
index a56574122e..78479c1448 100644
--- a/app/assets/javascripts/select-kit/components/multi-select/selected-name.js.es6
+++ b/app/assets/javascripts/select-kit/components/multi-select/selected-name.js.es6
@@ -47,7 +47,7 @@ export default Ember.Component.extend({
 
   click() {
     if (this.get("isLocked")) return false;
-    this.sendAction("onClickSelectionItem", [this.get("computedContent")]);
+    this.onClickSelectionItem([this.get("computedContent")]);
     return false;
   }
 });
diff --git a/app/assets/javascripts/select-kit/components/notifications-button.js.es6 b/app/assets/javascripts/select-kit/components/notifications-button.js.es6
index f2b11bcb0a..b19e6662a5 100644
--- a/app/assets/javascripts/select-kit/components/notifications-button.js.es6
+++ b/app/assets/javascripts/select-kit/components/notifications-button.js.es6
@@ -1,6 +1,7 @@
 import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
 import {
   default as computed,
+  observes,
   on
 } from "ember-addons/ember-computed-decorators";
 import { buttonDetails } from "discourse/lib/notification-levels";
@@ -24,6 +25,15 @@ export default DropdownSelectBoxComponent.extend({
     return iconForSelectedDetails;
   },
 
+  @on("init")
+  @observes("i18nPostfix")
+  _setNotificationsButtonComponentOptions() {
+    this.get("rowComponentOptions").setProperties({
+      i18nPrefix: this.get("i18nPrefix"),
+      i18nPostfix: this.get("i18nPostfix")
+    });
+  },
+
   iconForSelectedDetails: Ember.computed.alias("selectedDetails.icon"),
 
   computeHeaderContent() {
@@ -37,14 +47,6 @@ export default DropdownSelectBoxComponent.extend({
     return content;
   },
 
-  @on("didReceiveAttrs")
-  _setNotificationsButtonComponentOptions() {
-    this.get("rowComponentOptions").setProperties({
-      i18nPrefix: this.get("i18nPrefix"),
-      i18nPostfix: this.get("i18nPostfix")
-    });
-  },
-
   @computed("computedValue")
   selectedDetails(computedValue) {
     return buttonDetails(computedValue);
diff --git a/app/assets/javascripts/select-kit/components/period-chooser.js.es6 b/app/assets/javascripts/select-kit/components/period-chooser.js.es6
index 88896a4070..fe784b5418 100644
--- a/app/assets/javascripts/select-kit/components/period-chooser.js.es6
+++ b/app/assets/javascripts/select-kit/components/period-chooser.js.es6
@@ -26,7 +26,9 @@ export default DropdownSelectBoxComponent.extend({
 
   actions: {
     onSelect() {
-      this.sendAction("action", this.get("computedValue"));
+      if (this.action) {
+        this.action(this.get("computedValue"));
+      }
     }
   }
 });
diff --git a/app/assets/javascripts/select-kit/components/select-kit.js.es6 b/app/assets/javascripts/select-kit/components/select-kit.js.es6
index b907e875b7..49144540c4 100644
--- a/app/assets/javascripts/select-kit/components/select-kit.js.es6
+++ b/app/assets/javascripts/select-kit/components/select-kit.js.es6
@@ -80,8 +80,9 @@ export default Ember.Component.extend(
     forceEscape: false,
 
     init() {
-      this._super();
+      this._super(...arguments);
 
+      this.selectKitComponent = true;
       this.noneValue = "__none__";
       this.set(
         "headerComponentOptions",
@@ -277,7 +278,9 @@ export default Ember.Component.extend(
         collectionComputedContent.length === 0 &&
         !isLoading
       ) {
-        return I18n.t("select_kit.no_content");
+        return (
+          this.get("termMatchErrorMessage") || I18n.t("select_kit.no_content")
+        );
       }
     },
 
@@ -389,9 +392,8 @@ export default Ember.Component.extend(
     },
 
     highlightSelection(items) {
-      this.propertyWillChange("highlightedSelection");
       this.set("highlightedSelection", makeArray(items));
-      this.propertyDidChange("highlightedSelection");
+      this.notifyPropertyChange("highlightedSelection");
     },
 
     clearHighlightSelection() {
diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js.es6 b/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js.es6
index 3253c5d9a2..0cd20b26dd 100644
--- a/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js.es6
+++ b/app/assets/javascripts/select-kit/components/select-kit/select-kit-header.js.es6
@@ -51,6 +51,6 @@ export default Ember.Component.extend({
   },
 
   click() {
-    this.sendAction("onToggle");
+    this.onToggle();
   }
 });
diff --git a/app/assets/javascripts/select-kit/components/select-kit/select-kit-row.js.es6 b/app/assets/javascripts/select-kit/components/select-kit/select-kit-row.js.es6
index a1c7f6ba4a..4690ef3543 100644
--- a/app/assets/javascripts/select-kit/components/select-kit/select-kit-row.js.es6
+++ b/app/assets/javascripts/select-kit/components/select-kit/select-kit-row.js.es6
@@ -83,10 +83,10 @@ export default Ember.Component.extend(UtilsMixin, {
   },
 
   click() {
-    this.sendAction("onClickRow", this.get("computedContent"));
+    this.onClickRow(this.get("computedContent"));
   },
 
   _sendMouseoverAction() {
-    this.sendAction("onMouseoverRow", this.get("computedContent"));
+    this.onMouseoverRow(this.get("computedContent"));
   }
 });
diff --git a/app/assets/javascripts/select-kit/components/tag-chooser.js.es6 b/app/assets/javascripts/select-kit/components/tag-chooser.js.es6
index 90c291b4de..807b86baf6 100644
--- a/app/assets/javascripts/select-kit/components/tag-chooser.js.es6
+++ b/app/assets/javascripts/select-kit/components/tag-chooser.js.es6
@@ -27,6 +27,7 @@ export default MultiSelectComponent.extend(TagsMixin, {
     }
 
     this.set("termMatchesForbidden", false);
+    this.set("termMatchErrorMessage", null);
 
     this.set("templateForRow", rowComponent => {
       const tag = rowComponent.get("computedContent");
@@ -117,6 +118,7 @@ export default MultiSelectComponent.extend(TagsMixin, {
     let results = json.results;
 
     context.set("termMatchesForbidden", json.forbidden ? true : false);
+    context.set("termMatchErrorMessage", json.forbidden_message);
 
     if (context.get("blacklist")) {
       results = results.filter(result => {
diff --git a/app/assets/javascripts/select-kit/components/tag-notifications-button.js.es6 b/app/assets/javascripts/select-kit/components/tag-notifications-button.js.es6
index 3ec3e110b4..b9772c1199 100644
--- a/app/assets/javascripts/select-kit/components/tag-notifications-button.js.es6
+++ b/app/assets/javascripts/select-kit/components/tag-notifications-button.js.es6
@@ -9,7 +9,7 @@ export default NotificationOptionsComponent.extend({
   allowInitialValueMutation: false,
 
   mutateValue(value) {
-    this.sendAction("action", value);
+    this.action(value);
   },
 
   computeValue() {
diff --git a/app/assets/javascripts/select-kit/components/topic-footer-mobile-dropdown.js.es6 b/app/assets/javascripts/select-kit/components/topic-footer-mobile-dropdown.js.es6
index 9ac5d83dcb..c83b53b66b 100644
--- a/app/assets/javascripts/select-kit/components/topic-footer-mobile-dropdown.js.es6
+++ b/app/assets/javascripts/select-kit/components/topic-footer-mobile-dropdown.js.es6
@@ -21,35 +21,43 @@ export default ComboBoxComponent.extend({
       content.push({
         id: "invite",
         icon: "users",
-        name: I18n.t("topic.invite_reply.title")
+        name: I18n.t("topic.invite_reply.title"),
+        __sk_row_type: "noopRow"
       });
     }
 
-    if (topic.get("bookmarked")) {
+    if (
+      (topic.get("bookmarked") && !topic.get("bookmarking")) ||
+      (!topic.get("bookmarked") && topic.get("bookmarking"))
+    ) {
       content.push({
         id: "bookmark",
         icon: "bookmark",
-        name: I18n.t("bookmarked.clear_bookmarks")
+        name: I18n.t("bookmarked.clear_bookmarks"),
+        __sk_row_type: "noopRow"
       });
     } else {
       content.push({
         id: "bookmark",
         icon: "bookmark",
-        name: I18n.t("bookmarked.title")
+        name: I18n.t("bookmarked.title"),
+        __sk_row_type: "noopRow"
       });
     }
 
     content.push({
       id: "share",
       icon: "link",
-      name: I18n.t("topic.share.title")
+      name: I18n.t("topic.share.title"),
+      __sk_row_type: "noopRow"
     });
 
     if (details.get("can_flag_topic")) {
       content.push({
         id: "flag",
         icon: "flag",
-        name: I18n.t("topic.flag_topic.title")
+        name: I18n.t("topic.flag_topic.title"),
+        __sk_row_type: "noopRow"
       });
     }
 
@@ -58,35 +66,41 @@ export default ComboBoxComponent.extend({
 
   autoHighlight() {},
 
-  mutateValue(value) {
-    const topic = this.get("topic");
+  actions: {
+    onSelect(value) {
+      const topic = this.get("topic");
 
-    if (!topic.get("id")) {
-      return;
-    }
+      if (!topic.get("id")) {
+        return;
+      }
 
-    const refresh = () => this.deselect(this.get("selection"));
+      const refresh = () => {
+        this._compute();
+        this.deselect();
+      };
 
-    switch (value) {
-      case "invite":
-        this.attrs.showInvite();
-        refresh();
-        break;
-      case "bookmark":
-        topic.toggleBookmark().then(() => refresh());
-        break;
-      case "share":
-        this.appEvents.trigger(
-          "share:url",
-          topic.get("shareUrl"),
-          $("#topic-footer-buttons")
-        );
-        refresh();
-        break;
-      case "flag":
-        this.attrs.showFlagTopic();
-        refresh();
-        break;
+      switch (value) {
+        case "flag":
+          this.showFlagTopic();
+          refresh();
+          break;
+        case "bookmark":
+          topic.toggleBookmark().then(refresh());
+          break;
+        case "share":
+          this.appEvents.trigger(
+            "share:url",
+            topic.get("shareUrl"),
+            $("#topic-footer-buttons")
+          );
+          refresh();
+          break;
+        case "invite":
+          this.showInvite();
+          refresh();
+          break;
+        default:
+      }
     }
   }
 });
diff --git a/app/assets/javascripts/set-prototype-polyfill.js b/app/assets/javascripts/set-prototype-polyfill.js
new file mode 100644
index 0000000000..0668bd73f5
--- /dev/null
+++ b/app/assets/javascripts/set-prototype-polyfill.js
@@ -0,0 +1,8 @@
+/* eslint-disable */
+Object.setPrototypeOf =
+  Object.setPrototypeOf ||
+  function(obj, proto) {
+    obj.__proto__ = proto;
+    return obj;
+  };
+/* eslint-enable */
diff --git a/app/assets/javascripts/vendor.js b/app/assets/javascripts/vendor.js
index bcf1f0d72f..76a27a347e 100644
--- a/app/assets/javascripts/vendor.js
+++ b/app/assets/javascripts/vendor.js
@@ -21,7 +21,6 @@
 //= require jquery.tagsinput.js
 //= require jquery.sortable.js
 //= require lodash.js
-//= require modernizr.custom.00874.js
 //= require mousetrap.js
 //= require rsvp.js
 //= require show-html.js
diff --git a/app/assets/javascripts/wizard/components/invite-list-user.js.es6 b/app/assets/javascripts/wizard/components/invite-list-user.js.es6
index 534c6b48e6..a4adc100ca 100644
--- a/app/assets/javascripts/wizard/components/invite-list-user.js.es6
+++ b/app/assets/javascripts/wizard/components/invite-list-user.js.es6
@@ -6,11 +6,5 @@ export default Ember.Component.extend({
   @computed("user.role")
   roleName(role) {
     return this.get("roles").findBy("id", role).label;
-  },
-
-  actions: {
-    removeUser(user) {
-      this.sendAction("removeUser", user);
-    }
   }
 });
diff --git a/app/assets/javascripts/wizard/components/radio-button.js.es6 b/app/assets/javascripts/wizard/components/radio-button.js.es6
index e1ffbf3f8f..096165199a 100644
--- a/app/assets/javascripts/wizard/components/radio-button.js.es6
+++ b/app/assets/javascripts/wizard/components/radio-button.js.es6
@@ -5,7 +5,7 @@ export default Ember.Component.extend({
 
   click(e) {
     e.preventDefault();
-    this.sendAction("onChange", this.get("radioValue"));
+    this.onChange(this.get("radioValue"));
   },
 
   @observes("value")
diff --git a/app/assets/javascripts/wizard/components/theme-preview.js.es6 b/app/assets/javascripts/wizard/components/theme-preview.js.es6
index e2e21b5ede..b5c408de9b 100644
--- a/app/assets/javascripts/wizard/components/theme-preview.js.es6
+++ b/app/assets/javascripts/wizard/components/theme-preview.js.es6
@@ -20,7 +20,7 @@ export default createPreviewComponent(305, 165, {
   },
 
   click() {
-    this.sendAction("onChange", this.get("colorsId"));
+    this.onChange(this.get("colorsId"));
   },
 
   @observes("step.fieldsById.base_scheme_id.value")
diff --git a/app/assets/javascripts/wizard/components/wizard-step.js.es6 b/app/assets/javascripts/wizard/components/wizard-step.js.es6
index 4420a5a65a..567e11df5f 100644
--- a/app/assets/javascripts/wizard/components/wizard-step.js.es6
+++ b/app/assets/javascripts/wizard/components/wizard-step.js.es6
@@ -112,7 +112,7 @@ export default Ember.Component.extend({
     this.set("saving", true);
     this.get("step")
       .save()
-      .then(response => this.sendAction("goNext", response))
+      .then(response => this.goNext(response))
       .catch(() => this.animateInvalidFields())
       .finally(() => this.set("saving", false));
   },
@@ -144,7 +144,8 @@ export default Ember.Component.extend({
       if (this.get("saving")) {
         return;
       }
-      this.sendAction("goBack");
+
+      this.goBack();
     },
 
     nextStep() {
diff --git a/app/assets/javascripts/wizard/templates/components/invite-list-user.hbs b/app/assets/javascripts/wizard/templates/components/invite-list-user.hbs
index c31d80349a..0c4c88a27b 100644
--- a/app/assets/javascripts/wizard/templates/components/invite-list-user.hbs
+++ b/app/assets/javascripts/wizard/templates/components/invite-list-user.hbs
@@ -1,6 +1,6 @@
 <span class='email'>{{user.email}}</span>
 <span class='role'>{{roleName}}</span>
 
-<button class="wizard-btn small danger remove-user" {{action "removeUser" user}}>
+<button class="wizard-btn small danger remove-user" {{action removeUser user}}>
   {{d-icon "times"}}
 </button>
diff --git a/app/assets/javascripts/wizard/templates/components/invite-list.hbs b/app/assets/javascripts/wizard/templates/components/invite-list.hbs
index c966c8bc00..d37cc82e3f 100644
--- a/app/assets/javascripts/wizard/templates/components/invite-list.hbs
+++ b/app/assets/javascripts/wizard/templates/components/invite-list.hbs
@@ -2,7 +2,7 @@
 {{#if users}}
 <div class="users-list">
   {{#each users as |user|}}
-    {{invite-list-user user=user roles=roles removeUser="removeUser"}}
+    {{invite-list-user user=user roles=roles removeUser=(action "removeUser")}}
   {{/each}}
 </div>
 {{/if}}
diff --git a/app/assets/javascripts/wizard/templates/components/theme-previews.hbs b/app/assets/javascripts/wizard/templates/components/theme-previews.hbs
index 9ec8161a1c..f267e49952 100644
--- a/app/assets/javascripts/wizard/templates/components/theme-previews.hbs
+++ b/app/assets/javascripts/wizard/templates/components/theme-previews.hbs
@@ -4,11 +4,11 @@
       {{theme-preview colorsId=choice.id
                       wizard=wizard
                       selectedId=field.value
-                      onChange="changed"}}
+                      onChange=(action "changed")}}
       {{radio-button radioValue=choice.id
                      label=choice.id
                      value=field.value
-                     onChange="changed"}}
+                     onChange=(action "changed")}}
     </li>
   {{/each}}
 </ul>
diff --git a/app/assets/javascripts/wizard/templates/components/wizard-field-radio.hbs b/app/assets/javascripts/wizard/templates/components/wizard-field-radio.hbs
index c4697794c9..cb65052fc8 100644
--- a/app/assets/javascripts/wizard/templates/components/wizard-field-radio.hbs
+++ b/app/assets/javascripts/wizard/templates/components/wizard-field-radio.hbs
@@ -6,6 +6,6 @@
                    extraLabel=c.extra_label
                    icon=c.icon
                    description=c.description
-                   onChange="changed"}}
+                   onChange=(action "changed")}}
   </div>
 {{/each}}
diff --git a/app/assets/javascripts/wizard/templates/step.hbs b/app/assets/javascripts/wizard/templates/step.hbs
index 2e00198a9a..9d42be41e5 100644
--- a/app/assets/javascripts/wizard/templates/step.hbs
+++ b/app/assets/javascripts/wizard/templates/step.hbs
@@ -1 +1 @@
-{{wizard-step step=step wizard=wizard goNext="goNext" goBack="goBack"}}
+{{wizard-step step=step wizard=wizard goNext=(action "goNext") goBack=(action "goBack")}}
diff --git a/app/assets/stylesheets/common/admin/customize.scss b/app/assets/stylesheets/common/admin/customize.scss
index e420481b03..d4b2b261f2 100644
--- a/app/assets/stylesheets/common/admin/customize.scss
+++ b/app/assets/stylesheets/common/admin/customize.scss
@@ -99,9 +99,6 @@
       margin-bottom: 0;
       font-size: $font-down-2;
     }
-    .btn-small {
-      font-size: $font-down-2;
-    }
   }
 
   .field-error {
diff --git a/app/assets/stylesheets/common/admin/dashboard_next.scss b/app/assets/stylesheets/common/admin/dashboard_next.scss
index eb4e6bc172..5a0b6da568 100644
--- a/app/assets/stylesheets/common/admin/dashboard_next.scss
+++ b/app/assets/stylesheets/common/admin/dashboard_next.scss
@@ -279,7 +279,13 @@
     }
 
     .actions {
-      margin: 0;
+      margin: 1em 0 0 0;
+      display: flex;
+      align-items: center;
+      color: $primary-medium;
+      .btn {
+        margin-right: 1em;
+      }
     }
   }
 }
diff --git a/app/assets/stylesheets/common/admin/flagging.scss b/app/assets/stylesheets/common/admin/flagging.scss
index c42b85f44b..f1010ddc35 100644
--- a/app/assets/stylesheets/common/admin/flagging.scss
+++ b/app/assets/stylesheets/common/admin/flagging.scss
@@ -191,7 +191,7 @@
   }
 }
 
-.flag-counts {
+div.flag-counts {
   display: inline-block;
   margin-right: 0.5em;
 
@@ -204,9 +204,16 @@
 .flagged-topic {
   td.topic-title {
     width: 400px;
+
+    .combined-title {
+      .d-icon {
+        margin-right: 0.5em;
+      }
+      display: flex;
+    }
+
     a {
       width: 400px;
-      display: inline-block;
       text-overflow: ellipsis;
       overflow: hidden;
       white-space: nowrap;
diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index d276ea033c..54b49674d5 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -134,7 +134,14 @@
   .link-bottom-line {
     font-size: $font-down-1;
     display: flex;
+    flex-wrap: wrap;
     align-items: center;
+    .discourse-tags {
+      flex-wrap: wrap;
+      // IE11 is being very stubborn but this is only protection for topics with
+      // a very excessive number of extra long tags - edge case.
+      -ms-flex: 1 0 0px;
+    }
     a.badge-wrapper.box,
     a.discourse-tag.box {
       padding-top: 0;
diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index c11f336e62..b00124a639 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -270,14 +270,6 @@
     min-height: 0;
   }
 
-  .d-editor-button-bar .btn {
-    padding: 4px 8px;
-    display: inline-block;
-    @media all and (max-width: 800px) {
-      padding: 5px;
-    }
-  }
-
   .submit-panel {
     display: flex;
     flex-shrink: 0;
diff --git a/app/assets/stylesheets/common/base/composer-user-selector.scss b/app/assets/stylesheets/common/base/composer-user-selector.scss
index f3ea48c8ab..a1614ffdfd 100644
--- a/app/assets/stylesheets/common/base/composer-user-selector.scss
+++ b/app/assets/stylesheets/common/base/composer-user-selector.scss
@@ -1,10 +1,11 @@
 div.ac-wrap.composer-user-selector-limited {
   width: 400px;
-
-  .btn-small {
-    border-radius: 10px;
-    position: relative;
-    top: -2px;
-    float: none;
+  padding: 0 10px;
+  margin-bottom: 5px;
+  .btn-primary {
+    margin-left: 0.5em;
+    padding: 3px 6px 2px;
+    font-size: $font-down-1;
+    min-height: unset;
   }
 }
diff --git a/app/assets/stylesheets/common/base/emoji.scss b/app/assets/stylesheets/common/base/emoji.scss
index df07721f59..d931856bfe 100644
--- a/app/assets/stylesheets/common/base/emoji.scss
+++ b/app/assets/stylesheets/common/base/emoji.scss
@@ -20,7 +20,7 @@ sup img.emoji {
   height: 300px;
   color: dark-light-choose(darken($primary, 40%), blend-primary-secondary(90%));
   background-color: $secondary;
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border: 1px solid $primary-low;
 }
 
 .emoji-picker .categories-column {
@@ -29,7 +29,7 @@ sup img.emoji {
   flex: 1 0 0;
   align-items: center;
   justify-content: space-between;
-  border-right: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border-right: 1px solid $primary-low;
   min-width: 36px;
 }
 
@@ -102,7 +102,7 @@ sup img.emoji {
   align-items: center;
   display: flex;
   justify-content: space-between;
-  border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border-top: 1px solid $primary-low;
 }
 
 .emoji-picker .info {
@@ -202,7 +202,7 @@ sup img.emoji {
 
 .emoji-picker .filter {
   background-color: none;
-  border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border-bottom: 1px solid $primary-low;
   padding: 5px;
   display: flex;
   position: relative;
diff --git a/app/assets/stylesheets/common/base/header.scss b/app/assets/stylesheets/common/base/header.scss
index 081c35c25c..70ef70888e 100644
--- a/app/assets/stylesheets/common/base/header.scss
+++ b/app/assets/stylesheets/common/base/header.scss
@@ -287,49 +287,81 @@
       white-space: nowrap;
       text-overflow: ellipsis;
       .discourse-tag {
-        display: inline;
+        display: inline; // tags need to stay inline in order for them to truncate
       }
     }
   }
-  // if a topic has both categories and tags, the tag container should shrink
-  // instead of wrapping to the next line.
-  .categories-wrapper + .topic-header-extra {
-    min-width: 0;
+  // the tag container should shrink
+  .topic-header-extra {
+    min-width: 1px; // 1px value is needed to avoid IE11 flexbox bug
   }
 }
 
+// PM header participants
+
+$avatar-height: 1.641em;
+$mobile-avatar-height: 1.532em;
+
 .topic-header-participants {
+  display: flex;
+  align-items: center;
+  overflow: hidden;
+  font-size: $font-down-1;
   &:not(:first-child) {
-    margin-left: 4px;
+    margin-left: 5px;
+  }
+  .trigger-user-card,
+  .trigger-group-card {
+    &:not(:last-of-type) {
+      margin-right: 5px;
+    }
   }
 
-  > span {
-    margin: 0 2px;
-    display: inline-block;
-    height: 20px;
+  .trigger-user-card {
+    .icon {
+      height: $avatar-height;
+      .mobile-view & {
+        height: $mobile-avatar-height;
+      }
+      display: inline-block;
+      img {
+        height: 100%;
+        width: auto;
+      }
+    }
   }
 
   .trigger-group-card {
-    height: 16px;
-    margin: 0 4px;
-    padding: 1px 4px;
+    padding: 0 5px;
     border: 1px solid $primary-low;
     border-radius: 0.25em;
-    align-items: center;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
 
-    a {
+    .icon {
+      display: flex;
+      align-items: center;
+      height: $avatar-height;
+      .mobile-view & {
+        height: $mobile-avatar-height;
+      }
       color: $primary-high;
 
       .d-icon {
-        margin-right: 4px;
+        margin-right: 5px;
       }
     }
+
+    span {
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    }
   }
 
   .more-participants {
-    display: inline-block;
     color: $header_primary-high;
-    line-height: 20px;
-    padding: 0 4px;
+    margin-left: 5px;
   }
 }
diff --git a/app/assets/stylesheets/common/base/lightbox.scss b/app/assets/stylesheets/common/base/lightbox.scss
index 1c1e46ade0..a83bab747c 100644
--- a/app/assets/stylesheets/common/base/lightbox.scss
+++ b/app/assets/stylesheets/common/base/lightbox.scss
@@ -2,7 +2,6 @@
   position: relative;
   display: inline-block;
   overflow: hidden;
-  background: $primary-low;
   &:hover .meta {
     opacity: 0.9;
     transition: opacity 0.5s;
diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss
index 6832098e44..2a9eaa8c15 100644
--- a/app/assets/stylesheets/common/base/onebox.scss
+++ b/app/assets/stylesheets/common/base/onebox.scss
@@ -565,3 +565,16 @@ aside.onebox.stackexchange .onebox-body {
 .onebox.google-photos-album {
   @extend .imgur-album;
 }
+
+// Force oneboxed videos to 16:9 aspect ratio
+.onebox.video-onebox {
+  position: relative;
+  padding: 0 0 56.25% 0;
+  width: 100%;
+
+  video {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+  }
+}
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index bb27732d2d..77298b6341 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -548,7 +548,7 @@ pre {
   code {
     word-wrap: normal;
     display: block;
-    padding: 5px 10px;
+    padding: 0.5em;
     color: $primary;
     background: blend-primary-secondary(5%);
     max-height: 500px;
diff --git a/app/assets/stylesheets/common/base/topic.scss b/app/assets/stylesheets/common/base/topic.scss
index 4b3db86c9e..de3a1759af 100644
--- a/app/assets/stylesheets/common/base/topic.scss
+++ b/app/assets/stylesheets/common/base/topic.scss
@@ -60,8 +60,8 @@
 .title-wrapper {
   display: flex;
   flex-wrap: wrap;
-  .btn-small {
-    margin: 0 6px 0 0;
+  button {
+    margin: 0 0.5em 0 0;
   }
   a.topic-featured-link {
     display: inline-block;
@@ -88,9 +88,6 @@ a.badge-category {
     display: flex;
     flex-wrap: wrap;
     width: 90%;
-    .btn-small {
-      margin: 0 6px 0 0;
-    }
     a.topic-featured-link {
       display: inline-block;
     }
diff --git a/app/assets/stylesheets/common/base/user-badges.scss b/app/assets/stylesheets/common/base/user-badges.scss
index db433abf70..f4688ec50c 100644
--- a/app/assets/stylesheets/common/base/user-badges.scss
+++ b/app/assets/stylesheets/common/base/user-badges.scss
@@ -206,7 +206,7 @@
   &.medium {
     flex: 0 0 auto;
     width: 32%;
-    margin-right: calc(2% - 3px);
+    margin-right: 1.63%;
     @media screen and (min-width: 851px) {
       &:nth-of-type(3n) {
         margin-right: 0;
diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss
index a7ac6f0b95..1379f9f880 100644
--- a/app/assets/stylesheets/common/base/user.scss
+++ b/app/assets/stylesheets/common/base/user.scss
@@ -86,9 +86,7 @@
       }
 
       h2 {
-        font-size: $font-up-2;
         font-weight: normal;
-        margin-top: 10px;
         max-width: 100%;
         white-space: nowrap;
         overflow: hidden;
@@ -97,9 +95,7 @@
 
       h3 {
         font-weight: normal;
-        font-size: $font-0;
-        margin: 5px 0;
-
+        margin-bottom: 0.5em;
         .d-icon:not(:first-of-type) {
           margin-left: 10px;
         }
diff --git a/app/assets/stylesheets/common/d-editor.scss b/app/assets/stylesheets/common/d-editor.scss
index 66d9799e47..8d8307d882 100644
--- a/app/assets/stylesheets/common/d-editor.scss
+++ b/app/assets/stylesheets/common/d-editor.scss
@@ -79,9 +79,15 @@
   padding-left: 3px;
   border-bottom: 1px solid $primary-low;
 
-  button {
+  .btn,
+  .btn-default {
     background-color: transparent;
     color: $primary-high;
+    padding: 4px 8px;
+    display: inline-block;
+    @media all and (max-width: 800px) {
+      padding: 5px;
+    }
   }
 
   .btn:not(.no-text) {
diff --git a/app/assets/stylesheets/common/foundation/base.scss b/app/assets/stylesheets/common/foundation/base.scss
index 03fa374c22..adf847650b 100644
--- a/app/assets/stylesheets/common/foundation/base.scss
+++ b/app/assets/stylesheets/common/foundation/base.scss
@@ -13,6 +13,14 @@ html {
   background-color: $secondary;
   overflow-y: scroll;
   direction: ltr;
+
+  &.text-size-larger {
+    font-size: $base-font-size-larger;
+  }
+
+  &.text-size-largest {
+    font-size: $base-font-size-largest;
+  }
 }
 
 // Links
diff --git a/app/assets/stylesheets/common/foundation/variables.scss b/app/assets/stylesheets/common/foundation/variables.scss
index 114811ef58..b2090ddd3f 100644
--- a/app/assets/stylesheets/common/foundation/variables.scss
+++ b/app/assets/stylesheets/common/foundation/variables.scss
@@ -33,6 +33,8 @@ $bronze: #cd7f32 !default;
 // --------------------------------------------------
 
 $base-font-size: 14px !default;
+$base-font-size-larger: 16px !default;
+$base-font-size-largest: 18px !default;
 $base-font-family: Helvetica, Arial, sans-serif !default;
 
 // Font-size defintions, multiplier ^ (step / interval)
@@ -195,14 +197,14 @@ $box-shadow: (
 // standard color transformations, use these if possible, and add any new dark-light-diffs here
 
 //primary
-$primary-very-low: dark-light-diff($primary, $secondary, 97%, -80%);
-$primary-low: dark-light-diff($primary, $secondary, 90%, -65%);
+$primary-very-low: dark-light-diff($primary, $secondary, 97%, -82%);
+$primary-low: dark-light-diff($primary, $secondary, 90%, -78%);
 $primary-low-mid: dark-light-diff($primary, $secondary, 70%, -45%);
 $primary-medium: dark-light-diff($primary, $secondary, 50%, -35%);
 $primary-high: dark-light-diff($primary, $secondary, 30%, -25%);
 
 //header_primary
-$header_primary-low: dark-light-diff($header_primary, $secondary, 90%, -65%);
+$header_primary-low: dark-light-diff($header_primary, $secondary, 90%, -78%);
 $header_primary-medium: dark-light-diff($header_primary, $secondary, 50%, -35%);
 $header_primary-high: dark-light-diff(
   $header_primary,
diff --git a/app/assets/stylesheets/common/select-kit/combo-box.scss b/app/assets/stylesheets/common/select-kit/combo-box.scss
index 102a6da1db..8b6b4d731e 100644
--- a/app/assets/stylesheets/common/select-kit/combo-box.scss
+++ b/app/assets/stylesheets/common/select-kit/combo-box.scss
@@ -19,8 +19,8 @@
 
     .select-kit-filter {
       padding: $input-padding;
-      border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
-      border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+      border-top: 1px solid $primary-low;
+      border-bottom: 1px solid $primary-low;
 
       .spinner {
         flex: 0 0 auto;
diff --git a/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss b/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
index 6c148f67fb..53c37d640c 100644
--- a/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
+++ b/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
@@ -14,7 +14,7 @@
     }
 
     .select-kit-body {
-      border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+      border: 1px solid $primary-low;
       background-clip: padding-box;
       box-shadow: shadow("dropdown");
       max-width: 300px;
diff --git a/app/assets/stylesheets/common/select-kit/select-kit.scss b/app/assets/stylesheets/common/select-kit/select-kit.scss
index cd5c7576d2..a96520b2ed 100644
--- a/app/assets/stylesheets/common/select-kit/select-kit.scss
+++ b/app/assets/stylesheets/common/select-kit/select-kit.scss
@@ -125,10 +125,6 @@
     align-items: center;
     justify-content: flex-start;
 
-    &.no-content {
-      white-space: nowrap;
-    }
-
     .name {
       margin: 0;
       overflow: hidden;
diff --git a/app/assets/stylesheets/desktop/modal.scss b/app/assets/stylesheets/desktop/modal.scss
index 895292e943..090a0bc826 100644
--- a/app/assets/stylesheets/desktop/modal.scss
+++ b/app/assets/stylesheets/desktop/modal.scss
@@ -42,7 +42,10 @@
 .close {
   font-size: $font-up-3;
   text-decoration: none;
-  color: dark-light-choose($primary-high, $secondary-low);
+  color: $primary-high;
+  &:visited {
+    color: $primary-high;
+  }
   cursor: pointer;
   &:hover {
     color: $primary;
diff --git a/app/assets/stylesheets/desktop/user-card.scss b/app/assets/stylesheets/desktop/user-card.scss
index f94ae71a90..f787290005 100644
--- a/app/assets/stylesheets/desktop/user-card.scss
+++ b/app/assets/stylesheets/desktop/user-card.scss
@@ -33,6 +33,10 @@ $user_card_background: $secondary;
     z-index: z("composer", "content") + 1;
   }
 
+  &.docked-card {
+    z-index: z("header") + 1;
+  }
+
   .card-content {
     padding: 12px 12px 0 12px;
     background: rgba($user_card_background, 0.85);
diff --git a/app/assets/stylesheets/mobile/topic.scss b/app/assets/stylesheets/mobile/topic.scss
index 5db0b876f7..409c291a31 100644
--- a/app/assets/stylesheets/mobile/topic.scss
+++ b/app/assets/stylesheets/mobile/topic.scss
@@ -189,13 +189,7 @@ sub sub {
   width: 100%;
 
   input#edit-title {
-    box-sizing: border-box;
     width: 100%;
-    height: 32px;
-  }
-  .btn-small {
-    padding: 6px 12px;
-    margin: 6px 6px 0 0;
   }
 
   .select-kit.combo-box.category-chooser {
diff --git a/app/controllers/admin/email_controller.rb b/app/controllers/admin/email_controller.rb
index 04b015b3c0..2415546005 100644
--- a/app/controllers/admin/email_controller.rb
+++ b/app/controllers/admin/email_controller.rb
@@ -30,10 +30,16 @@ class Admin::EmailController < Admin::AdminController
 
     email_logs = filter_logs(email_logs, params)
 
-    if params[:reply_key].present?
-      email_logs = email_logs.where(
-        "post_reply_keys.reply_key ILIKE ?", "%#{params[:reply_key]}%"
-      )
+    if (reply_key = params[:reply_key]).present?
+      email_logs =
+        if reply_key.length == 32
+          email_logs.where("post_reply_keys.reply_key = ?", reply_key)
+        else
+          email_logs.where(
+            "replace(post_reply_keys.reply_key::VARCHAR, '-', '') ILIKE ?",
+            "%#{reply_key}%"
+          )
+        end
     end
 
     email_logs = email_logs.to_a
@@ -51,8 +57,8 @@ class Admin::EmailController < Admin::AdminController
           *tuples
         )
         .pluck(:post_id, :user_id, "reply_key::text")
-        .each do |post_id, user_id, reply_key|
-          reply_keys[[post_id, user_id]] = reply_key
+        .each do |post_id, user_id, key|
+          reply_keys[[post_id, user_id]] = key
         end
     end
 
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 14627a1087..20dafe43e0 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -32,12 +32,13 @@ class Admin::UsersController < Admin::AdminController
   def index
     users = ::AdminUserIndexQuery.new(params).find_users
 
+    opts = {}
     if params[:show_emails] == "true"
-      guardian.can_see_emails = true
       StaffActionLogger.new(current_user).log_show_emails(users)
+      opts[:emails_desired] = true
     end
 
-    render_serialized(users, AdminUserListSerializer)
+    render_serialized(users, AdminUserListSerializer, opts)
   end
 
   def show
diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb
index c1bb2dda9e..96d358b0ab 100644
--- a/app/controllers/categories_controller.rb
+++ b/app/controllers/categories_controller.rb
@@ -280,7 +280,6 @@ class CategoriesController < ApplicationController
                       :auto_close_based_on_last_post,
                       :uploaded_logo_id,
                       :uploaded_background_id,
-                      :uploaded_meta_id,
                       :slug,
                       :allow_badges,
                       :topic_template,
diff --git a/app/controllers/invites_controller.rb b/app/controllers/invites_controller.rb
index 77dba98e5d..a178e401da 100644
--- a/app/controllers/invites_controller.rb
+++ b/app/controllers/invites_controller.rb
@@ -19,16 +19,21 @@ class InvitesController < ApplicationController
 
     invite = Invite.find_by(invite_key: params[:id])
 
-    if invite.present? && !invite.redeemed?
-      store_preloaded("invite_info", MultiJson.dump(
-        invited_by: UserNameSerializer.new(invite.invited_by, scope: guardian, root: false),
-        email: invite.email,
-        username: UserNameSuggester.suggest(invite.email))
-      )
+    if invite.present?
+      if !invite.redeemed?
+        store_preloaded("invite_info", MultiJson.dump(
+          invited_by: UserNameSerializer.new(invite.invited_by, scope: guardian, root: false),
+          email: invite.email,
+          username: UserNameSuggester.suggest(invite.email))
+        )
 
-      render layout: 'application'
+        render layout: 'application'
+      else
+        flash.now[:error] = I18n.t('invite.not_found_template', site_name: SiteSetting.title, base_url: Discourse.base_url)
+        render layout: 'no_ember'
+      end
     else
-      flash.now[:error] = I18n.t('invite.not_found_template', site_name: SiteSetting.title, base_url: Discourse.base_url)
+      flash.now[:error] = I18n.t('invite.not_found')
       render layout: 'no_ember'
     end
   end
@@ -42,16 +47,19 @@ class InvitesController < ApplicationController
       begin
         user = invite.redeem(username: params[:username], name: params[:name], password: params[:password], user_custom_fields: params[:user_custom_fields])
         if user.present?
-          log_on_user(user)
+          log_on_user(user) if user.active?
           post_process_invite(user)
         end
 
-        topic = user.present? ? invite.topics.first : nil
+        response = { success: true }
+        if user.present? && user.active?
+          topic = invite.topics.first
+          response[:redirect_to] = topic.present? ? path("#{topic.relative_url}") : path("/")
+        else
+          response[:message] = I18n.t('invite.confirm_email')
+        end
 
-        render json: {
-          success: true,
-          redirect_to: topic.present? ? path("#{topic.relative_url}") : path("/")
-        }
+        render json: response
       rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotSaved => e
         render json: {
           success: false,
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index b1fc8b0f5a..621788f7ec 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -68,6 +68,7 @@ class SearchController < ApplicationController
     search_args[:search_type] = :header
     search_args[:ip_address] = request.remote_ip
     search_args[:user_id] = current_user.id if current_user.present?
+    search_args[:restrict_to_archetype] = params[:restrict_to_archetype] if params[:restrict_to_archetype].present?
 
     search = Search.new(params[:term], search_args)
     result = search.execute
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 2c02fc71e3..f1e49da290 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -210,9 +210,24 @@ class TagsController < ::ApplicationController
 
     json_response = { results: tags }
 
-    if Tag.where_name(clean_name).exists? && !tags.find { |h| h[:id].downcase == clean_name.downcase }
+    if !tags.find { |h| h[:id].downcase == clean_name.downcase } && tag = Tag.where_name(clean_name).first
       # filter_allowed_tags determined that the tag entered is not allowed
       json_response[:forbidden] = params[:q]
+
+      category_names = tag.categories.where(id: guardian.allowed_category_ids).pluck(:name)
+      category_names += Category.joins(tag_groups: :tags).where(id: guardian.allowed_category_ids, "tags.id": tag.id).pluck(:name)
+
+      if category_names.present?
+        category_names.uniq!
+        json_response[:forbidden_message] = I18n.t(
+          "tags.forbidden.restricted_to",
+          count: category_names.count,
+          tag_name: tag.name,
+          category_names: category_names.join(", ")
+        )
+      else
+        json_response[:forbidden_message] = I18n.t("tags.forbidden.in_this_category", tag_name: tag.name)
+      end
     end
 
     render json: json_response
diff --git a/app/controllers/user_api_keys_controller.rb b/app/controllers/user_api_keys_controller.rb
index 44c3efe132..a9db864e90 100644
--- a/app/controllers/user_api_keys_controller.rb
+++ b/app/controllers/user_api_keys_controller.rb
@@ -51,9 +51,9 @@ class UserApiKeysController < ApplicationController
 
     require_params
 
-    unless SiteSetting.allowed_user_api_auth_redirects
+    if params.key?(:auth_redirect) && SiteSetting.allowed_user_api_auth_redirects
         .split('|')
-        .any? { |u| params[:auth_redirect] == u }
+        .none? { |u| params[:auth_redirect] == u }
 
       raise Discourse::InvalidAccess
     end
@@ -61,12 +61,13 @@ class UserApiKeysController < ApplicationController
     raise Discourse::InvalidAccess unless meets_tl?
 
     validate_params
+    @application_name = params[:application_name]
 
     # destroy any old keys we had
     UserApiKey.where(user_id: current_user.id, client_id: params[:client_id]).destroy_all
 
     key = UserApiKey.create!(
-      application_name: params[:application_name],
+      application_name: @application_name,
       client_id: params[:client_id],
       user_id: current_user.id,
       push_url: params[:push_url],
@@ -76,7 +77,7 @@ class UserApiKeysController < ApplicationController
 
     # we keep the payload short so it encrypts easily with public key
     # it is often restricted to 128 chars
-    payload = {
+    @payload = {
       key: key.key,
       nonce: params[:nonce],
       push: key.has_push?,
@@ -84,9 +85,19 @@ class UserApiKeysController < ApplicationController
     }.to_json
 
     public_key = OpenSSL::PKey::RSA.new(params[:public_key])
-    payload = Base64.encode64(public_key.public_encrypt(payload))
+    @payload = Base64.encode64(public_key.public_encrypt(@payload))
 
-    redirect_to "#{params[:auth_redirect]}?payload=#{CGI.escape(payload)}"
+    if params[:auth_redirect]
+      redirect_to("#{params[:auth_redirect]}?payload=#{CGI.escape(@payload)}")
+    else
+      respond_to do |format|
+        format.html { render :show }
+        format.json do
+          instructions = I18n.t("user_api_key.instructions", application_name: @application_name)
+          render json: { payload: @payload, instructions: instructions }
+        end
+      end
+    end
   end
 
   def revoke
@@ -124,7 +135,6 @@ class UserApiKeysController < ApplicationController
      :nonce,
      :scopes,
      :client_id,
-     :auth_redirect,
      :application_name
     ].each { |p| params.require(p) }
   end
diff --git a/app/controllers/user_avatars_controller.rb b/app/controllers/user_avatars_controller.rb
index a7f32b1171..79c3715a09 100644
--- a/app/controllers/user_avatars_controller.rb
+++ b/app/controllers/user_avatars_controller.rb
@@ -99,7 +99,11 @@ class UserAvatarsController < ApplicationController
     upload_id, version = params[:version].split("_")
 
     version = (version || OptimizedImage::VERSION).to_i
-    return render_blank if version != OptimizedImage::VERSION
+
+    # old versions simply get new avatar
+    if version > OptimizedImage::VERSION
+      return render_blank
+    end
 
     upload_id = upload_id.to_i
     return render_blank unless upload_id > 0
diff --git a/app/controllers/user_badges_controller.rb b/app/controllers/user_badges_controller.rb
index cb67ee7b42..276f990650 100644
--- a/app/controllers/user_badges_controller.rb
+++ b/app/controllers/user_badges_controller.rb
@@ -61,13 +61,7 @@ class UserBadgesController < ApplicationController
         return render json: failed_json.merge(message: I18n.t('invalid_grant_badge_reason_link')), status: 400
       end
 
-      path = begin
-        URI.parse(params[:reason]).path
-      rescue URI::Error
-      end
-
-      route = Rails.application.routes.recognize_path(path) if path
-      if route
+      if route = Discourse.route_for(params[:reason])
         topic_id = route[:topic_id].to_i
         post_number = route[:post_number] || 1
 
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 1f216015fc..fe87d7d506 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -20,7 +20,7 @@ class UsersController < ApplicationController
   skip_before_action :check_xhr, only: [
     :show, :badges, :password_reset, :update, :account_created,
     :activate_account, :perform_account_activation, :user_preferences_redirect, :avatar,
-    :my_redirect, :toggle_anon, :admin_login, :confirm_admin, :email_login
+    :my_redirect, :toggle_anon, :admin_login, :confirm_admin, :email_login, :summary
   ]
 
   before_action :respond_to_suspicious_request, only: [:create]
@@ -213,13 +213,20 @@ class UsersController < ApplicationController
   end
 
   def summary
-    user = fetch_user_from_params(include_inactive: current_user.try(:staff?) || (current_user && SiteSetting.show_inactive_accounts))
+    @user = fetch_user_from_params(include_inactive: current_user.try(:staff?) || (current_user && SiteSetting.show_inactive_accounts))
+    raise Discourse::NotFound unless guardian.can_see_profile?(@user)
 
-    raise Discourse::NotFound unless guardian.can_see_profile?(user)
-
-    summary = UserSummary.new(user, guardian)
+    summary = UserSummary.new(@user, guardian)
     serializer = UserSummarySerializer.new(summary, scope: guardian)
-    render_json_dump(serializer)
+    respond_to do |format|
+      format.html do
+        @restrict_fields = guardian.restrict_user_fields?(@user)
+        render :show
+      end
+      format.json do
+        render_json_dump(serializer)
+      end
+    end
   end
 
   def invited
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index cd3ed04453..d4a60fe613 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -109,7 +109,12 @@ module ApplicationHelper
   end
 
   def html_classes
-    "#{mobile_view? ? 'mobile-view' : 'desktop-view'} #{mobile_device? ? 'mobile-device' : 'not-mobile-device'} #{rtl_class} #{current_user ? '' : 'anon'}"
+    list = []
+    list << (mobile_view? ? 'mobile-view' : 'desktop-view')
+    list << (mobile_device? ? 'mobile-device' : 'not-mobile-device')
+    list << 'rtl' if rtl?
+    list << text_size_class
+    list.join(' ')
   end
 
   def body_classes
@@ -126,8 +131,9 @@ module ApplicationHelper
     result.join(' ')
   end
 
-  def rtl_class
-    rtl? ? 'rtl' : ''
+  def text_size_class
+    size = current_user&.user_option&.text_size || SiteSetting.default_text_size
+    "text-size-#{size}"
   end
 
   def escape_unicode(javascript)
@@ -210,17 +216,10 @@ module ApplicationHelper
       opts[:image] = SiteSetting.site_apple_touch_icon_url
     end
 
-    # Use the correct scheme for open graph image
-    if opts[:image].present?
-      if opts[:image].start_with?("//")
-        uri = URI(Discourse.base_url)
-        opts[:image] = "#{uri.scheme}:#{opts[:image]}"
-      elsif opts[:image].start_with?("/uploads/")
-        opts[:image] = "#{Discourse.base_url}#{opts[:image]}"
-      elsif GlobalSetting.relative_url_root && opts[:image].start_with?(GlobalSetting.relative_url_root)
-        opts[:image] = "#{Discourse.base_url_no_prefix}#{opts[:image]}"
-      end
-    end
+    # Use the correct scheme for opengraph/twitter image
+    opts[:image] = get_absolute_image_url(opts[:image]) if opts[:image].present?
+    opts[:twitter_summary_large_image] =
+      get_absolute_image_url(opts[:twitter_summary_large_image]) if opts[:twitter_summary_large_image].present?
 
     # Add opengraph & twitter tags
     result = []
@@ -452,4 +451,17 @@ module ApplicationHelper
 
     setup_data
   end
+
+  def get_absolute_image_url(link)
+    absolute_url = link
+    if link.start_with?("//")
+      uri = URI(Discourse.base_url)
+      absolute_url = "#{uri.scheme}:#{link}"
+    elsif link.start_with?("/uploads/")
+      absolute_url = "#{Discourse.base_url}#{link}"
+    elsif GlobalSetting.relative_url_root && link.start_with?(GlobalSetting.relative_url_root)
+      absolute_url = "#{Discourse.base_url_no_prefix}#{link}"
+    end
+    absolute_url
+  end
 end
diff --git a/app/jobs/base.rb b/app/jobs/base.rb
index 0bd5b6fe35..a7d23994a0 100644
--- a/app/jobs/base.rb
+++ b/app/jobs/base.rb
@@ -197,14 +197,28 @@ module Jobs
 
     # If we are able to queue a job, do it
     if SiteSetting.queue_jobs?
-      if opts[:delay_for].present?
-        klass.perform_in(opts.delete(:delay_for), opts)
-      else
-        Sidekiq::Client.enqueue(klass, opts)
+      hash = {
+        'class' => klass,
+        'args' => [opts]
+      }
+
+      if delay = opts.delete(:delay_for)
+        if delay.to_f > 0
+          hash['at'] = Time.now.to_f + delay.to_f
+        end
       end
+
+      if queue = opts.delete(:queue)
+        hash['queue'] = queue
+      end
+
+      klass.client_push(hash)
+
     else
       # Otherwise execute the job right away
       opts.delete(:delay_for)
+      opts.delete(:queue)
+
       opts[:sync_exec] = true
       if Rails.env == "development"
         Scheduler::Defer.later("job") do
diff --git a/app/jobs/regular/bump_topic.rb b/app/jobs/regular/bump_topic.rb
new file mode 100644
index 0000000000..f4e2193754
--- /dev/null
+++ b/app/jobs/regular/bump_topic.rb
@@ -0,0 +1,20 @@
+module Jobs
+  class BumpTopic < Jobs::Base
+
+    def execute(args)
+      topic_timer = TopicTimer.find_by(id: args[:topic_timer_id] || args[:topic_status_update_id])
+
+      topic = topic_timer&.topic
+
+      if topic_timer.blank? || topic.blank? || topic_timer.execute_at > Time.zone.now
+        return
+      end
+
+      if Guardian.new(topic_timer.user).can_create_post_on_topic?(topic)
+        topic.add_small_action(Discourse.system_user, "autobumped", nil, bump: true)
+      end
+      topic_timer.trash!(Discourse.system_user)
+    end
+
+  end
+end
diff --git a/app/jobs/regular/toggle_topic_closed.rb b/app/jobs/regular/toggle_topic_closed.rb
index 7a77f02489..99a446af10 100644
--- a/app/jobs/regular/toggle_topic_closed.rb
+++ b/app/jobs/regular/toggle_topic_closed.rb
@@ -15,7 +15,16 @@ module Jobs
       user = topic_timer.user
 
       if Guardian.new(user).can_close?(topic)
-        topic.update_status('autoclosed', state, user)
+        if state == false && PostAction.auto_close_threshold_reached?(topic)
+          topic.set_or_create_timer(
+            TopicTimer.types[:open],
+            SiteSetting.num_hours_to_close_topic,
+            by_user: Discourse.system_user
+          )
+        else
+          topic.update_status('autoclosed', state, user)
+        end
+
         topic.inherit_auto_close_from_category if state == false
       end
     end
diff --git a/app/jobs/scheduled/clean_up_uploads.rb b/app/jobs/scheduled/clean_up_uploads.rb
index 13dc588b35..3c4f37cc60 100644
--- a/app/jobs/scheduled/clean_up_uploads.rb
+++ b/app/jobs/scheduled/clean_up_uploads.rb
@@ -55,7 +55,7 @@ module Jobs
         .joins("LEFT JOIN users u ON u.uploaded_avatar_id = uploads.id")
         .joins("LEFT JOIN user_avatars ua ON ua.gravatar_upload_id = uploads.id OR ua.custom_upload_id = uploads.id")
         .joins("LEFT JOIN user_profiles up ON up.profile_background = uploads.url OR up.card_background = uploads.url")
-        .joins("LEFT JOIN categories c ON c.uploaded_logo_id = uploads.id OR c.uploaded_background_id = uploads.id OR c.uploaded_meta_id = uploads.id")
+        .joins("LEFT JOIN categories c ON c.uploaded_logo_id = uploads.id OR c.uploaded_background_id = uploads.id")
         .joins("LEFT JOIN custom_emojis ce ON ce.upload_id = uploads.id")
         .joins("LEFT JOIN theme_fields tf ON tf.upload_id = uploads.id")
         .joins("LEFT JOIN user_exports ue ON ue.upload_id = uploads.id")
diff --git a/app/jobs/scheduled/periodical_updates.rb b/app/jobs/scheduled/periodical_updates.rb
index 2ab9517808..5701e6d6fd 100644
--- a/app/jobs/scheduled/periodical_updates.rb
+++ b/app/jobs/scheduled/periodical_updates.rb
@@ -15,7 +15,7 @@ module Jobs
       (@call_count % 24) == 1
     end
 
-    def execute(args)
+    def execute(args = nil)
       # Feature topics in categories
       CategoryFeaturedTopic.feature_topics(batched: true)
 
@@ -29,7 +29,7 @@ module Jobs
 
       # Forces rebake of old posts where needed, as long as no system avatars need updating
       if !SiteSetting.automatically_download_gravatars || !UserAvatar.where("last_gravatar_download_attempt IS NULL").limit(1).first
-        problems = Post.rebake_old(SiteSetting.rebake_old_posts_count)
+        problems = Post.rebake_old(SiteSetting.rebake_old_posts_count, priority: :low)
         problems.each do |hash|
           post_id = hash[:post].id
           Discourse.handle_job_exception(hash[:ex], error_context(args, "Rebaking post id #{post_id}", post_id: post_id))
diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rb
index af664694dc..9d442daa8d 100644
--- a/app/mailers/user_notifications.rb
+++ b/app/mailers/user_notifications.rb
@@ -235,7 +235,7 @@ class UserNotifications < ActionMailer::Base
       @preheader_text = I18n.t('user_notifications.digest.preheader', last_seen_at: @last_seen_at)
 
       opts = {
-        from_alias: I18n.t('user_notifications.digest.from', site_name: SiteSetting.title),
+        from_alias: I18n.t('user_notifications.digest.from', site_name: Email.site_title),
         subject: I18n.t('user_notifications.digest.subject_template', email_prefix: @email_prefix, date: short_date(Time.now)),
         add_unsubscribe_link: true,
         unsubscribe_url: "#{Discourse.base_url}/email/unsubscribe/#{@unsubscribe_key}",
@@ -412,7 +412,7 @@ class UserNotifications < ActionMailer::Base
       title: notification_data[:topic_title],
       post: post,
       username: original_username,
-      from_alias: user_name,
+      from_alias: I18n.t('email_from', user_name: user_name, site_name: Email.site_title),
       allow_reply_by_email: allow_reply_by_email,
       use_site_subject: opts[:use_site_subject],
       add_re_to_subject: opts[:add_re_to_subject],
diff --git a/app/models/admin_dashboard_data.rb b/app/models/admin_dashboard_data.rb
index 565a61f620..5b4ed57766 100644
--- a/app/models/admin_dashboard_data.rb
+++ b/app/models/admin_dashboard_data.rb
@@ -98,8 +98,8 @@ class AdminDashboardData
     add_problem_check :rails_env_check, :host_names_check, :force_https_check,
                       :ram_check, :google_oauth2_config_check,
                       :facebook_config_check, :twitter_config_check,
-                      :github_config_check, :s3_config_check, :image_magick_check,
-                      :failing_emails_check,
+                      :github_config_check, :pwa_config_check, :s3_config_check,
+                      :image_magick_check, :failing_emails_check,
                       :subfolder_ends_in_slash_check,
                       :pop3_polling_configuration, :email_polling_errored_recently,
                       :out_of_date_themes, :unreachable_themes
@@ -211,6 +211,15 @@ class AdminDashboardData
     end
   end
 
+  def pwa_config_check
+    unless SiteSetting.large_icon.present? && SiteSetting.large_icon.width == 512 && SiteSetting.large_icon.height == 512
+      return I18n.t('dashboard.pwa_config_icon_warning', base_path: Discourse.base_path)
+    end
+    unless SiteSetting.short_title.present? && SiteSetting.short_title.size <= 12
+      return I18n.t('dashboard.pwa_config_title_warning', base_path: Discourse.base_path)
+    end
+  end
+
   def s3_config_check
     # if set via global setting it is validated during the `use_s3?` call
     if !GlobalSetting.use_s3?
diff --git a/app/models/category.rb b/app/models/category.rb
index d7a4c0fa6d..45aac78824 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -3,6 +3,10 @@
 require_dependency 'distributed_cache'
 
 class Category < ActiveRecord::Base
+  self.ignored_columns = %w{
+    uploaded_meta_id
+  }
+
   include Searchable
   include Positionable
   include HasCustomFields
@@ -28,7 +32,6 @@ class Category < ActiveRecord::Base
   belongs_to :latest_post, class_name: "Post"
   belongs_to :uploaded_logo, class_name: "Upload"
   belongs_to :uploaded_background, class_name: "Upload"
-  belongs_to :uploaded_meta, class_name: "Upload"
 
   has_many :topics
   has_many :category_users
@@ -666,7 +669,6 @@ end
 #  sort_ascending                    :boolean
 #  uploaded_logo_id                  :integer
 #  uploaded_background_id            :integer
-#  uploaded_meta_id                  :integer
 #  topic_featured_link_allowed       :boolean          default(TRUE)
 #  all_topics_wiki                   :boolean          default(FALSE), not null
 #  show_subcategory_list             :boolean          default(FALSE)
@@ -676,7 +678,7 @@ end
 #  default_top_period                :string(20)       default("all")
 #  mailinglist_mirror                :boolean          default(FALSE), not null
 #  suppress_from_latest              :boolean          default(FALSE)
-#  minimum_required_tags             :integer          default(0)
+#  minimum_required_tags             :integer          default(0), not null
 #  navigate_to_first_post_after_read :boolean          default(FALSE), not null
 #
 # Indexes
diff --git a/app/models/category_list.rb b/app/models/category_list.rb
index 86631af4c0..f59f36c3cd 100644
--- a/app/models/category_list.rb
+++ b/app/models/category_list.rb
@@ -69,7 +69,6 @@ class CategoryList
     @categories = Category.includes(
       :uploaded_background,
       :uploaded_logo,
-      :uploaded_meta,
       :topic_only_relative_url,
       subcategories: [:topic_only_relative_url]
     ).secured(@guardian)
diff --git a/app/models/emoji.rb b/app/models/emoji.rb
index e7889896ef..c20d26ef06 100644
--- a/app/models/emoji.rb
+++ b/app/models/emoji.rb
@@ -25,10 +25,14 @@ class Emoji
     Discourse.cache.fetch(cache_key("aliases_emojis")) { db['aliases'] }
   end
 
-  def self.searchAliases
+  def self.search_aliases
     Discourse.cache.fetch(cache_key("search_aliases_emojis")) { db['searchAliases'] }
   end
 
+  def self.translations
+    Discourse.cache.fetch(cache_key("translations_emojis")) { load_translations }
+  end
+
   def self.custom
     Discourse.cache.fetch(cache_key("custom_emojis")) { load_custom }
   end
@@ -63,13 +67,13 @@ class Emoji
   end
 
   def self.clear_cache
-    %w{custom standard aliases search_aliases all tonable}.each do |key|
+    %w{custom standard aliases search_aliases translations all tonable}.each do |key|
       Discourse.cache.delete(cache_key("#{key}_emojis"))
     end
   end
 
   def self.db_file
-    "#{Rails.root}/lib/emoji/db.json"
+    @db_file ||= "#{Rails.root}/lib/emoji/db.json"
   end
 
   def self.db
@@ -101,6 +105,10 @@ class Emoji
     result
   end
 
+  def self.load_translations
+    db["translations"].merge(Plugin::CustomEmoji.translations)
+  end
+
   def self.base_directory
     "public#{base_url}"
   end
@@ -117,35 +125,35 @@ class Emoji
   end
 
   def self.unicode_replacements
-    return @unicode_replacements if @unicode_replacements
+    @unicode_replacements ||= begin
+      replacements = {}
+      is_tonable_emojis = Emoji.tonable_emojis
+      fitzpatrick_scales = FITZPATRICK_SCALE.map { |scale| scale.to_i(16) }
 
-    @unicode_replacements = {}
-    is_tonable_emojis = Emoji.tonable_emojis
-    fitzpatrick_scales = FITZPATRICK_SCALE.map { |scale| scale.to_i(16) }
+      db['emojis'].each do |e|
+        name = e['name']
+        next if name == 'tm'.freeze
 
-    db['emojis'].each do |e|
-      name = e['name']
-      next if name == 'tm'.freeze
+        code = replacement_code(e['code'])
+        next unless code
 
-      code = replacement_code(e['code'])
-      next unless code
-
-      @unicode_replacements[code] = name
-      if is_tonable_emojis.include?(name)
-        fitzpatrick_scales.each_with_index do |scale, index|
-          toned_code = code.codepoints.insert(1, scale).pack("U*".freeze)
-          @unicode_replacements[toned_code] = "#{name}:t#{index + 2}"
+        replacements[code] = name
+        if is_tonable_emojis.include?(name)
+          fitzpatrick_scales.each_with_index do |scale, index|
+            toned_code = code.codepoints.insert(1, scale).pack("U*".freeze)
+            replacements[toned_code] = "#{name}:t#{index + 2}"
+          end
         end
       end
+
+      replacements["\u{2639}"] = 'frowning'
+      replacements["\u{263A}"] = 'slight_smile'
+      replacements["\u{263B}"] = 'slight_smile'
+      replacements["\u{2661}"] = 'heart'
+      replacements["\u{2665}"] = 'heart'
+
+      replacements
     end
-
-    @unicode_replacements["\u{2639}"] = 'frowning'
-    @unicode_replacements["\u{263A}"] = 'slight_smile'
-    @unicode_replacements["\u{263B}"] = 'slight_smile'
-    @unicode_replacements["\u{2661}"] = 'heart'
-    @unicode_replacements["\u{2665}"] = 'heart'
-
-    @unicode_replacements
   end
 
   def self.unicode_unescape(string)
diff --git a/app/models/global_setting.rb b/app/models/global_setting.rb
index c81430d2cd..67320ee5e8 100644
--- a/app/models/global_setting.rb
+++ b/app/models/global_setting.rb
@@ -152,6 +152,7 @@ class GlobalSetting
         c[:password] = redis_password if redis_password.present?
         c[:db] = redis_db if redis_db != 0
         c[:db] = 1 if Rails.env == "test"
+        c[:id] = nil if redis_skip_client_commands
 
         c.freeze
       end
diff --git a/app/models/optimized_image.rb b/app/models/optimized_image.rb
index 5e5e8e4191..8da1f8753d 100644
--- a/app/models/optimized_image.rb
+++ b/app/models/optimized_image.rb
@@ -7,16 +7,24 @@ class OptimizedImage < ActiveRecord::Base
   belongs_to :upload
 
   # BUMP UP if optimized image algorithm changes
-  VERSION = 1
+  VERSION = 2
 
   def self.lock(upload_id, width, height)
     @hostname ||= `hostname`.strip rescue "unknown"
-    # note, the extra lock here ensures we only optimize one image per machine
-    # this can very easily lead to runaway CPU so slowing it down is beneficial
-    DistributedMutex.synchronize("optimized_image_host_#{@hostname}") do
+    # note, the extra lock here ensures we only optimize one image per machine on webs
+    # this can very easily lead to runaway CPU so slowing it down is beneficial and it is hijacked
+    #
+    # we can not afford this blocking in Sidekiq cause it can lead to starvation
+    if Sidekiq.server?
       DistributedMutex.synchronize("optimized_image_#{upload_id}_#{width}_#{height}") do
         yield
       end
+    else
+      DistributedMutex.synchronize("optimized_image_host_#{@hostname}") do
+        DistributedMutex.synchronize("optimized_image_#{upload_id}_#{width}_#{height}") do
+          yield
+        end
+      end
     end
   end
 
@@ -43,7 +51,7 @@ class OptimizedImage < ActiveRecord::Base
     thumbnail = find_by(upload_id: upload.id, width: width, height: height)
 
     # correct bad thumbnail if needed
-    if thumbnail && thumbnail.url.blank?
+    if thumbnail && (thumbnail.url.blank? || thumbnail.version != VERSION)
       thumbnail.destroy!
       thumbnail = nil
     end
@@ -94,7 +102,8 @@ class OptimizedImage < ActiveRecord::Base
             width: width,
             height: height,
             url: "",
-            filesize: File.size(temp_path)
+            filesize: File.size(temp_path),
+            version: VERSION
           )
 
           # store the optimized image and update its url
@@ -321,7 +330,7 @@ class OptimizedImage < ActiveRecord::Base
   MAX_PNGQUANT_SIZE = 500_000
 
   def self.convert_with(instructions, to, opts = {})
-    Discourse::Utils.execute_command(*instructions)
+    Discourse::Utils.execute_command("nice", "-n", "10", *instructions)
 
     allow_pngquant = to.downcase.ends_with?(".png") && File.size(to) < MAX_PNGQUANT_SIZE
     FileHelper.optimize_image!(to, allow_pngquant: allow_pngquant)
@@ -422,9 +431,12 @@ end
 #  upload_id :integer          not null
 #  url       :string           not null
 #  filesize  :integer
+#  etag      :string
+#  version   :integer
 #
 # Indexes
 #
+#  index_optimized_images_on_etag                            (etag)
 #  index_optimized_images_on_upload_id                       (upload_id)
 #  index_optimized_images_on_upload_id_and_width_and_height  (upload_id,width,height) UNIQUE
 #
diff --git a/app/models/post.rb b/app/models/post.rb
index 7279a0ff27..19d093d967 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -515,14 +515,33 @@ class Post < ActiveRecord::Base
     PostRevisor.new(self).revise!(updated_by, changes, opts)
   end
 
-  def self.rebake_old(limit)
+  def self.rebake_old(limit, priority: :normal)
+
+    limiter = RateLimiter.new(
+      nil,
+      "global_periodical_rebake_limit",
+      GlobalSetting.max_old_rebakes_per_15_minutes,
+      900,
+      global: true
+    )
+
     problems = []
     Post.where('baked_version IS NULL OR baked_version < ?', BAKED_VERSION)
       .order('id desc')
       .limit(limit).pluck(:id).each do |id|
       begin
+
+        break if !limiter.can_perform?
+
         post = Post.find(id)
-        post.rebake!
+        post.rebake!(priority: priority)
+
+        begin
+          limiter.performed!
+        rescue RateLimiter::LimitExceeded
+          break
+        end
+
       rescue => e
         problems << { post: post, ex: e }
 
@@ -541,15 +560,13 @@ class Post < ActiveRecord::Base
     problems
   end
 
-  def rebake!(opts = nil)
-    opts ||= {}
-
-    new_cooked = cook(raw, topic_id: topic_id, invalidate_oneboxes: opts.fetch(:invalidate_oneboxes, false))
+  def rebake!(invalidate_broken_images: false, invalidate_oneboxes: false, priority: nil)
+    new_cooked = cook(raw, topic_id: topic_id, invalidate_oneboxes: invalidate_oneboxes)
     old_cooked = cooked
 
     update_columns(cooked: new_cooked, baked_at: Time.new, baked_version: BAKED_VERSION)
 
-    if opts.fetch(:invalidate_broken_images, false)
+    if invalidate_broken_images
       custom_fields.delete(BROKEN_IMAGES)
       save_custom_fields
     end
@@ -559,7 +576,7 @@ class Post < ActiveRecord::Base
     QuotedPost.extract_from(self)
 
     # make sure we trigger the post process
-    trigger_post_process(bypass_bump: true)
+    trigger_post_process(bypass_bump: true, priority: priority)
 
     publish_change_to_clients!(:rebaked)
 
@@ -673,7 +690,7 @@ class Post < ActiveRecord::Base
   end
 
   # Enqueue post processing for this post
-  def trigger_post_process(bypass_bump: false)
+  def trigger_post_process(bypass_bump: false, priority: :normal)
     args = {
       post_id: id,
       bypass_bump: bypass_bump,
@@ -681,6 +698,11 @@ class Post < ActiveRecord::Base
     args[:image_sizes] = image_sizes if image_sizes.present?
     args[:invalidate_oneboxes] = true if invalidate_oneboxes.present?
     args[:cooking_options] = self.cooking_options
+
+    if priority == :low
+      args[:queue] = 'low'
+    end
+
     Jobs.enqueue(:process_post, args)
     DiscourseEvent.trigger(:after_trigger_post_process, self)
   end
diff --git a/app/models/post_action.rb b/app/models/post_action.rb
index 8efa750b53..a042a6e218 100644
--- a/app/models/post_action.rb
+++ b/app/models/post_action.rb
@@ -52,6 +52,26 @@ class PostAction < ActiveRecord::Base
       .count
   end
 
+  # Forums can choose to apply a minimum number of flags required before it shows up in
+  # the admin interface. One exception is posts hidden by tl3/tl4 - we want those to
+  # show up even if the minimum visibility is not met.
+  def self.apply_minimum_visibility(relation)
+    return relation unless SiteSetting.min_flags_staff_visibility > 1
+
+    params = {
+      min_flags: SiteSetting.min_flags_staff_visibility,
+      hidden_reasons: Post.hidden_reasons.only(:flagged_by_tl3_user, :flagged_by_tl4_user).values
+    }
+
+    relation.having(<<~SQL, params)
+      (COUNT(*) >= :min_flags) OR
+      (SUM(CASE
+        WHEN posts.hidden_reason_id IN (:hidden_reasons) THEN 1
+        ELSE 0
+       END) > 0)
+    SQL
+  end
+
   def self.update_flagged_posts_count
     flagged_relation = PostAction.active
       .flags
@@ -61,10 +81,7 @@ class PostAction < ActiveRecord::Base
       .where('posts.user_id > 0')
       .group("posts.id")
 
-    if SiteSetting.min_flags_staff_visibility > 1
-      flagged_relation = flagged_relation
-        .having("count(*) >= ?", SiteSetting.min_flags_staff_visibility)
-    end
+    flagged_relation = apply_minimum_visibility(flagged_relation)
 
     posts_flagged_count = flagged_relation
       .pluck("posts.id")
@@ -547,9 +564,7 @@ class PostAction < ActiveRecord::Base
 
   MAXIMUM_FLAGS_PER_POST = 3
 
-  def self.auto_close_if_threshold_reached(topic)
-    return if topic.nil? || topic.closed?
-
+  def self.auto_close_threshold_reached?(topic)
     flags = PostAction.active
       .flags
       .joins(:post)
@@ -563,6 +578,13 @@ class PostAction < ActiveRecord::Base
     # we need a minimum number of flags
     return if flags.sum { |f| f[1] } < SiteSetting.num_flags_to_close_topic
 
+    true
+  end
+
+  def self.auto_close_if_threshold_reached(topic)
+    return if topic.nil? || topic.closed?
+    return unless auto_close_threshold_reached?(topic)
+
     # the threshold has been reached, we will close the topic waiting for intervention
     topic.update_status("closed", true, Discourse.system_user,
       message: I18n.t(
@@ -638,6 +660,7 @@ class PostAction < ActiveRecord::Base
                       message_type: hiding_again ? :post_hidden_again : :post_hidden,
                       message_options: options)
     end
+    update_flagged_posts_count
   end
 
   def self.guess_hide_reason(post)
diff --git a/app/models/remote_theme.rb b/app/models/remote_theme.rb
index 5dbb3a9b15..c191477a4c 100644
--- a/app/models/remote_theme.rb
+++ b/app/models/remote_theme.rb
@@ -236,7 +236,6 @@ end
 #  id                :integer          not null, primary key
 #  remote_url        :string           not null
 #  remote_version    :string
-#  branch            :string
 #  local_version     :string
 #  about_url         :string
 #  license_url       :string
@@ -245,5 +244,6 @@ end
 #  created_at        :datetime         not null
 #  updated_at        :datetime         not null
 #  private_key       :text
+#  branch            :string
 #  last_error_text   :text
 #
diff --git a/app/models/site.rb b/app/models/site.rb
index cdc34c2ef8..74d08c9912 100644
--- a/app/models/site.rb
+++ b/app/models/site.rb
@@ -28,7 +28,7 @@ class Site
   def categories
     @categories ||= begin
       categories = Category
-        .includes(:uploaded_logo, :uploaded_background, :uploaded_meta)
+        .includes(:uploaded_logo, :uploaded_background)
         .secured(@guardian)
         .joins('LEFT JOIN topics t on t.id = categories.topic_id')
         .select('categories.*, t.slug topic_slug')
diff --git a/app/models/site_setting.rb b/app/models/site_setting.rb
index ee20d17616..0bdf7b3000 100644
--- a/app/models/site_setting.rb
+++ b/app/models/site_setting.rb
@@ -175,8 +175,19 @@ class SiteSetting < ActiveRecord::Base
     site_logo_small_url
     site_mobile_logo_url
     site_favicon_url
+    site_home_logo_url
   }.each { |client_setting| client_settings << client_setting }
 
+  def self.site_home_logo_url
+    upload = SiteSetting.logo
+
+    if SiteSetting.defaults.get(:title) != SiteSetting.title && !upload
+      ''
+    else
+      full_cdn_url(upload ? upload.url : '/images/d-logo-sketch.png')
+    end
+  end
+
   def self.site_logo_url
     upload = self.logo
     upload ? full_cdn_url(upload.url) : self.logo_url(warn: false)
diff --git a/app/models/theme_field.rb b/app/models/theme_field.rb
index 3a393c22e0..07e6e3fd76 100644
--- a/app/models/theme_field.rb
+++ b/app/models/theme_field.rb
@@ -29,10 +29,17 @@ class ThemeField < ActiveRecord::Base
     @theme_var_type_ids ||= [2, 3, 4]
   end
 
+  def self.force_recompilation!
+    find_each do |field|
+      field.compiler_version = 0
+      field.ensure_baked!
+    end
+  end
+
   validates :name, format: { with: /\A[a-z_][a-z0-9_-]*\z/i },
                    if: Proc.new { |field| ThemeField.theme_var_type_ids.include?(field.type_id) }
 
-  COMPILER_VERSION = 5
+  COMPILER_VERSION = 6
 
   belongs_to :theme
 
diff --git a/app/models/topic_embed.rb b/app/models/topic_embed.rb
index 9284c41a76..5258eac263 100644
--- a/app/models/topic_embed.rb
+++ b/app/models/topic_embed.rb
@@ -209,7 +209,7 @@ class TopicEmbed < ActiveRecord::Base
 
   def self.topic_id_for_embed(embed_url)
     embed_url = normalize_url(embed_url).sub(/^https?\:\/\//, '')
-    TopicEmbed.where("embed_url ~* '^https?://#{Regexp.escape(embed_url)}$'").pluck(:topic_id).first
+    TopicEmbed.where("embed_url ~* ?", "^https?://#{Regexp.escape(embed_url)}$").pluck(:topic_id).first
   end
 
   def self.first_paragraph_from(html)
diff --git a/app/models/topic_timer.rb b/app/models/topic_timer.rb
index e884f33ade..c8229bcca4 100644
--- a/app/models/topic_timer.rb
+++ b/app/models/topic_timer.rb
@@ -42,7 +42,8 @@ class TopicTimer < ActiveRecord::Base
       open: 2,
       publish_to_category: 3,
       delete: 4,
-      reminder: 5
+      reminder: 5,
+      bump: 6
     )
   end
 
@@ -108,6 +109,14 @@ class TopicTimer < ActiveRecord::Base
     Jobs.cancel_scheduled_job(:topic_reminder, topic_timer_id: id)
   end
 
+  def cancel_auto_bump_job
+    Jobs.cancel_scheduled_job(:bump_topic, topic_timer_id: id)
+  end
+
+  def schedule_auto_bump_job(time)
+    Jobs.enqueue_at(time, :bump_topic, topic_timer_id: id)
+  end
+
   def schedule_auto_open_job(time)
     return unless topic
     topic.update_status('closed', true, user) if !topic.closed
diff --git a/app/models/upload.rb b/app/models/upload.rb
index a90eb4c14e..7f58ed20bb 100644
--- a/app/models/upload.rb
+++ b/app/models/upload.rb
@@ -289,9 +289,11 @@ end
 #  extension         :string(10)
 #  thumbnail_width   :integer
 #  thumbnail_height  :integer
+#  etag              :string
 #
 # Indexes
 #
+#  index_uploads_on_etag        (etag)
 #  index_uploads_on_extension   (lower((extension)::text))
 #  index_uploads_on_id_and_url  (id,url)
 #  index_uploads_on_sha1        (sha1) UNIQUE
diff --git a/app/models/user_history.rb b/app/models/user_history.rb
index 745188bc7b..4eb345b6c0 100644
--- a/app/models/user_history.rb
+++ b/app/models/user_history.rb
@@ -232,9 +232,10 @@ end
 #
 # Indexes
 #
-#  index_user_histories_on_acting_user_id_and_action_and_id  (acting_user_id,action,id)
-#  index_user_histories_on_action_and_id                     (action,id)
-#  index_user_histories_on_category_id                       (category_id)
-#  index_user_histories_on_subject_and_id                    (subject,id)
-#  index_user_histories_on_target_user_id_and_id             (target_user_id,id)
+#  index_user_histories_on_acting_user_id_and_action_and_id        (acting_user_id,action,id)
+#  index_user_histories_on_action_and_id                           (action,id)
+#  index_user_histories_on_category_id                             (category_id)
+#  index_user_histories_on_subject_and_id                          (subject,id)
+#  index_user_histories_on_target_user_id_and_id                   (target_user_id,id)
+#  index_user_histories_on_topic_id_and_target_user_id_and_action  (topic_id,target_user_id,action)
 #
diff --git a/app/models/user_option.rb b/app/models/user_option.rb
index 4f2ba155c8..95b0d75795 100644
--- a/app/models/user_option.rb
+++ b/app/models/user_option.rb
@@ -28,6 +28,12 @@ class UserOption < ActiveRecord::Base
     @like_notification_frequency_type ||= Enum.new(always: 0, first_time_and_daily: 1, first_time: 2, never: 3)
   end
 
+  def self.text_sizes
+    @text_sizes ||= Enum.new(normal: 0, larger: 1, largest: 2)
+  end
+
+  validates :text_size_key, inclusion: { in: UserOption.text_sizes.values }
+
   def set_defaults
     self.email_always = SiteSetting.default_email_always
     self.mailing_list_mode = SiteSetting.default_email_mailing_list_mode
@@ -58,6 +64,8 @@ class UserOption < ActiveRecord::Base
 
     self.include_tl0_in_digests = SiteSetting.default_include_tl0_in_digests
 
+    self.text_size = SiteSetting.default_text_size
+
     true
   end
 
@@ -146,6 +154,14 @@ class UserOption < ActiveRecord::Base
     end
   end
 
+  def text_size
+    UserOption.text_sizes[text_size_key]
+  end
+
+  def text_size=(value)
+    self.text_size_key = UserOption.text_sizes[value.to_sym]
+  end
+
   private
 
   def update_tracked_topics
@@ -185,6 +201,7 @@ end
 #  homepage_id                      :integer
 #  theme_ids                        :integer          default([]), not null, is an Array
 #  hide_profile_and_presence        :boolean          default(FALSE), not null
+#  text_size_key                    :integer          default(0), not null
 #
 # Indexes
 #
diff --git a/app/serializers/admin_user_list_serializer.rb b/app/serializers/admin_user_list_serializer.rb
index f318cac53a..81d953a0e1 100644
--- a/app/serializers/admin_user_list_serializer.rb
+++ b/app/serializers/admin_user_list_serializer.rb
@@ -39,7 +39,7 @@ class AdminUserListSerializer < BasicUserSerializer
   def include_email?
     # staff members can always see their email
     (scope.is_staff? && (object.id == scope.user.id || object.staged?)) ||
-    (scope.is_admin? && scope.can_see_emails?)
+      (scope.is_admin? && @options[:emails_desired])
   end
 
   alias_method :include_secondary_emails?, :include_email?
diff --git a/app/serializers/basic_category_serializer.rb b/app/serializers/basic_category_serializer.rb
index 2074314a3e..6be2df27ff 100644
--- a/app/serializers/basic_category_serializer.rb
+++ b/app/serializers/basic_category_serializer.rb
@@ -30,7 +30,6 @@ class BasicCategorySerializer < ApplicationSerializer
 
   has_one :uploaded_logo, embed: :object, serializer: CategoryUploadSerializer
   has_one :uploaded_background, embed: :object, serializer: CategoryUploadSerializer
-  has_one :uploaded_meta, embed: :object, serializer: CategoryUploadSerializer
 
   def include_parent_category_id?
     parent_category_id
diff --git a/app/serializers/user_option_serializer.rb b/app/serializers/user_option_serializer.rb
index 9df725e84c..0a0e7048fa 100644
--- a/app/serializers/user_option_serializer.rb
+++ b/app/serializers/user_option_serializer.rb
@@ -23,7 +23,8 @@ class UserOptionSerializer < ApplicationSerializer
              :theme_key_seq,
              :allow_private_messages,
              :homepage_id,
-             :hide_profile_and_presence
+             :hide_profile_and_presence,
+             :text_size
 
   def auto_track_topics_after_msecs
     object.auto_track_topics_after_msecs || SiteSetting.default_other_auto_track_topics_after_msecs
diff --git a/app/serializers/user_summary_serializer.rb b/app/serializers/user_summary_serializer.rb
index fcb5a00aeb..c2c104ea38 100644
--- a/app/serializers/user_summary_serializer.rb
+++ b/app/serializers/user_summary_serializer.rb
@@ -18,8 +18,16 @@ class UserSummarySerializer < ApplicationSerializer
     end
   end
 
-  class UserWithCountSerializer < BasicUserSerializer
-    attributes :count, :name
+  class UserWithCountSerializer < ApplicationSerializer
+    attributes :id, :username, :name, :count, :avatar_template
+
+    def include_name?
+      SiteSetting.enable_names?
+    end
+
+    def avatar_template
+      User.avatar_template(object[:username], object[:uploaded_avatar_id])
+    end
   end
 
   class CategoryWithCountsSerializer < ApplicationSerializer
diff --git a/app/services/badge_granter.rb b/app/services/badge_granter.rb
index 6999be26e1..675a58e832 100644
--- a/app/services/badge_granter.rb
+++ b/app/services/badge_granter.rb
@@ -139,8 +139,7 @@ class BadgeGranter
   end
 
   def self.find_by_type(type)
-    id = "Badge::Trigger::#{type}".constantize
-    Badge.where(trigger: id)
+    Badge.where(trigger: "Badge::Trigger::#{type}".constantize)
   end
 
   def self.queue_key
@@ -151,15 +150,18 @@ class BadgeGranter
   #   :target_posts - whether the badge targets posts
   #   :trigger - the Badge::Trigger id
   def self.contract_checks!(sql, opts = {})
-    return unless sql.present?
+    return if sql.blank?
+
     if Badge::Trigger.uses_post_ids?(opts[:trigger])
       raise("Contract violation:\nQuery triggers on posts, but does not reference the ':post_ids' array") unless sql.match(/:post_ids/)
       raise "Contract violation:\nQuery triggers on posts, but references the ':user_ids' array" if sql.match(/:user_ids/)
     end
+
     if Badge::Trigger.uses_user_ids?(opts[:trigger])
       raise "Contract violation:\nQuery triggers on users, but does not reference the ':user_ids' array" unless sql.match(/:user_ids/)
       raise "Contract violation:\nQuery triggers on users, but references the ':post_ids' array" if sql.match(/:post_ids/)
     end
+
     if opts[:trigger] && !Badge::Trigger.is_none?(opts[:trigger])
       raise "Contract violation:\nQuery is triggered, but does not reference the ':backfill' parameter.\n(Hint: if :backfill is TRUE, you should ignore the :post_ids/:user_ids)" unless sql.match(/:backfill/)
     end
@@ -168,6 +170,7 @@ class BadgeGranter
     if opts[:target_posts]
       raise "Contract violation:\nQuery targets posts, but does not return a 'post_id' column" unless sql.match(/post_id/)
     end
+
     raise "Contract violation:\nQuery does not return a 'user_id' column" unless sql.match(/user_id/)
     raise "Contract violation:\nQuery does not return a 'granted_at' column" unless sql.match(/granted_at/)
     raise "Contract violation:\nQuery ends with a semicolon. Remove the semicolon; your sql will be used in a subquery." if sql.match(/;\s*\z/)
@@ -186,22 +189,25 @@ class BadgeGranter
     count_sql = "SELECT COUNT(*) count FROM (#{sql}) q WHERE :backfill = :backfill"
     grant_count = DB.query_single(count_sql, params).first.to_i
 
-    grants_sql =
-     if opts[:target_posts]
-       "SELECT u.id, u.username, q.post_id, t.title, q.granted_at
-     FROM(#{sql}) q
-     JOIN users u on u.id = q.user_id
+    grants_sql = if opts[:target_posts]
+      <<~SQL
+        SELECT u.id, u.username, q.post_id, t.title, q.granted_at
+          FROM (#{sql}) q
+          JOIN users u on u.id = q.user_id
      LEFT JOIN badge_posts p on p.id = q.post_id
      LEFT JOIN topics t on t.id = p.topic_id
-     WHERE :backfill = :backfill
-     LIMIT 10"
-     else
-       "SELECT u.id, u.username, q.granted_at
-     FROM(#{sql}) q
-     JOIN users u on u.id = q.user_id
-     WHERE :backfill = :backfill
-     LIMIT 10"
-     end
+         WHERE :backfill = :backfill
+         LIMIT 10
+      SQL
+    else
+      <<~SQL
+        SELECT u.id, u.username, q.granted_at
+         FROM (#{sql}) q
+         JOIN users u on u.id = q.user_id
+        WHERE :backfill = :backfill
+        LIMIT 10
+      SQL
+    end
 
     query_plan = nil
     # HACK: active record sanitization too flexible, force it to go down the sanitization path that cares not for % stuff
@@ -235,29 +241,30 @@ class BadgeGranter
     user_ids = opts[:user_ids] if opts
 
     # safeguard fall back to full backfill if more than 200
-    if (post_ids && post_ids.length > MAX_ITEMS_FOR_DELTA) ||
-       (user_ids && user_ids.length > MAX_ITEMS_FOR_DELTA)
+    if (post_ids && post_ids.size > MAX_ITEMS_FOR_DELTA) ||
+       (user_ids && user_ids.size > MAX_ITEMS_FOR_DELTA)
       post_ids = nil
       user_ids = nil
     end
 
-    post_ids = nil unless post_ids.present?
-    user_ids = nil unless user_ids.present?
+    post_ids = nil if post_ids.blank?
+    user_ids = nil if user_ids.blank?
 
     full_backfill = !user_ids && !post_ids
 
     post_clause = badge.target_posts ? "AND (q.post_id = ub.post_id OR NOT :multiple_grant)" : ""
     post_id_field = badge.target_posts ? "q.post_id" : "NULL"
 
-    sql = "DELETE FROM user_badges
-           WHERE id in (
-             SELECT ub.id
-             FROM user_badges ub
-             LEFT JOIN ( #{badge.query} ) q
-             ON q.user_id = ub.user_id
-              #{post_clause}
-             WHERE ub.badge_id = :id AND q.user_id IS NULL
-           )"
+    sql = <<~SQL
+      DELETE FROM user_badges
+       WHERE id IN (
+         SELECT ub.id
+           FROM user_badges ub
+      LEFT JOIN (#{badge.query}) q ON q.user_id = ub.user_id
+         #{post_clause}
+         WHERE ub.badge_id = :id AND q.user_id IS NULL
+      )
+    SQL
 
     DB.exec(
       sql,
@@ -270,33 +277,34 @@ class BadgeGranter
 
     sql = <<~SQL
       WITH w as (
-      INSERT INTO user_badges(badge_id, user_id, granted_at, granted_by_id, post_id)
-      SELECT :id, q.user_id, q.granted_at, -1, #{post_id_field}
-      FROM ( #{badge.query} ) q
-      LEFT JOIN user_badges ub ON
-        ub.badge_id = :id AND ub.user_id = q.user_id
+        INSERT INTO user_badges(badge_id, user_id, granted_at, granted_by_id, post_id)
+        SELECT :id, q.user_id, q.granted_at, -1, #{post_id_field}
+          FROM (#{badge.query}) q
+     LEFT JOIN user_badges ub ON ub.badge_id = :id AND ub.user_id = q.user_id
         #{post_clause}
-      /*where*/
-      RETURNING id, user_id, granted_at
+        /*where*/
+        ON CONFLICT DO NOTHING
+        RETURNING id, user_id, granted_at
       )
-      select w.*, username, locale, (u.admin OR u.moderator) AS staff FROM w
-      JOIN users u on u.id = w.user_id
+      SELECT w.*, username, locale, (u.admin OR u.moderator) AS staff
+        FROM w
+        JOIN users u on u.id = w.user_id
     SQL
 
     builder = DB.build(sql)
-    builder.where("ub.badge_id IS NULL AND q.user_id <> -1")
+    builder.where("ub.badge_id IS NULL AND q.user_id > 0")
 
     if (post_ids || user_ids) && !badge.query.include?(":backfill")
       Rails.logger.warn "Your triggered badge query for #{badge.name} does not include the :backfill param, skipping!"
       return
     end
 
-    if (post_ids && !badge.query.include?(":post_ids"))
+    if post_ids && !badge.query.include?(":post_ids")
       Rails.logger.warn "Your triggered badge query for #{badge.name} does not include the :post_ids param, skipping!"
       return
     end
 
-    if (user_ids && !badge.query.include?(":user_ids"))
+    if user_ids && !badge.query.include?(":user_ids")
       Rails.logger.warn "Your triggered badge query for #{badge.name} does not include the :user_ids param, skipping!"
       return
     end
@@ -309,32 +317,29 @@ class BadgeGranter
       user_ids: user_ids || [-2]).each do |row|
 
       # old bronze badges do not matter
-      next if badge.badge_type_id == (BadgeType::Bronze) && row.granted_at < (2.days.ago)
+      next if badge.badge_type_id == BadgeType::Bronze && row.granted_at < 2.days.ago
 
       # Try to use user locale in the badge notification if possible without too much resources
-      notification_locale =
-        if SiteSetting.allow_user_locale && row.locale.present?
-          row.locale
-        else
-          SiteSetting.default_locale
-        end
+      notification_locale = if SiteSetting.allow_user_locale && row.locale.present?
+        row.locale
+      else
+        SiteSetting.default_locale
+      end
 
-      # Make this variable in this scope
-      notification = nil
+      next if row.staff && badge.awarded_for_trust_level?
 
-      next if (row.staff && badge.awarded_for_trust_level?)
-
-      I18n.with_locale(notification_locale) do
-        notification = Notification.create!(
-                          user_id: row.user_id,
-                          notification_type: Notification.types[:granted_badge],
-                          data: {
-                            badge_id: badge.id,
-                            badge_name: badge.display_name,
-                            badge_slug: badge.slug,
-                            badge_title: badge.allow_title,
-                            username: row.username
-        }.to_json)
+      notification = I18n.with_locale(notification_locale) do
+        Notification.create!(
+          user_id: row.user_id,
+          notification_type: Notification.types[:granted_badge],
+          data: {
+            badge_id: badge.id,
+            badge_name: badge.display_name,
+            badge_slug: badge.slug,
+            badge_title: badge.allow_title,
+            username: row.username
+          }.to_json
+        )
       end
 
       DB.exec(
@@ -345,9 +350,9 @@ class BadgeGranter
     end
 
     badge.reset_grant_count!
-  rescue => ex
+  rescue => e
     Rails.logger.error("Failed to backfill '#{badge.name}' badge: #{opts}")
-    raise ex
+    raise e
   end
 
   def self.revoke_ungranted_titles!
diff --git a/app/services/push_notification_pusher.rb b/app/services/push_notification_pusher.rb
index d397e13039..3a63378865 100644
--- a/app/services/push_notification_pusher.rb
+++ b/app/services/push_notification_pusher.rb
@@ -2,25 +2,25 @@ require_dependency 'webpush'
 
 class PushNotificationPusher
   def self.push(user, payload)
+    message = {
+      title: I18n.t(
+        "discourse_push_notifications.popup.#{Notification.types[payload[:notification_type]]}",
+        site_title: SiteSetting.title,
+        topic: payload[:topic_title],
+        username: payload[:username]
+      ),
+      body: payload[:excerpt],
+      badge: get_badge,
+      icon: ActionController::Base.helpers.image_url("push-notifications/#{Notification.types[payload[:notification_type]]}.png"),
+      tag: "#{Discourse.current_hostname}-#{payload[:topic_id]}",
+      base_url: Discourse.base_url,
+      url: payload[:post_url],
+      hide_when_active: true
+    }
+
     subscriptions(user).each do |subscription|
       subscription = JSON.parse(subscription.data)
-
-      message = {
-        title: I18n.t(
-          "discourse_push_notifications.popup.#{Notification.types[payload[:notification_type]]}",
-          site_title: SiteSetting.title,
-          topic: payload[:topic_title],
-          username: payload[:username]
-        ),
-        body: payload[:excerpt],
-        badge: get_badge,
-        icon: ActionController::Base.helpers.image_url("push-notifications/#{Notification.types[payload[:notification_type]]}.png"),
-        tag: "#{Discourse.current_hostname}-#{payload[:topic_id]}",
-        base_url: Discourse.base_url,
-        url: payload[:post_url],
-        hide_when_active: true
-      }
-      send_notification user, subscription, message
+      send_notification(user, subscription, message)
     end
   end
 
@@ -54,7 +54,7 @@ class PushNotificationPusher
         tag: "#{Discourse.current_hostname}-subscription"
       }
 
-      send_notification user, subscription, message
+      send_notification(user, subscription, message)
     end
   end
 
@@ -74,7 +74,7 @@ class PushNotificationPusher
 
   def self.send_notification(user, subscription, message)
     begin
-      response = Webpush.payload_send(
+      Webpush.payload_send(
         endpoint: subscription["endpoint"],
         message: message.to_json,
         p256dh: subscription.dig("keys", "p256dh"),
@@ -85,8 +85,18 @@ class PushNotificationPusher
           private_key: SiteSetting.vapid_private_key
         }
       )
-    rescue Webpush::InvalidSubscription => e
-      unsubscribe user, subscription
+    rescue Webpush::ExpiredSubscription
+      unsubscribe(user, subscription)
+    rescue Webpush::ResponseError => e
+      Discourse.warn_exception(
+        e,
+        message: "Failed to send push notification",
+        env: {
+          user_id: user.id,
+          endpoint: subscription["endpoint"],
+          message: message.to_json
+        }
+      )
     end
   end
 end
diff --git a/app/services/user_updater.rb b/app/services/user_updater.rb
index 558f08953c..3828b1da43 100644
--- a/app/services/user_updater.rb
+++ b/app/services/user_updater.rb
@@ -37,7 +37,8 @@ class UserUpdater
     :theme_ids,
     :allow_private_messages,
     :homepage_id,
-    :hide_profile_and_presence
+    :hide_profile_and_presence,
+    :text_size
   ]
 
   def initialize(actor, user)
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index e6502658b3..fc109a741a 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -57,7 +57,6 @@
 
     <%- if !current_user && cookies[:authentication_data] %>
       <meta id="data-authentication" data-authentication-data="<%= cookies.delete(:authentication_data) %>">
-      <%= preload_script "authentication-complete" %>
     <%- end %>
   </head>
 
diff --git a/app/views/list/list.erb b/app/views/list/list.erb
index 99abddc494..143f9ef4ca 100644
--- a/app/views/list/list.erb
+++ b/app/views/list/list.erb
@@ -90,7 +90,7 @@
 <% if @category %>
   <% content_for :head do %>
     <%= auto_discovery_link_tag(:rss, { action: :category_feed }, title: t('rss_topics_in_category', category: @category.name)) %>
-    <%= raw crawlable_meta_data(title: @category.name, description: @category.description) %>
+    <%= raw crawlable_meta_data(title: @category.name, description: @category.description, image: @category.uploaded_logo&.url.presence) %>
   <% end %>
 <% elsif @tag_id %>
   <% content_for :head do %>
diff --git a/app/views/static/login.html.erb b/app/views/static/login.html.erb
index c08a7661b1..19fa6ac062 100644
--- a/app/views/static/login.html.erb
+++ b/app/views/static/login.html.erb
@@ -1,5 +1,5 @@
 <% if SiteSetting.login_required %>
   <div class='login-required'>
-    <%= PrettyText.cook(I18n.t('login_required.welcome_message', title: SiteSetting.title)).html_safe %>
+    <%= PrettyText.cook(I18n.t("login_required.#{SiteSetting.invite_only? ? "welcome_message_invite_only" : "welcome_message"}", title: SiteSetting.title)).html_safe %>
   </div>
 <% end %>
diff --git a/app/views/user_api_keys/new.html.erb b/app/views/user_api_keys/new.html.erb
index 28531e07db..7657919d62 100644
--- a/app/views/user_api_keys/new.html.erb
+++ b/app/views/user_api_keys/new.html.erb
@@ -24,7 +24,7 @@
   <%= hidden_field_tag 'access', @access %>
   <%= hidden_field_tag 'nonce', @nonce %>
   <%= hidden_field_tag 'client_id', @client_id %>
-  <%= hidden_field_tag 'auth_redirect', @auth_redirect %>
+  <%= hidden_field_tag('auth_redirect', @auth_redirect) if @auth_redirect %>
   <%= hidden_field_tag 'push_url', @push_url %>
   <%= hidden_field_tag 'public_key', @public_key%>
   <%= hidden_field_tag 'scopes', @scopes%>
diff --git a/app/views/user_api_keys/show.html.erb b/app/views/user_api_keys/show.html.erb
new file mode 100644
index 0000000000..7d657efe09
--- /dev/null
+++ b/app/views/user_api_keys/show.html.erb
@@ -0,0 +1,2 @@
+<p><%= t("user_api_key.instructions", application_name: @application_name) %></p>
+<code><%= @payload %></code>
diff --git a/bin/docker/discourse b/bin/docker/discourse
new file mode 100755
index 0000000000..3ae9852f6d
--- /dev/null
+++ b/bin/docker/discourse
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+PARAMS="$@"
+CMD="cd /src && USER=discourse RUBY_GLOBAL_METHOD_CACHE_SIZE=131072 LD_PRELOAD=/usr/lib/libjemalloc.so RAILS_ENV=${RAILS_ENV:=development} script/discourse $PARAMS"
+docker exec -it -u discourse:discourse discourse_dev /bin/bash -c "$CMD"
diff --git a/config/application.rb b/config/application.rb
index 89c161bbfe..65233ef4d8 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -122,7 +122,6 @@ module Discourse
       google-tag-manager.js
       google-universal-analytics.js
       preload-application-data.js
-      authentication-complete.js
       print-page.js
       omniauth-complete.js
       activate-account.js
diff --git a/config/discourse_defaults.conf b/config/discourse_defaults.conf
index 43ce40ba2d..1b5fba6073 100644
--- a/config/discourse_defaults.conf
+++ b/config/discourse_defaults.conf
@@ -117,9 +117,8 @@ redis_db = 0
 # redis password
 redis_password =
 
-# redis sentinels eg
-# redis_sentinels = 10.0.0.1:26381,10.0.0.2:26381
-redis_sentinels =
+# skip configuring client id for cloud providers who support no client commands
+redis_skip_client_commands = false
 
 # enable Cross-origin Resource Sharing (CORS) directly at the application level
 enable_cors = false
@@ -202,3 +201,8 @@ force_anonymous_min_queue_seconds = 1
 # only trigger anon if we see more than N requests for this path in last 10 seconds
 force_anonymous_min_per_10_seconds = 3
 
+# maximum number of posts rebaked across the cluster in the periodical job
+# rebake process is very expensive, on multisite we have to make sure we never
+# flood the queue
+max_old_rebakes_per_15_minutes = 300
+
diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml
index 0237414737..1c78868b01 100644
--- a/config/locales/client.ar.yml
+++ b/config/locales/client.ar.yml
@@ -180,7 +180,6 @@ ar:
       close: 'أغلق'
       twitter: 'شارك هذا الرابط علي تويتر'
       facebook: 'شارك هذا الرابط علي الفيسبوك'
-      google+: 'شارك هذا الرابط علي جوجل+'
       email: 'شارك هذا الرابط علي بريد إلكتروني'
     action_codes:
       public_topic: "أجعل هذا الموضوع عامًّا %{when}"
@@ -241,6 +240,7 @@ ar:
     submit: "أرسل"
     generic_error: "نأسف، حدث عطل ما."
     generic_error_with_reason: "حدث عطل ما: %{error}"
+    go_ahead: "انطلق"
     sign_up: "أنشأ حسابا"
     log_in: "تسجل الدخول"
     age: "العمر"
@@ -262,6 +262,7 @@ ar:
     privacy_policy: "سياسة الخصوصية "
     privacy: "الخصوصية "
     tos: "شروط الخدمة"
+    rules: "الشروط"
     mobile_view: "نسخة الهواتف"
     desktop_view: "نسخة سطح المكتب"
     you: "انت"
@@ -286,6 +287,8 @@ ar:
       few: "{{count}} محارف"
       many: "{{count}} محرفا"
       other: "{{count}} حرف"
+    related_messages:
+      title: "الرسائل ذات الصلة"
     suggested_topics:
       title: "المواضيع المقترحة"
       pm_title: "رسائل مقترحة "
@@ -297,6 +300,8 @@ ar:
       our_moderators: "المشرفين"
       stat:
         all_time: "منذ التأسيس"
+        last_7_days: "آخر 7"
+        last_30_days: "آخر 30"
       like_count: "الإعجابات"
       topic_count: "المواضيع"
       post_count: "المنشورات"
@@ -313,6 +318,9 @@ ar:
     bookmarks:
       created: "لقد وضعت علامة مرجعية علي هذا المنشور"
       remove: "أزل العلامة المرجعية"
+    drafts:
+      resume: "أكمل"
+      remove: "احذف"
     preview: "معاينة"
     cancel: "ألغِ"
     save: "احفظ التعديلات"
@@ -3176,7 +3184,6 @@ ar:
         last_emailed: "آخر بريد الكتروني"
         not_found: "عذرا، اسم المستخدم غير موجود في النظام."
         id_not_found: "عذرا، هذا الرقم التعريفي غير موجود في النظام."
-        active: "نشط"
         show_emails: "عرض الرسائل"
         nav:
           new: "الجدد"
diff --git a/config/locales/client.bg.yml b/config/locales/client.bg.yml
index e2bd18ab23..01bc6b26e5 100644
--- a/config/locales/client.bg.yml
+++ b/config/locales/client.bg.yml
@@ -108,7 +108,6 @@ bg:
       close: 'затвори'
       twitter: 'споделете тази връзка в Twitter'
       facebook: 'споделете тази връзка във Facebook'
-      google+: 'споделете тази връзка в Google+'
       email: 'изпратете тази връзка с имейл'
     action_codes:
       public_topic: "направи тази тема публична на %{when}"
@@ -2309,7 +2308,6 @@ bg:
         last_emailed: "Последен имейл"
         not_found: "Съжаляваме, това потребителско име не съществува при нас."
         id_not_found: "Съжаляваме, това потребителско име не съществува при нас. "
-        active: "Активен"
         show_emails: "Покажи имейла"
         nav:
           new: "Нови"
diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml
index 073af3c6f6..1bca9a9241 100644
--- a/config/locales/client.bs_BA.yml
+++ b/config/locales/client.bs_BA.yml
@@ -134,7 +134,6 @@ bs_BA:
       close: 'zatvori'
       twitter: 'podijeli link na Twitteru'
       facebook: 'podijeli link na Facebook-u'
-      google+: 'podijeli link na Google+'
       email: 'pošalji ovaj link na email'
     action_codes:
       public_topic: "postavio ovu temu kao javno %{when}"
@@ -2512,7 +2511,6 @@ bs_BA:
         create: 'Add Admin User'
         last_emailed: "Last Emailed"
         not_found: "Sorry, that username doesn't exist in our system."
-        active: "Active"
         nav:
           new: "Novi"
           active: "Active"
diff --git a/config/locales/client.ca.yml b/config/locales/client.ca.yml
index 383e9d8924..51286ef97c 100644
--- a/config/locales/client.ca.yml
+++ b/config/locales/client.ca.yml
@@ -114,7 +114,6 @@ ca:
       close: 'tanca'
       twitter: 'comparteix aquest enllaç a Twitter'
       facebook: 'comparteix aquest enllaç a Facebook'
-      google+: 'comparteix aquest enllaç a Google+'
       email: 'envia aquest enllaç per correu electrònic'
     action_codes:
       public_topic: "va fer públic aquest tema %{when}"
@@ -2522,7 +2521,6 @@ ca:
         last_emailed: "Darrer correu"
         not_found: "Disculpa, aquesta nom de persona usuària no existeix al nostre sistema."
         id_not_found: "Disculpa, aquesta identitat usuària no existeix al nostre sistema."
-        active: "Actiu"
         show_emails: "Mostra correus"
         nav:
           new: "Nou"
diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml
index ef8d318511..505262700f 100644
--- a/config/locales/client.cs.yml
+++ b/config/locales/client.cs.yml
@@ -154,7 +154,6 @@ cs:
       close: 'zavřít'
       twitter: 'sdílet odkaz na Twitteru'
       facebook: 'sdílet odkaz na Facebooku'
-      google+: 'sdílet odkaz na Google+'
       email: 'odeslat odkaz emailem'
     action_codes:
       public_topic: "Téma zveřejněno %{when}"
@@ -3486,7 +3485,6 @@ cs:
         last_emailed: "Email naposledy zaslán"
         not_found: "Bohužel uživatel s tímto jménem není v našem systému."
         id_not_found: "Bohužel uživatel s tímto id není v našem systému."
-        active: "Aktivní"
         show_emails: "Ukázat emailové adresy"
         nav:
           new: "Noví"
diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml
index e175842c50..1713e4a947 100644
--- a/config/locales/client.da.yml
+++ b/config/locales/client.da.yml
@@ -108,7 +108,6 @@ da:
       close: 'luk'
       twitter: 'del dette link på Twitter'
       facebook: 'del dette link på Facebook'
-      google+: 'del dette link på Google+'
       email: 'send dette link i en e-mail'
     action_codes:
       public_topic: "offentliggjorde dette emne %{when}"
@@ -2664,7 +2663,6 @@ da:
         last_emailed: "Sidst mailet"
         not_found: "Beklager, brugernavnet findes ikke i vores system."
         id_not_found: "Desværre, dette bruger id findes ikke på vores system."
-        active: "Aktiv"
         show_emails: "Vis Emails"
         nav:
           new: "Ny"
diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml
index c015825a9a..8d944ac66f 100644
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@@ -114,7 +114,6 @@ de:
       close: 'Schließen'
       twitter: 'diesen Link auf Twitter teilen'
       facebook: 'diesen Link auf Facebook teilen'
-      google+: 'diesen Link auf Google+ teilen'
       email: 'diesen Link per E-Mail senden'
     action_codes:
       public_topic: "hat das Thema öffentlich gemacht, %{when}"
@@ -1813,6 +1812,9 @@ de:
           one: "1 Beitrag"
           other: "{{count}} Beiträge"
         cancel: "Filter entfernen"
+      move_to:
+        title: "Verschieben"
+        action: "verschieben"
       split_topic:
         title: "In neues Thema verschieben"
         action: "in ein neues Thema verschieben"
@@ -2947,8 +2949,6 @@ de:
             label: "Zurücksetzen"
             title: "Die Datenbank auf den letzten funktionierenden Zustand zurücksetzen"
             confirm: "Möchtest du wirklich die Datenbank auf den letzten funktionierenden Stand zurücksetzen?"
-        location:
-          s3: "Amazon S3"
       export_csv:
         success: "Der Export wurde gestartet. Du erhältst eine Nachricht, sobald der Vorgang abgeschlossen ist."
         failed: "Der Export ist fehlgeschlagen. Bitte überprüfe die Logs."
@@ -3387,7 +3387,6 @@ de:
         last_emailed: "Letzte E-Mail"
         not_found: "Entschuldige, dieser Benutzername ist im System nicht vorhanden."
         id_not_found: "Entschuldige, diese Benutzerkennung ist im System nicht vorhanden."
-        active: "Aktiv"
         show_emails: "E-Mails anzeigen"
         nav:
           new: "Neu"
diff --git a/config/locales/client.el.yml b/config/locales/client.el.yml
index 321f093676..80fcc61d8d 100644
--- a/config/locales/client.el.yml
+++ b/config/locales/client.el.yml
@@ -114,7 +114,6 @@ el:
       close: 'κλείσιμο'
       twitter: 'κοινοποίησε τον σύνδεσμο στο Twitter'
       facebook: 'κοινοποίησε τον σύνδεσμο στο Facebook'
-      google+: 'κοινοποίησε τον σύνδεσμο στο Google+'
       email: 'στείλε αυτόν τον σύνδεσμο με email'
     action_codes:
       public_topic: "έκανε το νήμα δημόσιο στις %{when}"
@@ -2818,7 +2817,6 @@ el:
         last_emailed: "Τελευταίο μήνυμα email"
         not_found: "Λυπούμαστε αλλά αυτό το όνομα χρήστη δεν υπάρχει στο σύστημα."
         id_not_found: "Λυπούμαστε αλλά αυτή η ταυτότητα χρήστη δεν υπάρχει στο σύστημα."
-        active: "Ενεργοί"
         show_emails: "Προβολή Emails"
         nav:
           new: "Νέα"
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index bb24a2ff5a..a0ab970a48 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -140,7 +140,6 @@ en:
       close: 'close'
       twitter: 'share this link on Twitter'
       facebook: 'share this link on Facebook'
-      google+: 'share this link on Google+'
       email: 'send this link in an email'
 
     action_codes:
@@ -910,6 +909,13 @@ en:
       website: "Web Site"
       email_settings: "Email"
       hide_profile_and_presence: "Hide my public profile and presence features"
+
+      text_size:
+        title: "Text Size"
+        normal: "Normal"
+        larger: "Larger"
+        largest: "Largest"
+
       like_notification_frequency:
         title: "Notify when liked"
         always: "Always"
@@ -1817,6 +1823,8 @@ en:
         based_on_last_post: "Don't close until the last post in the topic is at least this old."
       auto_delete:
         title: "Auto-Delete Topic"
+      auto_bump:
+        title: "Auto-Bump Topic"
       reminder:
         title: "Remind Me"
 
@@ -1826,6 +1834,7 @@ en:
         auto_publish_to_category: "This topic will be published to <a href=%{categoryUrl}>#%{categoryName}</a> %{timeLeft}."
         auto_close_based_on_last_post: "This topic will close %{duration} after the last reply."
         auto_delete: "This topic will be automatically deleted %{timeLeft}."
+        auto_bump: "This topic will be automatically bumped %{timeLeft}."
         auto_reminder: "You will be reminded about this topic %{timeLeft}."
       auto_close_title: 'Auto-Close Settings'
       auto_close_immediate:
@@ -3259,7 +3268,7 @@ en:
             confirm: "Are you sure you want to rollback the database to the previous working state?"
         location:
           local: "Local Storage"
-          s3: "Amazon S3"
+          s3: "S3"
 
       export_csv:
         success: "Export initiated, you will be notified via message when the process is complete."
@@ -3716,7 +3725,7 @@ en:
         last_emailed: "Last Emailed"
         not_found: "Sorry, that username doesn't exist in our system."
         id_not_found: "Sorry, that user id doesn't exist in our system."
-        active: "Active"
+        active: "Activated"
         show_emails: "Show Emails"
         nav:
           new: "New"
diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml
index bfbdd17467..ef2ff6a4b0 100644
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@@ -114,7 +114,6 @@ es:
       close: 'cerrar'
       twitter: 'comparte este enlace en Twitter'
       facebook: 'comparte este enlace en Facebook'
-      google+: 'comparte este enlace en Google+'
       email: 'comparte este enlace por email'
     action_codes:
       public_topic: "hizo este tema público %{when}"
@@ -148,7 +147,7 @@ es:
         enabled: 'hazlo un banner %{when}. Aparecerá arriba en cada página hasta que el usuario lo deje de destacar.'
         disabled: 'eliminar este banner %{when}. Ya no aparecerá en la parte superior de cada página.'
     topic_admin_menu: "acciones de administrador para el tema"
-    wizard_required: "¡Bienvenido a tu nuevo Discourse! Empezaremos con <a href='%{url}' data-auto-route='true'>el asistente de configuración</a>  ✨"
+    wizard_required: "¡Bienvenido a tu nuevo foro Discourse! Empezaremos con <a href='%{url}' data-auto-route='true'>el asistente de configuración</a>  ✨"
     emails_are_disabled: "Todos los emails salientes han sido desactivados por un administrador. No se enviará ninguna notificación por email."
     bootstrap_mode_enabled: "Para lanzar tu nuevo sitio más fácilmente, estás en modo Bootstrap. A todos los nuevos usuarios se les concederá el nivel 1 de confianza y recibirán resúmenes diarios por email. Esto se desactivará automáticamente cuando el número total de usuarios exceda los %{min_users}."
     bootstrap_mode_disabled: "El modo Bootstrap se inhabilitará en 24 horas."
@@ -297,7 +296,13 @@ es:
     choose_topic:
       none_found: "Ningún tema encontrado."
       title:
+        search: "Busca un tema por título, URL o id:"
         placeholder: "escribe el título de tema aquí"
+    choose_message:
+      none_found: "No se ha encontrado ningún mensaje."
+      title:
+        search: "Buscar un mensaje por título:"
+        placeholder: "escribe el título del mensaje aquí"
     queue:
       topic: "Tema:"
       approve: 'Aprobar'
@@ -1128,6 +1133,7 @@ es:
       provide_new_email: "Poner un nuevo email, y te reenviaremos una confirmación de email."
       submit_new_email: "Actualizar Dirección de Email"
       sent_activation_email_again: "Te hemos enviado otro e-mail de activación a <b>{{currentEmail}}</b>. Podría tardar algunos minutos en llegar; asegúrate de revisar tu carpeta de spam."
+      sent_activation_email_again_generic: "Te hemos enviado otro correo de activación. Podría tardar unos minutos en llegar. Asegúrate de mirar la carpeta de Correo no deseado."
       to_continue: "Por favor, inicia sesión"
       preferences: "Debes tener una sesión iniciada para cambiar tus preferencias de usuario."
       forgot: "No me acuerdo de los detalles de mi cuenta."
@@ -1649,6 +1655,8 @@ es:
         based_on_last_post: "No cerrar hasta que el último post en el tema es al menos así de antiguo."
       auto_delete:
         title: "Auto-Eliminar Tema"
+      auto_bump:
+        title: "Actualizar automáticamente la fecha de este tema"
       reminder:
         title: "Recordarme"
       status_update_notice:
@@ -1657,6 +1665,7 @@ es:
         auto_publish_to_category: "Este tema será publicado en <a href=%{categoryUrl}>#%{categoryName}</a> %{timeLeft}."
         auto_close_based_on_last_post: "Este tema será cerrado %{duration} después de la última respuesta."
         auto_delete: "Este tema se borrará automáticamente en %{timeLeft}."
+        auto_bump: "La fecha de este tema será actualizada %{timeLeft}."
         auto_reminder: "Te recordaremos sobre este tema %{timeLeft}."
       auto_close_title: 'Configuración de auto-cerrado'
       auto_close_immediate:
@@ -1822,9 +1831,15 @@ es:
           one: "1 post"
           other: "{{count}} posts"
         cancel: "Quitar filtro"
+      move_to:
+        title: "Mover a"
+        action: "mover a"
+        error: "Ha ocurrido un error al mover los mensajes."
       split_topic:
         title: "Mover a un tema nuevo"
         action: "mover a un tema nuevo"
+        topic_name: "Título del nuevo tema"
+        radio_label: "Nuevo tema"
         error: "Hubo un error moviendo los posts al nuevo tema"
         instructions:
           one: "Estas a punto de crear un tema nuevo y rellenarlo con el post que has seleccionado."
@@ -1833,9 +1848,27 @@ es:
         title: "Mover a un tema existente"
         action: "mover a un tema existente"
         error: "Hubo un error moviendo los posts a ese tema"
+        radio_label: "Tema ya existente"
         instructions:
           one: "Por favor escoge el tema al que quieres mover ese post."
           other: "Por favor escoge el tema al que quieres mover esos <b>{{count}}</b> posts."
+      move_to_new_message:
+        title: "Mover a un nuevo mensaje"
+        action: "mover a un nuevo mensaje"
+        message_title: "Título del nuevo mensaje"
+        radio_label: "Nuevo mensaje"
+        participants: "Participantes"
+        instructions:
+          one: "Estás a punto de crear un nuevo mensaje y de llenarlo con el mensaje que has seleccionado."
+          other: "Estás a punto de crear un nuevo mensaje y de llenarlo con los <b>{{count}}</b> mensajes seleccionados."
+      move_to_existing_message:
+        title: "Mover a un mensaje ya existente"
+        action: "mover a un mensaje existente"
+        radio_label: "Mensaje existente"
+        participants: "Participantes"
+        instructions:
+          one: "Por favor, selecciona el mensaje al que te gustaría mover el mensaje."
+          other: "Por favor, selecciona el mensaje al que te gustaría mover los <b>{{count}}</b> mensajes."
       merge_posts:
         title: "Unir posts seleccionados"
         action: "unir posts seleccionados"
@@ -1881,7 +1914,7 @@ es:
       edit_reason: "Motivo:"
       post_number: "post {{number}}"
       wiki_last_edited_on: "wiki editada por última vez"
-      last_edited_on: "post editado por última ven en"
+      last_edited_on: "post editado por última vez el"
       reply_as_new_topic: "Responder como tema enlazado"
       reply_as_new_private_message: "Responder como mensaje nuevo a los mismos destinatarios"
       continue_discussion: "Continuando la discusión desde {{postLink}}:"
@@ -2581,7 +2614,7 @@ es:
       title: 'Administrador de Discourse'
       moderator: 'Moderador'
       reports:
-        title: "Lista de reportes disponibles"
+        title: "Lista de informes disponibles"
       dashboard:
         title: "Panel"
         last_updated: "Panel actualizado el:"
@@ -2594,7 +2627,7 @@ es:
         please_upgrade: "¡Por favor, actualiza!"
         no_check_performed: "Una revisión de actualizaciones no ha sido realizada aún. Asegúrate de que sidekiq está funcionando."
         stale_data: "Una revisión de actualizaciones no ha sido realizada recientemente. Asegúrate de que sidekiq está funcionando."
-        version_check_pending: "Parece que has actualizado recientemente. Fantástico!"
+        version_check_pending: "Parece que has actualizado recientemente. ¡Fantástico!"
         installed_version: "Instalada"
         latest_version: "Última"
         problems_found: "Hemos encontrado algunos problemas con tu instalación de Discourse"
@@ -2625,17 +2658,17 @@ es:
         moderators_activity: Actividad de moderación
         whats_new_in_discourse: "¿Qué hay de nuevo en Discourse?"
         activity_metrics: Métricas de Actividad
-        all_reports: "Todos los reportes"
+        all_reports: "Todos los informes"
         general_tab: "General"
         moderation_tab: "Moderación"
         security_tab: "Seguridad"
-        reports_tab: "Reportes"
+        reports_tab: "Informes"
         disabled: Desactivado
         timeout_error: "Lo sentimos, la solicitud está durando demasiado, por favor selecciona un periodo más corto"
         exception_error: "Lo siento, ha ocurrido un error al ejecutar la consulta"
         too_many_requests: "Has realizado esta acción demasiadas veces. Por favor, espera antes de intentarlo de nuevo."
         not_found_error: "Lo sentimos, este reporte no existe"
-        filter_reports: Filtrar reporte
+        filter_reports: Filtrar informe
         reports:
           trend_title: "%{percent} de cambio. Actualmente %{current}, era %{prev} en el periodo previo."
           today: "Hoy"
@@ -2977,7 +3010,6 @@ es:
             confirm: "¿Seguro que quieres retornar la base de datos al estado funcional previo?"
         location:
           local: "Almacenamiento local"
-          s3: "Amazon S3"
       export_csv:
         success: "Exportación iniciada, se te notificará a través de un mensaje cuando el proceso se haya completado."
         failed: "Exportación fallida, revisa los logs."
@@ -3424,7 +3456,7 @@ es:
         last_emailed: "Último email enviado"
         not_found: "Lo sentimos, ese usuario no existe."
         id_not_found: "Lo sentimos, esa id de usuario no existe en nuestro sistema."
-        active: "Activo"
+        active: "Activado"
         show_emails: "Mostrar emails"
         nav:
           new: "Nuevo"
@@ -3726,6 +3758,7 @@ es:
           tags: "Etiquetas"
           search: "Búsqueda"
           groups: "Grupos"
+          dashboard: "Panel"
         secret_list:
           invalid_input: "Los campos no pueden estar vacíos o contener el carácter de barra vertical."
       badges:
diff --git a/config/locales/client.et.yml b/config/locales/client.et.yml
index deb744b8ee..efa7d99cbe 100644
--- a/config/locales/client.et.yml
+++ b/config/locales/client.et.yml
@@ -114,7 +114,6 @@ et:
       close: 'Sulge'
       twitter: 'Jaga seda viidet Twitteris'
       facebook: 'jaga seda viidet Facebookis'
-      google+: 'jaga seda viidet Google-plussis'
       email: 'Jaga viidet meiliga'
     action_codes:
       public_topic: "muutsin selle teema avalikuks %{when}"
@@ -2597,8 +2596,6 @@ et:
             label: "Pööra tagasi"
             title: "Pööra andmebaas tagasi viimati toiminud olekusse"
             confirm: "Oled kindel, et soovid andmebaasi tagasi viimati toiminud olekusse pöörata?"
-        location:
-          s3: "Amazon S3"
       export_csv:
         success: "Eksportimine käivitatud. Protsessi lõppemisel saadetakse Sulle teade."
         failed: "Eksportimine ebaõnnestus. Kontrolli logisid."
@@ -2925,7 +2922,6 @@ et:
         last_emailed: "Viimati meilitud"
         not_found: "Vabanda, sellist kasutajanime ei eksisteeri meie süsteemis."
         id_not_found: "Vabanda, sellist kasutajatunnust ei eksisteeri meie süsteemis."
-        active: "Aktiivne"
         show_emails: "Näita meile"
         nav:
           new: "Uus"
diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml
index b323fa47c1..9355d3289e 100644
--- a/config/locales/client.fa_IR.yml
+++ b/config/locales/client.fa_IR.yml
@@ -114,7 +114,6 @@ fa_IR:
       close: 'بسته'
       twitter: 'این پیوند را در توییتر به اشتراک بگذارید.'
       facebook: 'این پیوند را در فیسبوک به اشتراک بگذارید.'
-      google+: 'این پیوند را در Google+‎ به اشتراک بگذارید.'
       email: 'این پیوند را با ایمیل بفرستید'
     action_codes:
       public_topic: "این موضوع در %{when}  عمومی شده"
@@ -2732,7 +2731,6 @@ fa_IR:
         last_emailed: "آخرین ایمیل فرستاده شده"
         not_found: "متاسفیم٬ این کاربر در سیستم ما وجود ندارد."
         id_not_found: "متاسفیم٬ این شناسه کاربری در سیستم ما وجود ندارد."
-        active: "فعال"
         show_emails: "ایمیل ها را نشان بده"
         nav:
           new: "جدید"
diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml
index 3dc3919eb5..9faedafdd9 100644
--- a/config/locales/client.fi.yml
+++ b/config/locales/client.fi.yml
@@ -114,7 +114,6 @@ fi:
       close: 'sulje'
       twitter: 'jaa tämä linkki Twitterissä'
       facebook: 'jaa tämä linkki Facebookissa'
-      google+: 'jaa tämä linkki Google+:ssa'
       email: 'lähetä tämä linkki sähköpostissa'
     action_codes:
       public_topic: "teki ketjusta julkisen %{when}"
@@ -1657,6 +1656,8 @@ fi:
         based_on_last_post: "Älä sulje ennen kuin viimeisin viesti ketjussa on ainakin näin vanha."
       auto_delete:
         title: "Poista ketju ajastetusti"
+      auto_bump:
+        title: "Nosta ketjua ajastetusti"
       reminder:
         title: "Muistuta minua"
       status_update_notice:
@@ -1665,6 +1666,7 @@ fi:
         auto_publish_to_category: "Ketju julkaistaan alueella <a href=%{categoryUrl}>#%{categoryName}</a> %{timeLeft}."
         auto_close_based_on_last_post: "Ketju sulkeutuu %{duration} kuluttua viimeisimmästä viestistä."
         auto_delete: "Ketju poistetaan ajastetusti %{timeLeft}."
+        auto_bump: "Ketjua nostetaan ajastetusti %{timeLeft}."
         auto_reminder: "Sinua muistutetaan tästä ketjusta %{timeLeft}."
       auto_close_title: 'Automaattisen sulkemisen asetukset'
       auto_close_immediate:
@@ -3007,7 +3009,6 @@ fi:
             confirm: "Oletko varma, että haluat palauttaa tietokannan edelliseen toimivaan tilaan?"
         location:
           local: "Paikallinen"
-          s3: "Amazon S3"
       export_csv:
         success: "Vienti on käynnissä. Saat ilmoituksen viestillä, kun prosessi on valmis."
         failed: "Vienti epäonnistui. Tarkista loki-tiedostot."
@@ -3454,7 +3455,6 @@ fi:
         last_emailed: "Viimeksi lähetetty sähköpostia"
         not_found: "Pahoittelut, tuota käyttäjänimeä ei löydy järjestelmästä."
         id_not_found: "Pahoittelut, tuota käyttäjätunnusta ei löydy järjestelmästä."
-        active: "Aktiivinen"
         show_emails: "Näytä sähköpostit"
         nav:
           new: "Uudet"
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index ddbca91a6d..6580e808b4 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -114,7 +114,6 @@ fr:
       close: 'fermer'
       twitter: 'partager ce lien sur Twitter'
       facebook: 'partager ce lien sur Facebook'
-      google+: 'partager ce lien sur Google+'
       email: 'envoyer ce lien dans un courriel'
     action_codes:
       public_topic: "a rendu ce sujet public %{when}"
@@ -525,7 +524,7 @@ fr:
       topic_stat_sentence_month:
         one: "%{count} nouveau sujet dans le dernier mois."
         other: "%{count} nouveaux sujets dans le dernier mois."
-      n_more: "Catégories (%{count}additionnelles) ..."
+      n_more: "Catégories (%{count} autres) ..."
     ip_lookup:
       title: Rechercher l'adresse IP
       hostname: Nom de l'hôte
@@ -2967,8 +2966,6 @@ fr:
             label: "Revenir en arrière"
             title: "Restaurer (RollBack) la base de données à l'état de travail précédent"
             confirm: "Êtes-vous sûr de vouloir restaurer la base de données à l'état de fonctionnement précédent?"
-        location:
-          s3: "Amazon S3"
       export_csv:
         success: "L'exportation a été démarrée. Vous serez notifié par message lorsque le traitement sera terminé."
         failed: "L'exportation a échoué. Veuillez consulter les journaux."
@@ -3407,7 +3404,6 @@ fr:
         last_emailed: "Dernier courriel"
         not_found: "Désolé ce pseudo n'existe pas dans notre système."
         id_not_found: "Désolé cet identifiant d'utilisateur n'existe pas dans notre système."
-        active: "Actifs"
         show_emails: "Afficher les adresses de courriels"
         nav:
           new: "Nouveaux"
diff --git a/config/locales/client.gl.yml b/config/locales/client.gl.yml
index 43f11e81fc..1b6df7bfd7 100644
--- a/config/locales/client.gl.yml
+++ b/config/locales/client.gl.yml
@@ -108,7 +108,6 @@ gl:
       close: 'pechar'
       twitter: 'compartir esta ligazón no Twitter'
       facebook: 'compartir esta ligazón no Facebook'
-      google+: 'compartir esta ligazón no Google+'
       email: 'enviar esta ligazón nun correo electrónico'
     action_codes:
       public_topic: "fixo esta publicación pública no %{when}"
@@ -1882,7 +1881,6 @@ gl:
         last_emailed: "Últimos envíos por correo-e"
         not_found: "Sentímolo pero o nome do usuario non existe no sistema."
         id_not_found: "Sentímolo pero o usuario non existe no sistema."
-        active: "Activo"
         show_emails: "Amosar correos-e"
         nav:
           new: "Novo"
diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml
index 4b0f915e39..9ee9905349 100644
--- a/config/locales/client.he.yml
+++ b/config/locales/client.he.yml
@@ -144,7 +144,6 @@ he:
       close: 'סגור'
       twitter: 'שתפו קישור זה בטוויטר'
       facebook: 'שתפו קישור זה בפייסבוק'
-      google+: 'שתפו קישור זה בגוגל+'
       email: 'שליחת קישור בדוא״ל'
     action_codes:
       public_topic: "הפכו נושא זה לפומבי %{when}"
@@ -2851,7 +2850,6 @@ he:
         last_emailed: "נשלח בדואר אלקטרוני לאחרונה"
         not_found: "סליחה, שם המשתמש הזה אינו קיים במערכת שלנו."
         id_not_found: "מצטערים, זהות המשתמש/ת אינה קיימת במערכת שלנו."
-        active: "פעיל"
         show_emails: "הצגת דוא\"לים"
         nav:
           new: "חדש"
diff --git a/config/locales/client.hu.yml b/config/locales/client.hu.yml
index 527769264e..b149c64347 100644
--- a/config/locales/client.hu.yml
+++ b/config/locales/client.hu.yml
@@ -114,7 +114,6 @@ hu:
       close: 'bezár'
       twitter: 'a hivatkozás megosztása a Twitteren'
       facebook: 'a hivatkozás megosztása a Facebookon'
-      google+: 'a hivatkozás megosztása a Google+ -on'
       email: 'a hivatkozás elküldése e-mailben'
     action_codes:
       public_topic: "publikussá tette ezt a témát ekkor: %{when}"
@@ -2738,7 +2737,6 @@ hu:
         last_emailed: "Utoljára emailelt"
         not_found: "Sajnos ez a felhasználónév nem létezik."
         id_not_found: "Sajnos ez a felhasználó id nem található a rendszerben."
-        active: "Aktív"
         show_emails: "E-mailek mutatása"
         nav:
           new: "Új"
diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml
index 3dea5240d1..1e4ca42fb6 100644
--- a/config/locales/client.id.yml
+++ b/config/locales/client.id.yml
@@ -94,7 +94,6 @@ id:
       close: 'tutup'
       twitter: 'share link ini di Twitter'
       facebook: 'share link ini di Facebook'
-      google+: 'share link ini di Google+'
       email: 'kirim link ini melalui email'
     action_codes:
       public_topic: "membuat topik ini umum %{when}"
@@ -967,7 +966,6 @@ id:
             ip_address: "Alamat IP"
       users:
         not_found: "Maaf, username tersebut tidak ada ditemukan."
-        active: "Aktif"
         nav:
           new: "Baru"
           staff: 'Staf'
diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml
index f9bd160c6a..3b64c51cfc 100644
--- a/config/locales/client.it.yml
+++ b/config/locales/client.it.yml
@@ -114,7 +114,6 @@ it:
       close: 'chiudi'
       twitter: 'condividi questo collegamento su Twitter'
       facebook: 'condividi questo collegamento su Facebook'
-      google+: 'condividi questo collegamento su Google+'
       email: 'invia questo collegamento via email'
     action_codes:
       public_topic: "ha reso questo argomento pubblico %{when}"
@@ -161,6 +160,7 @@ it:
         ap_southeast_1: "Asia Pacifico (Singapore)"
         ap_southeast_2: "Asia Pacifico (Sidney)"
         cn_north_1: "Cina (Beijing)"
+        cn_northwest_1: "Cina"
         eu_central_1: "Europa (Francoforte)"
         eu_west_1: "Europa (Irlanda)"
         eu_west_2: "EU (Londra)"
@@ -195,6 +195,7 @@ it:
     privacy_policy: "Tutela Privacy"
     privacy: "Privacy"
     tos: "Termini di Servizio"
+    conduct: "Codice di Condotta"
     mobile_view: "Visualizzazione Mobile"
     desktop_view: "Visualizzazione Desktop"
     you: "Tu"
@@ -250,6 +251,9 @@ it:
       new_topic: "Nuovo argomento in bozza"
       new_private_message: "Nuovo messaggio privato in bozza"
       topic_reply: "Risposta in bozza"
+      abandon:
+        yes_value: "Sì, abbandona"
+        no_value: "No, mantieni"
     topic_count_latest:
       one: "Visualizza {{count}} argomenti nuovi o aggiornati"
       other: "Visualizza {{count}} argomenti nuovi o aggiornati."
@@ -266,6 +270,7 @@ it:
     saved: "Salvato!"
     upload: "Carica"
     uploading: "In caricamento..."
+    uploading_filename: "In caricamento: {{filename}}..."
     uploaded: "Caricato!"
     pasting: "Incollando..."
     enable: "Attiva"
@@ -282,7 +287,12 @@ it:
     choose_topic:
       none_found: "Nessun argomento trovato."
       title:
+        search: "Cerca un Argomento per titolo, URL o id:"
         placeholder: "digita il titolo dell'argomento"
+    choose_message:
+      none_found: "Nessun messaggio trovato."
+      title:
+        search: "Cerca un Messaggio per titolo:"
     queue:
       topic: "Argomento:"
       approve: 'Approva'
@@ -347,6 +357,7 @@ it:
         make_user_group_owner: "Rendi proprietario"
         remove_user_as_group_owner: "Revoca proprietà"
     groups:
+      member_added: "Aggiunto"
       add_members:
         title: "Aggiungi Membri"
         description: "Gestisci le iscrizioni di questo gruppo"
@@ -408,7 +419,7 @@ it:
         all: "Tutti i gruppi"
         empty: "Non ci sono gruppi visibili."
         filter: "Filtra per tipo di gruppo"
-        owner_groups: "Guppi di cui sono proprietario"
+        owner_groups: "Gruppi di cui sono proprietario"
         close_groups: "Gruppi Chiusi"
         automatic_groups: "Gruppi Automatici"
         automatic: "Automatico"
@@ -456,6 +467,7 @@ it:
           description: "Verrai avvertito per ogni nuovo invio in qualsiasi messaggio, e verrà mostrato il conteggio delle nuove risposte."
         watching_first_post:
           title: "Osservando Primo Messaggio"
+          description: "Verrai avvertito per ogni nuovo Argomento in questo gruppo, ma non per le risposte agli Argomenti."
         tracking:
           title: "Seguendo"
           description: "Verrai avvertito se qualcuno menziona il tuo @nome o ti risponde, e verrà mostrato un conteggio delle nuove risposte."
@@ -508,6 +520,12 @@ it:
       topic_sentence:
         one: "1 argomento"
         other: "%{count} argomenti"
+      topic_stat_sentence_week:
+        one: "%{count} nuovo argomento nell'ultima settimana."
+        other: "%{count} nuovi argomenti nell'ultima settimana."
+      topic_stat_sentence_month:
+        one: "%{count} nuovo argomento nell'ultimo mese."
+        other: "%{count} nuovi argomenti nell'ultimo mese."
       n_more: "Categorie (altre %{count}) ..."
     ip_lookup:
       title: Ricerca Indirizzo IP
@@ -609,6 +627,7 @@ it:
       watched_first_post_tags: "Osservando Primo Messaggio"
       watched_first_post_tags_instructions: "Riceverai la notifica per il primo messaggio di ogni nuovo argomento con queste etichette."
       muted_categories: "Silenziate"
+      muted_categories_instructions: "Non riceverai notifiche relative a nuovi Argomenti in queste Categorie, e non appariranno nella pagina delle Categorie o dei Recenti."
       no_category_access: "Come moderatore hai accesso limitato alla categoria, il salvataggio è disabilitato."
       delete_account: "Cancella il mio account"
       delete_account_confirm: "Sei sicuro di voler cancellare il tuo account in modo permanente? Questa azione non può essere annullata!"
@@ -682,8 +701,10 @@ it:
       second_factor:
         title: "Autenticazione a Due Fattori"
         disable: "Disabilita l'autenticazione a due fattori"
+        enable: "Attiva l'autenticazione a due fattori per migliorare la sicurezza del tuo account"
         confirm_password_description: "Per favore conferma la tua password per continuare"
         label: "Codice"
+        rate_limit: "Per favore, attendi prima di provare un altro codice di autenticazione."
         disable_description: "Inserisci il codice di autenticazione dalla tua app"
         show_key_description: "Inserisci manualmente"
         oauth_enabled_warning: "Tieni presente che gli accessi ai social network saranno disabilitati dopo aver attivato l'autenticazione a due fattori nel tuo account."
@@ -792,7 +813,7 @@ it:
         always: "sempre"
         never: "mai"
       email_digests:
-        title: "Quando non visito il sito da un po', inviami un'email con il sommario degli Argomenti e delle risposte più popolari"
+        title: "Quando non visito il sito da un po', inviami un'email con il riepiloglo degli argomenti e delle risposte più popolari"
         every_30_minutes: "ogni 30 minuti"
         every_hour: "ogni ora"
         daily: "ogni giorno"
@@ -1042,7 +1063,7 @@ it:
       complete_email_found: "C'è un account che corrisponde alla email <b>%{email}</b>, a breve dovresti ricevere una email con le istruzioni per reimpostare la tua password. "
       complete_username_not_found: "Nessun account corrisponde al nome utente <b>%{username}</b>"
       complete_email_not_found: "Nessun account corrisponde alla email <b>%{email}</b>"
-      help: "Non arrivano email? Per prima cosa assicurati di controllare la cartella spam.<p>Non sei sicuro di quale indirizzo email hai usato? Inserisci un indirizzo email e ti faremo sapere se esiste.</p>Se non hai più accesso all'indirizzo email del tuo account, per favore contatta <a href='%{basePath}/about'>il nostro disponibile staff.</a><p>"
+      help: "Le email non arrivano? Per prima cosa assicurati di controllare la cartella spam.<p>Non sei sicuro di quale indirizzo email hai usato? Inserisci un indirizzo email e ti faremo sapere se esiste.</p><p>Se non hai più accesso all'indirizzo email del tuo account, per favore contatta <a href='%{basePath}/about'>il nostro staff.</a></p>"
       button_ok: "OK"
       button_help: "Aiuto"
     email_login:
@@ -1050,7 +1071,7 @@ it:
       button_label: "con email"
       complete_username: "Se un account corrisponde al nome utente <b>%{username}</b> , a breve dovresti ricevere un'email con un link di accesso."
       complete_email: "Se un account corrisponde a <b>%{email}</b>, a breve dovresti ricevere un'email con un link di accesso. "
-      complete_username_found: "Abbiamo trovato un account che corrisponde al nome utente <b>%{username}</b>, dovresti ricevere un'email con un link di accesso a breve."
+      complete_username_found: "Abbiamo trovato un account che corrisponde al nome utente <b>%{username}</b>, a breve dovresti ricevere un'email con un collegamento per l'accesso."
       complete_email_found: "Abbiamo trovato un account che corrisponde a <b>%{email}</b>. A breve dovresti ricevere una email con un link di login."
       complete_username_not_found: "Nessun account con nome utente <b>%{username}</b>"
       complete_email_not_found: "Nessun account con email <b>%{email}</b>"
@@ -1088,6 +1109,7 @@ it:
       provide_new_email: "Fornisci un nuovo indirizzo e invieremo nuovamente la tua email di conferma."
       submit_new_email: "Aggiorna Indirizzo Email"
       sent_activation_email_again: "Ti abbiamo mandato un'altra email di attivazione su <b>{{currentEmail}}</b>. Potrebbero essere necessari alcuni minuti di attesa; assicurati di controllare anche la cartella dello spam."
+      sent_activation_email_again_generic: "Abbiamo inviato un'altra email di attivazione. Potrebbero passare alcuni minuti prima che arrivi; assicurati di controllare la tua cartella dello spam."
       to_continue: "Per favore Connettiti"
       preferences: "Devi essere connesso per cambiare le tue impostazioni."
       forgot: "Non ricordo i dettagli del mio account"
@@ -1141,7 +1163,9 @@ it:
       categories_only: "Solo Categorie"
       categories_with_featured_topics: "Categorie con argomenti in evidenza"
       categories_and_latest_topics: "Categorie e Argomenti Recenti"
-      categories_and_top_topics: "Categorie e argomenti più popolari"
+      categories_and_top_topics: "Categorie e Argomenti Popolari"
+      categories_boxes: "Riquadri con sottocategorie"
+      categories_boxes_with_topics: "Riquadri con Argomenti in evidenza"
     shortcut_modifier_key:
       shift: 'Maiusc'
       ctrl: 'Ctrl'
@@ -1181,7 +1205,7 @@ it:
       title: "Bozze condivise"
       notice: "L'argomento è visibile solo a chi può vedere la categoria <b>{{category}}</b>."
       destination_category: "Categoria di destinazione"
-      publish: "Pubblica Bozza condivisa"
+      publish: "Pubblica Bozza Condivisa"
       confirm_publish: "Confermi la pubblicazione di questa bozza?"
       publishing: "Argomento in pubblicazione..."
     composer:
@@ -1200,6 +1224,7 @@ it:
       saved_local_draft_tip: "salvato in locale"
       similar_topics: "Il tuo argomento è simile a..."
       drafts_offline: "bozze offline"
+      edit_conflict: 'modifica conflitto'
       group_mentioned_limit: "<b>Attenzione!</b> Hai menzionato <a href='{{group_link}}'>{{group}}</a>, tuttavia questo gruppo ha più membri del limite per le menzioni configurato dagli amministratori di {{max}} utenti. Nessuna notifica verrà inviata. "
       group_mentioned:
         one: "Menzionando {{group}}, verrà notificata <a href='{{group_link}}'>1 persona</a> – sei sicuro?"
@@ -1214,9 +1239,11 @@ it:
         title_too_long: "Il titolo non può essere più lungo di {{max}} caratteri"
         post_missing: "Il messaggio non può essere vuoto"
         post_length: "Il messaggio deve essere lungo almeno {{min}} caratteri"
+        try_like: "Hai provato ad usare il pulsante {{heart}} ?"
         category_missing: "Devi scegliere una categoria"
         tags_missing: "Devi scegliere almeno {{count}} etichette"
       save_edit: "Salva Modifiche"
+      overwrite_edit: "Sovrascrivi modifica"
       reply_original: "Rispondi all'Argomento Originale"
       reply_here: "Rispondi Qui"
       reply: "Rispondi"
@@ -1395,7 +1422,7 @@ it:
         posted_by:
           label: Pubblicato da
         in_category:
-          label: Categorizzato
+          label: Classificate
         in_group:
           label: Nel Gruppo
         with_badge:
@@ -1665,7 +1692,7 @@ it:
           description: "Non ti verrà notificato nulla per questo messaggio."
         muted:
           title: "Silenziato"
-          description: "Non riceverai mai notifiche o altro circa questo argomento e non apparirà nella sezione Recenti."
+          description: "Non riceverai mai notifiche o altro circa questo argomento e non apparirà nei recenti."
       actions:
         recover: "Ripristina Argomento"
         delete: "Cancella Argomento"
@@ -1727,7 +1754,7 @@ it:
           other: "Argomenti attualmente appuntati globalmente {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
         make_banner: "Rendi questo argomento uno striscione che apparirà in cima a tutte le pagine."
         remove_banner: "Rimuovi lo striscione che appare in cima a tutte le pagine."
-        banner_note: "Gli utenti possono rimuovere lo striscione nascondendolo. Solo un argomento per volta può diventare un Annuncio."
+        banner_note: "Gli utenti possono nascondere l'annuncio chiudendolo. Solo un argomento per volta può diventare un annuncio."
         no_banner_exists: "Non c'è alcun argomento annuncio."
         banner_exists: "<strong class='badge badge-notification unread'>C'è</strong> attualmente un argomento annuncio."
       inviting: "Sto invitando..."
@@ -1764,9 +1791,13 @@ it:
           one: "1 post"
           other: "{{count}} messaggi"
         cancel: "Rimuovi filtro"
+      move_to:
+        error: "Si è verificato un errore spostando i messaggi."
       split_topic:
         title: "Sposta in un nuovo argomento"
         action: "sposta in un nuovo argomento"
+        topic_name: "Titolo del nuovo Argomento"
+        radio_label: "Nuovo Argomento"
         error: "Si è verificato un errore spostando il messaggio nel nuovo argomento."
         instructions:
           one: "Stai per creare un nuovo argomento riempiendolo con il messaggio che hai selezionato."
@@ -1775,17 +1806,39 @@ it:
         title: "Sposta in Argomento Esistente"
         action: "sposta in un argomento esistente"
         error: "Si è verificato un errore nello spostare i messaggi nell'argomento."
+        radio_label: "Argomento esistente"
         instructions:
           one: "Per favore scegli l'argomento dove spostare il messaggio."
           other: "Per favore scegli l'argomento di destinazione dove spostare i <b>{{count}}</b> messaggi."
+      move_to_new_message:
+        title: "Sposta in un nuovo Messaggio"
+        action: "sposta in un nuovo messaggio"
+        message_title: "Titolo del nuovo messaggio"
+        radio_label: "Nuovo messaggio"
+        participants: "Partecipanti"
+        instructions:
+          one: "Stai per creare un nuovo messaggio e popolarlo con il messaggio che hai selezionato."
+          other: "Stai per creare un nuovo messaggio e popolarlo con i <b>{{count}}</b> messaggi che hai selezionato."
+      move_to_existing_message:
+        title: "Sposta in un messaggio esistente"
+        action: "sposta in un messaggio esistente"
+        radio_label: "Messaggio esistente"
+        participants: "Partecipanti"
+        instructions:
+          one: "Per favore, scegli il messaggio verso il quale vorresti spostare questo messaggio."
+          other: "Per favore, scegli il messaggio verso il quale vorresti spostare quei <b>{{count}}</b> messaggi."
       merge_posts:
         title: "Unisci Messaggi Selezionati"
         action: "unisci messaggi selezionati"
         error: "Si è verificato un errore nell'unire i messaggi selezionati."
       change_owner:
+        title: "Cambia Proprietario"
         action: "cambia proprietà"
         error: "Si è verificato un errore durante il cambio di proprietà dei messaggi."
         placeholder: "nome utente del nuovo proprietario"
+        instructions:
+          one: "Per favore, scegli un nuovo proprietario per il messaggio che apparteneva a  <b>@{{old_user}}</b>"
+          other: "Per favore, scegli un nuovo proprietario per i {{count}}  messaggio che appartenevano a <b>@{{old_user}}</b>"
       change_timestamp:
         title: "Cambia Marca Temporale..."
         action: "cambia marca temporale"
@@ -1829,7 +1882,7 @@ it:
       deleted_by_author:
         one: "(post eliminato dall'autore, sarà automaticamente cancellato in %{count} ore se non contrassegnato)"
         other: "(messaggio eliminato dall'autore, verrà automaticamente cancellato in %{count} ore se non segnalato)"
-      collapse: "collassa"
+      collapse: "raggruppa"
       expand_collapse: "espandi/raggruppa"
       locked: "un membro dello Staff ha bloccato le modifiche a questo messaggio"
       gap:
@@ -1855,6 +1908,7 @@ it:
         upload: "Spiacenti, si è verificato un errore durante il caricamento del file. Prova di nuovo."
         file_too_large: "Spiacenti, il file è troppo grande (la grandezza massima è {{max_size_kb}}kb). Perché non carichi il file con un servizio di cloud sharing e poi ne condividi il collegamento?"
         too_many_uploads: "Spiacenti, puoi caricare un solo file per volta."
+        too_many_dragged_and_dropped_files: "Spiacenti, puoi caricare solo {{max}} file contemporaneamente."
         upload_not_authorized: "Spiacenti, il file che stai cercando di caricare non è autorizzato (estensioni autorizzate: {{authorized_extensions}})."
         image_upload_not_allowed_for_new_user: "Spiacenti, i nuovi utenti non possono caricare immagini."
         attachment_upload_not_allowed_for_new_user: "Spiacenti, i nuovi utenti non possono caricare allegati."
@@ -1906,7 +1960,9 @@ it:
         lock_post_description: "impedisci all'autore di modificare questo messaggio"
         unlock_post: "Sblocca messaggio"
         unlock_post_description: "consenti all'autore di modificare questo messaggio"
+        delete_topic_disallowed_modal: "Non hai il permesso di eliminare questo Argomento. Se davvero lo vuoi eliminare, segnalalo all'attenzione dei moderatori spiegando le tue motivazioni."
         delete_topic_disallowed: "non hai il permesso di eliminare questo argomento"
+        delete_topic: "elimina argomento"
       actions:
         flag: 'Segnala'
         defer_flags:
@@ -2074,7 +2130,7 @@ it:
       show_subcategory_list: "Mostra la lista delle sottocategorie sopra agli argomenti in questa categoria."
       num_featured_topics: "Numero degli argomenti mostrati nella pagina categorie:"
       subcategory_num_featured_topics: "Numero degli argomenti in evidenza nella pagina della categoria superiore"
-      all_topics_wiki: "Rendi automaticamente i nuovi Argomenti delle Wiki"
+      all_topics_wiki: "Rendi i nuovi argomenti automaticamente delle wiki"
       subcategory_list_style: "Stile Lista Sottocategorie:"
       sort_order: "Lista Argomenti Ordinata Per:"
       default_view: "Lista Argomenti Predefinita:"
@@ -2098,6 +2154,7 @@ it:
           description: "Osserverai automaticamente tutti gli argomenti in queste categorie. Riceverai notifiche per ogni nuovo messaggio in ogni argomento, e apparirà il conteggio delle nuove risposte."
         watching_first_post:
           title: "Osservando il Primo Messaggio"
+          description: "Riceverai una notifica di nuovi argomenti in questa categoria, ma non per le risposte agli argomenti."
         tracking:
           title: "Seguendo"
           description: "Seguirai automaticamente tutti gli argomenti in tali categorie. Ti verrà inviata una notifica se qualcuno menziona il tuo @nome o ti risponde, e apparirà un conteggio delle nuove risposte."
@@ -2188,7 +2245,7 @@ it:
         help: "Questo argomento è per te spuntato; verrà mostrato con l'ordinamento di default"
       pinned_globally:
         title: "Appuntato Globalmente"
-        help: "Questo argomento è appuntato globalmente; verrà mostrato in cima all'elenco Recenti e nella sua categoria."
+        help: "Questo argomento è appuntato globalmente; verrà mostrato sempre in cima sia agli argomenti recenti sia nella sua categoria."
       pinned:
         title: "Appuntato"
         help: "Questo argomento è per te appuntato; verrà mostrato con l'ordinamento di default"
@@ -2230,7 +2287,7 @@ it:
       latest:
         title: "Recenti"
         title_with_count:
-          one: "Ultimo (1)"
+          one: "Recente (1)"
           other: "Recenti ({{count}})"
         help: "argomenti con messaggi recenti"
       hot:
@@ -2419,6 +2476,13 @@ it:
       sort_by_name: "nome"
       manage_groups: "Gestisci Gruppi Etichette"
       manage_groups_description: "Definisci gruppi per organizzare le etichette"
+      upload: "Carica Etichette"
+      upload_description: "Carica un file csv per creare Etichette in modo massivo"
+      upload_instructions: "Uno per riga, indicando opzionalmente un Gruppo di Etichette con il formato 'nome_etichetta,gruppo_etichetta'"
+      upload_successful: "Etichette caricate con successo"
+      delete_unused: "Elimina Etichette non utilizzate"
+      delete_unused_description: "Elimina tutte le Etichette che non sono usate in alcun Argomento o Messaggio Personale"
+      cancel_delete_unused: "Annulla"
       filters:
         without_category: "%{filter} %{tag} argomenti"
         with_category: "%{filter} %{tag} argomenti in %{category}"
@@ -2632,8 +2696,8 @@ it:
             too_short: "Il nome del Gruppo è troppo corto"
             too_long: "Il nome del Gruppo è troppo lungo"
             checking: "Controllo disponibilità del nome del gruppo..."
-            available: "Il nome del Gruppo è disponibile."
-            not_available: "Il nome del Gruppo non è disponibile."
+            available: "Il nome del gruppo è disponibile"
+            not_available: "Il nome del gruppo non è disponibile"
             blank: "Il nome del Gruppo non può essere vuoto"
         bulk_add:
           title: "Aggiungi in blocco al Gruppo"
@@ -2649,7 +2713,7 @@ it:
             visibility_levels:
               title: "Chi può vedere questo Gruppo?"
               public: "Chiunque"
-              members: "Proprietari del Gruppo, membri e amministratori"
+              members: "Proprietari del gruppo, membri e amministratori"
               staff: "Proprietari del gruppo e staff"
               owners: "Proprietari del gruppo e amministratori"
           membership:
@@ -2657,7 +2721,7 @@ it:
             trust_level: Livello Esperienza
             trust_levels_title: "Livello Esperienza assegnato automaticamente agli utenti quando vengono aggiunti:"
             trust_levels_none: "Nessuno"
-            primary_group: "Imposta automaticamente come gruppo primario"
+            primary_group: "Imposta automaticamente come gruppo principale"
         name_placeholder: "Nome del gruppo, senza spazi, stesse regole del nome utente"
         primary: "Gruppo Primario"
         no_primary: "(nessun gruppo primario)"
@@ -3223,7 +3287,6 @@ it:
         last_emailed: "Ultima email inviata"
         not_found: "Spiacenti, questo nome utente non esiste nel sistema."
         id_not_found: "Spiacenti, nel nostro sistema non esiste questo id utente."
-        active: "Attivo"
         show_emails: "Mostra email"
         nav:
           new: "Nuovi"
@@ -3490,7 +3553,7 @@ it:
         categories:
           all_results: 'Tutti'
           required: 'Obbligatorie'
-          basic: 'Impostazioni di base'
+          basic: 'Impostazioni Base'
           users: 'Utenti'
           posting: 'Pubblicazione'
           email: 'Email'
@@ -3514,6 +3577,7 @@ it:
           tags: "Etichette"
           search: "Cerca"
           groups: "Gruppi"
+          dashboard: "Cruscotto"
       badges:
         title: Distintivi
         new_badge: Nuovo Distintivo
diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml
index e2a155afe4..4802853917 100644
--- a/config/locales/client.ja.yml
+++ b/config/locales/client.ja.yml
@@ -94,7 +94,6 @@ ja:
       close: '閉じる'
       twitter: 'Twitter でこのリンクを共有する'
       facebook: 'Facebook でこのリンクを共有する'
-      google+: 'Google+ でこのリンクを共有する'
       email: 'メールでこのリンクを送る'
     action_codes:
       public_topic: "トピックを公開しました: %{when} "
diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml
index e2b474fa86..769936cc46 100644
--- a/config/locales/client.ko.yml
+++ b/config/locales/client.ko.yml
@@ -94,7 +94,6 @@ ko:
       close: '닫기'
       twitter: '트위터로 공유'
       facebook: '페이스북으로 공유'
-      google+: 'Google+로 공유'
       email: '이메일로 공유'
     action_codes:
       public_topic: "이 글을 %{when} 에 공개"
@@ -2921,7 +2920,6 @@ ko:
         last_emailed: "마지막 이메일"
         not_found: "죄송합니다, 그 이름은 시스템에 존재하지 않습니다."
         id_not_found: "죄송합니다. 해당 사용자가 시스템에 없습니다."
-        active: "활동"
         show_emails: "이메일 보기"
         nav:
           new: "새로운 사용자"
diff --git a/config/locales/client.lt.yml b/config/locales/client.lt.yml
index c6f36339dc..5434245836 100644
--- a/config/locales/client.lt.yml
+++ b/config/locales/client.lt.yml
@@ -154,7 +154,6 @@ lt:
       close: 'uždaryti'
       twitter: 'pasidalinkite šią nuorodą per Twitter'
       facebook: 'pasidalinkite šią nuorodą per Facebook'
-      google+: 'pasidalinkite šią nuorodą per Google+'
       email: 'siųskite šią nuorodą į el. paštą'
     action_codes:
       public_topic: "nustatė diskusijas viešom %{when}"
@@ -2826,7 +2825,6 @@ lt:
         last_emailed: "Paskutinį kartą siųstas el. laiškas"
         not_found: "Atsiprašome, toks slapyvardis neegzistuoja mūsų sistemoje."
         id_not_found: "Atsiprašome, tačiau toks vartotojo ID sistemoje neegzistuoja"
-        active: "Aktivuotas"
         show_emails: "Rodyti el. pašto adresus"
         nav:
           new: "Nauji"
diff --git a/config/locales/client.lv.yml b/config/locales/client.lv.yml
index 857b02b887..ca869afabf 100644
--- a/config/locales/client.lv.yml
+++ b/config/locales/client.lv.yml
@@ -126,7 +126,6 @@ lv:
       close: 'aizvērt'
       twitter: 'padalīties ar šo saiti Twitter'
       facebook: 'padalīties ar šo saiti Facebook'
-      google+: 'padalīties ar šo saiti Google+'
       email: 'nosūtīt šo saiti e-pastā'
     action_codes:
       public_topic: "padarīja tēmu publisku %{when}"
@@ -2653,7 +2652,6 @@ lv:
         last_emailed: "Pēdējo reizi saņēmis e-pastu"
         not_found: "Piedod, šāds lietotājvārds neeksistē mūsu sistēmā."
         id_not_found: "Piedod, šāds lietotāja ID neeksistē mūsu sistēmā."
-        active: "Aktīvi"
         show_emails: "Parādīt E-pastus"
         nav:
           new: "Jauns"
diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml
index 596bb9a4b4..7fb0d60788 100644
--- a/config/locales/client.nb_NO.yml
+++ b/config/locales/client.nb_NO.yml
@@ -114,7 +114,6 @@ nb_NO:
       close: 'lukk'
       twitter: 'del denne lenken på Twitter'
       facebook: 'del denne lenken på Facebook'
-      google+: 'del denne lenken på Google+'
       email: 'del denne lenken i en e-post'
     action_codes:
       public_topic: "gjorde dette emnet offentlig %{when}"
@@ -3247,7 +3246,6 @@ nb_NO:
         last_emailed: "Sist kontaktet"
         not_found: "Beklager, det brukernavner eksisterer ikke i systemet vårt."
         id_not_found: "Beklager, den bruker-ID-en eksisterer ikke i systemet vårt."
-        active: "Aktiv"
         show_emails: "Vis e-poster"
         nav:
           new: "Ny"
diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml
index 4a15c7ffa2..b88dc5e5b8 100644
--- a/config/locales/client.nl.yml
+++ b/config/locales/client.nl.yml
@@ -108,7 +108,6 @@ nl:
       close: 'sluiten'
       twitter: 'deze koppeling delen op Twitter'
       facebook: 'deze koppeling delen op Facebook'
-      google+: 'deze koppeling delen op Google+'
       email: 'deze koppeling delen via e-mail'
     action_codes:
       public_topic: "heeft dit topic openbaar gemaakt op %{when}"
@@ -2827,7 +2826,6 @@ nl:
         last_emailed: "Laatst gemaild"
         not_found: "Sorry, die gebruikersnaam bestaat niet in ons systeem."
         id_not_found: "Sorry, die gebruikers-ID bestaat niet in ons systeem."
-        active: "Actief"
         show_emails: "E-mails tonen"
         nav:
           new: "Nieuw"
diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml
index 308bbfa040..b0588556de 100644
--- a/config/locales/client.pl_PL.yml
+++ b/config/locales/client.pl_PL.yml
@@ -154,7 +154,6 @@ pl_PL:
       close: 'zamknij'
       twitter: 'udostępnij ten odnośnik na Twitterze'
       facebook: 'udostępnij ten odnośnik na Facebooku'
-      google+: 'udostępnij ten odnośnik na Google+'
       email: 'wyślij ten odnośnik przez email'
     action_codes:
       public_topic: "Upublicznij ten temat %{when}"
@@ -3235,7 +3234,6 @@ pl_PL:
         last_emailed: "Ostatnio wysłano email"
         not_found: "Przepraszamu, taka nazwa użytkowanika nie istnieje w naszym systemie."
         id_not_found: "Przepraszamy, ten identyfikator użytkownika nie istnieje w naszym systemie."
-        active: "Aktywny"
         show_emails: "Pokaż emaile"
         nav:
           new: "Nowi"
diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml
index 28669077bd..679a5a0d22 100644
--- a/config/locales/client.pt.yml
+++ b/config/locales/client.pt.yml
@@ -114,7 +114,6 @@ pt:
       close: 'fechar'
       twitter: 'partilhar esta hiperligação no Twitter'
       facebook: 'partilhar esta hiperligação no Facebook'
-      google+: 'partilhar esta hiperligação no Google+'
       email: 'enviar esta hiperligação por e-mail'
     action_codes:
       public_topic: "tornei este tópico publico %{when}"
@@ -2612,7 +2611,6 @@ pt:
         last_emailed: "Último email enviado"
         not_found: "Pedimos desculpa, esse nome de utilizador não existe no nosso sistema."
         id_not_found: "Pedimos desculpa, esse id de utilizador não existe no nosso sistema."
-        active: "Ativo"
         show_emails: "Mostrar Emails"
         nav:
           new: "Novo"
diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml
index df48ccfcda..0ec3ebbfbe 100644
--- a/config/locales/client.pt_BR.yml
+++ b/config/locales/client.pt_BR.yml
@@ -114,7 +114,6 @@ pt_BR:
       close: 'fechar'
       twitter: 'compartilhe este link no Twitter'
       facebook: 'compartilhe este link no Facebook'
-      google+: 'compartilhe este link no Google+'
       email: 'enviar esse link para um email'
     action_codes:
       public_topic: "tornou este tópico público em %{when}"
@@ -3257,7 +3256,6 @@ pt_BR:
         last_emailed: "Último email enviado"
         not_found: "Desculpe, esse nome de usuário não existe no nosso sistema."
         id_not_found: "Desculpe, esse nome de usuário não existe no nosso sistema."
-        active: "Ativo"
         show_emails: "Mostrar Emails"
         nav:
           new: "Novos"
diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml
index 455690297a..c12a0340e7 100644
--- a/config/locales/client.ro.yml
+++ b/config/locales/client.ro.yml
@@ -134,7 +134,6 @@ ro:
       close: 'Închide'
       twitter: 'Distribuie pe Twitter'
       facebook: 'Distribuie pe Facebook'
-      google+: 'Distribuie pe Google+'
       email: 'Drimite pe email'
     action_codes:
       public_topic: "a făcut acest subiect public %{when}"
@@ -3017,7 +3016,6 @@ ro:
         last_emailed: "Ultimul email trimis"
         not_found: "Ne pare rău, acest nume de utilizator nu există în sistem."
         id_not_found: "Ne pare rău, dar acest utilizator nu există în sistem."
-        active: "Activi"
         show_emails: "Arată email"
         nav:
           new: "Noi"
diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml
index e9158a36ac..396053261f 100644
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@@ -154,7 +154,6 @@ ru:
       close: 'Закрыть'
       twitter: 'Поделиться ссылкой через Twitter'
       facebook: 'Поделиться ссылкой через Facebook'
-      google+: 'Поделиться ссылкой через Google+'
       email: 'Поделиться ссылкой по электронной почте'
     action_codes:
       public_topic: "Сделал эту тему публичной %{when}"
@@ -3303,7 +3302,6 @@ ru:
         last_emailed: "Последнее письмо"
         not_found: "К сожалению, такой псевдоним не зарегистрирован."
         id_not_found: "К сожалению, этот пользователь не зарегистрирован."
-        active: "Активные"
         show_emails: "Показать адреса e-mail"
         nav:
           new: "Новые"
diff --git a/config/locales/client.sk.yml b/config/locales/client.sk.yml
index 69deaad8e7..f3536b674c 100644
--- a/config/locales/client.sk.yml
+++ b/config/locales/client.sk.yml
@@ -154,7 +154,6 @@ sk:
       close: 'zatvoriť'
       twitter: 'zdieľaj odkaz na Twitteri'
       facebook: 'zdieľaj odkaz na Facebooku'
-      google+: 'zdieľaj odkaz na Google+'
       email: 'pošli odkaz emailom'
     action_codes:
       public_topic: "téma je verejná%{when}"
@@ -2744,7 +2743,6 @@ sk:
         last_emailed: "Posledný odemailovaný"
         not_found: "Prepáčte, toto používateľské meno sa nenachádza v našom systéme."
         id_not_found: "Prepáčte, toto používateľské id sa nenachádza v našom systéme."
-        active: "Aktívny"
         show_emails: "Ukázať Emaily"
         nav:
           new: "Nový"
diff --git a/config/locales/client.sl.yml b/config/locales/client.sl.yml
index 057908c6e0..10a13a57f8 100644
--- a/config/locales/client.sl.yml
+++ b/config/locales/client.sl.yml
@@ -154,7 +154,6 @@ sl:
       close: 'zapri'
       twitter: 'deli povezavo na Twitterju'
       facebook: 'deli povezao na Facebooku'
-      google+: 'deli povezavo na Google+'
       email: 'pošlji povezavo preko e-pošte'
     action_codes:
       public_topic: "je naredil temo javno %{when}"
@@ -213,13 +212,13 @@ sl:
     not_implemented: "Oprosti, ta funkcija še ni bila implementirana!"
     no_value: "Ne"
     yes_value: "Da"
-    submit: "Oddaj"
+    submit: "Išči"
     generic_error: "Ups, prišlo je do napake."
     generic_error_with_reason: "Napaka: %{error}"
     sign_up: "Prijava"
     log_in: "Prijava"
     age: "Starost"
-    joined: "Pridružen"
+    joined: "Pridružitev"
     admin_title: "Administrator"
     flags_title: "Prijave"
     show_more: "Več"
@@ -396,7 +395,7 @@ sl:
       post_count_long: "Objavljeni Odgovori"
       no_results: "Noben rezultat ni bil najden."
       days_visited: "Obiski"
-      days_visited_long: "Dni obiskov"
+      days_visited_long: "Dni prisotnosti"
       posts_read: "Prebrano"
       posts_read_long: "Objave Prebrane"
       total_rows:
@@ -495,7 +494,7 @@ sl:
       activity: "Aktivnost"
       members:
         title: "Člani"
-        filter_placeholder_admin: "uporabniško ime ali e-pošta"
+        filter_placeholder_admin: "uporabniško ime ali e-naslov"
         filter_placeholder: "uporabniško ime"
         remove_member: "Odstrani člana"
         remove_member_description: "Odstrani <b>%{username}</b> iz te skupine"
@@ -572,6 +571,7 @@ sl:
         two: "1 tema"
         few: "%{count} tem"
         other: "%{count} tem"
+      n_more: "Kategorije (še %{count} več) ..."
     ip_lookup:
       title: Poizvedba IP naslova
       hostname: Ime gostitelja
@@ -586,7 +586,7 @@ sl:
       read_time: "čas prebiranja"
       topics_entered: "vstop v teme"
       post_count: "# objave"
-      confirm_delete_other_accounts: "Si prepričan, da želiš izbrisati te račune?"
+      confirm_delete_other_accounts: "Si prepričan/a, da želiš izbrisati te račune?"
     user_fields:
       none: "(izberi možnost)"
     user:
@@ -609,7 +609,7 @@ sl:
       collapse_profile: "Skrči"
       bookmarks: "Zaznamki"
       bio: "O meni"
-      invited_by: "Povabljen/a od"
+      invited_by: "Povabilo od"
       trust_level: "Nivo zaupanja"
       notifications: "Obvestila"
       statistics: "Statistika"
@@ -666,7 +666,7 @@ sl:
       muted_categories: "Zamolčano"
       no_category_access: "Kot moderator imaš omejen dostop do kategorije, shranjevanje je onemogočeno"
       delete_account: "Izbriši Moj Račun"
-      delete_account_confirm: "Si prepričan, da želiš trajno izbrisati svoj račun? Tega postopka ni mogoče razveljaviti!"
+      delete_account_confirm: "Si prepričan/a, da želiš trajno izbrisati svoj račun? Tega postopka ni mogoče razveljaviti!"
       deleted_yourself: "Vaš račun je bil uspešno izbrisan."
       delete_yourself_not_allowed: "Če želite izbrisati račun, prosim kontaktirajte osebje."
       unread_message_count: "Sporočila"
@@ -745,7 +745,7 @@ sl:
         title: "Ozadje kartice uporabnika"
         instructions: "Ozadje kartice bo centrirano in imelo širino 590px."
       email:
-        title: "E-pošta"
+        title: "E-naslov"
         instructions: "nikoli ne pokaži javno"
         invalid: "Prosim vnesite veljaven e-naslov"
         frequency:
@@ -785,12 +785,12 @@ sl:
         show_all: "Prikaži vse ({{count}})"
         show_few: "Prikaži manj"
       last_posted: "Zadnja objava"
-      last_seen: "Viden/a"
-      created: "Pridružen/a"
+      last_seen: "Prisotnost"
+      created: "Pridružitev"
       log_out: "Odjava"
       location: "Lokacija"
       website: "Spletna stran"
-      email_settings: "E-pošta"
+      email_settings: "E-naslov"
       hide_profile_and_presence: "Skrij moj javni profil and prisotnost"
       like_notification_frequency:
         title: "Obvesti o všečkih"
@@ -894,7 +894,7 @@ sl:
           one: "dan obiska"
           two: "dni obiska"
           few: "dni obiskov"
-          other: "dni obiskov"
+          other: "dni prisotnosti"
         topics_entered:
           one: "ogledana tema"
           two: "ogledani temi"
@@ -917,10 +917,12 @@ sl:
         more_topics: "Več tem"
         top_badges: "Najboljše značke"
         no_badges: "Ni značk."
+        more_badges: "Več značk"
         top_links: "Najboljše povezave"
         no_links: "Ni povezav."
         most_liked_by: "Največ všečkov od"
-        most_liked_users: "Največkrat všečkal/a"
+        most_liked_users: "Največ všečkov za"
+        most_replied_to_users: "NAJVEČKRAT ODGOVORJENO"
         no_likes: "Ni všečkov."
       avatar:
         title: "Profilna slika"
@@ -968,6 +970,7 @@ sl:
     private_message_info:
       edit: "Dodaj ali odstrani..."
     username: 'Uporabniško ime'
+    last_seen: 'Prisotnost'
     trust_level: 'Nivo zaupanja'
     search_hint: 'uporabniško ime, e-naslov ali IP naslov'
     create_account:
@@ -1022,6 +1025,7 @@ sl:
     emoji_picker:
       activity: Aktivnost
     composer:
+      options: "Možnosti"
       cannot_see_mention:
         category: "Omenil si uporabnika {{username}} , a ta ne bo obveščen saj nima dostopa do te kategorije. Dodati ga je potrebno v skupino ki lahko dostopa do kategorije."
         private: "Omenili ste uporabnika {{username}} , a ta ne bo obveščen, ker ne more videti tega osebnega sporočila. Moraii ga boste povabiti v to osebno sporočilo."
@@ -1032,6 +1036,7 @@ sl:
       reply_here: "Odgovori tu"
       reply: "Odgovori"
       create_topic: "Ustvari temo"
+      create_pm: "Pošlji"
       users_placeholder: "Dodaj uporabnika"
       title_placeholder: "Kaj je tema sporočila v kratkem stavku?"
       title_or_link_placeholder: "Na tem mestu vpiši naslov ali prilepi povezavo "
@@ -1041,6 +1046,10 @@ sl:
       show_preview: 'prikaži predogled &raquo;'
       hide_preview: '&laquo; skrij predogled'
       quote_post_title: "Citiraj celo objavo"
+      bold_title: "Krepko"
+      bold_text: "krepko"
+      link_title: "Povezava"
+      link_dialog_title: "Vstavi povezavo"
       paste_code_text: "vpiši ali prilepi kodo"
       composer_actions:
         reply_as_private_message:
@@ -1071,13 +1080,18 @@ sl:
     search:
       sort_by: "Uredi po"
       relevance: "Relevanci"
-      latest_post: "Zadnja objava"
-      latest_topic: "Zadnja tema"
+      latest_post: "Najnovejši objavi"
+      latest_topic: "Najnovejši temi"
       most_viewed: "Številu ogledov"
       most_liked: "Številu všečkov"
       select_all: "Izberi vse"
       clear_all: "Počisti vse"
       too_short: "Niz za iskanje je prekratek"
+      result_count:
+        one: "<span>1 zadetek za</span><span class='term'>{{term}}</span>"
+        two: "<span>1 zadetek za</span><span class='term'>{{term}}</span>"
+        few: "<span>1 zadetek za</span><span class='term'>{{term}}</span>"
+        other: "<span>{{count}}{{plus}} zadetkov za</span><span class='term'>{{term}}</span>"
       title: "išči po temah, objavah, uporabnikih ali kategorijah"
       full_page_title: "išči teme ali objave"
       no_results: "Iskanje nima zadetkov."
@@ -1111,28 +1125,28 @@ sl:
           label: Označeno
         filters:
           label: Vrni samo teme/objave...
-          title: se ujema naslov
-          likes: Ki sem jih všečkal
-          posted: Objavil sem v
-          watching: Ki jih opazujem
-          tracking: Ki jim sledim
+          title: kjer se ujema naslov
+          likes: ki sem jih všečkal
+          posted: v keterih sem odgovarjal
+          watching: ki jih opazujem
+          tracking: ki jim sledim
           private: V mojih sporočilih
-          bookmarks: Kjer sem ustvaril zaznamek
+          bookmarks: kjer sem ustvaril zaznamek
           first: ob prvi objavi
           pinned: so pripete
           unpinned: niso pripete
-          seen: Ki sem jih prebral
-          unseen: Ki jih nisem prebral
+          seen: ki sem jih prebral
+          unseen: ki jih nisem prebral
           wiki: so wiki
           images: Vsebujejo sliko(e)
           all_tags: Vse zgornje oznake
         statuses:
-          label: Kjer tema
-          open: so odprte
-          closed: so zaprte
-          archived: so arhivirane
-          noreplies: nimajo nobenega odgovora
-          single_user: vključujejo samo enega uporabnika
+          label: Kjer so teme
+          open: odprte
+          closed: zaprte
+          archived: arhivirane
+          noreplies: brez odgovora
+          single_user: od samo enega uporabnika
         post:
           count:
             label: Minimalno število objav
diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml
index a98ec436ee..99989010e0 100644
--- a/config/locales/client.sq.yml
+++ b/config/locales/client.sq.yml
@@ -107,7 +107,6 @@ sq:
       close: 'mbylle'
       twitter: 'shpërndaje këtë lidhje në Twitter'
       facebook: 'postojeni këtë lidhje në Facebook'
-      google+: 'shpërndaje këtë lidhje në Google+'
       email: 'dërgoje këtë lidhje me email'
     action_codes:
       public_topic: "e bëri këtë temë publike %{when}"
@@ -2212,7 +2211,6 @@ sq:
         last_emailed: "Emaili i fundit"
         not_found: "Na vjen keq, por ky emër nuk u gjet në sistem."
         id_not_found: "Na vjen keq, por ky emër nuk ekziston në sistem."
-        active: "Aktivë"
         show_emails: "Trego adresat email"
         nav:
           new: "E Re"
diff --git a/config/locales/client.sr.yml b/config/locales/client.sr.yml
index 2e9bc71b1e..4f704f62a6 100644
--- a/config/locales/client.sr.yml
+++ b/config/locales/client.sr.yml
@@ -134,7 +134,6 @@ sr:
       close: 'zatvori'
       twitter: 'podeli ovaj link na Twitteru'
       facebook: 'podeli ovaj link na Facebooku'
-      google+: 'podeli ovaj link na Google+'
       email: 'podeli ovaj link preko e-pošte'
     action_codes:
       public_topic: "objavi ovu temu javno %{when}"
@@ -1686,7 +1685,6 @@ sr:
         last_emailed: "Poslednji e-mail"
         not_found: "Žao nam je, taj korisnik ne postoji u našem sistemu."
         id_not_found: "Žao nam je, taj korisnički ID ne postoji u našem sistemu."
-        active: "Aktivni"
         show_emails: "Pokaži Email-ove"
         nav:
           new: "Novo"
diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml
index 44f1688030..b1e91e23cf 100644
--- a/config/locales/client.sv.yml
+++ b/config/locales/client.sv.yml
@@ -108,7 +108,6 @@ sv:
       close: 'stäng'
       twitter: 'dela denna länk på Twitter'
       facebook: 'dela denna länk på Facebook'
-      google+: 'dela denna länk på Google+'
       email: 'skicka denna länk i ett e-postmeddelande'
     action_codes:
       public_topic: "gjorde det här ämnet publikt %{when}"
@@ -2511,7 +2510,6 @@ sv:
         last_emailed: "Senaste som mottog e-post"
         not_found: "Tyvärr, det användarnamnet existerar inte i vårt system."
         id_not_found: "Tyvärr, användar-ID existerar inte i vårt system."
-        active: "Aktiv"
         show_emails: "Visa e-post"
         nav:
           new: "Ny"
diff --git a/config/locales/client.sw.yml b/config/locales/client.sw.yml
index fc303413ff..beac81a7ac 100644
--- a/config/locales/client.sw.yml
+++ b/config/locales/client.sw.yml
@@ -114,7 +114,6 @@ sw:
       close: 'funga'
       twitter: 'Shiriki hiki kiungo kwenye Twitter'
       facebook: 'Shiriki hiki kiungo kwenye Facebook'
-      google+: 'Kishiriki hiki kiungo kwenye Google+, mtandao wa kijamii'
       email: 'tuma kiungo hiki kwenye barua pepe'
     action_codes:
       public_topic: "ameifanya hii mada isiwe ya siri %{when}"
@@ -3013,7 +3012,6 @@ sw:
         last_emailed: "Mara ya Mwisho Amepokea Barua Pepe"
         not_found: "Samahani, jina la mtumiaji halipo kwenye mfupo wetu."
         id_not_found: "Samahani, utambulisho wa mtumiaji haupo kwenye mfumo wetu."
-        active: "Mara kwa Mara"
         show_emails: "Onyesha Barua Pepe"
         nav:
           new: "Mpya"
diff --git a/config/locales/client.te.yml b/config/locales/client.te.yml
index 6af53b23cc..2aa0b9e906 100644
--- a/config/locales/client.te.yml
+++ b/config/locales/client.te.yml
@@ -96,7 +96,6 @@ te:
       close: 'మూసివేయి'
       twitter: 'ఈ లింక్ ను ట్విట్టరు లో పంచుకొండి'
       facebook: 'ఈ లింక్ ను ఫేస్ బుక్ లో పంచుకొండి'
-      google+: 'ఈ లింక్ ను గూగుల్ ప్లస్ లో పంచుకొండి'
       email: 'ఈ లింక్ ను ఈమెయిల్ లో పంచుకొండి'
     topic_admin_menu: "విషయపు అధికార చర్యలు"
     emails_are_disabled: "బయటకు వెళ్లే అన్ని ఈమెయిల్లూ అధికారి నిశేధించాడు. ఇప్పుడు ఎటువంటి ఈమెయిల్ ప్రకటనలూ పంపవీలవదు."
@@ -1422,7 +1421,6 @@ te:
         last_emailed: "చివరగా ఈమెయిల్ చేసినది"
         not_found: "క్షమించాలి, ఆ సభ్యనామం మా వ్వవస్థలో లేదు."
         id_not_found: "క్షమించాలి, ఆ సభ్య ఐడీ మా వ్యవస్థలో లేదు"
-        active: "క్రియాశీల"
         show_emails: "ఈమెయిల్లు చూపు"
         nav:
           new: "కొత్త"
diff --git a/config/locales/client.th.yml b/config/locales/client.th.yml
index d1b38d8693..fce6af8364 100644
--- a/config/locales/client.th.yml
+++ b/config/locales/client.th.yml
@@ -90,7 +90,6 @@ th:
       close: 'ปิด'
       twitter: 'แบ่งปันลิงก์นี้บน Twitter'
       facebook: 'แบ่งปันลิงก์นี้บน Facebook'
-      google+: 'แบ่งปันลิงก์บน Google+'
       email: 'ส่งลิงก์นี้ทางอีเมล'
     action_codes:
       public_topic: "ทำให้กระทู้นี้เป็นสาธารณะ %{when} "
diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml
index 49e9accadc..36b32c39db 100644
--- a/config/locales/client.tr_TR.yml
+++ b/config/locales/client.tr_TR.yml
@@ -114,7 +114,6 @@ tr_TR:
       close: 'kapat'
       twitter: 'bu bağlantıyı Twitter''da paylaş'
       facebook: 'bu bağlantıyı Facebook''da paylaş'
-      google+: 'bu bağlantıyı Google+''da paylaş'
       email: 'bu bağlantıyı e-posta ile gönder'
     action_codes:
       public_topic: "bu konuyu %{when} herkese açık yaptı"
@@ -3233,7 +3232,6 @@ tr_TR:
         last_emailed: "Son E-posta Gönderimi"
         not_found: "Üzgünüz, bu kullanıcı adı sistemimizde bulunmuyor. "
         id_not_found: "Üzgünüz, bu kullanıcı kimliği sistemimizde bulunmuyor."
-        active: "Aktif"
         show_emails: "E-postaları Göster"
         nav:
           new: "Yeni"
diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml
index 5d2f2d7e81..e08861d2b5 100644
--- a/config/locales/client.uk.yml
+++ b/config/locales/client.uk.yml
@@ -67,7 +67,6 @@ uk:
       close: 'сховати'
       twitter: 'поширити це посилання в Twitter'
       facebook: 'поширити це посилання в Facebook'
-      google+: 'поширити це посилання в Google+'
       email: 'надіслати це посилання електронною поштою'
     topic_admin_menu: "керування темою"
     emails_are_disabled: "Надсилання повідомлень електронною поштою було глобально вимкнено адміністратором. Жодне сповіщення електронною поштою не буде надіслано."
@@ -1419,7 +1418,6 @@ uk:
         last_emailed: "Останній ел. лист"
         not_found: "Даруйте, такого імені користувача немає в нашій системі."
         id_not_found: "Даруйте, користувача за таким номером немає в нашій системі."
-        active: "Активний(а)"
         show_emails: "Показати електронну пошту"
         nav:
           new: "Нові"
diff --git a/config/locales/client.ur.yml b/config/locales/client.ur.yml
index 9271de72f8..6d642ef67d 100644
--- a/config/locales/client.ur.yml
+++ b/config/locales/client.ur.yml
@@ -114,7 +114,6 @@ ur:
       close: 'بند کریں'
       twitter: 'ٹوئٹر پر اس لنک کو شیئرکریں'
       facebook: 'فیس بک پر اس لنک کو شیئرکریں'
-      google+: 'گُوگَل+ پر اس لنک کو شیئرکریں'
       email: 'اس لنک کو  ای میل میں بھیجیں'
     action_codes:
       public_topic: "اس ٹاپک کو پبلک بنایا گیا %{when}"
@@ -3056,7 +3055,6 @@ ur:
         last_emailed: "جِسے آخری دفع اِی میل کی گئی"
         not_found: "معذرت، وہ صارف نام ہمارے سِسٹم میں موجود نہیں ہے۔"
         id_not_found: "معذرت، وہ صارف ID ہمارے سِسٹم میں موجود نہیں ہے۔"
-        active: "فعال"
         show_emails: "اِیمیل دکھائیں"
         nav:
           new: "نیا"
diff --git a/config/locales/client.vi.yml b/config/locales/client.vi.yml
index ab5aae9259..77e89d52ec 100644
--- a/config/locales/client.vi.yml
+++ b/config/locales/client.vi.yml
@@ -94,7 +94,6 @@ vi:
       close: 'đóng'
       twitter: 'chia sẻ lên Twitter'
       facebook: 'chia sẻ lên Facebook'
-      google+: 'chia sẻ lên Google+'
       email: 'Gửi liên kết này qua email'
     action_codes:
       public_topic: "hiển thị chủ đề này công khai lúc %{when}"
@@ -2198,7 +2197,6 @@ vi:
         last_emailed: "Email trước đây"
         not_found: "Xin lỗi, username không tồn tại trong hệ thống."
         id_not_found: "Xin lỗi, id người dùng không tồn tại trong hệ thống."
-        active: "Kích hoạt"
         show_emails: "Hiện địa chỉ Email"
         nav:
           new: "Mới"
diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml
index 033cf65169..70d172cab6 100644
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@@ -94,7 +94,6 @@ zh_CN:
       close: '关闭'
       twitter: '分享至 Twitter'
       facebook: '分享至 Facebook'
-      google+: '分享至 Google+'
       email: '在电子邮件里发送该链接'
     action_codes:
       public_topic: "于%{when}设置为公共主题"
@@ -160,6 +159,7 @@ zh_CN:
     submit: "提交"
     generic_error: "抱歉，出了点小问题。"
     generic_error_with_reason: "出错了：%{error}"
+    go_ahead: "继续"
     sign_up: "注册"
     log_in: "登录"
     age: "年龄"
@@ -224,12 +224,12 @@ zh_CN:
       clear_bookmarks: "取消收藏"
       help:
         bookmark: "点击收藏该主题的第一个帖子"
-        unbookmark: "点击删除本主题的所以书签"
+        unbookmark: "点击删除本主题的所有收藏"
     bookmarks:
       created: "已经收藏了"
       not_bookmarked: "收藏此贴"
       remove: "取消收藏"
-      confirm_clear: "你确定要清空这个主题中的所有书签？"
+      confirm_clear: "你确定要清空这个主题中的所有收藏？"
     drafts:
       resume: "复位"
       remove: "移除"
@@ -916,7 +916,7 @@ zh_CN:
         title: "注册 IP 地址"
       avatar:
         title: "头像"
-        header_title: "个人页面、私信、书签和设置"
+        header_title: "个人信息、私信、收藏和设置"
       title:
         title: "头衔"
         none: "（无）"
@@ -2224,8 +2224,8 @@ zh_CN:
         title: "我的帖子"
         help: "你发表过帖子的主题"
       bookmarks:
-        title: "书签"
-        help: "你标上书签的主题"
+        title: "收藏"
+        help: "你收藏的主题"
       category:
         title: "{{categoryName}}"
         title_with_count:
@@ -2270,7 +2270,7 @@ zh_CN:
         unread: '<b>g</b>, <b>u</b> 未读'
         categories: '<b>g</b>, <b>c</b> 分类'
         top: '<b>g</b>, <b>t</b> 热门'
-        bookmarks: '<b>g</b>, <b>b</b> 书签'
+        bookmarks: '<b>g</b>, <b>b</b> 收藏'
         profile: '<b>g</b> 然后 <b>p</b> 个人页面'
         messages: '<b>g</b>, <b>m</b> 私信'
         drafts: '<b>g</b>，<b></b>草稿'
@@ -2835,7 +2835,6 @@ zh_CN:
             confirm: "你确定要将数据库回滚到之前的工作状态吗？"
         location:
           local: "本地存储"
-          s3: "Amazon S3"
       export_csv:
         success: "导出开始，完成后你将被通过私信通知。"
         failed: "导出失败。请检查日志。"
@@ -3279,7 +3278,6 @@ zh_CN:
         last_emailed: "最后一次邮寄"
         not_found: "抱歉，在我们的系统中此用户名不存在。"
         id_not_found: "抱歉，在我们的系统中此用户 id 不存在。"
-        active: "活跃"
         show_emails: "显示邮件"
         nav:
           new: "新建"
diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml
index 575d3d3b26..3942ee597f 100644
--- a/config/locales/client.zh_TW.yml
+++ b/config/locales/client.zh_TW.yml
@@ -94,7 +94,6 @@ zh_TW:
       close: '關閉'
       twitter: '在 Twitter 分享此連結'
       facebook: '在 Facebook 分享此連結'
-      google+: '在 Google+ 分享此連結'
       email: '以電子郵件分享此連結'
     action_codes:
       public_topic: "於 %{when}發佈這個話題"
@@ -2681,7 +2680,6 @@ zh_TW:
         last_emailed: "最近寄出電子郵件"
         not_found: "抱歉，系統裡無此用戶名稱。"
         id_not_found: "抱歉，系統裡無此用戶名稱。"
-        active: "啟用的"
         show_emails: "顯示電子郵件"
         nav:
           new: "新用戶"
diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml
index 791513a907..8f9796e3ae 100644
--- a/config/locales/server.ar.yml
+++ b/config/locales/server.ar.yml
@@ -896,7 +896,6 @@ ar:
     tl2_additional_likes_per_day_multiplier: "زيادة حد الإعجابات باليوم لـ  لـمستوى الثقة 2 (عضو) بالضرب بهذا الرقم"
     tl3_additional_likes_per_day_multiplier: "زيادة حد الإعجابات باليوم لـ  لـمستوى الثقة 3 (منتظم) بالضرب بهذا الرقم"
     tl4_additional_likes_per_day_multiplier: "زيادة حد الإعجابات باليوم لـمستوى الثقة 4 (قائد) بالضرب بهذا الرقم"
-    flag_sockpuppets: "إذا رد أحد المستخدمين جديد إلى موضوع من عنوان IP نفسه باسم المستخدم الجديد الذي بدأ هذا الموضوع، علم كل من مناصبهم كدعاية المحتملين."
     traditional_markdown_linebreaks: "استعمل السطور التالفه التقليديه في Markdown, التي تتطلب مساحتين بيضاوين للسطور التالفه"
     post_undo_action_window_mins: "عدد الدقائق التي يسمح فيها للأعضاء بالتراجع عن آخر إجراءاتهم على المنشور (إعجاب، اشارة، إلخ...)"
     must_approve_users: "يجب علي طاقم العمل الموافقة على جميع الحسابات الجديدة قبل أن يتم السماح لها بالوصول إلى الموقع. تحذير: تفعيل هذة الخاصية علي موقع نشط سوف يمنع وصول كل الاعضاء ماعدا طاقم العمل."
@@ -920,7 +919,6 @@ ar:
     topics_per_period_in_top_page: "عدد افضل الموضوعات التي تظهر عند الضغط علي زر \"المزيد من\" افضل الموضوعات."
     redirect_users_to_top_page: "إعادة توجيه تلقائيا للمستخدمين الجدد وغائبة لمدة طويلة إلى أعلى الصفحة."
     top_page_default_timeframe: "المدي الزمني الافتراضي لصفحة الموضوعات الاكثر مشاهدة."
-    show_email_on_profile: "أظهر بريد المستخدمين الإلكترونيّ في لاحاتهم (يكون معروضًا لهم وللطّاقم)"
     email_token_valid_hours: "أمارات نسيان كلمة السّرّ/تنشيط الحساب صالحة لمدّة (n) ساعة."
     enable_badges: "تفعيل نظام الأوسمة."
     enable_whispers: "السماح للطاقم بعمل نقاشات سرية داخل الموضوعات."
diff --git a/config/locales/server.bg.yml b/config/locales/server.bg.yml
index 729da17da1..9890bb34f7 100644
--- a/config/locales/server.bg.yml
+++ b/config/locales/server.bg.yml
@@ -610,7 +610,6 @@ bg:
     tl2_additional_likes_per_day_multiplier: "Увеличи лимита от харесвания на ден за tl2 (member)  до"
     tl3_additional_likes_per_day_multiplier: "Увеличи лимита от харесвания на ден за tl3 (regular) до"
     tl4_additional_likes_per_day_multiplier: "Увеличи лимита от харесвания на ден за tl4 (leader) до"
-    flag_sockpuppets: "Ако нов потребител отговори на тема от същия IP адрес като на новия потребител, който е започнал темата, маркирайте и двете публикации като потенциален спам."
     traditional_markdown_linebreaks: "Използвайте стандартния метод за пренасяне на нов ред в Markdown, който изисква два интервала за пренасянето на нов ред."
     post_undo_action_window_mins: "Брой минути, през които потребителите могат да отменят своите действия в публикацията ( харесване, сигнал, и т.н.) "
     must_approve_users: "Персоналът трябва да одобри всички нови потребителски акаунти, преди да им бъде разрешен достъп до сайта. ВНИМАНИЕ: Включвайки тази функция, достъпът до сайта ще бъде разрешен само за персонала на сайта!"
@@ -629,7 +628,6 @@ bg:
     topics_per_period_in_top_summary: "Брой на най-добрите теми, показвани по подразбиране в резюмето с най-добрите теми."
     topics_per_period_in_top_page: "Брой на най-добрите видими теми в показваните подробно \"Покажи повече\" топ теми."
     redirect_users_to_top_page: "Автоматично пренасочване на нови и дълго отсъстващи потребители към началната страница."
-    show_email_on_profile: "Покажи имейлите на потребителите на техните профили (видими само за тях и за персонала) "
     email_token_valid_hours: "Забравена парола / символите за активиране на акаунта са валидни (n) часа."
     enable_badges: "Активирай системата за значки"
     allow_index_in_robots_txt: "Посочете в robots.txt, че е позволено този сайт  да бъде индексиран от търсачките."
diff --git a/config/locales/server.bs_BA.yml b/config/locales/server.bs_BA.yml
index 4dcff631b4..4c59964a49 100644
--- a/config/locales/server.bs_BA.yml
+++ b/config/locales/server.bs_BA.yml
@@ -374,7 +374,6 @@ bs_BA:
     polling_interval: "How often should logged in user clients poll in milliseconds"
     anon_polling_interval: "How often should anonymous clients poll in milliseconds"
     cooldown_minutes_after_hiding_posts: "Number of minutes a user must wait before they can edit a post hidden via community flagging"
-    flag_sockpuppets: "If a new user replies to a topic from the same IP address as the new user who started the topic, flag both of their posts as potential spam."
     traditional_markdown_linebreaks: "Use traditional linebreaks in Markdown, which require two trailing spaces for a linebreak."
     post_undo_action_window_mins: "Number of minutes users are allowed to undo recent actions on a post (like, flag, etc)."
     must_approve_users: "Staff must approve all new user accounts before they are allowed to access the site."
@@ -392,7 +391,6 @@ bs_BA:
     topics_per_period_in_top_summary: "Number of top topics shown in the default top topics summary."
     topics_per_period_in_top_page: "Number of top topics shown on the expanded 'Show More' top topics."
     redirect_users_to_top_page: "Automatically redirect new and long absent users to the top page."
-    show_email_on_profile: "Show a user's email on their profile (only visible to themselves and staff)"
     email_token_valid_hours: "Forgot password / activate account tokens are valid for (n) hours."
     enable_badges: "Enable the badge system"
     allow_index_in_robots_txt: "Specify in robots.txt that this site is allowed to be indexed by web search engines."
diff --git a/config/locales/server.ca.yml b/config/locales/server.ca.yml
index 9ea6490138..b133962af9 100644
--- a/config/locales/server.ca.yml
+++ b/config/locales/server.ca.yml
@@ -771,7 +771,6 @@ ca:
     tl2_additional_likes_per_day_multiplier: "Augmenta el límit de m'agrades per dia per a nivell de confiança 2 (membre), en multiplicar per aquesta xifra"
     tl3_additional_likes_per_day_multiplier: "Augmenta la quantitat de M'agrada per dia per nivell de confiança 3 (ordinari), en multiplicar per aquesta xifra"
     tl4_additional_likes_per_day_multiplier: "Augmenta el límit de M'agrada per dia a nivell de confiança 4 (líder), en multiplicar per aquesta xifra"
-    flag_sockpuppets: "Si una nova persona usuària respon un tema des de la mateixa adreça IP que la persona creadora del tema, marca les seves publicacions com a brossa potencial."
     traditional_markdown_linebreaks: "Fes servir salts de línia tradicionals a Markdown, que necessita dos espais a la dreta per un salt de línia."
     post_undo_action_window_mins: "Quantitat de minuts durant els quals es permet a les persones usuàries desfer accions recents sobre una publicació (M'agrada, bandera, etcètera)."
     must_approve_users: "L'equip ha d'aprovar tots els nous comptes abans de permetre que accedeixin el lloc. ATENCIÓ: si actives això a un lloc en funcionament, es revocarà l'accés a les persones usuàries que no pertanyen a l'equip!"
@@ -795,7 +794,6 @@ ca:
     topics_per_period_in_top_page: "Quantitat de temes principals per desplegar a \"Mostra'n més\" de temes principals."
     redirect_users_to_top_page: "Redirecciona automàticament les persones noves i força absents a l'inici de la pàgina."
     top_page_default_timeframe: "Marc de temps per defecte per a la vista principal de pàgina."
-    show_email_on_profile: "Mostra el correu de la persona (només visibles per a la mateixa persona i l'equip)"
     prioritize_username_in_ux: "Mostra el nom de la persona primer a la pàgina personal, tarjeta personal i publicacions (si està desactivat, el nom es mostra primer)"
     email_token_valid_hours: "Els petits grups de dades de contrasenya oblidada / activa el compte són vàlids durant (n) hores."
     enable_badges: "Activa el sistema de distintius"
diff --git a/config/locales/server.cs.yml b/config/locales/server.cs.yml
index c3506ef299..5c049aefc5 100644
--- a/config/locales/server.cs.yml
+++ b/config/locales/server.cs.yml
@@ -884,6 +884,15 @@ cs:
       click_here: "klikněte zde"
       from: "%{site_name} - přehled"
       preheader: "Krátký souhrn od poslední návštěvy v %{last_seen_at}"
+    forgot_password:
+      subject_template: "[%{email_prefix}] Obnovení hesla"
+      text_body_template: |
+        Někdo zažádal o změna Tvého hesla na [%{site_name}](%{base_url}).
+
+        Pokud jsi to Ty nebyl, můžeš v klidu ignorovat tento email.
+
+        Pro změnu hesla klikni na tento odkaz:
+        %{base_url}/u/password-reset/%{email_token}
     account_created:
       title: "Účet vytvořen"
     signup_after_approval:
@@ -923,6 +932,8 @@ cs:
       name: Populární odkaz
     admired:
       name: Obdivovaný
+    first_emoji:
+      name: První smajlík
   admin_login:
     success: "E-mail odeslán"
     submit_button: "Odeslat e-mail"
diff --git a/config/locales/server.da.yml b/config/locales/server.da.yml
index 79a22b4879..81a8b89b94 100644
--- a/config/locales/server.da.yml
+++ b/config/locales/server.da.yml
@@ -789,7 +789,6 @@ da:
     tl2_additional_likes_per_day_multiplier: "Øg antallet af likes pr dag for tl2 (member) ved at gange med dette tal"
     tl3_additional_likes_per_day_multiplier: "Øg antallet af likes pr. dag for tl3 (regular) ved at gange med dette tal"
     tl4_additional_likes_per_day_multiplier: "Øg antallet af likes pr. dag for tl4 (leader) ved at gange med dette tal"
-    flag_sockpuppets: "Hvis en ny bruger svarer på et emne fra den samme IP adresse som den der startede emnet, så rapporter begge at deres indlæg potentielt er spam."
     traditional_markdown_linebreaks: "Brug traditionelle linjeskift i Markdown, som kræver 2 mellemrum i slutningen af sætningen."
     post_undo_action_window_mins: "Antal minutter som brugere er tilladt at fortryde handlinger på et indlæg (like, flag, etc)."
     must_approve_users: "Personale skal godkende alle nye bruger konti inden de kan tilgå sitet. ADVARSEL: aktivering af dette for et live site vil medføre en ophævning af adgang for eksisterende ikke-personale brugere."
@@ -805,7 +804,6 @@ da:
     send_welcome_message: "Send alle nye brugere en velkomstbesked, med en hurtig start guide."
     topics_per_period_in_top_summary: "Antallet af top emner der vises som standard i top emner"
     topics_per_period_in_top_page: "Antallet af top emner der vises når 'Vis Mere' er aktiveret."
-    show_email_on_profile: "Vis en brugers email på deres profil (kun synligt for brugerne selv - samt admin)"
     email_token_valid_hours: "Glemte password / konto aktiverings muligheder er gyldige i (n) timer."
     enable_badges: "Aktiver badge systemet"
     enable_whispers: "Tillad at hjælperteamet har private samtaler i emner."
@@ -1047,9 +1045,6 @@ da:
     disagreed: "Tak for din henvendelse. Vi kigger på det."
     deferred: "Tak for din henvendelse. Vi kigger på det."
     deferred_and_deleted: "Tak for din henvendelse. Vi har fjernet indlægget."
-  temporarily_closed_due_to_flags:
-    one: "Emnet er lukket i 1 time pga. et stort antal flagmarkeringer."
-    other: "Emnet er lukket i %{count} timer pga. et stort antal flagmarkeringer."
   system_messages:
     private_topic_title: "Emne #%{id}"
     contents_hidden: "Gå venligst til indlægget for at se indholdet."
diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml
index 2352196425..b548202d7f 100644
--- a/config/locales/server.de.yml
+++ b/config/locales/server.de.yml
@@ -1136,7 +1136,6 @@ de:
     num_tl3_flags_to_silence_new_user: "Wenn Beiträge eines neuen Benutzers von num_tl3_users_to_silence_new_user verschiedenen Benutzern mit Vertrauensstufe 3 gemeldet werden, verstecke alle Beiträge des Benutzers und erlaube keine weiteren Beiträge. Ein Wert von 0 deaktiviert diese Funktion."
     num_tl3_users_to_silence_new_user: "Wenn Beiträge eines neuen Benutzers von num_tl3_users_to_silence_new_user verschiedenen Benutzern mit Vertrauensstufe 3 gemeldet werden, verstecke alle Beiträge des Benutzers und erlaube keine weiteren Beiträge. Ein Wert von 0 deaktiviert diese Funktion."
     notify_mods_when_user_silenced: "Wenn ein Benutzer automatisch stummgeschaltet wird, sende eine Nachricht an alle Moderatoren."
-    flag_sockpuppets: "Wenn ein neuer Benutzer auf ein Thema antwortet, das von einem anderen neuen Benutzer aber mit der gleichen IP-Adresse begonnen wurde, markiere beide Beiträge als potenziellen Spam."
     traditional_markdown_linebreaks: "Traditionelle Zeilenumbrüche in Markdown, die zwei nachfolgende Leerzeichen für einen Zeilenumbruch benötigen."
     enable_markdown_typographer: "Verwende typographische Regeln, um die Lesbarkeit von Text zu erhöhen: ersetze einfache Anführungszeichen ' durch geneigte Anführungszeichen ’, (c) (tm) durch Symbole, -- durch Gedankenstriche –, usw."
     enable_markdown_linkify: "Text, der nach einem Link aussieht, automatisch als Link behandeln: www.example.com und https://example.com werden automatisch verlinkt"
@@ -1179,7 +1178,6 @@ de:
     topics_per_period_in_top_page: "Anzahl der Themen, die in der mit \"Mehr zeigen\" erweiterten Top-Themenübersicht angezeigt werden."
     redirect_users_to_top_page: "Verweise neue und länger abwesende Benutzer automatisch zur Angesagt-Seite"
     top_page_default_timeframe: "Standardzeitfenster für die oberste, angezeigte Seite."
-    show_email_on_profile: "Im Profil die E-Mail-Adresse des Benutzers anzeigen (ist nur für den Benutzer selbst und das Team sichtbar)."
     prioritize_username_in_ux: "Zeige den Benutzernamen auf der Benutzerseite, der Benutzerkarte und in Beiträgen an erster Stelle (wenn deaktiviert, wird der Name an erster Stelle angezeigt)"
     enable_rich_text_paste: "Aktiviere automatische Umwandlung von HTML in Markdown beim Einfügen von Text in den Editor. (Experimentell)"
     email_token_valid_hours: "Tokens zur Passwort-Wiederherstellung / Aktivierung eines Kontos sind für (n) Stunden gültig."
@@ -1994,9 +1992,6 @@ de:
     disagreed: "Danke für deine Meldung. Wir sehen uns das an."
     deferred: "Danke für deine Meldung. Wir sehen uns das an."
     deferred_and_deleted: "Danke für deine Meldung. Wir haben den Beitrag entfernt."
-  temporarily_closed_due_to_flags:
-    one: "Dieses Thema ist vorübergehend für 1 Stunde gesperrt aufgrund einer großen Anzahl an Community-Meldungen."
-    other: "Dieses Thema ist vorübergehend für %{count} Stunden gesperrt aufgrund einer großen Anzahl an Community-Meldungen."
   system_messages:
     private_topic_title: "Thema #%{id}"
     contents_hidden: "Bitte besuche den Beitrag, um die Inhalte zu sehen."
diff --git a/config/locales/server.el.yml b/config/locales/server.el.yml
index 00841cb341..a699ddeae8 100644
--- a/config/locales/server.el.yml
+++ b/config/locales/server.el.yml
@@ -914,7 +914,6 @@ el:
     num_tl3_flags_to_silence_new_user: "Αν η ανάρτηση ενός νέου χρήστη λάβει αυτόν τον αριθμό σημάνσεων από  num_tl3_users_to_silence_new_user διαφορετικούς χρήστες επιπέδου 3, κρύψε όλες τις υπάρχουσες αναρτησεις του χρήστη και απαγόρευσε κάθε μελλοντική ανάρτηση. 0 για ακύρωση."
     num_tl3_users_to_silence_new_user: "Αν η ανάρτηση ενός νέου χρήστη λάβει num_tl3_flags_to_silence_new_user flags από αυτόν τον αριθμό διαφορετικών χρηστών επιπέδου 3, κρύψε όλες τις υπάρχουσες αναρτησεις του χρήστη και απαγόρευσε κάθε μελλοντική ανάρτηση. 0 για ακύρωση."
     notify_mods_when_user_silenced: "Αν ένας χρήστης σιγηθεί αυτόματα, στείλε ένα μήνυμα σε όλους τους συντονιστές."
-    flag_sockpuppets: "Εάν ένας νέος χρήστης απαντήσει σε ένα νήμα από την ίδια διεύθυνση ΙP όπως ο νέος χρήστης, ο οποίος ξεκίνησε το νήμα, και οι δυο δημοσιεύσεις τους θα επισημανθούν ως δυνητικά ανεπιθύμητες."
     traditional_markdown_linebreaks: "Χρήση παραδοσιακών αλλαγών γραμμών στη Markdown, η οποία απαιτεί δύο κενά διαστήματα για μια αλλαγή γραμμής."
     post_undo_action_window_mins: "Αριθμός των λεπτών όπου οι χρήστες δικαιούνται να αναιρέσουν πρόσφατες ενέργειες πάνω σε ένα θέμα (μου αρέσει, επισήμανση, κτλ) "
     must_approve_users: "Το προσωπικό πρέπει να εγκρίνει όλους τους λογαριασμούς των νέων χρηστών προτού τους επιτραπεί να έχουν πρόσβαση στην ιστοσελίδα. Προειδοποίηση: ενεργοποιώντας το για μια ζωντανή ιστοσελίδα θα έχει ως αποτέλεσμα την ανάκληση για τους υπάρχοντες χρήστες που δεν ανήκουν στο προσωπικό!"
@@ -941,7 +940,6 @@ el:
     topics_per_period_in_top_page: "Αριθμός κορυφαίων νημάτων που θα εμφανίζονται στην επέκταση 'Δείξε Περισσότερα' κορυφαία νήματα."
     redirect_users_to_top_page: "Αυτόματα επαναπροσανατολίστε τους νέους και συχνούς απόντες χρήστες στη κορυφή της σελίδας."
     top_page_default_timeframe: "Προκαθορισμένο χρονικό περιθώριο για την προβολή κορυφαίων νημάτων."
-    show_email_on_profile: "Εμφάνιση email στο προφίλ του μέλους (ορατό μόνο σε αυτούς και το προσωπικό)"
     prioritize_username_in_ux: "Δίξε το όνομα χρήστη πρώτα στη σελίδα του χρήστη, την κάρτα χρήστη και στις δημοσιεύσεις (όταν είναι ανενεργό, φαίνεται πρώτα το όνομα)"
     email_token_valid_hours: "Τα tokens ανάκτησης κωδικού / ενεργοποίησης λογαριασμού παραμένουν έγκυρα για (ν) ώρες."
     enable_badges: "Ενεργοποίηση συστήματος παρασήμων"
@@ -1537,9 +1535,6 @@ el:
     disagreed: "Ευχαριστούμε που μας ειδοποιήσατε. Το εξετάζουμε."
     deferred: "Ευχαριστούμε που μας ειδοποιήσατε. Το εξετάζουμε."
     deferred_and_deleted: "Ευχαριστούμε που μας ειδοποιήσατε. Έχουμε αφαιρέσει τη δημοσίευση."
-  temporarily_closed_due_to_flags:
-    one: "Αυτό το νήμα έχει κλείσει προσωρινά για 1 ώρα λόγω μεγάλου αριθμού σημάνσεων από την κοινότητα."
-    other: "Αυτό το νήμα έχει κλείσει προσωρινά για %{count} ώρες λόγω μεγάλου αριθμού σημάνσεων από την κοινότητα."
   system_messages:
     private_topic_title: "Νήμα #%{id}"
     contents_hidden: "Παρακαλώ επισκεφθείτε αυτή την ανάρτηση για να δείτε τα περιεχόμενά της."
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index c8e16216a4..8b1742fb67 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -185,6 +185,7 @@ en:
 
       <p>Otherwise please <a href="%{base_url}/password-reset">Reset Password</a>.</p>
     user_exists: "There's no need to invite <b>%{email}</b>, they <a href='%{base_path}/u/%{username}/summary'>already have an account!</a>"
+    confirm_email: "<p>You’re almost done! We sent an activation mail to your email address. Please follow the instructions in the mail to activate your account.</p><p>If it doesn’t arrive, check your spam folder.</p>"
 
   bulk_invite:
     file_should_be_csv: "The uploaded file should be of csv format."
@@ -874,6 +875,7 @@ en:
     read: "read"
     read_write: "read/write"
     description: "\"%{application_name}\" is requesting the following access to your account:"
+    instructions: "We just generated a new user API key for you to use with \"%{application_name}\", please paste the following key into your application:"
     no_trust_level: "Sorry, you do not have the required trust level to access the user API"
     generic_error: "Sorry, we are unable to issue user API keys, this feature may be disabled by the site admin"
     scopes:
@@ -1191,6 +1193,8 @@ en:
     facebook_config_warning: 'The server is configured to allow signup and log in with Facebook (enable_facebook_logins), but the app id and app secret values are not set. Go to <a href="%{base_path}/admin/site_settings">the Site Settings</a> and update the settings. <a href="https://meta.discourse.org/t/configuring-facebook-login-for-discourse/13394" target="_blank">See this guide to learn more</a>.'
     twitter_config_warning: 'The server is configured to allow signup and log in with Twitter (enable_twitter_logins), but the key and secret values are not set. Go to <a href="%{base_path}/admin/site_settings">the Site Settings</a> and update the settings. <a href="https://meta.discourse.org/t/configuring-twitter-login-for-discourse/13395" target="_blank">See this guide to learn more</a>.'
     github_config_warning: 'The server is configured to allow signup and log in with GitHub (enable_github_logins), but the client id and secret values are not set. Go to <a href="%{base_path}/admin/site_settings">the Site Settings</a> and update the settings. <a href="https://meta.discourse.org/t/configuring-github-login-for-discourse/13745" target="_blank">See this guide to learn more</a>.'
+    pwa_config_icon_warning: 'The server is missing a proper large icon which allows users to add a homescreen shortcut to this site on Android devices. Go to <a href="%{base_path}/admin/site_settings/category/all_results?filter=large_icon">the Site Settings</a> and upload an icon of the recommended size.'
+    pwa_config_title_warning: 'The server is missing a short title which allows users to add a homescreen shortcut to this site on Android devices. Go to <a href="%{base_path}/admin/site_settings/category/all_results?filter=short_title">the Site Settings</a> and configure a title of the recommended length.'
     s3_config_warning: 'The server is configured to upload files to S3, but at least one the following setting is not set: s3_access_key_id, s3_secret_access_key, s3_use_iam_profile, or s3_upload_bucket. Go to <a href="%{base_path}/admin/site_settings">the Site Settings</a> and update the settings. <a href="https://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">See "How to set up image uploads to S3?" to learn more</a>.'
     s3_backup_config_warning: 'The server is configured to upload backups to S3, but at least one the following setting is not set: s3_access_key_id, s3_secret_access_key, s3_use_iam_profile, or s3_backup_bucket. Go to <a href="%{base_path}/admin/site_settings">the Site Settings</a> and update the settings. <a href="https://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">See "How to set up image uploads to S3?" to learn more</a>.'
     image_magick_warning: 'The server is configured to create thumbnails of large images, but ImageMagick is not installed. Install ImageMagick using your favorite package manager or <a href="https://www.imagemagick.org/script/download.php" target="_blank">download the latest release</a>.'
@@ -1315,7 +1319,7 @@ en:
     num_tl3_flags_to_silence_new_user: "If a new user's posts get this many flags from num_tl3_users_to_silence_new_user different trust level 3 users, hide all their posts and prevent future posting. 0 to disable."
     num_tl3_users_to_silence_new_user: "If a new user's posts get num_tl3_flags_to_silence_new_user flags from this many different trust level 3 users, hide all their posts and prevent future posting. 0 to disable."
     notify_mods_when_user_silenced: "If a user is automatically silenced, send a message to all moderators."
-    flag_sockpuppets: "If a new user replies to a topic from the same IP address as the new user who started the topic, flag both of their posts as potential spam."
+    flag_sockpuppets: "If a new user replies to a topic from the same IP address as the user who started the topic, flag both of their posts as potential spam."
 
     traditional_markdown_linebreaks: "Use traditional linebreaks in Markdown, which require two trailing spaces for a linebreak."
     enable_markdown_typographer: "Use typography rules to improve readability of text: replace straight quotes ' with curly quotes ’, (c) (tm) with symbols, -- with emdash –, etc"
@@ -1361,7 +1365,7 @@ en:
     topics_per_period_in_top_page: "Number of top topics shown on the expanded 'Show More' top topics."
     redirect_users_to_top_page: "Automatically redirect new and long absent users to the top page."
     top_page_default_timeframe: "Default timeframe for the top view page."
-    show_email_on_profile: "Show a user's email on their profile (only visible to themselves and staff)"
+    show_email_on_profile: "Allow moderators to view user emails"
     prioritize_username_in_ux: "Show username first on user page, user card and posts (when disabled name is shown first)"
     enable_rich_text_paste: "Enable automatic HTML to Markdown conversion when pasting text into the composer. (Experimental)"
 
@@ -1873,6 +1877,8 @@ en:
     default_categories_muted: "List of categories that are muted by default."
     default_categories_watching_first_post: "List of categories in which first post in each new topic will be watched by default."
 
+    default_text_size: "Text size which is selected by default"
+
     retain_web_hook_events_period_days: "Number of days to retain web hook event records."
     retry_web_hook_events: "Automatically retry failed web hook events for 4 times. Time gaps between the retries are 1, 5, 25 and 125 minutes."
 
@@ -2343,8 +2349,8 @@ en:
     deferred_and_deleted: "Thanks for letting us know. We've removed the post."
 
   temporarily_closed_due_to_flags:
-    one: "This topic is temporarily closed for 1 hour due to a large number of community flags."
-    other: "This topic is temporarily closed for %{count} hours due to a large number of community flags."
+    one: "This topic is temporarily closed for at least 1 hour due to a large number of community flags."
+    other: "This topic is temporarily closed for at least %{count} hours due to a large number of community flags."
 
   system_messages:
     private_topic_title: "Topic #%{id}"
@@ -2883,6 +2889,7 @@ en:
 
   subject_re: "Re: "
   subject_pm: "[PM] "
+  email_from: "%{user_name} via %{site_name}"
 
   user_notifications:
     previous_discussion: "Previous Replies"
@@ -3342,6 +3349,9 @@ en:
     welcome_message: |
       ## [Welcome to %{title}](#welcome)
       An account is required. Please create an account or log in to continue.
+    welcome_message_invite_only: |
+      ## [Welcome to %{title}](#welcome)
+      An account is required. Please ask an existing member for an invite or log in to continue.
 
   terms_of_service:
     title: "Terms of Service"
@@ -4052,6 +4062,11 @@ en:
     staff_tag_remove_disallowed: "The tag \"%{tag}\" may only be removed by staff."
     minimum_required_tags: "You must select at least %{count} tags."
     upload_row_too_long: "The CSV file should have one tag per line. Optionally the tag can be followed by a comma, then the tag group name."
+    forbidden:
+      in_this_category: "\"%{tag_name}\" cannot be used in this category"
+      restricted_to:
+        one: "\"%{tag_name}\" is restricted to the \"%{category_names}\" category"
+        other: "\"%{tag_name}\" is restricted to the following categories: %{category_names}"
   rss_by_tag: "Topics tagged %{tag}"
 
   finish_installation:
diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml
index b8ed4c98a5..ac7d090d57 100644
--- a/config/locales/server.es.yml
+++ b/config/locales/server.es.yml
@@ -147,6 +147,7 @@ es:
       default_categories_already_selected: "No se puede seleccionar una categoría ya utilizada en otra lista."
       s3_upload_bucket_is_required: "No se pueden activar las subidas a S3 a menos que se haya proporcionado un valor a 's3_upload_bucket'."
       s3_backup_requires_s3_settings: "No puedes usar S3 como método de copia de seguridad salvo que hayas rellenado '%{setting_name}'."
+      s3_bucket_reused: "No puedes usar el mismo bucket para 's3_upload_bucket' y 's3_backup_bucket'. Por favor, selecciona otro bucket o usa una ruta diferente para cada bucket."
     conflicting_google_user_id: 'El ID de la cuenta Google para esta cuenta ha cambiado; el staff debe intervenir por razones de seguridad. Por favor, póngase en contacto con miembros del staff y envíe esta referencia <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
   activemodel:
     errors:
@@ -160,6 +161,7 @@ es:
 
       <p>O bien, por favor <a href="%{base_url}/password-reset">Resetear Contraseña</a>.</p>
     user_exists: "No hay necesidad de invitar a <b>%{email}</b>, ¡ya <a href='%{base_path}/u/%{username}/summary'>tiene una cuenta!</a>"
+    confirm_email: "<p>¡Ya casi has terminado! Te enviamos un correo de activación a tu dirección de correo. Por favor sigue las instrucciones de ese correo para activar tu cuenta.</p><p>Si no llega, mira en la carpeta de spam.</p>"
   bulk_invite:
     file_should_be_csv: "El archivo subido debería ser de formato csv."
     error: "Ha ocurrido un error al subir ese archivo. Por favor, inténtalo más tarde de nuevo."
@@ -198,6 +200,7 @@ es:
     continue: "Continuar discusión"
     error: "Error al insertar"
     referer: "Referente:"
+    mismatch: "El remitente no se envió o no coincide con ninguno de los siguientes hosts:"
     no_hosts: "No se han definido hosts para el insertado"
     configure: "Configurar insertado"
     more_replies:
@@ -793,6 +796,7 @@ es:
     read: "lectura"
     read_write: "lectura/escritura"
     description: "\"%{application_name}\" está solicitando el siguiente acceso a tu cuenta:"
+    instructions: "Acabamos de generar una nueva llave API de usuario para que uses con \"%{application_name}\", por favor pega la siguiente llave en tu aplicación: "
     no_trust_level: "Lo sentimos, no tienes el nivel de confianza requerido para acceder a la API de usuario"
     generic_error: "Lo sentimos, no pudimos emitir claves API de usuario, esta funcionalidad puede estar desactivada por el administrador del sitio"
     scopes:
@@ -812,7 +816,7 @@ es:
         percent: Porcentaje
         day: Día
     post_edits:
-      title: "Ediciones del mensaje"
+      title: "Ediciones de mensaje"
       labels:
         post: Post
         editor: Editor
@@ -827,6 +831,7 @@ es:
         disagreed_flags: Reportes en desacuerdo
         ignored_flags: Reportes ignorados
         score: Puntuación
+      description: "Lista de usuarios ordenada por la proporción de respuesta de staff a sus reportes (de acuerdo a en desacuerdo)."
     moderators_activity:
       title: "Actividad de moderación"
       labels:
@@ -837,6 +842,7 @@ es:
         post_count: Mensajes creados
         pm_count: Mensajes privados creados
         revision_count: Ediciones
+      description: "Lista de actividad de moderación incluyendo reportes revisados, tiempos de lectura, temas creados, mensajes privados iniciados y ediciones."
     flags_status:
       title: "Estado de reportes"
       values:
@@ -850,34 +856,42 @@ es:
         poster: Autor
         flagger: Reportado por
         time_to_resolution: Tiempo de resolución
+      description: "Lista de estados de reporte incluyendo el tipo de reporte, usuario que lo publica, usuario que reporta y el tiempo hasta ser resuelto."
     visits:
       title: "Visitas de usuario"
       xaxis: "Día"
       yaxis: "Número de visitas"
+      description: "Número de visitantes únicos."
     signups:
       title: "Registros"
       xaxis: "Día"
       yaxis: "Número de Registros"
+      description: "Nuevos registros de cuenta para este periodo"
     new_contributors:
       title: "Nuevos Colaboradores"
       xaxis: "Día"
       yaxis: "Número de nuevos colaboradores"
+      description: "Número de usuarios que han publicado su primer mensaje durante este periodo."
     dau_by_mau:
       title: "UAD/UAM"
       xaxis: "Día"
       yaxis: "UAD/UAM"
+      description: "Número de miembros que han iniciado sesión dividido entre el número de miembros que han iniciado sesión durante el último mes – devuelve un % que indica el grado de \"permanencia\". Intentar mantener por encima de 30%."
     daily_engaged_users:
       title: "Usuarios comprometidos a diario"
       xaxis: "Día"
       yaxis: "Usuarios Comprometidos"
+      description: "Número de usuarios que han dado me gusta o han publicado en el último día."
     profile_views:
       title: "Visitas a perfil de usuario"
       xaxis: "Día"
       yaxis: "Número de perfiles de usuario vistos"
+      description: "Número total de visitas a perfiles de usuario."
     topics:
       title: "Temas nuevos"
       xaxis: "Día"
       yaxis: "Número de topics nuevos"
+      description: "Nuevos temas creados durante este periodo."
     posts:
       title: "Nuevos posts"
       xaxis: "día"
@@ -887,20 +901,24 @@ es:
       title: "Me gusta"
       xaxis: "Día"
       yaxis: "Número de 'me gusta' nuevos"
+      description: "Número de nuevos me gusta."
     flags:
       title: "Reportes"
       xaxis: "Día"
       yaxis: "Número de reportes"
+      description: "Número de nuevos reportes."
     bookmarks:
       title: "Marcadores"
       xaxis: "Día"
       yaxis: "Número de nuevos marcadores"
+      description: "Número de nuevos temas y mensajes añadidos a marcadores."
     users_by_trust_level:
       title: "Usuarios por nivel de confianza"
       xaxis: "Día"
       yaxis: "Número de usuarios"
       labels:
         level: Nivel
+      description: "Número de usuarios agrupados por nivel de confianza."
     users_by_type:
       title: "Usuarios por Tipos"
       xaxis: "Tipo"
@@ -912,40 +930,49 @@ es:
         moderator: Moderador
         suspended: Suspendidos
         silenced: Silenciados
+      description: "Número de usuarios agrupados por administradores, moderadores, suspendidos y silenciados."
     trending_search:
       title: Tendencias de búsqueda
       labels:
         term: Término
         searches: Búsquedas
         click_through: CTR
+      description: "Términos de búsqueda más populares con sus porcentajes de clic"
     emails:
       title: "Correos enviados"
       xaxis: "Día"
       yaxis: "Número de correos"
+      description: "Número de nuevos emails enviados."
     user_to_user_private_messages:
       title: "Usuario a usuario (respuestas excluidas)"
       xaxis: "Día"
       yaxis: "Número de mensajes"
+      description: "Número de nuevos mensajes privados."
     user_to_user_private_messages_with_replies:
       title: "Usuario a usuario (con respuestas)"
       xaxis: "Día"
       yaxis: "Número de mensajes"
+      description: "Número de nuevos mensajes privados y sus respuestas."
     system_private_messages:
       title: "Sistema"
       xaxis: "Día"
       yaxis: "Número de mensajes"
+      description: "Número de mensajes privados enviados automáticamente por el sistema."
     moderator_warning_private_messages:
       title: "Advertencias al moderador"
       xaxis: "Día"
       yaxis: "Número de mensajes"
+      description: "Número de avisos enviados por mensaje privado por moderadores."
     notify_moderators_private_messages:
       title: "Notificaciones a moderadores"
       xaxis: "Día"
       yaxis: "Número de mensajes"
+      description: "Número de veces que los moderadores han sido notificados de forma privada por un reporte."
     notify_user_private_messages:
       title: "Notificaciones a usuarios"
       xaxis: "Día"
       yaxis: "Número de mensajes"
+      description: "Número de veces que los usuarios han sido notificados de forma privada por un reporte."
     top_referrers:
       title: "Los que más recomiendan"
       xaxis: "Usuario"
@@ -955,6 +982,7 @@ es:
         user: "Usuario"
         num_clicks: "Clics"
         num_topics: "Temas"
+      description: "Usuarios listados por número de clics en enlaces que han compartido"
     top_traffic_sources:
       title: "Las mayores fuentes de tráfico"
       xaxis: "Dominio"
@@ -965,35 +993,43 @@ es:
         domain: Dominio
         num_clicks: Clics
         num_topics: Temas
+      description: "Las fuentes externas que más han enlazado a este sitio."
     top_referred_topics:
       title: "Los temas más referidos"
       labels:
         num_clicks: "Clics"
         topic: "Tema"
+      description: "Los temas que más clics de fuentes externas han recibido."
     page_view_anon_reqs:
       title: "Anónimas"
       xaxis: "Día"
       yaxis: "Páginas vistas anónimas"
+      description: "Número de nuevas impresiones de páginas de visitantes sin una sesión iniciada."
     page_view_logged_in_reqs:
       title: "Registrados"
       xaxis: "Día"
       yaxis: "Páginas vistas de usuarios logueados"
+      description: "Número de impresiones de página de usuarios con sesión iniciada."
     page_view_crawler_reqs:
       title: "Rastreadores web"
       xaxis: "Día"
       yaxis: "Páginas vistas de rastreadores web"
+      description: "Lista de webcrawlers por número de nuevas impresiones de páginas generadas."
     page_view_total_reqs:
       title: "Páginas vistas"
       xaxis: "Día"
       yaxis: "Total páginas vistas"
+      description: "Número de nuevas impresiones de páginas de todos los visitantes."
     page_view_logged_in_mobile_reqs:
       title: "Páginas vistas de usuarios logueados"
       xaxis: "Día"
       yaxis: "Páginas vistas de usuarios logueados a través de móvil"
+      description: "Número de impresiones de página de usuarios en dispositivos móviles y con sesión iniciada."
     page_view_anon_mobile_reqs:
       title: "Páginas vistas anónimas"
       xaxis: "Día"
       yaxis: "Páginas vistas anónimas desde móvil"
+      description: "Número de impresiones de página de visitantes desde dispositivos móviles que no tenían sesión iniciada."
     http_background_reqs:
       title: "Background"
       xaxis: "Día"
@@ -1022,19 +1058,23 @@ es:
       title: "Tiempo transcurrido hasta la primera respuesta"
       xaxis: "Día"
       yaxis: "Tiempo medio (horas)"
+      description: "Tiempo medio (en horas) de la primera respuesta a nuevos temas."
     topics_with_no_response:
       title: "Temas sin respuesta"
       xaxis: "Día"
       yaxis: "Total"
+      description: "Número de nuevos temas creados que no han recibido respuestas."
     mobile_visits:
       title: "Visitas de usuarios (móvil)"
       xaxis: "Día"
       yaxis: "Número de visita"
+      description: "Número de usuarios únicos que han visitado desde dispositivos móviles."
     web_crawlers:
       title: "Solicitudes de Rastreadores Web"
       labels:
         user_agent: "Agente de usuario"
         page_views: "Páginas vistas"
+      description: "Número de impresiones de página generada por webcrawlers."
     suspicious_logins:
       title: "Inicios de sesión sospechosos"
       labels:
@@ -1045,12 +1085,22 @@ es:
         device: Dispositivo
         os: Sistema operativo
         login_time: Fecha y hora de inicio de sesión
+      description: "Detalles de nuevos inicios de sesión marcados como sospechosos."
     staff_logins:
       title: "Inicios de sesión del staff"
       labels:
         user: Usuario
         location: Ubicación
         login_at: Inicio de sesión el
+      description: "Lista de inicios de sesión de administradores y moderadores con fecha y lugar."
+    top_uploads:
+      title: "Top archivos subido"
+      labels:
+        filename: Nombre del archivo
+        extension: Extensión
+        author: Autor
+        filesize: Tamaño del archivo
+      description: "Lista de archivos subidos por extensión, tamaño y autor."
   dashboard:
     rails_env_warning: "Tu servidor está funcionando en modo de %{env}."
     host_names_warning: "Tu archivo 'config/database.yml' está utilizando un hostname predeterminado de 'localhost'. Actualízalo para usar el hostname de tu sitio."
@@ -1173,7 +1223,6 @@ es:
     num_tl3_flags_to_silence_new_user: "Si los posts de un nuevo usuario obtienen este número de reportes de num_tl3_users_to_silence_new_user diferentes usuarios con nivel de confianza 3, se ocultarán todos sus posts y no podrá publicar más en un futuro. 0 para deshabilitar."
     num_tl3_users_to_silence_new_user: "Si los posts de un nuevo usuario reciben num_tl3_flags_to_silence_new_user reportes de este número de usuarios de nivel 3 de confianza, ocultar todos sus posts y prevenir futuras publicaciones. 0 para desactivar esta opción."
     notify_mods_when_user_silenced: "Si un usuario es silenciado automáticamente, enviar un mensaje a todos los moderadores."
-    flag_sockpuppets: "Si un nuevo usuario responde a un tema desde la misma dirección de IP que el nuevo usuario que inició el tema, reportar los posts de los dos como spam en potencia."
     traditional_markdown_linebreaks: "Utiliza saltos de línea tradicionales en Markdown, que requieren dos espacios al final para un salto de línea."
     enable_markdown_typographer: "Utilice reglas de tipografía para mejorar la legibilidad de texto: remplace citas rectas 'con comillas', (c) (tm) con símbolos, - con emdash -, etc."
     enable_markdown_linkify: "Trate automáticamente el texto que se ve como un enlace como un enlace: www.ejemplo.com y https://ejemplo.com se vincularán automáticamente"
@@ -1218,7 +1267,7 @@ es:
     topics_per_period_in_top_page: "Número de mejores temas mostrados en la vista expandida al clicar en 'ver más'."
     redirect_users_to_top_page: "Redirigir automáticamente a los nuevos usuarios y a los ausentes de larga duración a la página de mejores temas."
     top_page_default_timeframe: "Período de tiempo por defecto para la página de temas top"
-    show_email_on_profile: "Mostrar el e-mail los usuarios en su perfil (solamente visibles para ellos mismos y el staff)"
+    show_email_on_profile: "Permitir a los moderadores visualizar los emails de usuarios"
     prioritize_username_in_ux: "Mostrar username primero en la página de usuario, tarjeta de usuario y mensajes (cuando el nombre ha sido desactivado se muestra primero)"
     enable_rich_text_paste: "Habilitar conversión automática de HTML a Markdown cuando pegues texto en el compositor. (Experimental)"
     email_token_valid_hours: "Los tokens para restablecer contraseña olvidada / activar cuenta son válidos durante (n) horas."
@@ -1331,6 +1380,7 @@ es:
     allow_staff_to_upload_any_file_in_pm: "Permitir a los miembros del staff subir cualquier archivo en MP."
     strip_image_metadata: "Eliminar metadatos de imágenes."
     min_ratio_to_crop: "Ratio utilizado para recortar imágenes altas. Ingrese el resultado de ancho / alto."
+    simultaneous_uploads: "Número máximo de archivos que se pueden arrastrar y soltar en el editor"
     enable_flash_video_onebox: "Habilitar el embebido de enlaces swf y flv (Adobe Flash) en formato Onebox. AVISO: podría introducir riesgos de seguridad."
     default_invitee_trust_level: "Nivel de confianza por defecto (0-4) para usuarios invitados."
     default_trust_level: "Nivel de confianza por defecto (0-4) para los nuevos usuarios. ¡AVISO! Cambiar esto puede resultar en riesgo por spam."
@@ -1559,6 +1609,7 @@ es:
     enable_emoji_shortcuts: "Texto común de emoticones como :) :p :( serán convertidos a emojis"
     emoji_set: "¿De qué tipo os gustan los emoji?"
     emoji_autocomplete_min_chars: "Número mínimo de caracteres necesarios para que aparezca el diálogo de selección de emoji"
+    enable_inline_emoji_translation: "Habilita la traducción de emojis en línea (sin ningún espacio ni puntuación antes)"
     approve_post_count: "La cantidad de posts que deben ser aprobados de usuarios nuevos o de nivel básico"
     approve_unless_trust_level: "Los posts de usuarios con un nivel de confianza inferior a este deberán ser aprobados"
     approve_new_topics_unless_trust_level: "Los nuevos temas de usuarios por debajo de este nivel de confianza deben ser aprobados"
@@ -1599,6 +1650,7 @@ es:
     min_trust_level_for_user_api_key: "Nivel de confianza necesario para generar claves de API de usuario"
     allowed_user_api_auth_redirects: "URL permitida para autentificar redirección para claves API de usuario"
     allowed_user_api_push_urls: "URL permitida para el 'server push' en claves API de usuario"
+    expire_user_api_keys_days: "Número de días antes de que la clave de la API de usuario caduque automáticamente (0 para nunca)"
     tagging_enabled: "¿Activar etiquetas para los temas?"
     min_trust_to_create_tag: "El mínimo nivel de confianza requerido para crear una etiqueta."
     max_tags_per_topic: "El máximo número de etiquetas que se pueden añadir a un tema."
@@ -1618,6 +1670,7 @@ es:
     governing_law: "Ley que rige"
     city_for_disputes: "Ciudad de Disputas"
     push_notifications_prompt: "Mostrar aviso del consentimiento del usuario."
+    dashboard_general_tab_activity_metrics: "Selecciona qué reportes se mostrarán como medidas de actividad en la pestaña general."
     errors:
       invalid_email: "Dirección de correo electrónico inválida. "
       invalid_username: "No existe ningún usuario con ese nombre de usuario. "
@@ -1647,6 +1700,8 @@ es:
       reply_by_email_disabled: "Primero debes habilitar 'reply by email' antes de habilitar esta configuración."
       sso_url_is_empty: "Debe establecer una 'sso url' antes de habilitar esta configuración."
       enable_local_logins_disabled: "Primero debes habilitar 'enable local logins'  antes de habilitar esta configuración."
+      min_username_length_range: "No puedes establecer el mínimo por encima del máximo."
+      max_username_length_range: "No puedes establecer el máximo por debajo del mínimo."
     placeholder:
       sso_provider_secrets:
         key: "www.ejemplo.com"
@@ -1680,6 +1735,13 @@ es:
     errors:
       different_topics: "Mensajes que pertenecen a temas diferentes no pueden ser juntados."
       different_users: "Mensajes que pertenecen a diferentes usuarios no pueden ser juntados."
+  move_posts:
+    new_topic_moderator_post:
+      one: "Un mensaje ha sido separado a un nuevo %{entity}: %{topic_link}"
+      other: "%{count} mensajes han sido separados a un nuevo %{entity}: %{topic_link}"
+    existing_topic_moderator_post:
+      one: "Un mensaje ha sido unido a un %{entity} existente: %{topic_link}"
+      other: "%{count} mensajes han sido unidos a un %{entity} existente: %{topic_link}"
   change_owner:
     post_revision_text: "Se ha transferido la propiedad"
   topic_statuses:
@@ -1941,8 +2003,8 @@ es:
     deferred: "Gracias por hacérnoslo saber. Estamos revisándolo."
     deferred_and_deleted: "Gracias por hacérnoslo saber. Hemos eliminado el post."
   temporarily_closed_due_to_flags:
-    one: "Este tema está temporalmente cerrado por 1 hora debido a un gran número de reportes de la comunidad."
-    other: "Este tema está temporalmente cerrado por %{count} horas debido a un gran número de reportes de la comunidad."
+    one: "Este tema está cerrado temporalmente durante al menos 1 hora debido a un número elevado de reportes de la comunidad."
+    other: "Este tema está cerrado temporalmente durante al menos %{count} horas debido a un número elevado de reportes de la comunidad."
   system_messages:
     private_topic_title: "Tema #%{id}"
     contents_hidden: "Por favor, visita el post para ver su contenido."
@@ -2508,6 +2570,7 @@ es:
     Para cancelar estos emails, [clic aquí](%{unsubscribe_url}).
   subject_re: "Re:"
   subject_pm: "[MP]"
+  email_from: "%{user_name} via %{site_name}"
   user_notifications:
     previous_discussion: "Respuestas anteriores"
     reached_limit:
@@ -3538,39 +3601,60 @@ es:
     member:
       name: Miembro
       description: "<a href=\"https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/\">Disponen</a> de invitaciones, mensaje a grupos y más \"me gusta\""
+      long_description: |
+        Esta medalla se concede al llegar a nivel de confianza 2. Gracias por participar durante estas semanas y unirte de verdad a nuestra comunidad. Ahora puedes enviar invitaciones desde tu página de usuario o desde los temas, crear mensajes personales grupales y dar más me gusta por día.
     regular:
       name: Habitual
       description: "<a href=\"https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/\">Disponen</a> del poder recategorizar, renombrar, publicar enlacer sin el tag no-follow y más me gusta"
+      long_description: |
+        Esta medalla se concede al llegar a nivel de confianza 3. Gracias por ser una parte constante de nuestra comunidad durante estos meses. Ahora eres uno de nuestros lectores más activos, y una fuente de confianza que hace nuestra comunidad mejor. Ahora puedes recategorizar y renombrar temas, tus reportes tienen más peso y tienes acceso a una categoría especial privada, además de poder dar muchos más me gusta al día.
     leader:
       name: Líder
       description: "<a href=\"https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/\">Dispone</a> de poder editar, destacar, cerrar, archivar, dividir y combinar temas globalmente"
     welcome:
       name: ¡Bienvenido/a!
       description: Recibió un "me gusta"
+      long_description: |
+        Esta medalla se concede al recibir tu primer me gusta en una publicación. ¡Enhorabuena, has publicado algo útil que los demás miembros de la comunidad han considerado útil, interesante o chulo!
     autobiographer:
       name: Autobiógrafo
       description: "Detalló información en su <a href=\"%{base_uri}/my/preferences/profile\">perfil</a> de usuario"
+      long_description: |
+        Esta medalla se concede por rellenar <a href="%{base_uri}/my/preferences/profile">tu perfil de usuario</a> y seleccionar una foto de perfil. Al contar más sobre ti y lo que te interesa, la comunidad es más cercana y está más conectada. ¡Anímate!
     anniversary:
       name: Aniversario
       description: Miembro activo desde hace un año y que ha publicado al menos una vez
+      long_description: |
+        Esta medalla se concede cuando has sido miembro durante un año y has publicado al menos una vez durante este tiempo. Gracias por seguir con nosotros y contribuir durante todos este tiempo. ¡No sería lo mismo sin ti!
     nice_post:
       name: Buena respuesta
       description: Recibió 10 "me gusta" en una respuesta
+      long_description: "Esta medalla se concede cuando una de tus respuestas consigue 10 me gusta. ¡Tu respuesta ha gustado a la comunidad y ha ayudado a mantener viva la conversación! \n"
     good_post:
       name: Gran respuesta
       description: Recibió 25 "me gusta" en una respuesta
+      long_description: |
+        Esta medalla se concede cuando una de tus respuestas consigue 25 me gusta. Tu respuesta ha sido excepcional y ha conseguido hacer la conversación mucho más interesante.
     great_post:
       name: Excelente respuesta
       description: Recibió 50 "me gusta" en una respuesta
+      long_description: |
+        Esta medalla se concede cuando una de tus respuestas consigue 50 me gusta. ¡Increíble! ¡Tu respuesta ha sido fascinante, buenísima o inspiradora y le ha encantado a la comunidad!
     nice_topic:
       name: Buen tema
       description: Recibió 10 "me gusta" en un tema
+      long_description: |
+        Esta medalla se concede cuando un tema tuyo recibe 10 me gusta. Has empezado una conversación interesante que le ha gustado a la comunidad.
     good_topic:
       name: Gran tema
       description: Recibió 25 "me gusta" en un tema
+      long_description: |
+        Esta medalla se concede cuando un tema tuyo consigue 25 me gusta. Has iniciado una conversación que la comunidad ha disfrutado mucho.
     great_topic:
       name: Excelente tema
       description: Recibió 50 "me gusta" en un tema
+      long_description: |
+        Esta medalla se concede cuando un tema tuyo consigue 50 me gusta. Has comenzado un tema que a la comunidad le ha encantado y que ha resultado en una interesante conversación.
     nice_share:
       name: Buena contribución
       description: Compartió un post con 25 visitantes únicos
@@ -3580,9 +3664,13 @@ es:
     good_share:
       name: Gran contribución
       description: Compartió un post con 300 visitantes únicos
+      long_description: |
+        Esta medalla se concede cuando compartes un enlace y 300 visitantes externos hacen clic. ¡Buen trabajo! Has enseñado una gran conversación a unas cuantas personas y has ayudado a crecer la comunidad.
     great_share:
       name: Excelente contribución
       description: Compartió un post con 1000 visitantes únicos
+      long_description: |
+        Esta medalla se concede cuando compartes un enlace y 1000 visitantes externos hacen clic en él. ¡Increíble! Has promocionado una conversación muy interesante a una gran audiencia, y has ayudado a crecer la comunidad.
     first_like:
       name: Primer "me gusta"
       description: Le dio a "me gusta" a un post
@@ -3592,6 +3680,8 @@ es:
     first_flag:
       name: Primer reporte
       description: Reportó un post
+      long_description: |
+        Esta medalla se concede la primera vez que reportas algo. Reportar es la manera en la que mantenemos el foro en buen estado. Si ves algo que necesite ser revisado por un moderador por cualquier motivo, no dudes en reportar. Si ves im problema... ¡:flag_black: repórtalo!
     promoter:
       name: Promotor
       description: Invitó a un usuario
@@ -3619,9 +3709,13 @@ es:
     first_quote:
       name: Primera Cita
       description: Citó un post
+      long_description: |
+        Esta medalla se concede la primera vez que citas algo en una respuesta. Citar las partes relevantes de mensajes anteriores ayuda a mantener la conversación conectada y no desvariar. La manera más fácil de citar es seleccionando una parte de un mensaje y luego pulsar el botón de responder. ¡Cita a discreción!
     read_guidelines:
       name: Directrices leídas
       description: "Leyó las <a href=\"%{base_uri}/guidelines\">directrices de la comunidad</a>"
+      long_description: |
+        Esta medalla se concede por <a href="%{base_uri}/guidelines">leer las directrices de la comunidad</a>. Con seguir y compartir estas simples pautas, nos ayudarás a construir un foro más seguro, divertido y sostenible. Acuérdate de que detrás de cada usuario hay un ser humano, muy parecido a ti. ¡Pórtate bien!
     reader:
       name: Lector
       description: Leyó todas las respuestas en un tema con más de 100 respuestas
@@ -3679,6 +3773,8 @@ es:
     crazy_in_love:
       name: Generoso
       description: Utilizó 50 "me gusta" 20 veces
+      long_description: |
+        Esta medalla se concede cuando usas todos los 50 me gusta durante 20 días. ¡Genial! Eres un modelo a seguir por animar a los demás miembros de la comunidad.
     thank_you:
       name: Agradecido/a
       description: "Ha recibido me gusta en 20 posts y dado a 10 "
@@ -3694,6 +3790,8 @@ es:
     empathetic:
       name: Empático
       description: Ha recibido me gusta en 500 posts y dado a 1000
+      long_description: |
+        Esta medalla se concede cuando tienes 500 me gusta y le has dado 1000 me gusta a otros mensajes. Eres un modelo de generosidad y apreciación mutua :two_hearts:.
     first_emoji:
       name: Primer emoji
       description: Utilizó un emoji en un post
@@ -3703,9 +3801,13 @@ es:
     first_mention:
       name: Primera mención
       description: Mencionó a un usuario en un post
+      long_description: |
+        Esta medalla se concede la primera vez que mencionas el @nombre de usuario de alguien en una publicación. Las menciones generan notificaciones a la persona mencionada, para que sepan que les estás mencionando. Simplemente empieza escribiendo @ (arroba) para mencionar a cualquiera, o, si está permitido, a un grupo – es una forma conveniente de captar la atención de alguien.
     first_onebox:
       name: Primer Onebox
       description: Publicó un enlace expandido vía Onebox
+      long_description: |
+        Esta medalla se concede la primera vez que publicas un enlace solo en una línea, que se expande automáticamente en un onebox con un resumen, título y (cuando esté disponible) foto.
     first_reply_by_email:
       name: Primera respuesta por email
       description: Respondió a un post vía email
@@ -3721,12 +3823,18 @@ es:
     enthusiast:
       name: Entusiasta
       description: 10 días de visitas
+      long_description: |
+        Esta medalla se concede por visitarnos durante 10 días consecutivos. ¡Gracias por quedarte con nosotros más de una semana!
     aficionado:
       name: Aficionado
       description: 100 días de visitas
+      long_description: |
+        Esta medalla se concede por visitarnos durante 100 días consecutivos. ¡Eso es más de tres meses!
     devotee:
       name: Devoto
       description: 365 días de visitas
+      long_description: |
+        Esta medalla se concede por visitarnos durante 365 días consecutivos. ¡Un año entero!
     badge_title_metadata: "%{display_name} distintivo en %{site_title}"
   admin_login:
     success: "Email enviado"
@@ -3743,6 +3851,11 @@ es:
     staff_tag_disallowed: "La etiqueta \"%{tag}\" solo puede ser insertada por moderadores."
     staff_tag_remove_disallowed: "La etiqueta \"%{tag}\" solo puede ser eliminada por moderadores."
     minimum_required_tags: "Debes seleccionar al menos %{count} etiquetas,"
+    forbidden:
+      in_this_category: "\"%{tag_name}\" no puede ser usada en esta categoría."
+      restricted_to:
+        one: "\"%{tag_name}\" está restringida a la categoría \"%{category_names}\""
+        other: "\"%{tag_name}\" está restringida a las siguientes categorías: %{category_names}"
   rss_by_tag: "Temas con la etiqueta %{tag}"
   finish_installation:
     congratulations: "Enhorabuena, ¡has instalado Discourse!"
@@ -3788,6 +3901,7 @@ es:
             placeholder: "La mejor comunidad del mundo"
       introduction:
         title: "Introducción"
+        disabled: "<p>No hemos encontrado ningún tema con el título \"%{topic_title}\".</p> <ul> <li>Si has cambiado el título, edita ese tema para cambiar el texto introductorio de tu foro.</li> <li>Si lo has borrado, crea otro tema y titúlalo \"%{topic_title}\". El contenido del primer mensaje será el texto introductorio de tu foro.</li> </ul>"
         fields:
           welcome:
             label: "Tema de bienvenida"
@@ -3847,8 +3961,10 @@ es:
         fields:
           logo:
             label: "Logo Principal"
+            description: "La imagen del logo en la parte superior izquierda de la página. Usa una imagen ancha y rectangular con una altura de 120px y una relación de aspecto mayor de 3:1."
           logo_small:
             label: "Logo Compacto"
+            description: "La versión compacta de tu logo, mostrada en la parte superior izquierda de la página al bajar. Usa una imagen cuadrada. El tamaño recomendado es 120x120"
       icons:
         title: "Iconos"
         fields:
@@ -3884,8 +4000,12 @@ es:
       invites:
         title: "Invitar staff"
         description: "¡Ya casi estás listo! Vamos a invitar otras personas para que ayuden a <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>iniciar discusiones</a> con temas interesantes y respuestas para que comience tu comunidad."
+        disabled: "Ya que los inicios de sesión locales están desactivados, no es posible enviar invitaciones a nadie. Por favor, ve al siguiente paso."
       finished:
         title: "Tu foro de Discourse está listo!"
+        description: |
+          <p>Si alguna vez quieres cambiar alguno de estos ajustes, <b>vuelve a lanzar este ayudante cuando quieras</b> o visita <a href='%{base_path}/admin' target='_blank'>el panel de administrador</a>; lo encontrarás al lado del icono de la llave inglesa en el menú.</p>
+          <p>¡Pásalo bien, y buena suerte <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>construyendo tu comunidad!</a></p>
   search_logs:
     graph_title: "Cuenta de Búsquedas"
   joined: "Registrado"
diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml
index 8e8cd74927..f68105b1dc 100644
--- a/config/locales/server.fa_IR.yml
+++ b/config/locales/server.fa_IR.yml
@@ -816,7 +816,6 @@ fa_IR:
     tl2_additional_likes_per_day_multiplier: "کنترل بالا رفتن پسند‌ها در روز برای   tl2 (اعضا) از طریق حاصل ضرب این شماره"
     tl3_additional_likes_per_day_multiplier: "کنترل بالا رفتن پسند ها در روز برای tl3 (معمولی) از طریق حاصل ضرب این شماره"
     tl4_additional_likes_per_day_multiplier: "کنترل بالا رفتن پسند ها در روز برای  tl4 ( راهبران) از طریق حاصل ضرب این شماره"
-    flag_sockpuppets: "اگر کاربری به موضوع با ای پی برابر با کاربری که نوشته را شروع کرده ٬ آنها را به عنوان هرزنامه پرچم گزاری کن."
     traditional_markdown_linebreaks: "در مدل‌های نشانه گزاری از خط جدید سنتی استفاده کن،‌ که برای linebreak نیاز به دو فضای انتهایی دارد ."
     post_undo_action_window_mins: "تعداد دقایقی که کاربران اجازه دارند اقدامی را که در نوشته انجام داده اند باز گردانند. (پسند، پرچم گذاری،‌ چیزهای دیگر)."
     must_approve_users: "همکاران باید تمامی حساب‌های کاربری را قبل از اجازه دسترسی به سایت تایید کنند. اخطار: فعال‌سازی این گزینه ممکن است باعث جلوگیری از دسترسی کاربرانی که قبلا عضو شده‌اند نیز بشود!"
@@ -840,7 +839,6 @@ fa_IR:
     topics_per_period_in_top_page: "تعداد موضوعات خوب در بخش گسترش یافته \" بیشتر نشان بده\" بهترین موضوعات، نشان داده شود. "
     redirect_users_to_top_page: "بطور خودکار کاربران  جدید و کاربران غایب را به صفحه‌ی بهترین‌ها هدایت کن."
     top_page_default_timeframe: "بازه زمانی پیشفرض برای نمایش در بالای صفحه."
-    show_email_on_profile: "به کاربران ایمیلشان را در نمایه نشان بده (فقط برای خودشان و مدیران)"
     prioritize_username_in_ux: "نام کاربری را در ابتدا در صفحه‌ی کاربر، کارت کاربر یا نوشته‌هایش نمایش بده(وقتی غیر‌فعال باشد نام در ابتدا نمایش داده می‌شود)"
     email_token_valid_hours: "رمز عبور فراموش شده/ حساب کاربری فعال تا (n) ساعت اعتبار دارد."
     enable_badges: "فعال سازی سیستم نشان‌دهی"
@@ -1392,9 +1390,6 @@ fa_IR:
     disagreed: "ممنون از اینکه به ما اطلاع دادید. ما بررسی می‌کنیم"
     deferred: "ممنون از اینکه به ما اطلاع دادید. ما بررسی می کنیم"
     deferred_and_deleted: "ممنون از اینکه به ما اطلاع دادید. ما نوشته را حذف کردیم."
-  temporarily_closed_due_to_flags:
-    one: "این موضوع موقتا به دلیل دریافت تعداد زیادی پرچم به مدت %{count}  ساعت بسته می‌شود."
-    other: "این موضوع موقتا به دلیل دریافت تعداد زیادی پرچم به مدت %{count}  ساعت بسته می‌شود."
   system_messages:
     private_topic_title: "موضوع #%{id}"
     contents_hidden: "لطفا نوشته را برای نمایش محتویات ببینید"
diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml
index ad17ddcac4..7a50586641 100644
--- a/config/locales/server.fi.yml
+++ b/config/locales/server.fi.yml
@@ -161,6 +161,7 @@ fi:
 
       <p>Muussa tapauksessa <a href="%{base_url}/password-reset">uusi salasanasi</a>.</p>
     user_exists: "Ei ole tarpeen lähettää kutsua osoitteeseen <b>%{email}</b>, sillä kutsuttavalla <a href='%{base_path}/u/%{username}/summary'>on jo tunnus!</a>"
+    confirm_email: "<p>Melkein valmista! Lähetimme aktivointiviestin sähköpostiosoitteeseesi. Aktivoi tilisi noudattamalla sähköpostissa kerrottuja ohjeita.</p><p>Jos viesti ei saavu, tarkistathan roskapostikansiosi.</p>"
   bulk_invite:
     file_should_be_csv: "Ladattavan tiedoston tulee olla CSV-muodossa."
     error: "Tiedoston lataus epäonnistui. Yritä myöhemmin uudelleen."
@@ -796,6 +797,7 @@ fi:
     read: "luku"
     read_write: "luku/kirjoitus"
     description: "\"%{application_name}\" pyytää seuraavaa käyttöoikeutta tunnukseesi:"
+    instructions: "Loimme juuri uuden käyttäjärajapinta-avaimen, jolla voit käyttää palveluamme \"%{application_name}\". Liitä tämä avainkoodi sovellukseesi:"
     no_trust_level: "Pahoittelut, luottamustasosi ei ole riittävä käyttäjärajapinnan käyttämiseen"
     generic_error: "Pahoittelut, API-salausavainta ei muodostettu; sivuston ylläpitäjä on saattanut ottaa ominaisuuden pois käytöstä"
     scopes:
@@ -1111,6 +1113,8 @@ fi:
     facebook_config_warning: 'Palvelin on konfiguroitu hyväksymään liittyminen ja kirjautuminen Facebookin kautta (enable_facebook_logins), mutta app id- ja app secret -arvoja ei ole asetettu. Päivitä arvot <a href="%{base_path}/admin/site_settings">sivuston asetuksissa</a>. <a href="https://meta.discourse.org/t/configuring-facebook-login-for-discourse/13394" target="_blank">Voit lukea lisää tästä oppaasta</a>.'
     twitter_config_warning: 'Palvelin on konfiguroitu hyväksymään liittyminen ja kirjautuminen Twitterin kautta (enable_twitter_logins), mutta key- ja secret-salausarvoja ei ole asetettu. Päivitä arvot <a href="%{base_path}/admin/site_settings">sivuston asetuksissa</a>. <a href="https://meta.discourse.org/t/configuring-twitter-login-for-discourse/13395" target="_blank">Voit lukea lisää tästä oppaasta</a>.'
     github_config_warning: 'Palvelin on konfiguroitu hyväksymään liittyminen ja kirjautuminen GitHubin kautta (enable_github_logins), mutta client id- ja app secret -arvoja ei ole asetettu. Päivitä arvot <a href="%{base_path}/admin/site_settings">sivuston asetuksissa</a>. <a href="https://meta.discourse.org/t/configuring-github-login-for-discourse/13745" target="_blank">Voit lukea lisää tästä oppaasta</a>.'
+    pwa_config_icon_warning: 'Palvelimelle ei ole asetettu kunnollista suurta ikonia, joka tarvitaan, jotta Android-käyttäjä voi lisätä sivuston kotinäyttönsä pikavalinnaksi. Käy <a href="/admin/site_settings/category/all_results?filter=large_icon">sivustoasetuksissa</a> ja lataa suositellun kokoinen kuvake.'
+    pwa_config_title_warning: 'Palvelimelle ei ole asetettu lyhyttä nimeä, joka tarvitaan, jotta Android-käyttäjä voi lisätä sivuston kotinäyttönsä pikavalinnaksi. Käy <a href="/admin/site_settings/category/all_results?filter=large_icon">sivustoasetuksissa</a> ja määritä suositellun pituinen nimi.'
     s3_config_warning: 'Palvelin on konfiguroitu tallentamaan sivustolle ladatut tiedostot S3:een, mutta vähintään yksi tiedoista on asettamatta: s3_access_key_id, s3_secret_access_key, s3_use_iam_profile tai s3_upload_bucket. Päivitä ne <a href="/admin/site_settings">sivuston asetuksissa</a>. Lisätietoa englanninkielisestä ketjusta <a href="https://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">"How to set up image uploads to S3?"</a>.'
     s3_backup_config_warning: 'Palvelin on konfiguroitu tallentamaan varmuuskopiot S3:een, mutta vähintään yksi tiedoista on asettamatta: s3_access_key_id, s3_secret_access_key tai s3_upload_bucket . Päivitä ne <a href="/admin/site_settings">sivuston asetuksissa</a>. Lisätietoa englanninkielisestä ketjusta <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">"How to set up image uploads to S3?"</a>.'
     image_magick_warning: 'Palvelin on konfiguroitu luomaan esikatselukuvia suurista kuvista, mutta ImageMagickia ei ole asennettu. Asenna ImageMagick paketinhallinnasta tai <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">lataa uusin versio</a>.'
@@ -1186,8 +1190,10 @@ fi:
     inline_onebox_domains_whitelist: "Verkko-osoitteet, joista luodaan Onebox-esikatselu, jos niihin linkitetään määrittämättä otsikkoa."
     enable_inline_onebox_on_all_domains: "Poista  inline_onebox_domain_whitelist -sivustoasetus käytöstä ja salli rivi-oneboxit kaikista verkko-osoitteista."
     max_oneboxes_per_post: "Oneboxien enimmäismäärä yhdessä viestissä"
+    logo: "Kuva, joka toimii sivuston logona sivuston vasemmassa yläkulmassa. Valitse suorakulmion muotoinen kuva, joka on vähintään 120px korkea ja jonka kuvasuhde on vähintään 3:1. Jos jätät tyhjäksi, tilalla näytetään sivuston nimi."
     logo_small: "Kuva, joka toimii sivuston pienenä logona sivuston yläkulmassa, kun vieritetään alaspäin. Valitse neliönmuotoinen kuva. Suositeltu koko on 120px kertaa 120px. Jos jätät tyhjäksi, tilalla näytetään koti-merkki."
     digest_logo: "Vaihtoehtoinen logo, jota käytetään sivustosi sähköpostitiivistelmien yläosassa. Valitse leveä suorakulmainen kuva. Älä käytä SVG-kuvaa. Jos jätät tyhjäksi, käytetään \"logo\"-asetuksen kuvaa."
+    mobile_logo: "Logo, jota sivuston mobiiliversio käyttää. Valitse suorakulmion muotoinen kuva, joka on vähintään 120px korkea ja jonka kuvasuhde on vähintään 3:1. Jos jätät tyhjäksi, käytetään \"logo\"-asetuksen kuvaa."
     large_icon: "Kuva, jota käytetään logo/splash -kuvana Androidissa. Suositeltu koko on 512x512 pikseliä."
     favicon: "Palstan favicon, ks. <a href='https://fi.wikipedia.org/wiki/Favicon' target='_blank'>https://fi.wikipedia.org/wiki/Favicon</a>. Täytyy olla png, jotta toimii CDN:n kanssa."
     apple_touch_icon: "Applen kosketuslaitteiden käyttämä ikoni. Suositeltu koko on 144px kertaa 144px."
@@ -1195,6 +1201,7 @@ fi:
     twitter_summary_large_image: "Oletuksena käytettävän Twitter-tiivistelmäkortin kuva (tulisi olla ainakin 280 px leveä ja ainakin 150 px korkea)."
     notification_email: "Sähköpostiosoite, josta kaikki tärkeät järjestelmän lähettämät sähköpostiviestit lähetetään. Verkkotunnuksen SPF, DKIM ja reverse PTR tietueiden täytyy olla kunnossa, jotta sähköpostit menevät perille."
     email_custom_headers: "Pystyviivalla eroteltu lista mukautetuista sähköpostin tunnisteista"
+    email_subject: "Mukauta sähköpostiviestien otsikon muoto. Katso englanninkielinen ohje: <a href='https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801' target='_blank'>https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801</a>"
     force_https: "Pakota sivusto käyttämään vain HTTPS:ää. VAROITUS: älä ota tätä käyttöön ennen kuin HTTPS on täysin käytössä ja toimii täysin kaikkialla! Tarkastitko käyttämäsi CDN, kaikki sosiaaliset kirjautumiset ja kaikki ulkoiset logot / muut riippuvuudet ovat myös HTTPS-yhteensopivia?"
     summary_score_threshold: "Viestin minimipistemäärä, jotta se näytetään ketjun tiivistelmässä."
     summary_posts_required: "Montako viestiä ketjussa täytyy olla, jotta ketjun tiivistelmä otetaan käyttöön"
@@ -1221,15 +1228,20 @@ fi:
     num_tl3_flags_to_silence_new_user: "Jos uuden käyttäjän viestit saavat näin monta liputusta num_tl3_users_to_silence_new_user eri luottamustason 3 käyttäjältä, piilota kaikki hänen viestinsä ja estä uusien viestien lähettäminen. 0 poistaa toiminnon käytöstä."
     num_tl3_users_to_silence_new_user: "Jos uuden käyttäjän viestit saavat num_tl3_flags_to_silence_new_user liputusta näin monelta eri luottamustason 3 käyttäjältä, piilota kaikki hänen viestinsä ja estä uusien viestien lähettäminen. 0 poistaa toiminnon käytöstä."
     notify_mods_when_user_silenced: "Jos käyttäjä hiljennetään automaattisesti, lähetä viesti kaikile valvojille."
-    flag_sockpuppets: "Jos uuden käyttäjän aloittamaan ketjuun vastaa toinen uusi käyttäjä samasta IP-osoitteesta, liputa molemmat viestit mahdolliseksi roskapostiksi."
+    flag_sockpuppets: "Jos ketjuun vastaa uusi käyttäjä, jonka IP on sama kuin ketjun aloittajalla, liputa molemmat viestit mahdolliseksi roskapostiksi."
     traditional_markdown_linebreaks: "Käytä perinteisiä rivinvaihtoja Markdownissa, joka vaatii kaksi perättäistä välilyöntiä rivin vaihtoon."
     enable_markdown_typographer: "Paranna tekstin luettavuutta typografisten sääntöjen avulla: suorat lainausmerkit korvataan 'kaarevilla lainausmerkeillä’, (c) (tm) korvataan symboleilla, -- korvataan m-ajatusviivalla – jne."
+    enable_markdown_linkify: "Tee linkin näköisestä tekstistä automaattisesti linkki: www.example.com ja https://example.com muutetaan automaattisesti linkeiksi"
     markdown_linkify_tlds: "Luettelo ylätason verkkotunnuksista, jotka muutetaan esiintyessään linkeiksi automaattisesti"
     post_undo_action_window_mins: "Kuinka monta minuuttia käyttäjällä on aikaa perua viestiin kohdistuva toimi (tykkäys, liputus, etc)."
     must_approve_users: "Henkilökunnan täytyy hyväksyä kaikki uudet tilit, ennen uusien käyttäjien päästämistä sivustolle. VAROITUS: tämän asetuksen valitseminen poistaa pääsyn kaikilta jo olemassa olevilta henkilökuntaan kuulumattomilta käyttäjiltä."
     pending_users_reminder_delay: "Ilmoita valvojille, jos uusi käyttäjä on odottanut hyväksyntää kauemmin kuin näin monta tuntia. Aseta -1, jos haluat kytkeä ilmoitukset pois päältä."
     maximum_session_age: "Käyttäjä pysyy sisäänkirjautuneena n tuntia vierailunsa jälkeen"
+    ga_universal_tracking_code: "Google Universal Analytics (analytics.js) tracking code -seurantakoodi, esim.: UA-12345678-9; katso  <a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
+    ga_universal_domain_name: "Google Universal Analytics (analytics.js) verkkotunnus, esim. mysite.com; katso <a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
+    ga_universal_auto_link_domains: "Ota käyttöön Google Universal Analyticsin (analytics.js) verkkotunnusten välinen seurantapalvelu . Poisvieviin näiden verkkotunnusten linkkeihin lisätään client id -tunniste. Katso lisää <a href='https://support.google.com/analytics/answer/1034342?hl=en' target='_blank'>Googlen Cross-Domain Tracking -oppaasta.</a>"
     gtm_container_id: "Google Tag Manager -säiliön ID. Esim: GTM-ABCDEF"
+    enable_escaped_fragments: "Käytä Googlen Ajax-sivustoille tarkoitettua API:a, jos webcrawleria ei tunnisteta. Katso <a href='https://developers.google.com/webmasters/ajax-crawling/docs/learn-more' target='_blank'>https://developers.google.com/webmasters/ajax-crawling/docs/learn-more</a>"
     allow_moderators_to_create_categories: "Salli valvojien luoda uusia alueita"
     cors_origins: "Salli lähteet CORS-pyynnöille (cross-origin request). Jokaisen lähteen pitää sisältää http:// tai https://. DISCOURSE_ENABLE_CORS asetus pitää olla valittuna ottaaksesi CORSin käyttöön."
     use_admin_ip_whitelist: "Ylläpitäjät voivat kirjautua vain IP-osoitteista, jotka on määritetty Seulottavien IP:iden listassa (Ylläpito > Lokit > Seulottavat IP:t)"
@@ -1239,6 +1251,11 @@ fi:
     blacklisted_crawler_user_agents: 'Uniikki kirjainkoosta riippumaton sana käyttäjäagentin nimessä, josta tunnistaa sivustolle ei-tervetulleen hakurobotin. Ei vaikutusta, mikäli valkolista sallituista on määritelty.'
     slow_down_crawler_user_agents: 'Hakurobottien käyttäjäagentit, joiden toiminnan nopeutta rajoitetaan hakuviivemääräyksen (Crawl-delay directive) mukaisesti'
     slow_down_crawler_rate: 'Jos slow_down_crawler_user_agents on määritelty tämä nopeusrajoitus koskee kaikkia hakurobotteja (kuinka monta sekuntia pitää kulua pyyntöjen välillä)'
+    content_security_policy: KOKEELLINEN - Ota käyttöön epäilyttävän sisällön seulonta (Content-Security-Policy)
+    content_security_policy_report_only: KOKEELLINEN - Ota käyttöön epäilyttävästä sisällöstä raportointi (Content-Security-Policy-Report-Only)
+    content_security_policy_collect_reports: Ota käyttöön CSP-seulontojen kerääminen lokiin /csp_reports
+    content_security_policy_script_src: Muut sallitut skriptien lähteet. Nykyinen webhotelli ja CDN ovat sallittuja jo valmiiksi.
+    invalidate_inactive_admin_email_after_days: "Ylläpitäjätunnukset jotka eivät ole vierailleet sivustolla näin moneen päivään joutuvat vahvistamaan sähköpostiosoitteensa uudelleen ennen sisäänkirjautumista. Aseta 0 poistaaksesi käytöstä."
     top_menu: "Mitkä painikkeet näytetään kotisivun navigointipalkissa, ja missä järjestyksessä. Esimerkiksi latest|new|unread|categories|top|read|posted|bookmarks"
     post_menu: "Mitkä painikkeet näytetään viestin valikossa, ja missä järjestyksessä. Esimerkiksi like|edit|flag|delete|share|bookmark|reply"
     post_menu_hidden_items: "Piilotettavat painikkeet viestin valikosta, kunnes '...' klikataan."
@@ -1248,13 +1265,14 @@ fi:
     send_tl1_welcome_message: "Lähetä luottamustason 1 saavuttaville käyttäjille yksityinen tervetuloviesti."
     suppress_reply_directly_below: "Älä näytä vastausten lukumäärää viestissä, jos ainoa vastaus on seuraavassa viestissä."
     suppress_reply_directly_above: "Älä näytä vastauksena-painiketta viestin yläreunassa, jos viestissä on vastattu vain edelliseen viestiin."
+    remove_full_quote: "Poista koko viestin lainaukset suorista vastauksista automaattisesti."
     suppress_reply_when_quoting: "Älä näytä vastauksena-painiketta viestin yläreunassa, kun viestissä on lainaus."
     max_reply_history: "Maksimimäärä vastauksia, jotka avataan klikattaessa 'vastauksena' painiketta"
     topics_per_period_in_top_summary: "Ketjujen lukumäärä, joka näytetään oletuksena Kuumat-listauksissa."
     topics_per_period_in_top_page: "Ketjujen lukumäärä, joka näytetään laajennetussa Kuumat-listauksessa."
     redirect_users_to_top_page: "Ohjaa uudet ja kauan poissa olleet käyttäjät automaattisesti kuumat-sivulle."
     top_page_default_timeframe: "Kuumat-sivun oletusaikajakso."
-    show_email_on_profile: "Näytä käyttäjän sähköpostiosoite profiilissa (näkyy vain käyttäjälle itselleen ja henkilökunnalle)"
+    show_email_on_profile: "Salli valvojien tarkastella käyttäjien sähköpostiosoitteita"
     prioritize_username_in_ux: "Näytä käyttäjänimi ensimmäisenä käyttäjäsivulla, -kortissa ja viesteissä (jos poistetaan käytöstä, nimi näytetään ensin)"
     enable_rich_text_paste: "Ota käyttöön automaattinen muunnos HTML:stä Markdowniin, kun tekstiä liitetään kirjoitusalueelle (kokeellinen)"
     email_token_valid_hours: "Unohtuneen salasanan / tilin vahvistamisen tokenit ovat voimassa (n) tuntia."
@@ -1265,6 +1283,7 @@ fi:
     email_domains_whitelist: "Pystyviivalla eroteltu lista sähköposti-verkkotunnuksista, joista käyttäjien pitää luoda tilinsä. VAROITUS: Käyttäjiä, joiden sähköpostiosoite on muusta verkkotunnuksesta ei sallita!"
     hide_email_address_taken: "Älä kerro käyttäjälle, että käyttäjätili annetulla sähköpostiosoitteella on jo olemassa, kun hän liittyy palstalle tai kun hän pyytää salasanan palauttamista."
     log_out_strict: "Kun kirjaudutaan ulos, kirjaa käyttäjä ulos kaikilta laitteilta"
+    version_checks: "Pingaa Discourse Hubia päivityksistä ja näytä ilmoitus <a href='%{base_path}/admin' target='_blank'>/admin</a>-hallintapaneelissa, kun uusi versio on saatavilla"
     new_version_emails: "Lähetä sähköposti contact_email osoitteeseen kun uusi versio Discoursesta on saatavilla."
     invite_expiry_days: "Kuinka monta päivää käyttäjäkutsujen avaimet ovat voimassa"
     invite_only: "Julkinen rekisteröityminen ei ole käytössä, uuden tilin luominen vaatii kutsun henkilökunnalta."
@@ -1277,6 +1296,7 @@ fi:
     password_unique_characters: "Vähimmäismäärä eri merkkejä salasanassa."
     block_common_passwords: "Älä salli salasanoja, jotka ovat 10 000 yleisimmän salasanan joukossa."
     enable_sso: "Ota käyttöön single sign on ulkopuolisen sivuston kautta (VAROITUS: ULKOPUOLISEN SIVUSTON TÄYTYY VALIDOIDA SÄHKÖPOSTIOSOITTEET!)"
+    verbose_sso_logging: "Tallenna runsaat SSO-diagnostiikat lokiin <a href='%{base_path}/logs' target='_blank'>/logs</a>"
     sso_url: "Kertakirjautumisen päätepisteen URL (täytyy sisältää http:// tai https://)"
     sso_secret: "Salausavain, jolla todennetaan SSO tiedot, varmista että se on vähintään 10 merkkiä pitkä"
     sso_overrides_bio: "Syrjäyttää käyttäjän kuvauksen itsestään käyttäjäprofiilissa ja estää sen muokkaamisen"
@@ -1290,11 +1310,21 @@ fi:
     allow_new_registrations: "Salli uusien käyttäjien rekisteröityminen. Ota tämä asetus pois käytöstä estääksesi uusien käyttäjätilien luomisen."
     enable_signup_cta: "Näytä palaaville anonyymeille käyttäjille ilmoitus, jossa kehoitetaan heitä luomaan tili."
     enable_yahoo_logins: "Ota käyttöön Yahoo kirjautuminen"
+    enable_google_oauth2_logins: "Ota käyttöön Google Oauth2 -tunnistautuminen. Tämä on tunnistautumistapa, jota Google nykyisellään tulee. Key ja secret vaaditaan. Katso <a href='https://meta.discourse.org/t/15858' target='_blank'>Configuring Google login for Discourse</a>."
     google_oauth2_client_id: "Google-applikaatiosi Client ID."
     google_oauth2_client_secret: "Google-applikaatiosi Client secret."
+    enable_twitter_logins: "Ota käyttöön Twitter-tunnistautuminen, vaaditaan twitter_consumer_key ja twitter_consumer_secret. Katso <a href='https://meta.discourse.org/t/13395' target='_blank'>Configuring Twitter login (and rich embeds) for Discourse</a>."
+    twitter_consumer_key: "Twitter-tunnistautumisen consumer key, joka rekisteröidään palvelussa <a href='https://apps.twitter.com/' target='_blank'>https://apps.twitter.com</a>"
+    twitter_consumer_secret: "Twitter-tunnistautumisen consumer secret, joka rekisteröidään palvelussa <a href='https://apps.twitter.com/' target='_blank'>https://apps.twitter.com</a>"
     enable_instagram_logins: "Ota Instagram-autentikaatio käyttöön, vaatimuksena instagram_consumer_key ja instagram_consumer_secret"
     instagram_consumer_key: "Consumer key Instagram-autentikaatioon"
     instagram_consumer_secret: "Consumer secret Instagram-autentikaatioon"
+    enable_facebook_logins: "Ota käyttöön Facebook-tunnistautuminen, vaaditaan facebook_app_id ja facebook_app_secret. Katso <a href='https://meta.discourse.org/t/13394' target='_blank'>Configuring Facebook login for Discourse</a>."
+    facebook_app_id: "Facebook-tunnistautumisen app id, joka rekisteröidään palvelussa <a href='https://developers.facebook.com/apps/' target='_blank'>https://developers.facebook.com/apps</a>"
+    facebook_app_secret: "Facebook-tunnistautumisen app secret, joka rekisteröidään palvelussa <a href='https://developers.facebook.com/apps/' target='_blank'>https://developers.facebook.com/apps</a>"
+    enable_github_logins: "Ota käyttöön Facebook-tunnistautuminen, vaaditaan github_client_id ja github_client_secret. Katso  <a href='https://meta.discourse.org/t/13745' target='_blank'>Configuring GitHub login for Discourse</a>."
+    github_client_id: "GitHub-tunnistautumisen client id, joka rekisteröidään palvelussa <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>"
+    github_client_secret: "GitHub-tunnistautumisen client secret, joka rekisteröidään palvelussa <a href='https://github.com/settings/developers/' target='_blank'>https://github.com/settings/developers</a>"
     readonly_mode_during_backup: "Ota käyttöön vain luku -tila, kun otetaan varmuuskopiota"
     enable_backups: "Salli ylläpitäjien tehdä varmuuskopioita palstasta"
     allow_restore: "Salli palautus, joka korvaa KAIKEN sivuston datan! Jätä valitsematta, jos et aio palauttaa sivuston varmuuskopiota"
@@ -1306,6 +1336,7 @@ fi:
     s3_disable_cleanup: "Älä poista varmuuskopiota S3:sta, kun se poistetaan paikallisesti."
     backup_time_of_day: "UTC-kellonaika, jolloin varmuuskopio tehdään."
     backup_with_uploads: "Sisällytä lataukset ajastettuihin varmuuskopioihin. Jos tämä on pois käytöstä, vain tietokanta varmuuskopioidaan."
+    backup_location: "SIjainti, jonne varmuuskopiot säilötään. TÄRKEÄÄ: S3 vaatii toimiakseen, että käyvät S3-käyttöoikeustiedot  on syötetty Tiedostot-asetuksiin."
     active_user_rate_limit_secs: "Kuinka usein 'last_seen_at' kenttä päivitetään, sekunneissa"
     verbose_localization: "Näytä laajennetut lokalisointitiedot käyttöliittymässä"
     previous_visit_timeout_hours: "Kuinka kauan vierailun on täytynyt kestää, jotta se lasketaan 'edelliseksi' vierailuksi, tunneissa"
@@ -1356,6 +1387,7 @@ fi:
     allow_staff_to_upload_any_file_in_pm: "Salli henkilökunnan ladata minkätyyppisiä liitteitä tahansa yksityisviesteihin."
     strip_image_metadata: "Poista metadata kuvista."
     min_ratio_to_crop: "Suhde, jolla korkeat kuvat cropataan. Syötä tulos suhteena leveys / korkeus."
+    simultaneous_uploads: "Kuinka monta tiedostoa voi enintään raahata viestieditoriin"
     enable_flash_video_onebox: "Ota käyttöön swf- ja flv-linkkien (Adobe Flash) onebox-tuki. VAROITUS: saattaa lisätä tietoturvariskejä."
     default_invitee_trust_level: "Oletus luottamustaso (0-4) kutsutuille käyttäjille."
     default_trust_level: "Uusien käyttäjien oletusarvoinen luottamustaso (0-4). VAROITUS! Tämän muuttaminen altistaa roskapostille."
@@ -1411,6 +1443,7 @@ fi:
     title_min_entropy: "Ketjun otsikon minimientropia (uniikkeja merkkejä)."
     body_min_entropy: "Viestin minimientropia (uniikkeja merkkejä)."
     allow_uppercase_posts: "Salli pelkillä isoilla kirjaimilla kirjoittaminen otsikossa tai viestin leipätekstissä."
+    max_consecutive_replies: "Kuinka monta perättäistä viestiä käyttäjä voi kirjoittaa ketjuun ennen kuin häntä estetään lähettämästä uutta vastausta"
     min_title_similar_length: "Ketjun otsikon minimipituus, kunnes sitä verrataan muihin samankaltaisiin ketjuihin."
     desktop_category_page_style: "/Keskustelualueet-sivun visuaalinen tyyli."
     category_colors: "Lista alueiden sallituista väriarvoista, heksadesimaaleina."
@@ -1949,9 +1982,6 @@ fi:
     disagreed: "Kiitos kun toit asian tietoomme. Selvitämme asiaa."
     deferred: "Kiitos kun toit asian tietoomme. Selvitämme asiaa."
     deferred_and_deleted: "Kiitos kun toit asian tietoomme. Poistimme kyseisen viestin."
-  temporarily_closed_due_to_flags:
-    one: "Ketju on suljettu väliaikaisesti 1 tunnin ajan suuren lippumäärän vuoksi."
-    other: "Ketju on suljettu väliaikaisesti %{count} tunnin ajan suuren lippumäärän vuoksi."
   system_messages:
     private_topic_title: "Ketju #%{id}"
     contents_hidden: "Käy lukemassa viesti, jotta näet sen sisällön."
diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml
index ce0ab91123..393d495ed6 100644
--- a/config/locales/server.fr.yml
+++ b/config/locales/server.fr.yml
@@ -1227,7 +1227,6 @@ fr:
     num_tl3_flags_to_silence_new_user: "Si les messages d'un nouvel utilisateur obtiennent ce nombre de signalements de la part de num_tl3_users_to_silence_new_user utilisateurs de niveau de confiance 3 différents, masquer tous ses messages et l'empêcher de poster à l'avenir. 0 désactive cette fonctionnalité."
     num_tl3_users_to_silence_new_user: "Si les messages d'un nouvel utilisateur num_tl3_flags_to_silence_new_user signalements de la part de plusieurs utilisateurs de niveau de confiance 3 différents, masquer tous ses messages et l'empêcher de poster à l'avenir. 0 désactive cette fonctionnalité."
     notify_mods_when_user_silenced: "Si un utilisateur est automatiquement mis sous silence, envoyer un message à tous les modérateurs."
-    flag_sockpuppets: "Si un nouvel utilisateur répond à un sujet avec la même adresse IP que le nouvel utilisateur qui a commencé le sujet, alors leurs messages seront automatiquement marqués comme spam."
     traditional_markdown_linebreaks: "Utiliser le retour à la ligne traditionnel dans Markdown, qui nécessite deux espaces pour un saut de ligne."
     enable_markdown_typographer: "Utiliser des règles typographiques pour améliorer la lisibilité du texte: remplacer les guillemets simples ' avec les guillemets bouclés ’, (c) (tm) avec les symbôles, -- avec emdash –, etc."
     enable_markdown_linkify: "Traiter automatiquement le texte qui ressemble à un lien comme un lien : www.site.com et https://site.com seront automatiquement liés."
@@ -1270,7 +1269,6 @@ fr:
     topics_per_period_in_top_page: "Nombre de meilleurs sujets affichés lorsqu'on sélectionne \"Voir plus\" des meilleurs sujets."
     redirect_users_to_top_page: "Rediriger automatiquement les nouveaux utilisateurs et les longues absences sur la page Top."
     top_page_default_timeframe: "Période par défaut pour la page la plus vue."
-    show_email_on_profile: "Afficher l'adresse du courriel de l'utilisateur sur leur page utilisateur (seulement visible pour l'utilisateur et les équipes techniques)"
     prioritize_username_in_ux: "Afficher le pseudonyme en premier sur la page d'un utilisateur, sa carte et ses messages (si désactivé, le nom est affiché en premier)"
     enable_rich_text_paste: "Permettre la conversion automatique de HTML en Markdown lors que du texte est collé dans l'éditeur. (Expérimental)"
     email_token_valid_hours: "Les jetons (tokens) de Mot de passe oublié / Activation de comptes sont valides (n) jours."
@@ -2162,9 +2160,6 @@ fr:
     disagreed: "Merci de nous en informer. Nous travaillons à sa résolution."
     deferred: "Merci de nous en informer. Nous travaillons à sa résolution."
     deferred_and_deleted: "Merci de nous en informer. Nous avons supprimé le message."
-  temporarily_closed_due_to_flags:
-    one: "Ce sujet est fermé 1 heure suite à plusieurs signalements de la communauté."
-    other: "Ce sujet est fermé %{count} heures suite à plusieurs signalements de la communauté."
   system_messages:
     private_topic_title: "Topic #%{id}"
     contents_hidden: "Veuillez visiter le message pour voir son contenu."
diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml
index 859941156b..f3b8c639dc 100644
--- a/config/locales/server.he.yml
+++ b/config/locales/server.he.yml
@@ -897,7 +897,6 @@ he:
     tl2_additional_likes_per_day_multiplier: "להגדיל את כמות הלייקים האפשרית ביום עבור tl2 (משתמש) באמצעות הכפלה במספר זה. "
     tl3_additional_likes_per_day_multiplier: "להגדיל את כמות הלייקים האפשרית ביום עבור רמת-אמון 3 (רגיל) באמצעות הכפלה במספר זה."
     tl4_additional_likes_per_day_multiplier: "להגדיל את כמות הלייקים האפשרית ביום עבור tl4 (מנהיג) באמצעות הכפלה במספר זה. "
-    flag_sockpuppets: "אם משתמשים חדשים מגיבים לנושא מכתובת IP זהה לזו של מי שהחל את הנושא, סמנו את הפוסטים של שניהם כספאם פוטנציאלי."
     traditional_markdown_linebreaks: "שימוש בשבירת שורות מסורתית בסימון, מה שדורש שני רווחים עוקבים למעבר שורה."
     post_undo_action_window_mins: "מספר הדקות בהן מתאפשר למשתמשים לבטל פעולות אחרות בפוסט (לייק, סימון, וכו')."
     must_approve_users: "על הצוות לאשר את כל המשתמשים החדשים לפני שהם מקבלים גישה לאתר. אזהרה: בחירה זו עבור אתר קיים תשלול גישה ממשתמשים קיימים שאינם מנהלים."
@@ -922,7 +921,6 @@ he:
     topics_per_period_in_top_page: "מספר הנושאים הראשונים המוצגים בתצוגה המורחבת של \"הצג עוד\"."
     redirect_users_to_top_page: "כוון באופן אוטומטי משתמשים חדשים וכאלה שנעדרו במשך זמן לראש העמוד."
     top_page_default_timeframe: "ברירת מחדל של פרק זמן להצגה בדף המובילים."
-    show_email_on_profile: "הצגת כתובת הדוא\"ל של המשתמשים בעמוד הפרופיל שלהם (גלוי רק להם ולצוות)"
     prioritize_username_in_ux: "הציגו שם-משתמש ראשון בדף המשתמש, כרטיס המשתמש ופוסטים (כשמנוטרל השם מופיע קודם)"
     email_token_valid_hours: "סיסמאות שכחת סיסמה / הפעלת חשבון תקפים במשך (n) שעות."
     enable_badges: "הפעלת מערכת העיטורים"
@@ -1509,11 +1507,6 @@ he:
     disagreed: "תודה שעדכנת אותנו. אנחנו בודקים את זה."
     deferred: "תודה שעדכנתם אותנו. אנחנו בודקים את העניין."
     deferred_and_deleted: "תודה שעדכנתם אותנו. הסרנו את הפוסט."
-  temporarily_closed_due_to_flags:
-    one: "נושא זה סגור זמנית לשעה 1 עקב מספר רב של דגלי קהילה."
-    two: "נושא זה סגור זמנית ל-%{count} שעות עקב מספר רב של דגלי קהילה."
-    many: "נושא זה סגור זמנית ל-%{count} שעות עקב מספר רב של דגלי קהילה."
-    other: "נושא זה סגור זמנית ל-%{count} שעות עקב מספר רב של דגלי קהילה."
   system_messages:
     private_topic_title: "נושא #%{id}"
     contents_hidden: "אנא בקרו בפוסט כדי לצפות בתוכן שלו."
diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml
index 4dd4ed9f9d..fe36c60ff3 100644
--- a/config/locales/server.it.yml
+++ b/config/locales/server.it.yml
@@ -1036,7 +1036,6 @@ it:
     num_tl3_flags_to_silence_new_user: "Se i messaggi di un nuovo utente ricevono questo numero di segnalazioni da num_tl3_users_to_silence_new_user differenti utenti a livello di esperienza 3, nascondi tutti i messaggi e previenine la futura pubblicazione. 0 per disabilitare. "
     num_tl3_users_to_silence_new_user: "Se i messaggi di un nuovo utente ricevono num_tl3_flags_to_silence_new_user segnalazioni da questo numero di utenti a livello di esperienza 3, nascondi tutti i messaggi e previenine la futura pubblicazione. 0 per disabilitare."
     notify_mods_when_user_silenced: "Se un utente è silenziato automaticamente, manda un messaggio ai moderatori."
-    flag_sockpuppets: "Se un nuovo utente risponde ad un argomento dallo stesso indirizzo IP dell'utente che ha aperto l'argomento stesso, segnala entrambi i messaggi come potenziale spam."
     traditional_markdown_linebreaks: "Usa l'accapo tradizionale in Markdown, cioè due spazi a fine riga per andare a capo."
     post_undo_action_window_mins: "Numero di minuti durante i quali gli utenti possono annullare le loro azioni recenti su un messaggio (segnalazioni, Mi piace, ecc.)."
     must_approve_users: "Lo staff deve approvare tutti i nuovi account utente prima che essi possano accedere al sito. ATTENZIONE: abilitare l'opzione per un sito live revocherà l'accesso per tutti gli utenti non-staff esistenti!"
@@ -1064,7 +1063,6 @@ it:
     topics_per_period_in_top_page: "Numero di argomenti popolari mostrati nella vista espansa 'Mostra Altro'"
     redirect_users_to_top_page: "Redirigi automaticamente i nuovi utenti e quelli assenti da tempo sulla pagina degli argomenti popolari."
     top_page_default_timeframe: "Lasso di tempo di default per la pagina principale."
-    show_email_on_profile: "Mostra l'email di un utente nel suo profilo (visibile solo a se stesso e allo staff)"
     prioritize_username_in_ux: "Nella pagina utente mostra prima il nome utente, la sua scheda e i suoi messaggi (quando l'opzione è disabilitata viene mostrato prima il nome)"
     email_token_valid_hours: "I messaggi di password dimenticata / attivazione account sono validi per (n) ore."
     enable_badges: "Attiva il sistema a distintivi"
@@ -1464,6 +1462,10 @@ it:
     errors:
       different_topics: "I messaggi appartenenti a diversi argomenti non possono essere fusi."
       different_users: "I messaggi appartenenti a diversi utenti non possono essere fusi."
+  move_posts:
+    new_topic_moderator_post:
+      one: "Un messaggio è stato spostato in un nuovo %{entity}: %{topic_link}"
+      other: "%{count} messaggi sono stati spostati in un nuovo %{entity}: %{topic_link}"
   topic_statuses:
     archived_enabled: "Questo argomento è stato archiviato. È congelato e non può più essere modificato."
     archived_disabled: "Questo argomento non è più archiviato. Non è più congelato e può essere modificato."
@@ -1651,9 +1653,6 @@ it:
     disagreed: "Grazie per averci informato. Stiamo provvedendo."
     deferred: "Grazie per averci informato. Stiamo provvedendo."
     deferred_and_deleted: "Grazie per averci informato. Abbiamo rimosso il messaggio."
-  temporarily_closed_due_to_flags:
-    one: "Questo argomento resterà temporaneamente chiuso per 1 ora per via di un elevato numero di segnalazioni da parte della comunità. "
-    other: "Questo argomento resterà temporaneamente chiuso per %{count}ore per via di un elevato numero di segnalazioni da parte della comunità. "
   system_messages:
     private_topic_title: "Argomento #%{id}"
     contents_hidden: "Visita il messaggio per vederne i contenuti."
@@ -2017,6 +2016,7 @@ it:
     Per annullare l'iscrizione a queste email, [clicca qui](%{unsubscribe_url}).
   subject_re: "R:"
   subject_pm: "[MP]"
+  email_from: "%{user_name} via %{site_name}"
   user_notifications:
     previous_discussion: "Risposte Precedenti"
     reached_limit:
diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml
index 47e1ba729a..c3014ad722 100644
--- a/config/locales/server.ko.yml
+++ b/config/locales/server.ko.yml
@@ -877,7 +877,6 @@ ko:
     tl2_additional_likes_per_day_multiplier: "tl2 (회원)의 일별 좋아요 제한을 올릴 배수"
     tl3_additional_likes_per_day_multiplier: "tl3 (정회원)의 일별 좋아요 제한을 올릴 배수"
     tl4_additional_likes_per_day_multiplier: "tl4 (리더)의 일별 좋아요 제한을 올릴 배수"
-    flag_sockpuppets: "어떤 신규 사용자(예:24이내 가입자)가 글타래를 생성하고 같은 IP주소의 또 다른 신규 사용자가 댓글을 쓰면 자동 스팸 신고"
     traditional_markdown_linebreaks: "Markdown에서 전통적인 linebreak를 사용, linebreak시 두개의 trailing space를 사용하는 것."
     post_undo_action_window_mins: "사용자가 어떤 글에 대해서 수행한 작업(신고 등)을 취소하는 것이 허용되는 시간(초)"
     must_approve_users: "스태프는 반드시 사이트 엑세스권한을 허용하기 전에 모든 신규가입계정을 승인해야 합니다. 경고: 이것을 활성화하면 기존 스태프 아닌 회원들의 엑세스권한이 회수됩니다."
@@ -903,7 +902,6 @@ ko:
     topics_per_period_in_top_page: "인기 글타래에서 '더 보기'를 요청할 시 보여질 글타래 수"
     redirect_users_to_top_page: "신규 사용자와 오랜만에 방문한 사용자를 인기글 페이지로 리다이렉트."
     top_page_default_timeframe: "탑 뷰 페이지를 위한 타임프레임 기본값"
-    show_email_on_profile: "사용자 프로필에서 자신의 이메일 주소 보기(본인과 관리자만 볼 수 있음)"
     prioritize_username_in_ux: "아이디를 사용자 페이지, 사용자 카드, 포스트에 가장 먼저 표시(해제 되면 이름이 가장 먼저 표시됨)"
     email_token_valid_hours: "비밀번호 찾기, 계정 활성화에 사용되는 토큰의 유효 기간(시간)"
     enable_badges: "배지 기능 사용"
diff --git a/config/locales/server.nb_NO.yml b/config/locales/server.nb_NO.yml
index 93bf2c25e4..8f0f4e49b7 100644
--- a/config/locales/server.nb_NO.yml
+++ b/config/locales/server.nb_NO.yml
@@ -1030,7 +1030,6 @@ nb_NO:
     allow_moderators_to_create_categories: "Tillat moderatorer å opprette nye kategorier"
     send_welcome_message: "Send alle nye brukere en velkomstmelding med en rask startveileder."
     topics_per_period_in_top_summary: "Antall tråder som vises i standard oppsummering av mest populære tråder."
-    show_email_on_profile: "Vis en brukers e-postadresse vedkommendes profil (kun synlig for brukeren selv og forumstaben)"
     email_token_valid_hours: "Glemt passord / aktiver konto tokens er gyldig for (n) timer."
     enable_badges: "Aktiver badge system"
     log_out_strict: "Ved utlogging, logg ut av ALLE enheter som er pålogget"
diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml
index bae8bddda9..b40448111f 100644
--- a/config/locales/server.nl.yml
+++ b/config/locales/server.nl.yml
@@ -807,7 +807,6 @@ nl:
     tl2_additional_likes_per_day_multiplier: "Verhoog de limiet van likes per dag voor tl2 (lid) door te vermenigvuldigen met dit getal"
     tl3_additional_likes_per_day_multiplier: "Verhoog de limiet van likes per dag voor tl3 (vaste bezoeker) door te vermenigvuldigen met dit getal"
     tl4_additional_likes_per_day_multiplier: "Verhoog de limiet van likes per dag voor tl4 (leider) door te vermenigvuldigen met dit getal"
-    flag_sockpuppets: "Als een nieuwe gebruiker antwoord op een topic vanaf hetzelfde ip-adres als de nieuwe gebruiker die het topic opende, markeer dan beide berichten als potentiële spam."
     traditional_markdown_linebreaks: "Gebruik traditionele regeleinden in Markdown, welke 2 spaties aan het einde van een regel nodig heeft voor een regeleinde."
     post_undo_action_window_mins: "Het aantal minuten waarin gebruikers hun recente acties op een bericht nog terug kunnen draaien (liken, markeren, etc)."
     must_approve_users: "Stafleden moeten alle nieuwe gebruikersaccounts goedkeuren voordat ze de site mogen bezoeken. OPGELET: als dit wordt aangezet voor een actieve site wordt alle toegang voor bestaande niet stafleden ingetrokken."
@@ -829,7 +828,6 @@ nl:
     topics_per_period_in_top_page: "Aantal topics in het uitgeklapte ´Meer...´ top-topics overzicht"
     redirect_users_to_top_page: "Stuur nieuwe en lang-niet-geziene gebruikers door naar de top-pagina"
     top_page_default_timeframe: "Standaard tijdspanne voor de top overzicht pagina."
-    show_email_on_profile: "Laat e-mail van gebruikers zien in hun profiel (alleen zichtbaar voor henzelf en staf)"
     email_token_valid_hours: "Wachtwoord vergeten / activeer account tokens zijn (n) uur geldig."
     enable_badges: "Activeer het badgesysteem"
     allow_index_in_robots_txt: "Specificeer in robots.txt dat de site geïndexeerd mag worden door zoekmachines."
diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml
index 7f1517fa4e..ad43d2f953 100644
--- a/config/locales/server.pl_PL.yml
+++ b/config/locales/server.pl_PL.yml
@@ -880,7 +880,6 @@ pl_PL:
     tl2_additional_likes_per_day_multiplier: "Zwiększ limit lajków na dzień dla tl2 (członek), mnożąc przez tę liczbę"
     tl3_additional_likes_per_day_multiplier: "Zwiększ limit lajków na dzień dla tl3 (użytkownik stały), mnożąc przez tę liczbę"
     tl4_additional_likes_per_day_multiplier: "Zwiększ limit lajków na dzień dla tl4 (lider), mnożąc przez tę liczbę"
-    flag_sockpuppets: "Jeśli nowy użytkownik odpowiada na dany temat z tego samego adresu IP co nowy użytkownik, który założył temat, oznacz ich posty jako potencjalny spam."
     traditional_markdown_linebreaks: "Używaj tradycyjnych znaków końca linii w Markdown, to znaczy dwóch spacji na końcu linii."
     post_undo_action_window_mins: "Przez tyle minut użytkownicy mogą cofnąć swoje ostatnie działania przy danym poście (lajki, flagowanie, itd.)."
     must_approve_users: "Zespół musi zaakceptować wszystkie nowe konta zanim uzyskają dostęp do serwisu. UWAGA: włączenie tego dla już udostępnionej strony sprawi, że zostanie odebrany dostęp wszystkim istniejącym użytkownikom spoza zespołu."
@@ -906,7 +905,6 @@ pl_PL:
     topics_per_period_in_top_page: "Liczba tematów wyświetlanych w widoku 'Pokaż więcej'  na ekranie popularnych wątków."
     redirect_users_to_top_page: "Automatycznie kieruj nowych i długo nieobecnych użytkowników na stronę główną."
     top_page_default_timeframe: "Domyślne ramy czasowe dla strony widoku z góry."
-    show_email_on_profile: "Pokazuj email użytkownika w jego profilu (widoczny jedynie dla użytkownika i personelu)."
     prioritize_username_in_ux: "Pokaż nazwę użytkownika jako pierwszą na stronie użytkownika, karcie użytkownika i w postach (kiedy wyłączone imię jest pokazane jako pierwsze)"
     email_token_valid_hours: "Tokeny resetujące hasło / aktywujące konto są ważne przez (n) godzin."
     enable_badges: "Włącz system odznak"
diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml
index 1e457402cb..3b0f136236 100644
--- a/config/locales/server.pt.yml
+++ b/config/locales/server.pt.yml
@@ -34,14 +34,27 @@ pt:
   disable_remote_images_download_reason: "A transferência remota de imagens foi desativada porque não existe espaço disponível no disco."
   anonymous: "Anónimo"
   remove_posts_deleted_by_author: "Eliminado pelo autor"
+  on_another_topic: "Noutro tópico"
   themes:
     bad_color_scheme: "Não é possível atualizar o tema, esquema de cor inválido"
     other_error: "Ocorreu algo de errado ao atualizar o tema"
     error_importing: "Erro ao clonar o repositório de GIT, acesso foi negado ou o repositório não foi encontrado"
+    errors:
+      component_no_user_selectable: "Components de um tema não podem ser seleccionados por um utilizador"
+      component_no_default: "Components de um tema não podem ter o tema predefinido"
+      component_no_color_scheme: "Componentes de um tema não podem ter uma palete de cores"
     settings_errors:
       invalid_yaml: "O YAML fornecido é inválido"
       data_type_not_a_number: "Tipo de configuração `%{name}` não é suportado. Tipos suportados são `integer`, `bool`, `lista` e `enum`."
       name_too_long: "Existe uma configuração com um nome demasiado longo. O tamanho máximo é 255"
+      default_value_missing: "A configuração `%{name}` não tem um valor predefinido"
+      default_not_match_type: "O tipo do valor predefinido para a configuração `%{name}` não é igual ao esperado pela configuração."
+      default_out_range: "O valor predefinido da configuração  `%{name}` não se encontra nos valores possiveis."
+      enum_value_not_valid: "O valor selecionado não é um dos enumerados."
+      number_value_not_valid: "O valor novo não está no intervalo permitido."
+      number_value_not_valid_min_max: "Deve estar entre %{min} e %{max}."
+      number_value_not_valid_min: "Deve ser maior ou igual a %{min}."
+      number_value_not_valid_max: "Deve ser menor ou igual a %{max}."
   emails:
     incoming:
       default_subject: "Este tópico precisa de um título"
@@ -776,7 +789,6 @@ pt:
     tl2_additional_likes_per_day_multiplier: "Aumentar limite de gostos por dia para nc2 (membro) ao multiplicar por este número"
     tl3_additional_likes_per_day_multiplier: "Aumentar limite de gostos por dia para nc3 (habitual) ao multiplicar por este número"
     tl4_additional_likes_per_day_multiplier: "Aumentar limite de gostos por dia para nc4 (líder) ao multiplicar por este número"
-    flag_sockpuppets: "Se um novo utilizador responde a um tópico a partir do mesmo endereço IP do novo utilizador que iniciou o tópico, sinalizar ambas as mensagens como potencial spam."
     traditional_markdown_linebreaks: "Utilize tradicionais quebras de linha no Markdown, que requer dois espaços no final para uma quebra de linha."
     post_undo_action_window_mins: "Número de minutos durante o qual os utilizadores têm permissão para desfazer ações numa mensagem (gostos, sinalizações, etc)."
     must_approve_users: "O pessoal deve aprovar todas as novas contas de utilizador antes destas terem permissão para aceder ao sítio. AVISO: ativar isto para um sítio ativo irá revogar o acesso aos utilizadores existentes que não fazem parte do pessoal!"
@@ -800,7 +812,6 @@ pt:
     topics_per_period_in_top_page: "Número de tópicos principais mostrados em  'Mostrar Mais' tópicos principais expandido."
     redirect_users_to_top_page: "Redirecionar automaticamente os utilizadores novos e ausentes por períodos longos para o topo da página."
     top_page_default_timeframe: "Intervalo de tempo por defeito para a página de visualizações do topo."
-    show_email_on_profile: "Mostrar o email do utilizador no seu perfil (apenas visível para si próprio e para o pessoal)"
     prioritize_username_in_ux: "Mostrar o nome de utilizador primeiro na página de utilizador, cartão de utilizador e publicações (quando o nome desactivado é mostrado primeiro)"
     email_token_valid_hours: "Os símbolos para palavra-passe esquecida /conta ativada são válidos por (n) horas."
     enable_badges: "Ativar o sistema de distintivos"
diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml
index 9462cfe7a8..2abf71c05c 100644
--- a/config/locales/server.pt_BR.yml
+++ b/config/locales/server.pt_BR.yml
@@ -1033,7 +1033,6 @@ pt_BR:
     num_tl3_flags_to_silence_new_user: "Se as postagens de um novo usuário obtiverem muitos sinalizadores de num_tl3_users_to_silence_new_user diferentes usuários do nível de confiança 3, oculte todos os posts e evite postagens futuras. 0 para desabilitar."
     num_tl3_users_to_silence_new_user: "Se as postagens de um novo usuário obtiverem sinalizadores num_tl3_flags_to_silence_new_user a partir dos vários usuários diferentes do nível de confiança 3, oculte todas as postagens e evite postagens futuras. 0 para desativar."
     notify_mods_when_user_silenced: "Se um usuário for silenciado automaticamente, envie uma mensagem para todos os moderadores."
-    flag_sockpuppets: "Se um novo usuário responder um tópico usando o mesmo endereço de IP do novo usário que começou o tópico, sinalize as duas publicações como um potencial spam."
     traditional_markdown_linebreaks: "Use quebras de linhas tradicionais em Markdown, as quais requerem dois espaços à direita para uma quebra de linha."
     enable_markdown_typographer: "Use as regras de tipografia para melhorar a legibilidade do texto: substitua as aspas normais por \"aspas curvas\", (c) (tm) pelos símbolos, - pelo emdash -, etc."
     markdown_linkify_tlds: "Lista de domínios de nível superior que são tratados automaticamente como links"
@@ -1067,7 +1066,6 @@ pt_BR:
     topics_per_period_in_top_page: "Número de melhores tópicos mostrados no 'Exibir Mais' melhores tópicos quando expandido."
     redirect_users_to_top_page: "Automaticamente redirecionar usuários novos e há muito ausentes para a página melhores."
     top_page_default_timeframe: "Intervalo de tempo padrão para a página de melhores publicações. "
-    show_email_on_profile: "Mostrar o email de um usuário em seus perfis (apenas visível a eles mesmos e staff)"
     prioritize_username_in_ux: "Mostrar primeiro o nome de usuário na página do usuário, cartão do usuário e publicações (quando desabilitado, o nome será mostrado primeiro) "
     enable_rich_text_paste: "Ative a conversão automática de HTML para Markdown ao colar texto no compositor. (Experimental)"
     email_token_valid_hours: "Tokens de Esqueceu senha / ativar conta são válidas por (n) horas."
@@ -1764,9 +1762,6 @@ pt_BR:
     disagreed: "Obrigado por nos avisar. Nós estamos olhando nele."
     deferred: "Obrigado por nos avisar. Nós estamos olhando nele."
     deferred_and_deleted: "Obrigado por nos avisar. Nós removemos o post."
-  temporarily_closed_due_to_flags:
-    one: "Este tópico está temporariamente fechado por 1 hora devido a um grande número de sinalizadores da comunidade."
-    other: "Este tópico está temporariamente fechado para %{count} horas devido a um grande número de sinalizações da comunidade."
   system_messages:
     private_topic_title: "Tópico #%{id}"
     contents_hidden: "Por favor, visite o post para ver o seu conteúdo."
diff --git a/config/locales/server.ro.yml b/config/locales/server.ro.yml
index 19366494e9..b84b0b7ef1 100644
--- a/config/locales/server.ro.yml
+++ b/config/locales/server.ro.yml
@@ -771,7 +771,6 @@ ro:
     tl2_additional_likes_per_day_multiplier: "Crește numărul maxim de aprecieri pe zi pentru (membrii cu) nivelul de încredere 2, multiplicând cu această valoare"
     tl3_additional_likes_per_day_multiplier: "Crește numărul maxim de aprecieri pe zi pentru (membrii cu) nivelul de încredere 3, multiplicând cu această valoare"
     tl4_additional_likes_per_day_multiplier: "Crește numărul maxim de aprecieri pe zi pentru (membrii cu) nivelul de încredere 4, multiplicând cu această valoare"
-    flag_sockpuppets: "Dacă un utilizator nou răspunde unui subiect de la același IP ca utilizatorul ce a pornit subiectul, marchează ambele postări ca potențial spam."
     traditional_markdown_linebreaks: "Folosește întreruperi de rând tradiționale în Markdown, ceea ce necesită două spații pentru un capăt de rând. "
     post_undo_action_window_mins: "Numărul de minute în care utilizatorii pot anula acțiunile recente asupra unei postări (aprecieri, marcări cu marcaje de avertizare, etc)."
     must_approve_users: "Membrii echipei trebuie să aprobe toate conturile noilor utilizatori înainte ca aceștia să poată accesa site-ul. ATENȚIE: activarea acestei opțiuni pentru un site în producție va revoca accesul tuturor utilizatorilor care nu sunt membri ai echipei!"
@@ -795,7 +794,6 @@ ro:
     topics_per_period_in_top_page: "Numărul celor mai bune subiecte afișat când se selectează 'Afișează mai multe' cele mai bune subiecte."
     redirect_users_to_top_page: "Redirecționează automat noii utilizatorii noi și cei absenți de multă vreme, către vârful paginii."
     top_page_default_timeframe: "Perioada implicită pentru pagina cea mai vizualizată"
-    show_email_on_profile: "Afișează adresa de email a unui utilizator în pagina sa de utilizator (vizibilă numai pentru el și pentru membrii echipei)"
     prioritize_username_in_ux: "Afișează întâi nume utilizator pe pagina utilizator, pe cardul utilizator și în postări (dacă e dezactivat, se afișează întâi numele)"
     email_token_valid_hours: "Tokenul uitat parolă / activează cont sunt valabili pentru (n) ore."
     enable_badges: "Activează sistemul de ecusoane"
diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml
index 1da01e3783..ee848b1bde 100644
--- a/config/locales/server.ru.yml
+++ b/config/locales/server.ru.yml
@@ -34,14 +34,22 @@ ru:
   disable_remote_images_download_reason: "Загрузка картинок была отключена из-за недостатка места на диске."
   anonymous: "Гость"
   remove_posts_deleted_by_author: "Удалено автором"
+  on_another_topic: "По другой теме"
   themes:
     bad_color_scheme: "При обновлении темы оформления обнаружена неверная цветовая схема."
     other_error: "При обновлении темы оформления что-то пошло не так."
     error_importing: "Ошибка клонирования git репозитория, доступ запрещен или репозиторий не найден"
+    errors:
+      component_no_user_selectable: "Компоненты темы не могут быть выбраны пользователем"
+      component_no_default: "Компоненты темы не могут быть темой по умолчанию"
     settings_errors:
+      name_too_long: "Есть настройка со слишком длинным именем. Максимальная длина 255"
+      enum_value_not_valid: "Выбранное значение не является одним из вариантов перечисления."
+      number_value_not_valid: "Новое значение находится за пределами допустимого диапазона."
       number_value_not_valid_min_max: "Значение должно быть от %{min} до %{max}."
       number_value_not_valid_min: "Значение должно быть равным или больше чем %{min}"
       number_value_not_valid_max: "Значение должно быть равным или меньше чем %{max}"
+      string_value_not_valid: "Длина нового значения находится за пределами допустимого диапазона."
       string_value_not_valid_min_max: "Допусткается от %{min} до %{max} символов."
   emails:
     incoming:
@@ -56,6 +64,7 @@ ru:
         no_message_id_error: "Происходит, когда письмо не имеет заголовка 'Message-Id'."
         auto_generated_email_error: "Происходит когда заголовок \"приоритет\" установлен в: 'bulk', 'list', 'auto_reply', 'junk' или когда другой заголовок содержит флаги 'auto-submitted', 'auto-replied' или 'auto-generated'."
         no_body_detected_error: "Случается, когда мы не смогли извлечь текст письма и не было никаких вложений."
+        no_sender_detected_error: "Происходит, когда мы не можем найти действительный Email  адрес в заголовке From."
         inactive_user_error: "Происходит, когда отправитель неактивен."
         silenced_user_error: "Происходит, когда отправитель заблокирован."
         bad_destination_address: "Происходит, когда ни один из адресатов, указанных в полях To/Cc/Bcc не совпадает со входящим адресом электронной почты."
@@ -817,7 +826,6 @@ ru:
     tl2_additional_likes_per_day_multiplier: "Увеличить лимит лайков в день для tl2 (member) до"
     tl3_additional_likes_per_day_multiplier: "Увеличить лимит лайков в день для tl3 (member) до"
     tl4_additional_likes_per_day_multiplier: "Увеличить лимит лайков в день для tl4 (leader) до"
-    flag_sockpuppets: "Если новый пользователь отвечает на тему с того же IP адреса как и новый пользователь, кто начал тему, отметить оба их сообщения как возможный спам."
     traditional_markdown_linebreaks: "Использовать стандартный способ переноса строки в Markdown: строка должна заканчиваться двумя пробелами, чтобы перенос строки после нее сработал."
     post_undo_action_window_mins: "Количество минут, в течение которых пользователь может отменить действия, связанные с сообщениями: 'Мне нравится', 'Жалоба' и др."
     must_approve_users: "Персонал должен подтвердить регистрации новых пользователей перед тем, как им будет разрешен доступ к сайту.\nВНИМАНИЕ: включая данную функцию на существуещем сайте будет закрыт доступ к сайту для всех пользователей, кроме персонала."
@@ -837,7 +845,6 @@ ru:
     topics_per_period_in_top_summary: "Количество рекомендованных тем, отображаемых внизу текущей темы."
     topics_per_period_in_top_page: "Количество рекомендованных тем, отображаемых при нажатии 'Показать больше' в низу текущей темы."
     redirect_users_to_top_page: "Автоматически перенаправлять новых и давно отсутствующих пользователей к началу страницы."
-    show_email_on_profile: "Показать Email пользователя в профиле (видно только себе и персоналу)"
     email_token_valid_hours: "Ссылка на восстановление пароля / активацию аккаунта будет действовать в течении (n) часов."
     enable_badges: "Включить систему наград"
     allow_index_in_robots_txt: "Разрешить поисковикам индексировать сайт в robots.txt"
@@ -960,6 +967,7 @@ ru:
     num_flaggers_to_close_topic: "Минимальное колличество уникальных человек, пожаловавшихся на топик, которое требуется для автоматической временной блокировки топика"
     num_flags_to_close_topic: "Минимальное колличество жалоб которое требуется для автоматической временной блокировки топика"
     auto_respond_to_flag_actions: "Включить автоматический ответ при использовании флагов на сайте."
+    min_first_post_typing_time: "Минимальное количество времени в миллисекундах, которое пользователь должен соблюсти при наборе поста во время первой записи. Если порог не соблюден, пост автоматически попадет в очередь утверждения. Установите 0 для отключения (не рекомендуется)"
     min_flags_staff_visibility: "Минимальное количество флагов на пост, прежде чем персонал может видеть его в разделе администратора"
     reply_by_email_enabled: "Разрешить отвечать в темах с помощью электронным писем."
     reply_by_email_address: "Шаблон для ответа по email в формате: %%{reply_key}@reply.example.com или replies+%%{reply_key}@example.com"
diff --git a/config/locales/server.sk.yml b/config/locales/server.sk.yml
index de0743f32f..26c121b3a0 100644
--- a/config/locales/server.sk.yml
+++ b/config/locales/server.sk.yml
@@ -775,7 +775,6 @@ sk:
     tl2_additional_likes_per_day_multiplier: "Zvýšiť počet páči sa mi na deň pre úroveň dôvery 2 (člen) vynásobením týmto číslom"
     tl3_additional_likes_per_day_multiplier: "Zvýšiť počet páči sa mi na deň pre úroveň dôvery 3 (bežný) vynásobením týmto číslom"
     tl4_additional_likes_per_day_multiplier: "Zvýšiť počet páči sa mi na deň pre úroveň dôvery 4 (vedúci) vynásobením týmto číslom"
-    flag_sockpuppets: "Ak nový používateľ odpovedá na tému z rovnakej IP adresy, ako nový používateľ, ktorý danú tému vytvoril, označ oba ich príspevky ako potencionálny spam."
     traditional_markdown_linebreaks: "V Markdown použiť tradičné oddeľovače riadkov, čo vyžaduje dve koncové medzery ako oddeľovač riadku."
     post_undo_action_window_mins: "Počet minút počas ktorých môžu používatelia zrušiť poslednú akciu na príspevku (\"Páči sa\", označenie, atď..)."
     must_approve_users: "Obsluha musí povoliť účty všetkým novým používateľom skôr než im bude povolený prístup na stránku. UPOZORNENIE: zapnutie na živej stránke spôsobí zrušenie prístupu pre existujúcich používateľov, okrem obsluhy!"
@@ -797,7 +796,6 @@ sk:
     topics_per_period_in_top_page: "Zobrazovaný počet najlepších tém vzozname po rozbalení 'Ukáž viac' najlepších tém."
     redirect_users_to_top_page: "Automaticky presmeruj nových a dlho neprihlásených používateľov na hlavnú stránku. "
     top_page_default_timeframe: "Východzí interval pre presmerovanie na hlavnú stránku."
-    show_email_on_profile: "Zobraziť používateľov email na ich profile (viditeľné len nimi samotnými a obsluhou)"
     email_token_valid_hours: "Platnosť tokenov pre Zabudnuté heslo a aktiváciu účtu v (n) hodinách."
     enable_badges: "Povoliť systém odznakov"
     allow_index_in_robots_txt: "V súbore robots.txt nastaviť, že tieto stránky je povolené indexovať vyhľadávačmi."
diff --git a/config/locales/server.sl.yml b/config/locales/server.sl.yml
index 619cc402e0..d0c2011fea 100644
--- a/config/locales/server.sl.yml
+++ b/config/locales/server.sl.yml
@@ -77,6 +77,15 @@ sl:
   activerecord:
     errors:
       <<: *errors
+  user_activity:
+    no_default:
+      self: "Nimate nobene aktivnosti."
+    no_bookmarks:
+      self: "Nimate zaznamkov; dodajte zaznamek na objavo, da jih lahko hitreje najdete."
+    no_replies:
+      self: "Nisi odgovoril na nobeno objavo."
+    no_drafts:
+      self: "Nimate nobenih osnutkov; začnite pisati odgovor v katerokoli temo in se bo sam shranil kot nov osnutek."
   site_settings:
     avatar_sizes: "Seznam avtomatsko generiranih velikosti avatarjev."
   user_notifications:
diff --git a/config/locales/server.sq.yml b/config/locales/server.sq.yml
index 7f71263980..9ad830dfbb 100644
--- a/config/locales/server.sq.yml
+++ b/config/locales/server.sq.yml
@@ -532,7 +532,6 @@ sq:
     tl2_additional_likes_per_day_multiplier: "Increase limit of likes per day for tl2 (member) by multiplying with this number"
     tl3_additional_likes_per_day_multiplier: "Increase limit of likes per day for tl3 (regular) by multiplying with this number"
     tl4_additional_likes_per_day_multiplier: "Increase limit of likes per day for tl4 (leader) by multiplying with this number"
-    flag_sockpuppets: "If a new user replies to a topic from the same IP address as the new user who started the topic, flag both of their posts as potential spam."
     traditional_markdown_linebreaks: "Use traditional linebreaks in Markdown, which require two trailing spaces for a linebreak."
     post_undo_action_window_mins: "Number of minutes users are allowed to undo recent actions on a post (like, flag, etc)."
     must_approve_users: "Staff must approve all new user accounts before they are allowed to access the site. WARNING: enabling this for a live site will revoke access for existing non-staff users!"
@@ -551,7 +550,6 @@ sq:
     topics_per_period_in_top_summary: "Number of top topics shown in the default top topics summary."
     topics_per_period_in_top_page: "Number of top topics shown on the expanded 'Show More' top topics."
     redirect_users_to_top_page: "Automatically redirect new and long absent users to the top page."
-    show_email_on_profile: "Show a user's email on their profile (only visible to themselves and staff)"
     email_token_valid_hours: "Forgot password / activate account tokens are valid for (n) hours."
     enable_badges: "Aktivizo sistemin e targetave"
     allow_index_in_robots_txt: "Specify in robots.txt that this site is allowed to be indexed by web search engines."
diff --git a/config/locales/server.sr.yml b/config/locales/server.sr.yml
index d8279bb701..0142a864c0 100644
--- a/config/locales/server.sr.yml
+++ b/config/locales/server.sr.yml
@@ -119,7 +119,6 @@ sr:
     max_topic_title_length: "Maksimalna dozvoljena dužina naslova teme u znakovima"
     min_search_term_length: "Minimalna dozvoljena dužina termina za pretragu u znakovima"
     max_replies_in_first_day: "Maksimalan broj odgovora koje korisnik može da kreira u prvih 24 sata nakon kreiranja svoje prve poruke."
-    flag_sockpuppets: "Ako novi korisnik odgovara na temu sa iste IP adrese kao i novi korisnik koji je pokrenuo temu, označi obe njihove poruke kao potencijalni spam."
     pending_users_reminder_delay: "Obavesti moderatore ako novi korisnik čeka na odobrenje duže nego ovoliko časova. Podesiti na -1 da bi se onemogućile notifikacije."
     maximum_session_age: "Korisnik će ostati ulogovan n časova od prethodnog logovanja"
     max_image_megapixels: "Maksimalan dozvoljeni broj megapiksela za slike."
diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml
index 0d06647d6b..9931dc1722 100644
--- a/config/locales/server.sv.yml
+++ b/config/locales/server.sv.yml
@@ -714,7 +714,6 @@ sv:
     tl2_additional_likes_per_day_multiplier: "Höj gränsen för antal gillningar per dag för användare med förtroendenivå 2 (medlem) genom att multiplicera med det här numret "
     tl3_additional_likes_per_day_multiplier: "Höj gränsen för antal gillningar per dag för användare med förtroendenivå 3 (regelbundna) genom att multiplicera med det här numret"
     tl4_additional_likes_per_day_multiplier: "Höj gränsen för antal gillningar per dag för användare med förtroendenivå 4 (ledare) genom att multiplicera med det här numret"
-    flag_sockpuppets: "Flagga båda användarnas inlägg som potentiell skräppost om en ny användare svarar på ett ämne från samma IP-adress som den andra nya användaren som skapade ämnet."
     traditional_markdown_linebreaks: "Använd vanliga radmatningar i Markdown, vilka kräver 2 avslutande mellanslag för en radmatning."
     post_undo_action_window_mins: "Antal minuter som en användare tillåts att upphäva handlingar på ett inlägg som gjorts nyligen (gillning, flaggning osv)."
     must_approve_users: "Personal måste godkänna alla nya användarkonton innan de tillåts använda webbplatsen. VARNING: om det tillåts när webbplatsen är live så kommer det att upphäva tillgång för alla existerande användare som inte är personal!"
@@ -737,7 +736,6 @@ sv:
     topics_per_period_in_top_page: "Antal toppämnen som visas i den utvidgade 'Visa mer'-toppämnen. "
     redirect_users_to_top_page: "Omdirigera automatiskt nya och långtidsfrånvarande användare till början av sidan. "
     top_page_default_timeframe: "Standard tidsram för mest sedda-sidan"
-    show_email_on_profile: "Visa en användares e-postadress på deras profil (endast synlig för de själva och för personal)"
     prioritize_username_in_ux: "Använd användarnamn först på användarsidan, användarkortet och inlägg (när inaktiverad så visas namnet först)"
     email_token_valid_hours: "Glömt lösenord / aktivera konto länkar är giltiga i (n) timmar."
     enable_badges: "Aktivera utmärkelsesystemet"
diff --git a/config/locales/server.sw.yml b/config/locales/server.sw.yml
index 29d2c3e73d..0a1f6b103b 100644
--- a/config/locales/server.sw.yml
+++ b/config/locales/server.sw.yml
@@ -757,7 +757,6 @@ sw:
     topics_per_period_in_top_page: "Idadi ya mada za juu zitakazo onyeshwa kwenye upande wa 'Onyesha Zaidi' mada za juu."
     redirect_users_to_top_page: "Otomatikali watumiaji wapya na wale ambao hawapo watapelekwa juu ya ukurasa."
     top_page_default_timeframe: "Chaguo-msingi la mda wa fremu kwa ajili ya kurasa wa juu wa kuangalia."
-    show_email_on_profile: "Onyesha barua pepe za mtumiaji kwenye umbo lao (wataona wao na wasaidizi)"
     email_token_valid_hours: "Nimesahau nywila / tokens za kuanzisha akaunti zina kibali cha masaa (n)"
     enable_badges: "Ruhusu mfumo wa beji"
     enable_whispers: "Ruhusu mawasiliano binafsi kati ya wasaidizi ndani ya mada."
diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml
index 1d7377a352..82322bdbee 100644
--- a/config/locales/server.tr_TR.yml
+++ b/config/locales/server.tr_TR.yml
@@ -660,7 +660,6 @@ tr_TR:
     tl2_additional_likes_per_day_multiplier: "Güvenlik seviyesi 2 (Üye) olanlar için günlük beğeni limitini bu rakamla çarparak artır"
     tl3_additional_likes_per_day_multiplier: "Güven seviyesi 3 (Müdavim) olanlar için günlük beğeni limitini bu rakamla çarparak artır"
     tl4_additional_likes_per_day_multiplier: "Güvenlik seviyesi 4 (Lider) olanlar için günlük beğeni limitini bu rakamla çarparak artır"
-    flag_sockpuppets: "Eğer, yeni kullanıcı konuya, konuyu başlatan yeni kullanıcı ile aynı IP adresinden cevap yazarsa, her iki gönderiyi de potansiyel istenmeyen olarak bildir. "
     traditional_markdown_linebreaks: "Markdown'da, satır sonundan önce yazının sağında iki tane boşluk gerektiren, geleneksel satır sonu metodunu kullan."
     post_undo_action_window_mins: "Bir gönderide yapılan yeni eylemlerin (beğenme, bildirme vb) geri alınabileceği zaman, dakika olarak"
     must_approve_users: "Siteye erişimlerine izin verilmeden önce tüm yeni kullanıcı hesaplarının görevliler tarafından onaylanması gerekir. UYARI: yayındaki bir site için bunu etkinleştirmek görevli olmayan hesapların erişimini iptal edecek."
@@ -683,7 +682,6 @@ tr_TR:
     topics_per_period_in_top_page: "'Daha Fazla Göster' ile genişletilen gözde konular bölümünde gösterilecek gözde konu sayısı. "
     redirect_users_to_top_page: "Yeni ve uzun süredir giriş yapmamış kullanıcıları otomatik olarak Gözde sayfasına yönlendir."
     top_page_default_timeframe: "Üst sayfa görünümü için öntanımlı zaman aralığı"
-    show_email_on_profile: "Kullanıcının e-posta adresini profilinde göster (sadece kendilerine ve site görevlilerine gözükür)"
     prioritize_username_in_ux: "Kullanıcı sayfası, kullanıcı kartı ve gönderilerde kullanıcı adını ilk olarak göster(devre dışı ise gerçek isim önce gözükür)"
     email_token_valid_hours: "Parolamı unuttum / hesap etkinleştirme jetonları (n) saat geçerlidir."
     enable_badges: "Rozet sistemini etkinleştir"
diff --git a/config/locales/server.ur.yml b/config/locales/server.ur.yml
index 2fe683d034..924a5798ac 100644
--- a/config/locales/server.ur.yml
+++ b/config/locales/server.ur.yml
@@ -923,7 +923,6 @@ ur:
     num_tl3_flags_to_silence_new_user: "اگر کسی نئے صارف کی پوسٹس کو num_tl3_users_to_silence_new_user مختلف ٹرسٹ لَیول 3 والے صارفین سے اتنے فلَیگز ملیں، تو اُن کی تمام پوسٹس کو چھپا اور مستقبل کی اشاعت کو روک دیں۔ غیر فعال کرنے کیلئے 0۔"
     num_tl3_users_to_silence_new_user: "اگر کسی نئے صارف کی پوسٹس کو اتنے مختلف ٹرسٹ لَیول 3 والے صارفین سے num_tl3_flags_to_silence_new_user فلَیگز ملیں، تو اُن کی تمام پوسٹس کو چھپا اور مستقبل کی اشاعت کو روک دیں۔ غیر فعال کرنے کیلئے 0۔"
     notify_mods_when_user_silenced: "اگر صارف خود کار طریقے سے خاموش کر دیا جائے، تو تمام ماڈریٹرزکو ایک پیغام بھیجیں۔"
-    flag_sockpuppets: "اگر ایک نیا صارف اُسی IP ایڈریس سے کسی ٹاپک پر جواب دیتا ہے جس IP ایڈریس سے ایک دوسرے نئے صارف نے وہی ٹاپک شروع کیا تھا، تو اُن دونوں کی پوسٹس کو ممکنہ سپَیم کے طور پر فلَیگ کریں۔"
     traditional_markdown_linebreaks: "مارکڈائون میں روایتی لائن وقفے کا استعمال کریں، جس میں ایک لائن وقفے کیلئے دو ٹریلنگ خالی جگہوں کی ضرورت ہوتی ہے۔"
     markdown_linkify_tlds: "سب سے اوپر کی سطح کے ڈَومینز کی فہرست جو خود بخود لِنکس کے طور پر دکھائے جاتے ہیں"
     post_undo_action_window_mins: "منٹوں کی تعداد جب تک صارفین کو ایک پوسٹ پر حالیہ کارروائیوں (لائیک، فلَیگ، وغیرہ) کو واپس کرلینے کی اجازت ہے۔"
@@ -953,7 +952,6 @@ ur:
     topics_per_period_in_top_page: "توسیع کردہ ٹاپ ٹاپکس 'مزید دکھائیں' میں دکھائے گئے ٹاپ ٹاپکس کی تعداد۔"
     redirect_users_to_top_page: "نئے اور طویل غیر حاضر صارفین کو خود کار طریقے سے ٹاپ صفحے پر ریڈائرَیکٹ کریں۔"
     top_page_default_timeframe: "ٹاپ وِیُو صفحے کیلئے ڈِیفالٹ ٹائم فریم۔"
-    show_email_on_profile: "صارف کا ای میل اُن کی پروفائل پر دکھائیں (صرف خود اُنہیں اور سٹاف کو نظر آتا ہے)"
     prioritize_username_in_ux: "صارف صفحے، صارف کارڈ اور پوسٹس پر پہلے صارف نام دکھائیں (جب غیر فعال ہو تو نام پہلے دکھایا جاتا ہے)"
     enable_rich_text_paste: "کمپَوزر میں ٹیکسٹ پَیسٹ کرتے وقت خود کار طریقہ سے HTML سے مارکڈائون میں تبادلہ فعال کریں۔ (تجرباتی)"
     email_token_valid_hours: "پاسورڈ بھولنے / اکاؤنٹ چالو کرنے کے ٹوکن (ن) گھنٹوں کیلئے درست ہیں۔"
@@ -1621,9 +1619,6 @@ ur:
     disagreed: "ہمیں بتانے کیلئے شکریہ۔ ہم اِس سے نمٹ رہے ہیں۔"
     deferred: "ہمیں بتانے کیلئے شکریہ۔ ہم اِس سے نمٹ رہے ہیں۔"
     deferred_and_deleted: "ہمیں بتانے کیلئے شکریہ۔ ہم نے پوسٹ ہٹا دی ہے۔"
-  temporarily_closed_due_to_flags:
-    one: "یہ ٹاپک کمیونٹی فلَیگز کی بڑی تعداد کی وجہ سے 1 گھنٹے کیلئے عارضی طور پر بند کردیا گیا ہے۔"
-    other: "یہ ٹاپک کمیونٹی فلَیگز کی بڑی تعداد کی وجہ سے %{count} گھنٹوں کیلئے عارضی طور پر بند کردیا گیا ہے۔"
   system_messages:
     private_topic_title: "ٹاپک #%{id}"
     contents_hidden: "اِس کے مواد کو دیکھنے کیلئے براہ کرم پوسٹ پر جائیں۔"
diff --git a/config/locales/server.vi.yml b/config/locales/server.vi.yml
index 37920f8ff6..8a3d5fd36e 100644
--- a/config/locales/server.vi.yml
+++ b/config/locales/server.vi.yml
@@ -606,7 +606,6 @@ vi:
     tl2_additional_likes_per_day_multiplier: "Tăng giới hạn thích mỗi ngày cho mức độ tin tưởng 2 (thành viên) bằng cách nhân với số này"
     tl3_additional_likes_per_day_multiplier: "Tăng giới hạn thích mỗi ngày cho mức độ tin tưởng 3 (bình thường) bằng cách nhân với số này"
     tl4_additional_likes_per_day_multiplier: "Tăng giới hạn thích mỗi ngày cho mức độ tin tưởng 4 (dẫn đầu) bằng cách nhân với số này"
-    flag_sockpuppets: "Nếu thành viên mới trả lời chủ đề có cùng địa chỉ IP với thành viên mới tạo chủ đề, đánh dấu các bài viết của họ là spam tiềm năng."
     traditional_markdown_linebreaks: "Sử dụng ngắt dòng truyền thống trong Markdown, đòi hỏi hai khoảng trống kế tiếp cho một ngắt dòng."
     post_undo_action_window_mins: "Số phút thành viên được phép làm lại các hành động gần đây với bài viết (like, đánh dấu...)."
     must_approve_users: "Quản trị viên phải duyệt tất cả các tài khoản thành viên mới trước khi họ có quyền truy cập website. LƯU Ý: bật tính năng này trên site đang hoạt động sẽ hủy bỏ quyền truy cập đối với các tài khoản thành viên hiện tại!"
@@ -628,7 +627,6 @@ vi:
     topics_per_period_in_top_page: "Số lượng chủ đề top hiển thị khi click 'Xem thêm'."
     redirect_users_to_top_page: "Tự động chuyển thành viên mới và vắng mặt lâu ngày lên trên cùng trang."
     top_page_default_timeframe: "Khung thời gian mặc định cho trang xem trên cùng."
-    show_email_on_profile: "Hiển thị email thành viên trên trang hồ hơ (chỉ cho họ và quản trị viên)"
     email_token_valid_hours: "Token quyên mật khẩu / kích hoạt tài khoản có giá trị trong (n) giờ."
     enable_badges: "Kích hoạt hệ thống huy hiệu"
     allow_index_in_robots_txt: "Chỉ rõ trong robots.txt trang web này cho phép tạo chỉ mục bởi web search engines."
diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml
index 360572ce9d..b03804fdf4 100644
--- a/config/locales/server.zh_CN.yml
+++ b/config/locales/server.zh_CN.yml
@@ -691,7 +691,7 @@ zh_CN:
       self: "你还没有活动。"
       others: "无活动。"
     no_bookmarks:
-      self: "你没有书签帖子; 书签可让你快速查阅特定帖子。"
+      self: "你没有收藏帖子；收藏可让你快速查阅特定帖子。"
       others: "没有收藏。"
     no_likes_given:
       self: "你还没有赞任何帖子。"
@@ -786,6 +786,7 @@ zh_CN:
         disagreed_flags: 否决的标记
         ignored_flags: 忽略的标记
         score: 评分
+      description: "按管理人员对标记的反馈比例排序的用户列表（反对到同意）。"
     moderators_activity:
       title: "版主活跃度"
       labels:
@@ -796,6 +797,7 @@ zh_CN:
         post_count: 创建的帖子
         pm_count: 创建的私信
         revision_count: 版本
+      description: 版主活动列表，包括已审核的标记，阅读时间，创建的主题，创建的帖子，创建的私信以及修订。
     flags_status:
       title: "标记状态"
       values:
@@ -809,34 +811,42 @@ zh_CN:
         poster: 发表人
         flagger: 标记人
         time_to_resolution: 解决时间
+      description: "标记状态列表，包括标记类型，作者，标记人和解决时间。"
     visits:
       title: "用户访问量"
       xaxis: "天"
       yaxis: "访问量"
+      description: "所有唯一身份用户访问次数。"
     signups:
       title: "注册"
       xaxis: "天"
       yaxis: "注册次数"
+      description: "此期间注册的新账户。"
     new_contributors:
       title: "新贡献者"
       xaxis: "天"
       yaxis: "新贡献者数"
+      description: "此期间首次发布帖子的用户数。"
     dau_by_mau:
       title: "DAU/MAU"
       xaxis: "天"
       yaxis: "DAU/MAU"
+      description: "在最后一天登录的成员数除以上个月登录的成员数——返回表示社区“粘性”的%。目标是>30％。"
     daily_engaged_users:
       title: "每日活跃用户"
       xaxis: "天"
       yaxis: "活跃的用户"
+      description: "在过去一天中赞过或发表过的用户数。"
     profile_views:
       title: "查看用户资料"
       xaxis: "天"
       yaxis: "已看的用户资料数量"
+      description: "用户个人信息页的新访问数。"
     topics:
       title: "新发表主题"
       xaxis: "天"
       yaxis: "新主题数"
+      description: "在此期间创建的新主题。"
     posts:
       title: "新发表帖子"
       xaxis: "天"
@@ -846,14 +856,17 @@ zh_CN:
       title: "新的赞"
       xaxis: "天"
       yaxis: "新的赞数"
+      description: "新的赞数。"
     flags:
       title: "标记"
       xaxis: "天"
       yaxis: "标记数"
+      description: "新标记数。"
     bookmarks:
       title: "收藏"
       xaxis: "天"
       yaxis: "新收藏数"
+      description: "新主题和帖子的收藏数。"
     users_by_trust_level:
       title: "各信任等级的用户数"
       xaxis: "用户等级"
@@ -1131,7 +1144,6 @@ zh_CN:
     num_tl3_flags_to_silence_new_user: "如果新用户被 num_tl3_users_to_silence_new_user 个信任等级3的用户标记垃圾信息，隐藏他们的所以帖子并禁止发音。设置为 0 禁用。"
     num_tl3_users_to_silence_new_user: "如果新用户被不同信任等级3的用户标记 num_tl3_flags_to_silence_new_use 为标记垃圾信息，隐藏他们的所以帖子并禁止发音。设置为 0 禁用。"
     notify_mods_when_user_silenced: "如果用户被自动禁言了，发私信给所有版主。"
-    flag_sockpuppets: "如果一个新用户开始了一个主题，并且同时另一个新用户以同一个 IP 在该主题回复，他们所有的帖子都将被自动标记为垃圾。"
     traditional_markdown_linebreaks: "在 Markdown 中使用传统换行符，即用两个尾随空格来换行"
     enable_markdown_typographer: "使用排版规则来提高文本的可读性：用引号替换直引号'，用符号代替（c）（tm），用emdash等等"
     enable_markdown_linkify: "自动将看起来像链接的文本视为链接：www.example.com和https://example.com将自动链接"
@@ -1176,7 +1188,6 @@ zh_CN:
     topics_per_period_in_top_page: "在展开“显示更多”推荐主题列表显示的主题数量。"
     redirect_users_to_top_page: "自动重定向至新用户或者长时间未登入的用户至热门页面。"
     top_page_default_timeframe: "顶部查看页面的默认时间表"
-    show_email_on_profile: "在用户页面显示用户的邮件地址（只有用户和管理人员可见）"
     prioritize_username_in_ux: "在用户页、用户卡片和帖子上优先显示用户名（未选时，昵称将先显示）"
     enable_rich_text_paste: "将文本粘贴到编辑器中时自动启用HTML到Markdown转换。（实验性）"
     email_token_valid_hours: "“忘记密码”/“激活账户”令牌有效的小时数。"
@@ -1265,7 +1276,7 @@ zh_CN:
     rate_limit_new_user_create_post: "在发表帖子后，新用户必须等待(n)秒才能创建另一个帖子。"
     max_likes_per_day: "每个用户每天能赞的数量的最大值。"
     max_flags_per_day: "每个用户每天能标记的数量的最大值。"
-    max_bookmarks_per_day: "每个用户每天能做书签数量的最大值。"
+    max_bookmarks_per_day: "每用户每天能收藏的最大值。"
     max_edits_per_day: "每个用户每天能编辑的次数的最大值。"
     max_topics_per_day: "每个用户每天能创建的主题数量的最大值。"
     max_personal_messages_per_day: "用户每天可以创建的最大消息数。"
@@ -1976,8 +1987,6 @@ zh_CN:
     disagreed: "谢谢你的私信。我们正在进行处理。"
     deferred: "感谢通知我们。我们正在调查情况。"
     deferred_and_deleted: "感谢通知我们。我们已经删除了帖子。"
-  temporarily_closed_due_to_flags:
-    other: "因为大量社区成员的标记，这个主题被临时关闭 %{count} 小时。"
   system_messages:
     private_topic_title: "主题 #%{id}"
     contents_hidden: "请访问帖子以查看内容。"
@@ -2956,7 +2965,7 @@ zh_CN:
 
       我们在这儿的讨论为大家树立了榜样。通过选择参与有意义的讨论，帮助我们将论坛变成一个有意思的地方 &mdash; 并且避免那些没有帮助的行为。
 
-      Discourse 提供了让社区共同鉴别最棒（或最差）的贡献的工具：收藏、书签、赞、标记、回复和编辑等等。使用这些工具不仅能改善你自己的体验，也能改善其他人的体验。
+      Discourse 提供了让社区共同鉴别最棒（或最差）的贡献的工具：收藏、赞、标记、回复和编辑等等。使用这些工具不仅能改善你自己的体验，也能改善其他人的体验。
 
       让我们创造一个更美好的社区。
 
@@ -2965,7 +2974,7 @@ zh_CN:
       ## [如果你发现问题了，标记它](#flag-problems)
       版主有特别的权力；他们对论坛负责。但是你也是。有了你的帮助，版主能成为社区监察者，而不仅是守卫或者警察。
 
-      当你见到不合适的行为，不要回复。这种承认变相鼓励了这种不合适的行为，浪费了你的精力，并且浪费了每一个人的时间。_只要标记它。_如果收到了足够的标记，将会有相应的处理，这个处理可能是自动地，也可能由版主介入。
+      当你见到不合适的行为，不要回复。这种承认变相鼓励了这种不合适的行为，浪费了你的精力，并且浪费了每一个人的时间。_只要标记它_。如果收到了足够的标记，将会有相应的处理，这个处理可能是自动地，也可能由版主介入。
 
       为了维护我们的社区，版主保留了任何情况下删除任何内容和任何用户的权力。版主没有预先审核任何新帖子；版主和站点维护人员对社区里发表的任何言论均不负责任。
 
diff --git a/config/locales/server.zh_TW.yml b/config/locales/server.zh_TW.yml
index 1d30b69a43..690e0f44b0 100644
--- a/config/locales/server.zh_TW.yml
+++ b/config/locales/server.zh_TW.yml
@@ -739,7 +739,6 @@ zh_TW:
     tl2_additional_likes_per_day_multiplier: "增加信任等級2（成員）的贊限制，可提供一個乘數與原始值相乘"
     tl3_additional_likes_per_day_multiplier: "增加信任等級3（常規）的每日贊限制，將此設置項與原始值相乘"
     tl4_additional_likes_per_day_multiplier: "增加信任等級4（資深）的贊限制，可提供一個乘數與原始值相乘"
-    flag_sockpuppets: "如果一個新用戶開始了一個主題，並且同時另一個新用戶以同一個 IP 在該主題回復，他們所有的帖子都將被自動標記為垃圾。"
     traditional_markdown_linebreaks: "在 Markdown 中使用傳統的換行符號，即用兩個行末空格來換行"
     post_undo_action_window_mins: "允許使用者還原文章上近期動作（讚、標記等）的時間長度（分鐘數）。"
     must_approve_users: "新用戶在被允許訪問站點前需要由管理人員批准。警告：在運行的站點中啟用將解除所有非管理人員用戶的訪問權限！"
@@ -763,7 +762,6 @@ zh_TW:
     topics_per_period_in_top_page: "在展開 \"顯示更多\" 推薦話題列表的顯示數量"
     redirect_users_to_top_page: "將新用戶或長時間未使用的用戶自動重新導向至熱門頁面"
     top_page_default_timeframe: "頂部查看頁面的預設時間表"
-    show_email_on_profile: "在用戶頁面顯示用戶的電郵地址（只有用戶自己和職員可見）"
     prioritize_username_in_ux: "在用戶頁、用戶卡片和帖子上優先顯示用戶名（未選時，暱稱將先顯示）"
     email_token_valid_hours: "\"忘記密碼\" / \"重啟帳號\" token 有效的小時數 (n)"
     enable_badges: "啟用勳章系統"
@@ -1249,8 +1247,6 @@ zh_TW:
     disagreed: "感謝你讓我們知道。我們正在調查。"
     deferred: "感謝你讓我們知道。我們正在調查。"
     deferred_and_deleted: "感謝通知我們。我們已經刪除了帖子。"
-  temporarily_closed_due_to_flags:
-    other: "這個話題因為大量的社群投訴暫時關閉 %{count} 小時。"
   system_messages:
     post_hidden:
       title: "文章已隱藏"
diff --git a/config/site_settings.yml b/config/site_settings.yml
index ebfd493e87..a22ce2a800 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -212,7 +212,6 @@ basic:
     choices:
      - twitter
      - facebook
-     - google+
      - email
   desktop_category_page_style:
     client: true
@@ -285,6 +284,7 @@ basic:
     default: ''
   short_title:
     default: ''
+    max: 12
   vapid_public_key_bytes:
     default: ''
     client: true
@@ -1411,7 +1411,7 @@ developer:
   top_topics_formula_least_likes_per_post_multiplier:
     default: 3
   rebake_old_posts_count:
-    default: 100
+    default: 80
     min: 1
   migrate_to_new_scheme:
     hidden: true
@@ -1811,6 +1811,14 @@ user_preferences:
   default_categories_watching_first_post:
     type: category_list
     default: ''
+  
+  default_text_size:
+    type: enum
+    default: normal
+    choices:
+      - normal
+      - larger
+      - largest
 
 api:
   retain_web_hook_events_period_days:
diff --git a/db/migrate/20161202034856_add_uploads_to_categories.rb b/db/migrate/20161202034856_add_uploads_to_categories.rb
index b799e0c23a..7aa3b64628 100644
--- a/db/migrate/20161202034856_add_uploads_to_categories.rb
+++ b/db/migrate/20161202034856_add_uploads_to_categories.rb
@@ -3,16 +3,20 @@ class AddUploadsToCategories < ActiveRecord::Migration[4.2]
     add_column :categories, :uploaded_logo_id, :integer, index: true
     add_column :categories, :uploaded_background_id, :integer, index: true
 
-    transaction do
-      Category.find_each do |category|
-        logo_upload = Upload.find_by(url: category.logo_url)
-        background_upload = Upload.find_by(url: category.background_url)
+    execute <<~SQL
+    UPDATE categories
+    SET uploaded_logo_id = u.id
+    FROM categories c
+    LEFT JOIN uploads u ON u.url = c.logo_url
+    WHERE u.url IS NOT NULL
+    SQL
 
-        category.update_columns(
-          uploaded_logo_id: logo_upload&.id,
-          uploaded_background_id: background_upload&.id
-        )
-      end
-    end
+    execute <<~SQL
+    UPDATE categories
+    SET uploaded_background_id = u.id
+    FROM categories c
+    LEFT JOIN uploads u ON u.url = c.background_url
+    WHERE u.url IS NOT NULL
+    SQL
   end
 end
diff --git a/db/migrate/20181218071253_add_etag_to_uploads.rb b/db/migrate/20181218071253_add_etag_to_uploads.rb
new file mode 100644
index 0000000000..dacc0957c1
--- /dev/null
+++ b/db/migrate/20181218071253_add_etag_to_uploads.rb
@@ -0,0 +1,9 @@
+class AddEtagToUploads < ActiveRecord::Migration[5.2]
+  def change
+    add_column :uploads, :etag, :string
+    add_index :uploads, [:etag]
+
+    add_column :optimized_images, :etag, :string
+    add_index :optimized_images, [:etag]
+  end
+end
diff --git a/db/migrate/20190103051737_add_version_to_optimized_images.rb b/db/migrate/20190103051737_add_version_to_optimized_images.rb
new file mode 100644
index 0000000000..88d2fb9958
--- /dev/null
+++ b/db/migrate/20190103051737_add_version_to_optimized_images.rb
@@ -0,0 +1,5 @@
+class AddVersionToOptimizedImages < ActiveRecord::Migration[5.2]
+  def change
+    add_column :optimized_images, :version, :integer
+  end
+end
diff --git a/db/migrate/20190103060819_force_rebake_on_posts_with_images.rb b/db/migrate/20190103060819_force_rebake_on_posts_with_images.rb
new file mode 100644
index 0000000000..3837aae59e
--- /dev/null
+++ b/db/migrate/20190103060819_force_rebake_on_posts_with_images.rb
@@ -0,0 +1,16 @@
+class ForceRebakeOnPostsWithImages < ActiveRecord::Migration[5.2]
+  def up
+
+    # commit message has more info:
+    # Picking up changes with pngquant, placeholder image, new image magick, retina images
+
+    execute <<~SQL
+      UPDATE posts SET baked_version = 0
+      WHERE id IN (SELECT post_id FROM post_uploads)
+    SQL
+  end
+
+  def down
+    # no op, does not really matter
+  end
+end
diff --git a/db/migrate/20190106041015_add_topic_id_index_to_user_histories.rb b/db/migrate/20190106041015_add_topic_id_index_to_user_histories.rb
new file mode 100644
index 0000000000..8172657fb1
--- /dev/null
+++ b/db/migrate/20190106041015_add_topic_id_index_to_user_histories.rb
@@ -0,0 +1,5 @@
+class AddTopicIdIndexToUserHistories < ActiveRecord::Migration[5.2]
+  def change
+    add_index :user_histories, [:topic_id, :target_user_id, :action]
+  end
+end
diff --git a/db/migrate/20190108110630_add_text_size_key_to_user_options.rb b/db/migrate/20190108110630_add_text_size_key_to_user_options.rb
new file mode 100644
index 0000000000..61edee561e
--- /dev/null
+++ b/db/migrate/20190108110630_add_text_size_key_to_user_options.rb
@@ -0,0 +1,5 @@
+class AddTextSizeKeyToUserOptions < ActiveRecord::Migration[5.2]
+  def change
+    add_column :user_options, :text_size_key, :integer, null: false, default: 0
+  end
+end
diff --git a/db/migrate/20190110201340_remove_google_plus_from_share_links_site_setting.rb b/db/migrate/20190110201340_remove_google_plus_from_share_links_site_setting.rb
new file mode 100644
index 0000000000..b6268b737a
--- /dev/null
+++ b/db/migrate/20190110201340_remove_google_plus_from_share_links_site_setting.rb
@@ -0,0 +1,13 @@
+class RemoveGooglePlusFromShareLinksSiteSetting < ActiveRecord::Migration[5.2]
+  def up
+    execute <<~SQL
+      UPDATE site_settings
+      SET value = array_to_string(array_remove(regexp_split_to_array(value, '\\|'), 'google+'), '|')
+      WHERE name = 'share_links'
+    SQL
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/post_migrate/20190103065652_remove_uploaded_meta_id_from_category.rb b/db/post_migrate/20190103065652_remove_uploaded_meta_id_from_category.rb
new file mode 100644
index 0000000000..997ae5e580
--- /dev/null
+++ b/db/post_migrate/20190103065652_remove_uploaded_meta_id_from_category.rb
@@ -0,0 +1,11 @@
+require 'migration/column_dropper'
+
+class RemoveUploadedMetaIdFromCategory < ActiveRecord::Migration[5.2]
+  def up
+    Migration::ColumnDropper.execute_drop(:categories, %i{uploaded_meta_id})
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/docs/INSTALL-cloud.md b/docs/INSTALL-cloud.md
index d6989479e8..1813c7955e 100644
--- a/docs/INSTALL-cloud.md
+++ b/docs/INSTALL-cloud.md
@@ -107,9 +107,11 @@ After completing the setup wizard, you should see Staff topics and **READ ME FIR
 
 ### Post-Install Maintenance
 
-- We strongly suggest you turn on automatic security updates for your OS. In Ubuntu use the `dpkg-reconfigure -plow unattended-upgrades` command.
-- If you are using a password and not a SSH key, be sure to enforce a strong root password. In Ubuntu use the `apt-get install libpam-cracklib` package. We also recommend `apt-get install fail2ban` which will default block any IP addresses for 10 minutes that attempt more than 3 password retries.
-- If you need or want a default firewall, [turn on ufw](https://meta.discourse.org/t/configure-a-firewall-for-discourse/20584).
+- We strongly suggest you turn on automatic security updates for your OS. In Ubuntu use the `dpkg-reconfigure -plow unattended-upgrades` command. In CentOS/RHEL, use the [`yum-cron`](https://www.cyberciti.biz/faq/fedora-automatic-update-retrieval-installation-with-cron/) package.
+- If you are using a password and not a SSH key, be sure to enforce a strong root password. In Ubuntu use the `apt-get install libpam-cracklib` package. We also recommend `fail2ban` which blocks any IP addresses for 10 minutes that attempt more than 3 password retries.
+  - **Ubuntu**: `apt-get install fail2ban`
+  - **CentOS/RHEL**: `sudo yum install fail2ban` (requires [EPEL](https://support.rackspace.com/how-to/install-epel-and-additional-repositories-on-centos-and-red-hat/))
+- If you need or want a default firewall, [turn on ufw](https://meta.discourse.org/t/configure-a-firewall-for-discourse/20584) for Ubuntu or use `firewalld` for CentOS/RHEL 7 or later.
 
 You will get email reminders as new versions of Discourse are released. Please stay current to get the latest features and security fixes. To **upgrade Discourse to the latest version**, visit `/admin/upgrade` in your browser and click the Upgrade button.
 
diff --git a/lib/backup_restore/restorer.rb b/lib/backup_restore/restorer.rb
index b09e6054dd..46fc47d760 100644
--- a/lib/backup_restore/restorer.rb
+++ b/lib/backup_restore/restorer.rb
@@ -479,10 +479,7 @@ module BackupRestore
 
     def clear_theme_cache
       log "Clear theme cache"
-      ThemeField.all.each do |field|
-        field.compiler_version = 0
-        field.ensure_baked!
-      end
+      ThemeField.force_recompilation!
       Theme.expire_site_cache!
     end
 
diff --git a/lib/content_security_policy/builder.rb b/lib/content_security_policy/builder.rb
index c108988990..f7cf1b690f 100644
--- a/lib/content_security_policy/builder.rb
+++ b/lib/content_security_policy/builder.rb
@@ -4,13 +4,14 @@ require_dependency 'content_security_policy/default'
 class ContentSecurityPolicy
   class Builder
     EXTENDABLE_DIRECTIVES = %i[
+      base_uri
+      object_src
       script_src
       worker_src
     ].freeze
 
     # Make extending these directives no-op, until core includes them in default CSP
     TO_BE_EXTENDABLE = %i[
-      base_uri
       connect_src
       default_src
       font_src
@@ -20,7 +21,6 @@ class ContentSecurityPolicy
       img_src
       manifest_src
       media_src
-      object_src
       prefetch_src
       style_src
     ].freeze
@@ -65,6 +65,8 @@ class ContentSecurityPolicy
       else
         @directives[directive] << sources
       end
+
+      @directives[directive].delete(:none) if @directives[directive].count > 1
     end
 
     def extendable?(directive)
diff --git a/lib/content_security_policy/default.rb b/lib/content_security_policy/default.rb
index d92285af43..1e056f78bb 100644
--- a/lib/content_security_policy/default.rb
+++ b/lib/content_security_policy/default.rb
@@ -7,6 +7,8 @@ class ContentSecurityPolicy
 
     def initialize
       @directives = {}.tap do |directives|
+        directives[:base_uri] = [:none]
+        directives[:object_src] = [:none]
         directives[:script_src] = script_src
         directives[:worker_src] = worker_src
         directives[:report_uri] = report_uri if SiteSetting.content_security_policy_collect_reports
diff --git a/lib/demon/sidekiq.rb b/lib/demon/sidekiq.rb
index 0ca7ba9994..bfb25f2bf5 100644
--- a/lib/demon/sidekiq.rb
+++ b/lib/demon/sidekiq.rb
@@ -43,6 +43,10 @@ class Demon::Sidekiq < Demon::Base
       end
     end
 
+    # Sidekiq not as high priority as web, in this environment it is forked so a web is very
+    # likely running
+    Discourse::Utils.execute_command('renice', '-n', '5', '-p', Process.pid.to_s)
+
     cli.parse(options)
     load Rails.root + "config/initializers/100-sidekiq.rb"
     cli.run
diff --git a/lib/email.rb b/lib/email.rb
index ed9182980d..9b7e13e81d 100644
--- a/lib/email.rb
+++ b/lib/email.rb
@@ -37,4 +37,8 @@ module Email
     [text&.decoded, html&.decoded]
   end
 
+  def self.site_title
+    SiteSetting.email_site_title.presence || SiteSetting.title
+  end
+
 end
diff --git a/lib/email/message_builder.rb b/lib/email/message_builder.rb
index 0d39cd5eff..146f49774b 100644
--- a/lib/email/message_builder.rb
+++ b/lib/email/message_builder.rb
@@ -208,8 +208,8 @@ module Email
         SiteSetting.email_site_title.blank? &&
         SiteSetting.title.blank?
 
-      if !@opts[:from_alias].blank?
-        "\"#{Email.cleanup_alias(@opts[:from_alias])}\" <#{source}>"
+      if @opts[:from_alias].present?
+        %Q|"#{Email.cleanup_alias(@opts[:from_alias])}" <#{source}>|
       elsif source == SiteSetting.notification_email || source == SiteSetting.reply_by_email_address
         site_alias_email(source)
       else
@@ -218,8 +218,8 @@ module Email
     end
 
     def site_alias_email(source)
-      from_alias = SiteSetting.email_site_title.presence || SiteSetting.title
-      "\"#{Email.cleanup_alias(from_alias)}\" <#{source}>"
+      from_alias = Email.site_title
+      %Q|"#{Email.cleanup_alias(from_alias)}" <#{source}>|
     end
 
   end
diff --git a/lib/emoji/db.json b/lib/emoji/db.json
index 31bf152c41..90c09f070d 100644
--- a/lib/emoji/db.json
+++ b/lib/emoji/db.json
@@ -7115,5 +7115,33 @@
     "cry": [
       "sob"
     ]
+  },
+  "translations": {
+    ":)"  : "slight_smile",
+    ":-)" : "slight_smile",
+    "^_^" : "slight_smile",
+    "^__^": "slight_smile",
+    ":("  : "frowning",
+    ":-(" : "frowning",
+    ";)"  : "wink",
+    ";-)" : "wink",
+    ":'(" : "cry",
+    ":'-(": "cry",
+    ":-'(": "cry",
+    ":p"  : "stuck_out_tongue",
+    ":P"  : "stuck_out_tongue",
+    ":-P" : "stuck_out_tongue",
+    ":O"  : "open_mouth",
+    ":-O" : "open_mouth",
+    ":D"  : "smiley",
+    ":-D" : "smiley",
+    ":|"  : "expressionless",
+    ":-|" : "expressionless",
+    ":/"  : "confused",
+    "8-)" : "sunglasses",
+    ";P"  : "stuck_out_tongue_winking_eye",
+    ";-P" : "stuck_out_tongue_winking_eye",
+    ":$"  : "blush",
+    ":-$" : "blush"
   }
-}
\ No newline at end of file
+}
diff --git a/lib/file_helper.rb b/lib/file_helper.rb
index 3f148fc278..feed479b0b 100644
--- a/lib/file_helper.rb
+++ b/lib/file_helper.rb
@@ -83,28 +83,43 @@ class FileHelper
   end
 
   def self.optimize_image!(filename, allow_pngquant: false)
-    pngquant_options = false
-    if allow_pngquant
-      pngquant_options = { allow_lossy: true }
-    end
-
-    ImageOptim.new(
-      # GLOBAL
-      timeout: 15,
-      skip_missing_workers: true,
-      # PNG
-      optipng: { level: 2, strip: SiteSetting.strip_image_metadata },
-      advpng: false,
-      pngcrush: false,
-      pngout: false,
-      pngquant: pngquant_options,
-      # JPG
-      jpegoptim: { strip: SiteSetting.strip_image_metadata ? "all" : "none" },
-      jpegtran: false,
-      jpegrecompress: false,
+    image_optim(
+      allow_pngquant: allow_pngquant,
+      strip_image_metadata: SiteSetting.strip_image_metadata
     ).optimize_image!(filename)
   end
 
+  def self.image_optim(allow_pngquant: false, strip_image_metadata: true)
+    # memoization is critical, initializing an ImageOptim object is very expensive
+    # sometimes up to 200ms searching for binaries and looking at versions
+    memoize("image_optim", allow_pngquant, strip_image_metadata) do
+      pngquant_options = false
+      if allow_pngquant
+        pngquant_options = { allow_lossy: true }
+      end
+
+      ImageOptim.new(
+        # GLOBAL
+        timeout: 15,
+        skip_missing_workers: true,
+        # PNG
+        optipng: { level: 2, strip: strip_image_metadata },
+        advpng: false,
+        pngcrush: false,
+        pngout: false,
+        pngquant: pngquant_options,
+        # JPG
+        jpegoptim: { strip: strip_image_metadata ? "all" : "none" },
+        jpegtran: false,
+        jpegrecompress: false,
+      )
+    end
+  end
+
+  def self.memoize(*args)
+    (@memoized ||= {})[args] ||= yield
+  end
+
   def self.supported_images
     @@supported_images ||= Set.new %w{jpg jpeg png gif svg ico}
   end
diff --git a/lib/file_store/base_store.rb b/lib/file_store/base_store.rb
index 9043205c88..2c8b416eff 100644
--- a/lib/file_store/base_store.rb
+++ b/lib/file_store/base_store.rb
@@ -116,7 +116,8 @@ module FileStore
 
     def get_path_for_optimized_image(optimized_image)
       upload = optimized_image.upload
-      extension = "_#{OptimizedImage::VERSION}_#{optimized_image.width}x#{optimized_image.height}#{optimized_image.extension}"
+      version = optimized_image.version || 1
+      extension = "_#{version}_#{optimized_image.width}x#{optimized_image.height}#{optimized_image.extension}"
       get_path_for("optimized".freeze, upload.id, upload.sha1, extension)
     end
 
diff --git a/lib/file_store/s3_store.rb b/lib/file_store/s3_store.rb
index da309f3400..119dd9c0a1 100644
--- a/lib/file_store/s3_store.rb
+++ b/lib/file_store/s3_store.rb
@@ -19,12 +19,14 @@ module FileStore
 
     def store_upload(file, upload, content_type = nil)
       path = get_path_for_upload(upload)
-      store_file(file, path, filename: upload.original_filename, content_type: content_type, cache_locally: true)
+      url, upload.etag = store_file(file, path, filename: upload.original_filename, content_type: content_type, cache_locally: true)
+      url
     end
 
     def store_optimized_image(file, optimized_image, content_type = nil)
       path = get_path_for_optimized_image(optimized_image)
-      store_file(file, path, content_type: content_type)
+      url, optimized_image.etag = store_file(file, path, content_type: content_type)
+      url
     end
 
     # options
@@ -42,13 +44,14 @@ module FileStore
       }
       # add a "content disposition" header for "attachments"
       options[:content_disposition] = "attachment; filename=\"#{filename}\"" unless FileHelper.is_supported_image?(filename)
-      # if this fails, it will throw an exception
 
       path.prepend(File.join(upload_path, "/")) if Rails.configuration.multisite
-      path = @s3_helper.upload(file, path, options)
 
-      # return the upload url
-      File.join(absolute_base_url, path)
+      # if this fails, it will throw an exception
+      path, etag = @s3_helper.upload(file, path, options)
+
+      # return the upload url and etag
+      return File.join(absolute_base_url, path), etag
     end
 
     def remove_file(url, path)
diff --git a/lib/flag_query.rb b/lib/flag_query.rb
index f3ef77ec0f..cd0ed15089 100644
--- a/lib/flag_query.rb
+++ b/lib/flag_query.rb
@@ -35,8 +35,8 @@ module FlagQuery
       .group(:post_id)
       .order('MIN(post_actions.created_at) DESC')
 
-    if opts[:filter] != "old" && SiteSetting.min_flags_staff_visibility > 1
-      post_ids_relation = post_ids_relation.having("count(*) >= ?", SiteSetting.min_flags_staff_visibility)
+    if opts[:filter] != "old"
+      post_ids_relation = PostAction.apply_minimum_visibility(post_ids_relation)
     end
 
     post_ids = post_ids_relation.pluck(:post_id).uniq
diff --git a/lib/global_path.rb b/lib/global_path.rb
index 10d1fbdda5..17479b60eb 100644
--- a/lib/global_path.rb
+++ b/lib/global_path.rb
@@ -11,7 +11,8 @@ module GlobalPath
     if SiteSetting.Upload.s3_cdn_url.present?
       p = Discourse.store.cdn_url(p)
     end
-    p =~ /^http/ ? p : cdn_path(p)
+
+    (p =~ /^http/ || p =~ /^\/\//) ? p : cdn_path(p)
   end
 
   def cdn_relative_path(path)
diff --git a/lib/guardian.rb b/lib/guardian.rb
index 65a1d3f103..cb80bb781f 100644
--- a/lib/guardian.rb
+++ b/lib/guardian.rb
@@ -54,7 +54,6 @@ class Guardian
     end
   end
 
-  attr_accessor :can_see_emails
   attr_reader :request
 
   def initialize(user = nil, request = nil)
@@ -381,10 +380,6 @@ class Guardian
     )
   end
 
-  def can_see_emails?
-    @can_see_emails
-  end
-
   def can_export_entity?(entity)
     return false unless @user
     return true if is_admin?
diff --git a/lib/guardian/post_guardian.rb b/lib/guardian/post_guardian.rb
index d30db1972d..0163496b82 100644
--- a/lib/guardian/post_guardian.rb
+++ b/lib/guardian/post_guardian.rb
@@ -267,6 +267,6 @@ module PostGuardian
   end
 
   def can_skip_bump?
-    is_staff?
+    is_staff? || @user.has_trust_level?(TrustLevel[4])
   end
 end
diff --git a/lib/highlight_js/assets/lang/xquery.js b/lib/highlight_js/assets/lang/xquery.js
deleted file mode 100644
index a91a30a153..0000000000
--- a/lib/highlight_js/assets/lang/xquery.js
+++ /dev/null
@@ -1 +0,0 @@
-hljs.registerLanguage("xquery",function(e){var t="for let if while then else return where group by xquery encoding versionmodule namespace boundary-space preserve strip default collation base-uri orderingcopy-namespaces order declare import schema namespace function option in allowing emptyat tumbling window sliding window start when only end when previous next stable ascendingdescending empty greatest least some every satisfies switch case typeswitch try catch andor to union intersect instance of treat as castable cast map array delete insert intoreplace value rename copy modify update",a="false true xs:string xs:integer element item xs:date xs:datetime xs:float xs:double xs:decimal QName xs:anyURI xs:long xs:int xs:short xs:byte attribute",s={b:/\$[a-zA-Z0-9\-]+/},n={cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},r={cN:"string",v:[{b:/"/,e:/"/,c:[{b:/""/,r:0}]},{b:/'/,e:/'/,c:[{b:/''/,r:0}]}]},i={cN:"meta",b:"%\\w+"},c={cN:"comment",b:"\\(:",e:":\\)",r:10,c:[{cN:"doctag",b:"@\\w+"}]},o={b:"{",e:"}"},l=[s,r,n,c,i,o];return o.c=l,{aliases:["xpath","xq"],cI:!1,l:/[a-zA-Z\$][a-zA-Z0-9_:\-]*/,i:/(proc)|(abstract)|(extends)|(until)|(#)/,k:{keyword:t,literal:a},c:l}});
\ No newline at end of file
diff --git a/lib/highlight_js/highlight_js.rb b/lib/highlight_js/highlight_js.rb
index 22c93609cf..efac9994e7 100644
--- a/lib/highlight_js/highlight_js.rb
+++ b/lib/highlight_js/highlight_js.rb
@@ -1,18 +1,21 @@
+# frozen_string_literal: true
+
 module HighlightJs
+  HIGHLIGHTJS_DIR = "#{Rails.root}/vendor/assets/javascripts/highlightjs/"
 
   def self.languages
-    Dir.glob(File.dirname(__FILE__) << "/assets/lang/*.js").map do |path|
-      File.basename(path)[0..-4]
+    langs = Dir.glob(HIGHLIGHTJS_DIR + "languages/*.js").map do |path|
+      File.basename(path)[0..-8]
     end
+
+    langs.sort
   end
 
   def self.bundle(langs)
-    path = File.dirname(__FILE__) << "/assets/"
-
-    result = File.read(path + "highlight.js")
+    result = File.read(HIGHLIGHTJS_DIR + "highlight.min.js")
     langs.each do |lang|
       begin
-        result << "\n" << File.read(path + "lang/#{lang}.js")
+        result << "\n" << File.read(HIGHLIGHTJS_DIR + "languages/#{lang}.min.js")
       rescue Errno::ENOENT
         # no file, don't care
       end
diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index b19d6cedb9..53552d0b47 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -16,6 +16,15 @@ class Plugin::CustomEmoji
     @@cache_key = Digest::SHA1.hexdigest(cache_key + name)[0..10]
     emojis[name] = url
   end
+
+  def self.translations
+    @@translations ||= {}
+  end
+
+  def self.translate(from, to)
+    @@cache_key = Digest::SHA1.hexdigest(cache_key + from)[0..10]
+    translations[from] = to
+  end
 end
 
 class Plugin::Instance
@@ -429,6 +438,10 @@ class Plugin::Instance
     Plugin::CustomEmoji.register(name, url)
   end
 
+  def translate_emoji(from, to)
+    Plugin::CustomEmoji.translate(from, to)
+  end
+
   def automatic_assets
     css = styles.join("\n")
     js = javascripts.join("\n")
diff --git a/lib/post_creator.rb b/lib/post_creator.rb
index c5c09d04d1..4c4c079325 100644
--- a/lib/post_creator.rb
+++ b/lib/post_creator.rb
@@ -167,22 +167,21 @@ class PostCreator
         create_topic
         save_post
         extract_links
-        store_unique_post_key
         track_topic
         update_topic_stats
         update_topic_auto_close
         update_user_counts
         create_embedded_topic
         link_post_uploads
-
         ensure_in_allowed_users if guardian.is_staff?
         unarchive_message
-        @post.advance_draft_sequence
+        @post.advance_draft_sequence unless @opts[:import_mode]
         @post.save_reply_relationships
       end
     end
 
-    if @post && errors.blank?
+    if @post && errors.blank? && !@opts[:import_mode]
+      store_unique_post_key
       # update counters etc.
       @post.topic.reload
 
@@ -194,12 +193,10 @@ class PostCreator
 
       trigger_after_events unless opts[:skip_events]
 
-      auto_close unless @opts[:import_mode]
+      auto_close
     end
 
-    if @post || @spam
-      handle_spam unless @opts[:import_mode]
-    end
+    handle_spam if !opts[:import_mode] && (@post || @spam)
 
     @post
   end
@@ -428,6 +425,8 @@ class PostCreator
   end
 
   def update_topic_auto_close
+    return if @opts[:import_mode]
+
     if @topic.closed?
       @topic.delete_topic_timer(TopicTimer.types[:close])
     else
@@ -510,9 +509,7 @@ class PostCreator
   end
 
   def publish
-    return if @opts[:import_mode]
-    return unless @post.post_number > 1
-
+    return if @opts[:import_mode] || @post.post_number == 1
     @post.publish_change_to_clients! :created
   end
 
@@ -522,7 +519,7 @@ class PostCreator
   end
 
   def track_topic
-    return if @opts[:auto_track] == false
+    return if @opts[:import_mode] || @opts[:auto_track] == false
 
     unless @user.user_option.disable_jump_reply?
       TopicUser.change(@post.user_id,
@@ -540,8 +537,7 @@ class PostCreator
 
     if @user.staged
       TopicUser.auto_notification_for_staging(@user.id, @topic.id, TopicUser.notification_reasons[:auto_watch])
-    else
-      return if @topic.private_message?
+    elsif !@topic.private_message?
       notification_level = @user.user_option.notification_level_when_replying || NotificationLevels.topic_levels[:tracking]
       TopicUser.auto_notification(@user.id, @topic.id, TopicUser.notification_reasons[:created_post], notification_level)
     end
diff --git a/lib/s3_helper.rb b/lib/s3_helper.rb
index 708c232133..fbdde9674a 100644
--- a/lib/s3_helper.rb
+++ b/lib/s3_helper.rb
@@ -7,11 +7,12 @@ class S3Helper
   attr_reader :s3_bucket_name, :s3_bucket_folder_path
 
   def initialize(s3_bucket_name, tombstone_prefix = '', options = {})
+    @s3_client = options.delete(:client)
     @s3_options = default_s3_options.merge(options)
 
     @s3_bucket_name, @s3_bucket_folder_path = begin
       raise Discourse::InvalidParameters.new("s3_bucket_name") if s3_bucket_name.blank?
-      s3_bucket_name.downcase.split("/".freeze, 2)
+      self.class.get_bucket_and_folder_path(s3_bucket_name)
     end
 
     @tombstone_prefix =
@@ -22,10 +23,27 @@ class S3Helper
       end
   end
 
+  def self.get_bucket_and_folder_path(s3_bucket_name)
+    s3_bucket_name.downcase.split("/".freeze, 2)
+  end
+
   def upload(file, path, options = {})
     path = get_path_for_s3_upload(path)
-    s3_bucket.object(path).upload_file(file, options)
-    path
+    obj = s3_bucket.object(path)
+
+    etag = begin
+      if File.size(file.path) >= Aws::S3::FileUploader::FIFTEEN_MEGABYTES
+        options[:multipart_threshold] = Aws::S3::FileUploader::FIFTEEN_MEGABYTES
+        obj.upload_file(file, options)
+        obj.load
+        obj.etag
+      else
+        options[:body] = file
+        obj.put(options).etag
+      end
+    end
+
+    return path, etag
   end
 
   def remove(s3_filename, copy_to_tombstone = false)
@@ -48,10 +66,10 @@ class S3Helper
       options[:copy_source] = File.join(@s3_bucket_name, source)
     else
       if @s3_bucket_folder_path
-        bucket_folder, filename = begin
+        folder, filename = begin
           source.split("/".freeze, 2)
         end
-        options[:copy_source] = File.join(@s3_bucket_name, bucket_folder, multisite_upload_path, filename)
+        options[:copy_source] = File.join(@s3_bucket_name, folder, multisite_upload_path, filename)
       else
         options[:copy_source] = File.join(@s3_bucket_name, multisite_upload_path, source)
       end
@@ -210,8 +228,12 @@ class S3Helper
     File.join("uploads", RailsMultisite::ConnectionManagement.current_db, "/")
   end
 
+  def s3_client
+    @s3_client ||= Aws::S3::Client.new(@s3_options)
+  end
+
   def s3_resource
-    Aws::S3::Resource.new(@s3_options)
+    Aws::S3::Resource.new(client: s3_client)
   end
 
   def s3_bucket
diff --git a/lib/search.rb b/lib/search.rb
index e26f8c29f1..61ccf79d91 100644
--- a/lib/search.rb
+++ b/lib/search.rb
@@ -227,7 +227,7 @@ class Search
     end
 
     # If the term is a number or url to a topic, just include that topic
-    if @opts[:search_for_id] && @results.type_filter == 'topic'
+    if @opts[:search_for_id] && (@results.type_filter == 'topic' || @results.type_filter == 'private_messages')
       if @term =~ /^\d+$/
         single_topic(@term.to_i)
       else
@@ -629,7 +629,14 @@ class Search
 
   # If we're searching for a single topic
   def single_topic(id)
-    post = Post.find_by(topic_id: id, post_number: 1)
+    if @opts[:restrict_to_archetype].present?
+      archetype = @opts[:restrict_to_archetype] == Archetype.default ? Archetype.default : Archetype.private_message
+      post = Post.joins(:topic)
+        .where("topics.id = :id AND topics.archetype = :archetype AND posts.post_number = 1", id: id, archetype: archetype)
+        .first
+    else
+      post = Post.find_by(topic_id: id, post_number: 1)
+    end
     return nil unless @guardian.can_see?(post)
 
     @results.add(post)
diff --git a/lib/svg_sprite/svg_sprite.rb b/lib/svg_sprite/svg_sprite.rb
index 232cefb7cf..f4a3335c8d 100644
--- a/lib/svg_sprite/svg_sprite.rb
+++ b/lib/svg_sprite/svg_sprite.rb
@@ -14,6 +14,7 @@ module SvgSprite
     "angle-up",
     "archive",
     "arrows-alt-h",
+    "arrows-alt-v",
     "arrow-down",
     "arrow-up",
     "arrow-left",
@@ -84,6 +85,7 @@ module SvgSprite
     "far-clipboard",
     "far-clock",
     "far-comment",
+    "far-copyright",
     "far-dot-circle",
     "far-edit",
     "far-envelope",
@@ -183,6 +185,9 @@ module SvgSprite
 
   FA_ICON_MAP = { 'far fa-' => 'far-', 'fab fa-' => 'fab-', 'fas fa-' => '', 'fa-' => '' }
 
+  SVG_SPRITE_PATHS = Dir.glob(["#{Rails.root}/vendor/assets/svg-icons/**/*.svg",
+                               "#{Rails.root}/plugins/*/svg-icons/*.svg"])
+
   def self.svg_sprite_cache
     @svg_sprite_cache ||= DistributedCache.new('svg_sprite')
   end
@@ -227,7 +232,7 @@ Discourse SVG subset of #{fa_license}
 <svg xmlns='http://www.w3.org/2000/svg' style='display: none;'>
 """.dup
 
-    Dir["#{Rails.root}/vendor/assets/svg-icons/**/*.svg"].each do |fname|
+    SVG_SPRITE_PATHS.each do |fname|
       svg_file = Nokogiri::XML(File.open(fname)) do |config|
         config.options = Nokogiri::XML::ParseOptions::NOBLANKS
       end
@@ -251,7 +256,7 @@ Discourse SVG subset of #{fa_license}
   def self.search(searched_icon)
     searched_icon = process(searched_icon.dup)
 
-    Dir["#{Rails.root}/vendor/assets/svg-icons/**/*.svg"].each do |fname|
+    SVG_SPRITE_PATHS.each do |fname|
       svg_file = Nokogiri::XML(File.open(fname))
       svg_filename = "#{File.basename(fname, ".svg")}"
 
diff --git a/lib/tasks/highlight.rake b/lib/tasks/highlight.rake
deleted file mode 100644
index f0e0c2bc20..0000000000
--- a/lib/tasks/highlight.rake
+++ /dev/null
@@ -1,25 +0,0 @@
-desc "download latest version of highlight and prepare it"
-task "highlightjs:update" do
-
-  def run(cmd, opts = {})
-    puts cmd
-    system(cmd, opts.merge(out: $stdout, err: :out))
-  end
-  run("cd tmp && rm -fr highlight.js && git clone --depth 1 https://github.com/isagalaev/highlight.js.git")
-  run("cd tmp && rm -fr highlight_distrib && mkdir -p highlight_distrib/lang")
-  run("cd tmp/highlight.js && npm install")
-  run("cd tmp/highlight.js && node tools/build.js -t cdn none")
-
-  run("mv tmp/highlight.js/build/highlight.min.js tmp/highlight_distrib/highlight.js")
-
-  run("cd tmp/highlight.js && npm install && node tools/build.js -t cdn")
-
-  Dir.glob("tmp/highlight.js/build/languages/*.min.js") do |path|
-    lang = File.basename(path)[0..-8]
-    run("mv #{path} tmp/highlight_distrib/lang/#{lang}.js")
-  end
-
-  run("rm -fr lib/highlight_js/assets")
-  run("mv tmp/highlight_distrib lib/highlight_js/assets")
-
-end
diff --git a/lib/tasks/javascript.rake b/lib/tasks/javascript.rake
index 28108df2e5..c34c4152dc 100644
--- a/lib/tasks/javascript.rake
+++ b/lib/tasks/javascript.rake
@@ -44,6 +44,9 @@ task 'javascript:update' do
       source: 'handlebars/dist/handlebars.js'
     }, {
       source: 'handlebars/dist/handlebars.runtime.js'
+    }, {
+      source: 'highlight.js/build/.',
+      destination: 'highlightjs'
     }, {
       source: 'htmlparser/lib/htmlparser.js'
     }, {
@@ -82,6 +85,18 @@ task 'javascript:update' do
       filename = f[:destination]
     end
 
+    # Highlight.js needs building
+    if src.include? "highlight.js"
+      puts "Install Highlight.js dependencies"
+      system("cd node_modules/highlight.js && yarn install")
+
+      puts "Build Highlight.js"
+      system("cd node_modules/highlight.js && node tools/build.js -t cdn none")
+
+      puts "Cleanup unused styles folder"
+      system("rm -rf node_modules/highlight.js/build/styles")
+    end
+
     if f[:public]
       dest = "#{public_js}/#{filename}"
     else
diff --git a/lib/tasks/s3.rake b/lib/tasks/s3.rake
index 356ca55cc2..69c854827a 100644
--- a/lib/tasks/s3.rake
+++ b/lib/tasks/s3.rake
@@ -33,7 +33,10 @@ def upload(path, remote_path, content_type, content_encoding = nil)
     puts "Skipping: #{remote_path}"
   else
     puts "Uploading: #{remote_path}"
-    helper.upload(path, remote_path, options)
+
+    File.open(path) do |file|
+      helper.upload(file, remote_path, options)
+    end
   end
 end
 
@@ -101,6 +104,40 @@ def ensure_s3_configured!
   end
 end
 
+task 's3:correct_acl' => :environment do
+  ensure_s3_configured!
+
+  puts "ensuring public-read is set on every upload and optimized image"
+
+  i = 0
+
+  base_url = Discourse.store.absolute_base_url
+
+  objects = Upload.pluck(:id, :url).map { |array| array << :upload }
+  objects.concat(OptimizedImage.pluck(:id, :url).map { |array| array << :optimized_image })
+
+  puts "#{objects.length} objects found"
+
+  objects.each do |id, url, type|
+    i += 1
+    if !url.start_with?(base_url)
+      puts "Skipping #{type} #{id} since it is not stored on s3, url is #{url}"
+    else
+      begin
+        key = url[(base_url.length + 1)..-1]
+        object = Discourse.store.s3_helper.object(key)
+        object.acl.put(acl: "public-read")
+      rescue => e
+        puts "Skipping #{type} #{id} url is #{url} #{e}"
+      end
+    end
+    if i % 100 == 0
+      puts "#{i} done"
+    end
+  end
+
+end
+
 task 's3:upload_assets' => :environment do
   ensure_s3_configured!
 
diff --git a/lib/tasks/uploads.rake b/lib/tasks/uploads.rake
index 73f0b3372d..106332794a 100644
--- a/lib/tasks/uploads.rake
+++ b/lib/tasks/uploads.rake
@@ -214,6 +214,7 @@ def migrate_to_s3
   db = RailsMultisite::ConnectionManagement.current_db
 
   dry_run = !!ENV["DRY_RUN"]
+  bucket_has_folder_path = true if ENV["DISCOURSE_S3_BUCKET"].include? "/"
 
   puts "*" * 30 + " DRY RUN " + "*" * 30 if dry_run
   puts "Migrating uploads to S3 for '#{db}'..."
@@ -246,11 +247,18 @@ def migrate_to_s3
 
   s3 = Aws::S3::Client.new(S3Helper.s3_options(GlobalSetting))
 
+  if bucket_has_folder_path
+    bucket, folder = S3Helper.get_bucket_and_folder_path(ENV["DISCOURSE_S3_BUCKET"])
+    folder = File.join(folder, "/")
+  else
+    bucket, folder = GlobalSetting.s3_bucket, ""
+  end
+
   begin
-    s3.head_bucket(bucket: GlobalSetting.s3_bucket)
+    s3.head_bucket(bucket: bucket)
   rescue Aws::S3::Errors::NotFound
-    puts "Bucket '#{GlobalSetting.s3_bucket}' not found. Creating it..."
-    s3.create_bucket(bucket: GlobalSetting.s3_bucket) unless dry_run
+    puts "Bucket '#{bucket}' not found. Creating it..."
+    s3.create_bucket(bucket: bucket) unless dry_run
   end
 
   puts "Uploading files to S3..."
@@ -267,7 +275,7 @@ def migrate_to_s3
 
   s3_objects = []
   prefix = Rails.configuration.multisite ? "#{db}/original/" : "original/"
-  options = { bucket: GlobalSetting.s3_bucket, prefix: prefix }
+  options = { bucket: bucket, prefix: prefix }
 
   loop do
     response = s3.list_objects_v2(options)
@@ -278,7 +286,7 @@ def migrate_to_s3
   end
 
   puts " => #{s3_objects.size} files"
-  print " - Syncing files to S3"
+  puts " - Syncing files to S3"
 
   synced = 0
   failed = []
@@ -287,6 +295,8 @@ def migrate_to_s3
     path = File.join("public", file)
     name = File.basename(path)
     etag = Digest::MD5.file(path).hexdigest
+    key = file[file.index(prefix)..-1]
+    key.prepend(folder) if bucket_has_folder_path
 
     if s3_object = s3_objects.find { |obj| file.ends_with?(obj.key) }
       next if File.size(path) == s3_object.size && s3_object.etag[etag]
@@ -295,9 +305,9 @@ def migrate_to_s3
     options = {
       acl: "public-read",
       body: File.open(path, "rb"),
-      bucket: GlobalSetting.s3_bucket,
+      bucket: bucket,
       content_type: MiniMime.lookup_by_filename(name)&.content_type,
-      key: file[file.index(prefix)..-1],
+      key: key,
     }
 
     if !FileHelper.is_supported_image?(name)
@@ -337,7 +347,7 @@ def migrate_to_s3
     }
 
     from = "/uploads/#{db}/original/(\\dX/(?:[a-f0-9]/)*[a-f0-9]{40}[a-z0-9\\.]*)"
-    to = "#{SiteSetting.Upload.s3_base_url}/#{prefix}\\1"
+    to = "#{SiteSetting.Upload.s3_base_url}/#{folder}#{prefix}\\1"
 
     if dry_run
       puts "REPLACING '#{from}' WITH '#{to}'"
diff --git a/lib/tasks/users.rake b/lib/tasks/users.rake
index 299b799364..78f4fb6c74 100644
--- a/lib/tasks/users.rake
+++ b/lib/tasks/users.rake
@@ -174,7 +174,7 @@ end
 desc "List all users which have been staff in the last month"
 task "users:list_recent_staff" => :environment do
   current_staff_ids = User.human_users.where("admin OR moderator").pluck(:id)
-  recent_actions = UserHistory.where("created_at < ?", 1.month.ago)
+  recent_actions = UserHistory.where("created_at > ?", 1.month.ago)
   recent_admin_ids = recent_actions.where(action: UserHistory.actions[:revoke_admin]).pluck(:target_user_id)
   recent_moderator_ids = recent_actions.where(action: UserHistory.actions[:revoke_moderation]).pluck(:target_user_id)
 
diff --git a/lib/upload_creator.rb b/lib/upload_creator.rb
index 35fa225e23..a1386feb2e 100644
--- a/lib/upload_creator.rb
+++ b/lib/upload_creator.rb
@@ -80,8 +80,8 @@ class UploadCreator
       end
 
       fixed_original_filename = nil
-      if is_image
 
+      if is_image
         current_extension = File.extname(@filename).downcase.sub("jpeg", "jpg")
         expected_extension = ".#{image_type}".downcase.sub("jpeg", "jpg")
 
@@ -89,11 +89,7 @@ class UploadCreator
         # otherwise validation will fail and we can not save
         # TODO decide if we only run the validation on the extension
         if current_extension != expected_extension
-          basename = File.basename(@filename, current_extension)
-
-          if basename.length == 0
-            basename = "image"
-          end
+          basename = File.basename(@filename, current_extension).presence || "image"
           fixed_original_filename = "#{basename}#{expected_extension}"
         end
       end
@@ -126,7 +122,8 @@ class UploadCreator
         url = Discourse.store.store_upload(f, @upload)
 
         if url.present?
-          @upload.update!(url: url)
+          @upload.url = url
+          @upload.save!
         else
           @upload.errors.add(:url, I18n.t("upload.store_failure", upload_id: @upload.id, user_id: user_id))
         end
@@ -172,10 +169,7 @@ class UploadCreator
   MIN_CONVERT_TO_JPEG_SAVING_RATIO = 0.70
 
   def convert_to_jpeg!
-
-    if filesize < MIN_CONVERT_TO_JPEG_BYTES_SAVED
-      return
-    end
+    return if filesize < MIN_CONVERT_TO_JPEG_BYTES_SAVED
 
     jpeg_tempfile = Tempfile.new(["image", ".jpg"])
 
@@ -289,7 +283,6 @@ class UploadCreator
 
   def crop!
     max_pixel_ratio = Discourse::PIXEL_RATIOS.max
-
     filename_with_correct_ext = "image.#{@image_info.type}"
 
     case @opts[:type]
diff --git a/lib/version.rb b/lib/version.rb
index 30aa4a0156..3618774673 100644
--- a/lib/version.rb
+++ b/lib/version.rb
@@ -5,7 +5,7 @@ module Discourse
       MAJOR = 2
       MINOR = 2
       TINY  = 0
-      PRE   = 'beta7'
+      PRE   = 'beta8'
 
       STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
     end
diff --git a/package.json b/package.json
index c0b084f768..8aa4b7eef3 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,8 @@
     "bootbox": "3.2.0",
     "chart.js": "2.7.2",
     "favcount": "https://github.com/chrishunt/favcount",
-    "handlebars": "4.0.5",
+    "handlebars": "4.0.12",
+    "highlight.js": "https://github.com/highlightjs/highlight.js",
     "htmlparser": "https://github.com/tautologistics/node-htmlparser",
     "intersection-observer": "^0.5.1",
     "jquery": "3.3.1",
@@ -35,7 +36,7 @@
     "pretender": "^1.6",
     "prettier": "1.14.3",
     "puppeteer": "1.4",
-    "qunit": "2.6",
+    "qunit": "2.8.0",
     "route-recognizer": "^0.3.3",
     "sinon": "^6.3.5"
   },
diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
index 29be6000b4..1d03c8e24a 100644
--- a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
@@ -113,7 +113,7 @@
 <div class="modal-footer discourse-local-dates-create-modal-footer">
   {{#if isValid}}
     {{d-button class="btn btn-default"
-      action="save"
+      action=(action "save")
       label="discourse_local_dates.create.form.insert"}}
   {{/if}}
 
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ar.yml b/plugins/discourse-narrative-bot/config/locales/server.ar.yml
index 4cb5c58cfb..237fbc4c48 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ar.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ar.yml
@@ -138,12 +138,6 @@ ar:
       reset_trigger: "تدريب العضو جديد"
       cert_title: "في اعتراف بأتمام ناجح للدرس التعليمي للاعضاء الجدد"
       onebox:
-        instructions: |-
-          التالي, هل يمكنك ان تشارك احد هذه الروابط معي؟ رد مع **وضع الرابط في سطر منفصل**, و سيظهر ملخص للصفحة المشير اليها.
-
-          - https://en.wikipedia.org/wiki/Inherently_funny_word
-          - https://en.wikipedia.org/wiki/Death_by_coconut
-          - https://en.wikipedia.org/wiki/Calculator_spelling
         not_found: |-
           عذرا, انا لم اجد الرابط في ردك! :cry:
 
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ca.yml b/plugins/discourse-narrative-bot/config/locales/server.ca.yml
index 87cc446226..e356baf504 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ca.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ca.yml
@@ -141,14 +141,6 @@ ca:
       reset_trigger: "nou usuari"
       cert_title: "En reconeixement per haver completat satisfactòriament el tutorial de nou usuari"
       onebox:
-        instructions: |-
-          Seguidament, pots compartir un d'aquests enllaços amb mi? Respon amb  **un enllaç d'una línia sense res més**, i s'expandirà automàticament per incloure un breu resum.
-
-          Per copiar un enllaç, punteja i mantingues al mòbil o fes clic amb el botó dret del ratolí:
-
-          - https://ca.wikipedia.org/wiki/Patufeta
-          - https://ca.wikipedia.org/wiki/Botifarra_dolça
-          - https://ca.wikipedia.org/wiki/Ortografia_de_la_calculadora
         reply: |-
           Genial! Això funcionarà per a la majoria d'enllaços <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-link.png" width="16" height="16">. Recorda, ha d'estar en una línia _tot per si mateix_, res a davant, ni a darrere.
         not_found: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.cs.yml b/plugins/discourse-narrative-bot/config/locales/server.cs.yml
index 1b10ca71a2..bbcf40992d 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.cs.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.cs.yml
@@ -119,5 +119,17 @@ cs:
           Bohužel nejsem naprogramován nijak skvěle, takže jsem tomuhle neporozumněl. :frowning:
     new_user_narrative:
       reset_trigger: "nový uživatel"
+      hello:
+        message: |-
+          Díky, že jste se rozhodli zaregistrovat do fóra %{title} a vítejte!
+
+          - Já jsem jenom robot, ale [náš přátelský tým](%{base_uri}/about) je tu taky připraven pomoct, kdykoliv budete potřebovat.
+
+          - Z bezpečnostních důvodů dočasně omezujeme práva nově registrovaných uživatelů. Jak Tě budeme znát víc, budeš dostávat nové dovednosti a [odznaky](%{base_uri}/badges)).
+
+          - Na našem fóru ctíme [zásady slušného chování](%{base_uri}/guidelines) za každých podmínek.
+      bookmark:
+        instructions: |-
+          Pokud by ses chtěl dozvědět víc, klikni na <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> níže  a <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **ulož si tuto soukromou zprávu do záložek**.  Pokud to uděláš, je možný, že tam v budoucnu najdeš :gift:!
     advanced_user_narrative:
       reset_trigger: 'pokročilý uživatel'
diff --git a/plugins/discourse-narrative-bot/config/locales/server.de.yml b/plugins/discourse-narrative-bot/config/locales/server.de.yml
index 96b675fe4b..9c0cb9fddd 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.de.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.de.yml
@@ -153,14 +153,6 @@ de:
 
           - Wir glauben an [zivilisiertes Community-Verhalten](%{base_uri}/guidelines) zu allen Zeiten.
       onebox:
-        instructions: |-
-          Als Nächstes: Kannst du einen dieser Links mit mir teilen? Antworte mit **einem Link auf einer eigenen Zeile**, und er wird automatisch in eine hübsche, kurze Inhaltsangabe erweitert.
-
-          Um einen Link zu kopieren, tippe und halte auf mobilen Geräten, oder klicke rechts mit deiner Maus:
-
-          - https://de.wikipedia.org/wiki/Antiwitz
-          - https://de.wikipedia.org/wiki/Tetraphobie
-          - https://de.wikipedia.org/wiki/Beghilos
         reply: |-
           Schick! Das wird für die meisten <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-link.png" width="16" height="16">-Links funktionieren. Denke daran, dass er auf einer _ganz eigenen_ Zeile stehen muss, ohne etwas davor oder dahinter.
         not_found: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.el.yml b/plugins/discourse-narrative-bot/config/locales/server.el.yml
index fb08bd4665..b088b22933 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.el.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.el.yml
@@ -141,14 +141,6 @@ el:
       reset_trigger: "νέος χρήστης"
       cert_title: "Σε αναγνώριση της επιτυχούς ολοκλήρωσης\nτης εκπαίδευσης νέου χρήστη."
       onebox:
-        instructions: |-
-          Στην συνέχεια, θα ήθελες να μοιραστείς έναν από τους παρακάτω συνδέσμους μαζί μου; Απάντησέ μου και βάλε έναν **σύνδεσμο σε μια γραμμή μόνο του** ο οποίος αυτόματα θα επεκταθεί ώστε να εμπεριέχει και μια σύντομη περίληψη.
-
-          Για να αντιγράψεις έναν σύνδεσμο, κράτα το δάχτυλο επάνω του σε μια φορητή συσκευή και επίλεξε "αντιγραφή" ή κάνε δεξί κλικ και "αντιγραφή" με το ποντίκι και μετά κάνε δεξί κλικ και "επικόλληση" στο μήνυμά σου:
-
-          - https://en.wikipedia.org/wiki/Inherently_funny_word
-          - https://en.wikipedia.org/wiki/Death_by_coconut
-          - https://en.wikipedia.org/wiki/Calculator_spelling
         reply: |-
           Τέλεια! Αυτό θα λειτουργήσει με τους περισσοτερους <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-link.png" width="16" height="16"> συνδέσμους. Να θυμάσαι, ο σύνδεσμος πρέπει να είναι σε μια γραμμή _μόνος του_, χωρίς κάτι άλλο από εμπρός ή στο τέλος.
         not_found: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.en.yml b/plugins/discourse-narrative-bot/config/locales/server.en.yml
index 87c794f23c..00b1bf1d84 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.en.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.en.yml
@@ -163,11 +163,11 @@ en:
         instructions: |-
           Next, can you share one of these links with me? Reply with **a link on a line by itself**, and it’ll automatically expand to include a nifty summary.
 
-          To copy a link, tap and hold on mobile, or right click your mouse:
+          To copy any link, tap and hold on mobile, or right click your pointing device:
 
-          - https://en.wikipedia.org/wiki/Inherently_funny_word
-          - https://en.wikipedia.org/wiki/Death_by_coconut
-          - https://en.wikipedia.org/wiki/Calculator_spelling
+           <https://en.wikipedia.org/wiki/Inherently_funny_word>
+           <https://en.wikipedia.org/wiki/Death_by_coconut>
+           <https://en.wikipedia.org/wiki/Calculator_spelling>
         reply: |-
           Cool! This will work for most <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-link.png" width="16" height="16"> links. Remember, it must be on a line _all by itself_, with nothing else in front, or behind.
         not_found: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.es.yml b/plugins/discourse-narrative-bot/config/locales/server.es.yml
index 30ce533929..a20eff96e4 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.es.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.es.yml
@@ -29,6 +29,7 @@ es:
     timeout:
       message: |-
         Hey @%{username}, solo estoy verificando si estás porque no he oído de tí en un tiempo.
+
         - Para continuar, responde en cualquier momento.
 
         - Si gustas de saltar este paso, dime `%{skip_trigger}`.
@@ -41,9 +42,9 @@ es:
       invalid: |-
         Lo siento, es matemáticamente imposible lanzar esa combinación de dados. :confounded:
       not_enough_dice: |-
-        Solo tengo %{num_of_dice} dados para jugar. Es vergonsozo lo sé!
+        Solo tengo %{num_of_dice} dados para jugar. Es [vergonzoso]((http://www.therobotsvoice.com/2009/04/the_10_most_shameful_rpg_dice.php)) lo sé!
       out_of_range: |-
-        ¿Sabías que el máximo número de lados para que un dado, matemáticamente correcto, es de 120 lados?
+        ¿Sabías que [el máximo número de lados](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) para que un dado, matemáticamente correcto, es de 120 lados?
       results: |-
         > :game_die: %{results}
     quote:
@@ -111,7 +112,7 @@ es:
       help_trigger: 'mostrar ayuda'
       random_mention:
         reply: |-
-          ¿Alguien me llamó? Averigua qué puedo hacer con `@%{discobot_username} %{help_trigger}`.
+          ¡Hola! Para averiguar qué puedo hacer, escribe `@%{discobot_username} %{help_trigger}`.
         tracks: |-
           Hola! Estoy conociendo cómo hacer las siguientes cosas:
 
@@ -128,11 +129,11 @@ es:
           > :crystal_ball: No se puede predecir ahora
       do_not_understand:
         first_response: |-
-          Hey, gracias por tu respuesta!
+          Oye, ¡gracias por tu respuesta!
           Lamentablemente, como un robot con programación muy pobre, no he podido entender lo que me has dicho. :frowning:
         track_response: Puedes intentarlo de nuevo, o bien para saltar este paso, dime `%{skip_trigger}`. Para empezar de nuevo, dime `%{reset_trigger}`.
         second_response: |-
-          Aw, lo siento. Sigo sin entenderlo. :anguished:
+          Vaya, lo siento. Sigo sin entenderlo. :anguished:
 
           Soy solo un robot, pero si quieres contactar a una persona real, mira [nuestra página de contacto](%{base_path}/about).
 
@@ -142,6 +143,7 @@ es:
       title: "Certificado de completación para el nuevo usuario"
       cert_title: "En reconocimiento de la finalización exitosa del tutorial de usuario nuevo"
       hello:
+        title: "¡Saludos!"
         message: |-
           Gracias por unirte a %{title}, y bienvenido!
 
@@ -151,13 +153,6 @@ es:
 
           - Nosotros creemos en el [comportamiento de una comunidad civilizada](%{base_uri}/guidelines) en todo momento.
       onebox:
-        instructions: |-
-          Ahora, tú puedes compartir uno de estos enlaces conmigo? Responde con **el enlace propiamente dicho**, y automáticamente se expandirá con un breve resumen.
-          Para copiar un enlace, toca y mantiene presionado en el móvil, o haz clic derecho con tu mouse:
-
-          - https://en.wikipedia.org/wiki/Inherently_funny_word
-          - https://en.wikipedia.org/wiki/Death_by_coconut
-          - https://en.wikipedia.org/wiki/Calculator_spelling
         reply: |-
           ¡Genial! Esto funcionará en la mayoría de los <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-link.png" width="16" height="16"> enlaces. Recuerda que debe ser colocado el enlace en una _linea aparte_, sin texto ni espacios delante ni atrás del enlace.
         not_found: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.fa_IR.yml b/plugins/discourse-narrative-bot/config/locales/server.fa_IR.yml
index c3fb93f2f7..30ce147d4a 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.fa_IR.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.fa_IR.yml
@@ -140,14 +140,6 @@ fa_IR:
       reset_trigger: "کاربر جدید"
       cert_title: "با توجه به اتمام موفقیت آمیز راهنمای جدید کاربران"
       onebox:
-        instructions: |-
-          در ادامه، میتوانی یکی از پیوند های زیر را با من به اشتراک بگذاری؟ اگر طوری پاسخ بدهی که پیوند **تنها و بدون پس و پیش در یک خط** باشد، به طور اتوماتیک باز می‌شود و خلاصه ای از محتوای آن اضافه می‌گردد.
-
-          برای کپی کردن پیوند، در موبایل انگشتت را روی لینک نگه دار، و یا با موس کلیک راست کن.
-
-          - https://en.wikipedia.org/wiki/Inherently_funny_word
-          - https://en.wikipedia.org/wiki/Death_by_coconut
-          - https://en.wikipedia.org/wiki/Calculator_spelling
         reply: |-
           عالی! این کار برای اکثر پیوندها <img src="%{base_uri}/images/font-awesome-link.png" width="16" height="16"> صدق میکنه. به یاد داشته باش که لینک بایستی در یک خط به تنهایی و _بدون پس و پیش_ قرار بگیرد.
         not_found: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.fi.yml b/plugins/discourse-narrative-bot/config/locales/server.fi.yml
index 1900e30619..da034a0291 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.fi.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.fi.yml
@@ -94,6 +94,7 @@ fi:
         '8': "Siltä näyttäisi"
         '9': "Kyllä"
         '10': "Merkit viittaavat siihen suuntaan"
+        '11': "Näky epäselvä, yritä uudelleen"
         '12': "Palaa myöhemmin asiaan"
         '13': "Parempi, etten kerro vielä"
         '14': "En pysty sanomaan juuri nyt"
@@ -140,16 +141,19 @@ fi:
           En häiritse sinua enempää nyt.
     new_user_narrative:
       reset_trigger: "peruskurssi"
+      title: "Diplomi peruskurssin suorittamisesta"
       cert_title: "Tunnustuksena palstan käytön peruskurssin menestyksekkäästä suorittamisesta"
+      hello:
+        title: "Tervehdys!"
+        message: |-
+          Kiitos kun liityit sivustollemme %{title}. Tervetuloa!
+
+          - Olen vain robotti, mutta [avulias henkilökunta](%{base_uri}/about) auttaa myös mielellään, jos sinulla on asiaa heille.
+
+          - Turvallisuussyistä uusi käyttäjä ei voi tehdä ihan kaikkea. Saat uusia toimintoja käyttöösi (ja [ansiomerkkejä](%{base_uri}/badges)) kun tutustumme sinuun.
+
+          - Vannomme [sivistyneen yhteisökäyttäytymisen](%{base_uri}/guidelines) nimeen kaikissa tilanteissa.
       onebox:
-        instructions: |-
-          Voisitko nyt jakaa jonkun seuraavista linkeistä minulle? Laita vastaukseesi **linkin osoite yksin omalle rivilleen**, jolloin siitä muotoillaan automaattisesti kätevä tiivistelmälaatikko.
-
-          Kopioi linkki mobiililaitteella koskettamalla sitä hetken aikaa, tai klikkaa sitä hiiresi oikealla painikkeella:
-
-          - https://en.wikipedia.org/wiki/Inherently_funny_word
-          - https://en.wikipedia.org/wiki/Death_by_coconut
-          - https://en.wikipedia.org/wiki/Calculator_spelling
         reply: |-
           Siistiä! Suurin osa <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-link.png" width="16" height="16"> linkeistä käyttäytyy samoin. Muista, että sen tulee olla _yksin omalla rivillään_; mitään ei saa olla rivillä ennen sitä tai sen jälkeen.
         not_found: |-
@@ -253,6 +257,8 @@ fi:
           >  :imp: Kirjoitin tähän jotain tuhmaa.
 
           Tiedät mitä tehdä. **Liputa tämä viesti** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16"> sopimattomaksi!
+        reply: |-
+          [Henkilökuntamme](%{base_uri}/groups/staff) saa ei-julkisen ilmoituksen lipusta. Jos riittävän moni yhteisön jäsen liputtaa viestin, sekin riittää viestin automaattiseen piilottamiseen varotoimena. (Koska en oikeasti kirjoittanut mitään tuhmaa :angel:, menin ja poistin liputuksesi.)
         not_found: |-
           Oh no, my nasty post hasn’t been flagged yet. :worried: Can you flag it as inappropriate using the **flag** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16">? Don’t forget to use the show more button <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> to reveal more actions for each post.
       search:
@@ -276,12 +282,25 @@ fi:
           - Jos sinulla on fyysinen :keyboard:, tarkastele käteviä näppäinoikoteitä painamalla <kbd>?</kbd>.
         not_found: |-
           Hm… sinulla vaikuttaa olevan vaikeuksia. Pahoitteluni. Haitko <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> hakusanalla **kapy&#8203;bara**?
+      end:
+        message: |-
+          Kiitos kun jaksoit loppuun asti @%{username}! Tein tämän sinulle, minusta olet ansainnut sen:
+
+          %{certificate}
+
+          Siinä kaikki tältä erää! Tsekkaa [**tuoreimmat ketjut**](%{base_uri}/latest) tai tutki [**keskustelualueita**](%{base_uri}/categories). :sunglasses:
+
+          (Jos haluat vielä jutella kanssani ja oppia lisää, lähetä minulle `@%{discobot_username}` yksityisviesti tai mainitse minut koska vain!)
       certificate:
         alt: 'Diplomi'
     advanced_user_narrative:
       reset_trigger: 'jatkokurssi'
       cert_title: "Tunnustuksena palstan käytön jatkokurssin menestyksekkäästä suorittamisesta"
       title: ':arrow_up: Jatkokurssi'
+      start_message: |-
+        _Edistynyt_ käyttäjä kun olet, oletko @%{username} jo käynyt [käyttäjäasetussivulla](%{base_uri}/my/preferences)? Siellä voit mukauttaa sivustoa makusi mukaan monilla tavoin, esimerkiksi valita tumman ja vaalean teeman väliltä.
+
+        Vaan eipä harhauduta asiasta vaan aloitetaan!
       edit:
         bot_created_post_raw: "@%{discobot_username} on ylivoimaisesti mahtavin botti, jonka tiedän. :wink:"
         instructions: |-
@@ -341,6 +360,10 @@ fi:
           Kokeillaanpa vaihtaa tämän ketjun ilmoitustasoa. Ketjun alla on painike, joka näyttää sinun tarkkailevan tätä ketjua. Vaihda ilmoitustasoksi **seurataan**.
         not_found: |-
           Näytät yhä tarkkailevan :eyes: tätä ketjua! Jollet meinaa löytää sitä, ilmoitustasopainike sijaitsee ketjun alla.
+        reply: |-
+          Mahtavaa! Toivottavasti et kuitenkaan vaimentanut tätä ketjua, vaikka saatan välillä olla vähän liiankin puhelias. :grin:.
+
+          Huomioi, että kun vastaat ketjuun tai luet sitä kauemmin kuin muutaman minuutin ajan, se saa automaattisesti ilmoitustasokseen 'seurataan'. Tätä voi säätää [käyttäjäasetuksissa](%{base_uri}/my/preferences).
       poll:
         instructions: |-
           Tiesitkö, että viesteihin voi lisätä äänestyksiä? **Luo äänestys** valitsemalla viestieditorin <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> hammasrataskuvake.
diff --git a/plugins/discourse-narrative-bot/config/locales/server.fr.yml b/plugins/discourse-narrative-bot/config/locales/server.fr.yml
index 9fe70f7cdf..48394a126d 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.fr.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.fr.yml
@@ -153,14 +153,6 @@ fr:
 
           - Nous croyons en [un comportement communautaire civilisé](%{base_uri}/guidelines) de tout temps.
       onebox:
-        instructions: |-
-          Maintenant, pouvez-vous partager l'un de ces liens avec moi ? Répondez avec **un lien sur une ligne vide**, et il sera automatiquement transformé pour inclure un astucieux résumé.
-
-          Pour copier un lien, tapez et maintenant appuyé sur mobile, ou utilisez le clic droit de votre souris:
-
-          - https://fr.wikipedia.org/wiki/Jeu_de_mots
-          - https://fr.wikipedia.org/wiki/Liste_de_morts_insolites
-          - https://fr.wikipedia.org/wiki/Orthographe_pour_calculatrice
         reply: |-
           Super ! Ça fonctionne pour la plupart <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-link.png" width="16" height="16"> des liens. N'oubliez pas, ils doivent être sur une ligne _vide_, sans rien devant, ni derrière.
         not_found: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.he.yml b/plugins/discourse-narrative-bot/config/locales/server.he.yml
index 764dde8f80..3cce1b2b4c 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.he.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.he.yml
@@ -139,15 +139,6 @@ he:
     new_user_narrative:
       reset_trigger: "משתמש/ת חדש/ה"
       cert_title: "כהוקרה על סיום מוצלח של מדריך המשתמשים החדש"
-      onebox:
-        instructions: |-
-          כעת, האם תוכלו לשתף את אחד הקישורים האלו איתי? השיבו עם **קישור בשורה בפני עצמו**, והוא יפתח לכלול סיכום.
-
-          להעתקת קישור, לחצו והחזיקו במכשיר נייד, או לחצו עם הכפתור הימני של העכבר:
-
-          - https://en.wikipedia.org/wiki/Inherently_funny_word
-          - https://en.wikipedia.org/wiki/Death_by_coconut
-          - https://en.wikipedia.org/wiki/Calculator_spelling
       images:
         reply: |-
           תמונה שווה - לחצתי על כפתור :heart: הלייק כדי שתדעו כמה אני מעריך זאת :heart_eyes:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.id.yml b/plugins/discourse-narrative-bot/config/locales/server.id.yml
index 812f7e3a73..5d85a2d44a 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.id.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.id.yml
@@ -139,15 +139,6 @@ id:
     new_user_narrative:
       reset_trigger: "pengguna baru"
       cert_title: "Tercatat telah berhasil menyelesaikan panduan pengguna baru."
-      onebox:
-        instructions: |-
-          Selanjutnya, bisakah Anda membagikan salah satu tautan ini kepada saya? Balas dengan **a link on a line by itself**, otomatis tautan itu akan menjelaskan ringkasan yang menarik.
-
-          Untuk menyalin sebuah tautan, tekan dan tahan pada ponsel, atau klik kanan pada tetikus:
-
-          - https://en.wikipedia.org/wiki/Inherently_funny_word
-          - https://en.wikipedia.org/wiki/Death_by_coconut
-          - https://en.wikipedia.org/wiki/Calculator_spelling
       images:
         reply: |-
           Gambar yang menarik – Saya telah menekan tombol :heart: supaya Anda tahu kalau saya menghargainya :heart_eyes:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.it.yml b/plugins/discourse-narrative-bot/config/locales/server.it.yml
index 56c4c303fc..2875f44650 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.it.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.it.yml
@@ -143,6 +143,7 @@ it:
       reset_trigger: "nuovo utente"
       cert_title: "In riconoscimento del successo nel completamento del tutorial come nuovo utente"
       hello:
+        title: "Saluti!"
         message: |-
           Grazie per esserti unito a %{title}, e benvenuto!
 
@@ -152,14 +153,6 @@ it:
 
           - Noi crediamo in una [comunità dal comportamento civile](%{base_uri}/guidelines) in ogni momento.
       onebox:
-        instructions: |-
-          Adesso, puoi condividere uno di questi collegamenti con me? Rispondi con **un collegamento su una riga a sé stante**, e verrà automaticamente espanso per includere un bel sommario.
-
-          Per copiare un collegamento, toccalo e tienilo premuto su mobile, o fai click col tasto destro del mouse:
-
-          - https://it.wikipedia.org/wiki/Italia
-          - https://it.wikipedia.org/wiki/Pagina_principale
-          - https://it.wikipedia.org/wiki/Traduzione
         reply: |-
           Fantastico! Funziona per la maggior parte dei  <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-link.png" width="16" height="16"> collegamenti. Ricorda, deve essere su una riga _da solo_, senza niente né davanti né dietro.
         not_found: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ko.yml b/plugins/discourse-narrative-bot/config/locales/server.ko.yml
index 807018f1fd..e776436002 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ko.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ko.yml
@@ -141,14 +141,6 @@ ko:
       reset_trigger: "새로운 사용자"
       cert_title: "새로운 사용자 튜토리얼을 성공적으로 마친 것에 대한 보상으로"
       onebox:
-        instructions: |-
-          자 이제, 이 링크 중 하나를 나한테 공유해볼래? 한줄 당 링크 하나씩 써서 답글을 써봐. 그러면 자동으로 해당 페이지의 요약이 추가된단다.
-
-          링크를 복사하려면, 링크 위에서 마우스 우클릭을 하면 돼. 모바일에서는 링크를 계속 누르고 있으면 되고.
-
-          - https://en.wikipedia.org/wiki/Inherently_funny_word
-          - https://en.wikipedia.org/wiki/Death_by_coconut
-          - https://en.wikipedia.org/wiki/Calculator_spelling
         reply: |-
           좋았어! 이건 대부분의 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-link.png" width="16" height="16"> 링크에 대해서 작동해.  딱 링크로만 된 한줄이어야만 한다는 걸 명심해. 앞이나 뒤에 다른게 있어서는 안돼.
         not_found: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.nb_NO.yml b/plugins/discourse-narrative-bot/config/locales/server.nb_NO.yml
index e8655fd88e..38cf987ad1 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.nb_NO.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.nb_NO.yml
@@ -141,14 +141,6 @@ nb_NO:
       reset_trigger: "ny bruker"
       cert_title: "Som bevis for vellykket gjennomføring av introduksjonen for nye brukere"
       onebox:
-        instructions: |-
-          Neste steg, kan du dele en av disse lenkene med meg? Svar med **en frittstående lenke på en ny linje**, da vil den automatisk utvides til å inkludere et stilig sammendrag.
-
-          For å kopiere en lenke, trykk og hold på den med en mobil enhet, eller høyreklikk med en gammeldags mus:
-
-          - https://en.wikipedia.org/wiki/Inherently_funny_word
-          - https://en.wikipedia.org/wiki/Death_by_coconut
-          - https://en.wikipedia.org/wiki/Calculator_spelling
         reply: |-
           Kult! Dette fungerer for de aller fleste <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-link.png" width="16" height="16"> lenkene. Bare husk at de må ha en linje _helt for seg selv_ når du limer dem inn, uten noe annet foran eller bak.
         not_found: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.pl_PL.yml b/plugins/discourse-narrative-bot/config/locales/server.pl_PL.yml
index 1059bd4557..d105cadcba 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.pl_PL.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.pl_PL.yml
@@ -141,14 +141,6 @@ pl_PL:
       reset_trigger: "nowy użytkownik"
       cert_title: "W podziękowaniu za skończony samouczek"
       onebox:
-        instructions: |-
-          Następnie, czy możesz udostępnić mi jeden z poniższych linków? Odpowiedz przy użyciu **link**, a automatycznie zostanie dodane dobre podsumowanie.
-
-          Aby skopiować link, naciśnij i przytrzymaj na telefonie, lub kliknij prawym przyciskiem myszy.
-
-          - https://en.wikipedia.org/wiki/Inherently_funny_word
-          - https://en.wikipedia.org/wiki/Death_by_coconut
-          - https://en.wikipedia.org/wiki/Calculator_spelling
         not_found: |-
           Przepraszam, nie mogłem znaleźć linku w twojej odpowiedzi!
           :cry:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.pt_BR.yml b/plugins/discourse-narrative-bot/config/locales/server.pt_BR.yml
index cf111945fb..610df2ecbd 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.pt_BR.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.pt_BR.yml
@@ -150,14 +150,6 @@ pt_BR:
 
           - Nós acreditamos em um [comportamento civilizado em comunidade](%{base_uri}/guidelines) a todo momento.
       onebox:
-        instructions: |-
-          Em seguida, você pode compartilhar um desses links comigo? Responda com ** um link em uma linha sozinho ** e ele será expandido automaticamente para incluir um resumo interessante.
-
-          Para copiar um link, toque e segure no celular ou clique com o botão direito do mouse:
-
-          - https://en.wikipedia.org/wiki/Inherently_funny_word
-          - https://en.wikipedia.org/wiki/Death_by_coconut
-          - https://en.wikipedia.org/wiki/Calculator_spelling
         reply: |-
           Legal! isto vai funcionar para a maioria dos links. Lembre-se, deve estar na linha _all by itself_, com nada na frente ou atrás.
         not_found: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ru.yml b/plugins/discourse-narrative-bot/config/locales/server.ru.yml
index 9a36b0b99b..25aecf579e 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ru.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ru.yml
@@ -149,14 +149,6 @@ ru:
 
           - Мы верим в [цивилизованном поведении](%{base_uri}/guidelines) в нашем сообществе.
       onebox:
-        instructions: |-
-          Далее, вы можете поделиться одну из этих ссылок со мной? Ответить мне с **ссылкой с новой строки**.  Эти ссылки добавят отличный обзор.
-
-          Чтобы скопировать ссылку, нажмите и удерживайте на мобильном, или правой кнопкой мыши:
-
-          - https://en.wikipedia.org/wiki/Inherently_funny_word
-          - https://en.wikipedia.org/wiki/Death_by_coconut
-          - https://en.wikipedia.org/wiki/Calculator_spelling
         reply: |-
           Здорово! Это будет работать для большинства <img src="%{base_uri}/images/font-awesome-link.png" width="16" height="16"> ссылок. Помните, ссылка должна быть на одной линии _и_, ничего позади или впереди не должно находиться.
         not_found: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.sw.yml b/plugins/discourse-narrative-bot/config/locales/server.sw.yml
index deacf8ec98..0c8177cd41 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.sw.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.sw.yml
@@ -138,14 +138,6 @@ sw:
       reset_trigger: "mtumiaji mpya"
       cert_title: "Utambulisho wa kumaliza mafunzo ya mtumiaji mpya"
       onebox:
-        instructions: |-
-          Baada ya hapo, je unaweza kunipa hivi viungo na mimi? Jibu na **kila kiungo kwenye mstari wake**, na itaongezeka kuonyesha muhtasari kuhusiana na hicho kiungo.
-
-          Kunakili kiungo, bonyeza bila kuachia kwenye simu yako ya mkononi, au bonyeza upande wa kulia wa puku ya komputa yako:
-
-          - https://en.wikipedia.org/wiki/Inherently_funny_word
-          - https://en.wikipedia.org/wiki/Death_by_coconut
-          - https://en.wikipedia.org/wiki/Calculator_spelling
         reply: |-
           Vizuri! Hii itafaa kwa <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-link.png" width="16" height="16"> viungo. Kumbuka, inabidi kiwe kwenye mstari mmoja _yenyewe_, bila maneno yoyote mbele, au nyuma yake.
         not_found: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ur.yml b/plugins/discourse-narrative-bot/config/locales/server.ur.yml
index 5d9c97db6b..9a2ab449ac 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ur.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ur.yml
@@ -141,14 +141,6 @@ ur:
       reset_trigger: "نیا صارف"
       cert_title: "نیا صارف ٹیوٹوریل کی کامیاب تکمیل کے اعتراف میں"
       onebox:
-        instructions: |-
-          پھر، کیا آپ اِن لنکس میں سے ایک میرے ساتھ شئیر کر سکتے ہیں؟ **ایک لائن پر ایک لنک** کے طور پر جواب دیں، اور یہ خود بخود اُس کا ایک اچھا خلاصہ شامل کردے گا۔
-
-          ایک لنک کاپی کرنے کیلئے، موبائل پرٹَیپ اور ہولڈ کریں یا اپنے ماؤز پر دایاں کلک کریں:
-
-          - https://en.wikipedia.org/wiki/Inherently_funny_word
-          - https://en.wikipedia.org/wiki/Death_by_coconut
-          -  https://en.wikipedia.org/wiki/Calculator_spelling
         reply: |-
           یہ زیادہ تر <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-link.png" width="16" height="16"> لنکس کے لئے کام کرے گا۔ یاد رہے کہ یہ ایک لائن پر _صرف اکیلا_ ہونا چاہئے، بغیر اس کے سامنے یا پیچھے کچھ ہوے۔
         not_found: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.zh_CN.yml b/plugins/discourse-narrative-bot/config/locales/server.zh_CN.yml
index 1a2b22e92d..87dbe36310 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.zh_CN.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.zh_CN.yml
@@ -145,22 +145,14 @@ zh_CN:
       cert_title: "你已经成功完成新用户教程了"
       hello:
         message: |-
-          感谢你加入%{title}，欢迎！
+          感谢加入%{title}， 欢迎！
 
-          - 我只是一个机器人，但[我们友好的工作人员](%{base_uri}/ 关于）也可以帮到你，如果你需要接触一个人。
+          - 我只是个机器人，但是如果你需要真人帮助，请找找[我们友善的管理人员](%{base_uri}/about)帮忙。
 
-          - 出于安全原因，我们暂时限制新用户可以执行的操作。 当我们了解你时，你将获得新的能力（以及[徽章](%{base_uri}/badges)）。
+          - 出于安全考虑，我们暂时限制了新用户能使用的功能。当我们更了解你的时候，你就可以使用更多功能（和 [徽章](%{base_uri}/badges)）了。
 
-          - 我们始终相信[文明社区行为](%{base_uri}/指南)。
+          - 我们始终相信[文明社区行为准则](%{base_uri}/guidelines)。
       onebox:
-        instructions: |-
-          接下来，你能分享下列链接给我么？回复**单独一行的链接**，然后它会自动展开显示一个有用的摘要。
-
-          要复制链接，在移动端点击并且保持，或者用你的鼠标右键：
-
-          - https://en.wikipedia.org/wiki/Inherently_funny_word
-          - https://en.wikipedia.org/wiki/Death_by_coconut
-          - https://en.wikipedia.org/wiki/Calculator_spelling
         reply: |-
           酷！这对许多<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-link.png" width="16" height="16">链接都管用。请记住，它必须占**单独的一行**，前后都没东西。
         not_found: |-
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
index 5c69c90099..2eb963b277 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
+++ b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
@@ -9,8 +9,6 @@ export const keepAliveDuration = 10000;
 export const bufferTime = 3000;
 
 export default Ember.Component.extend({
-  composer: Ember.inject.controller(),
-
   // Passed in variables
   action: null,
   post: null,
diff --git a/plugins/discourse-presence/assets/stylesheets/presence.scss b/plugins/discourse-presence/assets/stylesheets/presence.scss
index e26da30b92..fdd8de25be 100644
--- a/plugins/discourse-presence/assets/stylesheets/presence.scss
+++ b/plugins/discourse-presence/assets/stylesheets/presence.scss
@@ -49,7 +49,7 @@
 .composer-fields .presence-users {
   position: absolute;
   top: 20px;
-  right: 75px;
+  right: 95px;
   @media screen and (max-width: $small-width) {
     max-width: 318px;
     .presence-avatars {
diff --git a/plugins/discourse-presence/config/locales/client.pl_PL.yml b/plugins/discourse-presence/config/locales/client.pl_PL.yml
index 9228a9d70f..ffedc92b4f 100644
--- a/plugins/discourse-presence/config/locales/client.pl_PL.yml
+++ b/plugins/discourse-presence/config/locales/client.pl_PL.yml
@@ -10,3 +10,8 @@ pl_PL:
     presence:
       replying: "odpowiada"
       editing: "edytuje"
+      replying_to_topic:
+        one: "odpowiada"
+        few: "odpowiadają"
+        many: "odpowiadają"
+        other: "odpowiadają"
diff --git a/plugins/discourse-presence/config/locales/server.fi.yml b/plugins/discourse-presence/config/locales/server.fi.yml
index 51fb1162a4..56d5ac5f20 100644
--- a/plugins/discourse-presence/config/locales/server.fi.yml
+++ b/plugins/discourse-presence/config/locales/server.fi.yml
@@ -8,3 +8,4 @@
 fi:
   site_settings:
     presence_enabled: 'Näytä ketkä parhaillaan kirjoittavat tai muokkaavat viestiä ketjussa, jossa käyttäjä on?'
+    presence_max_users_shown: 'Kuinka monta käyttäjää enintään näytetään.'
diff --git a/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs b/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
index b4c913b75c..142f7f3ffa 100644
--- a/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
+++ b/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
@@ -82,5 +82,5 @@
 {{/d-modal-body}}
 
 <div class="modal-footer">
-  {{d-button action="insertPoll" icon="chart-bar" class='btn-primary' label='poll.ui_builder.insert' disabled=disableInsert}}
+  {{d-button action=(action "insertPoll") icon="chart-bar" class='btn-primary' label='poll.ui_builder.insert' disabled=disableInsert}}
 </div>
diff --git a/plugins/poll/assets/javascripts/initializers/add-poll-ui-builder.js.es6 b/plugins/poll/assets/javascripts/initializers/add-poll-ui-builder.js.es6
index 6aeb6ee3e0..adb3fb869d 100644
--- a/plugins/poll/assets/javascripts/initializers/add-poll-ui-builder.js.es6
+++ b/plugins/poll/assets/javascripts/initializers/add-poll-ui-builder.js.es6
@@ -29,7 +29,7 @@ function initializePollUIBuilder(api) {
     }
   });
 
-  api.addToolbarPopupMenuOptionsCallback(function() {
+  api.addToolbarPopupMenuOptionsCallback(() => {
     return {
       action: "showPollBuilder",
       icon: "chart-bar",
diff --git a/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6 b/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6
index 760c3390b5..edd99f16f9 100644
--- a/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6
+++ b/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6
@@ -44,7 +44,7 @@ function initializePolls(api) {
           if (existing) {
             this._polls[p.name].setProperties(p);
           } else {
-            this._polls[p.name] = Em.Object.create(p);
+            this._polls[p.name] = Ember.Object.create(p);
           }
         });
         this.set("pollsObject", this._polls);
diff --git a/plugins/poll/config/locales/client.fi.yml b/plugins/poll/config/locales/client.fi.yml
index dff4cee3e0..d121e0fe83 100644
--- a/plugins/poll/config/locales/client.fi.yml
+++ b/plugins/poll/config/locales/client.fi.yml
@@ -15,6 +15,13 @@ fi:
         one: "ääni"
         other: "ääntä"
       average_rating: "Keskiarvo: <strong>%{average}</strong>"
+      public:
+        title: "Äänet ovat <strong>julkisia</strong>."
+      results:
+        vote:
+          title: "Näet äänet, kun <strong>olet äänestänyt</strong>."
+        closed:
+          title: "Tulokset näytetään äänestyksen <strong>sulkeuduttua</strong>."
       multiple:
         help:
           at_least_min_options:
@@ -62,6 +69,11 @@ fi:
           regular: Valitaan yksi
           multiple: Valitaan useita
           number: Numeroarviointi
+        poll_result:
+          label: Tulokset
+          always: Näkyvät aina
+          vote: Kun on äänestänyt
+          closed: Kun äänestys suljettu
         poll_config:
           max: Enint.
           min: Väh.
diff --git a/plugins/poll/config/locales/server.es.yml b/plugins/poll/config/locales/server.es.yml
index 6c89c22a95..c100a4598f 100644
--- a/plugins/poll/config/locales/server.es.yml
+++ b/plugins/poll/config/locales/server.es.yml
@@ -12,6 +12,7 @@ es:
     poll_edit_window_mins: "Número de minutos tras la creación del mensaje durante los cuales las encuestas pueden ser editadas."
     poll_minimum_trust_level_to_create: "Definir el mínimo nivel de confianza requerido para crear encuestas."
   poll:
+    invalid_argument: "Valor no válido '%{value}' para el argumento '%{argument}'."
     multiple_polls_without_name: "Hay varias encuestas sin nombre. Usa la etiqueta '<code>name</code>' para diferenciar tus encuestas."
     multiple_polls_with_same_name: "Hay varias encuestas con el mismo nombre: <strong>%{name}</strong>. Usa la etiqueta '<code>name</code>' para diferenciar tus encuestas."
     default_poll_must_have_at_least_2_options: "La encuesta debe tener al menos 2 opciones."
diff --git a/plugins/poll/config/locales/server.fi.yml b/plugins/poll/config/locales/server.fi.yml
index aa45c94d4b..851ad7ccd7 100644
--- a/plugins/poll/config/locales/server.fi.yml
+++ b/plugins/poll/config/locales/server.fi.yml
@@ -12,6 +12,7 @@ fi:
     poll_edit_window_mins: "Kuinka monta minuuttia on aikaa muokata äänestystä sen luomisen jälkeen."
     poll_minimum_trust_level_to_create: "Vähimmäisluottamustaso, jolla voi luoda äänestyksiä."
   poll:
+    invalid_argument: "Arvo \"%{value}\" ei kelpaa argumentiksi \"%{argument}\"."
     multiple_polls_without_name: "Viesti sisältää useamman nimettömän äänestyskyselyn. Nimeä ne '<code>name</code>'-määreellä."
     multiple_polls_with_same_name: "Useamman kyselyn nimi on <strong>%{name}</strong>. Anna kaikille eri nimet '<code>name</code>'-määreellä."
     default_poll_must_have_at_least_2_options: "Äänestyksessä pitää olla vähintään 2 vaihtoehtoa."
@@ -27,8 +28,12 @@ fi:
     default_poll_with_multiple_choices_has_invalid_parameters: "Kysely, jossa on useita vaihtoehtoja sisältää epäkelpoja parametreja."
     named_poll_with_multiple_choices_has_invalid_parameters: "Kysely nimeltä <strong>%{name}</strong>, jossa on useampia vaihtoehtoja sisältää epäkelpoja parametreja"
     requires_at_least_1_valid_option: "Sinun täytyy valita vähintään 1 vaihtoehto."
+    edit_window_expired:
+      cannot_edit_default_poll_with_votes: "Et voi muuttaa äänestystä, kun %{minutes} minuuttia on kulunut. "
+      cannot_edit_named_poll_with_votes: "Et voi muuttaa äänestyksen nimeä <strong>${name}</strong>, kun %{minutes} minuuttia on kulunut."
     no_poll_with_this_name: "Tämä viesti ei sisällä äänestyskyselyä nimeltä <strong>%{name}</strong>."
     post_is_deleted: "Ei voi tehdä poistetulle viestille"
+    user_cant_post_in_topic: "Et voi äänestää, koska sinulla ei ole oikeutta kirjoittaa ketjuun."
     topic_must_be_open_to_vote: "Vain avoimessa ketjussa voi äänestää."
     poll_must_be_open_to_vote: "Vain avoimessa kyselyssä voi äänestää."
     topic_must_be_open_to_toggle_status: "Vain avoimessa ketjussa voi muuttaa äänestyksen tilaa."
diff --git a/script/import_scripts/base.rb b/script/import_scripts/base.rb
index 3ce3ef0452..30dfb7cb08 100644
--- a/script/import_scripts/base.rb
+++ b/script/import_scripts/base.rb
@@ -54,6 +54,8 @@ class ImportScripts::Base
       update_last_posted_at
       update_last_seen_at
       update_user_stats
+      update_topic_users
+      update_post_timings
       update_feature_topic_users
       update_category_featured_topics
       update_topic_count_replies
@@ -313,7 +315,7 @@ class ImportScripts::Base
 
     unless opts[:email][EmailValidator.email_regex]
       opts[:email] = fake_email
-      puts "Invalid email #{original_email} for #{opts[:username]}. Using: #{opts[:email]}"
+      puts "Invalid email '#{original_email}' for '#{opts[:username]}'. Using '#{opts[:email]}'"
     end
 
     opts[:name] = original_username if original_name.blank? && opts[:username] != original_username
@@ -326,7 +328,7 @@ class ImportScripts::Base
     u = User.new(opts)
     (opts[:custom_fields] || {}).each { |k, v| u.custom_fields[k] = v }
     u.custom_fields["import_id"] = import_id
-    u.custom_fields["import_username"] = opts[:username] if original_username.present?
+    u.custom_fields["import_username"] = original_username if original_username.present? && original_username != opts[:username]
     u.custom_fields["import_avatar_url"] = avatar_url if avatar_url.present?
     u.custom_fields["import_pass"] = opts[:password] if opts[:password].present?
     u.custom_fields["import_email"] = original_email if original_email != opts[:email]
@@ -506,21 +508,19 @@ class ImportScripts::Base
         import_id = params.delete(:id).to_s
 
         if post_id_from_imported_post_id(import_id)
-          skipped += 1 # already imported this post
+          skipped += 1
         else
           begin
             new_post = create_post(params, import_id)
             if new_post.is_a?(Post)
               add_post(import_id, new_post)
               add_topic(new_post)
-
               created_post(new_post)
-
               created += 1
             else
               skipped += 1
               puts "Error creating post #{import_id}. Skipping."
-              puts new_post.inspect
+              p new_post
             end
           rescue Discourse::InvalidAccess => e
             skipped += 1
@@ -632,7 +632,7 @@ class ImportScripts::Base
   def update_topic_status
     puts "", "Updating topic status"
 
-    DB.exec(<<~SQL)
+    DB.exec <<~SQL
       UPDATE topics AS t
       SET closed = TRUE
       WHERE EXISTS(
@@ -642,7 +642,7 @@ class ImportScripts::Base
       )
     SQL
 
-    DB.exec(<<~SQL)
+    DB.exec <<~SQL
       UPDATE topics AS t
       SET archived = TRUE
       WHERE EXISTS(
@@ -652,7 +652,7 @@ class ImportScripts::Base
       )
     SQL
 
-    DB.exec(<<~SQL)
+    DB.exec <<~SQL
       DELETE FROM topic_custom_fields
       WHERE name IN ('import_closed', 'import_archived')
     SQL
@@ -660,13 +660,16 @@ class ImportScripts::Base
 
   def update_bumped_at
     puts "", "Updating bumped_at on topics"
-    DB.exec("update topics t set bumped_at = COALESCE((select max(created_at) from posts where topic_id = t.id and post_type = #{Post.types[:regular]}), bumped_at)")
+    DB.exec <<~SQL
+      UPDATE topics t
+         SET bumped_at = COALESCE((SELECT MAX(created_at) FROM posts WHERE topic_id = t.id AND post_type = #{Post.types[:regular]}), bumped_at)
+    SQL
   end
 
   def update_last_posted_at
     puts "", "Updating last posted at on users"
 
-    sql = <<-SQL
+    DB.exec <<~SQL
       WITH lpa AS (
         SELECT user_id, MAX(posts.created_at) AS last_posted_at
         FROM posts
@@ -679,8 +682,6 @@ class ImportScripts::Base
       WHERE u1.id = users.id
         AND users.last_posted_at <> lpa.last_posted_at
     SQL
-
-    DB.exec(sql)
   end
 
   def update_user_stats
@@ -699,7 +700,7 @@ class ImportScripts::Base
 
     puts "", "Updating first_post_created_at..."
 
-    sql = <<-SQL
+    DB.exec <<~SQL
       WITH sub AS (
         SELECT user_id, MIN(posts.created_at) AS first_post_created_at
         FROM posts
@@ -713,11 +714,9 @@ class ImportScripts::Base
         AND user_stats.first_post_created_at <> sub.first_post_created_at
     SQL
 
-    DB.exec(sql)
-
     puts "", "Updating user post_count..."
 
-    sql = <<-SQL
+    DB.exec <<~SQL
       WITH sub AS (
         SELECT user_id, COUNT(*) AS post_count
         FROM posts
@@ -731,11 +730,9 @@ class ImportScripts::Base
         AND user_stats.post_count <> sub.post_count
     SQL
 
-    DB.exec(sql)
-
     puts "", "Updating user topic_count..."
 
-    sql = <<-SQL
+    DB.exec <<~SQL
       WITH sub AS (
         SELECT user_id, COUNT(*) AS topic_count
         FROM topics
@@ -748,8 +745,6 @@ class ImportScripts::Base
       WHERE u1.user_id = user_stats.user_id
         AND user_stats.topic_count <> sub.topic_count
     SQL
-
-    DB.exec(sql)
   end
 
   # scripts that are able to import last_seen_at from the source data should override this method
@@ -760,6 +755,31 @@ class ImportScripts::Base
     DB.exec("UPDATE users SET last_seen_at = last_posted_at WHERE last_posted_at IS NOT NULL")
   end
 
+  def update_topic_users
+    puts "", "Updating topic users"
+
+    DB.exec <<~SQL
+      INSERT INTO topic_users (user_id, topic_id, posted, last_read_post_number, highest_seen_post_number, first_visited_at, last_visited_at, total_msecs_viewed)
+           SELECT user_id, topic_id, 't' , MAX(post_number), MAX(post_number), MIN(created_at), MAX(created_at), COUNT(id) * 5000
+             FROM posts
+            WHERE user_id > 0
+         GROUP BY user_id, topic_id
+      ON CONFLICT DO NOTHING
+    SQL
+  end
+
+  def update_post_timings
+    puts "", "Updating post timings"
+
+    DB.exec <<~SQL
+      INSERT INTO post_timings (topic_id, post_number, user_id, msecs)
+           SELECT topic_id, post_number, user_id, 5000
+             FROM posts
+            WHERE user_id > 0
+      ON CONFLICT DO NOTHING
+    SQL
+  end
+
   def update_feature_topic_users
     puts "", "Updating featured topic users"
 
diff --git a/spec/components/cooked_post_processor_spec.rb b/spec/components/cooked_post_processor_spec.rb
index 1d62cf8fb2..9e2628a4c5 100644
--- a/spec/components/cooked_post_processor_spec.rb
+++ b/spec/components/cooked_post_processor_spec.rb
@@ -274,7 +274,8 @@ describe CookedPostProcessor do
           upload_id: upload.id,
           sha1: SecureRandom.hex,
           extension: '.jpg',
-          filesize: 500
+          filesize: 500,
+          version: OptimizedImage::VERSION
         )
 
         # fake 3x optimized image, we lose 2 pixels here over original due to rounding on downsize
@@ -408,7 +409,7 @@ describe CookedPostProcessor do
         FileStore::BaseStore.any_instance.expects(:get_depth_for).returns(0)
 
         cpp.post_process_images
-        expect(cpp.html).to match_html "<p><div class=\"lightbox-wrapper\"><a class=\"lightbox\" href=\"/uploads/default/original/1X/1234567890123456.jpg\" data-download-href=\"/uploads/default/#{upload.sha1}\" title=\"logo.png\"><img src=\"/uploads/default/optimized/1X/#{upload.sha1}_1_690x788.png\" width=\"690\" height=\"788\"><div class=\"meta\">
+        expect(cpp.html).to match_html "<p><div class=\"lightbox-wrapper\"><a class=\"lightbox\" href=\"/uploads/default/original/1X/1234567890123456.jpg\" data-download-href=\"/uploads/default/#{upload.sha1}\" title=\"logo.png\"><img src=\"/uploads/default/optimized/1X/#{upload.sha1}_#{OptimizedImage::VERSION}_690x788.png\" width=\"690\" height=\"788\"><div class=\"meta\">
 <span class=\"filename\">logo.png</span><span class=\"informations\">1750×2000 1.21 KB</span><span class=\"expand\"></span>
 </div></a></div></p>"
         expect(cpp).to be_dirty
@@ -501,7 +502,7 @@ describe CookedPostProcessor do
 
       it "crops the image" do
         cpp.post_process_images
-        expect(cpp.html).to match_html "<p><div class=\"lightbox-wrapper\"><a class=\"lightbox\" href=\"/uploads/default/original/1X/1234567890123456.jpg\" data-download-href=\"/uploads/default/#{upload.sha1}\" title=\"logo.png\"><img src=\"/uploads/default/optimized/1X/#{upload.sha1}_1_230x500.png\" width=\"230\" height=\"500\"><div class=\"meta\">
+        expect(cpp.html).to match_html "<p><div class=\"lightbox-wrapper\"><a class=\"lightbox\" href=\"/uploads/default/original/1X/1234567890123456.jpg\" data-download-href=\"/uploads/default/#{upload.sha1}\" title=\"logo.png\"><img src=\"/uploads/default/optimized/1X/#{upload.sha1}_#{OptimizedImage::VERSION}_230x500.png\" width=\"230\" height=\"500\"><div class=\"meta\">
 <span class=\"filename\">logo.png</span><span class=\"informations\">1125×2436 1.21 KB</span><span class=\"expand\"></span>
 </div></a></div></p>"
         expect(cpp).to be_dirty
@@ -532,7 +533,7 @@ describe CookedPostProcessor do
 
       it "generates overlay information" do
         cpp.post_process_images
-        expect(cpp.html).to match_html "<p><div class=\"lightbox-wrapper\"><a class=\"lightbox\" href=\"/subfolder/uploads/default/original/1X/1234567890123456.jpg\" data-download-href=\"/subfolder/uploads/default/#{upload.sha1}\" title=\"logo.png\"><img src=\"/subfolder/uploads/default/optimized/1X/#{upload.sha1}_1_690x788.png\" width=\"690\" height=\"788\"><div class=\"meta\">
+        expect(cpp.html).to match_html "<p><div class=\"lightbox-wrapper\"><a class=\"lightbox\" href=\"/subfolder/uploads/default/original/1X/1234567890123456.jpg\" data-download-href=\"/subfolder/uploads/default/#{upload.sha1}\" title=\"logo.png\"><img src=\"/subfolder/uploads/default/optimized/1X/#{upload.sha1}_#{OptimizedImage::VERSION}_690x788.png\" width=\"690\" height=\"788\"><div class=\"meta\">
 <span class=\"filename\">logo.png</span><span class=\"informations\">1750×2000 1.21 KB</span><span class=\"expand\"></span>
 </div></a></div></p>"
         expect(cpp).to be_dirty
@@ -541,7 +542,7 @@ describe CookedPostProcessor do
       it "should escape the filename" do
         upload.update_attributes!(original_filename: "><img src=x onerror=alert('haha')>.png")
         cpp.post_process_images
-        expect(cpp.html).to match_html "<p><div class=\"lightbox-wrapper\"><a class=\"lightbox\" href=\"/subfolder/uploads/default/original/1X/1234567890123456.jpg\" data-download-href=\"/subfolder/uploads/default/#{upload.sha1}\" title=\"&amp;gt;&amp;lt;img src=x onerror=alert(&amp;#39;haha&amp;#39;)&amp;gt;.png\"><img src=\"/subfolder/uploads/default/optimized/1X/#{upload.sha1}_1_690x788.png\" width=\"690\" height=\"788\"><div class=\"meta\">
+        expect(cpp.html).to match_html "<p><div class=\"lightbox-wrapper\"><a class=\"lightbox\" href=\"/subfolder/uploads/default/original/1X/1234567890123456.jpg\" data-download-href=\"/subfolder/uploads/default/#{upload.sha1}\" title=\"&amp;gt;&amp;lt;img src=x onerror=alert(&amp;#39;haha&amp;#39;)&amp;gt;.png\"><img src=\"/subfolder/uploads/default/optimized/1X/#{upload.sha1}_#{OptimizedImage::VERSION}_690x788.png\" width=\"690\" height=\"788\"><div class=\"meta\">
 <span class=\"filename\">&amp;gt;&amp;lt;img src=x onerror=alert(&amp;#39;haha&amp;#39;)&amp;gt;.png</span><span class=\"informations\">1750×2000 1.21 KB</span><span class=\"expand\"></span>
 </div></a></div></p>"
       end
@@ -567,7 +568,7 @@ describe CookedPostProcessor do
 
       it "generates overlay information" do
         cpp.post_process_images
-        expect(cpp.html).to match_html "<p><div class=\"lightbox-wrapper\"><a class=\"lightbox\" href=\"/uploads/default/original/1X/1234567890123456.jpg\" data-download-href=\"/uploads/default/#{upload.sha1}\" title=\"WAT\"><img src=\"/uploads/default/optimized/1X/#{upload.sha1}_1_690x788.png\" title=\"WAT\" width=\"690\" height=\"788\"><div class=\"meta\">
+        expect(cpp.html).to match_html "<p><div class=\"lightbox-wrapper\"><a class=\"lightbox\" href=\"/uploads/default/original/1X/1234567890123456.jpg\" data-download-href=\"/uploads/default/#{upload.sha1}\" title=\"WAT\"><img src=\"/uploads/default/optimized/1X/#{upload.sha1}_#{OptimizedImage::VERSION}_690x788.png\" title=\"WAT\" width=\"690\" height=\"788\"><div class=\"meta\">
        <span class=\"filename\">WAT</span><span class=\"informations\">1750×2000 1.21 KB</span><span class=\"expand\"></span>
        </div></a></div></p>"
         expect(cpp).to be_dirty
diff --git a/spec/components/file_store/base_store_spec.rb b/spec/components/file_store/base_store_spec.rb
index 20d898ee36..3de0ff2948 100644
--- a/spec/components/file_store/base_store_spec.rb
+++ b/spec/components/file_store/base_store_spec.rb
@@ -19,4 +19,19 @@ RSpec.describe FileStore::BaseStore do
       end
     end
   end
+
+  describe '#get_path_for_optimized_image' do
+    let(:upload) { Fabricate(:upload) }
+    let(:optimized_path) { "optimized/1X/#{upload.sha1}_1_100x200.png" }
+
+    it 'should return the right path' do
+      optimized = Fabricate(:optimized_image, upload: upload, version: 1)
+      expect(FileStore::BaseStore.new.get_path_for_optimized_image(optimized)).to eq(optimized_path)
+    end
+
+    it 'should return the right path for `nil` version' do
+      optimized = Fabricate(:optimized_image, upload: upload, version: nil)
+      expect(FileStore::BaseStore.new.get_path_for_optimized_image(optimized)).to eq(optimized_path)
+    end
+  end
 end
diff --git a/spec/components/file_store/s3_store_spec.rb b/spec/components/file_store/s3_store_spec.rb
index 53db46819e..e18a09231e 100644
--- a/spec/components/file_store/s3_store_spec.rb
+++ b/spec/components/file_store/s3_store_spec.rb
@@ -38,6 +38,8 @@ describe FileStore::S3Store do
   context 'uploading to s3' do
     include_context "s3 helpers"
 
+    let(:etag) { "etag" }
+
     describe "#store_upload" do
       it "returns an absolute schemaless url" do
         store.expects(:get_depth_for).with(upload.id).returns(0)
@@ -45,11 +47,13 @@ describe FileStore::S3Store do
         s3_object = stub
 
         s3_bucket.expects(:object).with("original/1X/#{upload.sha1}.png").returns(s3_object)
-        s3_object.expects(:upload_file)
+
+        s3_object.stubs(:put).returns(Aws::S3::Types::PutObjectOutput.new(etag: etag))
 
         expect(store.store_upload(uploaded_file, upload)).to eq(
           "//s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com/original/1X/#{upload.sha1}.png"
         )
+        expect(upload.etag).to eq(etag)
       end
 
       describe "when s3_upload_bucket includes folders path" do
@@ -63,11 +67,13 @@ describe FileStore::S3Store do
           s3_object = stub
 
           s3_bucket.expects(:object).with("discourse-uploads/original/1X/#{upload.sha1}.png").returns(s3_object)
-          s3_object.expects(:upload_file)
+
+          s3_object.stubs(:put).returns(Aws::S3::Types::PutObjectOutput.new(etag: etag))
 
           expect(store.store_upload(uploaded_file, upload)).to eq(
             "//s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com/discourse-uploads/original/1X/#{upload.sha1}.png"
           )
+          expect(upload.etag).to eq(etag)
         end
       end
     end
@@ -80,11 +86,13 @@ describe FileStore::S3Store do
         path = "optimized/1X/#{optimized_image.upload.sha1}_#{OptimizedImage::VERSION}_100x200.png"
 
         s3_bucket.expects(:object).with(path).returns(s3_object)
-        s3_object.expects(:upload_file)
+
+        s3_object.stubs(:put).returns(Aws::S3::Types::PutObjectOutput.new(etag: etag))
 
         expect(store.store_optimized_image(optimized_image_file, optimized_image)).to eq(
           "//s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com/#{path}"
         )
+        expect(optimized_image.etag).to eq(etag)
       end
 
       describe "when s3_upload_bucket includes folders path" do
@@ -99,11 +107,13 @@ describe FileStore::S3Store do
           path = "discourse-uploads/optimized/1X/#{optimized_image.upload.sha1}_#{OptimizedImage::VERSION}_100x200.png"
 
           s3_bucket.expects(:object).with(path).returns(s3_object)
-          s3_object.expects(:upload_file)
+
+          s3_object.stubs(:put).returns(Aws::S3::Types::PutObjectOutput.new(etag: etag))
 
           expect(store.store_optimized_image(optimized_image_file, optimized_image)).to eq(
             "//s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com/#{path}"
           )
+          expect(optimized_image.etag).to eq(etag)
         end
       end
     end
@@ -154,6 +164,24 @@ describe FileStore::S3Store do
         store.remove_upload(upload)
       end
 
+      it "removes the optimized image from s3 with the right paths" do
+        optimized = Fabricate(:optimized_image, version: 1)
+        upload = optimized.upload
+        path = "optimized/1X/#{upload.sha1}_#{optimized.version}_#{optimized.width}x#{optimized.height}.png"
+
+        store.expects(:get_depth_for).with(upload.id).returns(0)
+        s3_helper.expects(:s3_bucket).returns(s3_bucket).at_least_once
+        optimized.update_attributes!(url: "//s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com/#{path}")
+        s3_object = stub
+
+        s3_bucket.expects(:object).with("tombstone/#{path}").returns(s3_object)
+        s3_object.expects(:copy_from).with(copy_source: "s3-upload-bucket/#{path}")
+        s3_bucket.expects(:object).with(path).returns(s3_object)
+        s3_object.expects(:delete)
+
+        store.remove_optimized_image(optimized)
+      end
+
       describe "when s3_upload_bucket includes folders path" do
         before do
           SiteSetting.s3_upload_bucket = "s3-upload-bucket/discourse-uploads"
@@ -176,21 +204,25 @@ describe FileStore::S3Store do
     end
 
     describe "#remove_optimized_image" do
-      let(:optimized_image) do
-        Fabricate(:optimized_image,
-          url: "//s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com/optimized/1X/#{upload.sha1}_1_100x200.png",
-          upload: upload
+      let(:optimized_image) { Fabricate(:optimized_image, upload: upload) }
+
+      let(:image_path) do
+        FileStore::BaseStore.new.get_path_for_optimized_image(optimized_image)
+      end
+
+      before do
+        optimized_image.update!(
+          url: "//s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com#{image_path}"
         )
       end
 
       it "removes the file from s3 with the right paths" do
-        store.expects(:get_depth_for).with(optimized_image.upload.id).returns(0)
         s3_helper.expects(:s3_bucket).returns(s3_bucket).at_least_once
         s3_object = stub
 
-        s3_bucket.expects(:object).with("tombstone/optimized/1X/#{upload.sha1}_1_100x200.png").returns(s3_object)
-        s3_object.expects(:copy_from).with(copy_source: "s3-upload-bucket/optimized/1X/#{upload.sha1}_1_100x200.png")
-        s3_bucket.expects(:object).with("optimized/1X/#{upload.sha1}_1_100x200.png").returns(s3_object)
+        s3_bucket.expects(:object).with("tombstone/#{image_path}").returns(s3_object)
+        s3_object.expects(:copy_from).with(copy_source: "s3-upload-bucket/#{image_path}")
+        s3_bucket.expects(:object).with("#{image_path}").returns(s3_object)
         s3_object.expects(:delete)
 
         store.remove_optimized_image(optimized_image)
@@ -202,13 +234,21 @@ describe FileStore::S3Store do
         end
 
         it "removes the file from s3 with the right paths" do
-          store.expects(:get_depth_for).with(optimized_image.upload.id).returns(0)
           s3_helper.expects(:s3_bucket).returns(s3_bucket).at_least_once
           s3_object = stub
 
-          s3_bucket.expects(:object).with("discourse-uploads/tombstone/optimized/1X/#{upload.sha1}_1_100x200.png").returns(s3_object)
-          s3_object.expects(:copy_from).with(copy_source: "s3-upload-bucket/discourse-uploads/optimized/1X/#{upload.sha1}_1_100x200.png")
-          s3_bucket.expects(:object).with("discourse-uploads/optimized/1X/#{upload.sha1}_1_100x200.png").returns(s3_object)
+          s3_bucket.expects(:object)
+            .with("discourse-uploads/tombstone/#{image_path}")
+            .returns(s3_object)
+
+          s3_object.expects(:copy_from).with(
+            copy_source: "s3-upload-bucket/discourse-uploads/#{image_path}"
+          )
+
+          s3_bucket.expects(:object).with(
+            "discourse-uploads/#{image_path}"
+          ).returns(s3_object)
+
           s3_object.expects(:delete)
 
           store.remove_optimized_image(optimized_image)
diff --git a/spec/components/flag_query_spec.rb b/spec/components/flag_query_spec.rb
index 428a5aa319..aee160780e 100644
--- a/spec/components/flag_query_spec.rb
+++ b/spec/components/flag_query_spec.rb
@@ -114,11 +114,11 @@ describe FlagQuery do
 
     it "respects `min_flags_staff_visibility`" do
       admin = Fabricate(:admin)
-      moderator = Fabricate(:moderator)
+      flagger = Fabricate(:user)
 
       post = create_post
 
-      PostAction.act(moderator, post, PostActionType.types[:spam])
+      PostAction.act(flagger, post, PostActionType.types[:spam])
 
       SiteSetting.min_flags_staff_visibility = 2
       posts, topics, users = FlagQuery.flagged_posts_report(admin)
@@ -133,5 +133,33 @@ describe FlagQuery do
       expect(users).to be_present
     end
 
+    it "respects `min_flags_staff_visibility` for tl3 hidden spam" do
+      admin = Fabricate(:admin)
+      tl3 = Fabricate(:user, trust_level: 3)
+      post = create_post
+
+      post.user.update_column(:trust_level, 0)
+      PostAction.act(tl3, post, PostActionType.types[:spam])
+
+      SiteSetting.min_flags_staff_visibility = 2
+      posts, topics, users = FlagQuery.flagged_posts_report(admin)
+      expect(posts).to be_present
+      expect(topics).to be_present
+      expect(users).to be_present
+    end
+
+    it "respects `min_flags_staff_visibility` for tl4 hidden posts" do
+      admin = Fabricate(:admin)
+      tl4 = Fabricate(:user, trust_level: 4)
+      post = create_post
+      PostAction.act(tl4, post, PostActionType.types[:spam])
+
+      SiteSetting.min_flags_staff_visibility = 2
+      posts, topics, users = FlagQuery.flagged_posts_report(admin)
+      expect(posts).to be_present
+      expect(topics).to be_present
+      expect(users).to be_present
+    end
+
   end
 end
diff --git a/spec/components/post_creator_spec.rb b/spec/components/post_creator_spec.rb
index 304491c59c..8774c6402e 100644
--- a/spec/components/post_creator_spec.rb
+++ b/spec/components/post_creator_spec.rb
@@ -580,8 +580,9 @@ describe PostCreator do
 
       it "returns blank for another post with the same content" do
         creator.create
-        new_post_creator.create
-        expect(new_post_creator.errors).to be_present
+        post = new_post_creator.create
+
+        expect(post.errors[:raw]).to include(I18n.t(:just_posted_that))
       end
 
       it "returns a post for admins" do
diff --git a/spec/components/search_spec.rb b/spec/components/search_spec.rb
index 877812d9d2..ce6088a0a9 100644
--- a/spec/components/search_spec.rb
+++ b/spec/components/search_spec.rb
@@ -341,12 +341,32 @@ describe Search do
     end
 
     context "search for a topic by url" do
-      let(:result) { Search.execute(topic.relative_url, search_for_id: true, type_filter: 'topic') }
-
       it 'returns the topic' do
+        result = Search.execute(topic.relative_url, search_for_id: true, type_filter: 'topic')
         expect(result.posts.length).to eq(1)
         expect(result.posts.first.id).to eq(post.id)
       end
+
+      context 'restrict_to_archetype' do
+        let(:personal_message) { Fabricate(:private_message_topic) }
+        let!(:p1) { Fabricate(:post, topic: personal_message, post_number: 1) }
+
+        it 'restricts result to topics' do
+          result = Search.execute(personal_message.relative_url, search_for_id: true, type_filter: 'topic', restrict_to_archetype: Archetype.default)
+          expect(result.posts.length).to eq(0)
+
+          result = Search.execute(topic.relative_url, search_for_id: true, type_filter: 'topic', restrict_to_archetype: Archetype.default)
+          expect(result.posts.length).to eq(1)
+        end
+
+        it 'restricts result to messages' do
+          result = Search.execute(topic.relative_url, search_for_id: true, type_filter: 'private_messages', guardian: Guardian.new(Fabricate(:admin)), restrict_to_archetype: Archetype.private_message)
+          expect(result.posts.length).to eq(0)
+
+          result = Search.execute(personal_message.relative_url, search_for_id: true, type_filter: 'private_messages', guardian: Guardian.new(Fabricate(:admin)), restrict_to_archetype: Archetype.private_message)
+          expect(result.posts.length).to eq(1)
+        end
+      end
     end
 
     context 'security' do
diff --git a/spec/fabricators/optimized_image_fabricator.rb b/spec/fabricators/optimized_image_fabricator.rb
index 30fafd2f41..2ac3b8a96a 100644
--- a/spec/fabricators/optimized_image_fabricator.rb
+++ b/spec/fabricators/optimized_image_fabricator.rb
@@ -5,4 +5,5 @@ Fabricator(:optimized_image) do
   width 100
   height 200
   url "138569_100x200.png"
+  version OptimizedImage::VERSION
 end
diff --git a/spec/fixtures/images/large_icon_correct.png b/spec/fixtures/images/large_icon_correct.png
new file mode 100644
index 0000000000..e453d6fde5
Binary files /dev/null and b/spec/fixtures/images/large_icon_correct.png differ
diff --git a/spec/fixtures/images/large_icon_incorrect.png b/spec/fixtures/images/large_icon_incorrect.png
new file mode 100644
index 0000000000..e750b90196
Binary files /dev/null and b/spec/fixtures/images/large_icon_incorrect.png differ
diff --git a/spec/fixtures/plugins/csp_extension/plugin.rb b/spec/fixtures/plugins/csp_extension/plugin.rb
index f66915a06b..c0b2332ca3 100644
--- a/spec/fixtures/plugins/csp_extension/plugin.rb
+++ b/spec/fixtures/plugins/csp_extension/plugin.rb
@@ -4,5 +4,6 @@
 # authors: xrav3nz
 
 extend_content_security_policy(
-  script_src: ['https://from-plugin.com']
+  script_src: ['https://from-plugin.com'],
+  object_src: ['https://test-stripping.com']
 )
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index f838326f97..0b1aa0ee6c 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -147,15 +147,29 @@ describe ApplicationHelper do
     end
   end
 
-  describe '#rtl_class' do
-    it "returns 'rtl' when the I18n.locale is rtl" do
+  describe '#html_classes' do
+    it "includes 'rtl' when the I18n.locale is rtl" do
       I18n.stubs(:locale).returns(:he)
-      expect(helper.rtl_class).to eq('rtl')
+      expect(helper.html_classes.split(" ")).to include('rtl')
     end
 
     it 'returns an empty string when the I18n.locale is not rtl' do
       I18n.stubs(:locale).returns(:zh_TW)
-      expect(helper.rtl_class).to eq('')
+      expect(helper.html_classes.split(" ")).not_to include('rtl')
+    end
+
+    it 'includes the user specified text size' do
+      user = Fabricate(:user)
+      user.user_option.text_size = "larger"
+      user.user_option.save!
+      helper.request.env[Auth::DefaultCurrentUserProvider::CURRENT_USER_KEY] = user
+      expect(helper.html_classes.split(" ")).to include('text-size-larger')
+    end
+
+    it 'falls back to the default text size for anon' do
+      expect(helper.html_classes.split(" ")).to include('text-size-normal')
+      SiteSetting.default_text_size = "largest"
+      expect(helper.html_classes.split(" ")).to include('text-size-largest')
     end
   end
 
diff --git a/spec/helpers/user_notifications_helper_spec.rb b/spec/helpers/user_notifications_helper_spec.rb
index 735a69e19b..f1aeb8a4c9 100644
--- a/spec/helpers/user_notifications_helper_spec.rb
+++ b/spec/helpers/user_notifications_helper_spec.rb
@@ -108,6 +108,16 @@ describe UserNotificationsHelper do
         )
       end
 
+      describe 'when global cdn path is configured' do
+        it 'should return the right url' do
+          GlobalSetting.stubs(:cdn_url).returns('https://some.cdn.com/cluster')
+
+          expect(helper.logo_url).to eq(
+            "http://s3-upload-bucket.s3.dualstack.us-east-1.amazonaws.com/original/1X/somesha1.png"
+          )
+        end
+      end
+
       describe 'when cdn path is configured' do
         before do
           SiteSetting.s3_cdn_url = 'https://some.cdn.com'
diff --git a/spec/jobs/bump_topic_spec.rb b/spec/jobs/bump_topic_spec.rb
new file mode 100644
index 0000000000..1f90d54db2
--- /dev/null
+++ b/spec/jobs/bump_topic_spec.rb
@@ -0,0 +1,35 @@
+require 'rails_helper'
+
+describe Jobs::BumpTopic do
+  let(:admin) { Fabricate(:admin) }
+  let(:user) { Fabricate(:user) }
+
+  it "can bump a topic" do
+    topic = Fabricate(:topic_timer, user: admin).topic
+    create_post(topic: topic)
+
+    freeze_time (2.hours.from_now)
+
+    expect do
+      described_class.new.execute(topic_timer_id: topic.public_topic_timer.id)
+    end.to change { topic.posts.count }.by (1)
+
+    expect(topic.reload.public_topic_timer).to eq(nil)
+  end
+
+  it "respects the guardian" do
+    topic = Fabricate(:topic_timer, user: user).topic
+    create_post(topic: topic)
+    topic.category = Fabricate(:private_category, group: Fabricate(:group))
+    topic.save!
+
+    freeze_time (2.hours.from_now)
+
+    expect do
+      described_class.new.execute(topic_timer_id: topic.public_topic_timer.id)
+    end.to change { topic.posts.count }.by (0)
+
+    expect(topic.reload.public_topic_timer).to eq(nil)
+  end
+
+end
diff --git a/spec/jobs/jobs_spec.rb b/spec/jobs/jobs_spec.rb
index 01cbe6a225..a058971ed1 100644
--- a/spec/jobs/jobs_spec.rb
+++ b/spec/jobs/jobs_spec.rb
@@ -11,13 +11,40 @@ describe Jobs do
       end
 
       it 'enqueues a job in sidekiq' do
-        Sidekiq::Client.expects(:enqueue).with(Jobs::ProcessPost, post_id: 1, current_site_id: 'default')
-        Jobs.enqueue(:process_post, post_id: 1)
+        Sidekiq::Testing.fake! do
+          jobs = Jobs::ProcessPost.jobs
+
+          jobs.clear
+          Jobs.enqueue(:process_post, post_id: 1)
+          expect(jobs.length).to eq(1)
+          job = jobs.first
+
+          expected = {
+            "class" => "Jobs::ProcessPost",
+            "args" => [{ "post_id" => 1, "current_site_id" => "default" }],
+            "queue" => "default"
+          }
+          expect(job.slice("class", "args", "queue")).to eq(expected)
+        end
       end
 
       it "does not pass current_site_id when 'all_sites' is present" do
-        Sidekiq::Client.expects(:enqueue).with(Jobs::ProcessPost, post_id: 1)
-        Jobs.enqueue(:process_post, post_id: 1, all_sites: true)
+        Sidekiq::Testing.fake! do
+          jobs = Jobs::ProcessPost.jobs
+
+          jobs.clear
+          Jobs.enqueue(:process_post, post_id: 1, all_sites: true)
+
+          expect(jobs.length).to eq(1)
+          job = jobs.first
+
+          expected = {
+            "class" => "Jobs::ProcessPost",
+            "args" => [{ "post_id" => 1 }],
+            "queue" => "default"
+          }
+          expect(job.slice("class", "args", "queue")).to eq(expected)
+        end
       end
 
       it "doesn't execute the job" do
@@ -27,10 +54,23 @@ describe Jobs do
       end
 
       it "should enqueue with the correct database id when the current_site_id option is given" do
-        Sidekiq::Client.expects(:enqueue).with do |arg1, arg2|
-          arg2[:current_site_id] == 'test_db' && arg2[:sync_exec].nil?
+
+        Sidekiq::Testing.fake! do
+          jobs = Jobs::ProcessPost.jobs
+
+          jobs.clear
+          Jobs.enqueue(:process_post, post_id: 1, current_site_id: 'test_db')
+
+          expect(jobs.length).to eq(1)
+          job = jobs.first
+
+          expected = {
+            "class" => "Jobs::ProcessPost",
+            "args" => [{ "post_id" => 1, "current_site_id" => "test_db" }],
+            "queue" => "default"
+          }
+          expect(job.slice("class", "args", "queue")).to eq(expected)
         end
-        Jobs.enqueue(:process_post, post_id: 1, current_site_id: 'test_db')
       end
     end
 
diff --git a/spec/jobs/periodical_updates_spec.rb b/spec/jobs/periodical_updates_spec.rb
index b2ba6c60de..8b0e88bfc6 100644
--- a/spec/jobs/periodical_updates_spec.rb
+++ b/spec/jobs/periodical_updates_spec.rb
@@ -13,13 +13,24 @@ describe Jobs::PeriodicalUpdates do
     SiteSetting.automatically_download_gravatars = false
     post = create_post
     post.update_columns(baked_at: Time.new(2000, 1, 1), baked_version: -1)
-    described_class.new.execute({})
+
+    Sidekiq::Testing.fake! do
+      Jobs::ProcessPost.jobs.clear
+
+      Jobs::PeriodicalUpdates.new.execute
+
+      jobs = Jobs::ProcessPost.jobs
+      expect(jobs.length).to eq(1)
+
+      expect(jobs[0]["queue"]).to eq("low")
+    end
 
     post.reload
     expect(post.baked_at).to be > 1.day.ago
-
     baked = post.baked_at
-    described_class.new.execute({})
+
+    # does not rebake
+    Jobs::PeriodicalUpdates.new.execute
     post.reload
     expect(post.baked_at).to eq(baked)
   end
diff --git a/spec/lib/backup_restore/shared_examples_for_backup_store.rb b/spec/lib/backup_restore/shared_examples_for_backup_store.rb
index 921139a2c8..2c2770c73c 100644
--- a/spec/lib/backup_restore/shared_examples_for_backup_store.rb
+++ b/spec/lib/backup_restore/shared_examples_for_backup_store.rb
@@ -57,7 +57,7 @@ shared_examples "backup store" do
       end
 
       it "works with multisite", type: :multisite do
-        RailsMultisite::ConnectionManagement.with_connection("second") do
+        test_multisite_connection("second") do
           expect(store.files).to eq([backup5, backup4])
         end
       end
@@ -74,7 +74,7 @@ shared_examples "backup store" do
       end
 
       it "works with multisite", type: :multisite do
-        RailsMultisite::ConnectionManagement.with_connection("second") do
+        test_multisite_connection("second") do
           expect(store.latest_file).to eq(backup5)
         end
       end
@@ -110,7 +110,7 @@ shared_examples "backup store" do
       it "works with multisite", type: :multisite do
         SiteSetting.maximum_backups = 1
 
-        RailsMultisite::ConnectionManagement.with_connection("second") do
+        test_multisite_connection("second") do
           store.delete_old
           expect(store.files).to eq([backup5])
         end
@@ -132,7 +132,7 @@ shared_examples "backup store" do
       end
 
       it "works with multisite", type: :multisite do
-        RailsMultisite::ConnectionManagement.with_connection("second") do
+        test_multisite_connection("second") do
           file = store.file(backup4.filename, include_download_source: true)
           expect(file.source).to match(source_regex("second", backup4.filename, multisite: true))
         end
@@ -153,7 +153,7 @@ shared_examples "backup store" do
       end
 
       it "works with multisite", type: :multisite do
-        RailsMultisite::ConnectionManagement.with_connection("second") do
+        test_multisite_connection("second") do
           expect(store.files).to include(backup5)
           store.delete_file(backup5.filename)
           expect(store.files).to_not include(backup5)
@@ -182,7 +182,7 @@ shared_examples "backup store" do
       end
 
       it "works with multisite", type: :multisite do
-        RailsMultisite::ConnectionManagement.with_connection("second") do
+        test_multisite_connection("second") do
           expect(store.files).to include(backup5)
           store.delete_file(backup5.filename)
           expect(store.files).to_not include(backup5)
@@ -239,7 +239,7 @@ shared_examples "remote backup store" do
       end
 
       it "works with multisite", type: :multisite do
-        RailsMultisite::ConnectionManagement.with_connection("second") do
+        test_multisite_connection("second") do
           upload_file
         end
       end
@@ -266,7 +266,7 @@ shared_examples "remote backup store" do
       end
 
       it "works with multisite", type: :multisite do
-        RailsMultisite::ConnectionManagement.with_connection("second") do
+        test_multisite_connection("second") do
           filename = "foo.tar.gz"
           url = store.generate_upload_url(filename)
 
diff --git a/spec/lib/content_security_policy_spec.rb b/spec/lib/content_security_policy_spec.rb
index 79f190e588..9795698864 100644
--- a/spec/lib/content_security_policy_spec.rb
+++ b/spec/lib/content_security_policy_spec.rb
@@ -16,6 +16,20 @@ describe ContentSecurityPolicy do
     end
   end
 
+  describe 'base-uri' do
+    it 'is set to none' do
+      base_uri = parse(policy)['base-uri']
+      expect(base_uri).to eq(["'none'"])
+    end
+  end
+
+  describe 'object-src' do
+    it 'is set to none' do
+      object_srcs = parse(policy)['object-src']
+      expect(object_srcs).to eq(["'none'"])
+    end
+  end
+
   describe 'worker-src' do
     it 'always has self and blob' do
       worker_srcs = parse(policy)['worker-src']
@@ -97,6 +111,8 @@ describe ContentSecurityPolicy do
 
     plugin.enabled = true
     expect(parse(policy)['script-src']).to include('https://from-plugin.com')
+    expect(parse(policy)['object-src']).to include('https://test-stripping.com')
+    expect(parse(policy)['object-src']).to_not include("'none'")
 
     plugin.enabled = false
     expect(parse(policy)['script-src']).to_not include('https://from-plugin.com')
diff --git a/spec/lib/upload_creator_spec.rb b/spec/lib/upload_creator_spec.rb
index 897c946aee..0c2120deeb 100644
--- a/spec/lib/upload_creator_spec.rb
+++ b/spec/lib/upload_creator_spec.rb
@@ -1,4 +1,5 @@
 require 'rails_helper'
+require 'file_store/s3_store'
 
 RSpec.describe UploadCreator do
   let(:user) { Fabricate(:user) }
@@ -166,5 +167,34 @@ RSpec.describe UploadCreator do
         expect(upload.original_filename).to eq('should_be_jpeg.jpg')
       end
     end
+
+    describe 'uploading to s3' do
+      let(:filename) { "should_be_jpeg.png" }
+      let(:file) { file_from_fixtures(filename) }
+
+      before do
+        SiteSetting.s3_upload_bucket = "s3-upload-bucket"
+        SiteSetting.s3_access_key_id = "s3-access-key-id"
+        SiteSetting.s3_secret_access_key = "s3-secret-access-key"
+        SiteSetting.s3_region = 'us-west-1'
+        SiteSetting.enable_s3_uploads = true
+
+        store = FileStore::S3Store.new
+        s3_helper = store.instance_variable_get(:@s3_helper)
+        client = Aws::S3::Client.new(stub_responses: true)
+        s3_helper.stubs(:s3_client).returns(client)
+        Discourse.stubs(:store).returns(store)
+      end
+
+      it 'should store the file and return etag' do
+        expect {
+          UploadCreator.new(file, filename).create_for(user.id)
+        }.to change { Upload.count }.by(1)
+
+        upload = Upload.last
+
+        expect(upload.etag).to eq('ETag')
+      end
+    end
   end
 end
diff --git a/spec/mailers/user_notifications_spec.rb b/spec/mailers/user_notifications_spec.rb
index bd56dbd542..4c350124ee 100644
--- a/spec/mailers/user_notifications_spec.rb
+++ b/spec/mailers/user_notifications_spec.rb
@@ -247,7 +247,7 @@ describe UserNotifications do
                                              notification_data_hash: notification.data_hash
                                            )
       # from should include full user name
-      expect(mail[:from].display_names).to eql(['John Doe'])
+      expect(mail[:from].display_names).to eql(['John Doe via Discourse'])
 
       # subject should include category name
       expect(mail.subject).to match(/India/)
@@ -350,7 +350,7 @@ describe UserNotifications do
       expect(mail[:from].display_names).to_not eql(['John Doe'])
 
       # from should include username if "show user full names" is disabled
-      expect(mail[:from].display_names).to eql(['john'])
+      expect(mail[:from].display_names).to eql(['john via Discourse'])
 
       # subject should not include category name
       expect(mail.subject).not_to match(/Uncategorized/)
@@ -397,7 +397,7 @@ describe UserNotifications do
       )
 
       # from should include username if full user name is not provided
-      expect(mail[:from].display_names).to eql(['john'])
+      expect(mail[:from].display_names).to eql(['john via Discourse'])
 
       # subject should include "[PM]"
       expect(mail.subject).to include("[PM] ")
@@ -656,13 +656,13 @@ describe UserNotifications do
       it "should have user name as from_alias" do
         SiteSetting.enable_names = true
         SiteSetting.display_name_on_posts = true
-        expects_build_with(has_entry(:from_alias, "#{user.name}"))
+        expects_build_with(has_entry(:from_alias, "#{user.name} via Discourse"))
       end
 
       it "should not have user name as from_alias if display_name_on_posts is disabled" do
         SiteSetting.enable_names = false
         SiteSetting.display_name_on_posts = false
-        expects_build_with(has_entry(:from_alias, "walterwhite"))
+        expects_build_with(has_entry(:from_alias, "walterwhite via Discourse"))
       end
 
       it "should explain how to respond" do
diff --git a/spec/models/admin_dashboard_data_spec.rb b/spec/models/admin_dashboard_data_spec.rb
index 9ba85feb00..8df2a32f5f 100644
--- a/spec/models/admin_dashboard_data_spec.rb
+++ b/spec/models/admin_dashboard_data_spec.rb
@@ -192,6 +192,52 @@ describe AdminDashboardData do
     end
   end
 
+  describe 'pwa_config_check' do
+    subject { described_class.new.pwa_config_check }
+
+    it 'alerts for large_icon missing' do
+      SiteSetting.large_icon = nil
+      expect(subject).to eq(I18n.t('dashboard.pwa_config_icon_warning', base_path: Discourse.base_path))
+    end
+
+    it 'alerts for incompatible large_icon' do
+      upload = UploadCreator.new(
+        file_from_fixtures('large_icon_incorrect.png'),
+        'large_icon',
+        for_site_setting: true
+      ).create_for(Discourse.system_user.id)
+      SiteSetting.large_icon = upload
+      expect(subject).to eq(I18n.t('dashboard.pwa_config_icon_warning', base_path: Discourse.base_path))
+    end
+
+    context 'when large_icon is correct' do
+      before do
+        upload = UploadCreator.new(
+          file_from_fixtures('large_icon_correct.png'),
+          'large_icon',
+          for_site_setting: true
+        ).create_for(Discourse.system_user.id)
+        SiteSetting.large_icon = upload
+      end
+
+      it 'alerts for short_title missing' do
+        SiteSetting.short_title = nil
+        expect(subject).to eq(I18n.t('dashboard.pwa_config_title_warning', base_path: Discourse.base_path))
+      end
+
+      it 'returns nil when everything is ok' do
+        upload = UploadCreator.new(
+          file_from_fixtures('large_icon_correct.png'),
+          'large_icon',
+          for_site_setting: true
+        ).create_for(Discourse.system_user.id)
+        SiteSetting.large_icon = upload
+        SiteSetting.short_title = 'title'
+        expect(subject).to be_nil
+      end
+    end
+  end
+
   describe 's3_config_check' do
     shared_examples 'problem detection for s3-dependent setting' do
       subject { described_class.new.s3_config_check }
diff --git a/spec/models/optimized_image_spec.rb b/spec/models/optimized_image_spec.rb
index 35e95cd9be..4c832a8f4b 100644
--- a/spec/models/optimized_image_spec.rb
+++ b/spec/models/optimized_image_spec.rb
@@ -201,6 +201,32 @@ describe OptimizedImage do
 
   describe ".create_for" do
 
+    context "versioning" do
+      let(:filename) { 'logo.png' }
+      let(:file) { file_from_fixtures(filename) }
+
+      it "is able to update optimized images on version change" do
+        upload = UploadCreator.new(file, filename).create_for(Discourse.system_user.id)
+        optimized = OptimizedImage.create_for(upload, 10, 10)
+
+        expect(optimized.version).to eq(OptimizedImage::VERSION)
+
+        optimized_again = OptimizedImage.create_for(upload, 10, 10)
+        expect(optimized_again.id).to eq(optimized.id)
+
+        optimized.update_columns(version: nil)
+        old_id = optimized.id
+
+        optimized_new = OptimizedImage.create_for(upload, 10, 10)
+
+        expect(optimized_new.id).not_to eq(old_id)
+
+        # cleanup (which transaction rollback may miss)
+        optimized_new.destroy
+        upload.destroy
+      end
+    end
+
     it "is able to 'optimize' an svg" do
       # we don't really optimize anything, we simply copy
       # but at least this confirms this actually works
diff --git a/spec/models/post_action_spec.rb b/spec/models/post_action_spec.rb
index a99ecc795e..8cf531d403 100644
--- a/spec/models/post_action_spec.rb
+++ b/spec/models/post_action_spec.rb
@@ -160,6 +160,26 @@ describe PostAction do
       expect(PostAction.flagged_posts_count).to eq(1)
     end
 
+    it "tl3 hidden posts will supersede min_flags_staff_visibility" do
+      SiteSetting.min_flags_staff_visibility = 2
+      expect(PostAction.flagged_posts_count).to eq(0)
+
+      codinghorror.update_column(:trust_level, 3)
+      post.user.update_column(:trust_level, 0)
+      PostAction.act(codinghorror, post, PostActionType.types[:spam])
+      expect(PostAction.flagged_posts_count).to eq(1)
+    end
+
+    it "tl4 hidden posts will supersede min_flags_staff_visibility" do
+      SiteSetting.min_flags_staff_visibility = 2
+      expect(PostAction.flagged_posts_count).to eq(0)
+
+      codinghorror.update_column(:trust_level, 4)
+      PostAction.act(codinghorror, post, PostActionType.types[:off_topic])
+
+      expect(PostAction.flagged_posts_count).to eq(1)
+    end
+
     it "should reset counts when a topic is deleted" do
       PostAction.act(codinghorror, post, PostActionType.types[:off_topic])
       post.topic.trash!
@@ -255,28 +275,50 @@ describe PostAction do
   end
 
   describe 'when a user likes something' do
-
-    it 'should generate notifications correctly' do
-
+    before do
       PostActionNotifier.enable
+    end
 
-      PostAction.act(codinghorror, post, PostActionType.types[:like])
-      expect(Notification.count).to eq(1)
+    it 'should generate and remove notifications correctly' do
+      expect do
+        PostAction.act(codinghorror, post, PostActionType.types[:like])
+      end.to change { Notification.count }.by(1)
 
+      notification = Notification.last
+
+      expect(notification.user_id).to eq(post.user_id)
+      expect(notification.notification_type).to eq(Notification.types[:liked])
+
+      expect do
+        PostAction.remove_act(codinghorror, post, PostActionType.types[:like])
+      end.to change { Notification.count }.by(-1)
+
+      expect(Notification.exists?(id: notification.id)).to eq(false)
+    end
+
+    it "should not generate a notification if liker has been muted" do
       mutee = Fabricate(:user)
-
-      post = Fabricate(:post)
       MutedUser.create!(user_id: post.user.id, muted_user_id: mutee.id)
-      PostAction.act(mutee, post, PostActionType.types[:like])
 
-      expect(Notification.count).to eq(1)
+      expect do
+        PostAction.act(mutee, post, PostActionType.types[:like])
+      end.to_not change { Notification.count }
+    end
+
+    it "should generate a notification if liker is an admin irregardles of \
+      muting" do
 
       # you can not mute admin, sorry
       MutedUser.create!(user_id: post.user.id, muted_user_id: admin.id)
-      PostAction.act(admin, post, PostActionType.types[:like])
 
-      expect(Notification.count).to eq(2)
+      expect do
+        PostAction.act(admin, post, PostActionType.types[:like])
+      end.to change { Notification.count }.by(1)
 
+      notification = Notification.last
+
+      expect(notification.user_id).to eq(post.user_id)
+      expect(notification.notification_type).to eq(Notification.types[:liked])
     end
 
     it 'should increase the `like_count` and `like_score` when a user likes something' do
@@ -569,54 +611,100 @@ describe PostAction do
       expect(post.hidden).to eq(false)
     end
 
-    it "will automatically pause a topic due to large community flagging" do
-      SiteSetting.flags_required_to_hide_post = 0
-      SiteSetting.num_flags_to_close_topic = 3
-      SiteSetting.num_flaggers_to_close_topic = 2
-      SiteSetting.num_hours_to_close_topic = 1
+    context "topic auto closing" do
+      let(:topic) { Fabricate(:topic) }
+      let(:post1) { create_post(topic: topic) }
+      let(:post2) { create_post(topic: topic) }
+      let(:post3) { create_post(topic: topic) }
 
-      topic = Fabricate(:topic)
-      post1 = create_post(topic: topic)
-      post2 = create_post(topic: topic)
-      post3 = create_post(topic: topic)
+      let(:flagger1) { Fabricate(:user) }
+      let(:flagger2) { Fabricate(:user) }
 
-      flagger1 = Fabricate(:user)
-      flagger2 = Fabricate(:user)
-
-      # reaching `num_flaggers_to_close_topic` isn't enough
-      [flagger1, flagger2].each do |flagger|
-        PostAction.act(flagger, post1, PostActionType.types[:inappropriate])
+      before do
+        SiteSetting.flags_required_to_hide_post = 0
+        SiteSetting.num_flags_to_close_topic = 3
+        SiteSetting.num_flaggers_to_close_topic = 2
+        SiteSetting.num_hours_to_close_topic = 1
       end
 
-      expect(topic.reload.closed).to eq(false)
-
-      # clean up
-      PostAction.where(post: post1).delete_all
-
-      # reaching `num_flags_to_close_topic` isn't enough
-      [post1, post2, post3].each do |post|
-        PostAction.act(flagger1, post, PostActionType.types[:inappropriate])
-      end
-
-      expect(topic.reload.closed).to eq(false)
-
-      # clean up
-      PostAction.where(post: [post1, post2, post3]).delete_all
-
-      # reaching both should close the topic
-      [flagger1, flagger2].each do |flagger|
-        [post1, post2, post3].each do |post|
-          PostAction.act(flagger, post, PostActionType.types[:inappropriate])
+      it "will automatically pause a topic due to large community flagging" do
+        # reaching `num_flaggers_to_close_topic` isn't enough
+        [flagger1, flagger2].each do |flagger|
+          PostAction.act(flagger, post1, PostActionType.types[:inappropriate])
         end
+
+        expect(topic.reload.closed).to eq(false)
+
+        # clean up
+        PostAction.where(post: post1).delete_all
+
+        # reaching `num_flags_to_close_topic` isn't enough
+        [post1, post2, post3].each do |post|
+          PostAction.act(flagger1, post, PostActionType.types[:inappropriate])
+        end
+
+        expect(topic.reload.closed).to eq(false)
+
+        # clean up
+        PostAction.where(post: [post1, post2, post3]).delete_all
+
+        # reaching both should close the topic
+        [flagger1, flagger2].each do |flagger|
+          [post1, post2, post3].each do |post|
+            PostAction.act(flagger, post, PostActionType.types[:inappropriate])
+          end
+        end
+
+        expect(topic.reload.closed).to eq(true)
+
+        topic_status_update = TopicTimer.last
+
+        expect(topic_status_update.topic).to eq(topic)
+        expect(topic_status_update.execute_at).to be_within(1.second).of(1.hour.from_now)
+        expect(topic_status_update.status_type).to eq(TopicTimer.types[:open])
       end
 
-      expect(topic.reload.closed).to eq(true)
+      it "will keep the topic in closed status until the community flags are handled" do
+        freeze_time
 
-      topic_status_update = TopicTimer.last
+        PostAction.stubs(:auto_close_threshold_reached?).returns(true)
+        PostAction.auto_close_if_threshold_reached(topic)
 
-      expect(topic_status_update.topic).to eq(topic)
-      expect(topic_status_update.execute_at).to be_within(1.second).of(1.hour.from_now)
-      expect(topic_status_update.status_type).to eq(TopicTimer.types[:open])
+        expect(topic.reload.closed).to eq(true)
+
+        timer = TopicTimer.last
+        expect(timer.execute_at).to eq(1.hour.from_now)
+
+        freeze_time timer.execute_at
+        Jobs.expects(:enqueue_in).with(1.hour.to_i, :toggle_topic_closed, topic_timer_id: timer.id, state: false).returns(true)
+        Jobs::ToggleTopicClosed.new.execute(topic_timer_id: timer.id, state: false)
+
+        expect(topic.reload.closed).to eq(true)
+        expect(timer.reload.execute_at).to eq(1.hour.from_now)
+
+        freeze_time timer.execute_at
+        PostAction.stubs(:auto_close_threshold_reached?).returns(false)
+        Jobs::ToggleTopicClosed.new.execute(topic_timer_id: timer.id, state: false)
+
+        expect(topic.reload.closed).to eq(false)
+      end
+
+      it "will reopen topic after the flags are auto handled" do
+        freeze_time
+        [flagger1, flagger2].each do |flagger|
+          [post1, post2, post3].each do |post|
+            PostAction.act(flagger, post, PostActionType.types[:inappropriate])
+          end
+        end
+
+        expect(topic.reload.closed).to eq(true)
+
+        freeze_time 61.days.from_now
+        Jobs::AutoQueueHandler.new.execute({})
+        Jobs::ToggleTopicClosed.new.execute(topic_timer_id: TopicTimer.last.id, state: false)
+
+        expect(topic.reload.closed).to eq(false)
+      end
     end
 
   end
diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb
index dce839102d..9ddfccfb3f 100644
--- a/spec/models/post_spec.rb
+++ b/spec/models/post_spec.rb
@@ -1153,6 +1153,27 @@ describe Post do
       post.reload
       expect(post.baked_at).to eq(baked)
     end
+
+    it "will rate limit globally" do
+
+      post1 = create_post
+      post2 = create_post
+      post3 = create_post
+
+      Post.where(id: [post1.id, post2.id, post3.id]).update_all(baked_version: -1)
+
+      global_setting :max_old_rebakes_per_15_minutes, 2
+
+      RateLimiter.clear_all_global!
+      RateLimiter.enable
+
+      Post.rebake_old(100)
+
+      expect(post3.reload.baked_version).not_to eq(-1)
+      expect(post2.reload.baked_version).not_to eq(-1)
+      expect(post1.reload.baked_version).to eq(-1)
+
+    end
   end
 
   describe ".unhide!" do
diff --git a/spec/models/site_setting_spec.rb b/spec/models/site_setting_spec.rb
index 6c6f556c29..6f4cf60782 100644
--- a/spec/models/site_setting_spec.rb
+++ b/spec/models/site_setting_spec.rb
@@ -150,6 +150,40 @@ describe SiteSetting do
     end
   end
 
+  describe '.site_home_logo_url' do
+    describe 'when logo site setting is set' do
+      let(:upload) { Fabricate(:upload) }
+
+      before do
+        SiteSetting.logo = upload
+      end
+
+      it 'should return the right URL' do
+        expect(SiteSetting.site_home_logo_url)
+          .to eq("#{Discourse.base_url}#{upload.url}")
+      end
+    end
+
+    describe 'when logo site setting is not set' do
+      describe 'when there is a custom title' do
+        before do
+          SiteSetting.title = "test"
+        end
+
+        it 'should return a blank string' do
+          expect(SiteSetting.site_home_logo_url).to eq('')
+        end
+      end
+
+      describe 'when title has not been set' do
+        it 'should return the default logo url' do
+          expect(SiteSetting.site_home_logo_url)
+            .to eq("#{Discourse.base_url}/images/d-logo-sketch.png")
+        end
+      end
+    end
+  end
+
   context 'deprecated site settings' do
     before do
       SiteSetting.force_https = true
diff --git a/spec/multisite/distributed_cache_spec.rb b/spec/multisite/distributed_cache_spec.rb
index cdd25dbfaf..7306fc20ec 100644
--- a/spec/multisite/distributed_cache_spec.rb
+++ b/spec/multisite/distributed_cache_spec.rb
@@ -1,8 +1,6 @@
 require 'rails_helper'
 
 RSpec.describe 'Multisite SiteSettings', type: :multisite do
-  let(:conn) { RailsMultisite::ConnectionManagement }
-
   def cache(name, namespace: true)
     DistributedCache.new(name, namespace: namespace)
   end
@@ -15,7 +13,7 @@ RSpec.describe 'Multisite SiteSettings', type: :multisite do
 
       expect(cache1.hash).to eq('default' => true)
 
-      conn.with_connection('second') do
+      test_multisite_connection('second') do
         message = MessageBus.track_publish(DistributedCache::Manager::CHANNEL_NAME) do
           cache1['second'] = true
         end.first
diff --git a/spec/multisite/s3_store_spec.rb b/spec/multisite/s3_store_spec.rb
index 6c023d15b6..7939f32c9f 100644
--- a/spec/multisite/s3_store_spec.rb
+++ b/spec/multisite/s3_store_spec.rb
@@ -2,9 +2,9 @@ require 'rails_helper'
 require 'file_store/s3_store'
 
 RSpec.describe 'Multisite s3 uploads', type: :multisite do
-  let(:conn) { RailsMultisite::ConnectionManagement }
   let(:uploaded_file) { file_from_fixtures("smallest.png") }
-  let(:upload) { Fabricate(:upload, sha1: Digest::SHA1.hexdigest(File.read(uploaded_file))) }
+  let(:upload_sha1) { Digest::SHA1.hexdigest(File.read(uploaded_file)) }
+  let(:upload) { Fabricate(:upload, sha1: upload_sha1) }
 
   context 'uploading to s3' do
     before(:each) do
@@ -20,16 +20,20 @@ RSpec.describe 'Multisite s3 uploads', type: :multisite do
       let(:store) { FileStore::S3Store.new(s3_helper) }
 
       it "returns the correct url for default and second multisite db" do
-        conn.with_connection('default') do
-          expect(store.store_upload(uploaded_file, upload)).to eq(
+        test_multisite_connection('default') do
+          test_upload = Fabricate(:upload, sha1: upload_sha1)
+          expect(store.store_upload(uploaded_file, test_upload)).to eq(
             "//#{SiteSetting.s3_upload_bucket}.s3.dualstack.us-east-1.amazonaws.com/uploads/default/original/1X/c530c06cf89c410c0355d7852644a73fc3ec8c04.png"
           )
+          expect(upload.etag).to eq("ETag")
         end
 
-        conn.with_connection('second') do
-          expect(store.store_upload(uploaded_file, upload)).to eq(
+        test_multisite_connection('second') do
+          test_upload = Fabricate(:upload, sha1: upload_sha1)
+          expect(store.store_upload(uploaded_file, test_upload)).to eq(
             "//#{SiteSetting.s3_upload_bucket}.s3.dualstack.us-east-1.amazonaws.com/uploads/second/original/1X/c530c06cf89c410c0355d7852644a73fc3ec8c04.png"
           )
+          expect(upload.etag).to eq("ETag")
         end
       end
     end
@@ -52,7 +56,7 @@ RSpec.describe 'Multisite s3 uploads', type: :multisite do
       let(:s3_helper) { store.s3_helper }
 
       it "removes the file from s3 on multisite" do
-        conn.with_connection('default') do
+        test_multisite_connection('default') do
           store.expects(:get_depth_for).with(upload.id).returns(0)
           s3_helper.expects(:s3_bucket).returns(s3_bucket).at_least_once
           upload.update_attributes!(url: "//s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com/uploads/default/original/1X/#{upload.sha1}.png")
@@ -68,7 +72,7 @@ RSpec.describe 'Multisite s3 uploads', type: :multisite do
       end
 
       it "removes the file from s3 on another multisite db" do
-        conn.with_connection('second') do
+        test_multisite_connection('second') do
           store.expects(:get_depth_for).with(upload.id).returns(0)
           s3_helper.expects(:s3_bucket).returns(s3_bucket).at_least_once
           upload.update_attributes!(url: "//s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com/uploads/second/original/1X/#{upload.sha1}.png")
@@ -89,7 +93,7 @@ RSpec.describe 'Multisite s3 uploads', type: :multisite do
         end
 
         it "removes the file from s3 on multisite" do
-          conn.with_connection('default') do
+          test_multisite_connection('default') do
             store.expects(:get_depth_for).with(upload.id).returns(0)
             s3_helper.expects(:s3_bucket).returns(s3_bucket).at_least_once
             upload.update_attributes!(url: "//s3-upload-bucket.s3.dualstack.us-west-1.amazonaws.com/discourse-uploads/uploads/default/original/1X/#{upload.sha1}.png")
diff --git a/spec/multisite/site_settings_spec.rb b/spec/multisite/site_settings_spec.rb
index 5a0d7b4719..a01182e3b5 100644
--- a/spec/multisite/site_settings_spec.rb
+++ b/spec/multisite/site_settings_spec.rb
@@ -1,34 +1,28 @@
 require 'rails_helper'
 
 RSpec.describe 'Multisite SiteSettings', type: :multisite do
-  let(:conn) { RailsMultisite::ConnectionManagement }
-
   before do
     @original_provider = SiteSetting.provider
     SiteSetting.provider = SiteSettings::DbProvider.new(SiteSetting)
   end
 
   after do
-    ['default', 'second'].each do |db|
-      conn.with_connection(db) { SiteSetting.where(name: 'default_locale').destroy_all }
-    end
-
     SiteSetting.provider = @original_provider
   end
 
   describe '#default_locale' do
     it 'should return the right locale' do
-      conn.with_connection('default') do
+      test_multisite_connection('default') do
         expect(SiteSetting.default_locale).to eq('en')
       end
 
-      conn.with_connection('second') do
+      test_multisite_connection('second') do
         SiteSetting.default_locale = 'zh_TW'
 
         expect(SiteSetting.default_locale).to eq('zh_TW')
       end
 
-      conn.with_connection('default') do
+      test_multisite_connection('default') do
         expect(SiteSetting.default_locale).to eq('en')
 
         SiteSetting.default_locale = 'ja'
@@ -36,7 +30,7 @@ RSpec.describe 'Multisite SiteSettings', type: :multisite do
         expect(SiteSetting.default_locale).to eq('ja')
       end
 
-      conn.with_connection('second') do
+      test_multisite_connection('second') do
         expect(SiteSetting.default_locale).to eq('zh_TW')
       end
     end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 1367319521..a0fad312fd 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -135,7 +135,9 @@ RSpec.configure do |config|
     unfreeze_time
     ActionMailer::Base.deliveries.clear
 
-    raise if ActiveRecord::Base.connection_pool.stat[:busy] > 1
+    if ActiveRecord::Base.connection_pool.stat[:busy] > 1
+      raise ActiveRecord::Base.connection_pool.stat.inspect
+    end
   end
 
   config.before :each do |x|
@@ -200,6 +202,22 @@ RSpec.configure do |config|
     end
   end
 
+  # Normally we `use_transactional_fixtures` to clear out a database after a test
+  # runs. However, this does not apply to tests done for multisite. The second time
+  # a test runs you can end up with stale data that breaks things. This method will
+  # force a rollback after using a multisite connection.
+  def test_multisite_connection(name)
+    RailsMultisite::ConnectionManagement.with_connection(name) do
+      ActiveRecord::Base.transaction do
+        begin
+          yield
+        ensure
+          throw raise ActiveRecord::Rollback
+        end
+      end
+    end
+  end
+
 end
 
 class TrackTimeStub
diff --git a/spec/requests/admin/email_controller_spec.rb b/spec/requests/admin/email_controller_spec.rb
index 34b2faff5b..97cdef075c 100644
--- a/spec/requests/admin/email_controller_spec.rb
+++ b/spec/requests/admin/email_controller_spec.rb
@@ -58,6 +58,32 @@ describe Admin::EmailController do
       expect(log["id"]).to eq(email_log.id)
       expect(log["reply_key"]).to eq(post_reply_key.reply_key)
     end
+
+    it 'should be able to filter by reply key' do
+      email_log_2 = Fabricate(:email_log, post: post)
+
+      post_reply_key_2 = Fabricate(:post_reply_key,
+        post: post,
+        user: email_log_2.user,
+        reply_key: "2d447423-c625-4fb9-8717-ff04ac60eee8"
+      )
+
+      [
+        "17ff04",
+        "2d447423c6254fb98717ff04ac60eee8"
+      ].each do |reply_key|
+        get "/admin/email/sent.json", params: {
+          reply_key: reply_key
+        }
+
+        expect(response.status).to eq(200)
+
+        logs = JSON.parse(response.body)
+
+        expect(logs.size).to eq(1)
+        expect(logs.first["reply_key"]).to eq(post_reply_key_2.reply_key)
+      end
+    end
   end
 
   describe '#skipped' do
diff --git a/spec/requests/categories_controller_spec.rb b/spec/requests/categories_controller_spec.rb
index 428b876b3e..df387c56ab 100644
--- a/spec/requests/categories_controller_spec.rb
+++ b/spec/requests/categories_controller_spec.rb
@@ -144,8 +144,7 @@ describe CategoriesController do
             permissions: {
               "everyone" => readonly,
               "staff" => create_post
-            },
-            uploaded_meta_id: 2
+            }
           }
 
           expect(response.status).to eq(200)
@@ -158,7 +157,6 @@ describe CategoriesController do
           expect(category.color).to eq("ff0")
           expect(category.auto_close_hours).to eq(72)
           expect(UserHistory.count).to eq(4) # 1 + 3 (bootstrap mode)
-          expect(category.uploaded_meta_id).to eq(2)
         end
       end
     end
diff --git a/spec/requests/invites_controller_spec.rb b/spec/requests/invites_controller_spec.rb
index d51a3013ed..037d2aa047 100644
--- a/spec/requests/invites_controller_spec.rb
+++ b/spec/requests/invites_controller_spec.rb
@@ -12,7 +12,7 @@ describe InvitesController do
 
       body = response.body
       expect(body).to_not have_tag(:script, with: { src: '/assets/application.js' })
-      expect(CGI.unescapeHTML(body)).to include(I18n.t('invite.not_found_template', site_name: SiteSetting.title, base_url: Discourse.base_url))
+      expect(CGI.unescapeHTML(body)).to include(I18n.t('invite.not_found', site_name: SiteSetting.title, base_url: Discourse.base_url))
     end
 
     it "renders the accept invite page if invite exists" do
@@ -335,7 +335,10 @@ describe InvitesController do
               before { invite.update_column(:via_email, true) }
 
               it "doesn't send an activation email and activates the user" do
-                put "/invites/show/#{invite.invite_key}.json", params: { password: "verystrongpassword" }
+                expect do
+                  put "/invites/show/#{invite.invite_key}.json", params: { password: "verystrongpassword" }
+                end.to change { UserAuthToken.count }.by(1)
+
                 expect(response.status).to eq(200)
                 expect(JSON.parse(response.body)["success"]).to eq(true)
 
@@ -352,9 +355,13 @@ describe InvitesController do
               before { invite.update_column(:via_email, false) }
 
               it "sends an activation email and doesn't activate the user" do
-                put "/invites/show/#{invite.invite_key}.json", params: { password: "verystrongpassword" }
+                expect do
+                  put "/invites/show/#{invite.invite_key}.json", params: { password: "verystrongpassword" }
+                end.not_to change { UserAuthToken.count }
+
                 expect(response.status).to eq(200)
                 expect(JSON.parse(response.body)["success"]).to eq(true)
+                expect(JSON.parse(response.body)["message"]).to eq(I18n.t("invite.confirm_email"))
 
                 invited_user = User.find_by_email(invite.email)
                 expect(invited_user.active).to eq(false)
diff --git a/spec/requests/posts_controller_spec.rb b/spec/requests/posts_controller_spec.rb
index 8290e1b445..63f9ba875f 100644
--- a/spec/requests/posts_controller_spec.rb
+++ b/spec/requests/posts_controller_spec.rb
@@ -1160,10 +1160,18 @@ describe PostsController do
         include_examples "it works"
       end
 
+      context "TL4 users" do
+        before do
+          sign_in(Fabricate(:trust_level_4))
+        end
+
+        include_examples "it works"
+      end
+
       context "users" do
         let(:topic) { Fabricate(:topic) }
 
-        [:user, :trust_level_4].each do |user|
+        [:user].each do |user|
           it "will raise an error for #{user}" do
             sign_in(Fabricate(user))
             post "/posts.json", params: {
diff --git a/spec/requests/tags_controller_spec.rb b/spec/requests/tags_controller_spec.rb
index 740e628dcf..ade557a66e 100644
--- a/spec/requests/tags_controller_spec.rb
+++ b/spec/requests/tags_controller_spec.rb
@@ -319,14 +319,33 @@ describe TagsController do
         expect(json['results'].map { |j| j['id'] }).to eq(['tag', 'tag2'])
       end
 
-      it "can say if given tag is not allowed" do
-        yup, nope = Fabricate(:tag, name: 'yup'), Fabricate(:tag, name: 'nope')
-        category = Fabricate(:category, tags: [yup])
-        get "/tags/filter/search.json", params: { q: 'nope', categoryId: category.id }
-        expect(response.status).to eq(200)
-        json = ::JSON.parse(response.body)
-        expect(json["results"].map { |j| j["id"] }.sort).to eq([])
-        expect(json["forbidden"]).to be_present
+      context 'with category restriction' do
+        let(:yup) { Fabricate(:tag, name: 'yup') }
+        let(:category) { Fabricate(:category, tags: [yup]) }
+
+        it "can say if given tag is not allowed" do
+          nope = Fabricate(:tag, name: 'nope')
+          get "/tags/filter/search.json", params: { q: nope.name, categoryId: category.id }
+          expect(response.status).to eq(200)
+          json = ::JSON.parse(response.body)
+          expect(json["results"].map { |j| j["id"] }.sort).to eq([])
+          expect(json["forbidden"]).to be_present
+          expect(json["forbidden_message"]).to eq(I18n.t("tags.forbidden.in_this_category", tag_name: nope.name))
+        end
+
+        it "can say if given tag is restricted to different category" do
+          category
+          get "/tags/filter/search.json", params: { q: yup.name, categoryId: Fabricate(:category).id }
+          json = ::JSON.parse(response.body)
+          expect(json["results"].map { |j| j["id"] }.sort).to eq([])
+          expect(json["forbidden"]).to be_present
+          expect(json["forbidden_message"]).to eq(I18n.t(
+            "tags.forbidden.restricted_to",
+            count: 1,
+            tag_name: yup.name,
+            category_names: category.name
+          ))
+        end
       end
 
       it "matches tags after sanitizing input" do
diff --git a/spec/requests/user_api_keys_controller_spec.rb b/spec/requests/user_api_keys_controller_spec.rb
index ddaedd2589..ee5ffb4d7f 100644
--- a/spec/requests/user_api_keys_controller_spec.rb
+++ b/spec/requests/user_api_keys_controller_spec.rb
@@ -205,5 +205,40 @@ describe UserApiKeysController do
 
       expect(response.status).to eq(302)
     end
+
+    it "will just show the payload if no redirect" do
+      user = Fabricate(:user, trust_level: 0)
+      sign_in(user)
+
+      args.delete(:auth_redirect)
+
+      SiteSetting.min_trust_level_for_user_api_key = 0
+      post "/user-api-key", params: args
+      expect(response.status).not_to eq(302)
+      payload = Nokogiri::HTML(response.body).at('code').content
+      encrypted = Base64.decode64(payload)
+      key = OpenSSL::PKey::RSA.new(private_key)
+      parsed = JSON.parse(key.private_decrypt(encrypted))
+      api_key = UserApiKey.find_by(key: parsed["key"])
+      expect(api_key.user_id).to eq(user.id)
+    end
+
+    it "will just show the JSON payload if no redirect" do
+      user = Fabricate(:user, trust_level: 0)
+      sign_in(user)
+
+      args.delete(:auth_redirect)
+
+      SiteSetting.min_trust_level_for_user_api_key = 0
+      post "/user-api-key.json", params: args
+      expect(response.status).not_to eq(302)
+      payload = JSON.parse(response.body)["payload"]
+      encrypted = Base64.decode64(payload)
+      key = OpenSSL::PKey::RSA.new(private_key)
+      parsed = JSON.parse(key.private_decrypt(encrypted))
+      api_key = UserApiKey.find_by(key: parsed["key"])
+      expect(api_key.user_id).to eq(user.id)
+
+    end
   end
 end
diff --git a/spec/requests/user_avatars_controller_spec.rb b/spec/requests/user_avatars_controller_spec.rb
index 33a63799d7..030959c748 100644
--- a/spec/requests/user_avatars_controller_spec.rb
+++ b/spec/requests/user_avatars_controller_spec.rb
@@ -84,7 +84,8 @@ describe UserAvatarsController do
         upload: upload,
         width: 98,
         height: 98,
-        url: "//test.s3.dualstack.us-east-1.amazonaws.com/something/else"
+        url: "//test.s3.dualstack.us-east-1.amazonaws.com/something/else",
+        version: OptimizedImage::VERSION
       )
 
       user = Fabricate(:user, uploaded_avatar_id: upload.id)
@@ -101,6 +102,29 @@ describe UserAvatarsController do
       expect(response.headers["Last-Modified"]).to eq(optimized_image.upload.created_at.httpdate)
     end
 
+    it 'serves new version for old urls' do
+      user = Fabricate(:user)
+      SiteSetting.avatar_sizes = "45"
+
+      image = file_from_fixtures("cropped.png")
+      upload = UploadCreator.new(image, "image.png").create_for(user.id)
+
+      user.update_columns(uploaded_avatar_id: upload.id)
+
+      get "/user_avatar/default/#{user.username}/45/#{upload.id}_1.png"
+
+      expect(response.status).to eq(200)
+
+      image = response.body
+      optimized = upload.get_optimized_image(45, 45, {})
+
+      expect(optimized.filesize).to eq(body.length)
+
+      # clean up images
+      upload.destroy
+
+    end
+
     it 'serves a correct last modified for render blank' do
       freeze_time
 
diff --git a/spec/requests/user_badges_controller_spec.rb b/spec/requests/user_badges_controller_spec.rb
index 92da1a693e..3ee79270c1 100644
--- a/spec/requests/user_badges_controller_spec.rb
+++ b/spec/requests/user_badges_controller_spec.rb
@@ -188,6 +188,38 @@ describe UserBadgesController do
 
       expect(response.status).to eq(200)
     end
+
+    describe 'with relative_url_root' do
+      before do
+        @orig_relative_url_root = ActionController::Base.config.relative_url_root
+        ActionController::Base.config.relative_url_root = "/discuss"
+      end
+
+      after do
+        ActionController::Base.config.relative_url_root = @orig_relative_url_root
+      end
+
+      it 'grants badge when valid post/topic link is given in reason' do
+        admin = Fabricate(:admin)
+        post = create_post
+
+        sign_in(admin)
+
+        post "/user_badges.json", params: {
+          badge_id: badge.id,
+          username: user.username,
+          reason: "#{Discourse.base_url}#{post.url}"
+        }
+
+        expect(response.status).to eq(200)
+
+        expect(UserBadge.exists?(
+          badge_id: badge.id,
+          post_id: post.id,
+          granted_by: admin.id)
+        ).to eq(true)
+      end
+    end
   end
 
   context 'destroy' do
diff --git a/spec/serializers/admin_user_list_serializer_spec.rb b/spec/serializers/admin_user_list_serializer_spec.rb
index 63bc97cfd5..60c7dac3c9 100644
--- a/spec/serializers/admin_user_list_serializer_spec.rb
+++ b/spec/serializers/admin_user_list_serializer_spec.rb
@@ -8,92 +8,59 @@ describe AdminUserListSerializer do
     let(:moderator) { Fabricate(:user_single_email, moderator: true, email: "moderator@email.com") }
     let(:user) { Fabricate(:user_single_email, email: "user@email.com") }
     let(:guardian) { Guardian.new(admin) }
-    let(:mod_guardian) { Guardian.new(moderator) }
 
-    let(:json) do
-      AdminUserListSerializer.new(user,
-        scope: guardian,
-        root: false
-      ).as_json
+    let(:serializer) do
+      AdminUserListSerializer.new(user, scope: guardian, root: false)
     end
 
-    let(:mod_json) do
-      AdminUserListSerializer.new(user,
-        scope: mod_guardian,
-        root: false
+    def serialize(user, viewed_by, opts = nil)
+      AdminUserListSerializer.new(
+        user,
+        scope: Guardian.new(viewed_by),
+        root: false,
+        emails_desired: opts && opts[:emails_desired]
       ).as_json
     end
 
     def fabricate_secondary_emails_for(u)
-      ["first", "second"].each do |name|
-        Fabricate(:secondary_email, user: u, email: "#{name}@email.com")
-      end
+      Fabricate(:secondary_email, user: u, email: "first@email.com")
+      Fabricate(:secondary_email, user: u, email: "second@email.com")
     end
 
-    shared_examples "shown" do |email|
-      it "contains emails" do
-        expect(json[:email]).to eq(email)
-
-        expect(json[:secondary_emails]).to contain_exactly(
-          "first@email.com",
-          "second@email.com"
-        )
-      end
+    it "contains an admin's own emails" do
+      fabricate_secondary_emails_for(admin)
+      json = serialize(admin, admin)
+      expect(json[:email]).to eq("admin@email.com")
+      expect(json[:secondary_emails]).to contain_exactly("first@email.com", "second@email.com")
     end
 
-    shared_examples "not shown" do
-      it "doesn't contain emails" do
-        expect(json[:email]).to eq(nil)
-        expect(json[:secondary_emails]).to eq(nil)
-      end
+    it "doesn't include a regular user's emails" do
+      fabricate_secondary_emails_for(user)
+      json = serialize(user, user)
+      expect(json[:email]).to eq(nil)
+      expect(json[:secondary_emails]).to eq(nil)
     end
 
-    context "with myself" do
-      let(:user) { admin }
-
-      before do
-        fabricate_secondary_emails_for(admin)
-      end
-
-      include_examples "shown", "admin@email.com"
+    it "doesn't return emails for a moderator request" do
+      fabricate_secondary_emails_for(user)
+      json = serialize(user, moderator, emails_desired: true)
+      expect(json[:email]).to eq(nil)
+      expect(json[:secondary_emails]).to eq(nil)
     end
 
-    context "with a normal user" do
-      before do
-        fabricate_secondary_emails_for(user)
-      end
-
-      include_examples "not shown"
+    it "returns emails for admins when emails_desired is true" do
+      fabricate_secondary_emails_for(user)
+      json = serialize(user, admin, emails_desired: true)
+      expect(json[:email]).to eq("user@email.com")
+      expect(json[:secondary_emails]).to contain_exactly("first@email.com", "second@email.com")
     end
 
-    context "when moderator makes a request with show_emails param set to true" do
-      before do
-        mod_guardian.can_see_emails = true
-        fabricate_secondary_emails_for(user)
-      end
-
-      it "doesn't contain emails" do
-        expect(mod_json[:email]).to eq(nil)
-        expect(mod_json[:secondary_emails]).to eq(nil)
-      end
-    end
-
-    context "with a normal user after clicking 'show emails'" do
-      before do
-        guardian.can_see_emails = true
-        fabricate_secondary_emails_for(user)
-      end
-
-      include_examples "shown", "user@email.com"
-    end
-
-    context "with a staged user" do
-      before do
-        user.staged = true
-        fabricate_secondary_emails_for(user)
-      end
-
-      include_examples "shown", "user@email.com"
+    it "returns a staged user's emails" do
+      user.staged = true
+      fabricate_secondary_emails_for(user)
+      json = serialize(user, admin)
+      expect(json[:email]).to eq("user@email.com")
+      expect(json[:secondary_emails]).to contain_exactly("first@email.com", "second@email.com")
     end
   end
 end
diff --git a/spec/serializers/basic_user_serializer_spec.rb b/spec/serializers/basic_user_serializer_spec.rb
index 551df2c3aa..1e0b90832d 100644
--- a/spec/serializers/basic_user_serializer_spec.rb
+++ b/spec/serializers/basic_user_serializer_spec.rb
@@ -2,26 +2,20 @@ require 'rails_helper'
 require_dependency 'user'
 
 describe BasicUserSerializer do
-
-  context "name" do
+  describe '#as_json' do
     let(:user) { Fabricate.build(:user) }
     let(:serializer) { BasicUserSerializer.new(user, scope: Guardian.new(user), root: false) }
     let(:json) { serializer.as_json }
 
     it "returns the username" do
-      expect(json[:username]).to be_present
-    end
-
-    it "returns the name it when `enable_names` is true" do
-      SiteSetting.enable_names = true
-      expect(json[:name]).to be_present
+      expect(json[:username]).to eq(user.username)
+      expect(json[:name]).to eq(user.name)
+      expect(json[:avatar_template]).to eq(user.avatar_template)
     end
 
     it "doesn't return the name it when `enable_names` is false" do
       SiteSetting.enable_names = false
-      expect(json[:name]).to be_blank
+      expect(json[:name]).to eq(nil)
     end
-
   end
-
 end
diff --git a/spec/serializers/user_summary_serializer_spec.rb b/spec/serializers/user_summary_serializer_spec.rb
new file mode 100644
index 0000000000..55a53f54ce
--- /dev/null
+++ b/spec/serializers/user_summary_serializer_spec.rb
@@ -0,0 +1,30 @@
+require 'rails_helper'
+
+describe UserSummarySerializer do
+  it "returns expected data" do
+    UserActionCreator.enable
+    user = Fabricate(:user)
+    liked_user = Fabricate(:user, name: "John Doe", username: "john_doe")
+    liked_post = create_post(user: liked_user)
+    PostAction.act(user, liked_post, PostActionType.types[:like])
+
+    guardian = Guardian.new(user)
+    summary = UserSummary.new(user, guardian)
+    serializer = UserSummarySerializer.new(summary, scope: guardian, root: false)
+    json = serializer.as_json
+
+    expect(json[:likes_given]).to eq(1)
+    expect(json[:likes_received]).to be_present
+    expect(json[:posts_read_count]).to be_present
+    expect(json[:topic_count]).to be_present
+    expect(json[:time_read]).to be_present
+    expect(json[:most_liked_users][0][:count]).to eq(1)
+    expect(json[:most_liked_users][0][:name]).to eq("John Doe")
+    expect(json[:most_liked_users][0][:username]).to eq("john_doe")
+    expect(json[:most_liked_users][0][:avatar_template]).to eq(liked_user.avatar_template)
+
+    # do not include full name if disabled
+    SiteSetting.enable_names = false
+    expect(serializer.as_json[:most_liked_users][0][:name]).to eq(nil)
+  end
+end
diff --git a/spec/services/badge_granter_spec.rb b/spec/services/badge_granter_spec.rb
index 451cb158a1..e79288ce7e 100644
--- a/spec/services/badge_granter_spec.rb
+++ b/spec/services/badge_granter_spec.rb
@@ -74,31 +74,30 @@ describe BadgeGranter do
     end
 
     it 'should grant missing badges' do
+      nice_topic = Badge.find(Badge::NiceTopic)
       good_topic = Badge.find(Badge::GoodTopic)
 
       post = Fabricate(:post, like_count: 30)
+
       2.times {
-        BadgeGranter.backfill(Badge.find(Badge::NiceTopic), post_ids: [post.id])
+        BadgeGranter.backfill(nice_topic, post_ids: [post.id])
         BadgeGranter.backfill(good_topic)
       }
 
       # TODO add welcome
-      expect(post.user.user_badges.pluck(:badge_id).sort).to eq([Badge::NiceTopic, Badge::GoodTopic])
-
+      expect(post.user.user_badges.pluck(:badge_id)).to contain_exactly(nice_topic.id, good_topic.id)
       expect(post.user.notifications.count).to eq(2)
 
-      notification = post.user.notifications.last
-      data = notification.data_hash
+      data = post.user.notifications.last.data_hash
       expect(data["badge_id"]).to eq(good_topic.id)
       expect(data["badge_slug"]).to eq(good_topic.slug)
       expect(data["username"]).to eq(post.user.username)
 
-      expect(Badge.find(Badge::NiceTopic).grant_count).to eq(1)
-      expect(Badge.find(Badge::GoodTopic).grant_count).to eq(1)
+      expect(nice_topic.grant_count).to eq(1)
+      expect(good_topic.grant_count).to eq(1)
     end
 
     it 'should grant badges in the user locale' do
-
       SiteSetting.allow_user_locale = true
 
       nice_topic = Badge.find(Badge::NiceTopic)
diff --git a/spec/services/post_action_notifier_spec.rb b/spec/services/post_action_notifier_spec.rb
index b52aa8cb9a..85d978fcf3 100644
--- a/spec/services/post_action_notifier_spec.rb
+++ b/spec/services/post_action_notifier_spec.rb
@@ -10,26 +10,6 @@ describe PostActionNotifier do
   let!(:evil_trout) { Fabricate(:evil_trout) }
   let(:post) { Fabricate(:post) }
 
-  context 'liking' do
-    context 'when liking a post' do
-      it 'creates a notification' do
-        expect {
-          PostAction.act(evil_trout, post, PostActionType.types[:like])
-          # one like (welcome badge deferred)
-        }.to change(Notification, :count).by(1)
-      end
-    end
-
-    context 'when removing a liked post' do
-      it 'removes a notification' do
-        PostAction.act(evil_trout, post, PostActionType.types[:like])
-        expect {
-          PostAction.remove_act(evil_trout, post, PostActionType.types[:like])
-        }.to change(Notification, :count).by(-1)
-      end
-    end
-  end
-
   context 'when editing a post' do
     it 'notifies a user of the revision' do
       expect {
diff --git a/test/javascripts/acceptance/admin-site-settings-test.js.es6 b/test/javascripts/acceptance/admin-site-settings-test.js.es6
index 9db655fa46..86fcf962d0 100644
--- a/test/javascripts/acceptance/admin-site-settings-test.js.es6
+++ b/test/javascripts/acceptance/admin-site-settings-test.js.es6
@@ -47,6 +47,19 @@ QUnit.test("changing value updates dirty state", async assert => {
     "setting isn't marked as overriden after undo"
   );
 
+  await click("button.cancel");
+  assert.ok(
+    exists(".row.setting.overridden"),
+    "setting is marked as overriden after cancel"
+  );
+
+  await click("button.undo");
+  await click("button.ok");
+  assert.ok(
+    !exists(".row.setting.overridden"),
+    "setting isn't marked as overriden after undo"
+  );
+
   await fillIn(".input-setting-string", "Test");
   await keyEvent(".input-setting-string", "keydown", 13); // enter
   assert.ok(
diff --git a/test/javascripts/acceptance/auth-complete-test.js.es6 b/test/javascripts/acceptance/auth-complete-test.js.es6
new file mode 100644
index 0000000000..58a717bcc0
--- /dev/null
+++ b/test/javascripts/acceptance/auth-complete-test.js.es6
@@ -0,0 +1,40 @@
+import { acceptance } from "helpers/qunit-helpers";
+acceptance("Auth Complete", {
+  beforeEach() {
+    const node = document.createElement("meta");
+    node.dataset.authenticationData = JSON.stringify({
+      auth_provider: "test",
+      email: "blah@example.com"
+    });
+    node.id = "data-authentication";
+    document.querySelector("head").appendChild(node);
+  },
+  afterEach() {
+    document
+      .querySelector("head")
+      .removeChild(document.getElementById("data-authentication"));
+  }
+});
+
+QUnit.test("when login not required", async assert => {
+  await visit("/");
+
+  assert.equal(currentPath(), "discovery.latest", "it stays on the homepage");
+
+  assert.ok(
+    exists("#discourse-modal div.create-account"),
+    "it shows the registration modal"
+  );
+});
+
+QUnit.test("when login required", async assert => {
+  Discourse.SiteSettings.login_required = true;
+  await visit("/");
+
+  assert.equal(currentPath(), "login", "it redirects to the login page");
+
+  assert.ok(
+    exists("#discourse-modal div.create-account"),
+    "it shows the registration modal"
+  );
+});
diff --git a/test/javascripts/acceptance/create-account-user-fields-test.js.es6 b/test/javascripts/acceptance/create-account-user-fields-test.js.es6
index 3785859ff7..476dad902a 100644
--- a/test/javascripts/acceptance/create-account-user-fields-test.js.es6
+++ b/test/javascripts/acceptance/create-account-user-fields-test.js.es6
@@ -38,6 +38,9 @@ QUnit.test("create account with user fields", async assert => {
 
   await fillIn("#new-account-name", "Dr. Good Tuna");
   await fillIn("#new-account-password", "cool password bro");
+  // without this double fill, field will sometimes being empty
+  // got consistent repro by having browser search bar focused when starting test
+  await fillIn("#new-account-email", "good.tuna@test.com");
   await fillIn("#new-account-email", "good.tuna@test.com");
   await fillIn("#new-account-username", "goodtuna");
 
@@ -45,6 +48,10 @@ QUnit.test("create account with user fields", async assert => {
     exists("#username-validation.good"),
     "the username validation is good"
   );
+  assert.ok(
+    exists("#account-email-validation.good"),
+    "the email validation is good"
+  );
   assert.ok(
     exists(".modal-footer .btn-primary:disabled"),
     "create account is still disabled due to lack of user fields"
@@ -58,14 +65,15 @@ QUnit.test("create account with user fields", async assert => {
   );
 
   await click(".user-field input[type=checkbox]");
-  assert.not(
-    exists(".modal-footer .btn-primary:disabled"),
-    "create account is enabled because field is not checked"
+
+  assert.ok(
+    !exists(".modal-footer .btn-primary:disabled"),
+    "create account is enabled because field is checked"
   );
 
   await click(".user-field input[type=checkbox]");
   assert.ok(
     exists(".modal-footer .btn-primary:disabled"),
-    "unclicking the checkbox disables the submit"
+    "unchecking the checkbox disables the create account button"
   );
 });
diff --git a/test/javascripts/acceptance/jump-to-test.js.es6 b/test/javascripts/acceptance/jump-to-test.js.es6
index 87856db860..6e688841f7 100644
--- a/test/javascripts/acceptance/jump-to-test.js.es6
+++ b/test/javascripts/acceptance/jump-to-test.js.es6
@@ -3,6 +3,8 @@ import { acceptance } from "helpers/qunit-helpers";
 acceptance("Jump to", {
   loggedIn: true,
 
+  mobileView: true,
+
   pretend(server, helper) {
     server.get("/t/280/excerpts.json", () => helper.response(200, []));
     server.get("/t/280/3.json", () => helper.response(200, {}));
@@ -20,7 +22,6 @@ acceptance("Jump to", {
 
 QUnit.test("default", async assert => {
   await visit("/t/internationalization-localization/280");
-
   await click("nav#topic-progress .nums");
   await click("button.jump-to-post");
 
diff --git a/test/javascripts/acceptance/preferences-test.js.es6 b/test/javascripts/acceptance/preferences-test.js.es6
index 71961b489f..2f67c8b33c 100644
--- a/test/javascripts/acceptance/preferences-test.js.es6
+++ b/test/javascripts/acceptance/preferences-test.js.es6
@@ -57,12 +57,11 @@ QUnit.test("update some fields", async assert => {
   );
   assert.ok(exists(".user-preferences"), "it shows the preferences");
 
-  const savePreferences = () => {
-    click(".save-user");
+  const savePreferences = async () => {
     assert.ok(!exists(".saved-user"), "it hasn't been saved yet");
-    andThen(() => {
-      assert.ok(exists(".saved-user"), "it displays the saved message");
-    });
+    await click(".save-user");
+    assert.ok(exists(".saved-user"), "it displays the saved message");
+    find(".saved-user").remove();
   };
 
   fillIn(".pref-name input[type=text]", "Jon Snow");
diff --git a/test/javascripts/acceptance/sign-in-test.js.es6 b/test/javascripts/acceptance/sign-in-test.js.es6
index 132a8be5b6..c7916b38e7 100644
--- a/test/javascripts/acceptance/sign-in-test.js.es6
+++ b/test/javascripts/acceptance/sign-in-test.js.es6
@@ -114,8 +114,12 @@ QUnit.test("create account", async assert => {
   await fillIn("#new-account-name", "Dr. Good Tuna");
   await fillIn("#new-account-password", "cool password bro");
 
-  // Check username
+  // without this double fill, field will sometimes being empty
+  // got consistent repro by having browser search bar focused when starting test
   await fillIn("#new-account-email", "good.tuna@test.com");
+  await fillIn("#new-account-email", "good.tuna@test.com");
+
+  // Check username
   await fillIn("#new-account-username", "taken");
   assert.ok(
     exists("#username-validation.bad"),
diff --git a/test/javascripts/acceptance/topic-discovery-test.js.es6 b/test/javascripts/acceptance/topic-discovery-test.js.es6
index 54e578b9a7..e060c94d66 100644
--- a/test/javascripts/acceptance/topic-discovery-test.js.es6
+++ b/test/javascripts/acceptance/topic-discovery-test.js.es6
@@ -1,5 +1,9 @@
 import { acceptance } from "helpers/qunit-helpers";
-acceptance("Topic Discovery");
+acceptance("Topic Discovery", {
+  settings: {
+    show_pinned_excerpt_desktop: true
+  }
+});
 
 QUnit.test("Visit Discovery Pages", async assert => {
   await visit("/");
@@ -59,3 +63,16 @@ QUnit.test("Visit Discovery Pages", async assert => {
     "The featured topics are there too"
   );
 });
+
+QUnit.test("Clearing state after leaving a category", async assert => {
+  await visit("/c/dev");
+  assert.ok(
+    exists(".topic-list-item[data-topic-id=11994] .topic-excerpt"),
+    "it expands pinned topics in a subcategory"
+  );
+  await visit("/");
+  assert.ok(
+    !exists(".topic-list-item[data-topic-id=11557] .topic-excerpt"),
+    "it doesn't expand all pinned in the latest category"
+  );
+});
diff --git a/test/javascripts/acceptance/topic-edit-timer-test.js.es6 b/test/javascripts/acceptance/topic-edit-timer-test.js.es6
index 682d8bf149..4521975506 100644
--- a/test/javascripts/acceptance/topic-edit-timer-test.js.es6
+++ b/test/javascripts/acceptance/topic-edit-timer-test.js.es6
@@ -25,6 +25,7 @@ acceptance("Topic - Edit timer", {
 });
 
 QUnit.test("default", async assert => {
+  replaceCurrentUser({ admin: true, staff: true, canManageTopic: true });
   const timerType = selectKit(".select-kit.timer-type");
   const futureDateInputSelector = selectKit(".future-date-input-selector");
 
@@ -45,6 +46,7 @@ QUnit.test("default", async assert => {
 });
 
 QUnit.test("autoclose - specific time", async assert => {
+  replaceCurrentUser({ admin: true, staff: true, canManageTopic: true });
   const futureDateInputSelector = selectKit(".future-date-input-selector");
 
   await visit("/t/internationalization-localization");
@@ -65,6 +67,7 @@ QUnit.test("autoclose - specific time", async assert => {
 });
 
 QUnit.test("autoclose", async assert => {
+  replaceCurrentUser({ admin: true, staff: true, canManageTopic: true });
   const futureDateInputSelector = selectKit(".future-date-input-selector");
 
   await visit("/t/internationalization-localization");
@@ -119,6 +122,7 @@ QUnit.test("autoclose", async assert => {
 });
 
 QUnit.test("close temporarily", async assert => {
+  replaceCurrentUser({ admin: true, staff: true, canManageTopic: true });
   const timerType = selectKit(".select-kit.timer-type");
   const futureDateInputSelector = selectKit(".future-date-input-selector");
 
@@ -160,6 +164,7 @@ QUnit.test("close temporarily", async assert => {
 });
 
 QUnit.test("schedule", async assert => {
+  replaceCurrentUser({ admin: true, staff: true, canManageTopic: true });
   const timerType = selectKit(".select-kit.timer-type");
   const categoryChooser = selectKit(".modal-body .category-chooser");
   const futureDateInputSelector = selectKit(".future-date-input-selector");
@@ -208,6 +213,7 @@ QUnit.test("TL4 can't auto-delete", async assert => {
 });
 
 QUnit.test("auto delete", async assert => {
+  replaceCurrentUser({ admin: true, staff: true, canManageTopic: true });
   const timerType = selectKit(".select-kit.timer-type");
   const futureDateInputSelector = selectKit(".future-date-input-selector");
 
@@ -237,6 +243,7 @@ QUnit.test("auto delete", async assert => {
 QUnit.test(
   "Manually closing before the timer will clear the status text",
   async assert => {
+    replaceCurrentUser({ admin: true, staff: true, canManageTopic: true });
     const futureDateInputSelector = selectKit(".future-date-input-selector");
 
     await visit("/t/internationalization-localization");
diff --git a/test/javascripts/acceptance/topic-test.js.es6 b/test/javascripts/acceptance/topic-test.js.es6
index 7da5dc192a..011d64bd75 100644
--- a/test/javascripts/acceptance/topic-test.js.es6
+++ b/test/javascripts/acceptance/topic-test.js.es6
@@ -286,3 +286,10 @@ QUnit.test("select below", async assert => {
     "it should select the right number of posts"
   );
 });
+
+QUnit.test("View Hidden Replies", async assert => {
+  await visit("/t/internationalization-localization/280");
+  await click(".gap");
+
+  assert.equal(find(".gap").length, 0, "it hides gap");
+});
diff --git a/test/javascripts/acceptance/user-test.js.es6 b/test/javascripts/acceptance/user-test.js.es6
index d4fcd33be6..8a05a9367e 100644
--- a/test/javascripts/acceptance/user-test.js.es6
+++ b/test/javascripts/acceptance/user-test.js.es6
@@ -30,6 +30,7 @@ QUnit.test("Root URL - Viewing Self", async assert => {
 
 QUnit.test("Viewing Summary", async assert => {
   await visit("/u/eviltrout/summary");
+
   assert.ok(exists(".replies-section li a"), "replies");
   assert.ok(exists(".topics-section li a"), "topics");
   assert.ok(exists(".links-section li a"), "links");
diff --git a/test/javascripts/components/category-chooser-test.js.es6 b/test/javascripts/components/category-chooser-test.js.es6
index 271b00aa69..ba02fb51a0 100644
--- a/test/javascripts/components/category-chooser-test.js.es6
+++ b/test/javascripts/components/category-chooser-test.js.es6
@@ -71,6 +71,10 @@ componentTest("with scopedCategoryId", {
       26
     );
     assert.equal(this.get("subject").rows().length, 2);
+
+    await this.get("subject").fillInFilter("dev");
+
+    assert.equal(this.get("subject").rows().length, 3);
   }
 });
 
diff --git a/test/javascripts/components/d-editor-test.js.es6 b/test/javascripts/components/d-editor-test.js.es6
index a034c7aa44..4b806bee26 100644
--- a/test/javascripts/components/d-editor-test.js.es6
+++ b/test/javascripts/components/d-editor-test.js.es6
@@ -686,7 +686,7 @@ componentTest("emoji", {
           id: "emoji",
           group: "extras",
           icon: "smile-o",
-          action: "emoji"
+          action: () => toolbar.context.send("emoji")
         });
       });
     });
diff --git a/test/javascripts/components/keyboard-shortcuts-test.js.es6 b/test/javascripts/components/keyboard-shortcuts-test.js.es6
index a96ac88cdc..e126b6d831 100644
--- a/test/javascripts/components/keyboard-shortcuts-test.js.es6
+++ b/test/javascripts/components/keyboard-shortcuts-test.js.es6
@@ -73,7 +73,7 @@ Object.keys(pathBindings).forEach(path => {
   var testName = binding + " goes to " + path;
 
   test(testName, function(assert) {
-    KeyboardShortcuts.bindEvents(testMouseTrap);
+    KeyboardShortcuts.bindEvents(testMouseTrap, Discourse.__container__);
     testMouseTrap.trigger(binding);
 
     assert.ok(DiscourseURL.routeTo.calledWith(path));
@@ -88,7 +88,7 @@ Object.keys(clickBindings).forEach(selector => {
   var testName = binding + " clicks on " + selector;
 
   test(testName, function(assert) {
-    KeyboardShortcuts.bindEvents(testMouseTrap);
+    KeyboardShortcuts.bindEvents(testMouseTrap, Discourse.__container__);
     $(selector).on("click", function() {
       assert.ok(true, selector + " was clicked");
     });
@@ -108,24 +108,24 @@ Object.keys(functionBindings).forEach(func => {
     sandbox.stub(KeyboardShortcuts, func, function() {
       assert.ok(true, func + " is called when " + binding + " is triggered");
     });
-    KeyboardShortcuts.bindEvents(testMouseTrap);
+    KeyboardShortcuts.bindEvents(testMouseTrap, Discourse.__container__);
 
     testMouseTrap.trigger(binding);
   });
 });
 
 QUnit.test("selectDown calls _moveSelection with 1", assert => {
-  var spy = sandbox.spy(KeyboardShortcuts, "_moveSelection");
+  var stub = sandbox.stub(KeyboardShortcuts, "_moveSelection");
 
   KeyboardShortcuts.selectDown();
-  assert.ok(spy.calledWith(1), "_moveSelection is called with 1");
+  assert.ok(stub.calledWith(1), "_moveSelection is called with 1");
 });
 
 QUnit.test("selectUp calls _moveSelection with -1", assert => {
-  var spy = sandbox.spy(KeyboardShortcuts, "_moveSelection");
+  var stub = sandbox.stub(KeyboardShortcuts, "_moveSelection");
 
   KeyboardShortcuts.selectUp();
-  assert.ok(spy.calledWith(-1), "_moveSelection is called with -1");
+  assert.ok(stub.calledWith(-1), "_moveSelection is called with -1");
 });
 
 QUnit.test("goBack calls history.back", assert => {
diff --git a/test/javascripts/components/topic-notifications-options-test.js.es6 b/test/javascripts/components/topic-notifications-options-test.js.es6
index 05ae0d9dbb..6d74d71097 100644
--- a/test/javascripts/components/topic-notifications-options-test.js.es6
+++ b/test/javascripts/components/topic-notifications-options-test.js.es6
@@ -8,7 +8,7 @@ const buildTopic = function(archetype) {
     details: {
       notification_level: 1
     },
-    archetype: archetype
+    archetype
   });
 };
 
@@ -70,6 +70,7 @@ componentTest("PM topic notification level descriptions", {
       descriptions.length,
       "it has the correct copy"
     );
+
     uiTexts.forEach((text, index) => {
       assert.equal(
         text.trim(),
diff --git a/test/javascripts/controllers/create-account-test.js.es6 b/test/javascripts/controllers/create-account-test.js.es6
index 88f3005fb2..29494ceeaf 100644
--- a/test/javascripts/controllers/create-account-test.js.es6
+++ b/test/javascripts/controllers/create-account-test.js.es6
@@ -7,12 +7,13 @@ moduleFor("controller:create-account", "controller:create-account", {
   needs: ["controller:modal", "controller:login"]
 });
 
-QUnit.test("basicUsernameValidation", function(assert) {
-  var subject = this.subject;
+test("basicUsernameValidation", async function(assert) {
+  const subject = this.subject;
 
-  var testInvalidUsername = function(username, expectedReason) {
-    var controller = subject({ siteSettings: Discourse.SiteSettings });
+  const testInvalidUsername = async (username, expectedReason) => {
+    const controller = await subject({ siteSettings: Discourse.SiteSettings });
     controller.set("accountUsername", username);
+
     assert.equal(
       controller.get("basicUsernameValidation.failed"),
       true,
@@ -32,9 +33,12 @@ QUnit.test("basicUsernameValidation", function(assert) {
     I18n.t("user.username.too_long")
   );
 
-  var controller = subject({ siteSettings: Discourse.SiteSettings });
-  controller.set("accountUsername", "porkchops");
-  controller.set("prefilledUsername", "porkchops");
+  const controller = await subject({ siteSettings: Discourse.SiteSettings });
+  controller.setProperties({
+    accountUsername: "porkchops",
+    prefilledUsername: "porkchops"
+  });
+
   assert.equal(
     controller.get("basicUsernameValidation.ok"),
     true,
@@ -47,16 +51,17 @@ QUnit.test("basicUsernameValidation", function(assert) {
   );
 });
 
-QUnit.test("passwordValidation", function(assert) {
-  var subject = this.subject;
+test("passwordValidation", async function(assert) {
+  const controller = await this.subject({
+    siteSettings: Discourse.SiteSettings
+  });
 
-  var controller = subject({ siteSettings: Discourse.SiteSettings });
   controller.set("passwordRequired", true);
   controller.set("accountEmail", "pork@chops.com");
   controller.set("accountUsername", "porkchops");
   controller.set("prefilledUsername", "porkchops");
-
   controller.set("accountPassword", "b4fcdae11f9167");
+
   assert.equal(controller.get("passwordValidation.ok"), true, "Password is ok");
   assert.equal(
     controller.get("passwordValidation.reason"),
@@ -64,16 +69,16 @@ QUnit.test("passwordValidation", function(assert) {
     "Password is valid"
   );
 
-  var testInvalidPassword = function(password, expectedReason) {
-    var c = subject({ siteSettings: Discourse.SiteSettings });
-    c.set("accountPassword", password);
+  const testInvalidPassword = (password, expectedReason) => {
+    controller.set("accountPassword", password);
+
     assert.equal(
-      c.get("passwordValidation.failed"),
+      controller.get("passwordValidation.failed"),
       true,
       "password should be invalid: " + password
     );
     assert.equal(
-      c.get("passwordValidation.reason"),
+      controller.get("passwordValidation.reason"),
       expectedReason,
       "password validation reason: " + password + ", " + expectedReason
     );
@@ -85,7 +90,7 @@ QUnit.test("passwordValidation", function(assert) {
   testInvalidPassword("pork@chops.com", I18n.t("user.password.same_as_email"));
 });
 
-QUnit.test("authProviderDisplayName", function(assert) {
+test("authProviderDisplayName", async function(assert) {
   const controller = this.subject({ siteSettings: Discourse.SiteSettings });
 
   assert.equal(
@@ -93,6 +98,7 @@ QUnit.test("authProviderDisplayName", function(assert) {
     I18n.t("login.facebook.name"),
     "provider name is translated correctly"
   );
+
   assert.equal(
     controller.authProviderDisplayName("idontexist"),
     "idontexist",
diff --git a/test/javascripts/controllers/preferences-account-test.js.es6 b/test/javascripts/controllers/preferences-account-test.js.es6
index 4272459d95..ed5044edf1 100644
--- a/test/javascripts/controllers/preferences-account-test.js.es6
+++ b/test/javascripts/controllers/preferences-account-test.js.es6
@@ -5,10 +5,10 @@ QUnit.test("updating of associated accounts", function(assert) {
     siteSettings: {
       enable_google_oauth2_logins: true
     },
-    model: Em.Object.create({
+    model: Ember.Object.create({
       second_factor_enabled: true
     }),
-    site: Em.Object.create({
+    site: Ember.Object.create({
       isMobileDevice: false
     })
   });
diff --git a/test/javascripts/fixtures/discovery_fixtures.js.es6 b/test/javascripts/fixtures/discovery_fixtures.js.es6
index 378a8b7730..1de2598980 100644
--- a/test/javascripts/fixtures/discovery_fixtures.js.es6
+++ b/test/javascripts/fixtures/discovery_fixtures.js.es6
@@ -4962,7 +4962,8 @@ export default {
           bumped: true,
           bumped_at: "2014-01-16T11:04:32.000-05:00",
           unseen: false,
-          pinned: false,
+          pinned: true,
+          excerpt: "Hello world",
           visible: true,
           closed: false,
           archived: false,
diff --git a/test/javascripts/fixtures/topic.js.es6 b/test/javascripts/fixtures/topic.js.es6
index 02973487a4..1a71861e40 100644
--- a/test/javascripts/fixtures/topic.js.es6
+++ b/test/javascripts/fixtures/topic.js.es6
@@ -2106,7 +2106,7 @@ export default {
         4009,
         4012
       ],
-      gaps: { before: { "20706": [20125] }, after: {} }
+      gaps: { before: {}, after: { 398: [4012] } }
     },
     id: 280,
     title: "Internationalization / localization",
diff --git a/test/javascripts/helpers/create-pretender.js.es6 b/test/javascripts/helpers/create-pretender.js.es6
index 20f8acced5..02f84cab4c 100644
--- a/test/javascripts/helpers/create-pretender.js.es6
+++ b/test/javascripts/helpers/create-pretender.js.es6
@@ -505,6 +505,10 @@ export default function() {
     this.post("/admin/badges", success);
     this.delete("/admin/badges/:id", success);
 
+    this.get("/admin/logs/staff_action_logs.json", () => {
+      return response(200, { staff_action_logs: [], user_history_actions: [] });
+    });
+
     this.get("/admin/logs/watched_words", () => {
       return response(200, fixturesByUrl["/admin/logs/watched_words.json"]);
     });
diff --git a/test/javascripts/helpers/site-settings.js b/test/javascripts/helpers/site-settings.js
index 3065d01a68..47da5ec9e5 100644
--- a/test/javascripts/helpers/site-settings.js
+++ b/test/javascripts/helpers/site-settings.js
@@ -2,6 +2,7 @@
 Discourse.SiteSettingsOriginal = {
   title: "Discourse Meta",
   site_logo_url: "/assets/logo.png",
+  site_home_logo_url: "/assets/logo.png",
   site_logo_small_url: "/assets/logo-single.png",
   site_mobile_logo_url: "",
   site_favicon_url:
@@ -13,7 +14,7 @@ Discourse.SiteSettingsOriginal = {
   top_menu: "latest|new|unread|categories|top",
   post_menu: "like-count|like|share|flag|edit|bookmark|delete|admin|reply",
   post_menu_hidden_items: "flag|edit|delete|admin",
-  share_links: "twitter|facebook|google+|email",
+  share_links: "twitter|facebook|email",
   category_colors:
     "BF1E2E|F1592A|F7941D|9EB83B|3AB54A|12A89D|25AAE2|0E76BD|652D90|92278F|ED207B|8C6238|231F20|27AA5B|B3B5B4|E45735",
   enable_mobile_theme: true,
diff --git a/test/javascripts/lib/computed-test.js.es6 b/test/javascripts/lib/computed-test.js.es6
index 58a7a161b5..6b3b881119 100644
--- a/test/javascripts/lib/computed-test.js.es6
+++ b/test/javascripts/lib/computed-test.js.es6
@@ -20,7 +20,7 @@ QUnit.module("lib:computed", {
 });
 
 QUnit.test("setting", assert => {
-  var t = Em.Object.extend({
+  var t = Ember.Object.extend({
     vehicle: setting("vehicle"),
     missingProp: setting("madeUpThing")
   }).create();
@@ -38,7 +38,7 @@ QUnit.test("setting", assert => {
 });
 
 QUnit.test("propertyEqual", assert => {
-  var t = Em.Object.extend({
+  var t = Ember.Object.extend({
     same: propertyEqual("cookies", "biscuits")
   }).create({
     cookies: 10,
@@ -51,7 +51,7 @@ QUnit.test("propertyEqual", assert => {
 });
 
 QUnit.test("propertyNotEqual", assert => {
-  var t = Em.Object.extend({
+  var t = Ember.Object.extend({
     diff: propertyNotEqual("cookies", "biscuits")
   }).create({
     cookies: 10,
@@ -64,7 +64,7 @@ QUnit.test("propertyNotEqual", assert => {
 });
 
 QUnit.test("fmt", assert => {
-  var t = Em.Object.extend({
+  var t = Ember.Object.extend({
     exclaimyUsername: fmt("username", "!!! %@ !!!"),
     multiple: fmt("username", "mood", "%@ is %@")
   }).create({
@@ -98,7 +98,7 @@ QUnit.test("fmt", assert => {
 });
 
 QUnit.test("i18n", assert => {
-  var t = Em.Object.extend({
+  var t = Ember.Object.extend({
     exclaimyUsername: i18n("username", "!!! %@ !!!"),
     multiple: i18n("username", "mood", "%@ is %@")
   }).create({
@@ -134,7 +134,7 @@ QUnit.test("i18n", assert => {
 QUnit.test("url", assert => {
   var t, testClass;
 
-  testClass = Em.Object.extend({
+  testClass = Ember.Object.extend({
     userUrl: url("username", "/u/%@")
   });
 
diff --git a/test/javascripts/models/topic-test.js.es6 b/test/javascripts/models/topic-test.js.es6
index a3e89726cb..ca6bd1f7b5 100644
--- a/test/javascripts/models/topic-test.js.es6
+++ b/test/javascripts/models/topic-test.js.es6
@@ -33,7 +33,7 @@ QUnit.test("visited", assert => {
 });
 
 QUnit.test("lastUnreadUrl", assert => {
-  const category = Em.Object.create({
+  const category = Ember.Object.create({
     navigate_to_first_post_after_read: true
   });
 
diff --git a/test/javascripts/widgets/actions-summary-test.js.es6 b/test/javascripts/widgets/actions-summary-test.js.es6
index 407200feed..04e45927cb 100644
--- a/test/javascripts/widgets/actions-summary-test.js.es6
+++ b/test/javascripts/widgets/actions-summary-test.js.es6
@@ -46,7 +46,7 @@ widgetTest("undo", {
 
 widgetTest("deferFlags", {
   template:
-    '{{mount-widget widget="actions-summary" args=args deferPostActionFlags="deferPostActionFlags"}}',
+    '{{mount-widget widget="actions-summary" args=args deferPostActionFlags=(action "deferPostActionFlags")}}',
   beforeEach() {
     this.set("args", {
       actionsSummary: [
diff --git a/test/javascripts/widgets/header-test.js.es6 b/test/javascripts/widgets/header-test.js.es6
index dc12a9e74f..548faa08c1 100644
--- a/test/javascripts/widgets/header-test.js.es6
+++ b/test/javascripts/widgets/header-test.js.es6
@@ -12,7 +12,7 @@ widgetTest("rendering basics", {
 
 widgetTest("sign up / login buttons", {
   template:
-    '{{mount-widget widget="header" showCreateAccount="showCreateAccount" showLogin="showLogin" args=args}}',
+    '{{mount-widget widget="header" showCreateAccount=(action "showCreateAccount") showLogin=(action "showLogin") args=args}}',
   anonymous: true,
 
   beforeEach() {
@@ -35,7 +35,7 @@ widgetTest("sign up / login buttons", {
 
 widgetTest("anon when login required", {
   template:
-    '{{mount-widget widget="header" showCreateAccount="showCreateAccount" showLogin="showLogin" args=args}}',
+    '{{mount-widget widget="header" showCreateAccount=(action "showCreateAccount") showLogin=(action "showLogin") args=args}}',
   anonymous: true,
 
   beforeEach() {
@@ -55,7 +55,7 @@ widgetTest("anon when login required", {
 
 widgetTest("logged in when login required", {
   template:
-    '{{mount-widget widget="header" showCreateAccount="showCreateAccount" showLogin="showLogin" args=args}}',
+    '{{mount-widget widget="header" showCreateAccount=(action "showCreateAccount") showLogin=(action "showLogin") args=args}}',
 
   beforeEach() {
     this.set("args", { canSignUp: true });
diff --git a/test/javascripts/widgets/home-logo-test.js.es6 b/test/javascripts/widgets/home-logo-test.js.es6
index 4a6fb874d3..f8bbbfe165 100644
--- a/test/javascripts/widgets/home-logo-test.js.es6
+++ b/test/javascripts/widgets/home-logo-test.js.es6
@@ -10,7 +10,7 @@ const title = "Cool Forum";
 widgetTest("basics", {
   template: '{{mount-widget widget="home-logo" args=args}}',
   beforeEach() {
-    this.siteSettings.site_logo_url = bigLogo;
+    this.siteSettings.site_home_logo_url = bigLogo;
     this.siteSettings.site_logo_small_url = smallLogo;
     this.siteSettings.title = title;
     this.set("args", { minimized: false });
@@ -28,7 +28,7 @@ widgetTest("basics", {
 widgetTest("basics - minimized", {
   template: '{{mount-widget widget="home-logo" args=args}}',
   beforeEach() {
-    this.siteSettings.site_logo_url = bigLogo;
+    this.siteSettings.site_home_logo_url = bigLogo;
     this.siteSettings.site_logo_small_url = smallLogo;
     this.siteSettings.title = title;
     this.set("args", { minimized: true });
@@ -44,7 +44,7 @@ widgetTest("basics - minimized", {
 widgetTest("no logo", {
   template: '{{mount-widget widget="home-logo" args=args}}',
   beforeEach() {
-    this.siteSettings.site_logo_url = "";
+    this.siteSettings.site_home_logo_url = "";
     this.siteSettings.site_logo_small_url = "";
     this.siteSettings.title = title;
     this.set("args", { minimized: false });
@@ -59,7 +59,7 @@ widgetTest("no logo", {
 widgetTest("no logo - minimized", {
   template: '{{mount-widget widget="home-logo" args=args}}',
   beforeEach() {
-    this.siteSettings.site_logo_url = "";
+    this.siteSettings.site_home_logo_url = "";
     this.siteSettings.site_logo_small_url = "";
     this.siteSettings.title = title;
     this.set("args", { minimized: true });
@@ -87,7 +87,7 @@ widgetTest("mobile logo", {
 widgetTest("mobile without logo", {
   template: '{{mount-widget widget="home-logo" args=args}}',
   beforeEach() {
-    this.siteSettings.site_logo_url = bigLogo;
+    this.siteSettings.site_home_logo_url = bigLogo;
     this.site.mobileView = true;
   },
 
@@ -101,7 +101,7 @@ widgetTest("basics, subfolder", {
   template: '{{mount-widget widget="home-logo" args=args}}',
   beforeEach() {
     Discourse.BaseUri = "/forum";
-    this.siteSettings.site_logo_url = bigLogo;
+    this.siteSettings.site_home_logo_url = bigLogo;
     this.siteSettings.site_logo_small_url = smallLogo;
     this.siteSettings.title = title;
     this.set("args", { minimized: false });
@@ -118,7 +118,7 @@ widgetTest("basics, subfolder - minimized", {
   template: '{{mount-widget widget="home-logo" args=args}}',
   beforeEach() {
     Discourse.BaseUri = "/forum";
-    this.siteSettings.site_logo_url = bigLogo;
+    this.siteSettings.site_home_logo_url = bigLogo;
     this.siteSettings.site_logo_small_url = smallLogo;
     this.siteSettings.title = title;
     this.set("args", { minimized: true });
diff --git a/test/javascripts/widgets/post-test.js.es6 b/test/javascripts/widgets/post-test.js.es6
index 701606254b..64f0a1ed29 100644
--- a/test/javascripts/widgets/post-test.js.es6
+++ b/test/javascripts/widgets/post-test.js.es6
@@ -18,7 +18,7 @@ widgetTest("basic elements", {
 
 widgetTest("wiki", {
   template:
-    '{{mount-widget widget="post" args=args showHistory="showHistory"}}',
+    '{{mount-widget widget="post" args=args showHistory=(action "showHistory")}}',
   beforeEach() {
     this.set("args", { wiki: true, version: 2, canViewEditHistory: true });
     this.on("showHistory", () => (this.historyShown = true));
@@ -33,7 +33,8 @@ widgetTest("wiki", {
 });
 
 widgetTest("wiki without revision", {
-  template: '{{mount-widget widget="post" args=args editPost="editPost"}}',
+  template:
+    '{{mount-widget widget="post" args=args editPost=(action "editPost")}}',
   beforeEach() {
     this.set("args", { wiki: true, version: 1, canViewEditHistory: true });
     this.on("editPost", () => (this.editPostCalled = true));
@@ -46,7 +47,7 @@ widgetTest("wiki without revision", {
 
 widgetTest("via-email", {
   template:
-    '{{mount-widget widget="post" args=args showRawEmail="showRawEmail"}}',
+    '{{mount-widget widget="post" args=args showRawEmail=(action "showRawEmail")}}',
   beforeEach() {
     this.set("args", { via_email: true, canViewRawEmail: true });
     this.on("showRawEmail", () => (this.rawEmailShown = true));
@@ -59,7 +60,7 @@ widgetTest("via-email", {
 
 widgetTest("via-email without permission", {
   template:
-    '{{mount-widget widget="post" args=args showRawEmail="showRawEmail"}}',
+    '{{mount-widget widget="post" args=args showRawEmail=(action "showRawEmail")}}',
   beforeEach() {
     this.set("args", { via_email: true, canViewRawEmail: false });
     this.on("showRawEmail", () => (this.rawEmailShown = true));
@@ -75,7 +76,7 @@ widgetTest("via-email without permission", {
 
 widgetTest("history", {
   template:
-    '{{mount-widget widget="post" args=args showHistory="showHistory"}}',
+    '{{mount-widget widget="post" args=args showHistory=(action "showHistory")}}',
   beforeEach() {
     this.set("args", { version: 3, canViewEditHistory: true });
     this.on("showHistory", () => (this.historyShown = true));
@@ -88,7 +89,7 @@ widgetTest("history", {
 
 widgetTest("history without view permission", {
   template:
-    '{{mount-widget widget="post" args=args showHistory="showHistory"}}',
+    '{{mount-widget widget="post" args=args showHistory=(action "showHistory")}}',
   beforeEach() {
     this.set("args", { version: 3, canViewEditHistory: false });
     this.on("showHistory", () => (this.historyShown = true));
@@ -168,7 +169,7 @@ widgetTest("share button", {
 
 widgetTest("liking", {
   template:
-    '{{mount-widget widget="post-menu" args=args toggleLike="toggleLike"}}',
+    '{{mount-widget widget="post-menu" args=args toggleLike=(action "toggleLike")}}',
   beforeEach() {
     const args = { showLike: true, canToggleLike: true };
     this.set("args", args);
@@ -195,7 +196,7 @@ widgetTest("liking", {
 
 widgetTest("anon liking", {
   template:
-    '{{mount-widget widget="post-menu" args=args showLogin="showLogin"}}',
+    '{{mount-widget widget="post-menu" args=args showLogin=(action "showLogin")}}',
   anonymous: true,
   beforeEach() {
     const args = { showLike: true };
@@ -218,7 +219,8 @@ widgetTest("anon liking", {
 });
 
 widgetTest("edit button", {
-  template: '{{mount-widget widget="post" args=args editPost="editPost"}}',
+  template:
+    '{{mount-widget widget="post" args=args editPost=(action "editPost")}}',
   beforeEach() {
     this.set("args", { canEdit: true });
     this.on("editPost", () => (this.editPostCalled = true));
@@ -230,7 +232,7 @@ widgetTest("edit button", {
 });
 
 widgetTest(`edit button - can't edit`, {
-  template: '{{mount-widget widget="post" args=args editPost="editPost"}}',
+  template: '{{mount-widget widget="post" args=args}}',
   beforeEach() {
     this.set("args", { canEdit: false });
   },
@@ -240,7 +242,8 @@ widgetTest(`edit button - can't edit`, {
 });
 
 widgetTest("recover button", {
-  template: '{{mount-widget widget="post" args=args deletePost="deletePost"}}',
+  template:
+    '{{mount-widget widget="post" args=args deletePost=(action "deletePost")}}',
   beforeEach() {
     this.set("args", { canDelete: true });
     this.on("deletePost", () => (this.deletePostCalled = true));
@@ -252,7 +255,8 @@ widgetTest("recover button", {
 });
 
 widgetTest("delete topic button", {
-  template: '{{mount-widget widget="post" args=args deletePost="deletePost"}}',
+  template:
+    '{{mount-widget widget="post" args=args deletePost=(action "deletePost")}}',
   beforeEach() {
     this.set("args", { canDeleteTopic: true });
     this.on("deletePost", () => (this.deletePostCalled = true));
@@ -264,7 +268,7 @@ widgetTest("delete topic button", {
 });
 
 widgetTest(`delete topic button - can't delete`, {
-  template: '{{mount-widget widget="post" args=args deletePost="deletePost"}}',
+  template: '{{mount-widget widget="post" args=args}}',
   beforeEach() {
     this.set("args", { canDeleteTopic: false });
   },
@@ -276,8 +280,7 @@ widgetTest(`delete topic button - can't delete`, {
 widgetTest(
   `delete topic button - can't delete when topic author without permission`,
   {
-    template:
-      '{{mount-widget widget="post" args=args deletePost="deletePost"}}',
+    template: '{{mount-widget widget="post" args=args}}',
     beforeEach() {
       this.set("args", {
         canDeleteTopic: false,
@@ -299,7 +302,7 @@ widgetTest(
 
 widgetTest("recover topic button", {
   template:
-    '{{mount-widget widget="post" args=args recoverPost="recoverPost"}}',
+    '{{mount-widget widget="post" args=args recoverPost=(action "recoverPost")}}',
   beforeEach() {
     this.set("args", { canRecoverTopic: true });
     this.on("recoverPost", () => (this.recovered = true));
@@ -311,7 +314,7 @@ widgetTest("recover topic button", {
 });
 
 widgetTest(`recover topic button - can't recover`, {
-  template: '{{mount-widget widget="post" args=args deletePost="deletePost"}}',
+  template: '{{mount-widget widget="post" args=args}}',
   beforeEach() {
     this.set("args", { canRecoverTopic: false });
   },
@@ -321,7 +324,8 @@ widgetTest(`recover topic button - can't recover`, {
 });
 
 widgetTest("delete post button", {
-  template: '{{mount-widget widget="post" args=args deletePost="deletePost"}}',
+  template:
+    '{{mount-widget widget="post" args=args deletePost=(action "deletePost")}}',
   beforeEach() {
     this.set("args", { canDelete: true });
     this.on("deletePost", () => (this.deletePostCalled = true));
@@ -344,7 +348,7 @@ widgetTest(`delete post button - can't delete`, {
 
 widgetTest("recover post button", {
   template:
-    '{{mount-widget widget="post" args=args recoverPost="recoverPost"}}',
+    '{{mount-widget widget="post" args=args recoverPost=(action "recoverPost")}}',
   beforeEach() {
     this.set("args", { canRecover: true });
     this.on("recoverPost", () => (this.recovered = true));
@@ -356,7 +360,7 @@ widgetTest("recover post button", {
 });
 
 widgetTest(`recover post button - can't recover`, {
-  template: '{{mount-widget widget="post" args=args deletePost="deletePost"}}',
+  template: '{{mount-widget widget="post" args=args}}',
   beforeEach() {
     this.set("args", { canRecover: false });
   },
@@ -366,7 +370,8 @@ widgetTest(`recover post button - can't recover`, {
 });
 
 widgetTest(`flagging`, {
-  template: '{{mount-widget widget="post" args=args showFlags="showFlags"}}',
+  template:
+    '{{mount-widget widget="post" args=args showFlags=(action "showFlags")}}',
   beforeEach() {
     this.set("args", { canFlag: true });
     this.on("showFlags", () => (this.flagsShown = true));
@@ -473,7 +478,7 @@ widgetTest("reply directly above", {
 
 widgetTest("cooked content hidden", {
   template:
-    '{{mount-widget widget="post" args=args expandHidden="expandHidden"}}',
+    '{{mount-widget widget="post" args=args expandHidden=(action "expandHidden")}}',
   beforeEach() {
     this.set("args", { cooked_hidden: true });
     this.on("expandHidden", () => (this.unhidden = true));
@@ -509,7 +514,7 @@ widgetTest("can't bookmark", {
 
 widgetTest("bookmark", {
   template:
-    '{{mount-widget widget="post" args=args toggleBookmark="toggleBookmark"}}',
+    '{{mount-widget widget="post" args=args toggleBookmark=(action "toggleBookmark")}}',
   beforeEach() {
     const args = { canBookmark: true };
 
@@ -555,35 +560,40 @@ widgetTest("show admin menu", {
 
 widgetTest("toggle moderator post", {
   template:
-    '{{mount-widget widget="post" args=args togglePostType="togglePostType"}}',
+    '{{mount-widget widget="post" args=args togglePostType=(action "togglePostType")}}',
   beforeEach() {
+    this.currentUser.set("staff", true);
     this.set("args", { canManage: true });
     this.on("togglePostType", () => (this.toggled = true));
   },
   async test(assert) {
     await click(".post-menu-area .show-post-admin-menu");
     await click(".post-admin-menu .toggle-post-type");
+
     assert.ok(this.toggled);
     assert.equal(this.$(".post-admin-menu").length, 0, "also hides the menu");
   }
 });
 widgetTest("toggle moderator post", {
   template:
-    '{{mount-widget widget="post" args=args togglePostType="togglePostType"}}',
+    '{{mount-widget widget="post" args=args togglePostType=(action "togglePostType")}}',
   beforeEach() {
+    this.currentUser.set("staff", true);
     this.set("args", { canManage: true });
     this.on("togglePostType", () => (this.toggled = true));
   },
   async test(assert) {
     await click(".post-menu-area .show-post-admin-menu");
     await click(".post-admin-menu .toggle-post-type");
+
     assert.ok(this.toggled);
     assert.equal(this.$(".post-admin-menu").length, 0, "also hides the menu");
   }
 });
 
 widgetTest("rebake post", {
-  template: '{{mount-widget widget="post" args=args rebakePost="rebakePost"}}',
+  template:
+    '{{mount-widget widget="post" args=args rebakePost=(action "rebakePost")}}',
   beforeEach() {
     this.set("args", { canManage: true });
     this.on("rebakePost", () => (this.baked = true));
@@ -597,7 +607,8 @@ widgetTest("rebake post", {
 });
 
 widgetTest("unhide post", {
-  template: '{{mount-widget widget="post" args=args unhidePost="unhidePost"}}',
+  template:
+    '{{mount-widget widget="post" args=args unhidePost=(action "unhidePost")}}',
   beforeEach() {
     this.set("args", { canManage: true, hidden: true });
     this.on("unhidePost", () => (this.unhidden = true));
@@ -612,7 +623,7 @@ widgetTest("unhide post", {
 
 widgetTest("change owner", {
   template:
-    '{{mount-widget widget="post" args=args changePostOwner="changePostOwner"}}',
+    '{{mount-widget widget="post" args=args changePostOwner=(action "changePostOwner")}}',
   beforeEach() {
     this.currentUser.admin = true;
     this.set("args", { canManage: true });
@@ -628,7 +639,7 @@ widgetTest("change owner", {
 
 widgetTest("reply", {
   template:
-    '{{mount-widget widget="post" args=args replyToPost="replyToPost"}}',
+    '{{mount-widget widget="post" args=args replyToPost=(action "replyToPost")}}',
   beforeEach() {
     this.set("args", { canCreatePost: true });
     this.on("replyToPost", () => (this.replied = true));
@@ -813,7 +824,7 @@ widgetTest("topic map - no summary", {
 
 widgetTest("topic map - has summary", {
   template:
-    '{{mount-widget widget="post" args=args toggleSummary="toggleSummary"}}',
+    '{{mount-widget widget="post" args=args toggleSummary=(action "toggleSummary")}}',
   beforeEach() {
     this.set("args", { showTopicMap: true, hasTopicSummary: true });
     this.on("toggleSummary", () => (this.summaryToggled = true));
diff --git a/test/javascripts/widgets/user-menu-test.js.es6 b/test/javascripts/widgets/user-menu-test.js.es6
index b48dc952ce..c6e7590272 100644
--- a/test/javascripts/widgets/user-menu-test.js.es6
+++ b/test/javascripts/widgets/user-menu-test.js.es6
@@ -16,7 +16,7 @@ widgetTest("basics", {
 });
 
 widgetTest("log out", {
-  template: '{{mount-widget widget="user-menu" logout="logout"}}',
+  template: '{{mount-widget widget="user-menu" logout=(action "logout")}}',
 
   beforeEach() {
     this.on("logout", () => (this.loggedOut = true));
@@ -54,7 +54,7 @@ widgetTest("private messages - enabled", {
 
 widgetTest("anonymous", {
   template:
-    '{{mount-widget widget="user-menu" toggleAnonymous="toggleAnonymous"}}',
+    '{{mount-widget widget="user-menu" toggleAnonymous=(action "toggleAnonymous")}}',
 
   beforeEach() {
     this.currentUser.setProperties({ is_anonymous: false, trust_level: 3 });
@@ -85,7 +85,7 @@ widgetTest("anonymous - disabled", {
 
 widgetTest("anonymous - switch back", {
   template:
-    '{{mount-widget widget="user-menu" toggleAnonymous="toggleAnonymous"}}',
+    '{{mount-widget widget="user-menu" toggleAnonymous=(action "toggleAnonymous")}}',
 
   beforeEach() {
     this.currentUser.setProperties({ is_anonymous: true });
diff --git a/vendor/assets/javascripts/buffered-proxy.js b/vendor/assets/javascripts/buffered-proxy.js
index 289dcc07b4..a26ec632be 100644
--- a/vendor/assets/javascripts/buffered-proxy.js
+++ b/vendor/assets/javascripts/buffered-proxy.js
@@ -30,8 +30,6 @@
 
       if (previous === value) return;
 
-      this.propertyWillChange(key);
-
       if (current === value) {
         delete buffer[key];
         if (empty(buffer)) {
@@ -42,7 +40,7 @@
         this.set('hasBufferedChanges', true);
       }
 
-      this.propertyDidChange(key);
+      this.notifyPropertyChange(key);
       return value;
     },
 
@@ -65,9 +63,8 @@
       for (key in buffer) {
         if (!buffer.hasOwnProperty(key)) continue;
 
-        this.propertyWillChange(key);
         delete buffer[key];
-        this.propertyDidChange(key);
+        this.notifyPropertyChange(key);
       }
       this.set('hasBufferedChanges', false);
     }
diff --git a/vendor/assets/javascripts/handlebars.js b/vendor/assets/javascripts/handlebars.js
index 182c1be831..ad93d3befe 100644
--- a/vendor/assets/javascripts/handlebars.js
+++ b/vendor/assets/javascripts/handlebars.js
@@ -1,8 +1,9 @@
-/*!
+/**!
 
- handlebars v4.0.5
+ @license
+ handlebars v4.0.12
 
-Copyright (C) 2011-2015 by Yehuda Katz
+Copyright (C) 2011-2017 by Yehuda Katz
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -22,7 +23,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
-@license
 */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
@@ -78,7 +78,7 @@ return /******/ (function(modules) { // webpackBootstrap
 /************************************************************************/
 /******/ ([
 /* 0 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ (function(module, exports, __webpack_require__) {
 
 	'use strict';
 
@@ -92,23 +92,23 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	// Compiler imports
 
-	var _handlebarsCompilerAst = __webpack_require__(21);
+	var _handlebarsCompilerAst = __webpack_require__(35);
 
 	var _handlebarsCompilerAst2 = _interopRequireDefault(_handlebarsCompilerAst);
 
-	var _handlebarsCompilerBase = __webpack_require__(22);
+	var _handlebarsCompilerBase = __webpack_require__(36);
 
-	var _handlebarsCompilerCompiler = __webpack_require__(27);
+	var _handlebarsCompilerCompiler = __webpack_require__(41);
 
-	var _handlebarsCompilerJavascriptCompiler = __webpack_require__(28);
+	var _handlebarsCompilerJavascriptCompiler = __webpack_require__(42);
 
 	var _handlebarsCompilerJavascriptCompiler2 = _interopRequireDefault(_handlebarsCompilerJavascriptCompiler);
 
-	var _handlebarsCompilerVisitor = __webpack_require__(25);
+	var _handlebarsCompilerVisitor = __webpack_require__(39);
 
 	var _handlebarsCompilerVisitor2 = _interopRequireDefault(_handlebarsCompilerVisitor);
 
-	var _handlebarsNoConflict = __webpack_require__(20);
+	var _handlebarsNoConflict = __webpack_require__(34);
 
 	var _handlebarsNoConflict2 = _interopRequireDefault(_handlebarsNoConflict);
 
@@ -144,9 +144,9 @@ return /******/ (function(modules) { // webpackBootstrap
 	exports['default'] = inst;
 	module.exports = exports['default'];
 
-/***/ },
+/***/ }),
 /* 1 */
-/***/ function(module, exports) {
+/***/ (function(module, exports) {
 
 	"use strict";
 
@@ -158,9 +158,9 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	exports.__esModule = true;
 
-/***/ },
+/***/ }),
 /* 2 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ (function(module, exports, __webpack_require__) {
 
 	'use strict';
 
@@ -177,7 +177,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	// Each of these augment the Handlebars object. No need to setup here.
 	// (This is done to easily share code between commonjs and browse envs)
 
-	var _handlebarsSafeString = __webpack_require__(18);
+	var _handlebarsSafeString = __webpack_require__(21);
 
 	var _handlebarsSafeString2 = _interopRequireDefault(_handlebarsSafeString);
 
@@ -189,11 +189,11 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var Utils = _interopRequireWildcard(_handlebarsUtils);
 
-	var _handlebarsRuntime = __webpack_require__(19);
+	var _handlebarsRuntime = __webpack_require__(22);
 
 	var runtime = _interopRequireWildcard(_handlebarsRuntime);
 
-	var _handlebarsNoConflict = __webpack_require__(20);
+	var _handlebarsNoConflict = __webpack_require__(34);
 
 	var _handlebarsNoConflict2 = _interopRequireDefault(_handlebarsNoConflict);
 
@@ -225,9 +225,9 @@ return /******/ (function(modules) { // webpackBootstrap
 	exports['default'] = inst;
 	module.exports = exports['default'];
 
-/***/ },
+/***/ }),
 /* 3 */
-/***/ function(module, exports) {
+/***/ (function(module, exports) {
 
 	"use strict";
 
@@ -250,9 +250,9 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	exports.__esModule = true;
 
-/***/ },
+/***/ }),
 /* 4 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ (function(module, exports, __webpack_require__) {
 
 	'use strict';
 
@@ -267,15 +267,15 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var _exception2 = _interopRequireDefault(_exception);
 
-	var _helpers = __webpack_require__(7);
+	var _helpers = __webpack_require__(10);
 
-	var _decorators = __webpack_require__(15);
+	var _decorators = __webpack_require__(18);
 
-	var _logger = __webpack_require__(17);
+	var _logger = __webpack_require__(20);
 
 	var _logger2 = _interopRequireDefault(_logger);
 
-	var VERSION = '4.0.5';
+	var VERSION = '4.0.12';
 	exports.VERSION = VERSION;
 	var COMPILER_REVISION = 7;
 
@@ -357,9 +357,9 @@ return /******/ (function(modules) { // webpackBootstrap
 	exports.createFrame = _utils.createFrame;
 	exports.logger = _logger2['default'];
 
-/***/ },
+/***/ }),
 /* 5 */
-/***/ function(module, exports) {
+/***/ (function(module, exports) {
 
 	'use strict';
 
@@ -485,12 +485,14 @@ return /******/ (function(modules) { // webpackBootstrap
 	  return (contextPath ? contextPath + '.' : '') + id;
 	}
 
-/***/ },
+/***/ }),
 /* 6 */
-/***/ function(module, exports) {
+/***/ (function(module, exports, __webpack_require__) {
 
 	'use strict';
 
+	var _Object$defineProperty = __webpack_require__(7)['default'];
+
 	exports.__esModule = true;
 
 	var errorProps = ['description', 'fileName', 'lineNumber', 'message', 'name', 'number', 'stack'];
@@ -518,9 +520,23 @@ return /******/ (function(modules) { // webpackBootstrap
 	    Error.captureStackTrace(this, Exception);
 	  }
 
-	  if (loc) {
-	    this.lineNumber = line;
-	    this.column = column;
+	  try {
+	    if (loc) {
+	      this.lineNumber = line;
+
+	      // Work around issue under safari where we can't directly set the column value
+	      /* istanbul ignore next */
+	      if (_Object$defineProperty) {
+	        Object.defineProperty(this, 'column', {
+	          value: column,
+	          enumerable: true
+	        });
+	      } else {
+	        this.column = column;
+	      }
+	    }
+	  } catch (nop) {
+	    /* Ignore if the browser is very particular */
 	  }
 	}
 
@@ -529,9 +545,42 @@ return /******/ (function(modules) { // webpackBootstrap
 	exports['default'] = Exception;
 	module.exports = exports['default'];
 
-/***/ },
+/***/ }),
 /* 7 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ (function(module, exports, __webpack_require__) {
+
+	module.exports = { "default": __webpack_require__(8), __esModule: true };
+
+/***/ }),
+/* 8 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	var $ = __webpack_require__(9);
+	module.exports = function defineProperty(it, key, desc){
+	  return $.setDesc(it, key, desc);
+	};
+
+/***/ }),
+/* 9 */
+/***/ (function(module, exports) {
+
+	var $Object = Object;
+	module.exports = {
+	  create:     $Object.create,
+	  getProto:   $Object.getPrototypeOf,
+	  isEnum:     {}.propertyIsEnumerable,
+	  getDesc:    $Object.getOwnPropertyDescriptor,
+	  setDesc:    $Object.defineProperty,
+	  setDescs:   $Object.defineProperties,
+	  getKeys:    $Object.keys,
+	  getNames:   $Object.getOwnPropertyNames,
+	  getSymbols: $Object.getOwnPropertySymbols,
+	  each:       [].forEach
+	};
+
+/***/ }),
+/* 10 */
+/***/ (function(module, exports, __webpack_require__) {
 
 	'use strict';
 
@@ -540,31 +589,31 @@ return /******/ (function(modules) { // webpackBootstrap
 	exports.__esModule = true;
 	exports.registerDefaultHelpers = registerDefaultHelpers;
 
-	var _helpersBlockHelperMissing = __webpack_require__(8);
+	var _helpersBlockHelperMissing = __webpack_require__(11);
 
 	var _helpersBlockHelperMissing2 = _interopRequireDefault(_helpersBlockHelperMissing);
 
-	var _helpersEach = __webpack_require__(9);
+	var _helpersEach = __webpack_require__(12);
 
 	var _helpersEach2 = _interopRequireDefault(_helpersEach);
 
-	var _helpersHelperMissing = __webpack_require__(10);
+	var _helpersHelperMissing = __webpack_require__(13);
 
 	var _helpersHelperMissing2 = _interopRequireDefault(_helpersHelperMissing);
 
-	var _helpersIf = __webpack_require__(11);
+	var _helpersIf = __webpack_require__(14);
 
 	var _helpersIf2 = _interopRequireDefault(_helpersIf);
 
-	var _helpersLog = __webpack_require__(12);
+	var _helpersLog = __webpack_require__(15);
 
 	var _helpersLog2 = _interopRequireDefault(_helpersLog);
 
-	var _helpersLookup = __webpack_require__(13);
+	var _helpersLookup = __webpack_require__(16);
 
 	var _helpersLookup2 = _interopRequireDefault(_helpersLookup);
 
-	var _helpersWith = __webpack_require__(14);
+	var _helpersWith = __webpack_require__(17);
 
 	var _helpersWith2 = _interopRequireDefault(_helpersWith);
 
@@ -578,9 +627,9 @@ return /******/ (function(modules) { // webpackBootstrap
 	  _helpersWith2['default'](instance);
 	}
 
-/***/ },
-/* 8 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ }),
+/* 11 */
+/***/ (function(module, exports, __webpack_require__) {
 
 	'use strict';
 
@@ -621,9 +670,9 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	module.exports = exports['default'];
 
-/***/ },
-/* 9 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ }),
+/* 12 */
+/***/ (function(module, exports, __webpack_require__) {
 
 	'use strict';
 
@@ -718,9 +767,9 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	module.exports = exports['default'];
 
-/***/ },
-/* 10 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ }),
+/* 13 */
+/***/ (function(module, exports, __webpack_require__) {
 
 	'use strict';
 
@@ -746,9 +795,9 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	module.exports = exports['default'];
 
-/***/ },
-/* 11 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ }),
+/* 14 */
+/***/ (function(module, exports, __webpack_require__) {
 
 	'use strict';
 
@@ -779,9 +828,9 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	module.exports = exports['default'];
 
-/***/ },
-/* 12 */
-/***/ function(module, exports) {
+/***/ }),
+/* 15 */
+/***/ (function(module, exports) {
 
 	'use strict';
 
@@ -809,9 +858,9 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	module.exports = exports['default'];
 
-/***/ },
-/* 13 */
-/***/ function(module, exports) {
+/***/ }),
+/* 16 */
+/***/ (function(module, exports) {
 
 	'use strict';
 
@@ -825,9 +874,9 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	module.exports = exports['default'];
 
-/***/ },
-/* 14 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ }),
+/* 17 */
+/***/ (function(module, exports, __webpack_require__) {
 
 	'use strict';
 
@@ -862,9 +911,9 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	module.exports = exports['default'];
 
-/***/ },
-/* 15 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ }),
+/* 18 */
+/***/ (function(module, exports, __webpack_require__) {
 
 	'use strict';
 
@@ -873,7 +922,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	exports.__esModule = true;
 	exports.registerDefaultDecorators = registerDefaultDecorators;
 
-	var _decoratorsInline = __webpack_require__(16);
+	var _decoratorsInline = __webpack_require__(19);
 
 	var _decoratorsInline2 = _interopRequireDefault(_decoratorsInline);
 
@@ -881,9 +930,9 @@ return /******/ (function(modules) { // webpackBootstrap
 	  _decoratorsInline2['default'](instance);
 	}
 
-/***/ },
-/* 16 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ }),
+/* 19 */
+/***/ (function(module, exports, __webpack_require__) {
 
 	'use strict';
 
@@ -914,9 +963,9 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	module.exports = exports['default'];
 
-/***/ },
-/* 17 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ }),
+/* 20 */
+/***/ (function(module, exports, __webpack_require__) {
 
 	'use strict';
 
@@ -965,9 +1014,9 @@ return /******/ (function(modules) { // webpackBootstrap
 	exports['default'] = logger;
 	module.exports = exports['default'];
 
-/***/ },
-/* 18 */
-/***/ function(module, exports) {
+/***/ }),
+/* 21 */
+/***/ (function(module, exports) {
 
 	// Build out our basic SafeString type
 	'use strict';
@@ -984,12 +1033,14 @@ return /******/ (function(modules) { // webpackBootstrap
 	exports['default'] = SafeString;
 	module.exports = exports['default'];
 
-/***/ },
-/* 19 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ }),
+/* 22 */
+/***/ (function(module, exports, __webpack_require__) {
 
 	'use strict';
 
+	var _Object$seal = __webpack_require__(23)['default'];
+
 	var _interopRequireWildcard = __webpack_require__(3)['default'];
 
 	var _interopRequireDefault = __webpack_require__(1)['default'];
@@ -1132,6 +1183,8 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	      return obj;
 	    },
+	    // An empty object to use as replacement for null-contexts
+	    nullContext: _Object$seal({}),
 
 	    noop: env.VM.noop,
 	    compilerInfo: templateSpec.compiler
@@ -1150,7 +1203,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	        blockParams = templateSpec.useBlockParams ? [] : undefined;
 	    if (templateSpec.useDepths) {
 	      if (options.depths) {
-	        depths = context !== options.depths[0] ? [context].concat(options.depths) : options.depths;
+	        depths = context != options.depths[0] ? [context].concat(options.depths) : options.depths;
 	      } else {
 	        depths = [context];
 	      }
@@ -1199,7 +1252,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	    var options = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1];
 
 	    var currentDepths = depths;
-	    if (depths && context !== depths[0]) {
+	    if (depths && context != depths[0] && !(context === container.nullContext && depths[0] === null)) {
 	      currentDepths = [context].concat(depths);
 	    }
 
@@ -1230,6 +1283,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	}
 
 	function invokePartial(partial, context, options) {
+	  // Use the current closure context to save the partial-block if this partial
+	  var currentPartialBlock = options.data && options.data['partial-block'];
 	  options.partial = true;
 	  if (options.ids) {
 	    options.data.contextPath = options.ids[0] || options.data.contextPath;
@@ -1237,12 +1292,23 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	  var partialBlock = undefined;
 	  if (options.fn && options.fn !== noop) {
-	    options.data = _base.createFrame(options.data);
-	    partialBlock = options.data['partial-block'] = options.fn;
+	    (function () {
+	      options.data = _base.createFrame(options.data);
+	      // Wrapper function to get access to currentPartialBlock from the closure
+	      var fn = options.fn;
+	      partialBlock = options.data['partial-block'] = function partialBlockWrapper(context) {
+	        var options = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1];
 
-	    if (partialBlock.partials) {
-	      options.partials = Utils.extend({}, options.partials, partialBlock.partials);
-	    }
+	        // Restore the partial-block from the closure for the execution of the block
+	        // i.e. the part inside the block of the partial call.
+	        options.data = _base.createFrame(options.data);
+	        options.data['partial-block'] = currentPartialBlock;
+	        return fn(context, options);
+	      };
+	      if (fn.partials) {
+	        options.partials = Utils.extend({}, options.partials, fn.partials);
+	      }
+	    })();
 	  }
 
 	  if (partial === undefined && partialBlock) {
@@ -1277,9 +1343,171 @@ return /******/ (function(modules) { // webpackBootstrap
 	  return prog;
 	}
 
-/***/ },
-/* 20 */
-/***/ function(module, exports) {
+/***/ }),
+/* 23 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	module.exports = { "default": __webpack_require__(24), __esModule: true };
+
+/***/ }),
+/* 24 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	__webpack_require__(25);
+	module.exports = __webpack_require__(30).Object.seal;
+
+/***/ }),
+/* 25 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	// 19.1.2.17 Object.seal(O)
+	var isObject = __webpack_require__(26);
+
+	__webpack_require__(27)('seal', function($seal){
+	  return function seal(it){
+	    return $seal && isObject(it) ? $seal(it) : it;
+	  };
+	});
+
+/***/ }),
+/* 26 */
+/***/ (function(module, exports) {
+
+	module.exports = function(it){
+	  return typeof it === 'object' ? it !== null : typeof it === 'function';
+	};
+
+/***/ }),
+/* 27 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	// most Object methods by ES6 should accept primitives
+	var $export = __webpack_require__(28)
+	  , core    = __webpack_require__(30)
+	  , fails   = __webpack_require__(33);
+	module.exports = function(KEY, exec){
+	  var fn  = (core.Object || {})[KEY] || Object[KEY]
+	    , exp = {};
+	  exp[KEY] = exec(fn);
+	  $export($export.S + $export.F * fails(function(){ fn(1); }), 'Object', exp);
+	};
+
+/***/ }),
+/* 28 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	var global    = __webpack_require__(29)
+	  , core      = __webpack_require__(30)
+	  , ctx       = __webpack_require__(31)
+	  , PROTOTYPE = 'prototype';
+
+	var $export = function(type, name, source){
+	  var IS_FORCED = type & $export.F
+	    , IS_GLOBAL = type & $export.G
+	    , IS_STATIC = type & $export.S
+	    , IS_PROTO  = type & $export.P
+	    , IS_BIND   = type & $export.B
+	    , IS_WRAP   = type & $export.W
+	    , exports   = IS_GLOBAL ? core : core[name] || (core[name] = {})
+	    , target    = IS_GLOBAL ? global : IS_STATIC ? global[name] : (global[name] || {})[PROTOTYPE]
+	    , key, own, out;
+	  if(IS_GLOBAL)source = name;
+	  for(key in source){
+	    // contains in native
+	    own = !IS_FORCED && target && key in target;
+	    if(own && key in exports)continue;
+	    // export native or passed
+	    out = own ? target[key] : source[key];
+	    // prevent global pollution for namespaces
+	    exports[key] = IS_GLOBAL && typeof target[key] != 'function' ? source[key]
+	    // bind timers to global for call from export context
+	    : IS_BIND && own ? ctx(out, global)
+	    // wrap global constructors for prevent change them in library
+	    : IS_WRAP && target[key] == out ? (function(C){
+	      var F = function(param){
+	        return this instanceof C ? new C(param) : C(param);
+	      };
+	      F[PROTOTYPE] = C[PROTOTYPE];
+	      return F;
+	    // make static versions for prototype methods
+	    })(out) : IS_PROTO && typeof out == 'function' ? ctx(Function.call, out) : out;
+	    if(IS_PROTO)(exports[PROTOTYPE] || (exports[PROTOTYPE] = {}))[key] = out;
+	  }
+	};
+	// type bitmap
+	$export.F = 1;  // forced
+	$export.G = 2;  // global
+	$export.S = 4;  // static
+	$export.P = 8;  // proto
+	$export.B = 16; // bind
+	$export.W = 32; // wrap
+	module.exports = $export;
+
+/***/ }),
+/* 29 */
+/***/ (function(module, exports) {
+
+	// https://github.com/zloirock/core-js/issues/86#issuecomment-115759028
+	var global = module.exports = typeof window != 'undefined' && window.Math == Math
+	  ? window : typeof self != 'undefined' && self.Math == Math ? self : Function('return this')();
+	if(typeof __g == 'number')__g = global; // eslint-disable-line no-undef
+
+/***/ }),
+/* 30 */
+/***/ (function(module, exports) {
+
+	var core = module.exports = {version: '1.2.6'};
+	if(typeof __e == 'number')__e = core; // eslint-disable-line no-undef
+
+/***/ }),
+/* 31 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	// optional / simple context binding
+	var aFunction = __webpack_require__(32);
+	module.exports = function(fn, that, length){
+	  aFunction(fn);
+	  if(that === undefined)return fn;
+	  switch(length){
+	    case 1: return function(a){
+	      return fn.call(that, a);
+	    };
+	    case 2: return function(a, b){
+	      return fn.call(that, a, b);
+	    };
+	    case 3: return function(a, b, c){
+	      return fn.call(that, a, b, c);
+	    };
+	  }
+	  return function(/* ...args */){
+	    return fn.apply(that, arguments);
+	  };
+	};
+
+/***/ }),
+/* 32 */
+/***/ (function(module, exports) {
+
+	module.exports = function(it){
+	  if(typeof it != 'function')throw TypeError(it + ' is not a function!');
+	  return it;
+	};
+
+/***/ }),
+/* 33 */
+/***/ (function(module, exports) {
+
+	module.exports = function(exec){
+	  try {
+	    return !!exec();
+	  } catch(e){
+	    return true;
+	  }
+	};
+
+/***/ }),
+/* 34 */
+/***/ (function(module, exports) {
 
 	/* WEBPACK VAR INJECTION */(function(global) {/* global window */
 	'use strict';
@@ -1302,9 +1530,9 @@ return /******/ (function(modules) { // webpackBootstrap
 	module.exports = exports['default'];
 	/* WEBPACK VAR INJECTION */}.call(exports, (function() { return this; }())))
 
-/***/ },
-/* 21 */
-/***/ function(module, exports) {
+/***/ }),
+/* 35 */
+/***/ (function(module, exports) {
 
 	'use strict';
 
@@ -1337,9 +1565,9 @@ return /******/ (function(modules) { // webpackBootstrap
 	exports['default'] = AST;
 	module.exports = exports['default'];
 
-/***/ },
-/* 22 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ }),
+/* 36 */
+/***/ (function(module, exports, __webpack_require__) {
 
 	'use strict';
 
@@ -1350,15 +1578,15 @@ return /******/ (function(modules) { // webpackBootstrap
 	exports.__esModule = true;
 	exports.parse = parse;
 
-	var _parser = __webpack_require__(23);
+	var _parser = __webpack_require__(37);
 
 	var _parser2 = _interopRequireDefault(_parser);
 
-	var _whitespaceControl = __webpack_require__(24);
+	var _whitespaceControl = __webpack_require__(38);
 
 	var _whitespaceControl2 = _interopRequireDefault(_whitespaceControl);
 
-	var _helpers = __webpack_require__(26);
+	var _helpers = __webpack_require__(40);
 
 	var Helpers = _interopRequireWildcard(_helpers);
 
@@ -1386,14 +1614,15 @@ return /******/ (function(modules) { // webpackBootstrap
 	  return strip.accept(_parser2['default'].parse(input));
 	}
 
-/***/ },
-/* 23 */
-/***/ function(module, exports) {
+/***/ }),
+/* 37 */
+/***/ (function(module, exports) {
 
-	/* istanbul ignore next */
+	// File ignored in coverage tests via setting in .istanbul.yml
 	/* Jison generated parser */
 	"use strict";
 
+	exports.__esModule = true;
 	var handlebars = (function () {
 	    var parser = { trace: function trace() {},
 	        yy: {},
@@ -1401,7 +1630,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	        terminals_: { 2: "error", 5: "EOF", 14: "COMMENT", 15: "CONTENT", 18: "END_RAW_BLOCK", 19: "OPEN_RAW_BLOCK", 23: "CLOSE_RAW_BLOCK", 29: "OPEN_BLOCK", 33: "CLOSE", 34: "OPEN_INVERSE", 39: "OPEN_INVERSE_CHAIN", 44: "INVERSE", 47: "OPEN_ENDBLOCK", 48: "OPEN", 51: "OPEN_UNESCAPED", 54: "CLOSE_UNESCAPED", 55: "OPEN_PARTIAL", 60: "OPEN_PARTIAL_BLOCK", 65: "OPEN_SEXPR", 68: "CLOSE_SEXPR", 72: "ID", 73: "EQUALS", 75: "OPEN_BLOCK_PARAMS", 77: "CLOSE_BLOCK_PARAMS", 80: "STRING", 81: "NUMBER", 82: "BOOLEAN", 83: "UNDEFINED", 84: "NULL", 85: "DATA", 87: "SEP" },
 	        productions_: [0, [3, 2], [4, 1], [7, 1], [7, 1], [7, 1], [7, 1], [7, 1], [7, 1], [7, 1], [13, 1], [10, 3], [16, 5], [9, 4], [9, 4], [24, 6], [27, 6], [38, 6], [43, 2], [45, 3], [45, 1], [26, 3], [8, 5], [8, 5], [11, 5], [12, 3], [59, 5], [63, 1], [63, 1], [64, 5], [69, 1], [71, 3], [74, 3], [20, 1], [20, 1], [20, 1], [20, 1], [20, 1], [20, 1], [20, 1], [56, 1], [56, 1], [79, 2], [78, 1], [86, 3], [86, 1], [6, 0], [6, 2], [17, 1], [17, 2], [21, 0], [21, 2], [22, 0], [22, 1], [25, 0], [25, 1], [28, 0], [28, 1], [30, 0], [30, 2], [31, 0], [31, 1], [32, 0], [32, 1], [35, 0], [35, 2], [36, 0], [36, 1], [37, 0], [37, 1], [40, 0], [40, 2], [41, 0], [41, 1], [42, 0], [42, 1], [46, 0], [46, 1], [49, 0], [49, 2], [50, 0], [50, 1], [52, 0], [52, 2], [53, 0], [53, 1], [57, 0], [57, 2], [58, 0], [58, 1], [61, 0], [61, 2], [62, 0], [62, 1], [66, 0], [66, 2], [67, 0], [67, 1], [70, 1], [70, 2], [76, 1], [76, 2]],
 	        performAction: function anonymous(yytext, yyleng, yylineno, yy, yystate, $$, _$
-	        /**/) {
+	        /*``*/) {
 
 	            var $0 = $$.length - 1;
 	            switch (yystate) {
@@ -1939,7 +2168,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	            } };
 	        lexer.options = {};
 	        lexer.performAction = function anonymous(yy, yy_, $avoiding_name_collisions, YY_START
-	        /**/) {
+	        /*``*/) {
 
 	            function strip(start, end) {
 	                return yy_.yytext = yy_.yytext.substr(start, yy_.yyleng - end);
@@ -2125,12 +2354,12 @@ return /******/ (function(modules) { // webpackBootstrap
 	        this.yy = {};
 	    }Parser.prototype = parser;parser.Parser = Parser;
 	    return new Parser();
-	})();exports.__esModule = true;
-	exports['default'] = handlebars;
+	})();exports["default"] = handlebars;
+	module.exports = exports["default"];
 
-/***/ },
-/* 24 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ }),
+/* 38 */
+/***/ (function(module, exports, __webpack_require__) {
 
 	'use strict';
 
@@ -2138,7 +2367,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	exports.__esModule = true;
 
-	var _visitor = __webpack_require__(25);
+	var _visitor = __webpack_require__(39);
 
 	var _visitor2 = _interopRequireDefault(_visitor);
 
@@ -2352,9 +2581,9 @@ return /******/ (function(modules) { // webpackBootstrap
 	exports['default'] = WhitespaceControl;
 	module.exports = exports['default'];
 
-/***/ },
-/* 25 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ }),
+/* 39 */
+/***/ (function(module, exports, __webpack_require__) {
 
 	'use strict';
 
@@ -2495,9 +2724,9 @@ return /******/ (function(modules) { // webpackBootstrap
 	exports['default'] = Visitor;
 	module.exports = exports['default'];
 
-/***/ },
-/* 26 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ }),
+/* 40 */
+/***/ (function(module, exports, __webpack_require__) {
 
 	'use strict';
 
@@ -2557,7 +2786,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	}
 
 	function stripComment(comment) {
-	  return comment.replace(/^\{\{~?\!-?-?/, '').replace(/-?-?~?\}\}$/, '');
+	  return comment.replace(/^\{\{~?!-?-?/, '').replace(/-?-?~?\}\}$/, '');
 	}
 
 	function preparePath(data, parts, loc) {
@@ -2565,8 +2794,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	  var original = data ? '@' : '',
 	      dig = [],
-	      depth = 0,
-	      depthString = '';
+	      depth = 0;
 
 	  for (var i = 0, l = parts.length; i < l; i++) {
 	    var part = parts[i].part,
@@ -2581,7 +2809,6 @@ return /******/ (function(modules) { // webpackBootstrap
 	        throw new _exception2['default']('Invalid path: ' + original, { loc: loc });
 	      } else if (part === '..') {
 	        depth++;
-	        depthString += '../';
 	      }
 	    } else {
 	      dig.push(part);
@@ -2728,9 +2955,9 @@ return /******/ (function(modules) { // webpackBootstrap
 	  };
 	}
 
-/***/ },
-/* 27 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ }),
+/* 41 */
+/***/ (function(module, exports, __webpack_require__) {
 
 	/* eslint-disable new-cap */
 
@@ -2749,7 +2976,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var _utils = __webpack_require__(5);
 
-	var _ast = __webpack_require__(21);
+	var _ast = __webpack_require__(35);
 
 	var _ast2 = _interopRequireDefault(_ast);
 
@@ -2816,11 +3043,11 @@ return /******/ (function(modules) { // webpackBootstrap
 	      'lookup': true
 	    };
 	    if (knownHelpers) {
+	      // the next line should use "Object.keys", but the code has been like this a long time and changing it, might
+	      // cause backwards-compatibility issues... It's an old library...
+	      // eslint-disable-next-line guard-for-in
 	      for (var _name in knownHelpers) {
-	        /* istanbul ignore else */
-	        if (_name in knownHelpers) {
-	          options.knownHelpers[_name] = knownHelpers[_name];
-	        }
+	        this.options.knownHelpers[_name] = knownHelpers[_name];
 	      }
 	    }
 
@@ -3234,6 +3461,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	    throw new _exception2['default']('You must pass a string or Handlebars AST to Handlebars.compile. You passed ' + input);
 	  }
 
+	  options = _utils.extend({}, options);
 	  if (!('data' in options)) {
 	    options.data = true;
 	  }
@@ -3303,9 +3531,9 @@ return /******/ (function(modules) { // webpackBootstrap
 	  }
 	}
 
-/***/ },
-/* 28 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ }),
+/* 42 */
+/***/ (function(module, exports, __webpack_require__) {
 
 	'use strict';
 
@@ -3321,7 +3549,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var _utils = __webpack_require__(5);
 
-	var _codeGen = __webpack_require__(29);
+	var _codeGen = __webpack_require__(43);
 
 	var _codeGen2 = _interopRequireDefault(_codeGen);
 
@@ -4092,11 +4320,11 @@ return /******/ (function(modules) { // webpackBootstrap
 	      child = children[i];
 	      compiler = new this.compiler(); // eslint-disable-line new-cap
 
-	      var index = this.matchExistingProgram(child);
+	      var existing = this.matchExistingProgram(child);
 
-	      if (index == null) {
+	      if (existing == null) {
 	        this.context.programs.push(''); // Placeholder to prevent name conflicts for nested children
-	        index = this.context.programs.length;
+	        var index = this.context.programs.length;
 	        child.index = index;
 	        child.name = 'program' + index;
 	        this.context.programs[index] = compiler.compile(child, options, this.context, !this.precompile);
@@ -4105,12 +4333,14 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	        this.useDepths = this.useDepths || compiler.useDepths;
 	        this.useBlockParams = this.useBlockParams || compiler.useBlockParams;
+	        child.useDepths = this.useDepths;
+	        child.useBlockParams = this.useBlockParams;
 	      } else {
-	        child.index = index;
-	        child.name = 'program' + index;
+	        child.index = existing.index;
+	        child.name = 'program' + existing.index;
 
-	        this.useDepths = this.useDepths || child.useDepths;
-	        this.useBlockParams = this.useBlockParams || child.useBlockParams;
+	        this.useDepths = this.useDepths || existing.useDepths;
+	        this.useBlockParams = this.useBlockParams || existing.useBlockParams;
 	      }
 	    }
 	  },
@@ -4118,7 +4348,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	    for (var i = 0, len = this.context.environments.length; i < len; i++) {
 	      var environment = this.context.environments[i];
 	      if (environment && environment.equals(child)) {
-	        return i;
+	        return environment;
 	      }
 	    }
 	  },
@@ -4300,7 +4530,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	    var params = [],
 	        paramsInit = this.setupHelperArgs(name, paramSize, params, blockHelper);
 	    var foundHelper = this.nameLookup('helpers', name, 'helper'),
-	        callContext = this.aliasable(this.contextName(0) + ' != null ? ' + this.contextName(0) + ' : {}');
+	        callContext = this.aliasable(this.contextName(0) + ' != null ? ' + this.contextName(0) + ' : (container.nullContext || {})');
 
 	    return {
 	      params: params,
@@ -4432,9 +4662,9 @@ return /******/ (function(modules) { // webpackBootstrap
 	exports['default'] = JavaScriptCompiler;
 	module.exports = exports['default'];
 
-/***/ },
-/* 29 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ }),
+/* 43 */
+/***/ (function(module, exports, __webpack_require__) {
 
 	/* global define */
 	'use strict';
@@ -4602,7 +4832,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	exports['default'] = CodeGen;
 	module.exports = exports['default'];
 
-/***/ }
+/***/ })
 /******/ ])
 });
 ;
\ No newline at end of file
diff --git a/vendor/assets/javascripts/handlebars.runtime.js b/vendor/assets/javascripts/handlebars.runtime.js
index 95049f3b8d..f898d3128b 100644
--- a/vendor/assets/javascripts/handlebars.runtime.js
+++ b/vendor/assets/javascripts/handlebars.runtime.js
@@ -1,8 +1,9 @@
-/*!
+/**!
 
- handlebars v4.0.5
+ @license
+ handlebars v4.0.12
 
-Copyright (C) 2011-2015 by Yehuda Katz
+Copyright (C) 2011-2017 by Yehuda Katz
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -22,7 +23,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
-@license
 */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
@@ -78,7 +78,7 @@ return /******/ (function(modules) { // webpackBootstrap
 /************************************************************************/
 /******/ ([
 /* 0 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ (function(module, exports, __webpack_require__) {
 
 	'use strict';
 
@@ -95,7 +95,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	// Each of these augment the Handlebars object. No need to setup here.
 	// (This is done to easily share code between commonjs and browse envs)
 
-	var _handlebarsSafeString = __webpack_require__(17);
+	var _handlebarsSafeString = __webpack_require__(20);
 
 	var _handlebarsSafeString2 = _interopRequireDefault(_handlebarsSafeString);
 
@@ -107,11 +107,11 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var Utils = _interopRequireWildcard(_handlebarsUtils);
 
-	var _handlebarsRuntime = __webpack_require__(18);
+	var _handlebarsRuntime = __webpack_require__(21);
 
 	var runtime = _interopRequireWildcard(_handlebarsRuntime);
 
-	var _handlebarsNoConflict = __webpack_require__(19);
+	var _handlebarsNoConflict = __webpack_require__(33);
 
 	var _handlebarsNoConflict2 = _interopRequireDefault(_handlebarsNoConflict);
 
@@ -143,9 +143,9 @@ return /******/ (function(modules) { // webpackBootstrap
 	exports['default'] = inst;
 	module.exports = exports['default'];
 
-/***/ },
+/***/ }),
 /* 1 */
-/***/ function(module, exports) {
+/***/ (function(module, exports) {
 
 	"use strict";
 
@@ -168,9 +168,9 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	exports.__esModule = true;
 
-/***/ },
+/***/ }),
 /* 2 */
-/***/ function(module, exports) {
+/***/ (function(module, exports) {
 
 	"use strict";
 
@@ -182,9 +182,9 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	exports.__esModule = true;
 
-/***/ },
+/***/ }),
 /* 3 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ (function(module, exports, __webpack_require__) {
 
 	'use strict';
 
@@ -199,15 +199,15 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var _exception2 = _interopRequireDefault(_exception);
 
-	var _helpers = __webpack_require__(6);
+	var _helpers = __webpack_require__(9);
 
-	var _decorators = __webpack_require__(14);
+	var _decorators = __webpack_require__(17);
 
-	var _logger = __webpack_require__(16);
+	var _logger = __webpack_require__(19);
 
 	var _logger2 = _interopRequireDefault(_logger);
 
-	var VERSION = '4.0.5';
+	var VERSION = '4.0.12';
 	exports.VERSION = VERSION;
 	var COMPILER_REVISION = 7;
 
@@ -289,9 +289,9 @@ return /******/ (function(modules) { // webpackBootstrap
 	exports.createFrame = _utils.createFrame;
 	exports.logger = _logger2['default'];
 
-/***/ },
+/***/ }),
 /* 4 */
-/***/ function(module, exports) {
+/***/ (function(module, exports) {
 
 	'use strict';
 
@@ -417,12 +417,14 @@ return /******/ (function(modules) { // webpackBootstrap
 	  return (contextPath ? contextPath + '.' : '') + id;
 	}
 
-/***/ },
+/***/ }),
 /* 5 */
-/***/ function(module, exports) {
+/***/ (function(module, exports, __webpack_require__) {
 
 	'use strict';
 
+	var _Object$defineProperty = __webpack_require__(6)['default'];
+
 	exports.__esModule = true;
 
 	var errorProps = ['description', 'fileName', 'lineNumber', 'message', 'name', 'number', 'stack'];
@@ -450,9 +452,23 @@ return /******/ (function(modules) { // webpackBootstrap
 	    Error.captureStackTrace(this, Exception);
 	  }
 
-	  if (loc) {
-	    this.lineNumber = line;
-	    this.column = column;
+	  try {
+	    if (loc) {
+	      this.lineNumber = line;
+
+	      // Work around issue under safari where we can't directly set the column value
+	      /* istanbul ignore next */
+	      if (_Object$defineProperty) {
+	        Object.defineProperty(this, 'column', {
+	          value: column,
+	          enumerable: true
+	        });
+	      } else {
+	        this.column = column;
+	      }
+	    }
+	  } catch (nop) {
+	    /* Ignore if the browser is very particular */
 	  }
 	}
 
@@ -461,9 +477,42 @@ return /******/ (function(modules) { // webpackBootstrap
 	exports['default'] = Exception;
 	module.exports = exports['default'];
 
-/***/ },
+/***/ }),
 /* 6 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ (function(module, exports, __webpack_require__) {
+
+	module.exports = { "default": __webpack_require__(7), __esModule: true };
+
+/***/ }),
+/* 7 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	var $ = __webpack_require__(8);
+	module.exports = function defineProperty(it, key, desc){
+	  return $.setDesc(it, key, desc);
+	};
+
+/***/ }),
+/* 8 */
+/***/ (function(module, exports) {
+
+	var $Object = Object;
+	module.exports = {
+	  create:     $Object.create,
+	  getProto:   $Object.getPrototypeOf,
+	  isEnum:     {}.propertyIsEnumerable,
+	  getDesc:    $Object.getOwnPropertyDescriptor,
+	  setDesc:    $Object.defineProperty,
+	  setDescs:   $Object.defineProperties,
+	  getKeys:    $Object.keys,
+	  getNames:   $Object.getOwnPropertyNames,
+	  getSymbols: $Object.getOwnPropertySymbols,
+	  each:       [].forEach
+	};
+
+/***/ }),
+/* 9 */
+/***/ (function(module, exports, __webpack_require__) {
 
 	'use strict';
 
@@ -472,31 +521,31 @@ return /******/ (function(modules) { // webpackBootstrap
 	exports.__esModule = true;
 	exports.registerDefaultHelpers = registerDefaultHelpers;
 
-	var _helpersBlockHelperMissing = __webpack_require__(7);
+	var _helpersBlockHelperMissing = __webpack_require__(10);
 
 	var _helpersBlockHelperMissing2 = _interopRequireDefault(_helpersBlockHelperMissing);
 
-	var _helpersEach = __webpack_require__(8);
+	var _helpersEach = __webpack_require__(11);
 
 	var _helpersEach2 = _interopRequireDefault(_helpersEach);
 
-	var _helpersHelperMissing = __webpack_require__(9);
+	var _helpersHelperMissing = __webpack_require__(12);
 
 	var _helpersHelperMissing2 = _interopRequireDefault(_helpersHelperMissing);
 
-	var _helpersIf = __webpack_require__(10);
+	var _helpersIf = __webpack_require__(13);
 
 	var _helpersIf2 = _interopRequireDefault(_helpersIf);
 
-	var _helpersLog = __webpack_require__(11);
+	var _helpersLog = __webpack_require__(14);
 
 	var _helpersLog2 = _interopRequireDefault(_helpersLog);
 
-	var _helpersLookup = __webpack_require__(12);
+	var _helpersLookup = __webpack_require__(15);
 
 	var _helpersLookup2 = _interopRequireDefault(_helpersLookup);
 
-	var _helpersWith = __webpack_require__(13);
+	var _helpersWith = __webpack_require__(16);
 
 	var _helpersWith2 = _interopRequireDefault(_helpersWith);
 
@@ -510,9 +559,9 @@ return /******/ (function(modules) { // webpackBootstrap
 	  _helpersWith2['default'](instance);
 	}
 
-/***/ },
-/* 7 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ }),
+/* 10 */
+/***/ (function(module, exports, __webpack_require__) {
 
 	'use strict';
 
@@ -553,9 +602,9 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	module.exports = exports['default'];
 
-/***/ },
-/* 8 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ }),
+/* 11 */
+/***/ (function(module, exports, __webpack_require__) {
 
 	'use strict';
 
@@ -650,9 +699,9 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	module.exports = exports['default'];
 
-/***/ },
-/* 9 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ }),
+/* 12 */
+/***/ (function(module, exports, __webpack_require__) {
 
 	'use strict';
 
@@ -678,9 +727,9 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	module.exports = exports['default'];
 
-/***/ },
-/* 10 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ }),
+/* 13 */
+/***/ (function(module, exports, __webpack_require__) {
 
 	'use strict';
 
@@ -711,9 +760,9 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	module.exports = exports['default'];
 
-/***/ },
-/* 11 */
-/***/ function(module, exports) {
+/***/ }),
+/* 14 */
+/***/ (function(module, exports) {
 
 	'use strict';
 
@@ -741,9 +790,9 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	module.exports = exports['default'];
 
-/***/ },
-/* 12 */
-/***/ function(module, exports) {
+/***/ }),
+/* 15 */
+/***/ (function(module, exports) {
 
 	'use strict';
 
@@ -757,9 +806,9 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	module.exports = exports['default'];
 
-/***/ },
-/* 13 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ }),
+/* 16 */
+/***/ (function(module, exports, __webpack_require__) {
 
 	'use strict';
 
@@ -794,9 +843,9 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	module.exports = exports['default'];
 
-/***/ },
-/* 14 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ }),
+/* 17 */
+/***/ (function(module, exports, __webpack_require__) {
 
 	'use strict';
 
@@ -805,7 +854,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	exports.__esModule = true;
 	exports.registerDefaultDecorators = registerDefaultDecorators;
 
-	var _decoratorsInline = __webpack_require__(15);
+	var _decoratorsInline = __webpack_require__(18);
 
 	var _decoratorsInline2 = _interopRequireDefault(_decoratorsInline);
 
@@ -813,9 +862,9 @@ return /******/ (function(modules) { // webpackBootstrap
 	  _decoratorsInline2['default'](instance);
 	}
 
-/***/ },
-/* 15 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ }),
+/* 18 */
+/***/ (function(module, exports, __webpack_require__) {
 
 	'use strict';
 
@@ -846,9 +895,9 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	module.exports = exports['default'];
 
-/***/ },
-/* 16 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ }),
+/* 19 */
+/***/ (function(module, exports, __webpack_require__) {
 
 	'use strict';
 
@@ -897,9 +946,9 @@ return /******/ (function(modules) { // webpackBootstrap
 	exports['default'] = logger;
 	module.exports = exports['default'];
 
-/***/ },
-/* 17 */
-/***/ function(module, exports) {
+/***/ }),
+/* 20 */
+/***/ (function(module, exports) {
 
 	// Build out our basic SafeString type
 	'use strict';
@@ -916,12 +965,14 @@ return /******/ (function(modules) { // webpackBootstrap
 	exports['default'] = SafeString;
 	module.exports = exports['default'];
 
-/***/ },
-/* 18 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ }),
+/* 21 */
+/***/ (function(module, exports, __webpack_require__) {
 
 	'use strict';
 
+	var _Object$seal = __webpack_require__(22)['default'];
+
 	var _interopRequireWildcard = __webpack_require__(1)['default'];
 
 	var _interopRequireDefault = __webpack_require__(2)['default'];
@@ -1064,6 +1115,8 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	      return obj;
 	    },
+	    // An empty object to use as replacement for null-contexts
+	    nullContext: _Object$seal({}),
 
 	    noop: env.VM.noop,
 	    compilerInfo: templateSpec.compiler
@@ -1082,7 +1135,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	        blockParams = templateSpec.useBlockParams ? [] : undefined;
 	    if (templateSpec.useDepths) {
 	      if (options.depths) {
-	        depths = context !== options.depths[0] ? [context].concat(options.depths) : options.depths;
+	        depths = context != options.depths[0] ? [context].concat(options.depths) : options.depths;
 	      } else {
 	        depths = [context];
 	      }
@@ -1131,7 +1184,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	    var options = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1];
 
 	    var currentDepths = depths;
-	    if (depths && context !== depths[0]) {
+	    if (depths && context != depths[0] && !(context === container.nullContext && depths[0] === null)) {
 	      currentDepths = [context].concat(depths);
 	    }
 
@@ -1162,6 +1215,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	}
 
 	function invokePartial(partial, context, options) {
+	  // Use the current closure context to save the partial-block if this partial
+	  var currentPartialBlock = options.data && options.data['partial-block'];
 	  options.partial = true;
 	  if (options.ids) {
 	    options.data.contextPath = options.ids[0] || options.data.contextPath;
@@ -1169,12 +1224,23 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	  var partialBlock = undefined;
 	  if (options.fn && options.fn !== noop) {
-	    options.data = _base.createFrame(options.data);
-	    partialBlock = options.data['partial-block'] = options.fn;
+	    (function () {
+	      options.data = _base.createFrame(options.data);
+	      // Wrapper function to get access to currentPartialBlock from the closure
+	      var fn = options.fn;
+	      partialBlock = options.data['partial-block'] = function partialBlockWrapper(context) {
+	        var options = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1];
 
-	    if (partialBlock.partials) {
-	      options.partials = Utils.extend({}, options.partials, partialBlock.partials);
-	    }
+	        // Restore the partial-block from the closure for the execution of the block
+	        // i.e. the part inside the block of the partial call.
+	        options.data = _base.createFrame(options.data);
+	        options.data['partial-block'] = currentPartialBlock;
+	        return fn(context, options);
+	      };
+	      if (fn.partials) {
+	        options.partials = Utils.extend({}, options.partials, fn.partials);
+	      }
+	    })();
 	  }
 
 	  if (partial === undefined && partialBlock) {
@@ -1209,9 +1275,171 @@ return /******/ (function(modules) { // webpackBootstrap
 	  return prog;
 	}
 
-/***/ },
-/* 19 */
-/***/ function(module, exports) {
+/***/ }),
+/* 22 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	module.exports = { "default": __webpack_require__(23), __esModule: true };
+
+/***/ }),
+/* 23 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	__webpack_require__(24);
+	module.exports = __webpack_require__(29).Object.seal;
+
+/***/ }),
+/* 24 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	// 19.1.2.17 Object.seal(O)
+	var isObject = __webpack_require__(25);
+
+	__webpack_require__(26)('seal', function($seal){
+	  return function seal(it){
+	    return $seal && isObject(it) ? $seal(it) : it;
+	  };
+	});
+
+/***/ }),
+/* 25 */
+/***/ (function(module, exports) {
+
+	module.exports = function(it){
+	  return typeof it === 'object' ? it !== null : typeof it === 'function';
+	};
+
+/***/ }),
+/* 26 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	// most Object methods by ES6 should accept primitives
+	var $export = __webpack_require__(27)
+	  , core    = __webpack_require__(29)
+	  , fails   = __webpack_require__(32);
+	module.exports = function(KEY, exec){
+	  var fn  = (core.Object || {})[KEY] || Object[KEY]
+	    , exp = {};
+	  exp[KEY] = exec(fn);
+	  $export($export.S + $export.F * fails(function(){ fn(1); }), 'Object', exp);
+	};
+
+/***/ }),
+/* 27 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	var global    = __webpack_require__(28)
+	  , core      = __webpack_require__(29)
+	  , ctx       = __webpack_require__(30)
+	  , PROTOTYPE = 'prototype';
+
+	var $export = function(type, name, source){
+	  var IS_FORCED = type & $export.F
+	    , IS_GLOBAL = type & $export.G
+	    , IS_STATIC = type & $export.S
+	    , IS_PROTO  = type & $export.P
+	    , IS_BIND   = type & $export.B
+	    , IS_WRAP   = type & $export.W
+	    , exports   = IS_GLOBAL ? core : core[name] || (core[name] = {})
+	    , target    = IS_GLOBAL ? global : IS_STATIC ? global[name] : (global[name] || {})[PROTOTYPE]
+	    , key, own, out;
+	  if(IS_GLOBAL)source = name;
+	  for(key in source){
+	    // contains in native
+	    own = !IS_FORCED && target && key in target;
+	    if(own && key in exports)continue;
+	    // export native or passed
+	    out = own ? target[key] : source[key];
+	    // prevent global pollution for namespaces
+	    exports[key] = IS_GLOBAL && typeof target[key] != 'function' ? source[key]
+	    // bind timers to global for call from export context
+	    : IS_BIND && own ? ctx(out, global)
+	    // wrap global constructors for prevent change them in library
+	    : IS_WRAP && target[key] == out ? (function(C){
+	      var F = function(param){
+	        return this instanceof C ? new C(param) : C(param);
+	      };
+	      F[PROTOTYPE] = C[PROTOTYPE];
+	      return F;
+	    // make static versions for prototype methods
+	    })(out) : IS_PROTO && typeof out == 'function' ? ctx(Function.call, out) : out;
+	    if(IS_PROTO)(exports[PROTOTYPE] || (exports[PROTOTYPE] = {}))[key] = out;
+	  }
+	};
+	// type bitmap
+	$export.F = 1;  // forced
+	$export.G = 2;  // global
+	$export.S = 4;  // static
+	$export.P = 8;  // proto
+	$export.B = 16; // bind
+	$export.W = 32; // wrap
+	module.exports = $export;
+
+/***/ }),
+/* 28 */
+/***/ (function(module, exports) {
+
+	// https://github.com/zloirock/core-js/issues/86#issuecomment-115759028
+	var global = module.exports = typeof window != 'undefined' && window.Math == Math
+	  ? window : typeof self != 'undefined' && self.Math == Math ? self : Function('return this')();
+	if(typeof __g == 'number')__g = global; // eslint-disable-line no-undef
+
+/***/ }),
+/* 29 */
+/***/ (function(module, exports) {
+
+	var core = module.exports = {version: '1.2.6'};
+	if(typeof __e == 'number')__e = core; // eslint-disable-line no-undef
+
+/***/ }),
+/* 30 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	// optional / simple context binding
+	var aFunction = __webpack_require__(31);
+	module.exports = function(fn, that, length){
+	  aFunction(fn);
+	  if(that === undefined)return fn;
+	  switch(length){
+	    case 1: return function(a){
+	      return fn.call(that, a);
+	    };
+	    case 2: return function(a, b){
+	      return fn.call(that, a, b);
+	    };
+	    case 3: return function(a, b, c){
+	      return fn.call(that, a, b, c);
+	    };
+	  }
+	  return function(/* ...args */){
+	    return fn.apply(that, arguments);
+	  };
+	};
+
+/***/ }),
+/* 31 */
+/***/ (function(module, exports) {
+
+	module.exports = function(it){
+	  if(typeof it != 'function')throw TypeError(it + ' is not a function!');
+	  return it;
+	};
+
+/***/ }),
+/* 32 */
+/***/ (function(module, exports) {
+
+	module.exports = function(exec){
+	  try {
+	    return !!exec();
+	  } catch(e){
+	    return true;
+	  }
+	};
+
+/***/ }),
+/* 33 */
+/***/ (function(module, exports) {
 
 	/* WEBPACK VAR INJECTION */(function(global) {/* global window */
 	'use strict';
@@ -1234,7 +1462,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	module.exports = exports['default'];
 	/* WEBPACK VAR INJECTION */}.call(exports, (function() { return this; }())))
 
-/***/ }
+/***/ })
 /******/ ])
 });
 ;
\ No newline at end of file
diff --git a/lib/highlight_js/assets/highlight.js b/vendor/assets/javascripts/highlightjs/highlight.min.js
similarity index 100%
rename from lib/highlight_js/assets/highlight.js
rename to vendor/assets/javascripts/highlightjs/highlight.min.js
diff --git a/lib/highlight_js/assets/lang/1c.js b/vendor/assets/javascripts/highlightjs/languages/1c.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/1c.js
rename to vendor/assets/javascripts/highlightjs/languages/1c.min.js
diff --git a/lib/highlight_js/assets/lang/abnf.js b/vendor/assets/javascripts/highlightjs/languages/abnf.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/abnf.js
rename to vendor/assets/javascripts/highlightjs/languages/abnf.min.js
diff --git a/lib/highlight_js/assets/lang/accesslog.js b/vendor/assets/javascripts/highlightjs/languages/accesslog.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/accesslog.js
rename to vendor/assets/javascripts/highlightjs/languages/accesslog.min.js
diff --git a/lib/highlight_js/assets/lang/actionscript.js b/vendor/assets/javascripts/highlightjs/languages/actionscript.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/actionscript.js
rename to vendor/assets/javascripts/highlightjs/languages/actionscript.min.js
diff --git a/lib/highlight_js/assets/lang/ada.js b/vendor/assets/javascripts/highlightjs/languages/ada.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/ada.js
rename to vendor/assets/javascripts/highlightjs/languages/ada.min.js
diff --git a/lib/highlight_js/assets/lang/angelscript.js b/vendor/assets/javascripts/highlightjs/languages/angelscript.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/angelscript.js
rename to vendor/assets/javascripts/highlightjs/languages/angelscript.min.js
diff --git a/lib/highlight_js/assets/lang/apache.js b/vendor/assets/javascripts/highlightjs/languages/apache.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/apache.js
rename to vendor/assets/javascripts/highlightjs/languages/apache.min.js
diff --git a/lib/highlight_js/assets/lang/applescript.js b/vendor/assets/javascripts/highlightjs/languages/applescript.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/applescript.js
rename to vendor/assets/javascripts/highlightjs/languages/applescript.min.js
diff --git a/lib/highlight_js/assets/lang/arcade.js b/vendor/assets/javascripts/highlightjs/languages/arcade.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/arcade.js
rename to vendor/assets/javascripts/highlightjs/languages/arcade.min.js
diff --git a/lib/highlight_js/assets/lang/arduino.js b/vendor/assets/javascripts/highlightjs/languages/arduino.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/arduino.js
rename to vendor/assets/javascripts/highlightjs/languages/arduino.min.js
diff --git a/lib/highlight_js/assets/lang/armasm.js b/vendor/assets/javascripts/highlightjs/languages/armasm.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/armasm.js
rename to vendor/assets/javascripts/highlightjs/languages/armasm.min.js
diff --git a/lib/highlight_js/assets/lang/asciidoc.js b/vendor/assets/javascripts/highlightjs/languages/asciidoc.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/asciidoc.js
rename to vendor/assets/javascripts/highlightjs/languages/asciidoc.min.js
diff --git a/lib/highlight_js/assets/lang/aspectj.js b/vendor/assets/javascripts/highlightjs/languages/aspectj.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/aspectj.js
rename to vendor/assets/javascripts/highlightjs/languages/aspectj.min.js
diff --git a/lib/highlight_js/assets/lang/autohotkey.js b/vendor/assets/javascripts/highlightjs/languages/autohotkey.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/autohotkey.js
rename to vendor/assets/javascripts/highlightjs/languages/autohotkey.min.js
diff --git a/lib/highlight_js/assets/lang/autoit.js b/vendor/assets/javascripts/highlightjs/languages/autoit.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/autoit.js
rename to vendor/assets/javascripts/highlightjs/languages/autoit.min.js
diff --git a/lib/highlight_js/assets/lang/avrasm.js b/vendor/assets/javascripts/highlightjs/languages/avrasm.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/avrasm.js
rename to vendor/assets/javascripts/highlightjs/languages/avrasm.min.js
diff --git a/lib/highlight_js/assets/lang/awk.js b/vendor/assets/javascripts/highlightjs/languages/awk.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/awk.js
rename to vendor/assets/javascripts/highlightjs/languages/awk.min.js
diff --git a/lib/highlight_js/assets/lang/axapta.js b/vendor/assets/javascripts/highlightjs/languages/axapta.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/axapta.js
rename to vendor/assets/javascripts/highlightjs/languages/axapta.min.js
diff --git a/lib/highlight_js/assets/lang/bash.js b/vendor/assets/javascripts/highlightjs/languages/bash.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/bash.js
rename to vendor/assets/javascripts/highlightjs/languages/bash.min.js
diff --git a/lib/highlight_js/assets/lang/basic.js b/vendor/assets/javascripts/highlightjs/languages/basic.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/basic.js
rename to vendor/assets/javascripts/highlightjs/languages/basic.min.js
diff --git a/lib/highlight_js/assets/lang/bnf.js b/vendor/assets/javascripts/highlightjs/languages/bnf.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/bnf.js
rename to vendor/assets/javascripts/highlightjs/languages/bnf.min.js
diff --git a/lib/highlight_js/assets/lang/brainfuck.js b/vendor/assets/javascripts/highlightjs/languages/brainfuck.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/brainfuck.js
rename to vendor/assets/javascripts/highlightjs/languages/brainfuck.min.js
diff --git a/lib/highlight_js/assets/lang/cal.js b/vendor/assets/javascripts/highlightjs/languages/cal.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/cal.js
rename to vendor/assets/javascripts/highlightjs/languages/cal.min.js
diff --git a/lib/highlight_js/assets/lang/capnproto.js b/vendor/assets/javascripts/highlightjs/languages/capnproto.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/capnproto.js
rename to vendor/assets/javascripts/highlightjs/languages/capnproto.min.js
diff --git a/lib/highlight_js/assets/lang/ceylon.js b/vendor/assets/javascripts/highlightjs/languages/ceylon.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/ceylon.js
rename to vendor/assets/javascripts/highlightjs/languages/ceylon.min.js
diff --git a/lib/highlight_js/assets/lang/clean.js b/vendor/assets/javascripts/highlightjs/languages/clean.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/clean.js
rename to vendor/assets/javascripts/highlightjs/languages/clean.min.js
diff --git a/lib/highlight_js/assets/lang/clojure-repl.js b/vendor/assets/javascripts/highlightjs/languages/clojure-repl.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/clojure-repl.js
rename to vendor/assets/javascripts/highlightjs/languages/clojure-repl.min.js
diff --git a/lib/highlight_js/assets/lang/clojure.js b/vendor/assets/javascripts/highlightjs/languages/clojure.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/clojure.js
rename to vendor/assets/javascripts/highlightjs/languages/clojure.min.js
diff --git a/lib/highlight_js/assets/lang/cmake.js b/vendor/assets/javascripts/highlightjs/languages/cmake.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/cmake.js
rename to vendor/assets/javascripts/highlightjs/languages/cmake.min.js
diff --git a/lib/highlight_js/assets/lang/coffeescript.js b/vendor/assets/javascripts/highlightjs/languages/coffeescript.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/coffeescript.js
rename to vendor/assets/javascripts/highlightjs/languages/coffeescript.min.js
diff --git a/lib/highlight_js/assets/lang/coq.js b/vendor/assets/javascripts/highlightjs/languages/coq.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/coq.js
rename to vendor/assets/javascripts/highlightjs/languages/coq.min.js
diff --git a/lib/highlight_js/assets/lang/cos.js b/vendor/assets/javascripts/highlightjs/languages/cos.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/cos.js
rename to vendor/assets/javascripts/highlightjs/languages/cos.min.js
diff --git a/lib/highlight_js/assets/lang/cpp.js b/vendor/assets/javascripts/highlightjs/languages/cpp.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/cpp.js
rename to vendor/assets/javascripts/highlightjs/languages/cpp.min.js
diff --git a/lib/highlight_js/assets/lang/crmsh.js b/vendor/assets/javascripts/highlightjs/languages/crmsh.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/crmsh.js
rename to vendor/assets/javascripts/highlightjs/languages/crmsh.min.js
diff --git a/lib/highlight_js/assets/lang/crystal.js b/vendor/assets/javascripts/highlightjs/languages/crystal.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/crystal.js
rename to vendor/assets/javascripts/highlightjs/languages/crystal.min.js
diff --git a/lib/highlight_js/assets/lang/cs.js b/vendor/assets/javascripts/highlightjs/languages/cs.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/cs.js
rename to vendor/assets/javascripts/highlightjs/languages/cs.min.js
diff --git a/lib/highlight_js/assets/lang/csp.js b/vendor/assets/javascripts/highlightjs/languages/csp.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/csp.js
rename to vendor/assets/javascripts/highlightjs/languages/csp.min.js
diff --git a/lib/highlight_js/assets/lang/css.js b/vendor/assets/javascripts/highlightjs/languages/css.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/css.js
rename to vendor/assets/javascripts/highlightjs/languages/css.min.js
diff --git a/lib/highlight_js/assets/lang/d.js b/vendor/assets/javascripts/highlightjs/languages/d.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/d.js
rename to vendor/assets/javascripts/highlightjs/languages/d.min.js
diff --git a/lib/highlight_js/assets/lang/dart.js b/vendor/assets/javascripts/highlightjs/languages/dart.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/dart.js
rename to vendor/assets/javascripts/highlightjs/languages/dart.min.js
diff --git a/lib/highlight_js/assets/lang/delphi.js b/vendor/assets/javascripts/highlightjs/languages/delphi.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/delphi.js
rename to vendor/assets/javascripts/highlightjs/languages/delphi.min.js
diff --git a/lib/highlight_js/assets/lang/diff.js b/vendor/assets/javascripts/highlightjs/languages/diff.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/diff.js
rename to vendor/assets/javascripts/highlightjs/languages/diff.min.js
diff --git a/lib/highlight_js/assets/lang/django.js b/vendor/assets/javascripts/highlightjs/languages/django.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/django.js
rename to vendor/assets/javascripts/highlightjs/languages/django.min.js
diff --git a/lib/highlight_js/assets/lang/dns.js b/vendor/assets/javascripts/highlightjs/languages/dns.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/dns.js
rename to vendor/assets/javascripts/highlightjs/languages/dns.min.js
diff --git a/lib/highlight_js/assets/lang/dockerfile.js b/vendor/assets/javascripts/highlightjs/languages/dockerfile.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/dockerfile.js
rename to vendor/assets/javascripts/highlightjs/languages/dockerfile.min.js
diff --git a/lib/highlight_js/assets/lang/dos.js b/vendor/assets/javascripts/highlightjs/languages/dos.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/dos.js
rename to vendor/assets/javascripts/highlightjs/languages/dos.min.js
diff --git a/lib/highlight_js/assets/lang/dsconfig.js b/vendor/assets/javascripts/highlightjs/languages/dsconfig.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/dsconfig.js
rename to vendor/assets/javascripts/highlightjs/languages/dsconfig.min.js
diff --git a/lib/highlight_js/assets/lang/dts.js b/vendor/assets/javascripts/highlightjs/languages/dts.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/dts.js
rename to vendor/assets/javascripts/highlightjs/languages/dts.min.js
diff --git a/lib/highlight_js/assets/lang/dust.js b/vendor/assets/javascripts/highlightjs/languages/dust.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/dust.js
rename to vendor/assets/javascripts/highlightjs/languages/dust.min.js
diff --git a/lib/highlight_js/assets/lang/ebnf.js b/vendor/assets/javascripts/highlightjs/languages/ebnf.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/ebnf.js
rename to vendor/assets/javascripts/highlightjs/languages/ebnf.min.js
diff --git a/lib/highlight_js/assets/lang/elixir.js b/vendor/assets/javascripts/highlightjs/languages/elixir.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/elixir.js
rename to vendor/assets/javascripts/highlightjs/languages/elixir.min.js
diff --git a/lib/highlight_js/assets/lang/elm.js b/vendor/assets/javascripts/highlightjs/languages/elm.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/elm.js
rename to vendor/assets/javascripts/highlightjs/languages/elm.min.js
diff --git a/lib/highlight_js/assets/lang/erb.js b/vendor/assets/javascripts/highlightjs/languages/erb.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/erb.js
rename to vendor/assets/javascripts/highlightjs/languages/erb.min.js
diff --git a/lib/highlight_js/assets/lang/erlang-repl.js b/vendor/assets/javascripts/highlightjs/languages/erlang-repl.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/erlang-repl.js
rename to vendor/assets/javascripts/highlightjs/languages/erlang-repl.min.js
diff --git a/lib/highlight_js/assets/lang/erlang.js b/vendor/assets/javascripts/highlightjs/languages/erlang.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/erlang.js
rename to vendor/assets/javascripts/highlightjs/languages/erlang.min.js
diff --git a/lib/highlight_js/assets/lang/excel.js b/vendor/assets/javascripts/highlightjs/languages/excel.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/excel.js
rename to vendor/assets/javascripts/highlightjs/languages/excel.min.js
diff --git a/lib/highlight_js/assets/lang/fix.js b/vendor/assets/javascripts/highlightjs/languages/fix.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/fix.js
rename to vendor/assets/javascripts/highlightjs/languages/fix.min.js
diff --git a/lib/highlight_js/assets/lang/flix.js b/vendor/assets/javascripts/highlightjs/languages/flix.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/flix.js
rename to vendor/assets/javascripts/highlightjs/languages/flix.min.js
diff --git a/lib/highlight_js/assets/lang/fortran.js b/vendor/assets/javascripts/highlightjs/languages/fortran.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/fortran.js
rename to vendor/assets/javascripts/highlightjs/languages/fortran.min.js
diff --git a/lib/highlight_js/assets/lang/fsharp.js b/vendor/assets/javascripts/highlightjs/languages/fsharp.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/fsharp.js
rename to vendor/assets/javascripts/highlightjs/languages/fsharp.min.js
diff --git a/lib/highlight_js/assets/lang/gams.js b/vendor/assets/javascripts/highlightjs/languages/gams.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/gams.js
rename to vendor/assets/javascripts/highlightjs/languages/gams.min.js
diff --git a/lib/highlight_js/assets/lang/gauss.js b/vendor/assets/javascripts/highlightjs/languages/gauss.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/gauss.js
rename to vendor/assets/javascripts/highlightjs/languages/gauss.min.js
diff --git a/lib/highlight_js/assets/lang/gcode.js b/vendor/assets/javascripts/highlightjs/languages/gcode.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/gcode.js
rename to vendor/assets/javascripts/highlightjs/languages/gcode.min.js
diff --git a/lib/highlight_js/assets/lang/gherkin.js b/vendor/assets/javascripts/highlightjs/languages/gherkin.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/gherkin.js
rename to vendor/assets/javascripts/highlightjs/languages/gherkin.min.js
diff --git a/lib/highlight_js/assets/lang/glsl.js b/vendor/assets/javascripts/highlightjs/languages/glsl.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/glsl.js
rename to vendor/assets/javascripts/highlightjs/languages/glsl.min.js
diff --git a/lib/highlight_js/assets/lang/gml.js b/vendor/assets/javascripts/highlightjs/languages/gml.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/gml.js
rename to vendor/assets/javascripts/highlightjs/languages/gml.min.js
diff --git a/lib/highlight_js/assets/lang/go.js b/vendor/assets/javascripts/highlightjs/languages/go.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/go.js
rename to vendor/assets/javascripts/highlightjs/languages/go.min.js
diff --git a/lib/highlight_js/assets/lang/golo.js b/vendor/assets/javascripts/highlightjs/languages/golo.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/golo.js
rename to vendor/assets/javascripts/highlightjs/languages/golo.min.js
diff --git a/lib/highlight_js/assets/lang/gradle.js b/vendor/assets/javascripts/highlightjs/languages/gradle.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/gradle.js
rename to vendor/assets/javascripts/highlightjs/languages/gradle.min.js
diff --git a/lib/highlight_js/assets/lang/groovy.js b/vendor/assets/javascripts/highlightjs/languages/groovy.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/groovy.js
rename to vendor/assets/javascripts/highlightjs/languages/groovy.min.js
diff --git a/lib/highlight_js/assets/lang/haml.js b/vendor/assets/javascripts/highlightjs/languages/haml.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/haml.js
rename to vendor/assets/javascripts/highlightjs/languages/haml.min.js
diff --git a/lib/highlight_js/assets/lang/handlebars.js b/vendor/assets/javascripts/highlightjs/languages/handlebars.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/handlebars.js
rename to vendor/assets/javascripts/highlightjs/languages/handlebars.min.js
diff --git a/lib/highlight_js/assets/lang/haskell.js b/vendor/assets/javascripts/highlightjs/languages/haskell.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/haskell.js
rename to vendor/assets/javascripts/highlightjs/languages/haskell.min.js
diff --git a/lib/highlight_js/assets/lang/haxe.js b/vendor/assets/javascripts/highlightjs/languages/haxe.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/haxe.js
rename to vendor/assets/javascripts/highlightjs/languages/haxe.min.js
diff --git a/lib/highlight_js/assets/lang/hsp.js b/vendor/assets/javascripts/highlightjs/languages/hsp.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/hsp.js
rename to vendor/assets/javascripts/highlightjs/languages/hsp.min.js
diff --git a/lib/highlight_js/assets/lang/htmlbars.js b/vendor/assets/javascripts/highlightjs/languages/htmlbars.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/htmlbars.js
rename to vendor/assets/javascripts/highlightjs/languages/htmlbars.min.js
diff --git a/lib/highlight_js/assets/lang/http.js b/vendor/assets/javascripts/highlightjs/languages/http.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/http.js
rename to vendor/assets/javascripts/highlightjs/languages/http.min.js
diff --git a/lib/highlight_js/assets/lang/hy.js b/vendor/assets/javascripts/highlightjs/languages/hy.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/hy.js
rename to vendor/assets/javascripts/highlightjs/languages/hy.min.js
diff --git a/lib/highlight_js/assets/lang/inform7.js b/vendor/assets/javascripts/highlightjs/languages/inform7.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/inform7.js
rename to vendor/assets/javascripts/highlightjs/languages/inform7.min.js
diff --git a/lib/highlight_js/assets/lang/ini.js b/vendor/assets/javascripts/highlightjs/languages/ini.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/ini.js
rename to vendor/assets/javascripts/highlightjs/languages/ini.min.js
diff --git a/lib/highlight_js/assets/lang/irpf90.js b/vendor/assets/javascripts/highlightjs/languages/irpf90.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/irpf90.js
rename to vendor/assets/javascripts/highlightjs/languages/irpf90.min.js
diff --git a/lib/highlight_js/assets/lang/isbl.js b/vendor/assets/javascripts/highlightjs/languages/isbl.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/isbl.js
rename to vendor/assets/javascripts/highlightjs/languages/isbl.min.js
diff --git a/lib/highlight_js/assets/lang/java.js b/vendor/assets/javascripts/highlightjs/languages/java.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/java.js
rename to vendor/assets/javascripts/highlightjs/languages/java.min.js
diff --git a/lib/highlight_js/assets/lang/javascript.js b/vendor/assets/javascripts/highlightjs/languages/javascript.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/javascript.js
rename to vendor/assets/javascripts/highlightjs/languages/javascript.min.js
diff --git a/lib/highlight_js/assets/lang/jboss-cli.js b/vendor/assets/javascripts/highlightjs/languages/jboss-cli.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/jboss-cli.js
rename to vendor/assets/javascripts/highlightjs/languages/jboss-cli.min.js
diff --git a/lib/highlight_js/assets/lang/json.js b/vendor/assets/javascripts/highlightjs/languages/json.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/json.js
rename to vendor/assets/javascripts/highlightjs/languages/json.min.js
diff --git a/lib/highlight_js/assets/lang/julia-repl.js b/vendor/assets/javascripts/highlightjs/languages/julia-repl.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/julia-repl.js
rename to vendor/assets/javascripts/highlightjs/languages/julia-repl.min.js
diff --git a/lib/highlight_js/assets/lang/julia.js b/vendor/assets/javascripts/highlightjs/languages/julia.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/julia.js
rename to vendor/assets/javascripts/highlightjs/languages/julia.min.js
diff --git a/lib/highlight_js/assets/lang/kotlin.js b/vendor/assets/javascripts/highlightjs/languages/kotlin.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/kotlin.js
rename to vendor/assets/javascripts/highlightjs/languages/kotlin.min.js
diff --git a/lib/highlight_js/assets/lang/lasso.js b/vendor/assets/javascripts/highlightjs/languages/lasso.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/lasso.js
rename to vendor/assets/javascripts/highlightjs/languages/lasso.min.js
diff --git a/lib/highlight_js/assets/lang/ldif.js b/vendor/assets/javascripts/highlightjs/languages/ldif.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/ldif.js
rename to vendor/assets/javascripts/highlightjs/languages/ldif.min.js
diff --git a/lib/highlight_js/assets/lang/leaf.js b/vendor/assets/javascripts/highlightjs/languages/leaf.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/leaf.js
rename to vendor/assets/javascripts/highlightjs/languages/leaf.min.js
diff --git a/lib/highlight_js/assets/lang/less.js b/vendor/assets/javascripts/highlightjs/languages/less.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/less.js
rename to vendor/assets/javascripts/highlightjs/languages/less.min.js
diff --git a/lib/highlight_js/assets/lang/lisp.js b/vendor/assets/javascripts/highlightjs/languages/lisp.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/lisp.js
rename to vendor/assets/javascripts/highlightjs/languages/lisp.min.js
diff --git a/lib/highlight_js/assets/lang/livecodeserver.js b/vendor/assets/javascripts/highlightjs/languages/livecodeserver.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/livecodeserver.js
rename to vendor/assets/javascripts/highlightjs/languages/livecodeserver.min.js
diff --git a/lib/highlight_js/assets/lang/livescript.js b/vendor/assets/javascripts/highlightjs/languages/livescript.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/livescript.js
rename to vendor/assets/javascripts/highlightjs/languages/livescript.min.js
diff --git a/lib/highlight_js/assets/lang/llvm.js b/vendor/assets/javascripts/highlightjs/languages/llvm.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/llvm.js
rename to vendor/assets/javascripts/highlightjs/languages/llvm.min.js
diff --git a/lib/highlight_js/assets/lang/lsl.js b/vendor/assets/javascripts/highlightjs/languages/lsl.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/lsl.js
rename to vendor/assets/javascripts/highlightjs/languages/lsl.min.js
diff --git a/lib/highlight_js/assets/lang/lua.js b/vendor/assets/javascripts/highlightjs/languages/lua.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/lua.js
rename to vendor/assets/javascripts/highlightjs/languages/lua.min.js
diff --git a/lib/highlight_js/assets/lang/makefile.js b/vendor/assets/javascripts/highlightjs/languages/makefile.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/makefile.js
rename to vendor/assets/javascripts/highlightjs/languages/makefile.min.js
diff --git a/lib/highlight_js/assets/lang/markdown.js b/vendor/assets/javascripts/highlightjs/languages/markdown.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/markdown.js
rename to vendor/assets/javascripts/highlightjs/languages/markdown.min.js
diff --git a/lib/highlight_js/assets/lang/mathematica.js b/vendor/assets/javascripts/highlightjs/languages/mathematica.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/mathematica.js
rename to vendor/assets/javascripts/highlightjs/languages/mathematica.min.js
diff --git a/lib/highlight_js/assets/lang/matlab.js b/vendor/assets/javascripts/highlightjs/languages/matlab.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/matlab.js
rename to vendor/assets/javascripts/highlightjs/languages/matlab.min.js
diff --git a/lib/highlight_js/assets/lang/maxima.js b/vendor/assets/javascripts/highlightjs/languages/maxima.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/maxima.js
rename to vendor/assets/javascripts/highlightjs/languages/maxima.min.js
diff --git a/lib/highlight_js/assets/lang/mel.js b/vendor/assets/javascripts/highlightjs/languages/mel.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/mel.js
rename to vendor/assets/javascripts/highlightjs/languages/mel.min.js
diff --git a/lib/highlight_js/assets/lang/mercury.js b/vendor/assets/javascripts/highlightjs/languages/mercury.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/mercury.js
rename to vendor/assets/javascripts/highlightjs/languages/mercury.min.js
diff --git a/lib/highlight_js/assets/lang/mipsasm.js b/vendor/assets/javascripts/highlightjs/languages/mipsasm.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/mipsasm.js
rename to vendor/assets/javascripts/highlightjs/languages/mipsasm.min.js
diff --git a/lib/highlight_js/assets/lang/mizar.js b/vendor/assets/javascripts/highlightjs/languages/mizar.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/mizar.js
rename to vendor/assets/javascripts/highlightjs/languages/mizar.min.js
diff --git a/lib/highlight_js/assets/lang/mojolicious.js b/vendor/assets/javascripts/highlightjs/languages/mojolicious.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/mojolicious.js
rename to vendor/assets/javascripts/highlightjs/languages/mojolicious.min.js
diff --git a/lib/highlight_js/assets/lang/monkey.js b/vendor/assets/javascripts/highlightjs/languages/monkey.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/monkey.js
rename to vendor/assets/javascripts/highlightjs/languages/monkey.min.js
diff --git a/lib/highlight_js/assets/lang/moonscript.js b/vendor/assets/javascripts/highlightjs/languages/moonscript.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/moonscript.js
rename to vendor/assets/javascripts/highlightjs/languages/moonscript.min.js
diff --git a/lib/highlight_js/assets/lang/n1ql.js b/vendor/assets/javascripts/highlightjs/languages/n1ql.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/n1ql.js
rename to vendor/assets/javascripts/highlightjs/languages/n1ql.min.js
diff --git a/lib/highlight_js/assets/lang/nginx.js b/vendor/assets/javascripts/highlightjs/languages/nginx.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/nginx.js
rename to vendor/assets/javascripts/highlightjs/languages/nginx.min.js
diff --git a/lib/highlight_js/assets/lang/nimrod.js b/vendor/assets/javascripts/highlightjs/languages/nimrod.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/nimrod.js
rename to vendor/assets/javascripts/highlightjs/languages/nimrod.min.js
diff --git a/lib/highlight_js/assets/lang/nix.js b/vendor/assets/javascripts/highlightjs/languages/nix.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/nix.js
rename to vendor/assets/javascripts/highlightjs/languages/nix.min.js
diff --git a/lib/highlight_js/assets/lang/nsis.js b/vendor/assets/javascripts/highlightjs/languages/nsis.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/nsis.js
rename to vendor/assets/javascripts/highlightjs/languages/nsis.min.js
diff --git a/lib/highlight_js/assets/lang/objectivec.js b/vendor/assets/javascripts/highlightjs/languages/objectivec.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/objectivec.js
rename to vendor/assets/javascripts/highlightjs/languages/objectivec.min.js
diff --git a/lib/highlight_js/assets/lang/ocaml.js b/vendor/assets/javascripts/highlightjs/languages/ocaml.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/ocaml.js
rename to vendor/assets/javascripts/highlightjs/languages/ocaml.min.js
diff --git a/lib/highlight_js/assets/lang/openscad.js b/vendor/assets/javascripts/highlightjs/languages/openscad.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/openscad.js
rename to vendor/assets/javascripts/highlightjs/languages/openscad.min.js
diff --git a/lib/highlight_js/assets/lang/oxygene.js b/vendor/assets/javascripts/highlightjs/languages/oxygene.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/oxygene.js
rename to vendor/assets/javascripts/highlightjs/languages/oxygene.min.js
diff --git a/lib/highlight_js/assets/lang/parser3.js b/vendor/assets/javascripts/highlightjs/languages/parser3.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/parser3.js
rename to vendor/assets/javascripts/highlightjs/languages/parser3.min.js
diff --git a/lib/highlight_js/assets/lang/perl.js b/vendor/assets/javascripts/highlightjs/languages/perl.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/perl.js
rename to vendor/assets/javascripts/highlightjs/languages/perl.min.js
diff --git a/lib/highlight_js/assets/lang/pf.js b/vendor/assets/javascripts/highlightjs/languages/pf.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/pf.js
rename to vendor/assets/javascripts/highlightjs/languages/pf.min.js
diff --git a/lib/highlight_js/assets/lang/pgsql.js b/vendor/assets/javascripts/highlightjs/languages/pgsql.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/pgsql.js
rename to vendor/assets/javascripts/highlightjs/languages/pgsql.min.js
diff --git a/lib/highlight_js/assets/lang/php.js b/vendor/assets/javascripts/highlightjs/languages/php.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/php.js
rename to vendor/assets/javascripts/highlightjs/languages/php.min.js
diff --git a/lib/highlight_js/assets/lang/plaintext.js b/vendor/assets/javascripts/highlightjs/languages/plaintext.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/plaintext.js
rename to vendor/assets/javascripts/highlightjs/languages/plaintext.min.js
diff --git a/lib/highlight_js/assets/lang/pony.js b/vendor/assets/javascripts/highlightjs/languages/pony.min.js
similarity index 70%
rename from lib/highlight_js/assets/lang/pony.js
rename to vendor/assets/javascripts/highlightjs/languages/pony.min.js
index 05ee0958e8..1dc12e97a1 100644
--- a/lib/highlight_js/assets/lang/pony.js
+++ b/vendor/assets/javascripts/highlightjs/languages/pony.min.js
@@ -1 +1 @@
-hljs.registerLanguage("pony",function(e){var r={keyword:"actor addressof and as be break class compile_error compile_intrinsicconsume continue delegate digestof do else elseif embed end errorfor fun if ifdef in interface is isnt lambda let match new not objector primitive recover repeat return struct then trait try type until use var where while with xor",meta:"iso val tag trn box ref",literal:"this false true"},t={cN:"string",b:'"""',e:'"""',r:10},c={cN:"string",b:'"',e:'"',c:[e.BE]},i={cN:"string",b:"'",e:"'",c:[e.BE],r:0},n={cN:"type",b:"\\b_?[A-Z][\\w]*",r:0},s={b:e.IR+"'",r:0},a={cN:"class",bK:"class actor",e:"$",c:[e.TM,e.CLCM]},o={cN:"function",bK:"new fun",e:"=>",c:[e.TM,{b:/\(/,e:/\)/,c:[n,s,e.CNM,e.CBCM]},{b:/:/,eW:!0,c:[n]},e.CLCM]};return{k:r,c:[a,o,n,t,c,i,s,e.CNM,e.CLCM,e.CBCM]}});
\ No newline at end of file
+hljs.registerLanguage("pony",function(e){var r={keyword:"actor addressof and as be break class compile_error compile_intrinsicconsume continue delegate digestof do else elseif embed end errorfor fun if ifdef in interface is isnt lambda let match new not objector primitive recover repeat return struct then trait try type until use var where while with xor",meta:"iso val tag trn box ref",literal:"this false true"},t={cN:"string",b:'"""',e:'"""',r:10},c={cN:"string",b:'"',e:'"',c:[e.BE]},i={cN:"string",b:"'",e:"'",c:[e.BE],r:0},n={cN:"type",b:"\\b_?[A-Z][\\w]*",r:0},s={b:e.IR+"'",r:0},a={cN:"class",bK:"class actor object",e:"$",c:[e.TM,e.CLCM]},o={cN:"function",bK:"new fun",e:"=>",c:[e.TM,{b:/\(/,e:/\)/,c:[n,s,e.CNM,e.CBCM]},{b:/:/,eW:!0,c:[n]},e.CLCM]};return{k:r,c:[a,o,n,t,c,i,s,e.CNM,e.CLCM,e.CBCM]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/powershell.js b/vendor/assets/javascripts/highlightjs/languages/powershell.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/powershell.js
rename to vendor/assets/javascripts/highlightjs/languages/powershell.min.js
diff --git a/lib/highlight_js/assets/lang/processing.js b/vendor/assets/javascripts/highlightjs/languages/processing.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/processing.js
rename to vendor/assets/javascripts/highlightjs/languages/processing.min.js
diff --git a/lib/highlight_js/assets/lang/profile.js b/vendor/assets/javascripts/highlightjs/languages/profile.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/profile.js
rename to vendor/assets/javascripts/highlightjs/languages/profile.min.js
diff --git a/lib/highlight_js/assets/lang/prolog.js b/vendor/assets/javascripts/highlightjs/languages/prolog.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/prolog.js
rename to vendor/assets/javascripts/highlightjs/languages/prolog.min.js
diff --git a/lib/highlight_js/assets/lang/properties.js b/vendor/assets/javascripts/highlightjs/languages/properties.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/properties.js
rename to vendor/assets/javascripts/highlightjs/languages/properties.min.js
diff --git a/lib/highlight_js/assets/lang/protobuf.js b/vendor/assets/javascripts/highlightjs/languages/protobuf.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/protobuf.js
rename to vendor/assets/javascripts/highlightjs/languages/protobuf.min.js
diff --git a/lib/highlight_js/assets/lang/puppet.js b/vendor/assets/javascripts/highlightjs/languages/puppet.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/puppet.js
rename to vendor/assets/javascripts/highlightjs/languages/puppet.min.js
diff --git a/lib/highlight_js/assets/lang/purebasic.js b/vendor/assets/javascripts/highlightjs/languages/purebasic.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/purebasic.js
rename to vendor/assets/javascripts/highlightjs/languages/purebasic.min.js
diff --git a/lib/highlight_js/assets/lang/python.js b/vendor/assets/javascripts/highlightjs/languages/python.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/python.js
rename to vendor/assets/javascripts/highlightjs/languages/python.min.js
diff --git a/lib/highlight_js/assets/lang/q.js b/vendor/assets/javascripts/highlightjs/languages/q.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/q.js
rename to vendor/assets/javascripts/highlightjs/languages/q.min.js
diff --git a/lib/highlight_js/assets/lang/qml.js b/vendor/assets/javascripts/highlightjs/languages/qml.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/qml.js
rename to vendor/assets/javascripts/highlightjs/languages/qml.min.js
diff --git a/lib/highlight_js/assets/lang/r.js b/vendor/assets/javascripts/highlightjs/languages/r.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/r.js
rename to vendor/assets/javascripts/highlightjs/languages/r.min.js
diff --git a/lib/highlight_js/assets/lang/reasonml.js b/vendor/assets/javascripts/highlightjs/languages/reasonml.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/reasonml.js
rename to vendor/assets/javascripts/highlightjs/languages/reasonml.min.js
diff --git a/lib/highlight_js/assets/lang/rib.js b/vendor/assets/javascripts/highlightjs/languages/rib.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/rib.js
rename to vendor/assets/javascripts/highlightjs/languages/rib.min.js
diff --git a/lib/highlight_js/assets/lang/roboconf.js b/vendor/assets/javascripts/highlightjs/languages/roboconf.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/roboconf.js
rename to vendor/assets/javascripts/highlightjs/languages/roboconf.min.js
diff --git a/lib/highlight_js/assets/lang/routeros.js b/vendor/assets/javascripts/highlightjs/languages/routeros.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/routeros.js
rename to vendor/assets/javascripts/highlightjs/languages/routeros.min.js
diff --git a/lib/highlight_js/assets/lang/rsl.js b/vendor/assets/javascripts/highlightjs/languages/rsl.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/rsl.js
rename to vendor/assets/javascripts/highlightjs/languages/rsl.min.js
diff --git a/lib/highlight_js/assets/lang/ruby.js b/vendor/assets/javascripts/highlightjs/languages/ruby.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/ruby.js
rename to vendor/assets/javascripts/highlightjs/languages/ruby.min.js
diff --git a/lib/highlight_js/assets/lang/ruleslanguage.js b/vendor/assets/javascripts/highlightjs/languages/ruleslanguage.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/ruleslanguage.js
rename to vendor/assets/javascripts/highlightjs/languages/ruleslanguage.min.js
diff --git a/lib/highlight_js/assets/lang/rust.js b/vendor/assets/javascripts/highlightjs/languages/rust.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/rust.js
rename to vendor/assets/javascripts/highlightjs/languages/rust.min.js
diff --git a/lib/highlight_js/assets/lang/sas.js b/vendor/assets/javascripts/highlightjs/languages/sas.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/sas.js
rename to vendor/assets/javascripts/highlightjs/languages/sas.min.js
diff --git a/lib/highlight_js/assets/lang/scala.js b/vendor/assets/javascripts/highlightjs/languages/scala.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/scala.js
rename to vendor/assets/javascripts/highlightjs/languages/scala.min.js
diff --git a/lib/highlight_js/assets/lang/scheme.js b/vendor/assets/javascripts/highlightjs/languages/scheme.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/scheme.js
rename to vendor/assets/javascripts/highlightjs/languages/scheme.min.js
diff --git a/lib/highlight_js/assets/lang/scilab.js b/vendor/assets/javascripts/highlightjs/languages/scilab.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/scilab.js
rename to vendor/assets/javascripts/highlightjs/languages/scilab.min.js
diff --git a/lib/highlight_js/assets/lang/scss.js b/vendor/assets/javascripts/highlightjs/languages/scss.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/scss.js
rename to vendor/assets/javascripts/highlightjs/languages/scss.min.js
diff --git a/lib/highlight_js/assets/lang/shell.js b/vendor/assets/javascripts/highlightjs/languages/shell.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/shell.js
rename to vendor/assets/javascripts/highlightjs/languages/shell.min.js
diff --git a/lib/highlight_js/assets/lang/smali.js b/vendor/assets/javascripts/highlightjs/languages/smali.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/smali.js
rename to vendor/assets/javascripts/highlightjs/languages/smali.min.js
diff --git a/lib/highlight_js/assets/lang/smalltalk.js b/vendor/assets/javascripts/highlightjs/languages/smalltalk.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/smalltalk.js
rename to vendor/assets/javascripts/highlightjs/languages/smalltalk.min.js
diff --git a/lib/highlight_js/assets/lang/sml.js b/vendor/assets/javascripts/highlightjs/languages/sml.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/sml.js
rename to vendor/assets/javascripts/highlightjs/languages/sml.min.js
diff --git a/lib/highlight_js/assets/lang/sqf.js b/vendor/assets/javascripts/highlightjs/languages/sqf.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/sqf.js
rename to vendor/assets/javascripts/highlightjs/languages/sqf.min.js
diff --git a/lib/highlight_js/assets/lang/sql.js b/vendor/assets/javascripts/highlightjs/languages/sql.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/sql.js
rename to vendor/assets/javascripts/highlightjs/languages/sql.min.js
diff --git a/lib/highlight_js/assets/lang/stan.js b/vendor/assets/javascripts/highlightjs/languages/stan.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/stan.js
rename to vendor/assets/javascripts/highlightjs/languages/stan.min.js
diff --git a/lib/highlight_js/assets/lang/stata.js b/vendor/assets/javascripts/highlightjs/languages/stata.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/stata.js
rename to vendor/assets/javascripts/highlightjs/languages/stata.min.js
diff --git a/lib/highlight_js/assets/lang/step21.js b/vendor/assets/javascripts/highlightjs/languages/step21.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/step21.js
rename to vendor/assets/javascripts/highlightjs/languages/step21.min.js
diff --git a/lib/highlight_js/assets/lang/stylus.js b/vendor/assets/javascripts/highlightjs/languages/stylus.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/stylus.js
rename to vendor/assets/javascripts/highlightjs/languages/stylus.min.js
diff --git a/lib/highlight_js/assets/lang/subunit.js b/vendor/assets/javascripts/highlightjs/languages/subunit.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/subunit.js
rename to vendor/assets/javascripts/highlightjs/languages/subunit.min.js
diff --git a/lib/highlight_js/assets/lang/swift.js b/vendor/assets/javascripts/highlightjs/languages/swift.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/swift.js
rename to vendor/assets/javascripts/highlightjs/languages/swift.min.js
diff --git a/lib/highlight_js/assets/lang/taggerscript.js b/vendor/assets/javascripts/highlightjs/languages/taggerscript.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/taggerscript.js
rename to vendor/assets/javascripts/highlightjs/languages/taggerscript.min.js
diff --git a/lib/highlight_js/assets/lang/tap.js b/vendor/assets/javascripts/highlightjs/languages/tap.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/tap.js
rename to vendor/assets/javascripts/highlightjs/languages/tap.min.js
diff --git a/lib/highlight_js/assets/lang/tcl.js b/vendor/assets/javascripts/highlightjs/languages/tcl.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/tcl.js
rename to vendor/assets/javascripts/highlightjs/languages/tcl.min.js
diff --git a/lib/highlight_js/assets/lang/tex.js b/vendor/assets/javascripts/highlightjs/languages/tex.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/tex.js
rename to vendor/assets/javascripts/highlightjs/languages/tex.min.js
diff --git a/lib/highlight_js/assets/lang/thrift.js b/vendor/assets/javascripts/highlightjs/languages/thrift.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/thrift.js
rename to vendor/assets/javascripts/highlightjs/languages/thrift.min.js
diff --git a/lib/highlight_js/assets/lang/tp.js b/vendor/assets/javascripts/highlightjs/languages/tp.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/tp.js
rename to vendor/assets/javascripts/highlightjs/languages/tp.min.js
diff --git a/lib/highlight_js/assets/lang/twig.js b/vendor/assets/javascripts/highlightjs/languages/twig.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/twig.js
rename to vendor/assets/javascripts/highlightjs/languages/twig.min.js
diff --git a/lib/highlight_js/assets/lang/typescript.js b/vendor/assets/javascripts/highlightjs/languages/typescript.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/typescript.js
rename to vendor/assets/javascripts/highlightjs/languages/typescript.min.js
diff --git a/lib/highlight_js/assets/lang/vala.js b/vendor/assets/javascripts/highlightjs/languages/vala.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/vala.js
rename to vendor/assets/javascripts/highlightjs/languages/vala.min.js
diff --git a/lib/highlight_js/assets/lang/vbnet.js b/vendor/assets/javascripts/highlightjs/languages/vbnet.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/vbnet.js
rename to vendor/assets/javascripts/highlightjs/languages/vbnet.min.js
diff --git a/lib/highlight_js/assets/lang/vbscript-html.js b/vendor/assets/javascripts/highlightjs/languages/vbscript-html.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/vbscript-html.js
rename to vendor/assets/javascripts/highlightjs/languages/vbscript-html.min.js
diff --git a/lib/highlight_js/assets/lang/vbscript.js b/vendor/assets/javascripts/highlightjs/languages/vbscript.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/vbscript.js
rename to vendor/assets/javascripts/highlightjs/languages/vbscript.min.js
diff --git a/lib/highlight_js/assets/lang/verilog.js b/vendor/assets/javascripts/highlightjs/languages/verilog.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/verilog.js
rename to vendor/assets/javascripts/highlightjs/languages/verilog.min.js
diff --git a/lib/highlight_js/assets/lang/vhdl.js b/vendor/assets/javascripts/highlightjs/languages/vhdl.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/vhdl.js
rename to vendor/assets/javascripts/highlightjs/languages/vhdl.min.js
diff --git a/lib/highlight_js/assets/lang/vim.js b/vendor/assets/javascripts/highlightjs/languages/vim.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/vim.js
rename to vendor/assets/javascripts/highlightjs/languages/vim.min.js
diff --git a/lib/highlight_js/assets/lang/x86asm.js b/vendor/assets/javascripts/highlightjs/languages/x86asm.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/x86asm.js
rename to vendor/assets/javascripts/highlightjs/languages/x86asm.min.js
diff --git a/lib/highlight_js/assets/lang/xl.js b/vendor/assets/javascripts/highlightjs/languages/xl.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/xl.js
rename to vendor/assets/javascripts/highlightjs/languages/xl.min.js
diff --git a/lib/highlight_js/assets/lang/xml.js b/vendor/assets/javascripts/highlightjs/languages/xml.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/xml.js
rename to vendor/assets/javascripts/highlightjs/languages/xml.min.js
diff --git a/vendor/assets/javascripts/highlightjs/languages/xquery.min.js b/vendor/assets/javascripts/highlightjs/languages/xquery.min.js
new file mode 100644
index 0000000000..59e4a3e2cc
--- /dev/null
+++ b/vendor/assets/javascripts/highlightjs/languages/xquery.min.js
@@ -0,0 +1 @@
+hljs.registerLanguage("xquery",function(e){var t="module schema namespace boundary-space preserve no-preserve strip default collation base-uri ordering context decimal-format decimal-separator copy-namespaces empty-sequence except exponent-separator external grouping-separator inherit no-inherit lax minus-sign per-mille percent schema-attribute schema-element strict unordered zero-digit declare import option function validate variable for at in let where order group by return if then else tumbling sliding window start when only end previous next stable ascending descending allowing empty greatest least some every satisfies switch case typeswitch try catch and or to union intersect instance of treat as castable cast map array delete insert into replace value rename copy modify update",a="item document-node node attribute document element comment namespace namespace-node processing-instruction text construction xs:anyAtomicType xs:untypedAtomic xs:duration xs:time xs:decimal xs:float xs:double xs:gYearMonth xs:gYear xs:gMonthDay xs:gMonth xs:gDay xs:boolean xs:base64Binary xs:hexBinary xs:anyURI xs:QName xs:NOTATION xs:dateTime xs:dateTimeStamp xs:date xs:string xs:normalizedString xs:token xs:language xs:NMTOKEN xs:Name xs:NCName xs:ID xs:IDREF xs:ENTITY xs:integer xs:nonPositiveInteger xs:negativeInteger xs:long xs:int xs:short xs:byte xs:nonNegativeInteger xs:unisignedLong xs:unsignedInt xs:unsignedShort xs:unsignedByte xs:positiveInteger xs:yearMonthDuration xs:dayTimeDuration",n="eq ne lt le gt ge is self:: child:: descendant:: descendant-or-self:: attribute:: following:: following-sibling:: parent:: ancestor:: ancestor-or-self:: preceding:: preceding-sibling:: NaN",r={cN:"built_in",v:[{b:/\barray\:/,e:/(?:append|filter|flatten|fold\-(?:left|right)|for-each(?:\-pair)?|get|head|insert\-before|join|put|remove|reverse|size|sort|subarray|tail)\b/},{b:/\bmap\:/,e:/(?:contains|entry|find|for\-each|get|keys|merge|put|remove|size)\b/},{b:/\bmath\:/,e:/(?:a(?:cos|sin|tan[2]?)|cos|exp(?:10)?|log(?:10)?|pi|pow|sin|sqrt|tan)\b/},{b:/\bop\:/,e:/\(/,eE:!0},{b:/\bfn\:/,e:/\(/,eE:!0},{b:/[^<\/\$\:'"-]\b(?:abs|accumulator\-(?:after|before)|adjust\-(?:date(?:Time)?|time)\-to\-timezone|analyze\-string|apply|available\-(?:environment\-variables|system\-properties)|avg|base\-uri|boolean|ceiling|codepoints?\-(?:equal|to\-string)|collation\-key|collection|compare|concat|contains(?:\-token)?|copy\-of|count|current(?:\-)?(?:date(?:Time)?|time|group(?:ing\-key)?|output\-uri|merge\-(?:group|key))?data|dateTime|days?\-from\-(?:date(?:Time)?|duration)|deep\-equal|default\-(?:collation|language)|distinct\-values|document(?:\-uri)?|doc(?:\-available)?|element\-(?:available|with\-id)|empty|encode\-for\-uri|ends\-with|environment\-variable|error|escape\-html\-uri|exactly\-one|exists|false|filter|floor|fold\-(?:left|right)|for\-each(?:\-pair)?|format\-(?:date(?:Time)?|time|integer|number)|function\-(?:arity|available|lookup|name)|generate\-id|has\-children|head|hours\-from\-(?:dateTime|duration|time)|id(?:ref)?|implicit\-timezone|in\-scope\-prefixes|index\-of|innermost|insert\-before|iri\-to\-uri|json\-(?:doc|to\-xml)|key|lang|last|load\-xquery\-module|local\-name(?:\-from\-QName)?|(?:lower|upper)\-case|matches|max|minutes\-from\-(?:dateTime|duration|time)|min|months?\-from\-(?:date(?:Time)?|duration)|name(?:space\-uri\-?(?:for\-prefix|from\-QName)?)?|nilled|node\-name|normalize\-(?:space|unicode)|not|number|one\-or\-more|outermost|parse\-(?:ietf\-date|json)|path|position|(?:prefix\-from\-)?QName|random\-number\-generator|regex\-group|remove|replace|resolve\-(?:QName|uri)|reverse|root|round(?:\-half\-to\-even)?|seconds\-from\-(?:dateTime|duration|time)|snapshot|sort|starts\-with|static\-base\-uri|stream\-available|string\-?(?:join|length|to\-codepoints)?|subsequence|substring\-?(?:after|before)?|sum|system\-property|tail|timezone\-from\-(?:date(?:Time)?|time)|tokenize|trace|trans(?:form|late)|true|type\-available|unordered|unparsed\-(?:entity|text)?\-?(?:public\-id|uri|available|lines)?|uri\-collection|xml\-to\-json|years?\-from\-(?:date(?:Time)?|duration)|zero\-or\-one)\b/},{b:/\blocal\:/,e:/\(/,eE:!0},{b:/\bzip\:/,e:/(?:zip\-file|(?:xml|html|text|binary)\-entry| (?:update\-)?entries)\b/},{b:/\b(?:util|db|functx|app|xdmp|xmldb)\:/,e:/\(/,eE:!0}]},i={cN:"title",b:/\bxquery version "[13]\.[01]"\s?(?:encoding ".+")?/,e:/;/},o={cN:"variable",b:/[\$][\w-:]+/},s={cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},l={cN:"string",v:[{b:/"/,e:/"/,c:[{b:/""/,r:0}]},{b:/'/,e:/'/,c:[{b:/''/,r:0}]}]},m={cN:"meta",b:/%[\w-:]+/},c={cN:"comment",b:"\\(:",e:":\\)",r:10,c:[{cN:"doctag",b:"@\\w+"}]},d={bK:"element attribute comment document processing-instruction",e:"{",eE:!0},u={b:/<([\w\._:\-]+)((\s*.*)=('|").*('|"))?>/,e:/(\/[\w\._:\-]+>)/,sL:"xml",c:[{b:"{",e:"}",sL:"xquery"},"self"]},p=[o,r,l,s,c,m,i,d,u];return{aliases:["xpath","xq"],cI:!1,l:/[a-zA-Z\$][a-zA-Z0-9_:\-]*/,i:/(proc)|(abstract)|(extends)|(until)|(#)/,k:{keyword:t,type:a,literal:n},c:p}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/yaml.js b/vendor/assets/javascripts/highlightjs/languages/yaml.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/yaml.js
rename to vendor/assets/javascripts/highlightjs/languages/yaml.min.js
diff --git a/lib/highlight_js/assets/lang/zephir.js b/vendor/assets/javascripts/highlightjs/languages/zephir.min.js
similarity index 100%
rename from lib/highlight_js/assets/lang/zephir.js
rename to vendor/assets/javascripts/highlightjs/languages/zephir.min.js
diff --git a/vendor/assets/javascripts/i18n-patches.js b/vendor/assets/javascripts/i18n-patches.js
index b4522357e4..d7646901f9 100644
--- a/vendor/assets/javascripts/i18n-patches.js
+++ b/vendor/assets/javascripts/i18n-patches.js
@@ -13,7 +13,7 @@
       return oldI18ntoHumanSize.apply(this, [number, options]);
     };
 
-    if (Ember.EXTEND_PROTOTYPES) {
+    if (Ember.ENV.EXTEND_PROTOTYPES) {
       String.prototype.i18n = function(options) {
         return I18n.t(String(this), options);
       };
diff --git a/vendor/assets/javascripts/modernizr.custom.00874.js b/vendor/assets/javascripts/modernizr.custom.00874.js
deleted file mode 100644
index 90a7f93c50..0000000000
--- a/vendor/assets/javascripts/modernizr.custom.00874.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/* Modernizr 2.7.0 (Custom Build) | MIT & BSD
- * Build: http://modernizr.com/download/#-touch-shiv-mq-cssclasses-prefixed-teststyles-testprop-testallprops-prefixes-domprefixes-load
- */
-;window.Modernizr=function(a,b,c){function A(a){j.cssText=a}function B(a,b){return A(m.join(a+";")+(b||""))}function C(a,b){return typeof a===b}function D(a,b){return!!~(""+a).indexOf(b)}function E(a,b){for(var d in a){var e=a[d];if(!D(e,"-")&&j[e]!==c)return b=="pfx"?e:!0}return!1}function F(a,b,d){for(var e in a){var f=b[a[e]];if(f!==c)return d===!1?a[e]:C(f,"function")?f.bind(d||b):f}return!1}function G(a,b,c){var d=a.charAt(0).toUpperCase()+a.slice(1),e=(a+" "+o.join(d+" ")+d).split(" ");return C(b,"string")||C(b,"undefined")?E(e,b):(e=(a+" "+p.join(d+" ")+d).split(" "),F(e,b,c))}var d="2.7.0",e={},f=!0,g=b.documentElement,h="modernizr",i=b.createElement(h),j=i.style,k,l={}.toString,m=" -webkit- -moz- -o- -ms- ".split(" "),n="Webkit Moz O ms",o=n.split(" "),p=n.toLowerCase().split(" "),q={},r={},s={},t=[],u=t.slice,v,w=function(a,c,d,e){var f,i,j,k,l=b.createElement("div"),m=b.body,n=m||b.createElement("body");if(parseInt(d,10))while(d--)j=b.createElement("div"),j.id=e?e[d]:h+(d+1),l.appendChild(j);return f=["&#173;",'<style id="s',h,'">',a,"</style>"].join(""),l.id=h,(m?l:n).innerHTML+=f,n.appendChild(l),m||(n.style.background="",n.style.overflow="hidden",k=g.style.overflow,g.style.overflow="hidden",g.appendChild(n)),i=c(l,a),m?l.parentNode.removeChild(l):(n.parentNode.removeChild(n),g.style.overflow=k),!!i},x=function(b){var c=a.matchMedia||a.msMatchMedia;if(c)return c(b).matches;var d;return w("@media "+b+" { #"+h+" { position: absolute; } }",function(b){d=(a.getComputedStyle?getComputedStyle(b,null):b.currentStyle)["position"]=="absolute"}),d},y={}.hasOwnProperty,z;!C(y,"undefined")&&!C(y.call,"undefined")?z=function(a,b){return y.call(a,b)}:z=function(a,b){return b in a&&C(a.constructor.prototype[b],"undefined")},Function.prototype.bind||(Function.prototype.bind=function(b){var c=this;if(typeof c!="function")throw new TypeError;var d=u.call(arguments,1),e=function(){if(this instanceof e){var a=function(){};a.prototype=c.prototype;var f=new a,g=c.apply(f,d.concat(u.call(arguments)));return Object(g)===g?g:f}return c.apply(b,d.concat(u.call(arguments)))};return e}),q.touch=function(){var c;return"ontouchstart"in a||a.DocumentTouch&&b instanceof DocumentTouch?c=!0:w(["@media (",m.join("touch-enabled),("),h,")","{#modernizr{top:9px;position:absolute}}"].join(""),function(a){c=a.offsetTop===9}),c};for(var H in q)z(q,H)&&(v=H.toLowerCase(),e[v]=q[H](),t.push((e[v]?"":"no-")+v));return e.addTest=function(a,b){if(typeof a=="object")for(var d in a)z(a,d)&&e.addTest(d,a[d]);else{a=a.toLowerCase();if(e[a]!==c)return e;b=typeof b=="function"?b():b,typeof f!="undefined"&&f&&(g.className+=" "+(b?"":"no-")+a),e[a]=b}return e},A(""),i=k=null,function(a,b){function l(a,b){var c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x<style>"+b+"</style>",d.insertBefore(c.lastChild,d.firstChild)}function m(){var a=s.elements;return typeof a=="string"?a.split(" "):a}function n(a){var b=j[a[h]];return b||(b={},i++,a[h]=i,j[i]=b),b}function o(a,c,d){c||(c=b);if(k)return c.createElement(a);d||(d=n(c));var g;return d.cache[a]?g=d.cache[a].cloneNode():f.test(a)?g=(d.cache[a]=d.createElem(a)).cloneNode():g=d.createElem(a),g.canHaveChildren&&!e.test(a)&&!g.tagUrn?d.frag.appendChild(g):g}function p(a,c){a||(a=b);if(k)return a.createDocumentFragment();c=c||n(a);var d=c.frag.cloneNode(),e=0,f=m(),g=f.length;for(;e<g;e++)d.createElement(f[e]);return d}function q(a,b){b.cache||(b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag()),a.createElement=function(c){return s.shivMethods?o(c,a,b):b.createElem(c)},a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+m().join().replace(/[\w\-]+/g,function(a){return b.createElem(a),b.frag.createElement(a),'c("'+a+'")'})+");return n}")(s,b.frag)}function r(a){a||(a=b);var c=n(a);return s.shivCSS&&!g&&!c.hasCSS&&(c.hasCSS=!!l(a,"article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}mark{background:#FF0;color:#000}template{display:none}")),k||q(a,c),a}var c="3.7.0",d=a.html5||{},e=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,f=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,g,h="_html5shiv",i=0,j={},k;(function(){try{var a=b.createElement("a");a.innerHTML="<xyz></xyz>",g="hidden"in a,k=a.childNodes.length==1||function(){b.createElement("a");var a=b.createDocumentFragment();return typeof a.cloneNode=="undefined"||typeof a.createDocumentFragment=="undefined"||typeof a.createElement=="undefined"}()}catch(c){g=!0,k=!0}})();var s={elements:d.elements||"abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output progress section summary template time video",version:c,shivCSS:d.shivCSS!==!1,supportsUnknownElements:k,shivMethods:d.shivMethods!==!1,type:"default",shivDocument:r,createElement:o,createDocumentFragment:p};a.html5=s,r(b)}(this,b),e._version=d,e._prefixes=m,e._domPrefixes=p,e._cssomPrefixes=o,e.mq=x,e.testProp=function(a){return E([a])},e.testAllProps=G,e.testStyles=w,e.prefixed=function(a,b,c){return b?G(a,b,c):G(a,"pfx")},g.className=g.className.replace(/(^|\s)no-js(\s|$)/,"$1$2")+(f?" js "+t.join(" "):""),e}(this,this.document),function(a,b,c){function d(a){return"[object Function]"==o.call(a)}function e(a){return"string"==typeof a}function f(){}function g(a){return!a||"loaded"==a||"complete"==a||"uninitialized"==a}function h(){var a=p.shift();q=1,a?a.t?m(function(){("c"==a.t?B.injectCss:B.injectJs)(a.s,0,a.a,a.x,a.e,1)},0):(a(),h()):q=0}function i(a,c,d,e,f,i,j){function k(b){if(!o&&g(l.readyState)&&(u.r=o=1,!q&&h(),l.onload=l.onreadystatechange=null,b)){"img"!=a&&m(function(){t.removeChild(l)},50);for(var d in y[c])y[c].hasOwnProperty(d)&&y[c][d].onload()}}var j=j||B.errorTimeout,l=b.createElement(a),o=0,r=0,u={t:d,s:c,e:f,a:i,x:j};1===y[c]&&(r=1,y[c]=[]),"object"==a?l.data=c:(l.src=c,l.type=a),l.width=l.height="0",l.onerror=l.onload=l.onreadystatechange=function(){k.call(this,r)},p.splice(e,0,u),"img"!=a&&(r||2===y[c]?(t.insertBefore(l,s?null:n),m(k,j)):y[c].push(l))}function j(a,b,c,d,f){return q=0,b=b||"j",e(a)?i("c"==b?v:u,a,b,this.i++,c,d,f):(p.splice(this.i++,0,a),1==p.length&&h()),this}function k(){var a=B;return a.loader={load:j,i:0},a}var l=b.documentElement,m=a.setTimeout,n=b.getElementsByTagName("script")[0],o={}.toString,p=[],q=0,r="MozAppearance"in l.style,s=r&&!!b.createRange().compareNode,t=s?l:n.parentNode,l=a.opera&&"[object Opera]"==o.call(a.opera),l=!!b.attachEvent&&!l,u=r?"object":l?"script":"img",v=l?"script":u,w=Array.isArray||function(a){return"[object Array]"==o.call(a)},x=[],y={},z={timeout:function(a,b){return b.length&&(a.timeout=b[0]),a}},A,B;B=function(a){function b(a){var a=a.split("!"),b=x.length,c=a.pop(),d=a.length,c={url:c,origUrl:c,prefixes:a},e,f,g;for(f=0;f<d;f++)g=a[f].split("="),(e=z[g.shift()])&&(c=e(c,g));for(f=0;f<b;f++)c=x[f](c);return c}function g(a,e,f,g,h){var i=b(a),j=i.autoCallback;i.url.split(".").pop().split("?").shift(),i.bypass||(e&&(e=d(e)?e:e[a]||e[g]||e[a.split("/").pop().split("?")[0]]),i.instead?i.instead(a,e,f,g,h):(y[i.url]?i.noexec=!0:y[i.url]=1,f.load(i.url,i.forceCSS||!i.forceJS&&"css"==i.url.split(".").pop().split("?").shift()?"c":c,i.noexec,i.attrs,i.timeout),(d(e)||d(j))&&f.load(function(){k(),e&&e(i.origUrl,h,g),j&&j(i.origUrl,h,g),y[i.url]=2})))}function h(a,b){function c(a,c){if(a){if(e(a))c||(j=function(){var a=[].slice.call(arguments);k.apply(this,a),l()}),g(a,j,b,0,h);else if(Object(a)===a)for(n in m=function(){var b=0,c;for(c in a)a.hasOwnProperty(c)&&b++;return b}(),a)a.hasOwnProperty(n)&&(!c&&!--m&&(d(j)?j=function(){var a=[].slice.call(arguments);k.apply(this,a),l()}:j[n]=function(a){return function(){var b=[].slice.call(arguments);a&&a.apply(this,b),l()}}(k[n])),g(a[n],j,b,n,h))}else!c&&l()}var h=!!a.test,i=a.load||a.both,j=a.callback||f,k=j,l=a.complete||f,m,n;c(h?a.yep:a.nope,!!i),i&&c(i)}var i,j,l=this.yepnope.loader;if(e(a))g(a,0,l,0);else if(w(a))for(i=0;i<a.length;i++)j=a[i],e(j)?g(j,0,l,0):w(j)?B(j):Object(j)===j&&h(j,l);else Object(a)===a&&h(a,l)},B.addPrefix=function(a,b){z[a]=b},B.addFilter=function(a){x.push(a)},B.errorTimeout=1e4,null==b.readyState&&b.addEventListener&&(b.readyState="loading",b.addEventListener("DOMContentLoaded",A=function(){b.removeEventListener("DOMContentLoaded",A,0),b.readyState="complete"},0)),a.yepnope=k(),a.yepnope.executeStack=h,a.yepnope.injectJs=function(a,c,d,e,i,j){var k=b.createElement("script"),l,o,e=e||B.errorTimeout;k.src=a;for(o in d)k.setAttribute(o,d[o]);c=j?h:c||f,k.onreadystatechange=k.onload=function(){!l&&g(k.readyState)&&(l=1,c(),k.onload=k.onreadystatechange=null)},m(function(){l||(l=1,c(1))},e),i?k.onload():n.parentNode.insertBefore(k,n)},a.yepnope.injectCss=function(a,c,d,e,g,i){var e=b.createElement("link"),j,c=i?h:c||f;e.href=a,e.rel="stylesheet",e.type="text/css";for(j in d)e.setAttribute(j,d[j]);g||(n.parentNode.insertBefore(e,n),m(c,0))}}(this,document),Modernizr.load=function(){yepnope.apply(window,[].slice.call(arguments,0))};
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index 61fede61d0..bee90942c1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -138,11 +138,6 @@
   resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-0.0.28.tgz#5562519bc7963caca8abf7f128cae3b594d41d06"
   integrity sha1-VWJRm8eWPKyoq/fxKMrjtZTUHQY=
 
-abbrev@1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
-  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
-
 ace-builds@1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/ace-builds/-/ace-builds-1.4.1.tgz#a66e33bcd519918ee99bc54cac5d7399a83c8ff2"
@@ -187,20 +182,6 @@ ajv@^5.2.3, ajv@^5.3.0:
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
-align-text@^0.1.1, align-text@^0.1.3:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
-  integrity sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=
-  dependencies:
-    kind-of "^3.0.2"
-    longest "^1.0.1"
-    repeat-string "^1.5.2"
-
-amdefine@>=0.0.4:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
-  integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
-
 ansi-escapes@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"
@@ -236,19 +217,6 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-aproba@^1.0.3:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
-  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
-
-are-we-there-yet@~1.1.2:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
-  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
-  dependencies:
-    delegates "^1.0.0"
-    readable-stream "^2.0.6"
-
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -291,10 +259,12 @@ async-limiter@~1.0.0:
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
   integrity sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==
 
-async@^1.4.0:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
-  integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
+async@^2.5.0:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
+  integrity sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==
+  dependencies:
+    lodash "^4.17.10"
 
 atob@^2.1.1:
   version "2.1.2"
@@ -413,11 +383,6 @@ callsites@^0.2.0:
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
   integrity sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=
 
-camelcase@^1.0.2:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
-  integrity sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=
-
 capture-exit@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-1.2.0.tgz#1c5fcc489fd0ab00d4f1ac7ae1072e3173fbab6f"
@@ -425,14 +390,6 @@ capture-exit@^1.2.0:
   dependencies:
     rsvp "^3.3.3"
 
-center-align@^0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
-  integrity sha1-qg0yYptu6XIgBBHL1EYckHvCt60=
-  dependencies:
-    align-text "^0.1.3"
-    lazy-cache "^1.0.3"
-
 chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
@@ -481,11 +438,6 @@ chartjs-color@^2.1.0:
     chartjs-color-string "^0.5.0"
     color-convert "^0.5.3"
 
-chownr@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
-  integrity sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==
-
 chrome-launcher@^0.10:
   version "0.10.5"
   resolved "https://registry.yarnpkg.com/chrome-launcher/-/chrome-launcher-0.10.5.tgz#d0aa72c11f1653e6a60dfebea171522447470ef1"
@@ -535,25 +487,11 @@ cli-width@^2.0.0:
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
   integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
 
-cliui@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
-  integrity sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=
-  dependencies:
-    center-align "^0.1.1"
-    right-align "^0.1.1"
-    wordwrap "0.0.2"
-
 co@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
   integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
 
-code-point-at@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
-  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
-
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
@@ -594,6 +532,11 @@ commander@2.12.2:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.2.tgz#0f5946c427ed9ec0d91a46bb9def53e54650e555"
   integrity sha512-BFnaq5ZOGcDN7FlrtBT4xxkgIToalIIxwjxLWVJ8bGTpe1LroqMiqQXdA7ygc7CRvaYS+9zfPGFnJqFSayx+AA==
 
+commander@~2.17.1:
+  version "2.17.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
+  integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
+
 component-emitter@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
@@ -614,11 +557,6 @@ concat-stream@1.6.2, concat-stream@^1.6.0:
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
-console-control-strings@^1.0.0, console-control-strings@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
-
 copy-descriptor@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
@@ -638,7 +576,18 @@ cross-spawn@^5.1.0:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8:
+cross-spawn@^6.0.0:
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
+  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
+  dependencies:
+    nice-try "^1.0.4"
+    path-key "^2.0.1"
+    semver "^5.5.0"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
+
+debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -652,21 +601,11 @@ debug@^3.1.0:
   dependencies:
     ms "^2.1.1"
 
-decamelize@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
-
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
   integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
-deep-extend@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
-  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
-
 deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
@@ -694,21 +633,11 @@ define-property@^2.0.2:
     is-descriptor "^1.0.2"
     isobject "^3.0.1"
 
-delegates@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
-
 detect-file@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
   integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=
 
-detect-libc@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
-  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
-
 diff@^3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
@@ -721,6 +650,13 @@ doctrine@^2.1.0:
   dependencies:
     esutils "^2.0.2"
 
+end-of-stream@^1.1.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
+  integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==
+  dependencies:
+    once "^1.4.0"
+
 ensure-posix-path@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/ensure-posix-path/-/ensure-posix-path-1.0.2.tgz#a65b3e42d0b71cfc585eb774f9943c8d9b91b0c2"
@@ -857,6 +793,24 @@ exec-sh@^0.2.0:
   dependencies:
     merge "^1.2.0"
 
+exec-sh@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.2.tgz#6738de2eb7c8e671d0366aea0b0db8c6f7d7391b"
+  integrity sha512-9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg==
+
+execa@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
+  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
+  dependencies:
+    cross-spawn "^6.0.0"
+    get-stream "^4.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
+
 exists-stat@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/exists-stat/-/exists-stat-1.0.0.tgz#0660e3525a2e89d9e446129440c272edfa24b529"
@@ -1025,44 +979,22 @@ fragment-cache@^0.2.1:
   dependencies:
     map-cache "^0.2.2"
 
-fs-minipass@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
-  integrity sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==
-  dependencies:
-    minipass "^2.2.1"
-
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
-fsevents@^1.2.3:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426"
-  integrity sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==
-  dependencies:
-    nan "^2.9.2"
-    node-pre-gyp "^0.10.0"
-
 functional-red-black-tree@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
   integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
 
-gauge@~2.7.3:
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
-  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
+get-stream@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
+  integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
   dependencies:
-    aproba "^1.0.3"
-    console-control-strings "^1.0.0"
-    has-unicode "^2.0.0"
-    object-assign "^4.1.0"
-    signal-exit "^3.0.0"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-    wide-align "^1.1.0"
+    pump "^3.0.0"
 
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
@@ -1111,16 +1043,16 @@ graceful-fs@^4.1.2:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
   integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
 
-handlebars@4.0.5:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.5.tgz#92c6ed6bb164110c50d4d8d0fbddc70806c6f8e7"
-  integrity sha1-ksbta7FkEQxQ1NjQ+93HCAbG+Oc=
+handlebars@4.0.12:
+  version "4.0.12"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.12.tgz#2c15c8a96d46da5e266700518ba8cb8d919d5bc5"
+  integrity sha512-RhmTekP+FZL+XNhwS1Wf+bTTZpdLougwt5pcgA1tuz6Jcx0fpH/7z0qd71RKnZHBCxIRBHfBOnio4gViPemNzA==
   dependencies:
-    async "^1.4.0"
+    async "^2.5.0"
     optimist "^0.6.1"
-    source-map "^0.4.4"
+    source-map "^0.6.1"
   optionalDependencies:
-    uglify-js "^2.6"
+    uglify-js "^3.1.4"
 
 has-ansi@^2.0.0:
   version "2.0.0"
@@ -1134,11 +1066,6 @@ has-flag@^3.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
   integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
 
-has-unicode@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
-
 has-value@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
@@ -1170,6 +1097,10 @@ has-values@^1.0.0:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
+"highlight.js@https://github.com/highlightjs/highlight.js":
+  version "9.13.1"
+  resolved "https://github.com/highlightjs/highlight.js#1b10552510a1ec13a3d30d46281dc268553ad157"
+
 homedir-polyfill@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz#4c2bbc8a758998feebf5ed68580f76d46768b4bc"
@@ -1189,20 +1120,13 @@ https-proxy-agent@^2.1.0:
     agent-base "^4.1.0"
     debug "^3.1.0"
 
-iconv-lite@^0.4.17, iconv-lite@^0.4.4:
+iconv-lite@^0.4.17:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-ignore-walk@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
-  integrity sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==
-  dependencies:
-    minimatch "^3.0.4"
-
 ignore@^3.3.3:
   version "3.3.10"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
@@ -1226,7 +1150,7 @@ inherits@2, inherits@^2.0.3, inherits@~2.0.3:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
-ini@^1.3.4, ini@~1.3.0:
+ini@^1.3.4:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
   integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
@@ -1331,13 +1255,6 @@ is-extglob@^2.1.0:
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
-is-fullwidth-code-point@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
-  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
-  dependencies:
-    number-is-nan "^1.0.0"
-
 is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
@@ -1374,6 +1291,11 @@ is-resolvable@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
   integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==
 
+is-stream@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
+
 is-windows@^1.0.1, is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
@@ -1513,11 +1435,6 @@ kind-of@^6.0.0, kind-of@^6.0.2:
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
   integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
 
-lazy-cache@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
-  integrity sha1-odePw6UEdMuAhF07O24dpJpEbo4=
-
 levn@^0.3.0, levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
@@ -1546,7 +1463,7 @@ lodash.get@^4.4.2:
   resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
   integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
 
-lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0:
+lodash@^4.17.10, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
   integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
@@ -1556,11 +1473,6 @@ lolex@^2.3.2, lolex@^2.7.5:
   resolved "https://registry.yarnpkg.com/lolex/-/lolex-2.7.5.tgz#113001d56bfc7e02d56e36291cc5c413d1aa0733"
   integrity sha512-l9x0+1offnKKIzYVjyXU2SiwhXDLekRzKyhnbyldPHvC7BvLPVpdNUNR2KeMAiCN2D/kLNttZgQD5WjSxuBx3Q==
 
-longest@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
-  integrity sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=
-
 loose-envify@^1.0.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
@@ -1684,21 +1596,6 @@ minimist@~0.0.1:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
   integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
 
-minipass@^2.2.1, minipass@^2.3.4:
-  version "2.3.5"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"
-  integrity sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==
-  dependencies:
-    safe-buffer "^5.1.2"
-    yallist "^3.0.0"
-
-minizlib@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.1.tgz#6734acc045a46e61d596a43bb9d9cd326e19cc42"
-  integrity sha512-TrfjCjk4jLhcJyGMYymBH6oTXcWjYbUAXTHDbtnWHjZC25h0cdajHuPE1zxb4DVmu8crfh+HwH/WMuyLG0nHBg==
-  dependencies:
-    minipass "^2.2.1"
-
 mixin-deep@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
@@ -1707,7 +1604,7 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@0.5.1, mkdirp@^0.5.0, mkdirp@^0.5.1:
+mkdirp@0.5.1, mkdirp@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
@@ -1738,11 +1635,6 @@ mute-stream@0.0.7:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
   integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
 
-nan@^2.9.2:
-  version "2.11.1"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.1.tgz#90e22bccb8ca57ea4cd37cc83d3819b52eea6766"
-  integrity sha512-iji6k87OSXa0CcrLl9z+ZiYSuR2o+c0bGuNmXdrhTQTakxytAFsC56SArGYoiHlJlFoHSnvmhpceZJaXkVuOtA==
-
 nanomatch@^1.2.9:
   version "1.2.13"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
@@ -1765,14 +1657,10 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
-needle@^2.2.1:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.4.tgz#51931bff82533b1928b7d1d69e01f1b00ffd2a4e"
-  integrity sha512-HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==
-  dependencies:
-    debug "^2.1.2"
-    iconv-lite "^0.4.4"
-    sax "^1.2.4"
+nice-try@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
+  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
 nise@^1.4.5:
   version "1.4.6"
@@ -1790,30 +1678,6 @@ node-int64@^0.4.0:
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
   integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=
 
-node-pre-gyp@^0.10.0:
-  version "0.10.3"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc"
-  integrity sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A==
-  dependencies:
-    detect-libc "^1.0.2"
-    mkdirp "^0.5.1"
-    needle "^2.2.1"
-    nopt "^4.0.1"
-    npm-packlist "^1.1.6"
-    npmlog "^4.0.2"
-    rc "^1.2.7"
-    rimraf "^2.6.1"
-    semver "^5.3.0"
-    tar "^4"
-
-nopt@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
-  integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
-  dependencies:
-    abbrev "1"
-    osenv "^0.1.4"
-
 normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
@@ -1821,35 +1685,14 @@ normalize-path@^2.1.1:
   dependencies:
     remove-trailing-separator "^1.0.1"
 
-npm-bundled@^1.0.1:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979"
-  integrity sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==
-
-npm-packlist@^1.1.6:
-  version "1.1.12"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.12.tgz#22bde2ebc12e72ca482abd67afc51eb49377243a"
-  integrity sha512-WJKFOVMeAlsU/pjXuqVdzU0WfgtIBCupkEVwn+1Y0ERAbUfWw8R4GjgVbaKnUjRoD2FoQbHOCbOyT5Mbs9Lw4g==
+npm-run-path@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
+  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
   dependencies:
-    ignore-walk "^3.0.1"
-    npm-bundled "^1.0.1"
+    path-key "^2.0.0"
 
-npmlog@^4.0.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
-  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
-  dependencies:
-    are-we-there-yet "~1.1.2"
-    console-control-strings "~1.1.0"
-    gauge "~2.7.3"
-    set-blocking "~2.0.0"
-
-number-is-nan@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
-
-object-assign@^4.0.1, object-assign@^4.1.0:
+object-assign@^4.0.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
@@ -1877,7 +1720,7 @@ object.pick@^1.3.0:
   dependencies:
     isobject "^3.0.1"
 
-once@^1.3.0:
+once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
@@ -1911,23 +1754,15 @@ optionator@^0.8.2:
     type-check "~0.3.2"
     wordwrap "~1.0.0"
 
-os-homedir@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
-
-os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
+os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
-osenv@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
-  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
-  dependencies:
-    os-homedir "^1.0.0"
-    os-tmpdir "^1.0.0"
+p-finally@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
 
 parse-passwd@^1.0.0:
   version "1.0.0"
@@ -1949,6 +1784,11 @@ path-is-inside@^1.0.2:
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
   integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
 
+path-key@^2.0.0, path-key@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
+
 path-parse@^1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
@@ -2021,6 +1861,14 @@ pseudomap@^1.0.2:
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
   integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
 
+pump@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
+  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
 puppeteer@1.4:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-1.4.0.tgz#437f0f3450d76e437185c0bf06f446e80f184692"
@@ -2035,30 +1883,20 @@ puppeteer@1.4:
     rimraf "^2.6.1"
     ws "^3.0.0"
 
-qunit@2.6:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.6.2.tgz#551210c5cf857258a4fe39a7fe15d9e14dfef22c"
-  integrity sha512-PHbKulmd4rrDhFto7iHicIstDTX7oMRvAcI7loHstvU8J7AOGwzcchONmy+EG4KU8HDk0K90o7vO0GhlYyKlOg==
+qunit@2.8.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.8.0.tgz#007474727cdba323c35f9526e21c0687f8ea04b3"
+  integrity sha512-bT7vvvE4Xvk6c/uSbvP11uZXlzPJINURQyG9zj5I0EXXycW9oeDCodvAOK3GuYZ+GoXiTAMsxVSXCPGeXlTWzg==
   dependencies:
     commander "2.12.2"
     exists-stat "1.0.0"
     findup-sync "2.0.0"
     js-reporters "1.2.1"
     resolve "1.5.0"
-    sane "^2.5.2"
+    sane "^4.0.0"
     walk-sync "0.3.2"
 
-rc@^1.2.7:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
-  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
-  dependencies:
-    deep-extend "^0.6.0"
-    ini "~1.3.0"
-    minimist "^1.2.0"
-    strip-json-comments "~2.0.1"
-
-readable-stream@^2.0.6, readable-stream@^2.2.2:
+readable-stream@^2.2.2:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
   integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
@@ -2094,7 +1932,7 @@ repeat-element@^1.1.2:
   resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
   integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
 
-repeat-string@^1.5.2, repeat-string@^1.6.1:
+repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
   integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
@@ -2150,13 +1988,6 @@ ret@~0.1.10:
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
   integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
 
-right-align@^0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
-  integrity sha1-YTObci/mo1FWiSENJOFMlhSGE+8=
-  dependencies:
-    align-text "^0.1.1"
-
 rimraf@^2.6.1, rimraf@~2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
@@ -2193,7 +2024,7 @@ rx-lite@*, rx-lite@^4.0.8:
   resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
   integrity sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=
 
-safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
@@ -2210,37 +2041,26 @@ safe-regex@^1.1.0:
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sane@^2.5.2:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/sane/-/sane-2.5.2.tgz#b4dc1861c21b427e929507a3e751e2a2cb8ab3fa"
-  integrity sha1-tNwYYcIbQn6SlQej51HiosuKs/o=
+sane@^4.0.0:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/sane/-/sane-4.0.2.tgz#5bd4a3f1268fd7a921a2dc657047de635c8f8f25"
+  integrity sha512-/3STCUfNSgMVpoREJc1i6ajKFlYZ5OflzZTOhlqPLa+01Ey+QR9iGZK7K5/qIRsQbEDCvqEJH/PL7yZywmnWsA==
   dependencies:
     anymatch "^2.0.0"
     capture-exit "^1.2.0"
-    exec-sh "^0.2.0"
+    exec-sh "^0.3.2"
+    execa "^1.0.0"
     fb-watchman "^2.0.0"
     micromatch "^3.1.4"
     minimist "^1.1.1"
     walker "~1.0.5"
     watch "~0.18.0"
-  optionalDependencies:
-    fsevents "^1.2.3"
 
-sax@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
-  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
-
-semver@^5.3.0:
+semver@^5.3.0, semver@^5.5.0:
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
   integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
 
-set-blocking@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
-
 set-value@^0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
@@ -2346,18 +2166,16 @@ source-map-url@^0.4.0:
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
   integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
 
-source-map@^0.4.4:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
-  integrity sha1-66T12pwNyZneaAMti092FzZSA2s=
-  dependencies:
-    amdefine ">=0.0.4"
-
-source-map@^0.5.0, source-map@^0.5.6, source-map@~0.5.1:
+source-map@^0.5.0, source-map@^0.5.6:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
 
+source-map@^0.6.1, source-map@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
+
 spectrum-colorpicker@1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/spectrum-colorpicker/-/spectrum-colorpicker-1.8.0.tgz#b926cf5002c0a77860b5f8351e1c093c65200107"
@@ -2383,16 +2201,7 @@ static-extend@^0.1.1:
     define-property "^0.2.5"
     object-copy "^0.1.0"
 
-string-width@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
-  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
-  dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    strip-ansi "^3.0.0"
-
-"string-width@^1.0.2 || 2", string-width@^2.1.0, string-width@^2.1.1:
+string-width@^2.1.0, string-width@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
@@ -2407,7 +2216,7 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-strip-ansi@^3.0.0, strip-ansi@^3.0.1:
+strip-ansi@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
   integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
@@ -2421,6 +2230,11 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
+strip-eof@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
+  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
+
 strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
@@ -2450,19 +2264,6 @@ table@4.0.2:
     slice-ansi "1.0.0"
     string-width "^2.1.1"
 
-tar@^4:
-  version "4.4.8"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d"
-  integrity sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==
-  dependencies:
-    chownr "^1.1.1"
-    fs-minipass "^1.2.5"
-    minipass "^2.3.4"
-    minizlib "^1.1.1"
-    mkdirp "^0.5.0"
-    safe-buffer "^5.1.2"
-    yallist "^3.0.2"
-
 text-encoding@^0.6.4:
   version "0.6.4"
   resolved "https://registry.yarnpkg.com/text-encoding/-/text-encoding-0.6.4.tgz#e399a982257a276dae428bb92845cb71bdc26d19"
@@ -2547,20 +2348,13 @@ uc.micro@^1.0.1, uc.micro@^1.0.5:
   resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.5.tgz#0c65f15f815aa08b560a61ce8b4db7ffc3f45376"
   integrity sha512-JoLI4g5zv5qNyT09f4YAvEZIIV1oOjqnewYg5D38dkQljIzpPT296dbIGvKro3digYI1bkb7W6EP1y4uDlmzLg==
 
-uglify-js@^2.6:
-  version "2.8.29"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
-  integrity sha1-KcVzMUgFe7Th913zW3qcty5qWd0=
+uglify-js@^3.1.4:
+  version "3.4.9"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.9.tgz#af02f180c1207d76432e473ed24a28f4a782bae3"
+  integrity sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==
   dependencies:
-    source-map "~0.5.1"
-    yargs "~3.10.0"
-  optionalDependencies:
-    uglify-to-browserify "~1.0.0"
-
-uglify-to-browserify@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
-  integrity sha1-bgkk1r2mta/jSeOabWMoUKD4grc=
+    commander "~2.17.1"
+    source-map "~0.6.1"
 
 ultron@~1.1.0:
   version "1.1.1"
@@ -2630,23 +2424,6 @@ which@^1.2.14, which@^1.2.9:
   dependencies:
     isexe "^2.0.0"
 
-wide-align@^1.1.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
-  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
-  dependencies:
-    string-width "^1.0.2 || 2"
-
-window-size@0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
-  integrity sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=
-
-wordwrap@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
-  integrity sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=
-
 wordwrap@~0.0.2:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
@@ -2683,21 +2460,6 @@ yallist@^2.1.2:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
   integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
-yallist@^3.0.0, yallist@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
-  integrity sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=
-
-yargs@~3.10.0:
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
-  integrity sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=
-  dependencies:
-    camelcase "^1.0.2"
-    cliui "^2.1.0"
-    decamelize "^1.0.0"
-    window-size "0.1.0"
-
 yauzl@2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.4.1.tgz#9528f442dab1b2284e58b4379bb194e22e0c4005"