Merge branch 'master' into 'beta'

join.sucs.org - Open links in new tabs

See merge request !119
3 jobs for beta in 6 minutes and 50 seconds (queued for 3 seconds)