Fix dependency
New upstream version 0.7.1

Conflicts:
	package.json
Merge branch 'upstream'
Update packaging
Merge remote-tracking branch 'upstream/master' into kaji

Conflicts:
	debian/changelog
Bump kaji version
Update patches