Merge pull request #7318 from dotnet-bot/from-tfs
authorJan Kotas <jkotas@microsoft.com>
Thu, 22 Sep 2016 20:56:16 +0000 (13:56 -0700)
committerGitHub <noreply@github.com>
Thu, 22 Sep 2016 20:56:16 +0000 (13:56 -0700)
Merge changes from TFS


Trivial merge