Merged revisions 73769 via svnmerge from