Imported Upstream version 1.8.1
Merge tag 'upstream/1.8.1'

Upstream version 1.8.1
Merge branch 'master' into contrib

Conflicts:
	debian/changelog
Imported Upstream version 1.9
Merge branch 'upstream' into contrib