Merge tag 'upstream/1.5.2' into debian-experimental

Upstream version 1.5.2