some more packaging tweaks
Merge branch 'stable' into dev