Merged revisions 59939 via svnmerge from