Merge pull request dotnet/coreclr#4979 from dotnet-bot/from-tfs
authorJan Kotas <jkotas@microsoft.com>
Sun, 15 May 2016 19:57:06 +0000 (12:57 -0700)
committerJan Kotas <jkotas@microsoft.com>
Sun, 15 May 2016 19:57:06 +0000 (12:57 -0700)
Merge changes from TFS

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


Trivial merge