Merge pull request #2774 from marek-safar/roslyn