Merge branch 'wip-master-MDL-64563' of https://github.com/adpe/moodle