Merge branch mguth-master-patch-08619 with refs/heads/master into refs/merge-requests/219/train

25 jobs for !219 with mguth-master-patch-08619 into master in 9 minutes and 18 seconds (queued for 6 seconds)
merge train