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