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

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