Merge branch 'upstream' into merge-upstream