Merge pull request dotnet/coreclr#7595 from dotnet-bot/from-tfs
authorJan Kotas <jkotas@microsoft.com>
Thu, 13 Oct 2016 00:55:53 +0000 (17:55 -0700)
committerGitHub <noreply@github.com>
Thu, 13 Oct 2016 00:55:53 +0000 (17:55 -0700)
Merge changes from TFS

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


Trivial merge