Updated for Django 1.5+