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
Merge branch feature/morten.ofstad/ZipTraceHeaders with refs/heads/master into refs/merge-requests/342/train