Merge branch feature/morten.ofstad/ZipTraceHeaders with refs/heads/master into...

Merge branch feature/morten.ofstad/ZipTraceHeaders with refs/heads/master into refs/merge-requests/342/train
3 jobs for !342 with feature/morten.ofstad/ZipTraceHeaders into master in 20 minutes and 8 seconds (queued for 1 second)
merge train