Merged revisions 241626 via svnmerge from