Merged revisions 198311 via svnmerge from