Merge r26463:26468 of trunk to this branch. git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/copy-on-update@866543 13f79535-47bb-0310-9956-ffa450edef68