Updated for Django 1.6 compatibility