Merge pull request #9262 from BKPepe/unidecode_update