Merged revisions 7986 via svnmerge from