Merged revisions 74428 via svnmerge from