Merge branch 'es/freebsd-iconv-portability'