Actually make test_venv work
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore