Merged revisions 9156 via svnmerge from