packaging
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/jsonstream/__init__.py
packaging