Merge pull request #951 from ermshiperete/bug-xamarin-2462