Merge to stay up to date with the upstream 2.10.x branch.