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