merge Debian changes from 3.0.7 to 3.0.10