Fix warning generated on MSVC 1900

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

Merge request reports