Updates nuspec file
Merge branch 'master' into develop
Fixes error in nuspec file
Merge branch 'develop'