Merge branch 'jc/maint-autofix-tag-in-head'