Merge pull request #6509 from dotnet-bot/from-tfs
authorJan Kotas <jkotas@microsoft.com>
Fri, 29 Jul 2016 02:11:16 +0000 (19:11 -0700)
committerGitHub <noreply@github.com>
Fri, 29 Jul 2016 02:11:16 +0000 (19:11 -0700)
Merge changes from TFS


Trivial merge