Merged revisions 59804 via svnmerge from