On the '1.5.x-reintegrate-improvements' branch:
Merge from 1.5.x r34797-34816 (and pray that the results are right).


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x-reintegrate-improvements@874891 13f79535-47bb-0310-9956-ffa450edef68