Merged revisions 42086 via svnmerge from