Merge branch 'master' into 'beta'

Merge changes into beta

See merge request !110
3 jobs for beta in 4 minutes and 8 seconds (queued for 4 seconds)