Merge pull request #4398 from marek-safar/mono.csharp