Fix addon package

Closes #1610
Merge pull request #1611 from bcardarella/bc-fix-addon-package

Fix addon package