Merge pull request #271 from pruiz/xamarin-bug-4108