Merged revisions 74572 via svnmerge from