Merge pull request #950 from ermshiperete/bug-xamarin-2787