Release 0.6.0
Merge remote-tracking branch 'origin/master'

Conflicts:
	build/stado.py