Record a merge of r1578326, and apply a similar fix on the branch git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-r1578311@1578327 13f79535-47bb-0310-9956-ffa450edef68