On '1.7.x-issue4263' branch: Merge r1423585 from trunk.

Clean merge.



git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-issue4263@1423594 13f79535-47bb-0310-9956-ffa450edef68
4 files changed