Merge branch update-puma with refs/heads/master into refs/merge-requests/572/train

52 jobs for !572 with update-puma into master in 15 minutes and 56 seconds (queued for 2 seconds)
merge train