Merged revisions 41768 via svnmerge from