Merge pull request #204 from jcarpent/devel

Fix packaging issues
14 jobs for master in 21 minutes and 43 seconds (queued for 2 seconds)