Merge branch '3.5.0' into 3.6.0
authorSamantha Houts <samantha.houts@xamarin.com>
Thu, 28 Feb 2019 02:21:59 +0000 (18:21 -0800)
committerSamantha Houts <samantha.houts@xamarin.com>
Thu, 28 Feb 2019 02:21:59 +0000 (18:21 -0800)

Trivial merge