On the 1.8.x-r1611379 branch: Merge r1615354 from /trunk (no conflicts).

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-r1611379@1616694 13f79535-47bb-0310-9956-ffa450edef68