Merged revisions 10462 via svnmerge from