import updates for django 1.5