Bug 969136: Update NFC Manager to handle Tag Discovered, empty tags, and unformatted tags. r=alive
Merge pull request #16149 from davidflanagan/bug963917-3

Bug 963917: reduce Gallery memory use (and fix leak) while scanning r=dkuo
Merge pull request #16097 from qdot/969587-variant-with-no-icc

Bug 969587 - Run variant customization with no icc
Bug 966215 - Allow make test-integration to specify TEST_FILES. r=gaye
Merge pull request #16071 from flodolo/bug968071_mediainfo

Bug 968071 - Taken/Shoot date in image/video info not localizable
Bug 968049 - Don't try to reload a null URL when reviving crashed tabs
Add calendar-1.4-visual-refresh to travis branches

We can remove this once the branch lands on master.
Bug 971162 - [B2G][Clock][Alarm] Clock alarm has vibration when alarm vibration is set to off. r=gaye
Merge pull request #16228 from mcav/vibrate

Bug 971162 - [B2G][Clock][Alarm] Clock alarm has vibration when alarm vi...
Bug 968081 - [Settings][L10n] Localize WiFi hotspot security type info on setting changes. r=arthurcc
Revert "Merge pull request #16228 from mcav/vibrate"

This reverts commit 3c54aedf659b4792e4a1eb1f3ede8b266138cef7, reversing
changes made to ccae0d08943c3a33a25a2701ad9e38f31908ad3a.
Merge pull request #16207 from RickyChien/bug-971647

Bug 971647 - Ignore load script error in blanket r=julienw
Bug 934952 - Add test-agent coverage report into allow-failures of Travis CI
Bug 932605 - Add CalDAV server for integration testing. r=gaye
Bug 948363 - [Music] handle data transfer for nfc
Revert "Merge pull request #15808 from pmclanahan/send-language-to-basket-964342"

This reverts commit a2fbd8f96a6d262393832f23897c09349d398981, reversing
changes made to c627269a09d9479d0d8151c9918ae9dad0b5df37.
Bug 952610 - Re-enable marionette js test of homescreen
Merge pull request #16204 from timdream/screenshot-hires-cover

Bug 971631 - Correct screenshot dimension, r=alive
Merge branch 'STK_DSDS/Bug951586'

Bug 951586 - [DSDS][STK] Suport multiple cards in system STK code, r=timdream
Merge pull request #13578 from evanxd/bug-932605

Bug 932605 - [calendar] caldav server for integration testing