Merged revisions 7577 via svnmerge from