Django 1.4/1.5
Merge Django 1.4 upgrade