Merge r14665 onto 1.2.x.



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