Merged revisions 58320 via svnmerge from