Merged revisions 61656 via svnmerge from