Bug 885269 - [browser] about.css typo in v1.1
Merge pull request #10444 from ferjm/callloglimit2

Bug 829399 - Add a limit to the maximum number of calls logged inside th...(cherry picked from commit c74d0ee0692de0171af7b3a3f28b640a3f4fbec1)

Conflicts:

	apps/communications/dialer/js/call_log_db.js
	apps/communications/dialer/test/unit/calllog_db_test.js
Merge pull request #10405 from daleharvey/882175

Bug 882175 - Fix cellbroadcast settings UI to not display opposite of actual value. r=kaze(cherry picked from commit 5ad48f6c2ac80027e88e8d0c469686946e34a9cd)

Conflicts:
	apps/settings/index.html
	apps/settings/js/call.js
	apps/settings/js/settings.js
Merge pull request #10452 from davidflanagan/bug883250

Bug 883250: don't auto-punctuate after punctuation r=rudylu(cherry picked from commit cd68aa09fed7f8343b15a7f234e16b59ce562aea)
Merge pull request #10538 from davidflanagan/bug883250-v1-train

Merge pull request #10452 from davidflanagan/bug883250
Bug 871501 - Make zip file generation consistent r=vingetun a=leo+
Merge pull request #9159 from gaye/bug-853952

Bug 853952 - When a user edits and saves an event, return to the app root
(cherry picked from commit 0f1c0be6c8087873c0d362ac38a570c9edb58438)
Merge pull request #10126 from flodolo/fix-l10n

Bug 876145: l10n, fix localizability of title in authentication dialog (browser) r=benfrancis
(cherry picked from commit 016f943c62d30f90a09c30fa51c9e22ac0a54f66)
Bug 881672 - Enabling a DUMP function for all Gaia apps, r=kaze

(cherry picked from commit 5d6fbaa19afc6e15aa8449d6ba5e4a3cb680b0ec)
Merge pull request #10482 from mozshiao9/master_camera_881218

Bug 881218 - [Camera] Record of deleted videos are not updated in camera filmstrip, r=@dominickuo
(cherry picked from commit 9ec3c9a495c81c0ad7db5279a30c2cfa01d524a0)
Merge pull request #10100 from evanxd/bug-864555

Bug 864555 -  - [Dialer] [Regional] Display the voice mail label when calling to the VM service and the VM is not stored on the SIM
(cherry picked from commit 4a2bf69a59cbbc5486e0e7ae894336dc8492c7e2)
Merge pull request #10529 from alivedise/bugzilla/880931_master/recover-cpu-wake-lock

Bug 880931 - Recover cpu wake lock, r=timdream, a=leo+
(cherry picked from commit f7cdb4e7edf909a41d2a2bbf03217e18cbf2b513)
Revert "Revert "Merge pull request #10223 from lightsofapollo/clean-removal-of-events""

This reverts commit 258db40f9850558638c0fb3addbe7a203cbb14c4.
Merge pull request #10229 from lightsofapollo/hide-loading-area

Bug 876796 - Hide event details until they are loaded.
Merge pull request #10503 from gasolin/browsercss

Bug 885269 - [browser] about.css typo in v1.1, r=benfrancis
Bug 883616 - Bug 882607 resolution introduced a XSS vulnerability r=gnarf

Carefully escape the body before injecting it into the document
Added some tests to ensure this for both SMS and MMS.
(cherry picked from commit 079b57f45f2e272ceb4e0f3f067cc3d829b3f2b4)

Conflicts:
	apps/sms/test/unit/mock_utils.js
Merge remote-tracking branch 'upstream/v1-train' into v1-train-jc