Merge remote-tracking branch 'upstream/prod' into dev

Conflicts:
	conf/locale/en/LC_MESSAGES/django.po