merge Debian changes from 3.0.10 to 3.0.12.