Strip drive name off path on Windows
Merge remote-tracking branch 'origin/master'