Merged revisions 60268 via svnmerge from