changes for Windows
Merge branch '17-fixes' into 18