fix PATH (Windows only)
Merge remote-tracking branch 'upstream/master'