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