Merge pull request #12716 from dotnet-bot/from-tfs
authorBrian Sullivan <briansul@microsoft.com>
Mon, 10 Jul 2017 20:52:31 +0000 (13:52 -0700)
committerGitHub <noreply@github.com>
Mon, 10 Jul 2017 20:52:31 +0000 (13:52 -0700)
Merge changes from TFS


Trivial merge