Merge branch '0.9.0'

Conflicts:
	src/stat.py