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