Bug 959446 - [Australis] "Restore Defaults" button isn't pinned to the bottom of the window while we transition into customize mode. r=felipe
Bug 961051 - Fix for intermittent browser_console_addonsdk_loader_exception.js | This test exceeded the timeout threshold; r=me
Bug 960389 - mess with Australis overflow test to resolve winxp pgo issue, rs=me
Bug 944947 - label truncation is not fully supported in Australis menu widgets, r=MattN
Bug 944947 - automatically hyphenate labels for items in Australis' menupanel, r=MattN
Bug 958993 - taping Clear button under Options several times creates multiple modal prompts.r=mbrubeck
Bug 947612 - Fix VariablesView so that editableName._onCleanup is called. r=vp
Bug 917896 - Replace throbber with progress bar. r=lucasr

--HG--
extra : rebase_source : 3aee6ee1526857fa5eeda22137fac2b34bce1102
Bug 957588 - Bookmark navbar button is checked for non-metro bookmarks r=sfoster
Bug 955886 - Remove toolbar margin when entering fullscreen without dynamic toolbar. r=wesj
Bug 691614 - Make content zooming work with e10s Firefox. r=felipe
Bug 691614 - [Australis] Change zoom widget to work with e10s. r=felipe
Merge m-c to fx-team.
Backed out changeset a63deedeb4b7 (bug 917896) for robocop failures.
Bug 960270 - Streamline Editor API. r=msucan
Bug 960704 - Upgrade CodeMirror to 3.21. r=msucan
Bug 958456 - Hides highlighter when hovering over non-visible nodes in markup-view; r=jwalker
Bug 960043 - [Australis] Update the quit icon on the menu panel to make it more clear that it will quit the browser. r=mikedeboer
Bug 958089 - [Australis] Remove the padding-top on Linux while in customization mode. r=mikedeboer
Bug 958687 - Fixes pseudo-class lock in highlighter intermittent test failure; r=jwalker