Merge branch 'perl-Encode' into devel