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

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