On the 1.6.x-r39887 branch, merge r39887 from trunk and resolve conflicts. git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x-r39887@880025 13f79535-47bb-0310-9956-ffa450edef68