Django 1.7 compatibility
Updating for 1.0.4 release