Merge branch 'wip_23_mdl-34085' of https://github.com/iarenaza/moodle into MOODLE_23_...