Fixes compile error on .NET 3.5
Merge branch 'v4.1' into v4.2