Merge pull request #5854 from dotnet-bot/from-tfs
authorJan Kotas <jkotas@microsoft.com>
Fri, 17 Jun 2016 17:43:24 +0000 (10:43 -0700)
committerGitHub <noreply@github.com>
Fri, 17 Jun 2016 17:43:24 +0000 (10:43 -0700)
Merge changes from TFS


Trivial merge