Merged revisions 7349 via svnmerge from