Merge branch 'master' into 'beta'

Push changes from master to beta

See merge request !76
3 jobs for beta in 3 minutes and 20 seconds (queued for 1 second)