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