(This is an "ours" merge to avoid taking the version number bump.)