Merged revisions 7508 via svnmerge from