Merge branch 'master' of github.com:Microsoft/vscode-extension-samples