On the 1.8.x-r1469519-and-friends branch: merge r1469519 from trunk.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-r1469519-and-friends@1482490 13f79535-47bb-0310-9956-ffa450edef68
On the 1.8.x-r1469519-and-friends branch: merge r1469520 from trunk.


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