Merged revisions 59963 via svnmerge from