Merged revisions 73398 via svnmerge from