update for upstream 0.10.11