Merge remote-tracking branch 'upstream/master' into SdkProj
authorEric Erhardt <eric.erhardt@microsoft.com>
Fri, 6 Jul 2018 19:51:52 +0000 (14:51 -0500)
committerEric Erhardt <eric.erhardt@microsoft.com>
Fri, 6 Jul 2018 19:51:52 +0000 (14:51 -0500)
Commit migrated from https://github.com/dotnet/corefx/commit/b86cade27ef07e6be4bc6b4cd50a4ad0892de8bf


Trivial merge