Merge pull request dotnet/coreclr#6069 from dotnet-bot/from-tfs
authorAndy Ayers <andya@microsoft.com>
Wed, 29 Jun 2016 19:12:07 +0000 (12:12 -0700)
committerGitHub <noreply@github.com>
Wed, 29 Jun 2016 19:12:07 +0000 (12:12 -0700)
Merge changes from TFS

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


Trivial merge