Merge branch feature/morten.ofstad/FixAnalyzeSegment with refs/heads/master...

Merge branch feature/morten.ofstad/FixAnalyzeSegment with refs/heads/master into refs/merge-requests/183/train
3 jobs for !183 with feature/morten.ofstad/FixAnalyzeSegment into master in 5 minutes and 47 seconds (queued for 2 seconds)
merge train