Merged revisions 100835 via svnmerge from