Merged revisions 61959 via svnmerge from