Merge pull request dotnet/coreclr#10315 from dotnet-bot/from-tfs
authorBruce Forstall <brucefo@microsoft.com>
Mon, 20 Mar 2017 19:09:36 +0000 (12:09 -0700)
committerGitHub <noreply@github.com>
Mon, 20 Mar 2017 19:09:36 +0000 (12:09 -0700)
Merge changes from TFS

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


Trivial merge