Merge branches 'master' and 'beta-tester'