Merged revisions 75405 via svnmerge from