Merged revisions 8194 via svnmerge from