On the 1.6.x-issue4340-repos branch, merge r1480948 from trunk, resolving
conflicts.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x-issue4340-repos@1484250 13f79535-47bb-0310-9956-ffa450edef68