Merge r1567204, r1567228 from trunk

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