New upstream version 0.6
Merge branch 'upstream'
New Debian version 0.6-1
Fix changelog
Update standards-version
Merge remote-tracking branch 'upstream/master' into kaji

Conflicts:
	debian/changelog
Bump kaji version