Merged revisions 7515 via svnmerge from