Merge branch feature/jorgen.lind/enable_mergetrains with refs/heads/master...

Merge branch feature/jorgen.lind/enable_mergetrains with refs/heads/master into refs/merge-requests/101/train
3 jobs for !101 with feature/jorgen.lind/enable_mergetrains into master in 2 minutes and 42 seconds (queued for 1 second)
merge train