Merge branch 'master' into upsource-master