Merged revisions 58121 via svnmerge from