On the 1.8.x-r1477876 branch: merge r1479605 from trunk.

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