Bug 948177 - Setup Travis S3 bucket / artifact configuration
Bug 942863 - [SMS] The messages list content can not be scrolled to the end r=borja
Bug 949958 - Include Pinyin IME in eng build by default
Merge pull request #14519 from lightsofapollo/s3-uploads

Bug 948177 - Setup Travis S3 bucket / artifact configuration +shepherd
Bug 942795 - [email] autoconfig XHR callbacks seem to be firing multiple times on nightly. r=asuth a=fabrice
Merge pull request #14661 from mcav/autoconfig-xhr

Bug 942795 - [email] autoconfig XHR callbacks seem to be firing multiple times on nightly. r=asuth a=fabrice
Bug 938321 - [email/backend] Implement utf-7 charset support using hand-rolled decoder.
Merge pull request #14508 from julienw/942863-use-height-instead-of-border-bottom

Bug 942863 - Workaround for a Gecko bug in SMS app with APZ enabled. r=borja
Merge pull request #14667 from mcav/utf7

Bug 938321 - [email/backend] Implement utf-7 charset support using hand-rolled decoder. r=asuth
Revert "Merge pull request #14632 from alivedise/bugzilla/948596_v2/activity-window-size-copy"

This reverts commit 888f9df5515a47d2f5806efee77485e05e1e5416, reversing
changes made to 53b010647062b4e2637f98ac3538af1c7bfe723a.

This was backed out because of https://bugzilla.mozilla.org/show_bug.cgi?id=950136#c11
Merge pull request #14638 from timdream/include-pinyin

Bug 949958 - Include Pinyin IME in eng build by default, r=djf
Revert "Merge pull request #14667 from mcav/utf7"

This reverts commit cfa88581f0bdaa3d4b7a3773ae87edc55260a2ab, reversing
changes made to b44a75862ebcb651381eabc9c3a3b203d76d63bf.

This is breaking 6 integration tests
Revert "Revert "Merge pull request #14667 from mcav/utf7""

This reverts commit 7852023abb572c522a07af558e7c19f557cc4866.

That was a wrong revert, it didn't fix the failing tests.