Merged revisions 62369 via svnmerge from