Merge pull request #4645 from jmarshallnz/install_from_zip_not_packages