More comments
more changes to update to Django 1.5