Updated to support django-1.5+ and