Some changes made in debian-unstable
Merged