Merge branch 'master' into beta
Merge branch 'dev' into beta
Merge branch 'beta' into dev