Merged revisions 7386 via svnmerge from