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

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


Trivial merge