Merged revisions 61961 via svnmerge from