Merge branch 'master' into 3pn
authorEric Erhardt <eric.erhardt@microsoft.com>
Mon, 28 Aug 2017 14:50:02 +0000 (09:50 -0500)
committerEric Erhardt <eric.erhardt@microsoft.com>
Mon, 28 Aug 2017 14:50:02 +0000 (09:50 -0500)
Commit migrated from https://github.com/dotnet/core-setup/commit/8214e3b0ceefdc32b7910e0e01551bccfc95cec7


Trivial merge