Merge branch 'master' into darc-master-f2564df9-8df7-4569-8e31-4500b86d8bfa
authorStephen Toub <stoub@microsoft.com>
Thu, 21 Feb 2019 14:27:43 +0000 (09:27 -0500)
committerGitHub <noreply@github.com>
Thu, 21 Feb 2019 14:27:43 +0000 (09:27 -0500)
Commit migrated from https://github.com/dotnet/corefx/commit/fb4bcafc113a208da4ba60b8f56bc58689d624b3


Trivial merge