Merge branch 'MDL-53661_master' of https://github.com/sam-moodle/moodle