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