merged from the debian-sid branch