Merge pull request #475 from pruiz/xamarin-bug-7408