Merge tag 'upstream/1.3.2' into debian-experimental

Upstream version 1.3.2