Bug 971214 - Use setBackgroundDrawable() in BasicColorPicker (r=wesj)
Merge mozilla-central and fx-team
Bug 968447 - The Bookmarks Toolbar Items doesn't appear as a normal menu panel button in new windows. r=Gijs

--HG--
extra : rebase_source : 446af8d36736c74cff9e02614f80ac61b757d9ff
Bug 971246 - Fix the display of type='menu' to show the dropmarker in the corner like type='menu-button'. r=mconley

--HG--
extra : rebase_source : ca18708f200f7e85b985a2fb7c2a9f091cb0cc8f
Bug 960905 - DevToolsUtils.reportException is misused in Tracer.prototype. r=fitzgen
Bug 960905 - Fix a misuse of DevToolsUtils.reportException in ThreadSources.prototype.getOriginalLocation. r=fitzgen
Bug 972795 - NetMonitor should show "Request Headers From Upload Stream" in the Headers tab, not only as part of the Request Payload in the Params tab, r=rcampbell
Bug 968916 - Add an entry point to the ceh that launches the metro browser. r=bbondy
Bug 968916 - Launch the last used browser frontend after pave over installs. r=rstrong
Backout bug 960198 since it regressed Australis styling changes. Not backing out the string changes so strings will be present on Aurora30. rs=Gijs

--HG--
extra : rebase_source : 7f7e723f386a187cd1eba7116cc7b29c0a065b55
Backed out changeset 1eebddd614eb (bug 962103) for causing bug 947550

--HG--
extra : rebase_source : 809b725149264001d341469ebae420aa19911af4
Bug 972140 - fix tabbrowser-tabs min-height for Australis so it doesn't get squashed when the non-abs-pos bits have 0 width, r=mconley

--HG--
extra : rebase_source : a233b0be8a28a3fbb9cd49608655be9e7495be8f
Bug 978251 - nullcheck target in Australis' panel click detection code, r=jaws

--HG--
extra : rebase_source : 4bd6b3121fe298961f0354054508debf75d62e86
Bug 971418 - DevTools dark theme: use higher contrast text for main body content;r=harth
Bug 978494 - Fix URL in Reader:Removed. r=lucsar
Bug 972925 - Uplift Add-on SDK to Firefox
Merge fx-team to m-c.