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

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