Merge pull request #1219 from rubenk/version-gen