Merged revisions 7606 via svnmerge from