Merged revisions 58935 via svnmerge from