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

Merge branch feature/morten.ofstad/SEGYImport with refs/heads/master into refs/merge-requests/22/train
3 jobs for !22 with feature/morten.ofstad/SEGYImport into master in 7 minutes and 30 seconds (queued for 1 second)
merge train