Merge branch 'jc/latin-1' into maint