Django 1.5 upgrade