Merge pull request dotnet/coreclr#6190 from dotnet-bot/from-tfs
authorBrian Sullivan <briansul@microsoft.com>
Sat, 9 Jul 2016 02:14:10 +0000 (19:14 -0700)
committerGitHub <noreply@github.com>
Sat, 9 Jul 2016 02:14:10 +0000 (19:14 -0700)
Merge changes from TFS

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


Trivial merge