Merge branch 'master' into darc-master-ed378f9a-8baa-48bb-8487-e5938c044604
authorWilliam Godbe <wigodbe@microsoft.com>
Mon, 13 May 2019 17:57:02 +0000 (10:57 -0700)
committerGitHub <noreply@github.com>
Mon, 13 May 2019 17:57:02 +0000 (10:57 -0700)
Commit migrated from https://github.com/dotnet/corefx/commit/e9b2ef72ff6a746a1d7a2928e2e8cc41dade3dcf


Trivial merge