Bug 917701 - [Contacts] Passive merging is not working when the contact in the contact list is linked to a FB contact
Bug 867320 - Calendar reference workloads
Merge pull request #12340 from JonHylands/jhylands-867320-calendar-reference-workloads-master

Bug 867320 - Calendar reference workloads
Bug 916774 - [Clock] Rename StopwatchPanel => Stopwatch.Panel, move Timer.Panel to timer_panel.js

r=jugglinmike
Bug 917835 - [Clock] Timer does not honor settings - r=jugglinmike
vbump 0.15.5
Merge pull request #12343 from lightsofapollo/marionette-vbump

vbump 0.15.5
Bug 902974 - [Music] [User Story] Utility tray should display information about the song when music is still playing
Disable calendar create event integration test
Merge pull request #11847 from jimporter/music-nowplaying-notification

Bug 902974 - [Music] [User Story] Utility tray should display information about the song when music is still playing; r=alive, r=lightsofapollo, r=dkuo, r=djf, ui-r=robmac
Merge pull request #12349 from lightsofapollo/skip-calendar-test

Disable calendar create event integration test
Bug 919006 -  Email fails to start properly (xhr needs responseType text)
Merge pull request #12354 from jrburke/bug919006-xhr-responsetype

Bug 919006 -  Email fails to start properly (xhr needs responseType text) r=me, due to severity of blockage due to recent gecko change (nothing in gaia to roll back), and simplicity of the fix.
Bug 895480 - Bluetooth app tries to handle Share URL activity and fails
Merge pull request #12355 from ian-liu/bluetooth/Bug895480_Bluetooth_app_tries_to_handle_Share_URL_activity_and_fails

Bug 895480 - Bluetooth app tries to handle Share URL activity and fails, r=@davidflanagan
Merge pull request #12328 from jmcanterafonseca/bug-917701

Bug 917701 - [Contacts] Passive merging is not working when the contact ...
Bug 851189 - Move feedback button up one level