propertly normalize the path for windows platform
Merge branch 'issue865' into 1.7.x