Merge remote-tracking branch 'upstream/master' into release/3.0
authorMike McLaughlin <mikem@microsoft.com>
Tue, 11 Jun 2019 23:02:07 +0000 (16:02 -0700)
committerMike McLaughlin <mikem@microsoft.com>
Tue, 11 Jun 2019 23:02:07 +0000 (16:02 -0700)

Trivial merge