Merged revisions 58894 via svnmerge from