Merge pull request #958 from rubenk/fix-version-gen-sh