Merged revisions 7972 via svnmerge from