Merge branch 'master' into 'beta'

Master to beta

See merge request !125
3 jobs for beta in 2 minutes and 13 seconds (queued for 5 seconds)