Merge branch 'wip_master_mdl-32724' of https://github.com/iarenaza/moodle