Merge branch 'dev' into 'testing'

Cosmetic updates

See merge request !10
7 jobs for testing in 19 seconds (queued for 3 seconds)