Merged revisions 74388 via svnmerge from