added betayota branch to the auto-merge list
Merge branch 'master' into beta