Merge pull request #13967 from dotnet-bot/from-tfs
authorBrian Sullivan <briansul@microsoft.com>
Thu, 14 Sep 2017 01:48:47 +0000 (18:48 -0700)
committerGitHub <noreply@github.com>
Thu, 14 Sep 2017 01:48:47 +0000 (18:48 -0700)
Merge changes from TFS


Trivial merge