Merge pull request dotnet/coreclr#7866 from dotnet-bot/from-tfs
authorJan Kotas <jkotas@microsoft.com>
Fri, 28 Oct 2016 03:39:24 +0000 (20:39 -0700)
committerGitHub <noreply@github.com>
Fri, 28 Oct 2016 03:39:24 +0000 (20:39 -0700)
Merge changes from TFS

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


Trivial merge