Merged revisions 7599 via svnmerge from