GH #477: 1.5.2 buildwin.cmd incorrect, part II