Merge branch 'bug151-iconv' into master