Merge pull request dotnet/coreclr#7473 from dotnet-bot/from-tfs
authorJan Kotas <jkotas@microsoft.com>
Tue, 4 Oct 2016 07:01:10 +0000 (00:01 -0700)
committerGitHub <noreply@github.com>
Tue, 4 Oct 2016 07:01:10 +0000 (00:01 -0700)
Merge changes from TFS

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


Trivial merge