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

Merge branch feature/jorgen.lind/job_canellation with refs/heads/master into refs/merge-requests/230/train
3 jobs for !230 with feature/jorgen.lind/job_canellation into master in 5 minutes and 43 seconds
merge train