Resolve "Build failure on Windows"

Merged Mark Andrews requested to merge 1050-build-failure-on-windows into master
Edited by Mark Andrews

Merge request reports