Fix package name generation
Merge branch 'master' of https://github.com/samsellem/CMake
Merge cleanup