Merge branch 'MDL-71919-master-fix' of https://github.com/cescobedo/moodle