Merged revisions 58941 via svnmerge from