Merge branch 'upstreamcvs'