updated for Django 1.5