Merged revisions 99643 via svnmerge from