Merge pull request dotnet/coreclr#7814 from dotnet-bot/from-tfs
authorBruce Forstall <brucefo@microsoft.com>
Wed, 26 Oct 2016 04:36:19 +0000 (21:36 -0700)
committerGitHub <noreply@github.com>
Wed, 26 Oct 2016 04:36:19 +0000 (21:36 -0700)
Merge changes from TFS

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


Trivial merge