Merged revisions 74162 via svnmerge from