Merge pull request #1366 from DynamicDevices/ajl/win32build