Merged revisions 7957 via svnmerge from