Merge r12460 and r12470 onto 1.1.x branch.

No approval required.



git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.1.x@852545 13f79535-47bb-0310-9956-ffa450edef68
1 file changed