minor context fix
Merge branch 'master' into django-1.5