Merged revisions 58923 via svnmerge from