Merge pull request #1070 from tpokorra/FixTarball