On the 1.8.x-portability branch:
Merge r1722887 from /trunk and adapt it to the simpler 1.8.x data structures.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-portability@1725197 13f79535-47bb-0310-9956-ffa450edef68
1 file changed