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