Merge r17485 and r18027 from trunk to the 1.3.x-r17485 backport branch. git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.3.x-r17485@858120 13f79535-47bb-0310-9956-ffa450edef68