Merge branch 'master' into release/3.0
authorMike McLaughlin <mikem@microsoft.com>
Tue, 13 Aug 2019 00:01:07 +0000 (17:01 -0700)
committerMike McLaughlin <mikem@microsoft.com>
Tue, 13 Aug 2019 00:01:07 +0000 (17:01 -0700)

Trivial merge