bryanbcook Merge branch 'fix/xamarin_2.4.0.282'