On the merge-sensitive-blame branch: Merged revisions 26107-26152 via svnmerge from /trunk git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/merge-sensitive-blame@866227 13f79535-47bb-0310-9956-ffa450edef68