Bug 959058 - Map GBK and GB2312 decoder constructors to the GB18030 decoder. r=emk.
Bug 961648 - Provide a helpful error message when test variables JSON file cannot be parsed; r=dhunt
Backed out changeset 88549ccbce60 (bug 959058) for mochitest -m7 orange on android on a CLOSED TREE
Merge mozilla-central to mozilla-inbound
Bug 157846 - Remove padding from textbox.plain. r=roc
Bug 941611 - More consistent rounding of text metrics. r=karlt, r=fredw
Bug 957800 - Make codeword longer to avoid collisions. r=abr
Bug 963031 - AArch support for Graphics. r=doublec
Bug 963166 - Add getWindowHandles end-point for WebDriver compatibility. r=dburns
Bug 961041 - Replace infallible allocation in DOMStorage::BroadcastChangeNotification with fallible allocation. r=smaug
Bug 961313 - Add the transport protocol to candidate labels. r=abr
Bug 963491 - Implement MacIOSurface::GetAsSourceSurface. r=nical
Bug 962371 - Part 1: Make priority for TCP relayed candidates lower than UDP relayed candidates. r=abr
[Australis] Bug 963591: update font-size use in help subview toolbarbuttons. r=Gijs
Bug 839794 - Use OS.File in Telemetry. r=Yoric
Bug 962371 - Part 2: Remove some magic constants. r=abr
Bug 963674 - Remove xul appinfo from xpcshell tests. r=MattN
Bug 959058 - Map GBK and GB2312 decoder constructors to the GB18030 decoder. r=emk.
Additional test for bug 959058 - Check that 0x80 still decodes as euro on pages labeled as gbk. r=emk.

--HG--
rename : intl/uconv/tests/test_bug959058.html => intl/uconv/tests/test_bug959058-1.html
rename : intl/uconv/tests/test_bug959058.html => intl/uconv/tests/test_bug959058-2.html
Backed out changeset ce887b471785 (bug 961313) for buffered_stun_socket_unittest crashes, again.