Merged revisions 41269 via svnmerge from