Merge pull request #16637 from dotnet-bot/from-tfs
authorBrian Sullivan <briansul@microsoft.com>
Wed, 28 Feb 2018 01:34:53 +0000 (17:34 -0800)
committerGitHub <noreply@github.com>
Wed, 28 Feb 2018 01:34:53 +0000 (17:34 -0800)
Merge changes from TFS


Trivial merge