Merge pull request #1024 from rubenk/fix-version-gen-on-osx