Merged revisions 96931 via svnmerge from