Merge branch 'master' into beta
beta branch set up
Merge branch 'beta'