On the 1.9.x-r1706428 branch: Merge r1711507, r1711510 (without conflicts). git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.9.x-r1706428@1711512 13f79535-47bb-0310-9956-ffa450edef68