Merged revisions 61658 via svnmerge from