Merge pull request dotnet/core-setup#3350 from weshaggard/MergeDevRelease200
authorWes Haggard <weshaggard@users.noreply.github.com>
Fri, 27 Oct 2017 20:52:30 +0000 (13:52 -0700)
committerGitHub <noreply@github.com>
Fri, 27 Oct 2017 20:52:30 +0000 (13:52 -0700)
Merge dev/release/2.0.0 in to master

Commit migrated from https://github.com/dotnet/core-setup/commit/d5e9580461cf73577f4882ce8755a038c907abfb


Trivial merge