Bug 908602 - Remove Facebook partner key from v1-train repository
Merge pull request #11703 from unghost/master

Fix Bug 908343 and Bug 908350(cherry picked from commit b582aaafdab26e78c2c4288c2b439d72d68dc9a4)
Merge pull request #11836 from EverythingMe/bugfix-shortcuts-translations

[Bug 908513] fix shortcuts translations issue [r=crdlc]
Conflicts:
	apps/homescreen/everything.me/js/Brain.js
	apps/homescreen/everything.me/modules/Tasker/Tasker.js
Merge pull request #11837 from asutherland/email-regex-fix

Bug 910153 - [Email] email address in a plain message body is broken, when multiple sub domains present. r=mcav, r=psingapati(cherry picked from commit 40f43a0b0e25b0cdeb6e7c82387d1fd2517c1ac6)
Merge pull request #11835 from kk1fff/b891443/p1

Bug 891443 - avoid redirecting every url started with https://www.mozilla.org in FTU, r=alive, a=leo+(cherry picked from commit 92b79a2dfe09d950e3789247a21e13083116ec0a)
Merge pull request #11803 from crh0716/905969

Bug 905969 - Turn off vibration only when leaving the silent mode r=alive a=leo+(cherry picked from commit eabc797948d3d46952f894463daeaff8db49c7a2)

Conflicts:
	apps/system/js/sound_manager.js
Bug 895726 - [Buri][Monitor][MMS] Unable to save attachement from Camera(with conlicts fixing)
Merge pull request #11939 from steveck-chung/v1-train-fix

Bug 895726 - [Buri][Monitor][MMS] Unable to save attachement from Camera(with conflicts fixing) . r=julienw
Merge pull request #11808 from lodr/bug-909132-limitting-stats-query

Bug 909132 - Adding a minimum date in order to limit the time window to query for.
r=arcturus
(cherry picked from commit 3900b53a815eb60605aa52107736c2ba391110e3)

Conflicts:
	apps/costcontrol/js/fte.js
Bug 897283 - No scroll in input PUK screen
Merge pull request #11974 from alivedise/bugzilla/897283_v1-train

Bug 897283 - No scroll in input PUK screen, r=alive, a=leo+
Merge pull request #11712 from timdream/v1-train

Bug 908602 - Remove Facebook partner key from v1-train repository, r=jmcf
Merge pull request #10992 from leob2g/Bug_894196_CB_msg_title_error

Bug 894196 - [CB] Disapper the title background alert and need to display. r=daleharvey(cherry picked from commit 9c75c6100df2f70c30a68518ae9a5399b31537c1)
Merge pull request #11200 from fabi1cazenave/cellBroadcastLabel-bug890151

Bug 890151 - [CB] CH50 message should not be displayed when the Cell Broadcast service is off, r=kaze(cherry picked from commit ad923e915a38394497da682c3024ccc37390b52a)
Merge pull request #11903 from crdlc/bug-911875

Bug 911875 - [Homescreen] When user select icon and press home key, selected color is shown on icon(cherry picked from commit e3ea64a64f412fd427b50b5179d8992fe64034fb)
Merge pull request #11935 from dmarcos/master

Bug 894826 - [Buri][Gallery] Multiple taps on image edit ok button...(cherry picked from commit 0cf6bd098ca5b83e148f9e1423b663c94f1501e1)
Bug 913360 - Hard-coded en-US plural in threads with multiple recipients r=borja

Chirurgical patch to use the normal l10n mechanism for plural forms.
Only for v1-train, we already do this on master.
Bug 914493 - [Email] iframe is not resized for the embedded images that were already downloaded while building body. r=asuth, a=blocking-b2g=leo+
Bug 896425 - Add customization support for recording profile
Merge pull request #12060 from asutherland/email-fix-embedded-v1

Bug 914493 - [Email] iframe is not resized for the embedded images that were already downloaded while building body. r=asuth, a=blocking-b2g=leo+