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

This reverts commit 489d4497af54dbe3f088bec10e84a8ef8ee28a98.
Fix reference to vsix file in nuspec file
Merge branch 'release-2.1.0'
Increase vsix version
Merge branch 'hotfix/master' into develop