Merge branch 'master' into release/3.0
authorMike McLaughlin <mikem@microsoft.com>
Wed, 18 Sep 2019 00:19:06 +0000 (17:19 -0700)
committerMike McLaughlin <mikem@microsoft.com>
Wed, 18 Sep 2019 00:19:06 +0000 (17:19 -0700)

Trivial merge