Bug 1112700 - Fix assertion failure: aPropID != eCSSPropertyExtra_variable r=me
Bug 1109149 - Display a basic error to the user if Loop room creation fails. r=nperriault
Merge mozilla-central to fx-team
Bug 1108254 - fix hidpi icon in search, r=felipe

--HG--
extra : rebase_source : 764162314dc48b0a7669ebe41bfe58cd40dca062
extra : amend_source : 70bf1cb729cd114495f1a7fad40961e2c9801e01
Bug 1101287 - fix browser_934951_zoom_in_toolbar.js to use a mutation observer to wait for a label change, r=adw
Bug 1109032 - Fix the activity so audio only calls from received links work. r=mbanner
Bug 1097703 - Enable install/open FxOS Loop client from standalone UI for ROOM. r=mbanner
Bug 340814 - Highlighted text stays highlighted when closing the Find Toolbar. r=mdeboer,felipe
Bug 1110235 - Clicking on the header region of the search dropdown should trigger a search with the default engine. r=florian
Backout 3132eea067dc (bug 340814) for test failures on a CLOSED TREE
Bug 1112189 - Additional telemetry for tracking protection shield. r=mfinkle

--HG--
extra : rebase_source : eda2d69c36118cc93540ab0bed934d53c9de0c03
Bug 795968 - Create about:reader page. r=jaws

--HG--
extra : rebase_source : 5989b4e9434368aa5dac1eca03b331c2e845048a
Bug 1068664 - Introduce API for downloads in a blocked state with file on disk. r=paolo

This new API allows consumers to call unblock() on the download if
they'd like to allow it. If they'd like to delete the blocked download's
partial data they may call confirmBlock(). Downloads also have a new
hasBlockedData property which will be true if the Download has blocked
data on disk.

DownloadIntegration now also allows for checking if handling downloads
in a blocked state is supported. As platforms support the new operations
on a blocked download they should update their implementation of this
check to keep the blocked download data on disk.

This also moves the reputation checking into the saver so it can happen
before moving the download to its final path - so we don't have possibly
dangerous files sitting around with their intended filename / extension.

If a Download did not use a part file and it fails the reputation check
we will always remove it to prevent dangerous files from existing with
their intended filename.

--HG--
extra : rebase_source : 519e3b4b98c8ccfc00039f35bd32e3143e39a5f8
Bug 632290: Intermittent browser_about.js timeout. r=Mossop
Bug 1112556 - Ctrl-Tab previews are oversized with a small number of tabs open. r=dao

--HG--
extra : rebase_source : 1cb9531271538fcf6d842db56000e31cd21208d3
Bug 1112552 - Clean up global-scope pollution from browser-fxaccounts.js. r=dao

--HG--
extra : rebase_source : 5eb7c7451e8b8a57a2ecac55a1b0404bb7ce66dc
Bug 647540 - Get rid of the toolbar-primary class. r=enn

--HG--
extra : rebase_source : a42a4c583376dfa153bd4e7bae514646b35a6e22
Backing out bug 632290 due to more permanent failures.
Backed out changeset 326f890f61a5 (bug 647540) for mass test bustage.
CLOSED TREE
Backed out changeset 01f50f0fbda6 (bug 1112552) for mass test bustage.
CLOSED TREE