Merge branch 'master' into release/3.0
authorMike McLaughlin <mikem@microsoft.com>
Tue, 16 Jul 2019 01:01:33 +0000 (18:01 -0700)
committerMike McLaughlin <mikem@microsoft.com>
Tue, 16 Jul 2019 01:01:33 +0000 (18:01 -0700)

Trivial merge