Merge branch 'master' into release/3.0
authorMike McLaughlin <mikem@microsoft.com>
Wed, 4 Sep 2019 23:48:01 +0000 (16:48 -0700)
committerMike McLaughlin <mikem@microsoft.com>
Wed, 4 Sep 2019 23:48:01 +0000 (16:48 -0700)

Trivial merge