Merge branch feature/jorgen.lind/update_roundtrip_test with refs/heads/master...

Merge branch feature/jorgen.lind/update_roundtrip_test with refs/heads/master into refs/merge-requests/227/train
3 jobs for !227 with feature/jorgen.lind/update_roundtrip_test into master in 5 minutes and 56 seconds (queued for 1 second)
merge train