Merged revisions 59081 via svnmerge from