On the 'shelve' branch: Catch up with trunk@1813856.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/shelve@1813857 13f79535-47bb-0310-9956-ffa450edef68