Merged revisions 74551 via svnmerge from