Merge pull request dotnet/coreclr#9916 from dotnet-bot/from-tfs
authorBruce Forstall <brucefo@microsoft.com>
Thu, 2 Mar 2017 19:26:01 +0000 (11:26 -0800)
committerGitHub <noreply@github.com>
Thu, 2 Mar 2017 19:26:01 +0000 (11:26 -0800)
Merge changes from TFS

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


Trivial merge