On the 1.5.x-34184 branch: Merge 34585 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x-34184@874661 13f79535-47bb-0310-9956-ffa450edef68
1 file changed