Merged revisions 62692 via svnmerge from