Merge pull request dotnet/coreclr#5803 from dotnet-bot/from-tfs
authorJan Kotas <jkotas@microsoft.com>
Wed, 15 Jun 2016 00:33:12 +0000 (17:33 -0700)
committerGitHub <noreply@github.com>
Wed, 15 Jun 2016 00:33:12 +0000 (17:33 -0700)
Merge changes from TFS

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


Trivial merge