Merge pull request #15945 from dotnet-bot/from-tfs
authorBruce Forstall <brucefo@microsoft.com>
Sat, 20 Jan 2018 05:59:44 +0000 (21:59 -0800)
committerGitHub <noreply@github.com>
Sat, 20 Jan 2018 05:59:44 +0000 (21:59 -0800)
Merge changes from TFS


Trivial merge