Merge branch feature/morten.ofstad/SEGYSampleUnitsOption with...

Merge branch feature/morten.ofstad/SEGYSampleUnitsOption with refs/heads/master into refs/merge-requests/172/train
3 jobs for !172 with feature/morten.ofstad/SEGYSampleUnitsOption into master in 8 minutes and 39 seconds (queued for 3 seconds)
merge train