Merge r17466 into the 1.3.x release branch.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.3.x@857549 13f79535-47bb-0310-9956-ffa450edef68
2 files changed