Merge pull request dotnet/coreclr#7616 from dotnet-bot/from-tfs
authorJan Kotas <jkotas@microsoft.com>
Fri, 14 Oct 2016 15:54:15 +0000 (08:54 -0700)
committerGitHub <noreply@github.com>
Fri, 14 Oct 2016 15:54:15 +0000 (08:54 -0700)
Merge changes from TFS

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


Trivial merge