Merged revisions 74642 via svnmerge from