On the merge-sensitive-log branch:
Merged revisions 25115-25156 via svnmerge from
/trunk


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/merge-sensitive-log@865231 13f79535-47bb-0310-9956-ffa450edef68