Merge pull request dotnet/coreclr#6096 from dotnet-bot/from-tfs
authorBruce Forstall <brucefo@microsoft.com>
Fri, 1 Jul 2016 23:47:51 +0000 (16:47 -0700)
committerGitHub <noreply@github.com>
Fri, 1 Jul 2016 23:47:51 +0000 (16:47 -0700)
Merge changes from TFS

Commit migrated from https://github.com/dotnet/coreclr/commit/ce97aac437beb855a794155147d08ab94f60c1fe


Trivial merge