Merge pull request dotnet/coreclr#5909 from dotnet-bot/from-tfs
authorBrian Sullivan <briansul@microsoft.com>
Wed, 22 Jun 2016 04:11:15 +0000 (21:11 -0700)
committerGitHub <noreply@github.com>
Wed, 22 Jun 2016 04:11:15 +0000 (21:11 -0700)
Merge changes from TFS

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


Trivial merge