fixed imports for django 1.6