Bug 1100632 - Remove --disable-opus option and MOZ_OPUS #define macros. r=rillian,ted
Bug 1105851 - Unbreak non-unified non-SPS build after 1054498. r=jcj
Bug 1105104 - Fix the painting of XUL tree connector lines. r=Bas
Bug 1104433 part 1 - Update test_error_events.html to set allow_uncaught_exception; r=Ms2ger
Bug 1104433 part 2 - Update dom/imptests/testharness.js and friends; rs=Ms2ger
Bug 1104433 part 3 - Extend the timeout of dom/imptests/editing/conformancetest/test_runtest.html; rs=Ms2ger
Bug 1048745 - [WebGL2] Integer vertex attributes. r=jgilbert

--HG--
extra : rebase_source : 590eaef6f7582701607e48f7e67bbe7100ff7199
Bug 1098374 - Telemetry: Stop all monkey patching in devtools telemetry tests r=harth
Bug 1091796 - Add a telemetry probe to track dark theme usage r=pbrosset,bgrins,gijs,me
Back out 2 changesets (bug 1098374, bug 1091796) for crashes
CLOSED TREE

Backed out changeset 33a786d18780 (bug 1091796)
Backed out changeset f08caae7fcf9 (bug 1098374)
Merge m-c to f-t
Bug 1085774 - Part 0: cleanup in tabs engine. r=trivial
Bug 1085774 - Part 1: add more history URLs to tab records. r=rnewman
Bug 1091934, increase EventSource tests stress factor, r=wellington
Bug 1048719 - [WebGL2] Remove WebGLQueryRefPtr typedef. r=jgilbert

--HG--
extra : rebase_source : 1215509032baa31835844b4ee875e479de7cea2c
extra : source : 293d398b392ca1959d793298327ce2db170e1ca2
Bug 1080943 - UITour: Allow opening the Hello panel. r=Unfocused
Bug 1106277 - Include aero jar.mn reference for performance.css. r=jsantell
Bug 1106240 - Search category icon is squashed in in-content prefs. r=dao
Bug 1080943 - Leak fix for 5994d92115ac copied from Loop's head.js. rs=bustage
merge fx-team to mozilla-central a=merge