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