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