Bug 946517 - Provide MOZ_DISABLE_PROGUARD envvar to disable ProGuard (r=rnewman)
Bug 940387 - when dragging wide items in Australis' palette, don't fix insertion point to first item in row, r=mikedeboer
Bug 947867 - fix issues with events in Australis' CustomizableUI discovered when documenting, r=jaws
Bug 947952 - Rename "non-*" attributes in the Variables View to avoid double negation, r=paul
Bug 941357 - (Part 1) Consolidate per-profile content provider logic in PerProfileDatabases, starting with TabsProvider. r=rnewman
Bug 941357 - (Part 2) Update BrowserProvider to use PerProfileDatases. r=rnewman
Bug 942393 - document Australis' CustomizableUI, r=me, comments-only, NPOTB, DONTBUILD

--HG--
extra : rebase_source : 6e90cbf47609670ae3ee9e7a85ed1791fccee299
Bug 946335 - Scrollbar on Metro start page is covered by navbar [r=emtwo]
Bug 944255 - about:start bookmarks and history tiles cut off when using split views r=sfoster

--HG--
extra : rebase_source : d1e2a8636ba863d89fbcb658ce373cddceb722b2
Bug 947406 - Don't return promise when done with package upload. r=ochameau
Forbid out of order resumption when two tabs with the same URL are paused (bug 947830); r=fitzgen

Also consider stepping actions as a form of resumption and require the same resumption order when multiple tabs are paused.
Backed out changeset 772c30e9e812 (bug 944255) for mochitest-mc orange.
Merge fx-team to m-c.