Fix compilation vs2017

Merged Jørgen Lind requested to merge feature/jorgen.lind/fixvs17 into master

Merge request reports