Merge pull request dotnet/coreclr#3361 from dotnet-bot/from-tfs
authorJan Kotas <jkotas@microsoft.com>
Fri, 26 Feb 2016 04:07:28 +0000 (20:07 -0800)
committerJan Kotas <jkotas@microsoft.com>
Fri, 26 Feb 2016 04:07:28 +0000 (20:07 -0800)
Merge changes from TFS

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


Trivial merge