Merge pull request #17132 from dotnet-bot/from-tfs
authorBrian Sullivan <briansul@microsoft.com>
Thu, 22 Mar 2018 19:51:41 +0000 (12:51 -0700)
committerGitHub <noreply@github.com>
Thu, 22 Mar 2018 19:51:41 +0000 (12:51 -0700)
Merge changes from TFS


Trivial merge