Merge trunk r13222, r13223, and r13232 for backport. git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.1.x-r13222@853591 13f79535-47bb-0310-9956-ffa450edef68