Merge pull request #7657 from dotnet-bot/from-tfs
authorJan Kotas <jkotas@microsoft.com>
Mon, 17 Oct 2016 22:36:34 +0000 (15:36 -0700)
committerGitHub <noreply@github.com>
Mon, 17 Oct 2016 22:36:34 +0000 (15:36 -0700)
Merge changes from TFS


Trivial merge