Merge tag 'upstream/1.1' into debian-debian