Merge pull request dotnet/coreclr#5270 from briansull/issue-5264
authorBrian Sullivan <briansul@microsoft.com>
Fri, 27 May 2016 13:16:18 +0000 (06:16 -0700)
committerBrian Sullivan <briansul@microsoft.com>
Fri, 27 May 2016 13:16:18 +0000 (06:16 -0700)
Proposed fix for dotnet/coreclr#5264

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


Trivial merge