Follow-up to r1615212, merge r1615219 from trunk.

Merging under obvious rule.  Build is broken on Windows.


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