Couple of updates to work with Django 1.6