Merged revisions 58957 via svnmerge from