Merged revisions 74515 via svnmerge from