Merge branch 'master' into merge/release/3.1-to-master
authorDoug Bunting <6431421+dougbu@users.noreply.github.com>
Wed, 28 Aug 2019 23:10:56 +0000 (16:10 -0700)
committerGitHub <noreply@github.com>
Wed, 28 Aug 2019 23:10:56 +0000 (16:10 -0700)
Commit migrated from https://github.com/dotnet/Extensions/commit/f8ba70000eed71fd5c0b036fd72ab88cd15548c6


Trivial merge