Merged revisions 59853 via svnmerge from