Merged revisions 73679 via svnmerge from