Merge branch 'MDL-56978_iconv' of https://github.com/mrmark/moodle