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/194/train
3 jobs for !194 with feature/jorgen.lind/fixvs2015 into master in 17 minutes and 54 seconds (queued for 1 second)
merge train