Merge remote-tracking branch 'remotes/Coacher/uchardet-be-EAPI6-compatible'