Bug 958916: Update to NSS 3.15.5 (NSS_3_15_5_RTM), r=me, a=sledru
Backed out changeset 4887f7d34df2 (bug 896896) for causing bug 933733. a=lsblakk
Bug 943925 - Fix the loading of the glDrawBuffers symbol - r=jgilbert, a=blocking-b2g-1.3
Bug 969728 - Make users using temporary profile possible to update using the maintenance service. r=bbondy a=lsblakk
Bug 961526 - Part 1: Fix SQLiteConstraintException in FHR. r=rnewman, r=mcomella, a=lsblakk
Bug 961526 - Part 2: More thorough handling of search recording events. r=mcomella, a=lsblakk
No bug, Automated blocklist update from host bld-linux64-ec2-034 - a=blocklist-update
Bug 970081 - Add try/catch around Toast.makeText to prevent crashes. r=mfinkle a=lsblakk
Bug 947275 - Update Bing branding for desktop and Metro. r=gavin, a=lsblakk
Bug 969483 - Remove stub test code that is inferior to the real code. r=BenWa a=sledru
Bug 969483 - Fix the RepositionChild function and add a test for it. r=BenWa a=sledru
Bug 973974 - Disable browser_profiler* tests for frequent crashes/timeouts. a=test-only
Bug 873661 - Wait both browserloadend and process-created event. r=fabrice, a=test-only
Bug 957437 - Avoid crashing in GfxInfo::GLStrings::EnsureInitialized(). r=jrmuizel, a=lsblakk
Bug 970710 - Ensure GetTrimmedOffsets is called with consistent parameters from PropertyProvider::InitializeForMeasure and SetupJustificationSpacing. r=roc, a=abillings
Bug 972478 - Docshell scriptability should only affect non-immune principals. r=bz, a=lsblakk
Bug 970483 - Blackliist pre-RTM Windows 7 again to prevent Firefox from crash. r=bbondy,jfkthame a=lsblakk
Bug 965982. r=bent, a=lsblakk
Bumping gaia.json for 2 gaia-1_3 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_3/rev/6f4004812132
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Merge pull request #16234 from mikehenrty/bug-966571-uplift

Merge pull request #15977 from mikehenrty/bug-966571-retrycount

========

https://hg.mozilla.org/integration/gaia-1_3/rev/621ec2054c3e
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Merge pull request #15977 from mikehenrty/bug-966571-retrycount

Bug 966571 - Retry count not shown up in System SIM Dialog, r=arcturus,alive,ferjm
(cherry picked from commit 9de7295648e4bbbacfb90e897f50fbae0de4ee43)

Conflicts:
	build/jshint/xfail.list
Bug 932803 - [Contacts API] Add tests for migrations. r=reuben, a=fabrice