Merge branch 'MDL-57751-master' of https://github.com/xow/moodle