Merge branch 'jc/typo' into maint