Django 1.4
Merge Django 1.4 upgrade