Merged revisions 74657 via svnmerge from