Merged revisions 90696 via svnmerge from