Merge branch 'rj/git-version-gen-do-not-force-abbrev'