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

# Conflicts:
#	CHANGELOG.md
#	poetry/__version__.py
#	poetry/installation/pip_installer.py
#	poetry/masonry/builders/editable.py
#	pyproject.toml
#	tests/masonry/builders/test_editable.py