Merged revisions 61678 via svnmerge from