Merge branch 'master' into beta

3 jobs for beta in 3 minutes and 49 seconds (queued for 2 minutes and 7 seconds)