Merge debian changes from 3.0.34-6.