Merge branch mguth-tag-0.6 with refs/heads/master into refs/merge-requests/428/train

42 jobs for !428 with mguth-tag-0.6 into master in 10 minutes and 48 seconds (queued for 2 seconds)
merge train