Merge branch 'master' into darc-master-7c963d5e-3797-4b68-9fad-354784eeb96a
authorStephen Toub <stoub@microsoft.com>
Fri, 1 Mar 2019 15:38:01 +0000 (10:38 -0500)
committerGitHub <noreply@github.com>
Fri, 1 Mar 2019 15:38:01 +0000 (10:38 -0500)
Commit migrated from https://github.com/dotnet/corefx/commit/c523e9a012be1a8ab76df474d66ca0be81c606f1


Trivial merge