1.0
Merge remote-tracking branch 'origin/master' into 3.0

Conflicts:
	test/test3/__init__.py
3.0