Merge pull request dotnet/coreclr#4976 from dotnet-bot/from-tfs
authorMatt Ellis <matell@microsoft.com>
Sun, 15 May 2016 06:09:52 +0000 (23:09 -0700)
committerMatt Ellis <matell@microsoft.com>
Sun, 15 May 2016 06:09:52 +0000 (23:09 -0700)
Merge changes from TFS

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


Trivial merge