Bug 944242 - Properly handle do-not-track options when upgrading from 1.1 r=kaze
Merge pull request #14649 from fcampo/sms-overlay-style-broken-947285

Bug 947285 - [Messaging] Notice style is broken (r=julienw)
(cherry picked from commit 49cb38d06740e6b49ff30e89e11f428386250329)
Merge pull request #14609 from arroway/bug-831948

Bug 831948 - WiFi Tethering should default to WPA2
(cherry picked from commit 47266e33ea9f48c61c6cc8697999ede8477fe20e)
Merge pull request #14803 from mcjimenez/bug951552

Bug 951552 - Incorrect behavior when first boot is run with a pin locked SIM (and no PIN is entered)
(cherry picked from commit 5e5c9f71911e2c83c2552273b3407ab4ea60e56c)
Merge pull request #14611 from arroway/bug-797661

Bug 797661 - Hotspot should have random password, r=kaze
(cherry picked from commit 2be37d0b91deabc6f3efafbe01b1dec3e8643a67)
Bug 949799 - [B2G][Geolocation] 'More Info' icon is unresponsive on the Geolocation screen
Merge pull request #14797 from dwi2/bug937561

Bug 937561 - get both available network list and known network list, and...
(cherry picked from commit 065cba7bd8c3d8ad0ec424c2c2893b96bae6e54d)
Revert "Merge pull request #14611 from arroway/bug-797661"

This reverts commit 724d36716bcbbc5cee1af18b94cc328c289d0ccc.
Merge pull request #14892 from etiennesegonzac/bug-948975-resume-single-conference-group

Bug 948975 - Safeguard to make sure we can always resume a single held conference call. r=rik
(cherry picked from commit 7354e63bc91309895b85ca711baa5caff2991c73)
Merge pull request #14912 from davidflanagan/bug939679

Bug 939679: compute the right camera preview size on HD devices r=dmarcos(cherry picked from commit 4245fb93e747d3e3cc9e50ba6fa2f084c9cb682f)

Conflicts:

	apps/camera/js/camera.js
Merge pull request #15086 from davidflanagan/bug939679v1.2

Merge pull request #14912 from davidflanagan/bug939679
Bug 939962: manual uplift of willReadFrequently patch to v1.2
Merge pull request #15092 from davidflanagan/bug939962v1.2

Bug 939962: manual uplift of willReadFrequently patch to v1.2
Merge branch 'v1.2' into v1.2f