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

Merge branch feature/jorgen.lind/fixvs2015 with refs/heads/master into refs/merge-requests/210/train
3 jobs for !210 with feature/jorgen.lind/fixvs2015 into master in 5 minutes and 46 seconds (queued for 1 second)
merge train