Merge pull request dotnet/coreclr#7718 from dotnet-bot/from-tfs
authorJan Kotas <jkotas@microsoft.com>
Wed, 19 Oct 2016 18:17:40 +0000 (11:17 -0700)
committerGitHub <noreply@github.com>
Wed, 19 Oct 2016 18:17:40 +0000 (11:17 -0700)
Merge changes from TFS

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


Trivial merge