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