Emergency production fix by @ewheeler.
Merge branch 'production-fix' into develop

Conflicts:
	education/views.py