Merge remote-tracking branch 'dotnet/master'
authorRavi Eda <raeda@microsoft.com>
Fri, 2 Jun 2017 19:54:12 +0000 (14:54 -0500)
committerRavi Eda <raeda@microsoft.com>
Fri, 2 Jun 2017 19:54:12 +0000 (14:54 -0500)
Commit migrated from https://github.com/dotnet/core-setup/commit/4d7f19a8210428d8c3fa889b334802b2b278286f


Trivial merge