Made Django 1.6 compatible