Merged revisions 242226 via svnmerge from