Adapted for Django 1.6