modtool: fixes case when modulname ends in 0
Merge branch 'maint'
Merge branch 'master' into next