Merge pull request dotnet/coreclr#6740 from dotnet-bot/from-tfs
authorJan Kotas <jkotas@microsoft.com>
Sun, 14 Aug 2016 06:15:57 +0000 (23:15 -0700)
committerGitHub <noreply@github.com>
Sun, 14 Aug 2016 06:15:57 +0000 (23:15 -0700)
Merge changes from TFS

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


Trivial merge