Fix packaging

Merged Julien Wadel requested to merge fix/packaging into master

Merge request reports