Merge branch 'master' of https://github.com/dotnet/core-setup into appx-uwphost
authorChristopher Costa <chcosta@microsoft.com>
Sat, 8 Jul 2017 05:40:44 +0000 (22:40 -0700)
committerChristopher Costa <chcosta@microsoft.com>
Sat, 8 Jul 2017 05:40:44 +0000 (22:40 -0700)
Commit migrated from https://github.com/dotnet/core-setup/commit/0e506fbf122ddff4e1adfe9a9aae2ee0d30ac312


Trivial merge