Merge branch 'basicmaster-fix_iconv_result_type'