Merge tag 'upstream/1.7.90' into debian-experimental

Upstream version 1.7.90