On the 1.8.x-portability branch:
Merge r1722879 from /trunk and resolve the trivial text conflict.

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