Merged revisions 58479 via svnmerge from