Merge remote-tracking branch 'origin/release/3.0' into release/3.0
authorMike McLaughlin <mikem@microsoft.com>
Wed, 12 Jun 2019 00:15:26 +0000 (17:15 -0700)
committerMike McLaughlin <mikem@microsoft.com>
Wed, 12 Jun 2019 00:15:26 +0000 (17:15 -0700)

Trivial merge