Merge branch feature/jorgen.lind/vs_2015_build_fix with refs/heads/master into...

Merge branch feature/jorgen.lind/vs_2015_build_fix with refs/heads/master into refs/merge-requests/537/train
3 jobs for !537 with feature/jorgen.lind/vs_2015_build_fix into master in 32 minutes and 19 seconds (queued for 1 second)
merge train