Configure prod marketplace to use it's own redis instances.
Update prod marketplace redis settings to fall back on defaults.
Merge pull request #1832 from jasonthomas/redis

Configure prod marketplace to use it's own redis instances.
Update dev marketplace redis settings.
Make fireplace featured search fully anonymous (bug 975413)
Make S's value_dict Elasticsearch 1.0 compatible

With Elasticsearch 1.0, any time you query with `fields` the values
always come back as lists. This assumes this everywhere and forces it
for Elasticsearch < 1.0 to be consistent.
Merge pull request #1822 from diox/fireplace-api-search-anonymous

Make fireplace featured search fully anonymous (bug 975413)
Stop requiring permission to set region=None in search (bug 975413)
Merge pull request #1821 from diox/no-region-for-old-men

Stop requiring permission to set region=None in search (975413)
Added amo.LOG.ESCALATION to ACTION_MAP

new log type added in https://github.com/mozilla/zamboni/pull/1782
add zh-CN
Merge pull request #1836 from eviljeff/patch-4

Added amo.LOG.ESCALATION to ACTION_MAP
Merge pull request #1838 from clouserw/lang

add zh-CN
Update German L10n (for IARC) (bug 980058)
Merge pull request #1839 from ngokevin/iarcgerman

Update German L10n (for IARC) (bug 980058)
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)