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