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