Merge branch 'carpentries-style' into 'master'

Carpentries style

See merge request !38
2 jobs for master in 1 minute and 16 seconds (queued for 2 seconds)