Merge branch 'release/0.6.0'
bump version
Merge branch 'release/0.6.1'
Merge branch 'release/0.6.2'

Conflicts:
	ChangeLog
	install.sh
Merge branch 'develop'