Update Nuget to 2.5
Merge branch 'master' into develop