Merged revisions 8162 via svnmerge from