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

Merge branch feature/jorgen.lind/update_gitlabci with refs/heads/master into refs/merge-requests/118/train
3 jobs for !118 with feature/jorgen.lind/update_gitlabci into master in 5 minutes and 27 seconds (queued for 2 seconds)
merge train