Merged revisions 7608 via svnmerge from