Merge remote-tracking branch 'fosskers/colin/prework-reformatting'

2 jobs for master in 2 minutes and 54 seconds (queued for 2 seconds)