Bug 933023 - UITour: Add preference to disable HTTPS check for testing/development. r=MattN
Merge m-c to fxteam
Bug 933984 - Fix "this._mutationObserver is undefined" error on new tab page. r=gavin
Bug 933646 - Blackboxing a program in the shader editor should hide the rendered geometry, r=rcampbell
Bug 930928 - Shader compilation errors should be displayed in the editor, r=rcampbell,anton
Bug 934487 - Fix "TypeError: this.markup is undefined" in devtools b-c runs; r=pbrosset
Bug 867776 - Move URLCryptoKeyManager serialization to off the main-thread. r=Yoric
Bug 934274 - [app manager] changed invalidLaunchPath to accessFailedLaunchPath and edited the text. r=jryans
Bug 934207 - Add browser_thumbnails_background_crash.js to browser.ini r=jhammel,markh

From 866d4df33b0e9fd8b8a28eea4dfa690a10b7fa83 Mon Sep 17 00:00:00 2001
merge mozilla-central to fx-team
Backout 90d6f7ce0fc2 (bug 920935) not needed anymore (r=backout)
Bug 930548: collect more per-addon Telemetry details; r=unfocused
Bug 916797 - --run-until-failure mochitest option should support running multiple tests. r=jmaher
Bug 886014 - Don't assume that all vnd.youtube URLs have params. r=mfinkle
Bug 932937 - Images are resized on the server-side for image preview tooltips. r=harth
Bug 934131 - Remove k12.sd.us from PSL. r=gerv
Bug 754344 - Make in-content prefs navigation look like about:addons r=jaws

From 8e5ce19d039052d06c099a87c2c315353bc589cf Mon Sep 17 00:00:00 2001
Merge fx-team to m-c.