Merge tag 'upstream/1.1.2' into debian-experimental

Upstream version 1.1.2