Merge pull request dotnet/coreclr#10263 from dotnet-bot/from-tfs
authorAndy Ayers <andya@microsoft.com>
Fri, 17 Mar 2017 21:01:18 +0000 (14:01 -0700)
committerGitHub <noreply@github.com>
Fri, 17 Mar 2017 21:01:18 +0000 (14:01 -0700)
Merge changes from TFS

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


Trivial merge