Merge branch 'master' into beta

3 jobs for beta in 3 minutes and 32 seconds (queued for 51 seconds)