Merge branch '3.6.0' into 4.0.0
authorSamantha Houts <samantha.houts@xamarin.com>
Sat, 1 Jun 2019 01:50:16 +0000 (18:50 -0700)
committerSamantha Houts <samantha.houts@xamarin.com>
Sat, 1 Jun 2019 01:50:16 +0000 (18:50 -0700)

Trivial merge