Update for django 1.6