Merge branch 'master' of https://github.com/microsoft/vscode into clantz/dev-container