Merge branch 'MDL-58264' of https://github.com/darrencocco/moodle