Merge pull request dotnet/coreclr#5070 from dotnet-bot/from-tfs
authorBruce Forstall <brucefo@microsoft.com>
Wed, 18 May 2016 23:18:38 +0000 (16:18 -0700)
committerBruce Forstall <brucefo@microsoft.com>
Wed, 18 May 2016 23:18:38 +0000 (16:18 -0700)
Merge changes from TFS

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


Trivial merge