Merged revisions 74043 via svnmerge from