Merge remote-tracking branch 'upstream/master' into master-merge

# Conflicts:
#	.github/workflows/main.yml
#	CHANGELOG.md
#	docs/docs/cli.md
#	get-poetry.py
#	poetry/packages/package.py
#	poetry/spdx/__init__.py
#	poetry/utils/env.py
#	poetry/vcs/git.py
#	tests/packages/test_package.py
#	tests/spdx/test_main.py
#	tests/utils/test_env.py