Merged revisions 62942 via svnmerge from