Merge branch 'MDL-61290_master' of https://github.com/aanabit/moodle