Merge branch 'MDL-53367_master' of https://github.com/juancs/moodle