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


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