Removed ADDON_ANY choice for changing add-on types (Bug 970312)
Remove old 'Amp your firefox contest winners' promo (bug 979731)
move migrate_activity_Log to limited queue
upgrade jingo to 0.7 (again: reverts the revert in 61c4359) (bug 976727)
overload jingo.helpers.f to fix UnicodeEncodeError (bug 976727)
Merge pull request #1834 from magopian/976727-jingo-upgrade-unicode-error

re-upgrade jingo to 0.7, overload jingo.helpers.f to fix UnicodeEncodeError (bug 976727)
Report which features are present if passed a profile in features list API (bug 980409)
Merge pull request #1842 from diox/features-detection-api

Report which features are present if passed a profile in features list API (bug 980409)
move content rating app detail tests to right suite
shorten IARC strings in german locale (bug 980058)
Add DATABASE_POOL_ARGS to prod settings.
Merge pull request #1845 from jasonthomas/prod-db-settings

Add DATABASE_POOL_ARGS to prod settings.
Changed charset + fixes for IARC updates
Merge pull request #1846 from koehlermichael/master

Changed charset + fixes for IARC updates
match up the uuid for zippy
Don't make the same ES query twice if there are no results (bug 975102)
Merge pull request #1831 from diox/es-no-results-count

Don't make the same ES query twice if there are no results (bug 975102)
Fix AMO stats following ES 1.0 preparation
Fix mkt.fireplace.tests.test_api:TestSearchView.test_anonymous_user
Merge pull request #1847 from diox/fix-amo-stats-es

Fix AMO stats following ES 1.0 preparation