Merge pull request dotnet/coreclr#5167 from dotnet-bot/from-tfs
authorJan Kotas <jkotas@microsoft.com>
Mon, 23 May 2016 21:20:22 +0000 (14:20 -0700)
committerJan Kotas <jkotas@microsoft.com>
Mon, 23 May 2016 21:20:22 +0000 (14:20 -0700)
Merge changes from TFS

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


Trivial merge