On the 1.7.x-r1574868 branch: merge r1574868 from trunk.

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