Merge pull request dotnet/coreclr#6832 from dotnet-bot/from-tfs
authorBruce Forstall <brucefo@microsoft.com>
Sun, 21 Aug 2016 03:51:31 +0000 (20:51 -0700)
committerGitHub <noreply@github.com>
Sun, 21 Aug 2016 03:51:31 +0000 (20:51 -0700)
Merge changes from TFS

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


Trivial merge