Merge branch 'MDL-57383' of https://github.com/paulholden/moodle