Merged revisions 74317 via svnmerge from