Merge from trunk.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/issue-2991-dev@867686 13f79535-47bb-0310-9956-ffa450edef68
15 files changed