Merged revisions 7809 via svnmerge from