Merge branch 'master' of upstream