Merge 'normalize-win-paths' into HEAD