Merged revisions 62624 via svnmerge from