On the 'issue-2986-work' branch, merge 27353:27362 from trunk. (Using "svn merge". Merge tracking. Against a 1.4.x server. Will wonders never cease?) git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/issue-2986-work@867438 13f79535-47bb-0310-9956-ffa450edef68