update for django 1.6, backward compatible