Merge branch 'master-upstream'