Merge branch 'beta' into 'beta'

Tidy up branches (1/3)

See merge request !69
3 jobs for beta in 2 minutes and 56 seconds (queued for 2 minutes and 32 seconds)