Merged revisions 10487 via svnmerge from