Merge pull request dotnet/corefx#24830 from weshaggard/MergeDevRelease200
authorWes Haggard <weshaggard@users.noreply.github.com>
Wed, 25 Oct 2017 22:02:02 +0000 (15:02 -0700)
committerGitHub <noreply@github.com>
Wed, 25 Oct 2017 22:02:02 +0000 (15:02 -0700)
Merge dev/release/2.0.0 into master

Commit migrated from https://github.com/dotnet/corefx/commit/74279f3945dac92132835c924cce3e1ecc794b66


Trivial merge