Merge remote-tracking branch 'upstream/debian/sid' into debian/sid