Fix package display
Merge branch 'master' into production