Merge branch '4.2.0'
authorSamantha Houts <samantha.houts@xamarin.com>
Tue, 9 Jul 2019 01:55:31 +0000 (18:55 -0700)
committerSamantha Houts <samantha.houts@xamarin.com>
Tue, 9 Jul 2019 01:55:31 +0000 (18:55 -0700)

Trivial merge