Django 1.6 changes
Merge Django 1.6 update