On the merge-tracking branch: Bring branch up to date with trunk at r24022.


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