Merge branch 'MDL-59227' of https://github.com/rlorenzo/moodle