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