Merge branch 'hotfix/2.1.3'
Fix nuspec reference to vsix file
Merge branch 'hotfix/2.1.4' into develop