Change to .NET 40
Merge branch 'master'