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

Merge branch feature/jorgen.lind/vs2017_buildfix with refs/heads/master into refs/merge-requests/286/train
3 jobs for !286 with feature/jorgen.lind/vs2017_buildfix into master in 8 minutes and 13 seconds (queued for 1 second)
merge train