Merge pull request dotnet/coreclr#7755 from dotnet-bot/from-tfs
authorBruce Forstall <brucefo@microsoft.com>
Fri, 21 Oct 2016 22:50:36 +0000 (15:50 -0700)
committerGitHub <noreply@github.com>
Fri, 21 Oct 2016 22:50:36 +0000 (15:50 -0700)
Merge changes from TFS

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


Trivial merge