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