Merge branch 'jc/revision-dash-count-parsing' into maint