Merge branch 'dk/version-gen-gitdir' into maint