Use a clean version of the contrib name when renaming the first directory in MOD packages.
Merge branch 'master' into ascraeus