Merge branch 'debian' into debian-release-0.16

Conflicts:
	debian/changelog
	debian/copyright