Merge branch mguth-switch-puma with refs/heads/master into refs/merge-requests/540/train

50 jobs for !540 with mguth-switch-puma into master in 24 minutes and 7 seconds (queued for 3 seconds)
merge train