On 1.8.x-r1577812 branch, merge r1579429 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-r1577812@1579431 13f79535-47bb-0310-9956-ffa450edef68