Merged revisions 9232 via svnmerge from