Merge branch 'MDL-65404-master' of https://github.com/aanabit/moodle