Merged revisions 58243 via svnmerge from