initial change, update for Django 1.7