Merge remote-tracking branch 'new-upstream/master' into common-cvs-git-upstream