Move upstudy branch to master