upgraded for django 1.6