Merge branch 'master' into merge-master-into-develop

# Conflicts:
#	CHANGELOG.md
#	poetry/__version__.py
#	poetry/packages/dependency.py
#	poetry/version/markers.py
#	pyproject.toml
#	tests/packages/test_dependency.py
#	tests/packages/test_main.py