merge from the debian-sid branch