Merge branch 'lintian-fixes' into 'master'

Fix some issues reported by lintian

See merge request !8
3 jobs for master in 41 seconds (queued for 6 seconds)