Bug 865161 - [Call log] Creating new contact/Adding to an existing contact error (only v1.0.1) r=arcturus
Bug 842349 - disable travis except master
Merge pull request #9506 from yurenju/bug842349-v1.0.1

Bug 842349 - disable travis except master r=vivien a=NPOTB
Bug 863196 - Workaround on FTU and active audio channel to avoid the
power-on clip is too short.
Merge pull request #9510 from alivedise/bugzilla/863196_v1.0.1

Bug 863196 - Workaround on FTU and active audio channel to avoid the power-on clip is too short. r=yurenju, a=blocking-b2g:tef+
Merge pull request #9469 from asutherland/email-addressparser-apostrophe

Bug 866996 - [email] update addressparser node-dep to not think apostrophes are trying to quote display names. r=asuth(cherry picked from commit b9583de0462c6b126921d317bc9a36c3ab264605)
Merge pull request #9499 from jlebar/sms-use-cpu-lock

Bug 867649 - Switch the SMS app from using the high-priority wake lock t...(cherry picked from commit e9b649b29602e571ef96892f62fc52fb19364639)
Merge pull request #9503 from alivedise/bugzilla/864257

Bug 864257 - update wifi relative signal strength on statusbar, r=timdream, a=blocking-b2g:tef+(cherry picked from commit bc166560b278ef89fa9cb63591ec1d32b810556e)
Merge pull request #9509 from asutherland/tcpsocket-errors

Bug 855569 - [Buri][Shira-48042][Email] Message shown when bad certificates are used is not the right one. r=squib, a=blocking-b2g=tef+(cherry picked from commit de2a73e76b0bbe05759102d2c370eacb7eece6da)
Merge pull request #9511 from gtorodelvalle/dialer-bug-866378-number-can-be-null

Bug 866378 - [OPEN_]It does not have ringtone when receiving an Unknown number call and can not answer this call (r=jmcanterafonseca)(cherry picked from commit c247f1238c6cc7c845796a707982f79cdbc99418)
Bug 863335 - Download Update via data screen update
(cherry picked from commit e69553c36894979e0be587fe2b172a8b6795d803)

Conflicts:

	apps/system/style/update_manager/update_manager.css
	shared/style/confirm.css
(cherry picked from commit b0aca0dd1e2955e11190ede725e1fb9ee596438b)

Conflicts:

	apps/system/style/modal_dialog/prompt.css
Bug 857837 - Enter NCK/CCK/SPCK popup should pop up at boot up if phone is in network/corporate/serviceprovider locked state r=jaoo

Get rid of the setTimeout ack now that Bug 849757 is fixed.

Warning: do not uplift if Bug 849757 is not uplifted.
(cherry picked from commit 3fa788342953f33ab980fa1ba28deba1a1b8e650)

Conflicts:
	apps/system/js/sim_lock.js
Merge pull request #9471 from asutherland/email-4k-fix

Bug 864867 - Keep track of partially fetched bytes now that we attempt larger or complete download of bodies r=asuth.(cherry picked from commit 5944dfb3fb724755fde23d6cccb0f1bfa218e065)
Merge pull request #9527 from dominickuo/bug-866578

Bug 866578 - [music] change the option of shuffle all from title to shuffleAll, r=timdream(cherry picked from commit c5582a1cd935cb96e9020652cd2b39ba4e6da49d)
Merge pull request #9423 from shellylin/bug-859596

Bug 859596 - When closing the paring window, fire a blur event to the in...(cherry picked from commit a866e79190991a0d4678c3e7e47ffdcc5cfc744e)
Merge pull request #9213 from samjoch/follow-up-bug-823414

Bug 823414 - B2G browser gradient value does not match the gradient found in Settings (followup) r=me(cherry picked from commit 208848fd6dd04c090df3b89c0a1a51282c4731f7)

Conflicts:
	apps/browser/style/images/drawer-header-background.png
	apps/browser/style/images/drawer-header-background@2x.png
	apps/browser/style/images/tabs-badge-background@2x.png
	apps/browser/style/images/tabs-list-background@2x.png
Merge pull request #9479 from vingtetun/836056

Bug 836056 - [Lockscreen] Lockscreen appears after reboot after settings...(cherry picked from commit f8658bd0714cea8a37eeb4a4f670932c6bf355ad)

Conflicts:
	apps/system/js/lockscreen.js
Merge pull request #9429 from albertopq/contacts-add-to-existing-v1.0.1

Bug 865161 - [Call log] Creating new contact/Adding to an existing contact error (only v1.0.1) r=arcturus
Merge pull request #9504 from evanxd/bug-864977

Bug 864977 - datetime input fields do not bring up the keyboard(cherry picked from commit d883ec8a5e2df23508b40726ee0f6ef27e04acca)
Bug 864516 - Refresh time displays only when they are visible

- Made the homescreen, lockscreen and status-bar stop refreshing their
  time displays when the screen is off or they are invisible
- Fixed timer-leaks caused by starting the same timer twice overwriting
  the previous one without cancelling it
- Made the statusbar clock reflect locale changes immediately