Merged revisions 9086 via svnmerge from