Use the .NET 4.0 version of NSubstitute
Merge branch 'develop'