Merge branch feature/jorgen.lind/rel1.0 with refs/heads/master into refs/merge-requests/185/train

3 jobs for !185 with feature/jorgen.lind/rel1.0 into master in 5 minutes and 43 seconds (queued for 1 second)
merge train