Migrated to django 1.6