Merge branch alfroch-updating-paths with refs/merge-requests/278/train into...

Merge branch alfroch-updating-paths with refs/merge-requests/278/train into refs/merge-requests/269/train
27 jobs for !269 with alfroch-updating-paths into master in 9 minutes and 47 seconds (queued for 1 second)
merge train