Merge tag 'upstream/1.12.0' into debian-experimental

Upstream version 1.12.0