Tweaking for Django 1.5