Merge branch 'w03_MDL-31142_m23_slowiconv' of git://github.com/skodak/moodle