On 1.8.x-r1611380 branch: merge r1611380 and r1611381 from trunk.


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