Bug 824835 - Display the location info for the events which is cross the next day.
 Bug 831228 - proper l10n init in Settings > Cellular & Data > Network Operator
Bug 829023 - [Settings] Don't use dividers to separate paragraphs in the same text block

Conflicts:
	apps/settings/index.html
Bug 878726 -  Call time in red although answered (not missed call)
Bug 874715: [Settings/carriers] untranslated 'automatic' string
Merge pull request #10088 from pivanov/bug-829023

Bug 829023 - [Settings] Don't use dividers to separate paragraphs in the same text block r=samjoch
Bugs 878387, 878168, 876891: fix three closely related auto-correct bugs
Merge pull request #10155 from davidflanagan/bug876891

Bugs 878387, 878168, 876891: fix three closely related auto-correct bugs. r=janjongboom
Bug 878843 - Integrate with replaceSurroundingText for autocorrect
Merge pull request #10158 from albertopq/call-log-error-highlight

Bug 878726 -  Call time in red although answered (not missed call)
Merge pull request #10167 from lodr/bug-878833-completing-test-coverage

Bug 878833 - Completing test coverage for bug 873365
r=arcturus
Merge pull request #9782 from evanxd/bug-824835

Bug 824835 - [B2G][Calendar][Event] No location is displayed for an event that starts at 11:00 pm and continues to the next day.
Merge pull request #10165 from comoyo/replace_surrounding

Replace surrounding. r=fabrice
Revert "Bug 869903 - Use black as the default background of packaged apps"

This reverts commit 4d82d7eb583b215c65f19159bac0ea3f3d715ad8 due to regressions.
Bug 877079 - SMS with URL's separated with line breaks, only first is detected - r=gnarf37
Bug 878943 - Update marionette
Bug 873223: make long suggestions fit, increase font size, fix justification
Merge pull request #10154 from davidflanagan/bug873223

Bug 873223: make long suggestions fit, increase font size, fix justification r=RudyLu
Bug 878657 - Add UA overrides for Hungary, Mexico, Montenegro, and Serbia r=fabrice
Revert "Merge pull request #10165 from comoyo/replace_surrounding"

This reverts commit 181f88ac62bf16499653b4d1124b87adc9c85ca6, reversing
changes made to 123a145107584791355270a75317c0e1d1c700e7.