Merge branch 'master' into beta

3 jobs for beta in 3 minutes and 48 seconds (queued for 1 minute and 51 seconds)