Merge remote-tracking branch 'origin/pinned-requirements-tweaks'

Conflicts:
	requirements.txt