Merged revisions 7519 via svnmerge from