upgraded for django 1.5+