Actually include changes that should've been in 95c27b38805721dd6fa3fa2be8699ce10e3db80a
Merge branch 'master' of https://github.com/burke-software/django-sis