Code

Merge branch 'gt/maint-1.6.1-utf8-width' into maint-1.6.1