Merge branch alfroch-small-fixes with refs/heads/master into refs/merge-requests/549/train

49 jobs for !549 with alfroch-small-fixes into master in 12 minutes and 29 seconds (queued for 3 seconds)
merge train