Resolve "windows builds are failing for master"

Merged Evan Hunt requested to merge 607-win32-fixes into master

Closes #607 (closed)

Merge request reports