Django 1.6 compatible

Tested on production.