Merge pull request #13276 from dotnet-bot/from-tfs
authorBrian Sullivan <briansul@microsoft.com>
Wed, 9 Aug 2017 01:22:34 +0000 (18:22 -0700)
committerGitHub <noreply@github.com>
Wed, 9 Aug 2017 01:22:34 +0000 (18:22 -0700)
Merge changes from TFS


Trivial merge