Upgrade to be compatible with Django 1.5