Merge branch 'git-describe'