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