On the issue-3334-dirs branch: Merge changes from trunk up to r35791. git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/issue-3334-dirs@875866 13f79535-47bb-0310-9956-ffa450edef68