Fix wanings
Fix CPack variable
Merge branch 'master' into devel