Merge tag 'upstream/1.5.90' into debian-experimental

Upstream version 1.5.90