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
3 jobs for !526 with feature/jorgen.lind/msvc1900_compile_fix into master in 23 minutes and 45 seconds (queued for 6 seconds)
merge train