re-migrated to django 1.5