Merge branch 'master' into beta

3 jobs for beta in 5 minutes (queued for 1 minute and 9 seconds)