On 1.8.x-r1513879 branch, merge r1515516 from trunk (clean merge).


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