Merge pull request #926 from EvanLloyd/win_make_4