On 1.7.x-r1541790 branch: Merge r1542042 from trunk.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-r1541790@1542049 13f79535-47bb-0310-9956-ffa450edef68