Merged revisions 73985 via svnmerge from