Bug 979672 - On 1.3, marionette_js keeps failing in Travis
Merge pull request #16870 from EragonJ/v1.3-bug-979672

Bug 979672 - On 1.3, marionette_js keeps failing in Travis
Bug 962380 - [DSDS] When SIM 2 is primary outgoing call, ...

dialing out emergency call under airplane mode will not successfully turn off airplane mode.
Merge pull request #15963 from EragonJ/v1.3-bug-962380

Bug 962380 - [DSDS] When SIM 2 is primary outgoing call, ...
Merge pull request #16585 from asutherland/email-asflagfix

Bug 972514 - [B2G][Email] ActiveSync message state changes from server not synchronized error "Failed to parse a message: Error: Bad body type: undefined" thrown. r=mcav
Merge pull request #16626 from fcampo/fix-ftu-email-scroll

Bug 969230 - [FTE] Email address field is covered by keyboard in about B2G OS page (r=arcturus)
Conflicts:
	apps/communications/ftu/test/unit/sim_manager_test.js
	apps/communications/ftu/test/unit/tutorial_test.js
Bug 969230 - Fix lines inadvertently added when resolving a merge conflict during cherry-picking.
Bug 979983 - Fix gjslint issues on v1.3
Bug 972666 - [Calendar] lines over events longer than 2 hours
Merge branch 'v1.3' into v1.3t
Bug 976503 - Properly handle incoming messages with a 'si-id' field r=julienw

(cherry picked from commit 065154bf60176b0a17c34c4db4bcc384d2d894a5)

Conflicts:
	apps/wappush/js/wappush.js
Revert "Bug 972666 - [Calendar] lines over events longer than 2 hours"

This reverts commit 8aed4fafbaeb86d6884d31ce7d3cbeb87bcbf837.
Bug 972666 - [Calendar] lines over events longer than 2 hours
Merge pull request #16914 from julienw/979983-v1.3-fix-gjslint-issues

Bug 979983 - Fix gjslint issues on v1.3
Revert "Merge pull request #15748 from wanderview/ogg-to-opus"

This reverts commit 644cabbacc531bc0217bdb12adcf2a46a8a6ac87.
Merge branch 'v1.3' into v1.3t
Merge pull request #15668 from mukeshk1990/Bug_947086_Dialer_may_call_CDMA-specific_bluetooth_functions_on_non-CDMA_phone

Bug 947086 - [Dialer] Dialer may call CDMA-specific bluetooth functions r=etienne
(cherry picked from commit b58937b36da25e627d65a6aad38ecabaca6f3ffe)
Merge pull request #16631 from jaoo/971816

Bug 971816 - [OTA][Data Migration] Voicemail number will restored back default setting in SIM card after updating from v1.1 to v1.3. r=qDot
Merge branch 'v1.3' into v1.3t
Merge pull request #12448 from comoyo/render_speed

Bug 875963 - Switch case without rebuilding keyboard. r=RudyL(cherry picked from commit 74f49f0a1ba192056a4e529d3b1290144374011a)

Conflicts:
	apps/keyboard/js/render.js