Merged revisions 7382 via svnmerge from