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