Merge pull request #4727 from BrzVlad/fix-xamarin-studio