Merged revisions 74997 via svnmerge from