modtool: fix broken commit d09f1c3d
Merge branch 'maint'
Merge branch 'master' into next