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