Merge pull request dotnet/coreclr#4719 from dotnet-bot/from-tfs
authorBruce Forstall <brucefo@microsoft.com>
Mon, 2 May 2016 22:00:55 +0000 (15:00 -0700)
committerBruce Forstall <brucefo@microsoft.com>
Mon, 2 May 2016 22:00:55 +0000 (15:00 -0700)
Merge changes from TFS

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


Trivial merge