Bug 1012917 - Send HttpBaseChannel::mApplyConversion with ChannelDiverter constructor in IPDL r=reuben r=mayhemer
Bug 1058105 - Fix a typo in placesNodeAnnotationChanged; r=mconley

--HG--
extra : rebase_source : 5e04a73997a6d62d5664e350c42a284f8879e0ba
Bug 1057393 - Fix a regression on octane-zlib; r=sfink

--HG--
extra : rebase_source : 3ecf3f741cb5264a426c6edf97ce59184ae6cd34
Bug 1040924 - Ee-enable the serviceworker tests on non-Windows, r=RyanVM
Bug 1041631, part 1 - Change Symbol tests to pass if Symbol is not defined. r=Waldo.

--HG--
extra : rebase_source : b8510807640d3f0da483904079a26467829f7e70
Bug 1058388 - Remove NS_COM_GLUE and IMETHOD_VISIBILITY. r=bsmedberg.

--HG--
extra : rebase_source : 250ec1323d4097101a8e0331a2bf7fab59f72b1d
Bug 1057192 part.2 nsTextStore should not commit a part of composition string which will be still being composed after restarting composition r=emk
Bug 1051134 - Revert reftest annotation too.
Bug 1047743 - Screen sharing with multiple screens is broken (Mac only). r=jesup
* * *
Bug 1047743 - interdiff to not impact other platforms
Bug 1055378 - Adds RTCRTPStreamStats.mediaType + test of getStats w/track arg. r=smaug,drno,jesup
Bug 1041631, part 2 - Make ES6 Symbols Nightly-only for now. r=Waldo.

--HG--
extra : rebase_source : f2365f340299edac9db040280a2a13aa254e5148
Bug 1055378 - getStats w/non-null track arg now returns stats for the right track. r=jesup
Bug 1055378 - Tightened test of getStats w/track arg. r=drno
Bug 1049234 - deal with broken settings in feedwriter instead of dying completely, r=jaws
Bug 1059721 - update l10n comments, r=flod DONTBUILD because l10n comments only
Bug 1044932 - Add JQuery support to visual events r=pbrosset
Bug 995108: Don't register unused observers; r=mossop
Bug 1042919: Catch errors in isPlatformCompatible and report them via Telemetry; r=mossop
Bug 1059767 - browser_markupview_events-overflow.js: Fix precision error in alignment r=me
Merge mozilla-central to fx-team