Absorbing changes into 0.11 branch from trunk:  see commit message #1691.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/0.11.0@841766 13f79535-47bb-0310-9956-ffa450edef68
3 files changed