Merge pull request #726 from pruiz/xamarin-bug-13708