Imported Upstream version 1.9.1
Merge tag 'upstream/1.9.1'

Upstream version 1.9.1
new upstream
Merge branch 'master' into contrib

Conflicts:
	debian/changelog