Updated for django 1.5.1