Merge pull request #1404 from aparcar/edit_packages