Merge branch 'master' into 'beta'

non-interactive! need a -y in gitlab-ci!

See merge request !108
3 jobs for beta in 3 minutes and 42 seconds (queued for 3 seconds)