VS2015 fixes

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

Merge request reports