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

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


Trivial merge