Merged revisions 61707 via svnmerge from