Merge pull request dotnet/coreclr#8509 from dotnet-bot/from-tfs
authorBrian Sullivan <briansul@microsoft.com>
Thu, 8 Dec 2016 00:12:57 +0000 (16:12 -0800)
committerGitHub <noreply@github.com>
Thu, 8 Dec 2016 00:12:57 +0000 (16:12 -0800)
Merge changes from TFS

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


Trivial merge