On 1.7.x-issue4460 branch: Merge r1563067 and r1563068 from trunk.


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