Django 1.4/1.5 ready
Merge Django 1.4 upgrade