Merge pull request #5980 from dotnet-bot/from-tfs
authorJan Kotas <jkotas@microsoft.com>
Fri, 24 Jun 2016 03:18:16 +0000 (20:18 -0700)
committerGitHub <noreply@github.com>
Fri, 24 Jun 2016 03:18:16 +0000 (20:18 -0700)
Merge changes from TFS


Trivial merge