Moving master commits to beta

See commits for details.