Fix Visual Studio 2015 build

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

Merge request reports