Merged revisions 8588 via svnmerge from