Merged revisions 59688 via svnmerge from