Merged revisions 59358 via svnmerge from