merged from debian-sid