#75 backport for .NET 4.0