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

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