More Django 1.5 changes