Merge branch 'master' into refs/top-bases/next