Merged revisions 8242 via svnmerge from