Merge pull request dotnet/coreclr#6896 from dotnet-bot/from-tfs
authorJan Kotas <jkotas@microsoft.com>
Wed, 24 Aug 2016 20:15:05 +0000 (13:15 -0700)
committerGitHub <noreply@github.com>
Wed, 24 Aug 2016 20:15:05 +0000 (13:15 -0700)
Merge changes from TFS

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


Trivial merge