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

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