Merged revisions 96102 via svnmerge from