Patched to allow the creation of distribution ZIPs without breaking the repo.