Django 1.6 fixes
Merge Django 1.6 update