Merge branch 'master' into release/3.0
authorMike McLaughlin <mikem@microsoft.com>
Tue, 13 Aug 2019 05:38:11 +0000 (22:38 -0700)
committerMike McLaughlin <mikem@microsoft.com>
Tue, 13 Aug 2019 05:38:11 +0000 (22:38 -0700)

Trivial merge