Merge pull request dotnet/coreclr#6763 from dotnet-bot/from-tfs
authorJan Kotas <jkotas@microsoft.com>
Wed, 17 Aug 2016 01:33:14 +0000 (18:33 -0700)
committerGitHub <noreply@github.com>
Wed, 17 Aug 2016 01:33:14 +0000 (18:33 -0700)
Merge changes from TFS

Commit migrated from https://github.com/dotnet/coreclr/commit/5ce87cbc6936db5b920981dfa17db4c6b4495c1a


Trivial merge