Merge .NET 4.0 changes