Merge branch 'MDL-60966-master' of https://github.com/snake/moodle