Merge tag 'upstream/1.9.1' into debian-experimental

Upstream version 1.9.1