update for django 1.6 #2