Merge branch 'master' into 'master'

Tidy up branches (2/3)

See merge request !70
2 jobs for master in 2 minutes and 31 seconds (queued for 5 minutes and 35 seconds)