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

Trivial merge