Merge branch 'jp/dirty-describe'