Merged revisions 7677 via svnmerge from