Merge branch 'beta1'
Merge branch 'master' into beta1