Windows Git cleanup
Merged from Linux