Merge branch 'MDL-76257-master' of https://github.com/juancs/moodle