Merged revisions 58825-58826 via svnmerge from