Fix: bug https://bugzilla.xamarin.com/show_bug.cgi?id=14811 (to be reviewed)
Merge pull request #760 from mayerwin/patch-2

Fix: bug https://bugzilla.xamarin.com/show_bug.cgi?id=14811 (to be reviewed)