On the 1.8.x-r1561426 branch:
Merge r1561426 from /trunk, resolve the conflict and adapt code where necessary.

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