Merge branch 'wip_25_mdl-42723' of https://github.com/iarenaza/moodle into MOODLE_25_...