Bug 880752 - Console.jsm stdout/err output is joined with commas and nukes newlines; r=jwalker
Bug 880752 - Fix jetpack tests to account for new stringified output, r=test-only
merge mozilla-central to fx-team
Bug 899695 - Fix exception in "mach python" on Windows [r=gps]

DONTBUILD (not part of the build)
Bug 902059 - Enable mixed content blocking by default. r=mfinkle
Bug 853844 - Optimized pageload throbber. r=mfinkle
Bug 888982 - Fennec should use channel-specific build defines rather than MOZ_UPDATE_CHANNEL. r=mleibovic
Bug 894811 - First character gets dropped when typing into urlbar after opening a new tab.r=mbrubeck
Merge m-c to fx-team.
Bug 901239 - Uplift Add-on SDK to Firefox r=me
Bug 881995 - Snapped view Alignment for Bookmarks an Recent History is off and tiles are cut off

--HG--
extra : rebase_source : c555f8623515499f7cdf84f11e0b29a8c43343cd
Backing out 9c17e6d4739d due to test failures.
Bug 853388: Save and load XPIProvider state to/from a JSON file; r=unfocused
Bug 853388: Upgrade existing SQLITE databases to JSON; r=unfocused
Bug 853388: Remove transaction model of database flush control and implement async save of database; r=unfocused
Bug 853388: Trigger XPI database conversion from SQLITE based on schema version preference; r=unfocused
Bug 853388: Load JSON database asynchronously outside of startup; r=unfocused
Bug 853388: Keep trying to save JSON even if read or save fails; r=unfocused
Bug 818987 - Links to media files should have an 'Open in app' option. r=wesj
Bug 902246 - Utility methods for adding rgb(a) colors together. r=mbrubeck