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