separate branch for .NET 3.5 support