Merge branch '3.5.0' into 3.6.0
authorSamantha Houts <samantha.houts@xamarin.com>
Fri, 1 Mar 2019 18:06:34 +0000 (10:06 -0800)
committerSamantha Houts <samantha.houts@xamarin.com>
Fri, 1 Mar 2019 18:06:34 +0000 (10:06 -0800)

Trivial merge