Django 1.6 upgrade