Merge tag 'upstream/1.7.1' into debian-experimental

Upstream version 1.7.1