Merge branch 'legacy/0.9'

Conflicts:
	CHANGES.rst
	isso/core.py
	isso/dispatch.py
	setup.py