Merged revisions 9246 via svnmerge from