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

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