Make work with Django >= 1.6