Imported Upstream version 1.7.1
Merge tag 'upstream/1.7.1'

Upstream version 1.7.1

Conflicts:
	debian/changelog
New upstream: 1.7.1