Merge r1543594,1619774 from /trunk without conflicts.
This contains the actual patch.

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