Merge pull request dotnet/coreclr#6986 from dotnet-bot/from-tfs
authorJan Kotas <jkotas@microsoft.com>
Tue, 30 Aug 2016 21:18:05 +0000 (14:18 -0700)
committerGitHub <noreply@github.com>
Tue, 30 Aug 2016 21:18:05 +0000 (14:18 -0700)
Merge changes from TFS

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


Trivial merge