fixed unmerged change from master->debian
Fixed lintian warnings and others