On the 1.8.x-issue4400 branch merge r1512195 from trunk.


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