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

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