Merged revisions 75658 via svnmerge from