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

3 jobs for !510 with feature/jorgen.lind/vs_2015 into master in 22 minutes and 13 seconds (queued for 11 seconds)
merge train