Merge pull request #948 from ermshiperete/bug-xamarin-2394