Merge pull request #145 from nickvergessen/issue/139

[3.0] Fix archive names and allow a different package version
Merge branch 'develop-olympus' into develop-ascraeus