Merged revisions 42260 via svnmerge from