On the 1.7.x-issue3741 branch, merge r1445753, resolving minor text conflicts.


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