Merge pull request dotnet/coreclr#10301 from dotnet-bot/from-tfs
authorBrian Sullivan <briansul@microsoft.com>
Mon, 20 Mar 2017 17:34:10 +0000 (10:34 -0700)
committerGitHub <noreply@github.com>
Mon, 20 Mar 2017 17:34:10 +0000 (10:34 -0700)
Merge changes from TFS

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


Trivial merge