merge in hh/windows-fromscratch#2