Merge tag 'upstream/1.9.2' into debian-experimental

Upstream version 1.9.2