Merge r1584576,1584592 from trunk

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