Merged revisions 59304 via svnmerge from