Merged revisions 7999 via svnmerge from