Merging 1.2.1 bug fix

https://github.com/XLabs/Xamarin-Forms-Labs/issues/435#issuecomment-60972418