Cherry-picked into ESI

Conflicts:

	emas/theme/browser/views.py