Fix file references in nuspec file
Merge branch 'release-2.1.0'