Merged revisions 212498 via svnmerge from