Merge pull request dotnet/coreclr#4079 from dotnet-bot/from-tfs
authorJan Kotas <jkotas@microsoft.com>
Tue, 5 Apr 2016 17:19:26 +0000 (07:19 -1000)
committerJan Kotas <jkotas@microsoft.com>
Tue, 5 Apr 2016 17:19:26 +0000 (07:19 -1000)
Merge changes from TFS

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


Trivial merge