Merged revisions 62689 via svnmerge from