diff --git a/accessible/windows/msaa/Platform.cpp b/accessible/windows/msaa/Platform.cpp
index b2b0aa54558a..65b33102f3ef 100644
--- a/accessible/windows/msaa/Platform.cpp
+++ b/accessible/windows/msaa/Platform.cpp
@@ -49,6 +49,10 @@ a11y::ProxyDestroyed(ProxyAccessible* aProxy)
 {
   ProxyAccessibleWrap* wrapper =
     reinterpret_cast<ProxyAccessibleWrap*>(aProxy->GetWrapper());
+  MOZ_ASSERT(wrapper);
+  if (!wrapper)
+    return;
+
   wrapper->Shutdown();
   aProxy->SetWrapper(0);
   wrapper->Release();
diff --git a/b2g/app/b2g.js b/b2g/app/b2g.js
index e35640f5cfab..a4b5d71f4eb2 100644
--- a/b2g/app/b2g.js
+++ b/b2g/app/b2g.js
@@ -675,9 +675,6 @@ pref("dom.forms.number", true);
 // implemented for b2g (bug 875751)
 pref("dom.forms.color", false);
 
-// Turns on gralloc-based direct texturing for Gonk
-pref("gfx.gralloc.enabled", false);
-
 // This preference instructs the JS engine to discard the
 // source of any privileged JS after compilation. This saves
 // memory, but makes things like Function.prototype.toSource()
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 9359a41d6c92..aadde371f689 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -6696,6 +6696,10 @@ var gIdentityHandler = {
     delete this._identityIconCountryLabel;
     return this._identityIconCountryLabel = document.getElementById("identity-icon-country-label");
   },
+  get _identityIcons () {
+    delete this._identityIcons;
+    return this._identityIcons = document.getElementById("identity-icons");
+  },
   get _identityIcon () {
     delete this._identityIcon;
     return this._identityIcon = document.getElementById("page-proxy-favicon");
@@ -6715,12 +6719,14 @@ var gIdentityHandler = {
    */
   _cacheElements : function() {
     delete this._identityBox;
+    delete this._identityIcons;
     delete this._identityIconLabel;
     delete this._identityIconCountryLabel;
     delete this._identityIcon;
     delete this._permissionsContainer;
     delete this._permissionList;
     this._identityBox = document.getElementById("identity-box");
+    this._identityIcons = document.getElementById("identity-icons");
     this._identityIconLabel = document.getElementById("identity-icon-label");
     this._identityIconCountryLabel = document.getElementById("identity-icon-country-label");
     this._identityIcon = document.getElementById("page-proxy-favicon");
@@ -7130,7 +7136,7 @@ var gIdentityHandler = {
     this._identityBox.setAttribute("open", "true");
 
     // Now open the popup, anchored off the primary chrome element
-    this._identityPopup.openPopup(this._identityIcon, "bottomcenter topleft");
+    this._identityPopup.openPopup(this._identityIcons, "bottomcenter topleft");
   },
 
   onPopupShown(event) {
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index fc0728174039..40e9e1c02c5b 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -763,11 +763,13 @@
                    onclick="gIdentityHandler.handleIdentityButtonEvent(event);"
                    onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);"
                    ondragstart="gIdentityHandler.onDragStart(event);">
-                <image id="tracking-protection-icon"/>
-                <image id="page-proxy-favicon"
-                       consumeanchor="identity-box"
-                       onclick="PageProxyClickHandler(event);"
-                       pageproxystate="invalid"/>
+                <hbox id="identity-icons"
+                      consumeanchor="identity-box">
+                  <image id="tracking-protection-icon"/>
+                  <image id="page-proxy-favicon"
+                         onclick="PageProxyClickHandler(event);"
+                         pageproxystate="invalid"/>
+                </hbox>
                 <hbox id="identity-icon-labels">
                   <label id="identity-icon-label" class="plain" flex="1"/>
                   <label id="identity-icon-country-label" class="plain"/>
diff --git a/browser/components/loop/.eslintignore b/browser/components/loop/.eslintignore
index 69e22a5643fa..f0404a3c1d33 100644
--- a/browser/components/loop/.eslintignore
+++ b/browser/components/loop/.eslintignore
@@ -11,6 +11,9 @@ standalone/content/libs
 standalone/node_modules
 # Libs we don't need to check
 test/shared/vendor
+# Coverage files
+test/coverage
+test/node_modules
 # These are generated react files that we don't need to check
 content/js/contacts.js
 content/js/conversation.js
diff --git a/browser/components/loop/.gitignore b/browser/components/loop/.gitignore
index c4183eb1a927..6229eb2888a4 100644
--- a/browser/components/loop/.gitignore
+++ b/browser/components/loop/.gitignore
@@ -1 +1,2 @@
 .module-cache
+test/coverage
diff --git a/browser/components/loop/README.txt b/browser/components/loop/README.txt
index 7bdda30d3de2..4903e0866a1d 100644
--- a/browser/components/loop/README.txt
+++ b/browser/components/loop/README.txt
@@ -56,6 +56,17 @@ You can also run it by hand in the browser/components/loop directory:
 
   eslint --ext .js --ext .jsx --ext .jsm .
 
+Test coverage
+=============
+Initial setup
+  cd test
+  npm install
+
+To run
+  npm run build-coverage
+
+It will create a `coverage` folder under test/
+
 Front-End Unit Tests
 ====================
 The unit tests for Loop reside in three directories:
diff --git a/browser/components/loop/run-all-loop-tests.sh b/browser/components/loop/run-all-loop-tests.sh
index 45665522d988..2c0bfd5ad4f8 100755
--- a/browser/components/loop/run-all-loop-tests.sh
+++ b/browser/components/loop/run-all-loop-tests.sh
@@ -7,6 +7,7 @@ if [ "$1" == "--help" ]; then
   exit 0;
 fi
 
+# Causes script to abort immediately if error code is not checked.
 set -e
 
 # Main tests
@@ -22,6 +23,16 @@ if [ -x "${LOOPDIR}/${ESLINT}" ]; then
   echo 'eslint run finished.'
 fi
 
+# Build tests coverage.
+MISSINGDEPSMSG="\nMake sure all dependencies are up to date by running
+'npm install' inside the 'browser/components/loop/test/' directory.\n"
+(
+cd ${LOOPDIR}/test
+if ! npm run-script build-coverage ; then
+  echo $MISSINGDEPSMSG && exit 1
+fi
+)
+
 ./mach xpcshell-test ${LOOPDIR}/
 ./mach marionette-test ${LOOPDIR}/manifest.ini
 
diff --git a/browser/components/loop/standalone/content/js/standaloneRoomViews.js b/browser/components/loop/standalone/content/js/standaloneRoomViews.js
index 8ed26cef79c5..9a3cadaa7381 100644
--- a/browser/components/loop/standalone/content/js/standaloneRoomViews.js
+++ b/browser/components/loop/standalone/content/js/standaloneRoomViews.js
@@ -256,7 +256,8 @@ loop.standaloneRoomViews = (function(mozL10n) {
     mixins: [
       Backbone.Events,
       sharedMixins.MediaSetupMixin,
-      sharedMixins.RoomsAudioMixin
+      sharedMixins.RoomsAudioMixin,
+      sharedMixins.DocumentTitleMixin
     ],
 
     propTypes: {
@@ -306,6 +307,14 @@ loop.standaloneRoomViews = (function(mozL10n) {
      * @param  {Object} nextState Next state object.
      */
     componentWillUpdate: function(nextProps, nextState) {
+      if (this.state.roomState !== ROOM_STATES.READY &&
+          nextState.roomState === ROOM_STATES.READY) {
+        this.setTitle(mozL10n.get("standalone_title_with_room_name", {
+          roomName: nextState.roomName || this.state.roomName,
+          clientShortname: mozL10n.get("clientShortname2")
+        }));
+      }
+
       if (this.state.roomState !== ROOM_STATES.MEDIA_WAIT &&
           nextState.roomState === ROOM_STATES.MEDIA_WAIT) {
         this.props.dispatcher.dispatch(new sharedActions.SetupStreamElements({
diff --git a/browser/components/loop/standalone/content/js/standaloneRoomViews.jsx b/browser/components/loop/standalone/content/js/standaloneRoomViews.jsx
index e798129e52e9..bfdb2e8cbab1 100644
--- a/browser/components/loop/standalone/content/js/standaloneRoomViews.jsx
+++ b/browser/components/loop/standalone/content/js/standaloneRoomViews.jsx
@@ -256,7 +256,8 @@ loop.standaloneRoomViews = (function(mozL10n) {
     mixins: [
       Backbone.Events,
       sharedMixins.MediaSetupMixin,
-      sharedMixins.RoomsAudioMixin
+      sharedMixins.RoomsAudioMixin,
+      sharedMixins.DocumentTitleMixin
     ],
 
     propTypes: {
@@ -306,6 +307,14 @@ loop.standaloneRoomViews = (function(mozL10n) {
      * @param  {Object} nextState Next state object.
      */
     componentWillUpdate: function(nextProps, nextState) {
+      if (this.state.roomState !== ROOM_STATES.READY &&
+          nextState.roomState === ROOM_STATES.READY) {
+        this.setTitle(mozL10n.get("standalone_title_with_room_name", {
+          roomName: nextState.roomName || this.state.roomName,
+          clientShortname: mozL10n.get("clientShortname2")
+        }));
+      }
+
       if (this.state.roomState !== ROOM_STATES.MEDIA_WAIT &&
           nextState.roomState === ROOM_STATES.MEDIA_WAIT) {
         this.props.dispatcher.dispatch(new sharedActions.SetupStreamElements({
diff --git a/browser/components/loop/standalone/content/l10n/en-US/loop.properties b/browser/components/loop/standalone/content/l10n/en-US/loop.properties
index 183d552e59e5..297101fc8a47 100644
--- a/browser/components/loop/standalone/content/l10n/en-US/loop.properties
+++ b/browser/components/loop/standalone/content/l10n/en-US/loop.properties
@@ -115,6 +115,10 @@ room_information_failure_unsupported_browser=Your browser cannot access any info
 ## replaced by the brand name and {{currentStatus}} will be replaced
 ## by the current call status (Connecting, Ringing, etc.)
 standalone_title_with_status={{clientShortname}} — {{currentStatus}}
+## LOCALIZATION_NOTE(standalone_title_with_room_name): {{roomName}} will be replaced
+## by the name of the conversation and {{clientShortname}} will be
+## replaced by the brand name.
+standalone_title_with_room_name={{roomName}} — {{clientShortname}}
 status_in_conversation=In conversation
 status_conversation_ended=Conversation ended
 status_error=Something went wrong
diff --git a/browser/components/loop/test/desktop-local/conversation_test.js b/browser/components/loop/test/desktop-local/conversation_test.js
index 5fce3d1a35b9..2b66566e9d3c 100644
--- a/browser/components/loop/test/desktop-local/conversation_test.js
+++ b/browser/components/loop/test/desktop-local/conversation_test.js
@@ -78,6 +78,7 @@ describe("loop.conversation", function() {
   });
 
   describe("#init", function() {
+    var OTRestore;
     beforeEach(function() {
       sandbox.stub(React, "render");
       sandbox.stub(document.mozL10n, "initialize");
@@ -93,13 +94,14 @@ describe("loop.conversation", function() {
           pathname: "/"
         });
 
+      OTRestore = window.OT;
       window.OT = {
         overrideGuidStorage: sinon.stub()
       };
     });
 
     afterEach(function() {
-      delete window.OT;
+      window.OT = OTRestore;
     });
 
     it("should initialize L10n", function() {
diff --git a/browser/components/loop/test/karma/karma.conf.base.js b/browser/components/loop/test/karma/karma.conf.base.js
new file mode 100644
index 000000000000..fd9adfd6c343
--- /dev/null
+++ b/browser/components/loop/test/karma/karma.conf.base.js
@@ -0,0 +1,67 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/* eslint-env node */
+
+module.exports = function(config) {
+  "use strict";
+
+  return {
+
+    // Base path that will be used to resolve all patterns (eg. files, exclude).
+    basePath: "../../",
+
+    // List of files / patterns to load in the browser.
+    files: [],
+
+    // List of files to exclude.
+    exclude: [
+    ],
+
+    // Frameworks to use.
+    // Available frameworks: https://npmjs.org/browse/keyword/karma-adapter .
+    frameworks: ["mocha"],
+
+    // Test results reporter to use.
+    // Possible values: "dots", "progress".
+    // Available reporters: https://npmjs.org/browse/keyword/karma-reporter .
+    reporters: ["progress", "coverage"],
+
+    coverageReporter: {
+      type: "html",
+      dir: "test/coverage/"
+    },
+
+    // Web server port.
+    port: 9876,
+
+    // Enable / disable colors in the output (reporters and logs).
+    colors: true,
+
+    // Level of logging.
+    // Possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG.
+    logLevel: config.LOG_INFO,
+
+    // Enable / disable watching file and executing tests whenever any file changes.
+    autoWatch: false,
+
+    // Start these browsers
+    // Available browser launchers: https://npmjs.org/browse/keyword/karma-launcher .
+    browsers: ["Firefox"],
+
+    // Continuous Integration mode.
+    // If true, Karma captures browsers, runs the tests and exits.
+    singleRun: true,
+
+    // Capture console output.
+    client: {
+      captureConsole: true
+    },
+
+    plugins: [
+      "karma-coverage",
+      "karma-mocha",
+      "karma-firefox-launcher"
+    ]
+  };
+};
diff --git a/browser/components/loop/test/karma/karma.coverage.desktop.js b/browser/components/loop/test/karma/karma.coverage.desktop.js
new file mode 100644
index 000000000000..aa57903c3540
--- /dev/null
+++ b/browser/components/loop/test/karma/karma.coverage.desktop.js
@@ -0,0 +1,61 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/* eslint-env node */
+
+module.exports = function(config) {
+  "use strict";
+
+  var baseConfig = require("./karma.conf.base.js")(config);
+
+  // List of files / patterns to load in the browser.
+  baseConfig.files = baseConfig.files.concat([
+    "content/libs/l10n.js",
+    "content/shared/libs/react-0.12.2.js",
+    "content/shared/libs/jquery-2.1.4.js",
+    "content/shared/libs/lodash-3.9.3.js",
+    "content/shared/libs/backbone-1.2.1.js",
+    "test/shared/vendor/*.js",
+    "test/karma/stubs.js", // Stub out DOM event listener due to races.
+    "content/shared/js/utils.js",
+    "content/shared/js/models.js",
+    "content/shared/js/mixins.js",
+    "content/shared/js/websocket.js",
+    "content/shared/js/actions.js",
+    "content/shared/js/otSdkDriver.js",
+    "content/shared/js/validate.js",
+    "content/shared/js/dispatcher.js",
+    "content/shared/js/store.js",
+    "content/shared/js/conversationStore.js",
+    "content/shared/js/roomStates.js",
+    "content/shared/js/fxOSActiveRoomStore.js",
+    "content/shared/js/activeRoomStore.js",
+    "content/shared/js/views.js",
+    "content/shared/js/textChatStore.js",
+    "content/shared/js/textChatView.js",
+    "content/js/feedbackViews.js",
+    "content/js/client.js",
+    "content/js/conversationAppStore.js",
+    "content/js/roomStore.js",
+    "content/js/roomViews.js",
+    "content/js/conversationViews.js",
+    "content/js/conversation.js",
+    "test/desktop-local/*.js"
+  ]);
+
+  // List of files to exclude.
+  baseConfig.exclude = baseConfig.exclude.concat([
+    "test/desktop-local/panel_test.js",
+    "test/desktop-local/contacts_test.js"
+  ]);
+
+  // Preprocess matching files before serving them to the browser.
+  // Available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor .
+  baseConfig.preprocessors = {
+    "content/js/*.js": ["coverage"]
+  };
+
+  baseConfig.coverageReporter.dir = "test/coverage/desktop";
+
+  config.set(baseConfig);
+};
diff --git a/browser/components/loop/test/karma/karma.coverage.shared_standalone.js b/browser/components/loop/test/karma/karma.coverage.shared_standalone.js
new file mode 100644
index 000000000000..cf4ee5a35796
--- /dev/null
+++ b/browser/components/loop/test/karma/karma.coverage.shared_standalone.js
@@ -0,0 +1,59 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/* eslint-env node */
+
+module.exports = function(config) {
+  "use strict";
+
+  var baseConfig = require("./karma.conf.base.js")(config);
+
+  // List of files / patterns to load in the browser.
+  baseConfig.files = baseConfig.files.concat([
+    "standalone/content/libs/l10n-gaia-02ca67948fe8.js",
+    "content/shared/libs/jquery-2.1.4.js",
+    "content/shared/libs/lodash-3.9.3.js",
+    "content/shared/libs/backbone-1.2.1.js",
+    "content/shared/libs/react-0.12.2.js",
+    "content/shared/libs/sdk.js",
+    "test/shared/vendor/*.js",
+    "content/shared/js/utils.js",
+    "content/shared/js/store.js",
+    "content/shared/js/models.js",
+    "content/shared/js/mixins.js",
+    "content/shared/js/crypto.js",
+    "content/shared/js/websocket.js",
+    "content/shared/js/validate.js",
+    "content/shared/js/actions.js",
+    "content/shared/js/dispatcher.js",
+    "content/shared/js/otSdkDriver.js",
+    "content/shared/js/roomStates.js",
+    "content/shared/js/fxOSActiveRoomStore.js",
+    "content/shared/js/activeRoomStore.js",
+    "content/shared/js/conversationStore.js",
+    "content/shared/js/views.js",
+    "content/shared/js/textChatStore.js",
+    "content/shared/js/textChatView.js",
+    "standalone/content/js/multiplexGum.js",
+    "standalone/content/js/standaloneAppStore.js",
+    "standalone/content/js/standaloneClient.js",
+    "standalone/content/js/standaloneMozLoop.js",
+    "standalone/content/js/fxOSMarketplace.js",
+    "standalone/content/js/standaloneRoomViews.js",
+    "standalone/content/js/standaloneMetricsStore.js",
+    "standalone/content/js/webapp.js",
+    "test/shared/*.js",
+    "test/standalone/*.js"
+  ]);
+
+  // Preprocess matching files before serving them to the browser.
+  // Available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor .
+  baseConfig.preprocessors = {
+    "content/shared/js/*.js": ["coverage"],
+    "standalone/content/js/*.js": ["coverage"]
+  };
+
+  baseConfig.coverageReporter.dir = "test/coverage/shared_standalone";
+
+  config.set(baseConfig);
+};
diff --git a/browser/components/loop/test/karma/stubs.js b/browser/components/loop/test/karma/stubs.js
new file mode 100644
index 000000000000..4209e6310887
--- /dev/null
+++ b/browser/components/loop/test/karma/stubs.js
@@ -0,0 +1,8 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Used for desktop coverage tests because triggering methods on
+// DOMContentLoaded proved to lead to race conditions.
+
+sinon.stub(document, "addEventListener");
+console.log("[stubs.js] addEventListener stubbed to prevent race conditions");
diff --git a/browser/components/loop/test/package.json b/browser/components/loop/test/package.json
new file mode 100644
index 000000000000..6d6e56f63d2a
--- /dev/null
+++ b/browser/components/loop/test/package.json
@@ -0,0 +1,21 @@
+{
+  "name": "FirefoxHello",
+  "version": "0.0.1",
+  "description": "Firefox Hello test coverage",
+  "main": "index.js",
+  "directories": {
+    "test": "test"
+  },
+  "devDependencies": {
+    "istanbul": "^0.3.17",
+    "karma": "^0.12.37",
+    "karma-coverage": "^0.4.2",
+    "karma-firefox-launcher": "^0.1.6",
+    "karma-mocha": "^0.2.0"
+  },
+  "scripts": {
+    "build-coverage-shared": "./node_modules/.bin/karma start karma/karma.coverage.shared_standalone.js",
+    "build-coverage-desktop": "./node_modules/.bin/karma start karma/karma.coverage.desktop.js",
+    "build-coverage": "npm run build-coverage-desktop && npm run build-coverage-shared"
+  }
+}
diff --git a/browser/components/loop/test/shared/activeRoomStore_test.js b/browser/components/loop/test/shared/activeRoomStore_test.js
index 55f7bb96b3a3..db37d6cc2ee7 100644
--- a/browser/components/loop/test/shared/activeRoomStore_test.js
+++ b/browser/components/loop/test/shared/activeRoomStore_test.js
@@ -11,8 +11,8 @@ describe("loop.store.ActiveRoomStore", function () {
   var FAILURE_DETAILS = loop.shared.utils.FAILURE_DETAILS;
   var SCREEN_SHARE_STATES = loop.shared.utils.SCREEN_SHARE_STATES;
   var ROOM_INFO_FAILURES = loop.shared.utils.ROOM_INFO_FAILURES;
-  var sandbox, dispatcher, store, fakeMozLoop, fakeSdkDriver;
-  var fakeMultiplexGum;
+  var sandbox, dispatcher, store, fakeMozLoop, fakeSdkDriver, fakeMultiplexGum;
+  var standaloneMediaRestore;
 
   beforeEach(function() {
     sandbox = sinon.sandbox.create();
@@ -52,9 +52,10 @@ describe("loop.store.ActiveRoomStore", function () {
     };
 
     fakeMultiplexGum = {
-        reset: sandbox.spy()
+      reset: sandbox.spy()
     };
 
+    standaloneMediaRestore = loop.standaloneMedia;
     loop.standaloneMedia = {
       multiplexGum: fakeMultiplexGum
     };
@@ -67,6 +68,7 @@ describe("loop.store.ActiveRoomStore", function () {
 
   afterEach(function() {
     sandbox.restore();
+    loop.standaloneMedia = standaloneMediaRestore;
   });
 
   describe("#constructor", function() {
diff --git a/browser/components/loop/test/shared/mixins_test.js b/browser/components/loop/test/shared/mixins_test.js
index 4880d127d809..700bdf5d7813 100644
--- a/browser/components/loop/test/shared/mixins_test.js
+++ b/browser/components/loop/test/shared/mixins_test.js
@@ -431,7 +431,8 @@ describe("loop.shared.mixins", function() {
         doNotDisturb: true,
         getAudioBlob: sinon.spy(function(name, callback) {
           callback(null, new Blob([new ArrayBuffer(10)], {type: "audio/ogg"}));
-        })
+        }),
+        getLoopPref: sandbox.stub()
       };
 
       fakeAudio = {
diff --git a/browser/components/loop/test/shared/validate_test.js b/browser/components/loop/test/shared/validate_test.js
index 3ee3e657c41f..8afac9f0f10a 100644
--- a/browser/components/loop/test/shared/validate_test.js
+++ b/browser/components/loop/test/shared/validate_test.js
@@ -17,6 +17,13 @@ describe("Validator", function() {
   function Y(){}
 
   describe("#validate", function() {
+    function mozRTCSessionDescription() {}
+    var mozRTC;
+
+    beforeEach(function() {
+      mozRTC = new mozRTCSessionDescription();
+    });
+
     it("should check for a single required dependency when no option passed",
       function() {
         expect(create({x: Number}, {}))
@@ -67,7 +74,7 @@ describe("Validator", function() {
     });
 
     it("should check for a native constructor dependency", function() {
-      expect(create({foo: mozRTCSessionDescription}, {foo: "x"}))
+      expect(create({foo: mozRTC}, {foo: "x"}))
         .to.Throw(TypeError,
                   /invalid dependency: foo; expected mozRTCSessionDescription/);
     });
diff --git a/browser/components/loop/test/standalone/standaloneRoomViews_test.js b/browser/components/loop/test/standalone/standaloneRoomViews_test.js
index 5514c6cb17c6..01e688f74ddb 100644
--- a/browser/components/loop/test/standalone/standaloneRoomViews_test.js
+++ b/browser/components/loop/test/standalone/standaloneRoomViews_test.js
@@ -16,6 +16,7 @@ describe("loop.standaloneRoomViews", function() {
   var sharedUtils = loop.shared.utils;
 
   var sandbox, dispatcher, activeRoomStore, dispatch;
+  var fakeWindow;
 
   beforeEach(function() {
     sandbox = sinon.sandbox.create();
@@ -34,12 +35,30 @@ describe("loop.standaloneRoomViews", function() {
     });
 
     sandbox.useFakeTimers();
+    fakeWindow = {
+      close: sandbox.stub(),
+      addEventListener: function() {},
+      document: { addEventListener: function(){} },
+      setTimeout: function(callback) { callback(); }
+    };
+    loop.shared.mixins.setRootObject(fakeWindow);
+
+
+    sandbox.stub(navigator.mozL10n, "get", function(key, args) {
+      switch(key) {
+        case "standalone_title_with_room_name":
+          return args.roomName + " — " + args.clientShortname;
+        default:
+          return key;
+      }
+    });
 
     // Prevents audio request errors in the test console.
     sandbox.useFakeXMLHttpRequest();
   });
 
   afterEach(function() {
+    loop.shared.mixins.setRootObject(window);
     sandbox.restore();
   });
 
@@ -83,6 +102,14 @@ describe("loop.standaloneRoomViews", function() {
     }
 
     describe("#componentWillUpdate", function() {
+      it("should set document.title to roomName and brand name when the READY state is dispatched", function() {
+        activeRoomStore.setStoreState({roomName: "fakeName", roomState: ROOM_STATES.INIT});
+        var view = mountTestComponent();
+        activeRoomStore.setStoreState({roomState: ROOM_STATES.READY});
+
+        expect(fakeWindow.document.title).to.equal("fakeName — clientShortname2");
+      });
+
       it("should dispatch a `SetupStreamElements` action when the MEDIA_WAIT state " +
         "is entered", function() {
           activeRoomStore.setStoreState({roomState: ROOM_STATES.READY});
diff --git a/browser/components/loop/test/standalone/webapp_test.js b/browser/components/loop/test/standalone/webapp_test.js
index f42f61860604..263e79814c57 100644
--- a/browser/components/loop/test/standalone/webapp_test.js
+++ b/browser/components/loop/test/standalone/webapp_test.js
@@ -47,11 +47,22 @@ describe("loop.webapp", function() {
   });
 
   describe("#init", function() {
+    var loopConfigRestore;
+
     beforeEach(function() {
       sandbox.stub(React, "render");
+      loopConfigRestore = loop.config;
+      loop.config = {
+        feedbackApiUrl: "http://fake.invalid",
+        serverUrl: "http://fake.invalid"
+      };
       sandbox.stub(loop.Dispatcher.prototype, "dispatch");
     });
 
+    afterEach(function() {
+      loop.config = loopConfigRestore;
+    });
+
     it("should create the WebappRootView", function() {
       loop.webapp.init();
 
diff --git a/browser/devtools/canvasdebugger/panel.js b/browser/devtools/canvasdebugger/panel.js
index b90d4d898152..35e69180b75a 100644
--- a/browser/devtools/canvasdebugger/panel.js
+++ b/browser/devtools/canvasdebugger/panel.js
@@ -9,7 +9,7 @@ const { Cc, Ci, Cu, Cr } = require("chrome");
 const promise = Cu.import("resource://gre/modules/Promise.jsm", {}).Promise;
 const EventEmitter = require("devtools/toolkit/event-emitter");
 const { CanvasFront } = require("devtools/server/actors/canvas");
-const { DevToolsUtils } = Cu.import("resource://gre/modules/devtools/DevToolsUtils.jsm", {});
+const DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
 
 function CanvasDebuggerPanel(iframeWindow, toolbox) {
   this.panelWin = iframeWindow;
diff --git a/browser/devtools/debugger/debugger-controller.js b/browser/devtools/debugger/debugger-controller.js
index a8fdc8154f38..b231e006ac27 100644
--- a/browser/devtools/debugger/debugger-controller.js
+++ b/browser/devtools/debugger/debugger-controller.js
@@ -102,8 +102,10 @@ Cu.import("resource:///modules/devtools/SideMenuWidget.jsm");
 Cu.import("resource:///modules/devtools/VariablesView.jsm");
 Cu.import("resource:///modules/devtools/VariablesViewController.jsm");
 Cu.import("resource:///modules/devtools/ViewHelpers.jsm");
+const { devtools } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 
-const require = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}).devtools.require;
+const require = devtools.require;
+const DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
 const promise = require("devtools/toolkit/deprecated-sync-thenables");
 const Editor = require("devtools/sourceeditor/editor");
 const DebuggerEditor = require("devtools/sourceeditor/debugger.js");
@@ -116,12 +118,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "Task",
 XPCOMUtils.defineLazyModuleGetter(this, "Parser",
   "resource:///modules/devtools/Parser.jsm");
 
-XPCOMUtils.defineLazyModuleGetter(this, "devtools",
-  "resource://gre/modules/devtools/Loader.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "DevToolsUtils",
-  "resource://gre/modules/devtools/DevToolsUtils.jsm");
-
 XPCOMUtils.defineLazyModuleGetter(this, "ShortcutUtils",
   "resource://gre/modules/ShortcutUtils.jsm");
 
diff --git a/browser/devtools/debugger/panel.js b/browser/devtools/debugger/panel.js
index a2d5e656bc04..5ecb0c57fbe9 100644
--- a/browser/devtools/debugger/panel.js
+++ b/browser/devtools/debugger/panel.js
@@ -8,7 +8,7 @@
 const { Cc, Ci, Cu, Cr } = require("chrome");
 const { Promise: promise } = Cu.import("resource://gre/modules/Promise.jsm", {});
 const EventEmitter = require("devtools/toolkit/event-emitter");
-const { DevToolsUtils } = Cu.import("resource://gre/modules/devtools/DevToolsUtils.jsm", {});
+const DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
 
 function DebuggerPanel(iframeWindow, toolbox) {
   this.panelWin = iframeWindow;
diff --git a/browser/devtools/debugger/test/browser_dbg_source-maps-04.js b/browser/devtools/debugger/test/browser_dbg_source-maps-04.js
index 230982a77ac3..3e67c7e5ee36 100644
--- a/browser/devtools/debugger/test/browser_dbg_source-maps-04.js
+++ b/browser/devtools/debugger/test/browser_dbg_source-maps-04.js
@@ -10,7 +10,6 @@ const JS_URL = EXAMPLE_URL + "code_math_bogus_map.js";
 
 // This test causes an error to be logged in the console, which appears in TBPL
 // logs, so we are disabling that here.
-let { DevToolsUtils } = Cu.import("resource://gre/modules/devtools/DevToolsUtils.jsm", {});
 DevToolsUtils.reportingDisabled = true;
 
 let gPanel, gDebugger, gFrames, gSources, gPrefs;
diff --git a/browser/devtools/debugger/test/head.js b/browser/devtools/debugger/test/head.js
index 2188dc3cc850..0be91554c0b6 100644
--- a/browser/devtools/debugger/test/head.js
+++ b/browser/devtools/debugger/test/head.js
@@ -17,7 +17,7 @@ let { Promise: promise } = Cu.import("resource://gre/modules/devtools/deprecated
 let { gDevTools } = Cu.import("resource:///modules/devtools/gDevTools.jsm", {});
 let { devtools } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 let { require } = devtools;
-let { DevToolsUtils } = Cu.import("resource://gre/modules/devtools/DevToolsUtils.jsm", {});
+let DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
 let { BrowserToolboxProcess } = Cu.import("resource:///modules/devtools/ToolboxProcess.jsm", {});
 let { DebuggerServer } = Cu.import("resource://gre/modules/devtools/dbg-server.jsm", {});
 let { DebuggerClient, ObjectClient } =
diff --git a/browser/devtools/framework/toolbox.js b/browser/devtools/framework/toolbox.js
index 101eaac8a4c0..3509717434f9 100644
--- a/browser/devtools/framework/toolbox.js
+++ b/browser/devtools/framework/toolbox.js
@@ -1756,6 +1756,14 @@ Toolbox.prototype = {
         yield this.highlighterUtils.stopPicker();
         yield this._inspector.destroy();
         if (this._highlighter) {
+          // Note that if the toolbox is closed, this will work fine, but will fail
+          // in case the browser is closed and will trigger a noSuchActor message.
+          // We ignore the promise that |_hideBoxModel| returns, since we should still
+          // proceed with the rest of destruction if it fails.
+          // FF42+ now does the cleanup from the actor.
+          if (!this.highlighter.traits.autoHideOnDestroy) {
+            this.highlighterUtils.unhighlight();
+          }
           yield this._highlighter.destroy();
         }
         if (this._selection) {
diff --git a/browser/devtools/inspector/breadcrumbs.js b/browser/devtools/inspector/breadcrumbs.js
index dcd98c91e64f..d4cbdb3b2b3f 100644
--- a/browser/devtools/inspector/breadcrumbs.js
+++ b/browser/devtools/inspector/breadcrumbs.js
@@ -548,10 +548,11 @@ HTMLBreadcrumbs.prototype = {
     let deferred = promise.defer();
 
     let fallback = null;
+    let lastNode = null;
 
     let moreChildren = () => {
       this.walker.children(node, {
-        start: fallback,
+        start: lastNode,
         maxNodes: 10,
         whatToShow: Ci.nsIDOMNodeFilter.SHOW_ELEMENT
       }).then(this.selectionGuard()).then(response => {
@@ -563,6 +564,7 @@ HTMLBreadcrumbs.prototype = {
           if (!fallback) {
             fallback = node;
           }
+          lastNode = node;
         }
         if (response.hasLast) {
           deferred.resolve(fallback);
diff --git a/browser/devtools/inspector/test/browser_inspector_breadcrumbs.js b/browser/devtools/inspector/test/browser_inspector_breadcrumbs.js
index 73028ebd1480..e238debfc346 100644
--- a/browser/devtools/inspector/test/browser_inspector_breadcrumbs.js
+++ b/browser/devtools/inspector/test/browser_inspector_breadcrumbs.js
@@ -13,6 +13,7 @@ const NODES = [
   {selector: "#i21", result: "i2 i21 i211 i2111"},
   {selector: "#i22211", result: "i2 i22 i222 i2221 i22211"},
   {selector: "#i22", result: "i2 i22 i222 i2221 i22211"},
+  {selector: "#i3", result: "i3 i31"},
 ];
 
 add_task(function*() {
diff --git a/browser/devtools/inspector/test/doc_inspector_breadcrumbs.html b/browser/devtools/inspector/test/doc_inspector_breadcrumbs.html
index ce306d5f6c7d..a5b9224b59e3 100644
--- a/browser/devtools/inspector/test/doc_inspector_breadcrumbs.html
+++ b/browser/devtools/inspector/test/doc_inspector_breadcrumbs.html
@@ -42,6 +42,27 @@
         </div>
       </div>
     </article>
+    <article id="i3">
+      <link id="i31" />
+      <link />
+      <link />
+      <link />
+      <link />
+      <link />
+      <link />
+      <link />
+      <link />
+      <link />
+      <link />
+      <link />
+      <link />
+      <link />
+      <link />
+      <link />
+      <link />
+      <link />
+      <link />
+    </article>
     <div id='pseudo-container'></div>
   </body>
 </html>
diff --git a/browser/devtools/markupview/markup-view.js b/browser/devtools/markupview/markup-view.js
index 277849c3e9fb..7494ace4ac9c 100644
--- a/browser/devtools/markupview/markup-view.js
+++ b/browser/devtools/markupview/markup-view.js
@@ -1466,11 +1466,6 @@ MarkupView.prototype = {
 
     this._destroyer = promise.resolve();
 
-    // Note that if the toolbox is closed, this will work fine, but will fail
-    // in case the browser is closed and will trigger a noSuchActor message.
-    // We ignore the promise that |_hideBoxModel| returns, since we should still
-    // proceed with the rest of destruction if it fails.
-    this._hideBoxModel();
     this._clearBriefBoxModelTimer();
 
     this._elt.removeEventListener("click", this._onMouseClick, false);
diff --git a/browser/devtools/netmonitor/panel.js b/browser/devtools/netmonitor/panel.js
index d6775598b408..8f1afbd1f02f 100644
--- a/browser/devtools/netmonitor/panel.js
+++ b/browser/devtools/netmonitor/panel.js
@@ -8,7 +8,7 @@
 const { Cc, Ci, Cu, Cr } = require("chrome");
 const { Promise: promise } = Cu.import("resource://gre/modules/Promise.jsm", {});
 const EventEmitter = require("devtools/toolkit/event-emitter");
-const { DevToolsUtils } = Cu.import("resource://gre/modules/devtools/DevToolsUtils.jsm", {});
+const DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
 
 function NetMonitorPanel(iframeWindow, toolbox) {
   this.panelWin = iframeWindow;
diff --git a/browser/devtools/performance/test/head.js b/browser/devtools/performance/test/head.js
index ac4cb072ffd2..3bb0dcb0a2a0 100644
--- a/browser/devtools/performance/test/head.js
+++ b/browser/devtools/performance/test/head.js
@@ -10,7 +10,7 @@ let { Task } = Cu.import("resource://gre/modules/Task.jsm", {});
 let { Promise } = Cu.import("resource://gre/modules/Promise.jsm", {});
 let { devtools } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 let { gDevTools } = Cu.import("resource:///modules/devtools/gDevTools.jsm", {});
-let { DevToolsUtils } = Cu.import("resource://gre/modules/devtools/DevToolsUtils.jsm", {});
+const DevToolsUtils = devtools.require("devtools/toolkit/DevToolsUtils");
 let { DebuggerServer } = Cu.import("resource://gre/modules/devtools/dbg-server.jsm", {});
 let { console } = devtools.require("resource://gre/modules/devtools/Console.jsm");
 let { merge } = devtools.require("sdk/util/object");
diff --git a/browser/devtools/scratchpad/scratchpad.js b/browser/devtools/scratchpad/scratchpad.js
index 33d9d63f0eb5..ad383a6fd436 100644
--- a/browser/devtools/scratchpad/scratchpad.js
+++ b/browser/devtools/scratchpad/scratchpad.js
@@ -50,6 +50,7 @@ const Editor    = require("devtools/sourceeditor/editor");
 const TargetFactory = require("devtools/framework/target").TargetFactory;
 const EventEmitter = require("devtools/toolkit/event-emitter");
 const {DevToolsWorker} = require("devtools/toolkit/shared/worker");
+const DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
 
 const { Promise: promise } = Cu.import("resource://gre/modules/Promise.jsm", {});
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
@@ -61,7 +62,6 @@ Cu.import("resource:///modules/devtools/gDevTools.jsm");
 Cu.import("resource://gre/modules/osfile.jsm");
 Cu.import("resource:///modules/devtools/ViewHelpers.jsm");
 Cu.import("resource://gre/modules/reflect.jsm");
-Cu.import("resource://gre/modules/devtools/DevToolsUtils.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "VariablesView",
   "resource:///modules/devtools/VariablesView.jsm");
diff --git a/browser/devtools/scratchpad/test/head.js b/browser/devtools/scratchpad/test/head.js
index 81ba9acdf588..7c9c30dd93bd 100644
--- a/browser/devtools/scratchpad/test/head.js
+++ b/browser/devtools/scratchpad/test/head.js
@@ -9,9 +9,10 @@ const {FileUtils} = Cu.import("resource://gre/modules/FileUtils.jsm", {});
 const {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
 const {console} = Cu.import("resource://gre/modules/devtools/Console.jsm", {});
 const {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}).devtools;
-const {DevToolsUtils} = Cu.import("resource://gre/modules/devtools/DevToolsUtils.jsm", {});
+const DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
 const {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
 
+
 let gScratchpadWindow; // Reference to the Scratchpad chrome window object
 
 DevToolsUtils.testing = true;
diff --git a/browser/devtools/shadereditor/panel.js b/browser/devtools/shadereditor/panel.js
index 2376a47034a4..08bf606d842a 100644
--- a/browser/devtools/shadereditor/panel.js
+++ b/browser/devtools/shadereditor/panel.js
@@ -9,7 +9,7 @@ const { Cc, Ci, Cu, Cr } = require("chrome");
 const promise = Cu.import("resource://gre/modules/Promise.jsm", {}).Promise;
 const EventEmitter = require("devtools/toolkit/event-emitter");
 const { WebGLFront } = require("devtools/server/actors/webgl");
-const { DevToolsUtils } = Cu.import("resource://gre/modules/devtools/DevToolsUtils.jsm", {});
+const DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
 
 function ShaderEditorPanel(iframeWindow, toolbox) {
   this.panelWin = iframeWindow;
diff --git a/browser/devtools/shared/Parser.jsm b/browser/devtools/shared/Parser.jsm
index f5ad05404b1e..029f22e787d8 100644
--- a/browser/devtools/shared/Parser.jsm
+++ b/browser/devtools/shared/Parser.jsm
@@ -9,7 +9,8 @@ const Ci = Components.interfaces;
 const Cu = Components.utils;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-const { DevToolsUtils } = Cu.import("resource://gre/modules/devtools/DevToolsUtils.jsm", {});
+const { devtools } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
+const DevToolsUtils = devtools.require("devtools/toolkit/DevToolsUtils");
 
 XPCOMUtils.defineLazyModuleGetter(this,
   "Reflect", "resource://gre/modules/reflect.jsm");
diff --git a/browser/devtools/shared/SplitView.jsm b/browser/devtools/shared/SplitView.jsm
index 5e6322ef2a57..b480f9e513c6 100644
--- a/browser/devtools/shared/SplitView.jsm
+++ b/browser/devtools/shared/SplitView.jsm
@@ -8,7 +8,7 @@
 this.EXPORTED_SYMBOLS = ["SplitView"];
 
 /* this must be kept in sync with CSS (ie. splitview.css) */
-const LANDSCAPE_MEDIA_QUERY = "(min-width: 551px)";
+const LANDSCAPE_MEDIA_QUERY = "(min-width: 701px)";
 
 let bindings = new WeakMap();
 
diff --git a/browser/devtools/shared/splitview.css b/browser/devtools/shared/splitview.css
index 38e35e593772..de9c4e3304e3 100644
--- a/browser/devtools/shared/splitview.css
+++ b/browser/devtools/shared/splitview.css
@@ -43,12 +43,8 @@ box,
   display: -moz-box;
 }
 
-.splitview-landscape-resizer {
-  cursor: ew-resize;
-}
-
 /* this is to keep in sync with SplitView.jsm's LANDSCAPE_MEDIA_QUERY */
-@media (min-width: 551px) {
+@media (min-width: 701px) {
   .splitview-root {
     -moz-box-orient: horizontal;
   }
@@ -79,20 +75,8 @@ ol.splitview-nav > li.splitview-filtered {
   display: -moz-box;
 }
 
-.splitview-portrait-resizer {
-  display: none;
-}
-
 /* portrait mode */
-@media (max-width: 550px) {
-  .splitview-landscape-splitter {
-    display: none;
-  }
-
-  .splitview-portrait-resizer {
-    display: -moz-box;
-  }
-
+@media (max-width: 700px) {
   .splitview-controller {
     max-width: none;
   }
diff --git a/browser/devtools/shared/widgets/VariablesView.jsm b/browser/devtools/shared/widgets/VariablesView.jsm
index 61bd4efc6ff5..4ca953f0f317 100644
--- a/browser/devtools/shared/widgets/VariablesView.jsm
+++ b/browser/devtools/shared/widgets/VariablesView.jsm
@@ -21,13 +21,11 @@ Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource:///modules/devtools/ViewHelpers.jsm");
 Cu.import("resource://gre/modules/devtools/event-emitter.js");
-Cu.import("resource://gre/modules/devtools/DevToolsUtils.jsm");
+const { devtools } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
+const DevToolsUtils = devtools.require("devtools/toolkit/DevToolsUtils");
 Cu.import("resource://gre/modules/Task.jsm");
 let {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
 
-XPCOMUtils.defineLazyModuleGetter(this, "devtools",
-  "resource://gre/modules/devtools/Loader.jsm");
-
 XPCOMUtils.defineLazyModuleGetter(this, "PluralForm",
   "resource://gre/modules/PluralForm.jsm");
 
diff --git a/browser/devtools/shared/widgets/ViewHelpers.jsm b/browser/devtools/shared/widgets/ViewHelpers.jsm
index 5bd92c51dc40..264c16bec09f 100644
--- a/browser/devtools/shared/widgets/ViewHelpers.jsm
+++ b/browser/devtools/shared/widgets/ViewHelpers.jsm
@@ -16,7 +16,8 @@ const WIDGET_FOCUSABLE_NODES = new Set(["vbox", "hbox"]);
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Timer.jsm");
-Cu.import("resource://gre/modules/devtools/DevToolsUtils.jsm");
+const { devtools } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
+const DevToolsUtils = devtools.require("devtools/toolkit/DevToolsUtils");
 Cu.import("resource://gre/modules/devtools/event-emitter.js");
 
 this.EXPORTED_SYMBOLS = [
diff --git a/browser/devtools/styleeditor/styleeditor.xul b/browser/devtools/styleeditor/styleeditor.xul
index 168bc1c60f11..920cd9dffd4b 100644
--- a/browser/devtools/styleeditor/styleeditor.xul
+++ b/browser/devtools/styleeditor/styleeditor.xul
@@ -91,7 +91,7 @@
 
   <xul:stack id="style-editor-chrome" class="loading theme-body">
 
-    <xul:box class="splitview-root" context="sidebar-context">
+    <xul:box class="splitview-root devtools-responsive-container" context="sidebar-context">
       <xul:box class="splitview-controller">
         <xul:box class="splitview-main">
           <xul:toolbar class="devtools-toolbar">
@@ -125,7 +125,7 @@
           </div>
         </xul:box> <!-- .splitview-nav-container -->
       </xul:box>   <!-- .splitview-controller -->
-      <xul:splitter class="devtools-side-splitter splitview-landscape-splitter devtools-invisible-splitter"/>
+      <xul:splitter class="devtools-side-splitter devtools-invisible-splitter"/>
       <xul:box class="splitview-side-details devtools-main-content"/>
 
       <div id="splitview-templates" hidden="true">
@@ -148,9 +148,6 @@
         </li>
 
         <xul:box id="splitview-tpl-details-stylesheet" class="splitview-details">
-          <xul:resizer class="splitview-portrait-resizer"
-                      dir="bottom"
-                      element="splitview-resizer-target"/>
           <xul:hbox class="stylesheet-details-container">
             <xul:box class="stylesheet-editor-input textbox"
                      data-placeholder="&editorTextbox.placeholder;"/>
diff --git a/browser/devtools/webide/themes/panel-listing.css b/browser/devtools/webide/themes/panel-listing.css
index 165ff2494aaa..0b64f05d40d2 100644
--- a/browser/devtools/webide/themes/panel-listing.css
+++ b/browser/devtools/webide/themes/panel-listing.css
@@ -14,7 +14,7 @@ label,
 #runtime-panel-projects {
   display: block;
   float: left;
-  width: auto;
+  width: 100%;
   text-align: left;
 }
 
diff --git a/browser/themes/shared/controlcenter/panel.inc.css b/browser/themes/shared/controlcenter/panel.inc.css
index aaabdd1b095f..27b54e61a29b 100644
--- a/browser/themes/shared/controlcenter/panel.inc.css
+++ b/browser/themes/shared/controlcenter/panel.inc.css
@@ -65,7 +65,7 @@
 }
 
 .identity-popup-section:not(:first-child) {
-  border-top: 1px solid rgb(229,229,229);
+  border-top: 1px solid ThreeDShadow;
 }
 
 #identity-popup-securityView,
@@ -126,7 +126,7 @@
 .identity-popup-expander > .button-box {
   padding: 0;
   -moz-appearance: none;
-  border: solid #e5e5e5;
+  border: solid ThreeDShadow;
   border-width: 0 0 0 1px;
 }
 
@@ -209,7 +209,7 @@
 }
 
 #identity-popup-securityView-header {
-  border-bottom: 1px solid #e5e5e5;
+  border-bottom: 1px solid ThreeDShadow;
   padding-bottom: 1em;
   margin-bottom: 1em;
 }
@@ -219,7 +219,7 @@
 }
 
 #identity-popup-content-verifier {
-  color: #636363;
+  color: Graytext;
 }
 
 #identity-popup-content-owner,
@@ -277,7 +277,7 @@
 
 #identity-popup-more-info-button {
   border: none;
-  border-top: 1px solid hsla(210,4%,10%,.14);
+  border-top: 1px solid ThreeDShadow;
   background: transparent;
   -moz-appearance: none;
   margin-top: 5px;
diff --git a/browser/themes/shared/devtools/splitview.css b/browser/themes/shared/devtools/splitview.css
index b5f2f5051bf3..4756122fd796 100644
--- a/browser/themes/shared/devtools/splitview.css
+++ b/browser/themes/shared/devtools/splitview.css
@@ -140,20 +140,3 @@
   min-width: 48px;
   min-height: 0;
 }
-
-
-/* Resizers */
-
-.splitview-portrait-resizer {
-  -moz-appearance: none;
-  background: linear-gradient(black 1px, rgba(255,255,255,0.2) 1px),
-              linear-gradient(hsl(210,11%,36%), hsl(210,11%,18%));
-  height: 12px;
-  background-size: 10px 2px, 100% 12px;
-  background-clip: content-box, border-box;
-  background-repeat: repeat-y, no-repeat;
-  background-position: center center;
-  padding: 2px 0;
-  border-top: 1px solid hsla(210,8%,5%,.5);
-  border-bottom: 1px solid hsla(210,8%,5%,.5);
-}
diff --git a/browser/themes/shared/identity-block/identity-block.inc.css b/browser/themes/shared/identity-block/identity-block.inc.css
index c7f1a71e8a4f..f2522901bf3a 100644
--- a/browser/themes/shared/identity-block/identity-block.inc.css
+++ b/browser/themes/shared/identity-block/identity-block.inc.css
@@ -111,6 +111,10 @@
   transition: none;
 }
 
+#urlbar[pageproxystate="invalid"] > #identity-box > #identity-icons > #tracking-protection-icon {
+  visibility: collapse;
+}
+
 /* MAIN IDENTITY ICON */
 
 #page-proxy-favicon {
@@ -119,26 +123,26 @@
   list-style-image: url(chrome://browser/skin/identity-not-secure.svg);
 }
 
-.chromeUI > #page-proxy-favicon[pageproxystate="valid"] {
+.chromeUI > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] {
   list-style-image: url(chrome://branding/content/identity-icons-brand.svg);
 }
 
-.verifiedDomain > #page-proxy-favicon[pageproxystate="valid"],
-.verifiedIdentity > #page-proxy-favicon[pageproxystate="valid"] {
+.verifiedDomain > #identity-icons > #page-proxy-favicon[pageproxystate="valid"],
+.verifiedIdentity > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] {
   list-style-image: url(chrome://browser/skin/identity-secure.svg);
 }
 
-.mixedActiveContent > #page-proxy-favicon[pageproxystate="valid"] {
+.mixedActiveContent > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] {
   list-style-image: url(chrome://browser/skin/identity-mixed-active-loaded.svg);
 }
 
-.weakCipher > #page-proxy-favicon[pageproxystate="valid"],
-.mixedDisplayContent > #page-proxy-favicon[pageproxystate="valid"],
-.mixedDisplayContentLoadedActiveBlocked > #page-proxy-favicon[pageproxystate="valid"] {
+.weakCipher > #identity-icons > #page-proxy-favicon[pageproxystate="valid"],
+.mixedDisplayContent > #identity-icons > #page-proxy-favicon[pageproxystate="valid"],
+.mixedDisplayContentLoadedActiveBlocked > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] {
   list-style-image: url(chrome://browser/skin/identity-mixed-passive-loaded.svg);
 }
 
-.mixedActiveBlocked > #page-proxy-favicon[pageproxystate="valid"] {
+.mixedActiveBlocked > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] {
   list-style-image: url(chrome://browser/skin/identity-mixed-active-blocked.svg);
 }
 
@@ -146,7 +150,7 @@
   opacity: 0.3;
 }
 
-#urlbar[actiontype="searchengine"] > #identity-box > #page-proxy-favicon {
+#urlbar[actiontype="searchengine"] > #identity-box > #identity-icons > #page-proxy-favicon {
   -moz-image-region: inherit;
   list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon);
   width: 16px;
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 1df194710096..043c707f7137 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -1221,6 +1221,7 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba
   #urlbar,
   .searchbar-textbox {
     @navbarTextboxCustomBorder@
+    border-radius: 1px;
   }
 
   @media (-moz-os-version: windows-vista),
diff --git a/dom/base/test/mochitest.ini b/dom/base/test/mochitest.ini
index b1cedc8b52db..2d667f291ecc 100644
--- a/dom/base/test/mochitest.ini
+++ b/dom/base/test/mochitest.ini
@@ -808,3 +808,4 @@ skip-if = buildapp == 'mulet' || buildapp == 'b2g'
 [test_window_element_enumeration.html]
 [test_referrer_redirect.html]
 [test_postMessages.html]
+[test_window_proto.html]
diff --git a/dom/base/test/test_window_proto.html b/dom/base/test/test_window_proto.html
new file mode 100644
index 000000000000..944f953bc4e2
--- /dev/null
+++ b/dom/base/test/test_window_proto.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>Test for ...</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+test(function() {
+  assert_throws(new TypeError, function() {
+    Object.setPrototypeOf(window, Object.create(window));
+  }, "Setting prototype via setPrototypeOf");
+
+  assert_throws(new TypeError, function() {
+    window.__proto__ = Object.create(window);
+  }, "Setting prototype via __proto__");
+}, "Setting the prototype of a window to something that has the window on its proto chain should throw");
+</script>
diff --git a/dom/bindings/Codegen.py b/dom/bindings/Codegen.py
index ac0e0c0017d2..786417adaf08 100644
--- a/dom/bindings/Codegen.py
+++ b/dom/bindings/Codegen.py
@@ -14305,6 +14305,9 @@ class CallbackMember(CGNativeMember):
                                         self.descriptorProvider,
                                         exceptionCode=self.exceptionCode,
                                         isCallbackReturnValue=isCallbackReturnValue,
+                                        # Allow returning a callback type that
+                                        # allows non-callable objects.
+                                        allowTreatNonCallableAsNull=True,
                                         sourceDescription=sourceDescription),
             replacements)
         assignRetval = string.Template(
diff --git a/dom/bindings/test/TestInterfaceJS.js b/dom/bindings/test/TestInterfaceJS.js
index 90be44d0ea4b..575c655582b5 100644
--- a/dom/bindings/test/TestInterfaceJS.js
+++ b/dom/bindings/test/TestInterfaceJS.js
@@ -156,6 +156,13 @@ TestInterfaceJS.prototype = {
     });
   },
 
+  get onsomething() {
+    return this.__DOM_IMPL__.getEventHandler("onsomething");
+  },
+
+  set onsomething(val) {
+    this.__DOM_IMPL__.setEventHandler("onsomething", val);
+  }
 };
 
 this.NSGetFactory = XPCOMUtils.generateNSGetFactory([TestInterfaceJS])
diff --git a/dom/bindings/test/mochitest.ini b/dom/bindings/test/mochitest.ini
index 3b82263d0fb7..11285070d318 100644
--- a/dom/bindings/test/mochitest.ini
+++ b/dom/bindings/test/mochitest.ini
@@ -64,4 +64,6 @@ skip-if = debug == false
 [test_unforgeablesonexpando.html]
 [test_crossOriginWindowSymbolAccess.html]
 [test_bug1123516_maplikesetlike.html]
-skip-if = debug == false
\ No newline at end of file
+skip-if = debug == false
+[test_jsimplemented_eventhandler.html]
+skip-if = debug == false
diff --git a/dom/bindings/test/test_jsimplemented_eventhandler.html b/dom/bindings/test/test_jsimplemented_eventhandler.html
new file mode 100644
index 000000000000..2854a31125d0
--- /dev/null
+++ b/dom/bindings/test/test_jsimplemented_eventhandler.html
@@ -0,0 +1,47 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=1186696
+-->
+<head>
+  <meta charset="utf-8">
+  <title>Test for Bug 1186696</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+  <script type="application/javascript">
+
+  /** Test for Bug 1186696 **/
+  SimpleTest.waitForExplicitFinish();
+
+  function doTest() {
+    var values = [ function() {}, 5, null, undefined, "some string", {} ];
+
+    while (values.length != 0) {
+      var value = values.pop();
+      var t = new TestInterfaceJS();
+      t.onsomething = value;
+      var gottenValue = t.onsomething;
+      if (typeof value == "object" || typeof value == "function") {
+        is(gottenValue, value, "Should get back the object-or-null we put in");
+      } else {
+        is(gottenValue, null, "Should get back null");
+      }
+    }
+
+    SimpleTest.finish();
+  }
+
+  SpecialPowers.pushPrefEnv({set: [['dom.expose_test_interfaces', true]]},
+                            doTest);
+  </script>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1186696">Mozilla Bug 1186696</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+
+</div>
+<pre id="test">
+</pre>
+</body>
+</html>
diff --git a/dom/media/AudioSink.cpp b/dom/media/AudioSink.cpp
index 1127d8bbae29..ad2fc73f465d 100644
--- a/dom/media/AudioSink.cpp
+++ b/dom/media/AudioSink.cpp
@@ -23,7 +23,7 @@ extern PRLogModuleInfo* gMediaDecoderLog;
 // The amount of audio frames that is used to fuzz rounding errors.
 static const int64_t AUDIO_FUZZ_FRAMES = 1;
 
-AudioSink::AudioSink(MediaQueue<AudioData>& aAudioQueue,
+AudioSink::AudioSink(MediaQueue<MediaData>& aAudioQueue,
                      int64_t aStartTime,
                      const AudioInfo& aInfo,
                      dom::AudioChannel aChannel)
@@ -417,7 +417,8 @@ AudioSink::PlayFromAudioQueue()
 {
   AssertOnAudioThread();
   NS_ASSERTION(!mAudioStream->IsPaused(), "Don't play when paused");
-  nsRefPtr<AudioData> audio(AudioQueue().PopFront());
+  nsRefPtr<AudioData> audio =
+    dont_AddRef(AudioQueue().PopFront().take()->As<AudioData>());
 
   SINK_LOG_V("playing %u frames of audio at time %lld",
              audio->mFrames, audio->mTime);
diff --git a/dom/media/AudioSink.h b/dom/media/AudioSink.h
index 7dcb76068ee9..e9dba4ee4617 100644
--- a/dom/media/AudioSink.h
+++ b/dom/media/AudioSink.h
@@ -26,7 +26,7 @@ class AudioSink {
 public:
   NS_INLINE_DECL_THREADSAFE_REFCOUNTING(AudioSink)
 
-  AudioSink(MediaQueue<AudioData>& aAudioQueue,
+  AudioSink(MediaQueue<MediaData>& aAudioQueue,
             int64_t aStartTime,
             const AudioInfo& aInfo,
             dom::AudioChannel aChannel);
@@ -121,7 +121,7 @@ private:
   void StartAudioStreamPlaybackIfNeeded();
   void WriteSilence(uint32_t aFrames);
 
-  MediaQueue<AudioData>& AudioQueue() const {
+  MediaQueue<MediaData>& AudioQueue() const {
     return mAudioQueue;
   }
 
@@ -136,7 +136,7 @@ private:
   void AssertOnAudioThread();
   void AssertNotOnAudioThread();
 
-  MediaQueue<AudioData>& mAudioQueue;
+  MediaQueue<MediaData>& mAudioQueue;
   mutable ReentrantMonitor mMonitor;
 
   // There members are accessed on the audio thread only.
diff --git a/dom/media/DecodedStream.cpp b/dom/media/DecodedStream.cpp
index 913f68203e21..afccf797506b 100644
--- a/dom/media/DecodedStream.cpp
+++ b/dom/media/DecodedStream.cpp
@@ -184,8 +184,8 @@ OutputStreamData::Init(DecodedStream* aDecodedStream, ProcessedMediaStream* aStr
   aStream->AddListener(mListener);
 }
 
-DecodedStream::DecodedStream(MediaQueue<AudioData>& aAudioQueue,
-                             MediaQueue<VideoData>& aVideoQueue)
+DecodedStream::DecodedStream(MediaQueue<MediaData>& aAudioQueue,
+                             MediaQueue<MediaData>& aVideoQueue)
   : mMonitor("DecodedStream::mMonitor")
   , mPlaying(false)
   , mAudioQueue(aAudioQueue)
@@ -402,19 +402,21 @@ DecodedStream::InitTracks()
 
 static void
 SendStreamAudio(DecodedStreamData* aStream, int64_t aStartTime,
-                AudioData* aAudio, AudioSegment* aOutput,
+                MediaData* aData, AudioSegment* aOutput,
                 uint32_t aRate, double aVolume)
 {
+  MOZ_ASSERT(aData);
+  AudioData* audio = aData->As<AudioData>();
   // This logic has to mimic AudioSink closely to make sure we write
   // the exact same silences
   CheckedInt64 audioWrittenOffset = aStream->mAudioFramesWritten +
                                     UsecsToFrames(aStartTime, aRate);
-  CheckedInt64 frameOffset = UsecsToFrames(aAudio->mTime, aRate);
+  CheckedInt64 frameOffset = UsecsToFrames(audio->mTime, aRate);
 
   if (!audioWrittenOffset.isValid() ||
       !frameOffset.isValid() ||
       // ignore packet that we've already processed
-      frameOffset.value() + aAudio->mFrames <= audioWrittenOffset.value()) {
+      frameOffset.value() + audio->mFrames <= audioWrittenOffset.value()) {
     return;
   }
 
@@ -431,20 +433,20 @@ SendStreamAudio(DecodedStreamData* aStream, int64_t aStartTime,
   MOZ_ASSERT(audioWrittenOffset.value() >= frameOffset.value());
 
   int64_t offset = audioWrittenOffset.value() - frameOffset.value();
-  size_t framesToWrite = aAudio->mFrames - offset;
+  size_t framesToWrite = audio->mFrames - offset;
 
-  aAudio->EnsureAudioBuffer();
-  nsRefPtr<SharedBuffer> buffer = aAudio->mAudioBuffer;
+  audio->EnsureAudioBuffer();
+  nsRefPtr<SharedBuffer> buffer = audio->mAudioBuffer;
   AudioDataValue* bufferData = static_cast<AudioDataValue*>(buffer->Data());
   nsAutoTArray<const AudioDataValue*, 2> channels;
-  for (uint32_t i = 0; i < aAudio->mChannels; ++i) {
-    channels.AppendElement(bufferData + i * aAudio->mFrames + offset);
+  for (uint32_t i = 0; i < audio->mChannels; ++i) {
+    channels.AppendElement(bufferData + i * audio->mFrames + offset);
   }
   aOutput->AppendFrames(buffer.forget(), channels, framesToWrite);
   aStream->mAudioFramesWritten += framesToWrite;
   aOutput->ApplyVolume(aVolume);
 
-  aStream->mNextAudioTime = aAudio->GetEndTime();
+  aStream->mNextAudioTime = audio->GetEndTime();
 }
 
 void
@@ -458,7 +460,7 @@ DecodedStream::SendAudio(double aVolume, bool aIsSameOrigin)
 
   AudioSegment output;
   uint32_t rate = mInfo.mAudio.mRate;
-  nsAutoTArray<nsRefPtr<AudioData>,10> audio;
+  nsAutoTArray<nsRefPtr<MediaData>,10> audio;
   TrackID audioTrackId = mInfo.mAudio.mTrackId;
   SourceMediaStream* sourceStream = mData->mStream;
 
@@ -523,7 +525,7 @@ DecodedStream::SendVideo(bool aIsSameOrigin)
 
   VideoSegment output;
   TrackID videoTrackId = mInfo.mVideo.mTrackId;
-  nsAutoTArray<nsRefPtr<VideoData>, 10> video;
+  nsAutoTArray<nsRefPtr<MediaData>, 10> video;
   SourceMediaStream* sourceStream = mData->mStream;
 
   // It's OK to hold references to the VideoData because VideoData
@@ -531,7 +533,7 @@ DecodedStream::SendVideo(bool aIsSameOrigin)
   mVideoQueue.GetElementsAfter(mData->mNextVideoTime, &video);
 
   for (uint32_t i = 0; i < video.Length(); ++i) {
-    VideoData* v = video[i];
+    VideoData* v = video[i]->As<VideoData>();
 
     if (mData->mNextVideoTime < v->mTime) {
       // Write last video frame to catch up. mLastVideoImage can be null here
diff --git a/dom/media/DecodedStream.h b/dom/media/DecodedStream.h
index ebad8330c865..2e415fde5ddb 100644
--- a/dom/media/DecodedStream.h
+++ b/dom/media/DecodedStream.h
@@ -19,8 +19,7 @@
 
 namespace mozilla {
 
-class AudioData;
-class VideoData;
+class MediaData;
 class AudioSegment;
 class MediaStream;
 class MediaInputPort;
@@ -97,8 +96,8 @@ public:
 class DecodedStream {
   NS_INLINE_DECL_THREADSAFE_REFCOUNTING(DecodedStream);
 public:
-  DecodedStream(MediaQueue<AudioData>& aAudioQueue,
-                MediaQueue<VideoData>& aVideoQueue);
+  DecodedStream(MediaQueue<MediaData>& aAudioQueue,
+                MediaQueue<MediaData>& aVideoQueue);
 
   // Mimic MDSM::StartAudioThread.
   // Must be called before any calls to SendData().
@@ -149,8 +148,8 @@ private:
   Maybe<int64_t> mStartTime;
   MediaInfo mInfo;
 
-  MediaQueue<AudioData>& mAudioQueue;
-  MediaQueue<VideoData>& mVideoQueue;
+  MediaQueue<MediaData>& mAudioQueue;
+  MediaQueue<MediaData>& mVideoQueue;
 };
 
 } // namespace mozilla
diff --git a/dom/media/MediaData.cpp b/dom/media/MediaData.cpp
index 5cf8a43a46ee..0a15a5e7613a 100644
--- a/dom/media/MediaData.cpp
+++ b/dom/media/MediaData.cpp
@@ -115,7 +115,7 @@ VideoData::VideoData(int64_t aOffset,
                      int64_t aTimecode,
                      IntSize aDisplay,
                      layers::ImageContainer::FrameID aFrameID)
-  : MediaData(VIDEO_DATA, aOffset, aTime, aDuration)
+  : MediaData(VIDEO_DATA, aOffset, aTime, aDuration, 1)
   , mDisplay(aDisplay)
   , mFrameID(aFrameID)
   , mSentToCompositor(false)
@@ -488,7 +488,7 @@ VideoData::Create(const VideoInfo& aInfo,
 #define RAW_DATA_DEFAULT_SIZE 4096
 
 MediaRawData::MediaRawData()
-  : MediaData(RAW_DATA)
+  : MediaData(RAW_DATA, 0)
   , mData(nullptr)
   , mSize(0)
   , mCrypto(mCryptoInternal)
@@ -499,7 +499,7 @@ MediaRawData::MediaRawData()
 }
 
 MediaRawData::MediaRawData(const uint8_t* aData, size_t aSize)
-  : MediaData(RAW_DATA)
+  : MediaData(RAW_DATA, 0)
   , mData(nullptr)
   , mSize(0)
   , mCrypto(mCryptoInternal)
diff --git a/dom/media/MediaData.h b/dom/media/MediaData.h
index 798634efe203..d85c5f5e598a 100644
--- a/dom/media/MediaData.h
+++ b/dom/media/MediaData.h
@@ -40,12 +40,14 @@ public:
   MediaData(Type aType,
             int64_t aOffset,
             int64_t aTimestamp,
-            int64_t aDuration)
+            int64_t aDuration,
+            uint32_t aFrames)
     : mType(aType)
     , mOffset(aOffset)
     , mTime(aTimestamp)
     , mTimecode(aTimestamp)
     , mDuration(aDuration)
+    , mFrames(aFrames)
     , mKeyframe(false)
     , mDiscontinuity(false)
   {}
@@ -66,6 +68,9 @@ public:
   // Duration of sample, in microseconds.
   int64_t mDuration;
 
+  // Amount of frames for contained data.
+  const uint32_t mFrames;
+
   bool mKeyframe;
 
   // True if this is the first sample after a gap or discontinuity in
@@ -79,13 +84,29 @@ public:
     mTime = mTime - aStartTime;
     return mTime >= 0;
   }
+
+  template <typename ReturnType>
+  const ReturnType* As() const
+  {
+    MOZ_ASSERT(this->mType == ReturnType::sType);
+    return static_cast<const ReturnType*>(this);
+  }
+
+  template <typename ReturnType>
+  ReturnType* As()
+  {
+    MOZ_ASSERT(this->mType == ReturnType::sType);
+    return static_cast<ReturnType*>(this);
+  }
+
 protected:
-  explicit MediaData(Type aType)
+  MediaData(Type aType, uint32_t aFrames)
     : mType(aType)
     , mOffset(0)
     , mTime(0)
     , mTimecode(0)
     , mDuration(0)
+    , mFrames(aFrames)
     , mKeyframe(false)
     , mDiscontinuity(false)
   {}
@@ -105,8 +126,7 @@ public:
             AudioDataValue* aData,
             uint32_t aChannels,
             uint32_t aRate)
-    : MediaData(sType, aOffset, aTime, aDuration)
-    , mFrames(aFrames)
+    : MediaData(sType, aOffset, aTime, aDuration, aFrames)
     , mChannels(aChannels)
     , mRate(aRate)
     , mAudioData(aData) {}
@@ -128,7 +148,6 @@ public:
   // If mAudioBuffer is null, creates it from mAudioData.
   void EnsureAudioBuffer();
 
-  const uint32_t mFrames;
   const uint32_t mChannels;
   const uint32_t mRate;
   // At least one of mAudioBuffer/mAudioData must be non-null.
diff --git a/dom/media/MediaDecoder.cpp b/dom/media/MediaDecoder.cpp
index 3f0cdadc6a19..0daeb4628ae7 100644
--- a/dom/media/MediaDecoder.cpp
+++ b/dom/media/MediaDecoder.cpp
@@ -540,7 +540,7 @@ nsresult MediaDecoder::InitializeStateMachine(MediaDecoder* aCloneDonor)
   // set them now
   SetStateMachineParameters();
 
-  return ScheduleStateMachine();
+  return NS_OK;
 }
 
 void MediaDecoder::SetStateMachineParameters()
@@ -562,19 +562,6 @@ void MediaDecoder::SetMinimizePrerollUntilPlaybackStarts()
   MOZ_DIAGNOSTIC_ASSERT(!mDecoderStateMachine);
 }
 
-nsresult MediaDecoder::ScheduleStateMachine()
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  if (mShuttingDown)
-    return NS_OK;
-
-  MOZ_ASSERT(mDecoderStateMachine);
-  NS_ENSURE_STATE(mDecoderStateMachine);
-  ReentrantMonitorAutoEnter mon(GetReentrantMonitor());
-  mDecoderStateMachine->ScheduleStateMachineCrossThread();
-  return NS_OK;
-}
-
 nsresult MediaDecoder::Play()
 {
   MOZ_ASSERT(NS_IsMainThread());
@@ -585,7 +572,7 @@ nsresult MediaDecoder::Play()
   if (mPausedForPlaybackRateNull) {
     return NS_OK;
   }
-  ScheduleStateMachine();
+
   if (IsEnded()) {
     return Seek(0, SeekTarget::PrevSyncPoint);
   } else if (mPlayState == PLAY_STATE_LOADING) {
@@ -1047,8 +1034,6 @@ void MediaDecoder::ChangeState(PlayState aState)
     RemoveMediaTracks();
   }
 
-  ScheduleStateMachine();
-
   CancelDormantTimer();
   // Start dormant timer if necessary
   StartDormantTimer();
diff --git a/dom/media/MediaDecoder.h b/dom/media/MediaDecoder.h
index d216bf9c7666..3eba99247e1a 100644
--- a/dom/media/MediaDecoder.h
+++ b/dom/media/MediaDecoder.h
@@ -724,10 +724,6 @@ public:
   static bool IsAppleMP3Enabled();
 #endif
 
-  // Schedules the state machine to run one cycle on the shared state
-  // machine thread. Main thread only.
-  nsresult ScheduleStateMachine();
-
   struct Statistics {
     // Estimate of the current playback rate (bytes/second).
     double mPlaybackRate;
diff --git a/dom/media/MediaDecoderStateMachine.cpp b/dom/media/MediaDecoderStateMachine.cpp
index ac546d835cf4..ca29ec2af00b 100644
--- a/dom/media/MediaDecoderStateMachine.cpp
+++ b/dom/media/MediaDecoderStateMachine.cpp
@@ -287,13 +287,13 @@ MediaDecoderStateMachine::MediaDecoderStateMachine(MediaDecoder* aDecoder,
   nsRefPtr<MediaDecoderStateMachine> self = this;
 
   AudioQueue().AddPopListener(
-    [self] (const AudioData* aSample) {
-      self->OnAudioPopped(aSample);
-    }, mTaskQueue);
+    [self] (const MediaData* aSample) {
+      self->OnAudioPopped(aSample->As<AudioData>());
+     }, mTaskQueue);
 
   VideoQueue().AddPopListener(
-    [self] (const VideoData* aSample) {
-      self->OnVideoPopped(aSample);
+    [self] (const MediaData* aSample) {
+      self->OnVideoPopped(aSample->As<VideoData>());
     }, mTaskQueue);
 }
 
@@ -384,13 +384,14 @@ void MediaDecoderStateMachine::SendStreamData()
 
   const auto clockTime = GetClock();
   while (true) {
-    const AudioData* a = AudioQueue().PeekFront();
+    const MediaData* a = AudioQueue().PeekFront();
+
     // If we discard audio samples fed to the stream immediately, we will
     // keep decoding audio samples till the end and consume a lot of memory.
     // Therefore we only discard those behind the stream clock to throttle
     // the decoding speed.
     if (a && a->mTime <= clockTime) {
-      nsRefPtr<AudioData> releaseMe = AudioQueue().PopFront();
+      nsRefPtr<MediaData> releaseMe = AudioQueue().PopFront();
       continue;
     }
     break;
@@ -1042,7 +1043,7 @@ nsresult MediaDecoderStateMachine::Init(MediaDecoderStateMachine* aCloneDonor)
 
   nsresult rv = mReader->Init(cloneReader);
   NS_ENSURE_SUCCESS(rv, rv);
-
+  ScheduleStateMachineCrossThread();
   return NS_OK;
 }
 
@@ -2113,11 +2114,11 @@ MediaDecoderStateMachine::SeekCompleted()
   int64_t newCurrentTime = seekTime;
 
   // Setup timestamp state.
-  nsRefPtr<VideoData> video = VideoQueue().PeekFront();
+  nsRefPtr<MediaData> video = VideoQueue().PeekFront();
   if (seekTime == Duration().ToMicroseconds()) {
     newCurrentTime = seekTime;
   } else if (HasAudio()) {
-    AudioData* audio = AudioQueue().PeekFront();
+    MediaData* audio = AudioQueue().PeekFront();
     // Though we adjust the newCurrentTime in audio-based, and supplemented
     // by video. For better UX, should NOT bind the slide position to
     // the first audio data timestamp directly.
@@ -2516,7 +2517,7 @@ void MediaDecoderStateMachine::RenderVideoFrames(int32_t aMaxFrames,
   AssertCurrentThreadInMonitor();
 
   VideoFrameContainer* container = mDecoder->GetVideoFrameContainer();
-  nsAutoTArray<nsRefPtr<VideoData>,16> frames;
+  nsAutoTArray<nsRefPtr<MediaData>,16> frames;
   VideoQueue().GetFirstElements(aMaxFrames, &frames);
   if (frames.IsEmpty() || !container) {
     return;
@@ -2525,7 +2526,7 @@ void MediaDecoderStateMachine::RenderVideoFrames(int32_t aMaxFrames,
   nsAutoTArray<ImageContainer::NonOwningImage,16> images;
   TimeStamp lastFrameTime;
   for (uint32_t i = 0; i < frames.Length(); ++i) {
-    VideoData* frame = frames[i];
+    VideoData* frame = frames[i]->As<VideoData>();
     frame->mSentToCompositor = true;
 
     int64_t frameTime = frame->mTime;
@@ -2562,7 +2563,7 @@ void MediaDecoderStateMachine::RenderVideoFrames(int32_t aMaxFrames,
                 VideoQueue().GetSize(), mReader->SizeOfVideoQueueInFrames());
   }
 
-  container->SetCurrentFrames(frames[0]->mDisplay, images);
+  container->SetCurrentFrames(frames[0]->As<VideoData>()->mDisplay, images);
 }
 
 void MediaDecoderStateMachine::ResyncAudioClock()
@@ -2666,21 +2667,21 @@ void MediaDecoderStateMachine::UpdateRenderedVideoFrames()
   NS_ASSERTION(clockTime >= 0, "Should have positive clock time.");
   int64_t remainingTime = AUDIO_DURATION_USECS;
   if (VideoQueue().GetSize() > 0) {
-    nsRefPtr<VideoData> currentFrame = VideoQueue().PopFront();
+    nsRefPtr<MediaData> currentFrame = VideoQueue().PopFront();
     int32_t framesRemoved = 0;
     while (VideoQueue().GetSize() > 0) {
-      VideoData* nextFrame = VideoQueue().PeekFront();
+      MediaData* nextFrame = VideoQueue().PeekFront();
       if (!IsRealTime() && nextFrame->mTime > clockTime) {
         remainingTime = nextFrame->mTime - clockTime;
         break;
       }
       ++framesRemoved;
-      if (!currentFrame->mSentToCompositor) {
+      if (!currentFrame->As<VideoData>()->mSentToCompositor) {
         mDecoder->NotifyDecodedFrames(0, 0, 1);
         VERBOSE_LOG("discarding video frame mTime=%lld clock_time=%lld",
                     currentFrame->mTime, clockTime);
       }
-      CheckTurningOffHardwareDecoder(currentFrame);
+      CheckTurningOffHardwareDecoder(currentFrame->As<VideoData>());
       currentFrame = VideoQueue().PopFront();
 
     }
diff --git a/dom/media/MediaDecoderStateMachine.h b/dom/media/MediaDecoderStateMachine.h
index f6d5cfa98015..db17730683e5 100644
--- a/dom/media/MediaDecoderStateMachine.h
+++ b/dom/media/MediaDecoderStateMachine.h
@@ -406,8 +406,8 @@ protected:
   void LogicalPlaybackRateChanged();
   void PreservesPitchChanged();
 
-  MediaQueue<AudioData>& AudioQueue() { return mAudioQueue; }
-  MediaQueue<VideoData>& VideoQueue() { return mVideoQueue; }
+  MediaQueue<MediaData>& AudioQueue() { return mAudioQueue; }
+  MediaQueue<MediaData>& VideoQueue() { return mVideoQueue; }
 
   // True if our buffers of decoded audio are not full, and we should
   // decode more.
@@ -879,11 +879,10 @@ private:
 
   // Queue of audio frames. This queue is threadsafe, and is accessed from
   // the audio, decoder, state machine, and main threads.
-  MediaQueue<AudioData> mAudioQueue;
-
+  MediaQueue<MediaData> mAudioQueue;
   // Queue of video frames. This queue is threadsafe, and is accessed from
   // the decoder, state machine, and main threads.
-  MediaQueue<VideoData> mVideoQueue;
+  MediaQueue<MediaData> mVideoQueue;
 
   // The decoder monitor must be obtained before modifying this state.
   // NotifyAll on the monitor must be called when the state is changed so
diff --git a/dom/media/mediasource/MediaSourceDecoder.cpp b/dom/media/mediasource/MediaSourceDecoder.cpp
index 63a7b091f368..46026d1936c3 100644
--- a/dom/media/mediasource/MediaSourceDecoder.cpp
+++ b/dom/media/mediasource/MediaSourceDecoder.cpp
@@ -72,7 +72,7 @@ MediaSourceDecoder::Load(nsIStreamListener**, MediaDecoder*)
   NS_ENSURE_SUCCESS(rv, rv);
 
   SetStateMachineParameters();
-  return ScheduleStateMachine();
+  return NS_OK;
 }
 
 media::TimeIntervals
diff --git a/dom/webidl/EventTarget.webidl b/dom/webidl/EventTarget.webidl
index 0fc5e7bd005e..6742fce2f0f3 100644
--- a/dom/webidl/EventTarget.webidl
+++ b/dom/webidl/EventTarget.webidl
@@ -32,8 +32,14 @@ interface EventTarget {
 // Mozilla extensions for use by JS-implemented event targets to
 // implement on* properties.
 partial interface EventTarget {
+  // The use of [TreatNonCallableAsNull] here is a bit of a hack: it just makes
+  // the codegen check whether the type involved is either
+  // [TreatNonCallableAsNull] or [TreatNonObjectAsNull] and if it is handle it
+  // accordingly.  In particular, it will NOT actually treat a non-null
+  // non-callable object as null here.
   [ChromeOnly, Throws]
-  void setEventHandler(DOMString type, EventHandler handler);
+  void setEventHandler(DOMString type,
+                       [TreatNonCallableAsNull] EventHandler handler);
 
   [ChromeOnly]
   EventHandler getEventHandler(DOMString type);
diff --git a/dom/webidl/TestInterfaceJS.webidl b/dom/webidl/TestInterfaceJS.webidl
index 2176bcd77a5d..1ca629c39e2c 100644
--- a/dom/webidl/TestInterfaceJS.webidl
+++ b/dom/webidl/TestInterfaceJS.webidl
@@ -12,7 +12,7 @@ dictionary TestInterfaceJSUnionableDictionary {
 [JSImplementation="@mozilla.org/dom/test-interface-js;1",
  Pref="dom.expose_test_interfaces",
  Constructor(optional any anyArg, optional object objectArg, optional TestInterfaceJSDictionary dictionaryArg)]
-interface TestInterfaceJS {
+interface TestInterfaceJS : EventTarget {
   readonly attribute any anyArg;
   readonly attribute object objectArg;
   [Cached, Pure] readonly attribute TestInterfaceJSDictionary dictionaryArg;
@@ -78,4 +78,7 @@ interface TestInterfaceJS {
   Promise<void> testPromiseWithThrowingChromeThenable();
   Promise<void> testPromiseWithThrowingContentThenable(object thenable);
   Promise<void> testPromiseWithDOMExceptionThrowingThenable();
+
+  // Event handler tests
+  attribute EventHandler onsomething;
 };
diff --git a/gfx/layers/client/TiledContentClient.cpp b/gfx/layers/client/TiledContentClient.cpp
index 9c6bc34b7d63..b93918cf5753 100644
--- a/gfx/layers/client/TiledContentClient.cpp
+++ b/gfx/layers/client/TiledContentClient.cpp
@@ -1048,33 +1048,6 @@ void PadDrawTargetOutFromRegion(RefPtr<DrawTarget> drawTarget, nsIntRegion &regi
   }
 }
 
-void
-ClientTiledLayerBuffer::PostValidate(const nsIntRegion& aPaintRegion,
-                                     const nsIntRegion& aDirtyRegion)
-{
-  if (gfxPrefs::TiledDrawTargetEnabled() && mMoz2DTiles.size() > 0) {
-    gfx::TileSet tileset;
-    for (size_t i = 0; i < mMoz2DTiles.size(); ++i) {
-      mMoz2DTiles[i].mTileOrigin -= mTilingOrigin;
-    }
-    tileset.mTiles = &mMoz2DTiles[0];
-    tileset.mTileCount = mMoz2DTiles.size();
-    RefPtr<DrawTarget> drawTarget = gfx::Factory::CreateTiledDrawTarget(tileset);
-    drawTarget->SetTransform(Matrix());
-
-    RefPtr<gfxContext> ctx = new gfxContext(drawTarget);
-    ctx->SetMatrix(
-      ctx->CurrentMatrix().Scale(mResolution, mResolution).Translate(ThebesPoint(-mTilingOrigin)));
-
-    mCallback(mPaintedLayer, ctx, aPaintRegion, aDirtyRegion,
-              DrawRegionClip::DRAW, nsIntRegion(), mCallbackData);
-    mMoz2DTiles.clear();
-    // Reset:
-    mTilingOrigin = IntPoint(std::numeric_limits<int32_t>::max(),
-                             std::numeric_limits<int32_t>::max());
-  }
-}
-
 void
 ClientTiledLayerBuffer::UnlockTile(TileClient& aTile)
 {
@@ -1150,9 +1123,61 @@ void ClientTiledLayerBuffer::Update(const nsIntRegion& newValidRegion,
     }
   }
 
-  PostValidate(aPaintRegion, aDirtyRegion);
+  if (gfxPrefs::TiledDrawTargetEnabled() && mMoz2DTiles.size() > 0) {
+    gfx::TileSet tileset;
+    for (size_t i = 0; i < mMoz2DTiles.size(); ++i) {
+      mMoz2DTiles[i].mTileOrigin -= mTilingOrigin;
+    }
+    tileset.mTiles = &mMoz2DTiles[0];
+    tileset.mTileCount = mMoz2DTiles.size();
+    RefPtr<DrawTarget> drawTarget = gfx::Factory::CreateTiledDrawTarget(tileset);
+    drawTarget->SetTransform(Matrix());
 
-  for (TileClient& tile : mRetainedTiles) {
+    RefPtr<gfxContext> ctx = new gfxContext(drawTarget);
+    ctx->SetMatrix(
+      ctx->CurrentMatrix().Scale(mResolution, mResolution).Translate(ThebesPoint(-mTilingOrigin)));
+
+    mCallback(mPaintedLayer, ctx, aPaintRegion, aDirtyRegion,
+              DrawRegionClip::DRAW, nsIntRegion(), mCallbackData);
+    mMoz2DTiles.clear();
+    // Reset:
+    mTilingOrigin = IntPoint(std::numeric_limits<int32_t>::max(),
+                             std::numeric_limits<int32_t>::max());
+  }
+
+  bool edgePaddingEnabled = gfxPrefs::TileEdgePaddingEnabled();
+
+  for (uint32_t i = 0; i < mRetainedTiles.Length(); ++i) {
+    TileClient& tile = mRetainedTiles[i];
+
+    // Only worry about padding when not doing low-res because it simplifies
+    // the math and the artifacts won't be noticable
+    // Edge padding prevents sampling artifacts when compositing.
+    if (edgePaddingEnabled && mResolution == 1 &&
+        tile.mFrontBuffer && tile.mFrontBuffer->IsLocked()) {
+
+      const TileIntPoint tilePosition = newTiles.TilePosition(i);
+      IntPoint tileOffset = GetTileOffset(tilePosition);
+      // Strictly speakig we want the unscaled rect here, but it doesn't matter
+      // because we only run this code when the resolution is equal to 1.
+      IntRect tileRect = IntRect(tileOffset.x, tileOffset.y,
+                                 GetTileSize().width, GetTileSize().height);
+
+      nsIntRegion tileDrawRegion = IntRect(tileOffset, scaledTileSize);
+      tileDrawRegion.AndWith(aPaintRegion);
+
+      nsIntRegion tileValidRegion = mValidRegion;
+      tileValidRegion.OrWith(tileDrawRegion);
+
+      // We only need to pad out if the tile has area that's not valid
+      if (!tileValidRegion.Contains(tileRect)) {
+        tileValidRegion = tileValidRegion.Intersect(tileRect);
+        // translate the region into tile space and pad
+        tileValidRegion.MoveBy(-IntPoint(tileOffset.x, tileOffset.y));
+        RefPtr<DrawTarget> drawTarget = tile.mFrontBuffer->BorrowDrawTarget();
+        PadDrawTargetOutFromRegion(drawTarget, tileValidRegion);
+      }
+    }
     UnlockTile(tile);
   }
 
@@ -1240,7 +1265,6 @@ ClientTiledLayerBuffer::ValidateTile(TileClient& aTile,
       }
     }
 
-    // prepare an array of Moz2D tiles that will be painted into in PostValidate
     gfx::Tile moz2DTile;
     RefPtr<DrawTarget> dt = backBuffer->BorrowDrawTarget();
     RefPtr<DrawTarget> dtOnWhite;
@@ -1326,26 +1350,6 @@ ClientTiledLayerBuffer::ValidateTile(TileClient& aTile,
     aTile.mInvalidFront.Or(aTile.mInvalidFront, IntRect(copyTarget.x, copyTarget.y, copyRect.width, copyRect.height));
   }
 
-  // only worry about padding when not doing low-res
-  // because it simplifies the math and the artifacts
-  // won't be noticable
-  if (mResolution == 1) {
-    IntRect unscaledTile = IntRect(aTileOrigin.x,
-                                       aTileOrigin.y,
-                                       GetTileSize().width,
-                                       GetTileSize().height);
-
-    nsIntRegion tileValidRegion = GetValidRegion();
-    tileValidRegion.Or(tileValidRegion, aDirtyRegion);
-    // We only need to pad out if the tile has area that's not valid
-    if (!tileValidRegion.Contains(unscaledTile)) {
-      tileValidRegion = tileValidRegion.Intersect(unscaledTile);
-      // translate the region into tile space and pad
-      tileValidRegion.MoveBy(-nsIntPoint(unscaledTile.x, unscaledTile.y));
-      PadDrawTargetOutFromRegion(drawTarget, tileValidRegion);
-    }
-  }
-
   // The new buffer is now validated, remove the dirty region from it.
   aTile.mInvalidBack.SubOut(offsetScaledDirtyRegion);
 
@@ -1364,7 +1368,6 @@ ClientTiledLayerBuffer::ValidateTile(TileClient& aTile,
   tileRegion.SubOut(GetValidRegion());
   tileRegion.SubOut(aDirtyRegion); // Has now been validated
 
-  backBuffer->Unlock();
   backBuffer->SetWaste(tileRegion.Area() * mResolution * mResolution);
 
   if (createdTextureClient) {
diff --git a/gfx/layers/client/TiledContentClient.h b/gfx/layers/client/TiledContentClient.h
index b8b9c9f1136d..6f41b48f79e7 100644
--- a/gfx/layers/client/TiledContentClient.h
+++ b/gfx/layers/client/TiledContentClient.h
@@ -277,7 +277,6 @@ struct TileClient
   nsIntRegion mInvalidFront;
   nsIntRegion mInvalidBack;
   nsExpirationState mExpirationState;
-
 private:
   // Copies dirty pixels from the front buffer into the back buffer,
   // and records the copied region in aAddPaintedRegion.
@@ -469,9 +468,6 @@ protected:
                     const nsIntPoint& aTileRect,
                     const nsIntRegion& dirtyRect);
 
-  void PostValidate(const nsIntRegion& aPaintRegion,
-                    const nsIntRegion& aDirtyRegion);
-
   void UnlockTile(TileClient& aTile);
 
   TileClient GetPlaceholderTile() const { return TileClient(); }
diff --git a/gfx/layers/d3d11/CompositorD3D11.cpp b/gfx/layers/d3d11/CompositorD3D11.cpp
index 9f94005ce8b5..5907dd2883cb 100644
--- a/gfx/layers/d3d11/CompositorD3D11.cpp
+++ b/gfx/layers/d3d11/CompositorD3D11.cpp
@@ -685,10 +685,7 @@ CompositorD3D11::DrawVRDistortion(const gfx::Rect& aRect,
   mContext->PSSetShader(mAttachments->mVRDistortionPS[hmdType], nullptr, 0);
 
   // This is the source texture SRV for the pixel shader
-  // XXX, um should we cache this SRV on the source?
-  RefPtr<ID3D11ShaderResourceView> view;
-  mDevice->CreateShaderResourceView(source->GetD3D11Texture(), nullptr, byRef(view));
-  ID3D11ShaderResourceView* srView = view;
+  ID3D11ShaderResourceView* srView = source->GetShaderResourceView();
   mContext->PSSetShaderResources(0, 1, &srView);
 
   gfx::IntSize vpSizeInt = mCurrentRT->GetSize();
@@ -787,16 +784,7 @@ CompositorD3D11::DrawQuad(const gfx::Rect& aRect,
       return;
     }
 
-    RefPtr<ID3D11ShaderResourceView> view;
-    HRESULT hr = mDevice->CreateShaderResourceView(source->GetD3D11Texture(), nullptr, byRef(view));
-    if (Failed(hr)) {
-      // XXX - There's a chance we won't be able to render anything, should we
-      // just crash release builds?
-      gfxCriticalErrorOnce(gfxCriticalError::DefaultOptions(false)) << "Failed in DrawQuad 1";
-      return;
-    }
-
-    ID3D11ShaderResourceView* srView = view;
+    ID3D11ShaderResourceView* srView = source->GetShaderResourceView();
     mContext->PSSetShaderResources(3, 1, &srView);
 
     const gfx::Matrix4x4& maskTransform = maskEffect->mMaskTransform;
@@ -857,16 +845,7 @@ CompositorD3D11::DrawQuad(const gfx::Rect& aRect,
 
       SetPSForEffect(aEffectChain.mPrimaryEffect, maskType, texturedEffect->mTexture->GetFormat());
 
-      RefPtr<ID3D11ShaderResourceView> view;
-      HRESULT hr = mDevice->CreateShaderResourceView(source->GetD3D11Texture(), nullptr, byRef(view));
-      if (Failed(hr)) {
-        // XXX - There's a chance we won't be able to render anything, should we
-        // just crash release builds?
-        gfxCriticalErrorOnce(gfxCriticalError::DefaultOptions(false)) << "Failed in DrawQuad 2";
-        return;
-      }
-
-      ID3D11ShaderResourceView* srView = view;
+      ID3D11ShaderResourceView* srView = source->GetShaderResourceView();
       mContext->PSSetShaderResources(0, 1, &srView);
 
       if (!texturedEffect->mPremultiplied) {
@@ -905,32 +884,9 @@ CompositorD3D11::DrawQuad(const gfx::Rect& aRect,
       TextureSourceD3D11* sourceCb = source->GetSubSource(Cb)->AsSourceD3D11();
       TextureSourceD3D11* sourceCr = source->GetSubSource(Cr)->AsSourceD3D11();
 
-      HRESULT hr;
-
-      RefPtr<ID3D11ShaderResourceView> views[3];
-
-      hr = mDevice->CreateShaderResourceView(sourceY->GetD3D11Texture(),
-                                             nullptr, byRef(views[0]));
-      if (Failed(hr)) {
-        gfxCriticalErrorOnce(gfxCriticalError::DefaultOptions(false)) << "Failed in DrawQuad 3";
-        return;
-      }
-
-      hr = mDevice->CreateShaderResourceView(sourceCb->GetD3D11Texture(),
-                                             nullptr, byRef(views[1]));
-      if (Failed(hr)) {
-        gfxCriticalErrorOnce(gfxCriticalError::DefaultOptions(false)) << "Failed in DrawQuad 4";
-        return;
-      }
-
-      hr = mDevice->CreateShaderResourceView(sourceCr->GetD3D11Texture(),
-                                             nullptr, byRef(views[2]));
-      if (Failed(hr)) {
-        gfxCriticalErrorOnce(gfxCriticalError::DefaultOptions(false)) << "Failed in DrawQuad 5";
-        return;
-      }
-
-      ID3D11ShaderResourceView* srViews[3] = { views[0], views[1], views[2] };
+      ID3D11ShaderResourceView* srViews[3] = { sourceY->GetShaderResourceView(),
+                                               sourceCb->GetShaderResourceView(),
+                                               sourceCr->GetShaderResourceView() };
       mContext->PSSetShaderResources(0, 3, srViews);
     }
     break;
@@ -955,22 +911,8 @@ CompositorD3D11::DrawQuad(const gfx::Rect& aRect,
 
       pTexCoordRect = &effectComponentAlpha->mTextureCoords;
 
-      RefPtr<ID3D11ShaderResourceView> views[2];
-
-      HRESULT hr;
-
-      hr = mDevice->CreateShaderResourceView(sourceOnBlack->GetD3D11Texture(), nullptr, byRef(views[0]));
-      if (Failed(hr)) {
-        gfxCriticalErrorOnce(gfxCriticalError::DefaultOptions(false)) << "Failed in DrawQuad 6";
-        return;
-      }
-      hr = mDevice->CreateShaderResourceView(sourceOnWhite->GetD3D11Texture(), nullptr, byRef(views[1]));
-      if (Failed(hr)) {
-        gfxCriticalErrorOnce(gfxCriticalError::DefaultOptions(false)) << "Failed in DrawQuad 7";
-        return;
-      }
-
-      ID3D11ShaderResourceView* srViews[2] = { views[0], views[1] };
+      ID3D11ShaderResourceView* srViews[2] = { sourceOnBlack->GetShaderResourceView(),
+                                               sourceOnWhite->GetShaderResourceView() };
       mContext->PSSetShaderResources(0, 2, srViews);
 
       mContext->OMSetBlendState(mAttachments->mComponentBlendState, sBlendFactor, 0xFFFFFFFF);
diff --git a/gfx/layers/d3d11/TextureD3D11.cpp b/gfx/layers/d3d11/TextureD3D11.cpp
index 59af9af04128..92b0ab0b12a5 100644
--- a/gfx/layers/d3d11/TextureD3D11.cpp
+++ b/gfx/layers/d3d11/TextureD3D11.cpp
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -65,6 +65,23 @@ GetTileRectD3D11(uint32_t aID, IntSize aSize, uint32_t aMaxSize)
                  verticalTile < (verticalTiles - 1) ? aMaxSize : aSize.height % aMaxSize);
 }
 
+ID3D11ShaderResourceView*
+TextureSourceD3D11::GetShaderResourceView()
+{
+  MOZ_ASSERT(mTexture == GetD3D11Texture(), "You need to override GetShaderResourceView if you're overriding GetD3D11Texture!");
+
+  if (!mSRV && mTexture) {
+    RefPtr<ID3D11Device> device;
+    mTexture->GetDevice(byRef(device));
+    HRESULT hr = device->CreateShaderResourceView(mTexture, nullptr, byRef(mSRV));
+    if (FAILED(hr)) {
+      gfxCriticalError(CriticalLog::DefaultOptions(false)) << "[D3D11] TextureSourceD3D11:GetShaderResourceView CreateSRV failure " << gfx::hexa(hr);
+      return nullptr;
+    }
+  }
+  return mSRV;
+}
+
 DataTextureSourceD3D11::DataTextureSourceD3D11(SurfaceFormat aFormat,
                                                CompositorD3D11* aCompositor,
                                                TextureFlags aFlags)
@@ -954,6 +971,7 @@ DataTextureSourceD3D11::Update(DataSourceSurface* aSurface,
                          GetRequiredTilesD3D11(mSize.height, maxSize);
 
     mTileTextures.resize(tileCount);
+    mTileSRVs.resize(tileCount);
     mTexture = nullptr;
 
     for (uint32_t i = 0; i < tileCount; i++) {
@@ -986,10 +1004,34 @@ DataTextureSourceD3D11::GetD3D11Texture() const
                     : mTexture;
 }
 
+ID3D11ShaderResourceView*
+DataTextureSourceD3D11::GetShaderResourceView()
+{
+  if (mIterating) {
+    if (!mTileSRVs[mCurrentTile]) {
+      if (!mTileTextures[mCurrentTile]) {
+        return nullptr;
+      }
+      
+      RefPtr<ID3D11Device> device;
+      mTileTextures[mCurrentTile]->GetDevice(byRef(device));
+      HRESULT hr = device->CreateShaderResourceView(mTileTextures[mCurrentTile], nullptr, byRef(mTileSRVs[mCurrentTile]));
+      if (FAILED(hr)) {
+        gfxCriticalError(CriticalLog::DefaultOptions(false)) << "[D3D11] DataTextureSourceD3D11:GetShaderResourceView CreateSRV failure " << gfx::hexa(hr);
+        return nullptr;
+      }
+    }
+    return mTileSRVs[mCurrentTile];
+  }
+
+  return TextureSourceD3D11::GetShaderResourceView();
+}
+
 void
 DataTextureSourceD3D11::Reset()
 {
   mTexture = nullptr;
+  mTileSRVs.resize(0);
   mTileTextures.resize(0);
   mIsTiled = false;
   mSize.width = 0;
diff --git a/gfx/layers/d3d11/TextureD3D11.h b/gfx/layers/d3d11/TextureD3D11.h
index c6ca898c375d..86d016a93612 100644
--- a/gfx/layers/d3d11/TextureD3D11.h
+++ b/gfx/layers/d3d11/TextureD3D11.h
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -154,12 +154,13 @@ public:
   virtual ~TextureSourceD3D11() {}
 
   virtual ID3D11Texture2D* GetD3D11Texture() const { return mTexture; }
-
+  virtual ID3D11ShaderResourceView* GetShaderResourceView();
 protected:
   virtual gfx::IntSize GetSize() const { return mSize; }
 
   gfx::IntSize mSize;
   RefPtr<ID3D11Texture2D> mTexture;
+  RefPtr<ID3D11ShaderResourceView> mSRV;
 };
 
 /**
@@ -193,6 +194,8 @@ public:
 
   virtual ID3D11Texture2D* GetD3D11Texture() const override;
 
+  virtual ID3D11ShaderResourceView* GetShaderResourceView() override;
+
   virtual DataTextureSource* AsDataTextureSource() override { return this; }
 
   virtual void DeallocateDeviceData() override { mTexture = nullptr; }
@@ -227,6 +230,7 @@ protected:
   void Reset();
 
   std::vector< RefPtr<ID3D11Texture2D> > mTileTextures;
+  std::vector< RefPtr<ID3D11ShaderResourceView> > mTileSRVs;
   RefPtr<CompositorD3D11> mCompositor;
   gfx::SurfaceFormat mFormat;
   TextureFlags mFlags;
diff --git a/gfx/thebes/gfxPrefs.h b/gfx/thebes/gfxPrefs.h
index 844c4eab38ba..0044be4502a6 100644
--- a/gfx/thebes/gfxPrefs.h
+++ b/gfx/thebes/gfxPrefs.h
@@ -345,6 +345,7 @@ private:
   DECL_GFX_PREF(Once, "layers.tile-shrink-pool-timeout",       LayersTileShrinkPoolTimeout, uint32_t, (uint32_t)1000);
   DECL_GFX_PREF(Once, "layers.tiled-drawtarget.enabled",       TiledDrawTargetEnabled, bool, false);
   DECL_GFX_PREF(Once, "layers.tiles.adjust",                   LayersTilesAdjust, bool, true);
+  DECL_GFX_PREF(Once, "layers.tiles.edge-padding",             TileEdgePaddingEnabled, bool, true);
   DECL_GFX_PREF(Live, "layers.transaction.warning-ms",         LayerTransactionWarning, uint32_t, 200);
   DECL_GFX_PREF(Once, "layers.uniformity-info",                UniformityInfo, bool, false);
   DECL_GFX_PREF(Once, "layers.use-image-offscreen-surfaces",   UseImageOffscreenSurfaces, bool, false);
diff --git a/js/public/RootingAPI.h b/js/public/RootingAPI.h
index f7255059f8db..917b8928d513 100644
--- a/js/public/RootingAPI.h
+++ b/js/public/RootingAPI.h
@@ -623,6 +623,30 @@ class DispatchWrapper
     }
 };
 
+inline RootLists&
+RootListsForRootingContext(JSContext* cx)
+{
+    return ContextFriendFields::get(cx)->roots;
+}
+
+inline RootLists&
+RootListsForRootingContext(js::ContextFriendFields* cx)
+{
+    return cx->roots;
+}
+
+inline RootLists&
+RootListsForRootingContext(JSRuntime* rt)
+{
+    return PerThreadDataFriendFields::getMainThread(rt)->roots;
+}
+
+inline RootLists&
+RootListsForRootingContext(js::PerThreadDataFriendFields* pt)
+{
+    return pt->roots;
+}
+
 } /* namespace js */
 
 namespace JS {
@@ -650,19 +674,6 @@ class MOZ_STACK_CLASS Rooted : public js::RootedBase<T>
         *stack = reinterpret_cast<Rooted<void*>*>(this);
     }
 
-    static js::RootLists& rootListsForRootingContext(JSContext* cx) {
-        return js::ContextFriendFields::get(cx)->roots;
-    }
-    static js::RootLists& rootListsForRootingContext(js::ContextFriendFields* cx) {
-        return cx->roots;
-    }
-    static js::RootLists& rootListsForRootingContext(JSRuntime* rt) {
-        return js::PerThreadDataFriendFields::getMainThread(rt)->roots;
-    }
-    static js::RootLists& rootListsForRootingContext(js::PerThreadDataFriendFields* pt) {
-        return pt->roots;
-    }
-
   public:
     template <typename RootingContext>
     explicit Rooted(const RootingContext& cx
@@ -670,7 +681,7 @@ class MOZ_STACK_CLASS Rooted : public js::RootedBase<T>
       : ptr(js::GCMethods<T>::initial())
     {
         MOZ_GUARD_OBJECT_NOTIFIER_INIT;
-        registerWithRootLists(rootListsForRootingContext(cx));
+        registerWithRootLists(js::RootListsForRootingContext(cx));
     }
 
     template <typename RootingContext, typename S>
@@ -679,7 +690,7 @@ class MOZ_STACK_CLASS Rooted : public js::RootedBase<T>
       : ptr(mozilla::Forward<S>(initial))
     {
         MOZ_GUARD_OBJECT_NOTIFIER_INIT;
-        registerWithRootLists(rootListsForRootingContext(cx));
+        registerWithRootLists(js::RootListsForRootingContext(cx));
     }
 
     ~Rooted() {
@@ -993,26 +1004,32 @@ class PersistentRooted : public js::PersistentRootedBase<T>,
 
     void registerWithRootLists(js::RootLists& roots) {
         MOZ_ASSERT(!initialized());
-        roots.getPersistentRootedList<T>().insertBack(this);
+        js::ThingRootKind kind = js::RootKind<T>::rootKind();
+        roots.heapRoots_[kind].insertBack(reinterpret_cast<JS::PersistentRooted<void*>*>(this));
+        // Until marking and destruction support the full set, we assert that
+        // we don't try to add any unsupported types.
+        MOZ_ASSERT(kind == js::THING_ROOT_OBJECT ||
+                   kind == js::THING_ROOT_SCRIPT ||
+                   kind == js::THING_ROOT_STRING ||
+                   kind == js::THING_ROOT_ID ||
+                   kind == js::THING_ROOT_VALUE);
     }
 
   public:
     PersistentRooted() : ptr(js::GCMethods<T>::initial()) {}
 
-    explicit PersistentRooted(JSContext* cx) {
-        init(cx);
+    template <typename RootingContext>
+    explicit PersistentRooted(const RootingContext& cx)
+      : ptr(js::GCMethods<T>::initial())
+    {
+        registerWithRootLists(js::RootListsForRootingContext(cx));
     }
 
-    PersistentRooted(JSContext* cx, T initial) {
-        init(cx, initial);
-    }
-
-    explicit PersistentRooted(JSRuntime* rt) {
-        init(rt);
-    }
-
-    PersistentRooted(JSRuntime* rt, T initial) {
-        init(rt, initial);
+    template <typename RootingContext, typename U>
+    PersistentRooted(const RootingContext& cx, U&& initial)
+      : ptr(mozilla::Forward<U>(initial))
+    {
+        registerWithRootLists(js::RootListsForRootingContext(cx));
     }
 
     PersistentRooted(const PersistentRooted& rhs)
@@ -1034,22 +1051,15 @@ class PersistentRooted : public js::PersistentRootedBase<T>,
         return ListBase::isInList();
     }
 
-    void init(JSContext* cx) {
+    template <typename RootingContext>
+    void init(const RootingContext& cx) {
         init(cx, js::GCMethods<T>::initial());
     }
 
-    void init(JSContext* cx, T initial) {
-        ptr = initial;
-        registerWithRootLists(js::ContextFriendFields::get(cx)->roots);
-    }
-
-    void init(JSRuntime* rt) {
-        init(rt, js::GCMethods<T>::initial());
-    }
-
-    void init(JSRuntime* rt, T initial) {
-        ptr = initial;
-        registerWithRootLists(js::PerThreadDataFriendFields::getMainThread(rt)->roots);
+    template <typename RootingContext, typename U>
+    void init(const RootingContext& cx, U&& initial) {
+        ptr = mozilla::Forward<U>(initial);
+        registerWithRootLists(js::RootListsForRootingContext(cx));
     }
 
     void reset() {
diff --git a/js/src/gc/RootMarking.cpp b/js/src/gc/RootMarking.cpp
index 87ba965bcb18..afede54fe377 100644
--- a/js/src/gc/RootMarking.cpp
+++ b/js/src/gc/RootMarking.cpp
@@ -320,17 +320,16 @@ struct PersistentRootedMarker
 void
 js::gc::MarkPersistentRootedChainsInLists(RootLists& roots, JSTracer* trc)
 {
-    PersistentRootedMarker<JSFunction*>::markChain(trc, roots.functionPersistentRooteds,
-                                                   "PersistentRooted<JSFunction*>");
-    PersistentRootedMarker<JSObject*>::markChain(trc, roots.objectPersistentRooteds,
+    PersistentRootedMarker<JSObject*>::markChain(trc, roots.getPersistentRootedList<JSObject*>(),
                                                  "PersistentRooted<JSObject*>");
-    PersistentRootedMarker<JSScript*>::markChain(trc, roots.scriptPersistentRooteds,
+    PersistentRootedMarker<JSScript*>::markChain(trc, roots.getPersistentRootedList<JSScript*>(),
                                                  "PersistentRooted<JSScript*>");
-    PersistentRootedMarker<JSString*>::markChain(trc, roots.stringPersistentRooteds,
+    PersistentRootedMarker<JSString*>::markChain(trc, roots.getPersistentRootedList<JSString*>(),
                                                  "PersistentRooted<JSString*>");
-    PersistentRootedMarker<jsid>::markChain(trc, roots.idPersistentRooteds,
+
+    PersistentRootedMarker<jsid>::markChain(trc, roots.getPersistentRootedList<jsid>(),
                                             "PersistentRooted<jsid>");
-    PersistentRootedMarker<Value>::markChain(trc, roots.valuePersistentRooteds,
+    PersistentRootedMarker<Value>::markChain(trc, roots.getPersistentRootedList<Value>(),
                                              "PersistentRooted<Value>");
 }
 
diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp
index 7dab2e11d312..00ea567edd72 100644
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -1366,12 +1366,11 @@ FinishPersistentRootedChain(mozilla::LinkedList<PersistentRooted<T>>& list)
 void
 js::gc::FinishPersistentRootedChains(RootLists& roots)
 {
-    FinishPersistentRootedChain(roots.functionPersistentRooteds);
-    FinishPersistentRootedChain(roots.idPersistentRooteds);
-    FinishPersistentRootedChain(roots.objectPersistentRooteds);
-    FinishPersistentRootedChain(roots.scriptPersistentRooteds);
-    FinishPersistentRootedChain(roots.stringPersistentRooteds);
-    FinishPersistentRootedChain(roots.valuePersistentRooteds);
+    FinishPersistentRootedChain(roots.getPersistentRootedList<JSObject*>());
+    FinishPersistentRootedChain(roots.getPersistentRootedList<JSScript*>());
+    FinishPersistentRootedChain(roots.getPersistentRootedList<JSString*>());
+    FinishPersistentRootedChain(roots.getPersistentRootedList<jsid>());
+    FinishPersistentRootedChain(roots.getPersistentRootedList<Value>());
 }
 
 void
diff --git a/js/src/jsobj.cpp b/js/src/jsobj.cpp
index 4d6d00139f9c..fecb0d23e25a 100644
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -2449,10 +2449,16 @@ js::SetPrototype(JSContext* cx, HandleObject obj, HandleObject proto, JS::Object
     if (!extensible)
         return result.fail(JSMSG_CANT_SET_PROTO);
 
-    /* ES6 9.1.2 step 6 forbids generating cyclical prototype chains. */
+    /*
+     * ES6 9.1.2 step 6 forbids generating cyclical prototype chains. But we
+     * have to do this comparison on the observable outer objects, not on the
+     * possibly-inner object we're setting the proto on.
+     */
+    RootedObject outerObj(cx, GetOuterObject(cx, obj));
     RootedObject obj2(cx);
     for (obj2 = proto; obj2; ) {
-        if (obj2 == obj)
+        MOZ_ASSERT(GetOuterObject(cx, obj2) == obj2);
+        if (obj2 == outerObj)
             return result.fail(JSMSG_CANT_SET_PROTO_CYCLE);
 
         if (!GetPrototype(cx, obj2, &obj2))
diff --git a/js/src/jspubtd.h b/js/src/jspubtd.h
index 7b2238525b38..a509ae963abb 100644
--- a/js/src/jspubtd.h
+++ b/js/src/jspubtd.h
@@ -345,12 +345,7 @@ class RootLists
     friend void js::gc::MarkPersistentRootedChainsInLists(RootLists&, JSTracer*);
     friend void js::gc::FinishPersistentRootedChains(RootLists&);
 
-    mozilla::LinkedList<JS::PersistentRootedFunction> functionPersistentRooteds;
-    mozilla::LinkedList<JS::PersistentRootedId>       idPersistentRooteds;
-    mozilla::LinkedList<JS::PersistentRootedObject>   objectPersistentRooteds;
-    mozilla::LinkedList<JS::PersistentRootedScript>   scriptPersistentRooteds;
-    mozilla::LinkedList<JS::PersistentRootedString>   stringPersistentRooteds;
-    mozilla::LinkedList<JS::PersistentRootedValue>    valuePersistentRooteds;
+    mozilla::LinkedList<JS::PersistentRooted<void*>> heapRoots_[THING_ROOT_LIMIT];
 
     /* Specializations of this return references to the appropriate list. */
     template<typename Referent>
@@ -358,28 +353,46 @@ class RootLists
 };
 
 template<>
-inline mozilla::LinkedList<JS::PersistentRootedFunction>
-&RootLists::getPersistentRootedList<JSFunction*>() { return functionPersistentRooteds; }
+inline mozilla::LinkedList<JS::PersistentRootedFunction>&
+RootLists::getPersistentRootedList<JSFunction*>() {
+    return reinterpret_cast<mozilla::LinkedList<JS::PersistentRooted<JSFunction*>>&>(
+        heapRoots_[THING_ROOT_OBJECT]);
+}
 
 template<>
-inline mozilla::LinkedList<JS::PersistentRootedId>
-&RootLists::getPersistentRootedList<jsid>() { return idPersistentRooteds; }
+inline mozilla::LinkedList<JS::PersistentRootedObject>&
+RootLists::getPersistentRootedList<JSObject*>() {
+    return reinterpret_cast<mozilla::LinkedList<JS::PersistentRooted<JSObject*>>&>(
+        heapRoots_[THING_ROOT_OBJECT]);
+}
 
 template<>
-inline mozilla::LinkedList<JS::PersistentRootedObject>
-&RootLists::getPersistentRootedList<JSObject*>() { return objectPersistentRooteds; }
+inline mozilla::LinkedList<JS::PersistentRootedId>&
+RootLists::getPersistentRootedList<jsid>() {
+    return reinterpret_cast<mozilla::LinkedList<JS::PersistentRooted<jsid>>&>(
+        heapRoots_[THING_ROOT_ID]);
+}
 
 template<>
-inline mozilla::LinkedList<JS::PersistentRootedScript>
-&RootLists::getPersistentRootedList<JSScript*>() { return scriptPersistentRooteds; }
+inline mozilla::LinkedList<JS::PersistentRootedScript>&
+RootLists::getPersistentRootedList<JSScript*>() {
+    return reinterpret_cast<mozilla::LinkedList<JS::PersistentRooted<JSScript*>>&>(
+        heapRoots_[THING_ROOT_SCRIPT]);
+}
 
 template<>
-inline mozilla::LinkedList<JS::PersistentRootedString>
-&RootLists::getPersistentRootedList<JSString*>() { return stringPersistentRooteds; }
+inline mozilla::LinkedList<JS::PersistentRootedString>&
+RootLists::getPersistentRootedList<JSString*>() {
+    return reinterpret_cast<mozilla::LinkedList<JS::PersistentRooted<JSString*>>&>(
+        heapRoots_[THING_ROOT_STRING]);
+}
 
 template<>
-inline mozilla::LinkedList<JS::PersistentRootedValue>
-&RootLists::getPersistentRootedList<JS::Value>() { return valuePersistentRooteds; }
+inline mozilla::LinkedList<JS::PersistentRootedValue>&
+RootLists::getPersistentRootedList<JS::Value>() {
+    return reinterpret_cast<mozilla::LinkedList<JS::PersistentRooted<JS::Value>>&>(
+        heapRoots_[THING_ROOT_VALUE]);
+}
 
 struct ContextFriendFields
 {
diff --git a/mfbt/AlreadyAddRefed.h b/mfbt/AlreadyAddRefed.h
index 099a3d51febe..faf1f4c3d69b 100644
--- a/mfbt/AlreadyAddRefed.h
+++ b/mfbt/AlreadyAddRefed.h
@@ -96,7 +96,7 @@ struct MOZ_MUST_USE already_AddRefed
    * Note that nsRefPtr is the XPCOM reference counting smart pointer class.
    */
   template <typename U>
-  already_AddRefed(already_AddRefed<U>&& aOther) : mRawPtr(aOther.take()) {}
+  MOZ_IMPLICIT already_AddRefed(already_AddRefed<U>&& aOther) : mRawPtr(aOther.take()) {}
 
   ~already_AddRefed() { MOZ_ASSERT(!mRawPtr); }
 
diff --git a/mfbt/CheckedInt.h b/mfbt/CheckedInt.h
index 8e1be4b4b3e7..02ef8d5b7e95 100644
--- a/mfbt/CheckedInt.h
+++ b/mfbt/CheckedInt.h
@@ -526,7 +526,7 @@ public:
    * argument is valid.
    */
   template<typename U>
-  CheckedInt(U aValue) MOZ_NO_ARITHMETIC_EXPR_IN_ARGUMENT
+  MOZ_IMPLICIT CheckedInt(U aValue) MOZ_NO_ARITHMETIC_EXPR_IN_ARGUMENT
     : mValue(T(aValue)),
       mIsValid(detail::IsInRange<T>(aValue))
   {
diff --git a/mfbt/EnumeratedRange.h b/mfbt/EnumeratedRange.h
index 7f0c18b7ff86..2fd0f881f1f9 100644
--- a/mfbt/EnumeratedRange.h
+++ b/mfbt/EnumeratedRange.h
@@ -36,7 +36,7 @@ public:
     : mCurrent(aCurrent) { }
 
   template<typename IntType, typename EnumType>
-  EnumeratedIterator(const EnumeratedIterator<IntType, EnumType>& aOther)
+  explicit EnumeratedIterator(const EnumeratedIterator<IntType, EnumType>& aOther)
     : mCurrent(aOther.mCurrent) { }
 
   EnumTypeT operator*() const { return mCurrent; }
diff --git a/mfbt/IntegerRange.h b/mfbt/IntegerRange.h
index 2ebfb3914533..8d5d2e4d66e3 100644
--- a/mfbt/IntegerRange.h
+++ b/mfbt/IntegerRange.h
@@ -26,7 +26,7 @@ public:
     : mCurrent(aCurrent) { }
 
   template<typename IntType>
-  IntegerIterator(const IntegerIterator<IntType>& aOther)
+  explicit IntegerIterator(const IntegerIterator<IntType>& aOther)
     : mCurrent(aOther.mCurrent) { }
 
   IntTypeT operator*() const { return mCurrent; }
diff --git a/mfbt/RangedPtr.h b/mfbt/RangedPtr.h
index fb40d4d9bd91..40710415a920 100644
--- a/mfbt/RangedPtr.h
+++ b/mfbt/RangedPtr.h
@@ -104,7 +104,7 @@ public:
 
   /* Equivalent to RangedPtr(aArr, aArr, N). */
   template<size_t N>
-  RangedPtr(T (&aArr)[N])
+  explicit RangedPtr(T (&aArr)[N])
     : mPtr(aArr)
 #ifdef DEBUG
     , mRangeStart(aArr), mRangeEnd(aArr + N)
diff --git a/mfbt/ReentrancyGuard.h b/mfbt/ReentrancyGuard.h
index 4093a81840a3..d5142073c1d8 100644
--- a/mfbt/ReentrancyGuard.h
+++ b/mfbt/ReentrancyGuard.h
@@ -26,12 +26,12 @@ class ReentrancyGuard
 public:
   template<class T>
 #ifdef DEBUG
-  ReentrancyGuard(T& aObj
-                  MOZ_GUARD_OBJECT_NOTIFIER_PARAM)
+  explicit ReentrancyGuard(T& aObj
+                           MOZ_GUARD_OBJECT_NOTIFIER_PARAM)
     : mEntered(aObj.mEntered)
 #else
-  ReentrancyGuard(T&
-                  MOZ_GUARD_OBJECT_NOTIFIER_PARAM)
+  explicit ReentrancyGuard(T&
+                           MOZ_GUARD_OBJECT_NOTIFIER_PARAM)
 #endif
   {
     MOZ_GUARD_OBJECT_NOTIFIER_INIT;
diff --git a/mfbt/RefPtr.h b/mfbt/RefPtr.h
index fdeef3233977..1fc5cd3246d6 100644
--- a/mfbt/RefPtr.h
+++ b/mfbt/RefPtr.h
@@ -238,7 +238,7 @@ public:
   MOZ_IMPLICIT RefPtr(T* aVal) : mPtr(ref(aVal)) {}
 
   template<typename U>
-  RefPtr(const RefPtr<U>& aOther) : mPtr(ref(aOther.get())) {}
+  MOZ_IMPLICIT RefPtr(const RefPtr<U>& aOther) : mPtr(ref(aOther.get())) {}
 
   ~RefPtr() { unref(mPtr); }
 
diff --git a/mfbt/ReverseIterator.h b/mfbt/ReverseIterator.h
index e1d247b65f82..49c2e27920a9 100644
--- a/mfbt/ReverseIterator.h
+++ b/mfbt/ReverseIterator.h
@@ -126,11 +126,11 @@ public:
   typedef ReverseIterator<IteratorT> const_reverse_iterator;
 
   template<typename Iterator1, typename Iterator2>
-  IteratorRange(Iterator1 aIterBegin, Iterator2 aIterEnd)
+  MOZ_IMPLICIT IteratorRange(Iterator1 aIterBegin, Iterator2 aIterEnd)
     : mIterBegin(aIterBegin), mIterEnd(aIterEnd) { }
 
   template<typename Iterator>
-  IteratorRange(const IteratorRange<Iterator>& aOther)
+  MOZ_IMPLICIT IteratorRange(const IteratorRange<Iterator>& aOther)
     : mIterBegin(aOther.mIterBegin), mIterEnd(aOther.mIterEnd) { }
 
   iterator begin() const { return mIterBegin; }
diff --git a/mfbt/UniquePtr.h b/mfbt/UniquePtr.h
index d58ffe335c53..54be8cabffb6 100644
--- a/mfbt/UniquePtr.h
+++ b/mfbt/UniquePtr.h
@@ -238,6 +238,7 @@ public:
   }
 
   template<typename U, class E>
+  MOZ_IMPLICIT
   UniquePtr(UniquePtr<U, E>&& aOther,
             typename EnableIf<IsConvertible<typename UniquePtr<U, E>::Pointer,
                                             Pointer>::value &&
@@ -478,9 +479,9 @@ public:
   MOZ_CONSTEXPR DefaultDelete() {}
 
   template<typename U>
-  DefaultDelete(const DefaultDelete<U>& aOther,
-                typename EnableIf<mozilla::IsConvertible<U*, T*>::value,
-                                  int>::Type aDummy = 0)
+  MOZ_IMPLICIT DefaultDelete(const DefaultDelete<U>& aOther,
+                             typename EnableIf<mozilla::IsConvertible<U*, T*>::value,
+                                               int>::Type aDummy = 0)
   {}
 
   void operator()(T* aPtr) const
diff --git a/mobile/android/base/AndroidManifest.xml.in b/mobile/android/base/AndroidManifest.xml.in
index c2e6cd3b9a0f..2509f7568aca 100644
--- a/mobile/android/base/AndroidManifest.xml.in
+++ b/mobile/android/base/AndroidManifest.xml.in
@@ -309,6 +309,12 @@
           </intent-filter>
         </receiver>
 
+        <receiver android:name="org.mozilla.gecko.RestrictionProvider">
+          <intent-filter>
+            <action android:name="android.intent.action.GET_RESTRICTION_ENTRIES" />
+          </intent-filter>
+        </receiver>
+
         <!-- Activity used for launching non-privileged WebApps via a URL -->
         <activity android:name="org.mozilla.gecko.Webapp"
                   android:label="@string/webapp_generic_name"
diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java
index 0c4e6fb4ba17..8710af4951fc 100644
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -473,6 +473,9 @@ public class BrowserApp extends GeckoApp
             case LOCATION_CHANGE:
                 // fall through
             case SELECTED:
+                if (mZoomedView != null) {
+                    mZoomedView.stopZoomDisplay(false);
+                }
                 if (Tabs.getInstance().isSelectedTab(tab)) {
                     updateHomePagerForTab(tab);
                 }
diff --git a/mobile/android/base/RestrictedProfiles.java b/mobile/android/base/RestrictedProfiles.java
index 4ce8ba7dc0f8..f0b4b556f3b2 100644
--- a/mobile/android/base/RestrictedProfiles.java
+++ b/mobile/android/base/RestrictedProfiles.java
@@ -65,30 +65,55 @@ public class RestrictedProfiles {
      * These constants should be in sync with the ones from toolkit/components/parentalcontrols/nsIParentalControlServices.idl
      */
     public enum Restriction {
-        DISALLOW_DOWNLOADS(1, "no_download_files"),
-        DISALLOW_INSTALL_EXTENSION(2, "no_install_extensions"),
-        DISALLOW_INSTALL_APPS(3, "no_install_apps"), // UserManager.DISALLOW_INSTALL_APPS
-        DISALLOW_BROWSE_FILES(4, "no_browse_files"),
-        DISALLOW_SHARE(5, "no_share"),
-        DISALLOW_BOOKMARK(6, "no_bookmark"),
-        DISALLOW_ADD_CONTACTS(7, "no_add_contacts"),
-        DISALLOW_SET_IMAGE(8, "no_set_image"),
-        DISALLOW_MODIFY_ACCOUNTS(9, "no_modify_accounts"), // UserManager.DISALLOW_MODIFY_ACCOUNTS
-        DISALLOW_REMOTE_DEBUGGING(10, "no_remote_debugging"),
-        DISALLOW_IMPORT_SETTINGS(11, "no_import_settings"),
-        DISALLOW_TOOLS_MENU(12, "no_tools_menu"),
-        DISALLOW_REPORT_SITE_ISSUE(13, "no_report_site_issue");
+        // These restrictions have no strings assigned because they are only used in guest mode and not shown in the
+        // restricted profiles settings UI
+        DISALLOW_DOWNLOADS(1, "no_download_files", 0, 0),
+        DISALLOW_BROWSE_FILES(4, "no_browse_files", 0, 0),
+        DISALLOW_SHARE(5, "no_share", 0, 0),
+        DISALLOW_BOOKMARK(6, "no_bookmark", 0, 0),
+        DISALLOW_ADD_CONTACTS(7, "no_add_contacts", 0, 0),
+        DISALLOW_SET_IMAGE(8, "no_set_image", 0, 0),
+        DISALLOW_MODIFY_ACCOUNTS(9, "no_modify_accounts", 0, 0), // UserManager.DISALLOW_MODIFY_ACCOUNTS
+        DISALLOW_REMOTE_DEBUGGING(10, "no_remote_debugging", 0, 0),
+
+        // These restrictions are used for restricted profiles and therefore need to have strings assigned for the profile
+        // settings UI.
+        DISALLOW_INSTALL_EXTENSION(2, "no_install_extensions", R.string.restriction_disallow_addons_title, R.string.restriction_disallow_addons_description),
+        DISALLOW_INSTALL_APPS(3, "no_install_apps", R.string.restriction_disallow_apps_title, R.string.restriction_disallow_apps_description), // UserManager.DISALLOW_INSTALL_APPS
+        DISALLOW_IMPORT_SETTINGS(11, "no_report_site_issue", R.string.restriction_disallow_import_settings_title, R.string.restriction_disallow_import_settings_description),
+        DISALLOW_TOOLS_MENU(12, "no_tools_menu", R.string.restriction_disallow_tools_menu_title, R.string.restriction_disallow_tools_menu_description),
+        DISALLOW_REPORT_SITE_ISSUE(13, "no_report_site_issue", R.string.restriction_disallow_report_site_issue_title, R.string.restriction_disallow_report_site_issue_description);
 
         public final int id;
         public final String name;
+        public final int titleResource;
+        public final int descriptionResource;
 
-        Restriction(final int id, final String name) {
+        Restriction(final int id, final String name, int titleResource, int descriptionResource) {
             this.id = id;
             this.name = name;
+            this.titleResource = titleResource;
+            this.descriptionResource = descriptionResource;
+        }
+
+        public String getTitle(Context context) {
+            if (titleResource == 0) {
+                return toString();
+            }
+
+            return context.getResources().getString(titleResource);
+        }
+
+        public String getDescription(Context context) {
+            if (descriptionResource == 0) {
+                return name;
+            }
+
+            return context.getResources().getString(descriptionResource);
         }
     }
 
-    private static List<Restriction> restrictionsOfGuestProfile = Arrays.asList(
+    static List<Restriction> GUEST_RESTRICTIONS = Arrays.asList(
         Restriction.DISALLOW_DOWNLOADS,
         Restriction.DISALLOW_INSTALL_EXTENSION,
         Restriction.DISALLOW_INSTALL_APPS,
@@ -103,7 +128,9 @@ public class RestrictedProfiles {
     );
 
     // Restricted profiles will automatically have these restrictions by default
-    private static List<Restriction> defaultRestrictionsOfRestrictedProfiles = Arrays.asList(
+    static List<Restriction> RESTRICTED_PROFILE_RESTRICTIONS = Arrays.asList(
+        Restriction.DISALLOW_INSTALL_EXTENSION,
+        Restriction.DISALLOW_INSTALL_APPS,
         Restriction.DISALLOW_TOOLS_MENU,
         Restriction.DISALLOW_REPORT_SITE_ISSUE,
         Restriction.DISALLOW_IMPORT_SETTINGS
@@ -125,6 +152,12 @@ public class RestrictedProfiles {
         return mgr.getUserRestrictions();
     }
 
+    @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
+    private static Bundle getAppRestrictions(final Context context) {
+        final UserManager mgr = (UserManager) context.getSystemService(Context.USER_SERVICE);
+        return mgr.getApplicationRestrictions(context.getPackageName());
+    }
+
     /**
      * This method does the system version check for you.
      *
@@ -134,14 +167,18 @@ public class RestrictedProfiles {
      *
      * Returns true otherwise.
      */
-    private static boolean getRestriction(final Context context, final String name) {
+    private static boolean getRestriction(final Context context, final Restriction restriction) {
         // Early versions don't support restrictions at all,
         // so no action can be restricted.
         if (Versions.preJBMR2) {
             return false;
         }
 
-        return getRestrictions(context).getBoolean(name, false);
+        if (!isUserRestricted(context)) {
+            return false;
+        }
+
+        return getAppRestrictions(context).getBoolean(restriction.name, RESTRICTED_PROFILE_RESTRICTIONS.contains(restriction));
     }
 
     private static boolean canLoadUrl(final Context context, final String url) {
@@ -153,7 +190,7 @@ public class RestrictedProfiles {
         try {
             // If we're not in guest mode, and the system restriction isn't in place, everything is allowed.
             if (!getInGuest() &&
-                !getRestriction(context, Restriction.DISALLOW_BROWSE_FILES.name)) {
+                !getRestriction(context, Restriction.DISALLOW_BROWSE_FILES)) {
                 return true;
             }
         } catch (IllegalArgumentException ex) {
@@ -231,16 +268,11 @@ public class RestrictedProfiles {
                 return canLoadUrl(context, url);
             }
 
-            return !restrictionsOfGuestProfile.contains(restriction);
-        }
-
-        // Hardcoded restrictions. Make restrictions configurable and read from UserManager (Bug 1180653)
-        if (isUserRestricted(context) && defaultRestrictionsOfRestrictedProfiles.contains(restriction)) {
-            return false;
+            return !GUEST_RESTRICTIONS.contains(restriction);
         }
 
         // NOTE: Restrictions hold the opposite intention, so we need to flip it.
-        return !getRestriction(context, restriction.name);
+        return !getRestriction(context, restriction);
     }
 
     @WrapElementForJNI
diff --git a/mobile/android/base/RestrictionProvider.java b/mobile/android/base/RestrictionProvider.java
new file mode 100644
index 000000000000..c71720c3e628
--- /dev/null
+++ b/mobile/android/base/RestrictionProvider.java
@@ -0,0 +1,69 @@
+/* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*-
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.gecko;
+
+import android.annotation.TargetApi;
+import android.app.Activity;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.RestrictionEntry;
+import android.os.Build;
+import android.os.Bundle;
+import android.util.Log;
+
+import java.util.ArrayList;
+
+/**
+ * Broadcast receiver providing supported restrictions to the system.
+ */
+@TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
+public class RestrictionProvider extends BroadcastReceiver {
+    @Override
+    public void onReceive(final Context context, final Intent intent) {
+        if (AppConstants.Versions.preJBMR2) {
+            // This broadcast does not make any sense prior to Jelly Bean MR2.
+            return;
+        }
+
+        final PendingResult result = goAsync();
+
+        new Thread() {
+            @Override
+            public void run() {
+                final Bundle oldRestrictions = intent.getBundleExtra(Intent.EXTRA_RESTRICTIONS_BUNDLE);
+                final Bundle extras = new Bundle();
+
+                ArrayList<RestrictionEntry> entries = initRestrictions(context, oldRestrictions);
+                extras.putParcelableArrayList(Intent.EXTRA_RESTRICTIONS_LIST, entries);
+
+                result.setResult(Activity.RESULT_OK, null, extras);
+                result.finish();
+            }
+        }.start();
+    }
+
+    private ArrayList<RestrictionEntry> initRestrictions(Context context, Bundle oldRestrictions) {
+        ArrayList<RestrictionEntry> entries = new ArrayList<RestrictionEntry>();
+
+        for (RestrictedProfiles.Restriction restriction : RestrictedProfiles.RESTRICTED_PROFILE_RESTRICTIONS) {
+            RestrictionEntry entry = createRestrictionEntryWithDefaultValue(context, restriction,
+                    oldRestrictions.getBoolean(restriction.name, true));
+            entries.add(entry);
+        }
+
+        return entries;
+    }
+
+    private RestrictionEntry createRestrictionEntryWithDefaultValue(Context context, RestrictedProfiles.Restriction restriction, boolean defaultValue) {
+        RestrictionEntry entry = new RestrictionEntry(restriction.name, defaultValue);
+
+        entry.setTitle(restriction.getTitle(context));
+        entry.setDescription(restriction.getDescription(context));
+
+        return entry;
+    }
+}
diff --git a/mobile/android/base/ZoomedView.java b/mobile/android/base/ZoomedView.java
index c5208caf977e..f7befdbac1b5 100644
--- a/mobile/android/base/ZoomedView.java
+++ b/mobile/android/base/ZoomedView.java
@@ -501,7 +501,7 @@ public class ZoomedView extends FrameLayout implements LayerView.OnMetricsChange
         moveUsingGeckoPosition(leftFromGecko, topFromGecko);
     }
 
-    private void stopZoomDisplay(boolean withAnimation) {
+    public void stopZoomDisplay(boolean withAnimation) {
         if (getVisibility() == View.VISIBLE) {
             shouldSetVisibleOnUpdate = false;
             hideZoomedView(withAnimation);
diff --git a/mobile/android/base/locales/en-US/android_strings.dtd b/mobile/android/base/locales/en-US/android_strings.dtd
index 71e002fdea8c..7435ad4254dc 100644
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -678,3 +678,18 @@ just addresses the organization to follow, e.g. "This site is run by " -->
      desktop Firefox via WebIDE), so you just need to aim this device at the QR
      code. -->
 <!ENTITY devtools_auth_scan_header "Scanning for the QR code displayed on your other device">
+
+<!-- Restrictions -->
+<!-- Localization note: These are restrictions the device owner (e.g. parent) can enable for
+     a restricted profile (e.g. child). Used inside the Android settings UI. -->
+<!ENTITY restriction_disallow_tools_menu_title "Disallow Tools menu">
+<!ENTITY restriction_disallow_tools_menu_description "Hide Tools menu from UI.">
+<!ENTITY restriction_disallow_report_site_issue_title "Disallow \'Report site issue\'">
+<!ENTITY restriction_disallow_report_site_issue_description "Hide \'Report site issue\' menu item.">
+<!ENTITY restriction_disallow_import_settings_title "Disallow importing settings">
+<!ENTITY restriction_disallow_import_settings_description "Do not allow to import settings from other system browsers.">
+<!ENTITY restriction_disallow_addons_title "Disallow add-ons">
+<!ENTITY restriction_disallow_addons_description "Disallow installation of add-ons.">
+<!ENTITY restriction_disallow_apps_title "Disallow apps">
+<!ENTITY restriction_disallow_apps_description "Disallow installing apps from Firefox Marketplace.">
+
diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build
index 0ff04df185bb..0c051227438d 100644
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -433,6 +433,7 @@ gbjar.sources += [
     'RemoteTabsExpandableListAdapter.java',
     'Restarter.java',
     'RestrictedProfiles.java',
+    'RestrictionProvider.java',
     'ServiceNotificationClient.java',
     'SessionParser.java',
     'SharedPreferencesHelper.java',
diff --git a/mobile/android/base/strings.xml.in b/mobile/android/base/strings.xml.in
index d94de155567a..e441455328a8 100644
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -541,6 +541,18 @@
   <!-- Voice search from the Awesome Bar -->
   <string name="voicesearch_prompt">&voicesearch_prompt;</string>
 
+  <!-- Restrictions -->
+  <string name="restriction_disallow_tools_menu_title">&restriction_disallow_tools_menu_title;</string>
+  <string name="restriction_disallow_tools_menu_description">&restriction_disallow_tools_menu_description;</string>
+  <string name="restriction_disallow_report_site_issue_title">&restriction_disallow_report_site_issue_title;</string>
+  <string name="restriction_disallow_report_site_issue_description">&restriction_disallow_report_site_issue_description;</string>
+  <string name="restriction_disallow_import_settings_title">&restriction_disallow_import_settings_title;</string>
+  <string name="restriction_disallow_import_settings_description">&restriction_disallow_import_settings_description;</string>
+  <string name="restriction_disallow_addons_title">&restriction_disallow_addons_title;</string>
+  <string name="restriction_disallow_addons_description">&restriction_disallow_addons_description;</string>
+  <string name="restriction_disallow_apps_title">&restriction_disallow_apps_title;</string>
+  <string name="restriction_disallow_apps_description">&restriction_disallow_apps_description;</string>
+
   <!-- Miscellaneous -->
   <string name="ellipsis">&ellipsis;</string>
 
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 5029fca52580..65af545be48e 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -4261,8 +4261,12 @@ pref("layers.async-pan-zoom.enabled", true);
 #ifdef XP_MACOSX
 pref("layers.enable-tiles", true);
 pref("layers.tiled-drawtarget.enabled", true);
+pref("layers.tiles.edge-padding", false);
 #endif
 
+#ifdef MOZ_WIDGET_GONK
+pref("layers.tiled-drawtarget.enabled", true);
+#endif
 
 // same effect as layers.offmainthreadcomposition.enabled, but specifically for
 // use with tests.
diff --git a/mozglue/misc/TimeStamp.h b/mozglue/misc/TimeStamp.h
index 58958351ea87..6eff3bd02adb 100644
--- a/mozglue/misc/TimeStamp.h
+++ b/mozglue/misc/TimeStamp.h
@@ -426,8 +426,8 @@ public:
    * lower precision, usually 15.6 ms, but with very good performance benefit.
    * Use it for measurements of longer times, like >200ms timeouts.
    */
-  static MFBT_API TimeStamp Now() { return Now(true); }
-  static MFBT_API TimeStamp NowLoRes() { return Now(false); }
+  static TimeStamp Now() { return Now(true); }
+  static TimeStamp NowLoRes() { return Now(false); }
 
   /**
    * Return a timestamp representing the time when the current process was
diff --git a/python/mozbuild/mozbuild/backend/visualstudio.py b/python/mozbuild/mozbuild/backend/visualstudio.py
index c2bf60bf4e3d..05865305c125 100644
--- a/python/mozbuild/mozbuild/backend/visualstudio.py
+++ b/python/mozbuild/mozbuild/backend/visualstudio.py
@@ -42,7 +42,9 @@ def visual_studio_product_to_internal_version(version, solution=False):
         elif version == '2011':
             return '12.00'
         elif version == '2012':
-            return '13.00'
+            return '12.00'
+        elif version == '2013':
+            return '12.00'
         else:
             raise Exception('Unknown version seen: %s' % version)
     else:
@@ -52,9 +54,23 @@ def visual_studio_product_to_internal_version(version, solution=False):
             return '11.00'
         elif version == '2012':
             return '12.00'
+        elif version == '2013':
+            return '12.00'
         else:
             raise Exception('Unknown version seen: %s' % version)
 
+def visual_studio_product_to_platform_toolset_version(version):
+    if version == '2010':
+        return 'v100'
+    elif version == '2011':
+        return 'v110'
+    elif version == '2012':
+        return 'v120'
+    elif version == '2013':
+        return 'v120'
+    else:
+        raise Exception('Unknown version seen: %s' % version)
+
 class VisualStudioBackend(CommonBackend):
     """Generate Visual Studio project files.
 
@@ -75,8 +91,9 @@ class VisualStudioBackend(CommonBackend):
 
         # These should eventually evolve into parameters.
         self._out_dir = os.path.join(self.environment.topobjdir, 'msvc')
+        self._projsubdir = 'projects'
         # But making this one a parameter requires testing first.
-        self._version = '2010'
+        self._version = '2013'
 
         self._paths_to_sources = {}
         self._paths_to_includes = {}
@@ -141,11 +158,17 @@ class VisualStudioBackend(CommonBackend):
 
     def consume_finished(self):
         out_dir = self._out_dir
+        out_proj_dir = os.path.join(self._out_dir, self._projsubdir)
         try:
             os.makedirs(out_dir)
         except OSError as e:
             if e.errno != errno.EEXIST:
                 raise
+        try:
+            os.makedirs(out_proj_dir)
+        except OSError as e:
+            if e.errno != errno.EEXIST:
+                raise
 
         projects = {}
 
@@ -194,7 +217,7 @@ class VisualStudioBackend(CommonBackend):
                     defines.append('%s=%s' % (k, v))
 
             basename = 'library_%s' % lib
-            project_id = self._write_vs_project(out_dir, basename, lib,
+            project_id = self._write_vs_project(out_proj_dir, basename, lib,
                 includes=includes,
                 forced_includes=['$(TopObjDir)\\dist\\include\\mozilla-config.h'],
                 defines=defines,
@@ -210,7 +233,7 @@ class VisualStudioBackend(CommonBackend):
             if target != 'full':
                 command += ' %s' % target
 
-            project_id = self._write_vs_project(out_dir, basename, target,
+            project_id = self._write_vs_project(out_proj_dir, basename, target,
                 build_command=command,
                 clean_command='$(SolutionDir)\\mach.bat build clean')
 
@@ -218,14 +241,14 @@ class VisualStudioBackend(CommonBackend):
 
         # A project that can be used to regenerate the visual studio projects.
         basename = 'target_vs'
-        project_id = self._write_vs_project(out_dir, basename, 'visual-studio',
+        project_id = self._write_vs_project(out_proj_dir, basename, 'visual-studio',
             build_command='$(SolutionDir)\\mach.bat build-backend -b VisualStudio')
         projects[basename] = (project_id, basename, 'visual-studio')
 
         # A project to run the main application binary.
         app_name = self.environment.substs['MOZ_APP_NAME']
         basename = 'binary_%s' % app_name
-        project_id = self._write_vs_project(out_dir, basename, app_name,
+        project_id = self._write_vs_project(out_proj_dir, basename, app_name,
             debugger=('$(TopObjDir)\\dist\\bin\\%s.exe' % app_name,
                 '-no-remote'))
         projects[basename] = (project_id, basename, app_name)
@@ -233,12 +256,12 @@ class VisualStudioBackend(CommonBackend):
         # Projects to run other common binaries.
         for app in ['js', 'xpcshell']:
             basename = 'binary_%s' % app
-            project_id = self._write_vs_project(out_dir, basename, app,
+            project_id = self._write_vs_project(out_proj_dir, basename, app,
                 debugger=('$(TopObjDir)\\dist\\bin\\%s.exe' % app, ''))
             projects[basename] = (project_id, basename, app)
 
         # Write out a shared property file with common variables.
-        props_path = os.path.join(out_dir, 'mozilla.props')
+        props_path = os.path.join(out_proj_dir, 'mozilla.props')
         with open(props_path, 'wb') as fh:
             self._write_props(fh)
 
@@ -274,7 +297,7 @@ class VisualStudioBackend(CommonBackend):
         # Write out entries for each project.
         for key in sorted(projects):
             project_id, basename, name = projects[key]
-            path = '%s.vcxproj' % basename
+            path = os.path.join(self._projsubdir, '%s.vcxproj' % basename)
 
             fh.write('Project("{%s}") = "%s", "%s", "{%s}"\r\n' % (
                 project_type, name, path, project_id))
@@ -446,9 +469,11 @@ class VisualStudioBackend(CommonBackend):
 
     def _write_vs_project(self, out_dir, basename, name, **kwargs):
         root = '%s.vcxproj' % basename
+        project_id = get_id(basename.encode('utf-8'))
+
         with open(os.path.join(out_dir, root), 'wb') as fh:
             project_id, name = VisualStudioBackend.write_vs_project(fh,
-                self._version, name, **kwargs)
+                self._version, project_id, name, **kwargs)
 
         with open(os.path.join(out_dir, '%s.user' % root), 'w') as fh:
             fh.write('<?xml version="1.0" encoding="utf-8"?>\r\n')
@@ -459,13 +484,11 @@ class VisualStudioBackend(CommonBackend):
         return project_id
 
     @staticmethod
-    def write_vs_project(fh, version, name, includes=[],
+    def write_vs_project(fh, version, project_id, name, includes=[],
         forced_includes=[], defines=[],
         build_command=None, clean_command=None,
         debugger=None, headers=[], sources=[]):
 
-        project_id = get_id(name.encode('utf-8'))
-
         impl = getDOMImplementation()
         doc = impl.createDocument(MSBUILD_NAMESPACE, 'Project', None)
 
@@ -501,6 +524,9 @@ class VisualStudioBackend(CommonBackend):
         rn = pg.appendChild(doc.createElement('RootNamespace'))
         rn.appendChild(doc.createTextNode('mozilla'))
 
+        pts = pg.appendChild(doc.createElement('PlatformToolset'))
+        pts.appendChild(doc.createTextNode(visual_studio_product_to_platform_toolset_version(version)))
+
         i = project.appendChild(doc.createElement('Import'))
         i.setAttribute('Project', '$(VCTargetsPath)\\Microsoft.Cpp.Default.props')
 
diff --git a/security/sandbox/mac/Sandbox.mm b/security/sandbox/mac/Sandbox.mm
index 2c811d7918f2..653afb7e1200 100644
--- a/security/sandbox/mac/Sandbox.mm
+++ b/security/sandbox/mac/Sandbox.mm
@@ -326,7 +326,8 @@ static const char contentSandboxRules[] =
   "    (allow file-read*\n"
   "        (home-regex \"/Library/Application Support/[^/]+/Extensions/[^/]/\")\n"
   "        (resolving-regex \"/Library/Application Support/[^/]+/Extensions/[^/]/\")\n"
-  "        (home-regex \"/Library/Application Support/Firefox/Profiles/[^/]+/extensions/\"))\n"
+  "        (home-regex \"/Library/Application Support/Firefox/Profiles/[^/]+/extensions/\")\n"
+  "        (home-regex \"/Library/Application Support/Firefox/Profiles/[^/]+/weave/\"))\n"
   "\n"
   "; the following rules should be removed when printing and \n"
   "; opening a file from disk are brokered through the main process\n"
diff --git a/toolkit/components/places/UnifiedComplete.js b/toolkit/components/places/UnifiedComplete.js
index 85a84260282a..c26c983adcaa 100644
--- a/toolkit/components/places/UnifiedComplete.js
+++ b/toolkit/components/places/UnifiedComplete.js
@@ -419,6 +419,10 @@ XPCOMUtils.defineLazyGetter(this, "Prefs", () => {
     store.suggestTyped = prefs.get(...PREF_SUGGEST_HISTORY_ONLYTYPED);
     store.suggestSearches = prefs.get(...PREF_SUGGEST_SEARCHES);
     store.maxCharsForSearchSuggestions = prefs.get(...PREF_MAX_CHARS_FOR_SUGGEST);
+    store.keywordEnabled = true;
+    try {
+      store.keywordEnabled = Services.prefs.getBoolPref("keyword.enabled");
+    } catch (ex) {}
 
     // If history is not set, onlyTyped value should be ignored.
     if (!store.suggestHistory) {
@@ -473,7 +477,9 @@ XPCOMUtils.defineLazyGetter(this, "Prefs", () => {
       loadPrefs(subject, topic, data);
       this._ignoreNotifications = false;
     },
-    QueryInterface: XPCOMUtils.generateQI([ Ci.nsIObserver ])
+    QueryInterface: XPCOMUtils.generateQI([
+      Ci.nsIObserver,
+      Ci.nsISupportsWeakReference ])
   };
 
   // Synchronize suggest.* prefs with autocomplete.enabled at initialization
@@ -481,6 +487,7 @@ XPCOMUtils.defineLazyGetter(this, "Prefs", () => {
 
   loadPrefs();
   prefs.observe("", store);
+  Services.prefs.addObserver("keyword.enabled", store, true);
 
   return Object.seal(store);
 });
@@ -1174,7 +1181,9 @@ Search.prototype = {
 
     // If the result is something that looks like a single-worded hostname
     // we need to check the domain whitelist to treat it as such.
+    // We also want to return a "visit" if keyword.enabled is false.
     if (uri.asciiHost &&
+        Prefs.keywordEnabled &&
         REGEXP_SINGLEWORD_HOST.test(uri.asciiHost) &&
         !Services.uriFixup.isDomainWhitelisted(uri.asciiHost, -1)) {
       return false;
diff --git a/toolkit/components/places/tests/unifiedcomplete/test_visiturl.js b/toolkit/components/places/tests/unifiedcomplete/test_visiturl.js
index 1972c66ff6b6..55d175a8860c 100644
--- a/toolkit/components/places/tests/unifiedcomplete/test_visiturl.js
+++ b/toolkit/components/places/tests/unifiedcomplete/test_visiturl.js
@@ -61,4 +61,16 @@ add_task(function*() {
     searchParam: "enable-actions",
     matches: [ makeVisitMatch("[2001:db8::1]", "http://[2001:db8::1]/") ]
   });
+
+  // Setting keyword.enabled to false should always try to visit.
+  Services.prefs.setBoolPref("keyword.enabled", false);
+  do_register_cleanup(() => {
+    Services.prefs.clearUserPref("keyword.enabled");
+  });
+  do_print("visit url, keyword.enabled = false");
+  yield check_autocomplete({
+    search: "bacon",
+    searchParam: "enable-actions",
+    matches: [ makeVisitMatch("bacon", "http://bacon/") ]
+  });
 });
diff --git a/toolkit/components/telemetry/TelemetryController.jsm b/toolkit/components/telemetry/TelemetryController.jsm
index 7788a8ae3294..41caa5748638 100644
--- a/toolkit/components/telemetry/TelemetryController.jsm
+++ b/toolkit/components/telemetry/TelemetryController.jsm
@@ -593,9 +593,20 @@ let Impl = {
    *                   false otherwise.
    */
   enableTelemetryRecording: function enableTelemetryRecording() {
-    const enabled = Preferences.get(PREF_ENABLED, false);
+    // The thumbnail service also runs in a content process, even with e10s off.
+    // We need to check if e10s is on so we don't submit child payloads for it.
+    // We still need xpcshell child tests to work, so we skip this if test mode is enabled.
+    if (Utils.isContentProcess && !this._testMode && !Services.appinfo.browserTabsRemoteAutostart) {
+      this._log.config("enableTelemetryRecording - not enabling Telemetry for non-e10s child process");
+      Telemetry.canRecordBase = false;
+      Telemetry.canRecordExtended = false;
+      return false;
+    }
 
-    // Enable base Telemetry recording, if needed.
+    // Configure base Telemetry recording.
+    // Unified Telemetry makes it opt-out unless the unifedOptin pref is set.
+    // If extended Telemetry is enabled, base recording is always on as well.
+    const enabled = Preferences.get(PREF_ENABLED, false);
     Telemetry.canRecordBase = enabled || (IS_UNIFIED_TELEMETRY && !IS_UNIFIED_OPTIN);
 
 #ifdef MOZILLA_OFFICIAL
diff --git a/toolkit/components/telemetry/TelemetrySession.jsm b/toolkit/components/telemetry/TelemetrySession.jsm
index 73cdf9ab258f..ecb9412ee753 100644
--- a/toolkit/components/telemetry/TelemetrySession.jsm
+++ b/toolkit/components/telemetry/TelemetrySession.jsm
@@ -27,13 +27,6 @@ const Utils = TelemetryUtils;
 
 const myScope = this;
 
-const IS_CONTENT_PROCESS = (function() {
-  // We cannot use Services.appinfo here because in telemetry xpcshell tests,
-  // appinfo is initially unavailable, and becomes available only later on.
-  let runtime = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULRuntime);
-  return runtime.processType == Ci.nsIXULRuntime.PROCESS_TYPE_CONTENT;
-})();
-
 // When modifying the payload in incompatible ways, please bump this version number
 const PAYLOAD_VERSION = 4;
 const PING_TYPE_MAIN = "main";
@@ -58,7 +51,7 @@ const MIN_SUBSESSION_LENGTH_MS = 10 * 60 * 1000;
 #expand const HISTOGRAMS_FILE_VERSION = "__HISTOGRAMS_FILE_VERSION__";
 
 const LOGGER_NAME = "Toolkit.Telemetry";
-const LOGGER_PREFIX = "TelemetrySession" + (IS_CONTENT_PROCESS ? "#content::" : "::");
+const LOGGER_PREFIX = "TelemetrySession" + (Utils.isContentProcess ? "#content::" : "::");
 
 const PREF_BRANCH = "toolkit.telemetry.";
 const PREF_PREVIOUS_BUILDID = PREF_BRANCH + "previousBuildID";
@@ -538,32 +531,20 @@ let TelemetryScheduler = {
     }
     this._lastTickTime = now;
 
-    // Check if aborted-session ping is due.
-    let isAbortedPingDue =
-      (now - this._lastSessionCheckpointTime) >= ABORTED_SESSION_UPDATE_INTERVAL_MS;
-    // Check if daily ping is due.
-    let shouldSendDaily = this._isDailyPingDue(nowDate);
-    // We can combine the daily-ping and the aborted-session ping in the following cases:
-    // - If both the daily and the aborted session pings are due (a laptop that wakes
-    //   up after a few hours).
-    // - If either the daily ping is due and the other one would follow up shortly
-    //   (whithin the coalescence threshold).
-    let nextSessionCheckpoint =
-      this._lastSessionCheckpointTime + ABORTED_SESSION_UPDATE_INTERVAL_MS;
-    let combineActions = (shouldSendDaily && isAbortedPingDue) || (shouldSendDaily &&
-                          Utils.areTimesClose(now, nextSessionCheckpoint,
-                                                       SCHEDULER_COALESCE_THRESHOLD_MS));
+    // Check if the daily ping is due.
+    const shouldSendDaily = this._isDailyPingDue(nowDate);
 
-    if (combineActions) {
-      this._log.trace("_schedulerTickLogic - Combining pings.");
-      // Send the daily ping and also save its payload as an aborted-session ping.
-      return Impl._sendDailyPing(true).then(() => this._dailyPingSucceeded(now),
-                                            () => this._dailyPingFailed(now));
-    } else if (shouldSendDaily) {
+    if (shouldSendDaily) {
       this._log.trace("_schedulerTickLogic - Daily ping due.");
       return Impl._sendDailyPing().then(() => this._dailyPingSucceeded(now),
                                         () => this._dailyPingFailed(now));
-    } else if (isAbortedPingDue) {
+    }
+
+    // Check if the aborted-session ping is due. If a daily ping was saved above, it was
+    // already duplicated as an aborted-session ping.
+    const isAbortedPingDue =
+      (now - this._lastSessionCheckpointTime) >= ABORTED_SESSION_UPDATE_INTERVAL_MS;
+    if (isAbortedPingDue) {
       this._log.trace("_schedulerTickLogic - Aborted session ping due.");
       return this._saveAbortedPing(now);
     }
@@ -746,6 +727,12 @@ this.TelemetrySession = Object.freeze({
   setup: function() {
     return Impl.setupChromeProcess(true);
   },
+  /**
+   * Used only for testing purposes.
+   */
+  setupContent: function() {
+    return Impl.setupContentProcess(true);
+  },
   /**
    * Used only for testing purposes.
    */
@@ -853,7 +840,7 @@ let Impl = {
     } catch (ex) {}
 
     // Only submit this if the extended set is enabled.
-    if (!IS_CONTENT_PROCESS && Telemetry.canRecordExtended) {
+    if (!Utils.isContentProcess && Telemetry.canRecordExtended) {
       try {
         ret.addonManager = AddonManagerPrivate.getSimpleMeasures();
         ret.UITelemetry = UITelemetry.getSimpleMeasures();
@@ -882,7 +869,7 @@ let Impl = {
       ret.maximalNumberOfConcurrentThreads = maximalNumberOfConcurrentThreads;
     }
 
-    if (IS_CONTENT_PROCESS) {
+    if (Utils.isContentProcess) {
       return ret;
     }
 
@@ -1306,7 +1293,7 @@ let Impl = {
       payloadObj.log = TelemetryLog.entries();
     }
 
-    if (IS_CONTENT_PROCESS) {
+    if (Utils.isContentProcess) {
       return payloadObj;
     }
 
@@ -1364,10 +1351,10 @@ let Impl = {
 
     let measurements =
       this.getSimpleMeasurements(reason == REASON_SAVED_SESSION, isSubsession, clearSubsession);
-    let info = !IS_CONTENT_PROCESS ? this.getMetadata(reason) : null;
+    let info = !Utils.isContentProcess ? this.getMetadata(reason) : null;
     let payload = this.assemblePayloadWithMeasurements(measurements, info, reason, clearSubsession);
 
-    if (!IS_CONTENT_PROCESS && clearSubsession) {
+    if (!Utils.isContentProcess && clearSubsession) {
       this.startNewSubsession();
       // Persist session data to disk (don't wait until it completes).
       let sessionData = this._getSessionDataObject();
@@ -1528,10 +1515,11 @@ let Impl = {
   /**
    * Initializes telemetry for a content process.
    */
-  setupContentProcess: function setupContentProcess() {
+  setupContentProcess: function setupContentProcess(testing) {
     this._log.trace("setupContentProcess");
 
     if (!Telemetry.canRecordBase) {
+      this._log.trace("setupContentProcess - base recording is disabled, not initializing");
       return;
     }
 
@@ -1545,7 +1533,7 @@ let Impl = {
 
       this.attachObservers();
       this.gatherMemory();
-    }.bind(this), TELEMETRY_DELAY);
+    }.bind(this), testing ? TELEMETRY_TEST_DELAY : TELEMETRY_DELAY);
 
     delayedTask.arm();
   },
@@ -1871,11 +1859,9 @@ let Impl = {
 
   /**
    * Gather and send a daily ping.
-   * @param {Boolean} [saveAsAborted=false] Also saves the payload as an aborted-session
-   *                  ping.
    * @return {Promise} Resolved when the ping is sent.
    */
-  _sendDailyPing: function(saveAsAborted = false) {
+  _sendDailyPing: function() {
     this._log.trace("_sendDailyPing");
     let payload = this.getSessionPayload(REASON_DAILY, true);
 
@@ -1885,11 +1871,14 @@ let Impl = {
     };
 
     let promise = TelemetryController.submitExternalPing(getPingType(payload), payload, options);
-    // If required, also save the payload as an aborted session.
-    if (saveAsAborted && IS_UNIFIED_TELEMETRY) {
+
+    // Also save the payload as an aborted session. If we delay this, aborted-session can
+    // lag behind for the profileSubsessionCounter and other state, complicating analysis.
+    if (IS_UNIFIED_TELEMETRY) {
       let abortedPromise = this._saveAbortedSessionPing(payload);
       promise = promise.then(() => abortedPromise);
     }
+
     return promise;
   },
 
diff --git a/toolkit/components/telemetry/TelemetryUtils.jsm b/toolkit/components/telemetry/TelemetryUtils.jsm
index 78a16914c241..7878aab0c737 100644
--- a/toolkit/components/telemetry/TelemetryUtils.jsm
+++ b/toolkit/components/telemetry/TelemetryUtils.jsm
@@ -12,7 +12,21 @@ const {classes: Cc, interfaces: Ci, results: Cr, utils: Cu} = Components;
 
 const MILLISECONDS_PER_DAY = 24 * 60 * 60 * 1000;
 
+const IS_CONTENT_PROCESS = (function() {
+  // We cannot use Services.appinfo here because in telemetry xpcshell tests,
+  // appinfo is initially unavailable, and becomes available only later on.
+  let runtime = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULRuntime);
+  return runtime.processType == Ci.nsIXULRuntime.PROCESS_TYPE_CONTENT;
+})();
+
 this.TelemetryUtils = {
+  /**
+   * True if this is a content process.
+   */
+  get isContentProcess() {
+    return IS_CONTENT_PROCESS;
+  },
+
   /**
    * Turn a millisecond timestamp into a day timestamp.
    *
diff --git a/toolkit/components/telemetry/docs/index.rst b/toolkit/components/telemetry/docs/index.rst
index faa7a5656b2e..9bdae7d5a765 100644
--- a/toolkit/components/telemetry/docs/index.rst
+++ b/toolkit/components/telemetry/docs/index.rst
@@ -21,4 +21,5 @@ Client-side, this consists of:
    main-ping
    deletion-ping
    crash-ping
+   uitour-ping
    preferences
diff --git a/toolkit/components/telemetry/docs/preferences.rst b/toolkit/components/telemetry/docs/preferences.rst
index ddcba12bb3f2..967a32ce54d7 100644
--- a/toolkit/components/telemetry/docs/preferences.rst
+++ b/toolkit/components/telemetry/docs/preferences.rst
@@ -3,9 +3,15 @@ Preferences
 
 Telemetry behaviour is controlled through the preferences listed here.
 
-*Note:* On official builds (which define ``MOZILLA_OFFICIAL``), Telemetry is only initialized when ``MOZ_TELEMETRY_REPORTING`` is defined.
+Default behaviors
+-----------------
+
+On official builds (which define ``MOZILLA_OFFICIAL``), Telemetry is only initialized when ``MOZ_TELEMETRY_REPORTING`` is defined.
 Sending only happens on official builds with ``MOZ_TELEMETRY_REPORTING`` defined.
 
+Preferences
+-----------
+
 ``toolkit.telemetry.unified``
 
   This controls whether unified behavior is enabled. If true:
@@ -24,6 +30,10 @@ Sending only happens on official builds with ``MOZ_TELEMETRY_REPORTING`` defined
   If ``unified`` is on, this controls whether to record *extended* data.
   This preference is controlled through the `Preferences` dialog.
 
+  Note that the default value here of this pref depends on the define ``RELEASE_BUILD`` and the channel.
+  If ``RELEASE_BUILD`` is set, ``MOZ_TELEMETRY_ON_BY_DEFAULT`` gets set, which means this pref will default to ``true``.
+  This is overridden by the preferences code on the "beta" channel, the pref also defaults to ``true`` there.
+
 ``datareporting.healthreport.uploadEnabled``
 
   Send the data we record if user has consented to FHR. This preference is controlled through the `Preferences` dialog.
diff --git a/toolkit/components/telemetry/tests/unit/test_ChildHistograms.js b/toolkit/components/telemetry/tests/unit/test_ChildHistograms.js
index 2c29c567bf0f..cbaef9d9e5e5 100644
--- a/toolkit/components/telemetry/tests/unit/test_ChildHistograms.js
+++ b/toolkit/components/telemetry/tests/unit/test_ChildHistograms.js
@@ -6,6 +6,8 @@ Cu.import("resource://gre/modules/PromiseUtils.jsm", this);
 const Telemetry = Cc["@mozilla.org/base/telemetry;1"].getService(Ci.nsITelemetry);
 
 const MESSAGE_TELEMETRY_PAYLOAD = "Telemetry:Payload";
+const MESSAGE_TELEMETRY_GET_CHILD_PAYLOAD = "Telemetry:GetChildPayload";
+const MESSAGE_CHILD_TEST_DONE = "ChildTest:Done";
 
 const PLATFORM_VERSION = "1.9.2";
 const APP_VERSION = "1";
@@ -58,7 +60,12 @@ function check_histogram_values(payload) {
 add_task(function*() {
   if (!runningInParent) {
     TelemetryController.setupContent();
+    TelemetrySession.setupContent();
     run_child_test();
+    dump("... done with child test\n");
+    do_send_remote_message(MESSAGE_CHILD_TEST_DONE);
+    dump("... waiting for child payload collection\n");
+    yield do_await_remote_message(MESSAGE_TELEMETRY_GET_CHILD_PAYLOAD);
     return;
   }
 
@@ -69,13 +76,16 @@ add_task(function*() {
   yield TelemetryController.setup();
   yield TelemetrySession.setup();
 
-  // Run test in child and wait until it is finished.
-  yield run_test_in_child("test_ChildHistograms.js");
+  // Run test in child, don't wait for it to finish.
+  let childPromise = run_test_in_child("test_ChildHistograms.js");
+  yield do_await_remote_message(MESSAGE_CHILD_TEST_DONE);
 
   // Gather payload from child.
+  dump("... requesting child payloads\n");
   let promiseMessage = do_await_remote_message(MESSAGE_TELEMETRY_PAYLOAD);
   TelemetrySession.requestChildPayloads();
   yield promiseMessage;
+  dump("... received child payload\n");
 
   // Check child payload.
   const payload = TelemetrySession.getPayload("test-ping");
diff --git a/toolkit/devtools/DevToolsUtils.jsm b/toolkit/devtools/DevToolsUtils.jsm
deleted file mode 100644
index 373f35d41e01..000000000000
--- a/toolkit/devtools/DevToolsUtils.jsm
+++ /dev/null
@@ -1,18 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-/*
- * General utilities used throughout devtools.
- *
- * When using chrome debugging, the debugger server is unable to debug itself.
- * To avoid this, it must be loaded with a custom devtools loader with the
- * invisibleToDebugger flag set to true. Everyone else, though, prefers a JSM.
- */
-
-this.EXPORTED_SYMBOLS = [ "DevToolsUtils" ];
-
-const { devtools } = Components.utils.import("resource://gre/modules/devtools/Loader.jsm", {});
-this.DevToolsUtils = devtools.require("devtools/toolkit/DevToolsUtils.js");
diff --git a/toolkit/devtools/Loader.jsm b/toolkit/devtools/Loader.jsm
index eef5d90e5c3b..7fa69a174c9e 100644
--- a/toolkit/devtools/Loader.jsm
+++ b/toolkit/devtools/Loader.jsm
@@ -152,7 +152,7 @@ SrcdirProvider.prototype = {
     let contentObserverURI = this.fileURI(OS.Path.join(toolkitDir), "content-observer.js");
     let gcliURI = this.fileURI(OS.Path.join(toolkitDir, "gcli", "source", "lib", "gcli"));
     let projecteditorURI = this.fileURI(OS.Path.join(devtoolsDir, "projecteditor"));
-    let promiseURI = this.fileURI(OS.Path.join(modulesDir, "promise-backend.js"));
+    let promiseURI = this.fileURI(OS.Path.join(modulesDir, "Promise-backend.js"));
     let acornURI = this.fileURI(OS.Path.join(toolkitDir, "acorn"));
     let acornWalkURI = OS.Path.join(acornURI, "walk.js");
     let ternURI = OS.Path.join(toolkitDir, "tern");
@@ -439,7 +439,9 @@ DevToolsLoader.prototype = {
 
     this._provider.unload("reload");
     delete this._provider;
+    delete this._mainid;
     this._chooseProvider();
+    this.main("main");
   },
 
   /**
diff --git a/toolkit/devtools/client/dbg-client.jsm b/toolkit/devtools/client/dbg-client.jsm
index 52693e79b5eb..595791dac31e 100644
--- a/toolkit/devtools/client/dbg-client.jsm
+++ b/toolkit/devtools/client/dbg-client.jsm
@@ -50,7 +50,7 @@ Object.defineProperty(this, "WebConsoleClient", {
   enumerable: true
 });
 
-Components.utils.import("resource://gre/modules/devtools/DevToolsUtils.jsm");
+const DevToolsUtils = devtools.require("devtools/toolkit/DevToolsUtils");
 this.executeSoon = DevToolsUtils.executeSoon;
 this.makeInfallible = DevToolsUtils.makeInfallible;
 this.values = DevToolsUtils.values;
diff --git a/toolkit/devtools/gcli/commands/security.js b/toolkit/devtools/gcli/commands/security.js
index 6337400751b0..a1384e71fc1e 100644
--- a/toolkit/devtools/gcli/commands/security.js
+++ b/toolkit/devtools/gcli/commands/security.js
@@ -21,13 +21,20 @@ const BAD_IMG_SRC = "chrome://browser/content/gcli_sec_bad.svg";
 const CONTENT_SECURITY_POLICY = "Content-Security-Policy";
 const CONTENT_SECURITY_POLICY_REPORT_ONLY = "Content-Security-Policy-Report-Only";
 
-const DIR_UNSAFE_INLINE = "'unsafe-inline'";
-const DIR_UNSAFE_EVAL = "'unsafe-eval'";
+// special handling within policy
 const POLICY_REPORT_ONLY = "report-only"
 
+// special handling of directives
+const DIR_UPGRADE_INSECURE = "upgrade-insecure-requests";
+
+// special handling of sources
+const SRC_UNSAFE_INLINE = "'unsafe-inline'";
+const SRC_UNSAFE_EVAL = "'unsafe-eval'";
+
 const WILDCARD_MSG = l10n.lookup("securityCSPRemWildCard");
 const XSS_WARNING_MSG = l10n.lookup("securityCSPPotentialXSS");
 
+
 exports.items = [
   {
     // --- General Security information
@@ -73,6 +80,17 @@ exports.items = [
 
           // loop over all the directive-sources within that directive
           var outSrcs = [];
+
+          // special case handling for upgrade-insecure-requests
+          // which does not have any srcs
+          if (dir === DIR_UPGRADE_INSECURE) {
+            outSrcs.push({
+              icon: GOOD_IMG_SRC,
+              src: "", // no src for upgrade-insecure-requests
+              desc: "" // no description for upgrade-insecure-requests
+            });
+          }
+
           for (var src in curDir) {
             var curSrc = curDir[src];
 
@@ -84,7 +102,7 @@ exports.items = [
               outIcon = MOD_IMG_SRC;
               outDesc = WILDCARD_MSG;
             }
-            if (curSrc == DIR_UNSAFE_INLINE || curSrc == DIR_UNSAFE_EVAL) {
+            if (curSrc == SRC_UNSAFE_INLINE || curSrc == SRC_UNSAFE_EVAL) {
               outIcon = BAD_IMG_SRC;
               outDesc = XSS_WARNING_MSG;
             }
diff --git a/toolkit/devtools/moz.build b/toolkit/devtools/moz.build
index 7d9abb17fbeb..cccd1a7cdb6b 100644
--- a/toolkit/devtools/moz.build
+++ b/toolkit/devtools/moz.build
@@ -42,7 +42,6 @@ EXTRA_JS_MODULES.devtools += [
 
 EXTRA_JS_MODULES.devtools += [
     'Console.jsm',
-    'DevToolsUtils.jsm',
     'LayoutHelpers.jsm',
     'Loader.jsm',
     'Require.jsm',
diff --git a/toolkit/devtools/server/actors/highlighter.js b/toolkit/devtools/server/actors/highlighter.js
index 1a0f7c5e412b..afe3846c937c 100644
--- a/toolkit/devtools/server/actors/highlighter.js
+++ b/toolkit/devtools/server/actors/highlighter.js
@@ -158,6 +158,15 @@ let HighlighterActor = exports.HighlighterActor = protocol.ActorClass({
     return this._inspector && this._inspector.conn;
   },
 
+  form: function() {
+    return {
+      actor: this.actorID,
+      traits: {
+        autoHideOnDestroy: true
+      }
+    }
+  },
+
   _createHighlighter: function() {
     this._isPreviousWindowXUL = isXUL(this._tabActor.window);
 
@@ -199,6 +208,7 @@ let HighlighterActor = exports.HighlighterActor = protocol.ActorClass({
   destroy: function() {
     protocol.Actor.prototype.destroy.call(this);
 
+    this.hideBoxModel();
     this._destroyHighlighter();
     events.off(this._tabActor, "navigate", this._onNavigate);
 
@@ -416,7 +426,14 @@ let HighlighterActor = exports.HighlighterActor = protocol.ActorClass({
   })
 });
 
-let HighlighterFront = protocol.FrontClass(HighlighterActor, {});
+let HighlighterFront = protocol.FrontClass(HighlighterActor, {
+  // Update the object given a form representation off the wire.
+  form: function(json) {
+    this.actorID = json.actor;
+    // FF42+ HighlighterActors starts exposing custom form, with traits object
+    this.traits = json.traits || {};
+  }
+});
 
 /**
  * A generic highlighter actor class that instantiate a highlighter given its
diff --git a/toolkit/devtools/tests/unit/head_devtools.js b/toolkit/devtools/tests/unit/head_devtools.js
index ffd8f95aa461..b64578aea2bd 100644
--- a/toolkit/devtools/tests/unit/head_devtools.js
+++ b/toolkit/devtools/tests/unit/head_devtools.js
@@ -5,7 +5,7 @@ const Cu = Components.utils;
 const Cr = Components.results;
 
 Cu.import("resource://gre/modules/devtools/Loader.jsm");
-Cu.import("resource://gre/modules/devtools/DevToolsUtils.jsm");
+const DevToolsUtils = devtools.require("devtools/toolkit/DevToolsUtils");
 
 // Register a console listener, so console messages don't just disappear
 // into the ether.
diff --git a/toolkit/devtools/webconsole/network-helper.js b/toolkit/devtools/webconsole/network-helper.js
index f0c46ae5a4d3..0879c6692d14 100644
--- a/toolkit/devtools/webconsole/network-helper.js
+++ b/toolkit/devtools/webconsole/network-helper.js
@@ -56,7 +56,7 @@
 
 const {components, Cc, Ci, Cu} = require("chrome");
 loader.lazyImporter(this, "NetUtil", "resource://gre/modules/NetUtil.jsm");
-loader.lazyImporter(this, "DevToolsUtils", "resource://gre/modules/devtools/DevToolsUtils.jsm");
+const DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
 
 // The cache used in the `nsIURL` function.
 const gNSURLStore = new Map();
diff --git a/toolkit/devtools/webconsole/utils.js b/toolkit/devtools/webconsole/utils.js
index 289dbc7dfcab..7b001a8af8c7 100644
--- a/toolkit/devtools/webconsole/utils.js
+++ b/toolkit/devtools/webconsole/utils.js
@@ -18,7 +18,7 @@ loader.lazyImporter(this, "LayoutHelpers", "resource://gre/modules/devtools/Layo
 loader.lazyImporter(this, "gDevTools", "resource:///modules/devtools/gDevTools.jsm");
 loader.lazyImporter(this, "devtools", "resource://gre/modules/devtools/Loader.jsm");
 loader.lazyImporter(this, "VariablesView", "resource:///modules/devtools/VariablesView.jsm");
-loader.lazyImporter(this, "DevToolsUtils", "resource://gre/modules/devtools/DevToolsUtils.jsm");
+const DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
 
 // Match the function name from the result of toString() or toSource().
 //
diff --git a/widget/gtk/gtk3drawing.c b/widget/gtk/gtk3drawing.c
index e0b19a3c582b..d4f0c551a30f 100644
--- a/widget/gtk/gtk3drawing.c
+++ b/widget/gtk/gtk3drawing.c
@@ -901,9 +901,7 @@ moz_gtk_button_paint(cairo_t *cr, GdkRectangle* rect,
         y += default_top;
         width -= (default_left + default_right);
         height -= (default_top + default_bottom);
-    }
- 
-    if (relief != GTK_RELIEF_NONE || state->depressed ||
+    } else if (relief != GTK_RELIEF_NONE || state->depressed ||
         (state_flags & GTK_STATE_FLAG_PRELIGHT)) {
         /* the following line can trigger an assertion (Crux theme)
            file ../../gdk/gdkwindow.c: line 1846 (gdk_window_clear_area):
diff --git a/widget/gtk/mozgtk/mozgtk.c b/widget/gtk/mozgtk/mozgtk.c
index 00e60834b51b..8f78c45b2e01 100644
--- a/widget/gtk/mozgtk/mozgtk.c
+++ b/widget/gtk/mozgtk/mozgtk.c
@@ -507,6 +507,7 @@ STUB(gdk_x11_display_get_type)
 STUB(gtk_cairo_should_draw_window)
 STUB(gtk_cairo_transform_to_window)
 STUB(gtk_combo_box_text_append)
+STUB(gtk_drag_set_icon_surface)
 STUB(gtk_get_major_version)
 STUB(gtk_get_micro_version)
 STUB(gtk_get_minor_version)
@@ -546,6 +547,7 @@ STUB(gtk_tree_view_column_get_button)
 STUB(gtk_widget_get_preferred_size)
 STUB(gtk_widget_get_style_context)
 STUB(gtk_widget_path_append_type)
+STUB(gtk_widget_path_free)
 STUB(gtk_widget_path_new)
 STUB(gtk_widget_set_visual)
 STUB(gtk_app_chooser_dialog_new_for_content_type)
diff --git a/widget/gtk/nsDragService.cpp b/widget/gtk/nsDragService.cpp
index 291722e8bdb7..3331442136b2 100644
--- a/widget/gtk/nsDragService.cpp
+++ b/widget/gtk/nsDragService.cpp
@@ -19,6 +19,7 @@
 #include "nsPrimitiveHelpers.h"
 #include "prtime.h"
 #include "prthread.h"
+#include <dlfcn.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 #include "nsCRT.h"
@@ -38,6 +39,7 @@
 #include "nsGtkUtils.h"
 #include "mozilla/gfx/2D.h"
 #include "gfxPlatform.h"
+#include "nsScreenGtk.h"
 
 using namespace mozilla;
 using namespace mozilla::gfx;
@@ -406,7 +408,6 @@ nsDragService::SetAlphaPixmap(SourceSurface *aSurface,
                               int32_t aYOffset,
                               const nsIntRect& dragRect)
 {
-#if (MOZ_WIDGET_GTK == 2)
     GdkScreen* screen = gtk_widget_get_screen(mHiddenWidget);
 
     // Transparent drag icons need, like a lot of transparency-related things,
@@ -414,6 +415,7 @@ nsDragService::SetAlphaPixmap(SourceSurface *aSurface,
     if (!gdk_screen_is_composited(screen))
       return false;
 
+#if (MOZ_WIDGET_GTK == 2)
     GdkColormap* alphaColormap = gdk_screen_get_rgba_colormap(screen);
     if (!alphaColormap)
       return false;
@@ -454,8 +456,46 @@ nsDragService::SetAlphaPixmap(SourceSurface *aSurface,
     g_object_unref(pixmap);
     return true;
 #else
-    // TODO GTK3
-    return false;
+#ifdef cairo_image_surface_create
+#error "Looks like we're including Mozilla's cairo instead of system cairo"
+#endif
+    // TODO: grab X11 pixmap or image data instead of expensive readback.
+    cairo_surface_t *surf = cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
+                                                       dragRect.width,
+                                                       dragRect.height);
+    if (!surf)
+        return false;
+
+    RefPtr<DrawTarget> dt = gfxPlatform::GetPlatform()->
+        CreateDrawTargetForData(cairo_image_surface_get_data(surf),
+                                dragRect.Size(),
+                                cairo_image_surface_get_stride(surf),
+                                SurfaceFormat::B8G8R8A8);
+    if (!dt)
+        return false;
+
+    dt->ClearRect(Rect(0, 0, dragRect.width, dragRect.height));
+    dt->DrawSurface(aSurface,
+                    Rect(0, 0, dragRect.width, dragRect.height),
+                    Rect(0, 0, dragRect.width, dragRect.height),
+                    DrawSurfaceOptions(),
+                    DrawOptions(DRAG_IMAGE_ALPHA_LEVEL, CompositionOp::OP_SOURCE));
+
+    cairo_surface_mark_dirty(surf);
+    cairo_surface_set_device_offset(surf, -aXOffset, -aYOffset);
+
+    // Ensure that the surface is drawn at the correct scale on HiDPI displays.
+    static auto sCairoSurfaceSetDeviceScalePtr =
+        (void (*)(cairo_surface_t*,double,double))
+        dlsym(RTLD_DEFAULT, "cairo_surface_set_device_scale");
+    if (sCairoSurfaceSetDeviceScalePtr) {
+        gint scale = nsScreenGtk::GetGtkMonitorScaleFactor();
+        sCairoSurfaceSetDeviceScalePtr(surf, scale, scale);
+    }
+
+    gtk_drag_set_icon_surface(aContext, surf);
+    cairo_surface_destroy(surf);
+    return true;
 #endif
 }
 
diff --git a/widget/gtk/nsLookAndFeel.cpp b/widget/gtk/nsLookAndFeel.cpp
index 7d49c8aaa005..06972e670563 100644
--- a/widget/gtk/nsLookAndFeel.cpp
+++ b/widget/gtk/nsLookAndFeel.cpp
@@ -1187,6 +1187,8 @@ nsLookAndFeel::Init()
     style = gtk_widget_get_style_context(frame);
     gtk_style_context_get_border_color(style, GTK_STATE_FLAG_NORMAL, &color);
     sFrameInnerDarkBorder = sFrameOuterLightBorder = GDK_RGBA_TO_NS_RGBA(color);
+
+    gtk_widget_path_free(path);
 #endif
     // Some themes have a unified menu bar, and support window dragging on it
     gboolean supports_menubar_drag = FALSE;
diff --git a/widget/gtk/nsScreenManagerGtk.cpp b/widget/gtk/nsScreenManagerGtk.cpp
index 98650d32710e..8d8d8424d868 100644
--- a/widget/gtk/nsScreenManagerGtk.cpp
+++ b/widget/gtk/nsScreenManagerGtk.cpp
@@ -8,6 +8,7 @@
 #include "nsIComponentManager.h"
 #include "nsRect.h"
 #include "nsAutoPtr.h"
+#include "nsGtkUtils.h"
 
 #define SCREEN_MANAGER_LIBRARY_LOAD_FAILED ((PRLibrary*)1)
 
@@ -20,6 +21,12 @@ typedef XineramaScreenInfo* (*_XnrmQueryScreens_fn)(Display *dpy, int *number);
 
 #include <gtk/gtk.h>
 
+void
+monitors_changed(GdkScreen* aScreen, gpointer aClosure)
+{
+  nsScreenManagerGtk *manager = static_cast<nsScreenManagerGtk*>(aClosure);
+  manager->Init();
+}
 
 static GdkFilterReturn
 root_window_event_filter(GdkXEvent *aGdkXEvent, GdkEvent *aGdkEvent,
@@ -31,9 +38,6 @@ root_window_event_filter(GdkXEvent *aGdkXEvent, GdkEvent *aGdkEvent,
 
   // See comments in nsScreenGtk::Init below.
   switch (xevent->type) {
-    case ConfigureNotify:
-      manager->Init();
-      break;
     case PropertyNotify:
       {
         XPropertyEvent *propertyEvent = &xevent->xproperty;
@@ -63,6 +67,10 @@ nsScreenManagerGtk :: nsScreenManagerGtk ( )
 
 nsScreenManagerGtk :: ~nsScreenManagerGtk()
 {
+  g_signal_handlers_disconnect_by_func(gdk_screen_get_default(),
+                                       FuncToGpointer(monitors_changed),
+                                       this);
+
   if (mRootWindow) {
     gdk_window_remove_filter(mRootWindow, root_window_event_filter, this);
     g_object_unref(mRootWindow);
@@ -93,14 +101,15 @@ nsScreenManagerGtk :: EnsureInit()
   mRootWindow = gdk_get_default_root_window();
   g_object_ref(mRootWindow);
 
-  // GDK_STRUCTURE_MASK ==> StructureNotifyMask, for ConfigureNotify
   // GDK_PROPERTY_CHANGE_MASK ==> PropertyChangeMask, for PropertyNotify
   gdk_window_set_events(mRootWindow,
                         GdkEventMask(gdk_window_get_events(mRootWindow) |
-                                     GDK_STRUCTURE_MASK |
                                      GDK_PROPERTY_CHANGE_MASK));
-  gdk_window_add_filter(mRootWindow, root_window_event_filter, this);
+
+  g_signal_connect(gdk_screen_get_default(), "monitors-changed",
+                   G_CALLBACK(monitors_changed), this);
 #ifdef MOZ_X11
+  gdk_window_add_filter(mRootWindow, root_window_event_filter, this);
   if (GDK_IS_X11_DISPLAY(gdk_display_get_default()))
       mNetWorkareaAtom =
         XInternAtom(GDK_WINDOW_XDISPLAY(mRootWindow), "_NET_WORKAREA", False);
diff --git a/xpcom/base/nsAutoPtr.h b/xpcom/base/nsAutoPtr.h
index 0c57fbb789db..1f26c8ef0395 100644
--- a/xpcom/base/nsAutoPtr.h
+++ b/xpcom/base/nsAutoPtr.h
@@ -97,7 +97,7 @@ public:
   }
 
   template <typename I>
-  nsAutoPtr(nsAutoPtr<I>& aSmartPtr)
+  MOZ_IMPLICIT nsAutoPtr(nsAutoPtr<I>& aSmartPtr)
     : mRawPtr(aSmartPtr.forget())
     // Construct by transferring ownership from another smart pointer.
   {
@@ -110,7 +110,7 @@ public:
   }
 
   template <typename I>
-  nsAutoPtr(nsAutoPtr<I>&& aSmartPtr)
+  MOZ_IMPLICIT nsAutoPtr(nsAutoPtr<I>&& aSmartPtr)
     : mRawPtr(aSmartPtr.forget())
     // Construct by transferring ownership from another smart pointer.
   {
diff --git a/xpcom/base/nsRefPtr.h b/xpcom/base/nsRefPtr.h
index ae33bf0307a9..29b913fcd1ba 100644
--- a/xpcom/base/nsRefPtr.h
+++ b/xpcom/base/nsRefPtr.h
@@ -101,21 +101,21 @@ public:
   }
 
   template <typename I>
-  nsRefPtr(already_AddRefed<I>& aSmartPtr)
+  MOZ_IMPLICIT nsRefPtr(already_AddRefed<I>& aSmartPtr)
     : mRawPtr(aSmartPtr.take())
     // construct from |already_AddRefed|
   {
   }
 
   template <typename I>
-  nsRefPtr(already_AddRefed<I>&& aSmartPtr)
+  MOZ_IMPLICIT nsRefPtr(already_AddRefed<I>&& aSmartPtr)
     : mRawPtr(aSmartPtr.take())
     // construct from |otherRefPtr.forget()|
   {
   }
 
   template <typename I>
-  nsRefPtr(nsRefPtr<I>&& aSmartPtr)
+  MOZ_IMPLICIT nsRefPtr(nsRefPtr<I>&& aSmartPtr)
     : mRawPtr(aSmartPtr.forget().take())
     // construct from |Move(nsRefPtr<SomeSubclassOfT>)|.
   {
diff --git a/xpcom/glue/nsTArray.h b/xpcom/glue/nsTArray.h
index 2809ad0c1329..695eb3af3b50 100644
--- a/xpcom/glue/nsTArray.h
+++ b/xpcom/glue/nsTArray.h
@@ -2224,7 +2224,7 @@ protected:
   }
 
   template<typename Allocator>
-  nsAutoArrayBase(nsTArray_Impl<elem_type, Allocator>&& aOther)
+  explicit nsAutoArrayBase(nsTArray_Impl<elem_type, Allocator>&& aOther)
   {
     Init();
     this->SwapElements(aOther);
diff --git a/xpcom/glue/nsThreadUtils.h b/xpcom/glue/nsThreadUtils.h
index aac11e6f5846..dd63d7f96e78 100644
--- a/xpcom/glue/nsThreadUtils.h
+++ b/xpcom/glue/nsThreadUtils.h
@@ -367,7 +367,7 @@ struct StoreCopyPassByValue
   typedef T passed_type;
   stored_type m;
   template <typename A>
-  StoreCopyPassByValue(A&& a) : m(mozilla::Forward<A>(a)) {}
+  explicit StoreCopyPassByValue(A&& a) : m(mozilla::Forward<A>(a)) {}
   passed_type PassAsParameter() { return m; }
 };
 template<typename S>
@@ -381,7 +381,7 @@ struct StoreCopyPassByConstLRef
   typedef const T& passed_type;
   stored_type m;
   template <typename A>
-  StoreCopyPassByConstLRef(A&& a) : m(mozilla::Forward<A>(a)) {}
+  explicit StoreCopyPassByConstLRef(A&& a) : m(mozilla::Forward<A>(a)) {}
   passed_type PassAsParameter() { return m; }
 };
 template<typename S>
@@ -395,7 +395,7 @@ struct StoreCopyPassByLRef
   typedef T& passed_type;
   stored_type m;
   template <typename A>
-  StoreCopyPassByLRef(A&& a) : m(mozilla::Forward<A>(a)) {}
+  explicit StoreCopyPassByLRef(A&& a) : m(mozilla::Forward<A>(a)) {}
   passed_type PassAsParameter() { return m; }
 };
 template<typename S>
@@ -409,7 +409,7 @@ struct StoreCopyPassByRRef
   typedef T&& passed_type;
   stored_type m;
   template <typename A>
-  StoreCopyPassByRRef(A&& a) : m(mozilla::Forward<A>(a)) {}
+  explicit StoreCopyPassByRRef(A&& a) : m(mozilla::Forward<A>(a)) {}
   passed_type PassAsParameter() { return mozilla::Move(m); }
 };
 template<typename S>
@@ -423,7 +423,7 @@ struct StoreRefPassByLRef
   typedef T& passed_type;
   stored_type m;
   template <typename A>
-  StoreRefPassByLRef(A& a) : m(a) {}
+  explicit StoreRefPassByLRef(A& a) : m(a) {}
   passed_type PassAsParameter() { return m; }
 };
 template<typename S>
@@ -437,7 +437,7 @@ struct StoreConstRefPassByConstLRef
   typedef const T& passed_type;
   stored_type m;
   template <typename A>
-  StoreConstRefPassByConstLRef(const A& a) : m(a) {}
+  explicit StoreConstRefPassByConstLRef(const A& a) : m(a) {}
   passed_type PassAsParameter() { return m; }
 };
 template<typename S>
@@ -451,7 +451,7 @@ struct StorensRefPtrPassByPtr
   typedef T* passed_type;
   stored_type m;
   template <typename A>
-  StorensRefPtrPassByPtr(A a) : m(a) {}
+  explicit StorensRefPtrPassByPtr(A a) : m(a) {}
   passed_type PassAsParameter() { return m.get(); }
 };
 template<typename S>
@@ -465,7 +465,7 @@ struct StorePtrPassByPtr
   typedef T* passed_type;
   stored_type m;
   template <typename A>
-  StorePtrPassByPtr(A a) : m(a) {}
+  explicit StorePtrPassByPtr(A a) : m(a) {}
   passed_type PassAsParameter() { return m; }
 };
 template<typename S>
@@ -479,7 +479,7 @@ struct StoreConstPtrPassByConstPtr
   typedef const T* passed_type;
   stored_type m;
   template <typename A>
-  StoreConstPtrPassByConstPtr(A a) : m(a) {}
+  explicit StoreConstPtrPassByConstPtr(A a) : m(a) {}
   passed_type PassAsParameter() { return m; }
 };
 template<typename S>
@@ -493,7 +493,7 @@ struct StoreCopyPassByConstPtr
   typedef const T* passed_type;
   stored_type m;
   template <typename A>
-  StoreCopyPassByConstPtr(A&& a) : m(mozilla::Forward<A>(a)) {}
+  explicit StoreCopyPassByConstPtr(A&& a) : m(mozilla::Forward<A>(a)) {}
   passed_type PassAsParameter() { return &m; }
 };
 template<typename S>
@@ -507,7 +507,7 @@ struct StoreCopyPassByPtr
   typedef T* passed_type;
   stored_type m;
   template <typename A>
-  StoreCopyPassByPtr(A&& a) : m(mozilla::Forward<A>(a)) {}
+  explicit StoreCopyPassByPtr(A&& a) : m(mozilla::Forward<A>(a)) {}
   passed_type PassAsParameter() { return &m; }
 };
 template<typename S>
@@ -626,7 +626,7 @@ struct nsRunnableMethodArguments<T0>
 {
   typename ::detail::ParameterStorage<T0>::Type m0;
   template<typename A0>
-  nsRunnableMethodArguments(A0&& a0)
+  explicit nsRunnableMethodArguments(A0&& a0)
     : m0(mozilla::Forward<A0>(a0))
   {}
   template<class C, typename M> void apply(C* o, M m)
diff --git a/xpcom/string/nsTLiteralString.h b/xpcom/string/nsTLiteralString.h
index 2ad27ffc41a5..fa75ba8293e5 100644
--- a/xpcom/string/nsTLiteralString.h
+++ b/xpcom/string/nsTLiteralString.h
@@ -28,7 +28,7 @@ public:
    */
 
   template<size_type N>
-  nsTLiteralString_CharT(const char_type (&aStr)[N])
+  explicit nsTLiteralString_CharT(const char_type (&aStr)[N])
     : string_type(const_cast<char_type*>(aStr), N - 1, F_TERMINATED | F_LITERAL)
   {
   }