Merge r1568072 from /trunk with no conflicts.

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