Fix Windows build

Merged Julien Wadel requested to merge fix/windows_build into master

Merge request reports