Merge branch 'wip_MDL-48420_m29_lasttypo' of https://github.com/skodak/moodle