From-SVN: r49698
which included commits to RCS files with non-trunk default branches. From-SVN: r49362
From-SVN: r44969