Merge pull request #2090 from DavidKarlas/mono-4.2.0-branch-bug25480