Merge branch formatting with refs/merge-requests/284/train into refs/merge-requests/290/train

30 jobs for !290 with formatting into master in 14 minutes and 40 seconds (queued for 8 seconds)
merge train