Merge branch 'pt/git4win-mods' into pu