Merge pull request dotnet/coreclr#4864 from dotnet-bot/from-tfs
authorRahul Kumar <rahku@microsoft.com>
Tue, 10 May 2016 01:04:29 +0000 (18:04 -0700)
committerRahul Kumar <rahku@microsoft.com>
Tue, 10 May 2016 01:04:29 +0000 (18:04 -0700)
Merge changes from TFS

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


Trivial merge