Merge pull request dotnet/coreclr#5468 from dotnet-bot/from-tfs
authorJan Kotas <jkotas@microsoft.com>
Sat, 4 Jun 2016 05:04:45 +0000 (22:04 -0700)
committerJan Kotas <jkotas@microsoft.com>
Sat, 4 Jun 2016 05:04:45 +0000 (22:04 -0700)
Merge changes from TFS

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


Trivial merge