Merge pull request dotnet/coreclr#7730 from dotnet-bot/from-tfs
authorBruce Forstall <brucefo@microsoft.com>
Thu, 20 Oct 2016 18:30:34 +0000 (11:30 -0700)
committerGitHub <noreply@github.com>
Thu, 20 Oct 2016 18:30:34 +0000 (11:30 -0700)
Merge changes from TFS

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


Trivial merge