Merge branch mguth-gitlab with refs/heads/master into refs/merge-requests/463/train

46 jobs for !463 with mguth-gitlab into master in 43 minutes and 30 seconds (queued for 4 seconds)
merge train