Merge branch feature/jorgen.lind/msvc1900_compile_fix with refs/heads/master...
Merge branch feature/jorgen.lind/msvc1900_compile_fix with refs/heads/master into refs/merge-requests/526/train
Merge branch feature/jorgen.lind/msvc1900_compile_fix with refs/heads/master into refs/merge-requests/526/train