Merged revisions 74955 via svnmerge from