Merge tag 'upstream/1.3.3' into debian-experimental

Upstream version 1.3.3