Released 0.6.0
Merge remote-tracking branch 'origin/0.6'

Conflicts:
	CHANGELOG.md