Merged revisions 109226 via svnmerge from